From 3270291b95865a69fe4e7cc7459807601a85412a Mon Sep 17 00:00:00 2001
From: thokkat <thokatt@gmail.com>
Date: Sun, 11 Oct 2026 20:27:14 +0200
Subject: [PATCH 1/2] clear animation overlay on transform spell end

---
 common/world/objects/npc.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/common/world/objects/npc.cpp b/common/world/objects/npc.cpp
index 226adab52..19d2394d4 100644
--- a/common/world/objects/npc.cpp
+++ b/common/world/objects/npc.cpp
@@ -888,6 +888,7 @@ Tempest::Vec3 Npc::animMoveSpeed(uint64_t dt) const {
 
 void Npc::setVisual(const Skeleton* v) {
   visual.setVisual(v);
+  visual.clearOverlays();
   invalidateTalentOverlays();
   }
 
@@ -3229,7 +3230,6 @@ void Npc::commitSpell() {
   if(spellInfo!=0 && transformSpl==nullptr) {
     transformSpl.reset(new TransformBack(*this));
     invent.updateView(*this);
-    visual.clearOverlays();
 
     owner.script().initializeInstanceNpc(hnpc, size_t(spellInfo));
     spellInfo  = 0;
@@ -4508,10 +4508,6 @@ void Npc::transformBack() {
   setVisualBody(vHead,vTeeth,vColor,bdColor,body,head);
   closeWeapon(true);
 
-  // invalidate tallent overlays
-  for(size_t i=0; i<TALENT_MAX_G2; ++i)
-    setTalentSkill(Talent(i),talentsSk[i]);
-
   invent.updateView(*this);
   transformSpl.reset();
   }

From 0517a2c95649c22231cd2767bac9bc216b0d619c Mon Sep 17 00:00:00 2001
From: Try <try9998@gmail.com>
Date: Mon, 12 Oct 2026 21:16:43 +0200
Subject: [PATCH 2/2] nitpicks

---
 common/world/objects/npc.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/world/objects/npc.cpp b/common/world/objects/npc.cpp
index 19d2394d4..e01539808 100644
--- a/common/world/objects/npc.cpp
+++ b/common/world/objects/npc.cpp
@@ -887,6 +887,8 @@ Tempest::Vec3 Npc::animMoveSpeed(uint64_t dt) const {
   }
 
 void Npc::setVisual(const Skeleton* v) {
+  if(visual.visualSkeleton()==v)
+    return;
   visual.setVisual(v);
   visual.clearOverlays();
   invalidateTalentOverlays();