Index: trunk/src/bindings/scripts/VC71/71ScriptDev2.vcproj =================================================================== --- trunk/src/bindings/scripts/VC71/71ScriptDev2.vcproj (revision 2) +++ trunk/src/bindings/scripts/VC71/71ScriptDev2.vcproj (revision 6) @@ -21,5 +21,5 @@ Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\" + AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers" PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT" MinimalRebuild="TRUE" @@ -74,5 +74,5 @@ -* This program is free software licensed under GPL version 2 -* Please see the included DOCS/LICENSE.TXT for more information */ + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ #ifndef SC_PLAYER_H @@ -32,10 +32,10 @@ #define GOSSIP_TEXT_ALTERACVALLEY "Alterac Valley" -#define GOSSIP_TEXT_ARATHIBASIN "Arathi Basin" +#define GOSSIP_TEXT_ARATHIBASIN "Arathi Basin" #define GOSSIP_TEXT_WARSONGULCH "Warsong Gulch" #define GOSSIP_TEXT_ARENA "Arena" #define GOSSIP_TEXT_EYEOFTHESTORM "Eye of The Storm" -#define GOSSIP_TEXT_DRUID "Druid" +#define GOSSIP_TEXT_DRUID "Druid" #define GOSSIP_TEXT_HUNTER "Hunter" #define GOSSIP_TEXT_PRIEST "Priest" @@ -132,6 +132,6 @@ // e - Text to be displayed in pop up box // f - Money value in pop up box -#define ADD_GOSSIP_ITEM(a,b,c,d) PlayerTalkClass->GetGossipMenu()->AddMenuItem(a,b,c,d,"",0) -#define ADD_GOSSIP_ITEM_EXTENDED(a,b,c,d,e,f) PlayerTalkClass->GetGossipMenu()->AddMenuItem(a,b,c,d,e,f) +#define ADD_GOSSIP_ITEM(a,b,c,d) PlayerTalkClass->GetGossipMenu().AddMenuItem(a,b,c,d,"",0) +#define ADD_GOSSIP_ITEM_EXTENDED(a,b,c,d,e,f,g) PlayerTalkClass->GetGossipMenu().AddMenuItem(a,b,c,d,e,f,g) // This fuction Sends the current menu to show to client, a - NPCTEXTID(uint32) , b - npc guid(uint64) Index: trunk/src/bindings/scripts/include/sc_creature.cpp =================================================================== --- trunk/src/bindings/scripts/include/sc_creature.cpp (revision 2) +++ trunk/src/bindings/scripts/include/sc_creature.cpp (revision 6) @@ -26,5 +26,5 @@ if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) { - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; @@ -576,5 +576,5 @@ if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) { - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; Index: trunk/src/bindings/scripts/scripts/npc/npc_escortAI.h =================================================================== --- trunk/src/bindings/scripts/scripts/npc/npc_escortAI.h (revision 2) +++ trunk/src/bindings/scripts/scripts/npc/npc_escortAI.h (revision 6) Index: trunk/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/npc/npcs_special.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/npc/npcs_special.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/npc/npcs_special.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/npc/npc_escortAI.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/npc/npc_escortAI.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/npc/npc_escortAI.cpp (revision 6) @@ -63,5 +63,5 @@ if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) { - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; Index: trunk/src/bindings/scripts/scripts/npc/npc_professions.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/npc/npc_professions.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/npc/npc_professions.cpp (revision 6) @@ -497,15 +497,15 @@ { case 22427: //Zarevhi - player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player)); + player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player),false); //unknown textID () player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); break; case 19052: //Lorokeem - player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player)); + player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player),false); //unknown textID () player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); break; case 17909: //Lauranna Thar'well - player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player)); + player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player),false); //unknown textID () player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); @@ -767,5 +767,5 @@ case 5164: //Grumnus Steelshaper case 11177: //Okothos Ironrager - player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(player)); + player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(player),false); //unknown textID (TALK_UNLEARN_AXEORWEAPON) player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); @@ -773,15 +773,15 @@ case 11191: - player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player)); + player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player),false); //unknown textID (TALK_HAMMER_UNLEARN) player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); break; case 11192: - player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player)); + player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player),false); //unknown textID (TALK_AXE_UNLEARN) player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); break; case 11193: - player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player)); + player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player),false); //unknown textID (TALK_SWORD_UNLEARN) player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); @@ -920,5 +920,5 @@ case 7866: //Peter Galen case 7867: //Thorkaf Dragoneye - player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player)); + player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player),false); //unknown textID () player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); @@ -926,5 +926,5 @@ case 7868: //Sarah Tanner case 7869: //Brumn Winterhoof - player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player)); + player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player),false); //unknown textID () player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); @@ -932,5 +932,5 @@ case 7870: //Caryssia Moonhunter case 7871: //Se'Jib - player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player)); + player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player),false); //unknown textID () player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); @@ -1123,15 +1123,15 @@ { case 22213: //Gidge Spellweaver - player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player)); + player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player),false); //unknown textID () player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); break; case 22208: //Nasmara Moonsong - player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player)); + player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player),false); //unknown textID () player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); break; case 22212: //Andrion Darkspinner - player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, action,BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player)); + player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, action,BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player),false); //unknown textID () player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); Index: trunk/src/bindings/scripts/scripts/guard/guard_ai.h =================================================================== --- trunk/src/bindings/scripts/scripts/guard/guard_ai.h (revision 2) +++ trunk/src/bindings/scripts/scripts/guard/guard_ai.h (revision 6) Index: trunk/src/bindings/scripts/scripts/guard/guards.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/guard/guards.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/guard/guards.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/guard/guard_ai.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/guard/guard_ai.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/guard/guard_ai.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/go/go_scripts.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/go/go_scripts.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/go/go_scripts.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/boss/boss_lethon.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/boss/boss_lethon.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/boss/boss_lethon.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/boss/boss_taerar.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/boss/boss_taerar.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/boss/boss_taerar.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/boss/boss_ysondre.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/boss/boss_ysondre.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/boss/boss_ysondre.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/boss/boss_emeriss.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/boss/boss_emeriss.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/boss/boss_emeriss.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/creature/simple_ai.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/creature/simple_ai.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/creature/simple_ai.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/creature/mob_event_ai.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/creature/mob_event_ai.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/creature/mob_event_ai.cpp (revision 6) @@ -53,7 +53,9 @@ switch ((*i).Event.event_type) { - case EVENT_T_SPAWNED: - ProcessEvent(*i); - break; + case EVENT_T_SPAWNED: + ProcessEvent(*i); + break; + default: + break; } } @@ -391,5 +393,4 @@ } break; - case EVENT_T_FRIENDLY_IS_CC: { @@ -421,5 +422,4 @@ } break; - case EVENT_T_FRIENDLY_MISSING_BUFF: { @@ -448,5 +448,4 @@ } break; - case EVENT_T_SUMMONED_UNIT: { @@ -498,9 +497,7 @@ return param1; break; - case 1: return param2; break; - case 2: return param3; @@ -548,21 +545,16 @@ DoSay(GetEventAIText(param1), LANG_UNIVERSAL, pActionInvoker ? pActionInvoker : m_creature->getVictim()); break; - case ACTION_T_YELL: DoYell(GetEventAIText(param1), LANG_UNIVERSAL, pActionInvoker ? pActionInvoker : m_creature->getVictim()); break; - case ACTION_T_TEXTEMOTE: DoTextEmote(GetEventAIText(param1), pActionInvoker ? pActionInvoker : m_creature->getVictim()); break; - case ACTION_T_SOUND: DoPlaySoundToSet(m_creature, param1); break; - case ACTION_T_EMOTE: m_creature->HandleEmoteCommand(param1); break; - case ACTION_T_RANDOM_SAY: { @@ -573,5 +565,4 @@ } break; - case ACTION_T_RANDOM_YELL: { @@ -582,5 +573,4 @@ } break; - case ACTION_T_RANDOM_TEXTEMOTE: { @@ -591,5 +581,4 @@ } break; - case ACTION_T_RANDOM_SOUND: { @@ -600,5 +589,4 @@ } break; - case ACTION_T_RANDOM_EMOTE: { @@ -609,5 +597,4 @@ } break; - case ACTION_T_CAST: { @@ -658,5 +645,4 @@ } break; - case ACTION_T_SUMMON: { @@ -678,5 +664,4 @@ } break; - case ACTION_T_THREAT_SINGLE_PCT: { @@ -687,5 +672,4 @@ } break; - case ACTION_T_THREAT_ALL_PCT: { @@ -701,5 +685,4 @@ } break; - case ACTION_T_QUEST_EVENT: { @@ -710,5 +693,4 @@ } break; - case ACTION_T_CASTCREATUREGO: { @@ -719,5 +701,4 @@ } break; - case ACTION_T_SET_UNIT_FIELD: { @@ -728,5 +709,4 @@ } break; - case ACTION_T_SET_UNIT_FLAG: { @@ -737,5 +717,4 @@ } break; - case ACTION_T_REMOVE_UNIT_FLAG: { @@ -746,5 +725,4 @@ } break; - case ACTION_T_AUTO_ATTACK: { @@ -754,5 +732,4 @@ } break; - case ACTION_T_COMBAT_MOVEMENT: { @@ -791,5 +768,4 @@ } break; - case ACTION_T_EVADE: { @@ -814,5 +790,4 @@ } break; - case ACTION_T_CASTCREATUREGO_ALL: { @@ -828,5 +803,4 @@ } break; - case ACTION_T_REMOVEAURASFROMSPELL: { @@ -837,5 +811,4 @@ } break; - case ACTION_T_RANGED_MOVEMENT: { @@ -851,5 +824,4 @@ } break; - case ACTION_T_RANDOM_PHASE: { @@ -859,5 +831,4 @@ } break; - case ACTION_T_RANDOM_PHASE_RANGE: { @@ -899,5 +870,4 @@ } break; - case ACTION_T_KILLED_MONSTER: { @@ -908,5 +878,4 @@ } break; - case ACTION_T_SET_INST_DATA: { @@ -922,5 +891,4 @@ } break; - case ACTION_T_SET_INST_DATA64: { @@ -946,5 +914,4 @@ } break; - case ACTION_T_UPDATE_TEMPLATE: { @@ -959,5 +926,4 @@ } break; - case ACTION_T_DIE: { @@ -971,5 +937,4 @@ } break; - case ACTION_T_ZONE_COMBAT_PULSE: { @@ -984,5 +949,5 @@ } break; - }; + } } @@ -1015,19 +980,23 @@ { //Reset all out of combat timers - case EVENT_T_TIMER_OOC: - { - if ((*i).Event.event_param2 == (*i).Event.event_param1) + case EVENT_T_TIMER_OOC: { - (*i).Time = (*i).Event.event_param1; - (*i).Enabled = true; - - }else if ((*i).Event.event_param2 > (*i).Event.event_param1) - { - (*i).Time = urand((*i).Event.event_param1, (*i).Event.event_param2); - (*i).Enabled = true; - }else if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has InitialMax < InitialMin. Event disabled.", m_creature->GetEntry(), (*i).Event.event_id, (*i).Event.event_type); - - }break; + if ((*i).Event.event_param2 == (*i).Event.event_param1) + { + (*i).Time = (*i).Event.event_param1; + (*i).Enabled = true; + }else if ((*i).Event.event_param2 > (*i).Event.event_param1) + { + (*i).Time = urand((*i).Event.event_param1, (*i).Event.event_param2); + (*i).Enabled = true; + }else if (EAI_ErrorLevel > 0) + error_db_log("SD2: Creature %u using Event %u (Type = %u) has InitialMax < InitialMin. Event disabled.", m_creature->GetEntry(), (*i).Event.event_id, (*i).Event.event_type); + } + break; + default: + //TODO: enable below code line / verify this is correct to enable events previously disabled (ex. aggro yell), instead of enable this in void Aggro() + //(*i).Enabled = true; + //(*i).Time = 0; + break; } } @@ -1054,7 +1023,9 @@ { //Evade - case EVENT_T_EVADE: - ProcessEvent(*i); - break; + case EVENT_T_EVADE: + ProcessEvent(*i); + break; + default: + break; } } @@ -1072,7 +1043,9 @@ { //Evade - case EVENT_T_DEATH: - ProcessEvent(*i, killer); - break; + case EVENT_T_DEATH: + ProcessEvent(*i, killer); + break; + default: + break; } } @@ -1089,7 +1062,9 @@ { //Kill - case EVENT_T_KILL: - ProcessEvent(*i, victim); - break; + case EVENT_T_KILL: + ProcessEvent(*i, victim); + break; + default: + break; } } @@ -1107,7 +1082,9 @@ { //Summoned - case EVENT_T_SUMMONED_UNIT: - ProcessEvent(*i, pUnit); - break; + case EVENT_T_SUMMONED_UNIT: + ProcessEvent(*i, pUnit); + break; + default: + break; } } @@ -1121,30 +1098,26 @@ switch ((*i).Event.event_type) { - case EVENT_T_AGGRO: - ProcessEvent(*i, who); - break; - + case EVENT_T_AGGRO: + (*i).Enabled = true; + ProcessEvent(*i, who); + break; //Reset all in combat timers - case EVENT_T_TIMER: - - if ((*i).Event.event_param2 == (*i).Event.event_param1) - { - (*i).Time = (*i).Event.event_param1; + case EVENT_T_TIMER: + if ((*i).Event.event_param2 == (*i).Event.event_param1) + { + (*i).Time = (*i).Event.event_param1; + (*i).Enabled = true; + }else if ((*i).Event.event_param2 > (*i).Event.event_param1) + { + (*i).Time = urand((*i).Event.event_param1, (*i).Event.event_param2); + (*i).Enabled = true; + }else if (EAI_ErrorLevel > 0) + error_db_log("SD2: Creature %u using Event %u (Type = %u) has InitialMax < InitialMin. Event disabled.", m_creature->GetEntry(), (*i).Event.event_id, (*i).Event.event_type); + break; + //All normal events need to be re-enabled and their time set to 0 + default: (*i).Enabled = true; - - }else if ((*i).Event.event_param2 > (*i).Event.event_param1) - { - (*i).Time = urand((*i).Event.event_param1, (*i).Event.event_param2); - (*i).Enabled = true; - }else if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has InitialMax < InitialMin. Event disabled.", m_creature->GetEntry(), (*i).Event.event_id, (*i).Event.event_type); - - break; - - //All normal events need to be re-enabled and their time set to 0 - default: - (*i).Enabled = true; - (*i).Time = 0; - break; + (*i).Time = 0; + break; } } @@ -1200,6 +1173,9 @@ if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) + if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who)) { if(who->HasStealthAura()) @@ -1226,13 +1202,15 @@ switch ((*i).Event.event_type) { - //Spell hit - case EVENT_T_SPELLHIT: - { - //If spell id matches (or no spell id) & if spell school matches (or no spell school) - if (!(*i).Event.event_param1 || pSpell->Id == (*i).Event.event_param1) - if ((*i).Event.event_param2_s == -1 || pSpell->SchoolMask == (*i).Event.event_param2) - ProcessEvent(*i, pUnit); - } - break; + //Spell hit + case EVENT_T_SPELLHIT: + { + //If spell id matches (or no spell id) & if spell school matches (or no spell school) + if (!(*i).Event.event_param1 || pSpell->Id == (*i).Event.event_param1) + if ((*i).Event.event_param2_s == -1 || pSpell->SchoolMask == (*i).Event.event_param2) + ProcessEvent(*i, pUnit); + } + break; + default: + break; } } @@ -1326,42 +1304,36 @@ if ((*i).creature_id == ID) { - //Debug check +//Debug check #ifndef _DEBUG if ((*i).event_flags & EFLAG_DEBUG_ONLY) continue; #endif - - //Heroic Instance Difficulty check - if ((*i).event_flags & EFLAG_HEROIC) - { - //Creature isn't even in a dungeon - if (!_Creature->GetMap() || !_Creature->GetMap()->IsDungeon()) - { - if (EAI_ErrorLevel > 1) - error_db_log("SD2: Creature %u, Event %u using EFLAG_HEROIC but creature is not inside of an instance. Event skipped.", _Creature->GetEntry(), (*i).event_id); - continue; - } - - if (!_Creature->GetMap()->IsHeroic()) - continue; - } else - - //Normal Instance Difficulty check - if ((*i).event_flags & EFLAG_NORMAL) - { - //Creature isn't even in a dungeon - if (!_Creature->GetMap() || !_Creature->GetMap()->IsDungeon()) + if( _Creature->GetMap()->IsDungeon() ) + { + if( _Creature->GetMap()->IsHeroic() ) + { + if( (*i).event_flags & EFLAG_HEROIC ) { - if (EAI_ErrorLevel > 1) - error_db_log("SD2: Creature %u, Event %u using EFLAG_NORMAL but creature is not inside of an instance. Event skipped.", _Creature->GetEntry(), (*i).event_id); + EventList.push_back(EventHolder(*i)); continue; - } - - if (_Creature->GetMap()->IsHeroic()) + }else if( (*i).event_flags & EFLAG_NORMAL ) continue; - } else if (_Creature->GetMap() && _Creature->GetMap()->IsDungeon() && EAI_ErrorLevel > 1) - error_db_log("SD2: Creature %u, Event %u. Creature is in instance but neither EFLAG_NORMAL or EFLAG_HEROIC are set.", _Creature->GetEntry(), (*i).event_id); - - //Push back event + } + else + { + if( (*i).event_flags & EFLAG_NORMAL ) + { + EventList.push_back(EventHolder(*i)); + continue; + }else if( (*i).event_flags & EFLAG_HEROIC ) + continue; + } + + if (EAI_ErrorLevel > 1) + error_db_log("SD2: Creature %u Event %u. Creature are in instance but neither EFLAG_NORMAL or EFLAG_HEROIC are set. Event Disabled.", _Creature->GetEntry(), (*i).event_id); + + continue; + } + EventList.push_back(EventHolder(*i)); } Index: trunk/src/bindings/scripts/scripts/creature/simple_ai.h =================================================================== --- trunk/src/bindings/scripts/scripts/creature/simple_ai.h (revision 2) +++ trunk/src/bindings/scripts/scripts/creature/simple_ai.h (revision 6) Index: trunk/src/bindings/scripts/scripts/creature/mob_event_ai.h =================================================================== --- trunk/src/bindings/scripts/scripts/creature/mob_event_ai.h (revision 2) +++ trunk/src/bindings/scripts/scripts/creature/mob_event_ai.h (revision 6) Index: trunk/src/bindings/scripts/scripts/custom/test.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/custom/test.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/custom/test.cpp (revision 6) @@ -153,9 +153,7 @@ _Creature->prepareGossipMenu(player,0); - player->PlayerTalkClass->GetGossipMenu()->AddMenuItem(0, "Click to Test Escort(Attack, Defend, Run)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1,"",0); - - player->PlayerTalkClass->GetGossipMenu()->AddMenuItem(0, "Click to Test Escort(NoAttack, NoDefend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2,"",0); - - player->PlayerTalkClass->GetGossipMenu()->AddMenuItem(0, "Click to Test Escort(NoAttack, Defend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3,"",0); + player->ADD_GOSSIP_ITEM(0, "Click to Test Escort(Attack, Defend, Run)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(0, "Click to Test Escort(NoAttack, NoDefend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM(0, "Click to Test Escort(NoAttack, Defend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); _Creature->sendPreparedGossip( player ); Index: trunk/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp (revision 6) @@ -28,5 +28,5 @@ bool GossipHello_custom_gossip_codebox(Player *player, Creature *_Creature) { - player->PlayerTalkClass->GetGossipMenu()->AddMenuItem(0, "A quiz: what's your name?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true); + player->ADD_GOSSIP_ITEM_EXTENDED(0, "A quiz: what's your name?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true); player->ADD_GOSSIP_ITEM(0, "I'm not interested", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); Index: trunk/src/bindings/scripts/scripts/custom/custom_example.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/custom/custom_example.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/custom/custom_example.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/def_zulgurub.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/def_zulgurub.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/def_zulgurub.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/instance_zulgurub.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/instance_zulgurub.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/instance_zulgurub.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp (revision 6) @@ -183,22 +183,4 @@ } - void MoveInLineOfSight(Unit *who) - { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { - float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) - { - if(who->HasStealthAura()) - who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - - DoStartAttackAndMovement(who); - } - } - } - void UpdateAI (const uint32 diff) { @@ -241,22 +223,4 @@ } - void MoveInLineOfSight(Unit *who) - { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { - float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) - { - if(who->HasStealthAura()) - who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - - DoStartAttackAndMovement(who); - } - } - } - void UpdateAI (const uint32 diff) { Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp (revision 6) @@ -209,22 +209,4 @@ } - void MoveInLineOfSight(Unit *who) - { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { - float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) - { - if(who->HasStealthAura()) - who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - - DoStartAttackAndMovement(who); - } - } - } - void UpdateAI (const uint32 diff) { Index: trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp (revision 6) @@ -98,5 +98,5 @@ if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) { - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; Index: trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp (revision 6) @@ -128,5 +128,5 @@ if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) { - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; @@ -259,4 +259,6 @@ } }else Shadowbolt_Timer -= diff; + + DoMeleeAttackIfReady(); } }; Index: trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp (revision 6) @@ -222,5 +222,5 @@ } - if( m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE ) + if(!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE ) return; Index: trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp (revision 6) @@ -996,6 +996,9 @@ if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) + if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who)) { if(who->HasStealthAura()) Index: trunk/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/black_temple/def_black_temple.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/def_black_temple.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/def_black_temple.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp (revision 6) @@ -205,5 +205,5 @@ if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) { - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; @@ -499,11 +499,11 @@ void MoveInLineOfSight(Unit *who) { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + { + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + float attackRadius = m_creature->GetAttackDistance(who); - if (Phase >= 4 && m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) + if (Phase >= 4 && m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who)) { if(who->HasStealthAura()) @@ -1512,22 +1512,4 @@ } - void MoveInLineOfSight(Unit *who) - { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { - float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) - { - if(who->HasStealthAura()) - who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - - AttackStart(who); - } - } - } - void UpdateAI(const uint32 diff) { Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp (revision 6) @@ -478,22 +478,4 @@ } - void MoveInLineOfSight(Unit *who) - { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { - float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) - { - if(who->HasStealthAura()) - who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - - DoStartAttackAndMovement(who); - } - } - } - void UpdateAI(const uint32 diff) { Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp (revision 6) @@ -120,5 +120,5 @@ if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) { - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp (revision 6) @@ -128,5 +128,5 @@ if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) { - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; @@ -369,5 +369,5 @@ if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) { - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; if (who->GetTypeId() != TYPEID_PLAYER) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/def_arcatraz.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/def_arcatraz.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/def_arcatraz.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp (revision 6) @@ -163,22 +163,4 @@ } - void MoveInLineOfSight(Unit *who) - { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && IsVisible(who) && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { - float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) - { - if(who->HasStealthAura()) - who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - //Begin melee attack if we are within range - DoStartAttackAndMovement(who); - } - } - } - void UpdateAI(const uint32 diff) { @@ -268,22 +250,4 @@ void Aggro(Unit *who) { - } - - void MoveInLineOfSight(Unit *who) - { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && IsVisible(who) && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { - float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) - { - if(who->HasStealthAura()) - who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - //Begin melee attack if we are within range - DoStartAttackAndMovement(who); - } - } } Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/undercity/undercity.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/undercity/undercity.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/undercity/undercity.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackwing_lair/instance_blackwing_lair.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackwing_lair/instance_blackwing_lair.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackwing_lair/instance_blackwing_lair.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp (revision 6) @@ -276,7 +276,4 @@ void MoveInLineOfSight(Unit *who) { - if (!who || m_creature->getVictim()) - return; - if (who->GetTypeId() == TYPEID_PLAYER) { @@ -290,8 +287,11 @@ } - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + { + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) + if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who)) { if(who->HasStealthAura()) Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp (revision 6) @@ -96,5 +96,5 @@ } - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp (revision 6) @@ -194,5 +194,5 @@ } - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp (revision 6) @@ -105,5 +105,5 @@ } - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp (revision 6) @@ -115,5 +115,5 @@ } - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp (revision 6) @@ -85,5 +85,5 @@ if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) { - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; Index: trunk/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/slave_pens/boss_rokmar.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/slave_pens/boss_rokmar.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/slave_pens/boss_rokmar.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_ghazan.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_ghazan.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_ghazan.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp (revision 6) @@ -296,25 +296,4 @@ } - void MoveInLineOfSight(Unit *who) - { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { - float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) - { - if(who->HasStealthAura()) - who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - - DoStartAttackAndMovement(who); - - if(!InCombat) - StartEvent(); - } - } - } - void UpdateAI(const uint32 diff) { Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp (revision 6) @@ -617,22 +617,4 @@ void Aggro(Unit *who) { - } - - void MoveInLineOfSight(Unit *who) - { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { - float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) - { - if(who->HasStealthAura()) - who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - - m_creature->AddThreat(who, 0.1f); - } - } } Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp (revision 6) @@ -101,8 +101,11 @@ } - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) + if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who)) { if(who->HasStealthAura()) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/def_hyjal.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/def_hyjal.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/def_hyjal.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp (revision 6) @@ -51,5 +51,5 @@ if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) { - if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; Index: trunk/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/shadowfang_keep/def_shadowfang_keep.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/shadowfang_keep/def_shadowfang_keep.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/shadowfang_keep/def_shadowfang_keep.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp (revision 6) @@ -345,11 +345,11 @@ void MoveInLineOfSight(Unit *who) { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + { + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) + if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who)) { if(who->HasStealthAura()) @@ -460,11 +460,11 @@ void MoveInLineOfSight(Unit *who) { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + { + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) + if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who)) { if(who->HasStealthAura()) @@ -560,11 +560,11 @@ void MoveInLineOfSight(Unit *who) { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + { + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) + if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who)) { if(who->HasStealthAura()) Index: trunk/src/bindings/scripts/scripts/zone/gruuls_lair/def_gruuls_lair.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/gruuls_lair/def_gruuls_lair.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/gruuls_lair/def_gruuls_lair.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/deadmines/instance_deadmines.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/deadmines/instance_deadmines.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/deadmines/instance_deadmines.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scarlet_commander_mograine.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scarlet_commander_mograine.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scarlet_commander_mograine.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_whitemane.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_whitemane.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_whitemane.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp (revision 6) @@ -194,16 +194,16 @@ AddList.erase((AddList.begin())+(rand()%AddList.size())); - uint8 j = 0; + uint8 i = 0; for(std::vector::iterator itr = AddList.begin(); itr != AddList.end(); ++itr) { uint32 entry = *itr; - pCreature = m_creature->SummonCreature(entry, Locations[j][0], Locations[j][1], POS_Z, ORIENT, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + pCreature = m_creature->SummonCreature(entry, Locations[i][0], Locations[i][1], POS_Z, ORIENT, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); if(pCreature) { - AddGUID[j] = pCreature->GetGUID(); - AddId[j] = entry; + AddGUID[i] = pCreature->GetGUID(); + AddId[i] = entry; } - ++j; + ++i; } Index: trunk/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/felwood/felwood.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/felwood/felwood.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/felwood/felwood.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_seethrel.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_seethrel.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_seethrel.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gloomrel.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gloomrel.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gloomrel.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_haterel.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_haterel.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_haterel.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_doperel.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_doperel.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_doperel.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_angerrel.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_angerrel.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_angerrel.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_doomrel.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_doomrel.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_doomrel.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_vilerel.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_vilerel.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/blackrock_depths/boss_vilerel.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp (revision 6) @@ -97,23 +97,4 @@ } - void MoveInLineOfSight(Unit *who) - { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { - float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) - { - if(who->HasStealthAura()) - who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - - DoStartAttackAndMovement(who); - - } - } - } - void UpdateAI(const uint32 diff) { Index: trunk/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp (revision 6) @@ -139,22 +139,4 @@ } - void MoveInLineOfSight(Unit *who) - { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { - float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) - { - if(who->HasStealthAura()) - who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - - DoStartAttackAndMovement(who); - } - } - } - void UpdateAI(const uint32 diff) { Index: trunk/src/bindings/scripts/scripts/zone/molten_core/def_molten_core.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/def_molten_core.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/def_molten_core.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp (revision 6) @@ -695,21 +695,4 @@ } - void MoveInLineOfSight(Unit *who) - { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { - float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) - { - if(who->HasStealthAura()) - who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - DoStartAttackAndMovement(who); - } - } - } - void UpdateAI(const uint32 diff) { Index: trunk/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulaman/def_zulaman.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulaman/def_zulaman.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulaman/def_zulaman.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/azshara/azshara.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/azshara/azshara.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/azshara/azshara.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scholomance/def_scholomance.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/def_scholomance.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/def_scholomance.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp (revision 6) @@ -168,22 +168,4 @@ } - void MoveInLineOfSight(Unit *who) - { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { - float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) - { - if(who->HasStealthAura()) - who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - - DoStartAttackAndMovement(who); - } - } - } - void UpdateAI(const uint32 diff) { Index: trunk/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_feugen.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_feugen.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_feugen.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp (revision 6) @@ -100,11 +100,11 @@ void MoveInLineOfSight(Unit *who) { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + { + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who)) + if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who)) { if(who->HasStealthAura()) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp (revision 6) @@ -90,11 +90,11 @@ void MoveInLineOfSight(Unit *who) { - if (!who || m_creature->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) - { + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + { + if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + float attackRadius = m_creature->GetAttackDistance(who); - if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE) + if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who)) { if(who->HasStealthAura()) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_stalagg.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_stalagg.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_stalagg.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_thane_korthazz.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_thane_korthazz.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_thane_korthazz.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_lady_blaumeux.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_lady_blaumeux.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_lady_blaumeux.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_sir_zeliek.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_sir_zeliek.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_sir_zeliek.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/magisters_terrace/def_magisters_terrace.h =================================================================== --- trunk/src/bindings/scripts/scripts/zone/magisters_terrace/def_magisters_terrace.h (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/magisters_terrace/def_magisters_terrace.h (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/silithus/silithus.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/silithus/silithus.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/silithus/silithus.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/zone/feralas/feralas.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/zone/feralas/feralas.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/zone/feralas/feralas.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/item/item_scripts.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/item/item_scripts.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/item/item_scripts.cpp (revision 6) Index: trunk/src/bindings/scripts/scripts/item/item_test.cpp =================================================================== --- trunk/src/bindings/scripts/scripts/item/item_test.cpp (revision 2) +++ trunk/src/bindings/scripts/scripts/item/item_test.cpp (revision 6) Index: trunk/src/bindings/scripts/ScriptMgr.cpp =================================================================== --- trunk/src/bindings/scripts/ScriptMgr.cpp (revision 5) +++ trunk/src/bindings/scripts/ScriptMgr.cpp (revision 6) @@ -1120,7 +1120,8 @@ void ScriptsInit() { - //Trinity Script startup + //Trinity Script startup + outstring_log(" _____ _ _ _ ____ _ _"); outstring_log("|_ _| __(_)_ __ (_) |_ _ _/ ___| ___ _ __(_)_ __ | |_ "); - outstring_log(" | || '__| | '_ \\| | __| | | \\___ \\ / __| \\'__| | \\'_ \\| __|"); + outstring_log(" | || '__| | '_ \\| | __| | | \\___ \\ / __| \'__| | \'_ \\| __|"); outstring_log(" | || | | | | | | | |_| |_| |___) | (__| | | | |_) | |_ "); outstring_log(" |_||_| |_|_| |_|_|\\__|\\__, |____/ \\___|_| |_| .__/ \\__|");