Ticket #60: AATimerReset.diff

zone/spells.cpp

@@ -725 +725 @@
                 CastToNPC()->AI_Event_SpellCastFinished(false, casting_spell_slot);
         }
         
+        if(casting_spell_type == 1 && IsClient()) { //Rest AA Timer on failed cast
+                CastToClient()->SendAATimer(casting_spell_timer - pTimerAAStart, 0, 0xFFFFFF);
+                CastToClient()->Message_StringID(15,ABILITY_FAILED);
+                CastToClient()->GetPTimers().Clear(&database, casting_spell_timer);
+        }
+
         ZeroCastingVars();      // resets all the state keeping stuff
         
         mlog(SPELLS__CASTING, "Spell %d has been interrupted.", spellid);

zone/StringIDs.h

@@ -10 +10 @@
 #define SPELL_DOES_NOT_WORK_PLANE       107             //This spell does not work on this plane.
 #define CANT_SEE_TARGET                         108             //You cannot see your target.
 #define MGB_STRING                                      113             //The next group buff you cast will hit all targets in range.
+#define ABILITY_FAILED                          116             //Your ability failed. Timer has been reset.
 #define TARGET_TOO_FAR                          124             //Your target is too far away, get closer!
 #define PROC_TOOLOW                                     126             //Your will is not sufficient to command this weapon.
 #define PROC_PETTOOLOW                          127             //Your pet's will is not sufficient to command its weapon.