josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[svn] * Scripts fixed

Browse Source 
* Last commit before public

--HG--
branch : trunk
This commit is contained in:
runningnak3d
2008-10-14 15:05:43 -05:00
parent 4679076a58
commit fc6a5eae08
321 changed files with 1126 additions and 1126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/boss/boss_emeriss.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ EndScriptData */
#define SPELL_VOLATILEINFECTION 24928 #define SPELL_VOLATILEINFECTION 24928
#define SPELL_CORRUPTIONOFEARTH 24910 #define SPELL_CORRUPTIONOFEARTH 24910
struct MANGOS_DLL_DECL boss_emerissAI : public ScriptedAI struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI
{ {
boss_emerissAI(Creature *c) : ScriptedAI(c) {Reset();} boss_emerissAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/boss/boss_taerar.cpp
+2 -2
View File
@@ -38,7 +38,7 @@ EndScriptData */
#define SPELL_POSIONCLOUD 24840 #define SPELL_POSIONCLOUD 24840
#define SPELL_POSIONBREATH 20667 #define SPELL_POSIONBREATH 20667
struct MANGOS_DLL_DECL boss_taerarAI : public ScriptedAI struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI
{ {
boss_taerarAI(Creature *c) : ScriptedAI(c) {Reset();} boss_taerarAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -240,7 +240,7 @@ struct MANGOS_DLL_DECL boss_taerarAI : public ScriptedAI
// Shades of Taerar Script // Shades of Taerar Script
struct MANGOS_DLL_DECL boss_shadeoftaerarAI : public ScriptedAI struct TRINITY_DLL_DECL boss_shadeoftaerarAI : public ScriptedAI
{ {
boss_shadeoftaerarAI(Creature *c) : ScriptedAI(c) {Reset();} boss_shadeoftaerarAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/boss/boss_ysondre.cpp
+2 -2
View File
@@ -34,7 +34,7 @@ EndScriptData */
#define SPELL_MOONFIRE 21669 #define SPELL_MOONFIRE 21669
// Ysondre script // Ysondre script
struct MANGOS_DLL_DECL boss_ysondreAI : public ScriptedAI struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI
{ {
boss_ysondreAI(Creature *c) : ScriptedAI(c) {Reset();} boss_ysondreAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -189,7 +189,7 @@ struct MANGOS_DLL_DECL boss_ysondreAI : public ScriptedAI
} }
}; };
// Summoned druid script // Summoned druid script
struct MANGOS_DLL_DECL mob_dementeddruidsAI : public ScriptedAI struct TRINITY_DLL_DECL mob_dementeddruidsAI : public ScriptedAI
{ {
mob_dementeddruidsAI(Creature *c) : ScriptedAI(c) {Reset();} mob_dementeddruidsAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/creature/mob_event_ai.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ struct EventHolder
bool Enabled; bool Enabled;
}; };
struct MANGOS_DLL_DECL Mob_EventAI : public ScriptedAI struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI
{ {
Mob_EventAI(Creature *c, std::list<EventHolder> pEventList) : ScriptedAI(c) Mob_EventAI(Creature *c, std::list<EventHolder> pEventList) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/creature/mob_generic_creature.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ EndScriptData */
#define GENERIC_CREATURE_COOLDOWN 5000 #define GENERIC_CREATURE_COOLDOWN 5000
struct MANGOS_DLL_DECL generic_creatureAI : public ScriptedAI struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI
{ {
generic_creatureAI(Creature *c) : ScriptedAI(c) {Reset();} generic_creatureAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/creature/simple_ai.h
+1 -1
View File
@@ -19,7 +19,7 @@ enum CastTarget
CAST_JUSTDIED_KILLER, //Only works within JustDied function CAST_JUSTDIED_KILLER, //Only works within JustDied function
}; };
struct MANGOS_DLL_DECL SimpleAI : public ScriptedAI struct TRINITY_DLL_DECL SimpleAI : public ScriptedAI
{ {
SimpleAI(Creature *c);// : ScriptedAI(c); SimpleAI(Creature *c);// : ScriptedAI(c);
src/bindings/scripts/scripts/custom/custom_example.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ EndScriptData */
#define SAY_DANCE "I always thought I was a good dancer" #define SAY_DANCE "I always thought I was a good dancer"
#define SAY_SALUTE "Move out Soldier!" #define SAY_SALUTE "Move out Soldier!"
struct MANGOS_DLL_DECL custom_exampleAI : public ScriptedAI struct TRINITY_DLL_DECL custom_exampleAI : public ScriptedAI
{ {
//*** HANDLED FUNCTION *** //*** HANDLED FUNCTION ***
//This is the constructor, called only once when the creature is first created //This is the constructor, called only once when the creature is first created
src/bindings/scripts/scripts/custom/test.cpp
+4 -4
View File
@@ -24,7 +24,7 @@ EndScriptData */
#include "precompiled.h" #include "precompiled.h"
#include "../npc/npc_escortAI.h" #include "../npc/npc_escortAI.h"
struct MANGOS_DLL_DECL npc_testAI : public npc_escortAI struct TRINITY_DLL_DECL npc_testAI : public npc_escortAI
{ {
public: public:
@@ -167,7 +167,7 @@ bool GossipSelect_npc_test(Player *player, Creature *_Creature, uint32 sender, u
player->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
((npc_escortAI*)(_Creature->AI()))->Start(true, true, true, player->GetGUID()); ((npc_escortAI*)(_Creature->AI()))->Start(true, true, true, player->GetGUID());
return true; // prevent mangos core handling return true; // prevent Trinity core handling
} }
if (action == GOSSIP_ACTION_INFO_DEF+2) if (action == GOSSIP_ACTION_INFO_DEF+2)
@@ -175,7 +175,7 @@ bool GossipSelect_npc_test(Player *player, Creature *_Creature, uint32 sender, u
player->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
((npc_escortAI*)(_Creature->AI()))->Start(false, false, false, player->GetGUID()); ((npc_escortAI*)(_Creature->AI()))->Start(false, false, false, player->GetGUID());
return true; // prevent mangos core handling return true; // prevent Trinity core handling
} }
if (action == GOSSIP_ACTION_INFO_DEF+3) if (action == GOSSIP_ACTION_INFO_DEF+3)
@@ -183,7 +183,7 @@ bool GossipSelect_npc_test(Player *player, Creature *_Creature, uint32 sender, u
player->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
((npc_escortAI*)(_Creature->AI()))->Start(false, true, false, player->GetGUID()); ((npc_escortAI*)(_Creature->AI()))->Start(false, true, false, player->GetGUID());
return true; // prevent mangos core handling return true; // prevent Trinity core handling
} }
return false; return false;
} }
src/bindings/scripts/scripts/go/go_scripts.cpp
+1 -1
View File
@@ -136,7 +136,7 @@ bool GOHello_go_tablet_of_madness(Player *player, GameObject* _GO)
## go_tablet_of_the_seven ## go_tablet_of_the_seven
######*/ ######*/
//TODO: use gossip option ("Transcript the Tablet") instead, if Mangos adds support. //TODO: use gossip option ("Transcript the Tablet") instead, if Trinity adds support.
bool GOHello_go_tablet_of_the_seven(Player *player, GameObject* _GO) bool GOHello_go_tablet_of_the_seven(Player *player, GameObject* _GO)
{ {
if (_GO->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER) if (_GO->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER)
src/bindings/scripts/scripts/guard/guard_ai.h
+1 -1
View File
@@ -7,7 +7,7 @@
#define GENERIC_CREATURE_COOLDOWN 5000 #define GENERIC_CREATURE_COOLDOWN 5000
struct MANGOS_DLL_DECL guardAI : public ScriptedAI struct TRINITY_DLL_DECL guardAI : public ScriptedAI
{ {
guardAI(Creature *c) : ScriptedAI(c) {Reset();} guardAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/guard/guards.cpp
+3 -3
View File
@@ -491,7 +491,7 @@ CreatureAI* GetAI_guard_bluffwatcher(Creature *_Creature)
* guard_contested start * guard_contested start
*******************************************************/ *******************************************************/
struct MANGOS_DLL_DECL guard_contested : public guardAI struct TRINITY_DLL_DECL guard_contested : public guardAI
{ {
guard_contested(Creature *c) : guardAI(c) {} guard_contested(Creature *c) : guardAI(c) {}
@@ -2540,7 +2540,7 @@ CreatureAI* GetAI_guard_shattrath(Creature *_Creature)
#define SPELL_BANISH_TELEPORT 36643 #define SPELL_BANISH_TELEPORT 36643
#define SPELL_EXILE 39533 #define SPELL_EXILE 39533
struct MANGOS_DLL_DECL guard_shattrath_aldorAI : public guardAI struct TRINITY_DLL_DECL guard_shattrath_aldorAI : public guardAI
{ {
guard_shattrath_aldorAI(Creature *c) : guardAI(c) { Reset(); } guard_shattrath_aldorAI(Creature *c) : guardAI(c) { Reset(); }
@@ -2736,7 +2736,7 @@ CreatureAI* GetAI_guard_shattrath_aldor(Creature *_Creature)
* guard_shattrath_scryer * guard_shattrath_scryer
*******************************************************/ *******************************************************/
struct MANGOS_DLL_DECL guard_shattrath_scryerAI : public guardAI struct TRINITY_DLL_DECL guard_shattrath_scryerAI : public guardAI
{ {
guard_shattrath_scryerAI(Creature *c) : guardAI(c) { Reset(); } guard_shattrath_scryerAI(Creature *c) : guardAI(c) { Reset(); }
src/bindings/scripts/scripts/npc/npc_escortAI.h
+1 -1
View File
@@ -23,7 +23,7 @@ struct Escort_Waypoint
uint32 WaitTimeMs; uint32 WaitTimeMs;
}; };
struct MANGOS_DLL_DECL npc_escortAI : public ScriptedAI struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI
{ {
public: public:
src/bindings/scripts/scripts/npc/npc_innkeeper.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ bool GossipSelect_npc_innkeeper(Player *player, Creature *_Creature, uint32 send
} }
player->CastSpell(player, trickspell, true); player->CastSpell(player, trickspell, true);
} }
return true; // prevent mangos core handling return true; // prevent Trinity core handling
} }
return false; // the player didn't select "trick or treat" or cheated, normal core handling return false; // the player didn't select "trick or treat" or cheated, normal core handling
} }
src/bindings/scripts/scripts/npc/npcs_special.cpp
+4 -4
View File
@@ -46,7 +46,7 @@ EndContentData */
#define FACTION_FRIENDLY 84 #define FACTION_FRIENDLY 84
#define FACTION_CHICKEN 31 #define FACTION_CHICKEN 31
struct MANGOS_DLL_DECL npc_chicken_cluckAI : public ScriptedAI struct TRINITY_DLL_DECL npc_chicken_cluckAI : public ScriptedAI
{ {
npc_chicken_cluckAI(Creature *c) : ScriptedAI(c) {Reset();} npc_chicken_cluckAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -235,7 +235,7 @@ const uint32 HordeSoldierId[3] =
## npc_doctor (handles both Gustaf Vanhowzen and Gregory Victor) ## npc_doctor (handles both Gustaf Vanhowzen and Gregory Victor)
######*/ ######*/
struct MANGOS_DLL_DECL npc_doctorAI : public ScriptedAI struct TRINITY_DLL_DECL npc_doctorAI : public ScriptedAI
{ {
uint64 Playerguid; uint64 Playerguid;
@@ -265,7 +265,7 @@ struct MANGOS_DLL_DECL npc_doctorAI : public ScriptedAI
## npc_injured_patient (handles all the patients, no matter Horde or Alliance) ## npc_injured_patient (handles all the patients, no matter Horde or Alliance)
#####*/ #####*/
struct MANGOS_DLL_DECL npc_injured_patientAI : public ScriptedAI struct TRINITY_DLL_DECL npc_injured_patientAI : public ScriptedAI
{ {
npc_injured_patientAI(Creature *c) : ScriptedAI(c) {Reset();} npc_injured_patientAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -527,7 +527,7 @@ CreatureAI* GetAI_npc_doctor(Creature *_Creature)
#define SPELL_DEATHTOUCH 5 #define SPELL_DEATHTOUCH 5
#define SAY_AGGRO "This area is closed!" #define SAY_AGGRO "This area is closed!"
struct MANGOS_DLL_DECL npc_guardianAI : public ScriptedAI struct TRINITY_DLL_DECL npc_guardianAI : public ScriptedAI
{ {
npc_guardianAI(Creature *c) : ScriptedAI(c) {Reset();} npc_guardianAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ EndContentData */
## npc_ravenholdt ## npc_ravenholdt
######*/ ######*/
struct MANGOS_DLL_DECL npc_ravenholdtAI : public ScriptedAI struct TRINITY_DLL_DECL npc_ravenholdtAI : public ScriptedAI
{ {
npc_ravenholdtAI(Creature *c) : ScriptedAI(c) { Reset(); } npc_ravenholdtAI(Creature *c) : ScriptedAI(c) { Reset(); }
src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
+4 -4
View File
@@ -39,7 +39,7 @@ EndContentData */
#define SPELL_FREEZING_TRAP 37368 #define SPELL_FREEZING_TRAP 37368
#define SPELL_HAMMER_OF_JUSTICE 37369 #define SPELL_HAMMER_OF_JUSTICE 37369
struct MANGOS_DLL_DECL mob_stolen_soulAI : public ScriptedAI struct TRINITY_DLL_DECL mob_stolen_soulAI : public ScriptedAI
{ {
mob_stolen_soulAI(Creature *c) : ScriptedAI(c) {Reset();} mob_stolen_soulAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -151,7 +151,7 @@ CreatureAI* GetAI_mob_stolen_soul(Creature *_Creature)
#define ENTRY_STOLEN_SOUL 18441 #define ENTRY_STOLEN_SOUL 18441
struct MANGOS_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI struct TRINITY_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI
{ {
boss_exarch_maladaarAI(Creature *c) : ScriptedAI(c) {Reset();} boss_exarch_maladaarAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -232,7 +232,7 @@ struct MANGOS_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI
{ {
if( summoned->GetEntry() == ENTRY_STOLEN_SOUL ) if( summoned->GetEntry() == ENTRY_STOLEN_SOUL )
{ {
//SPELL_STOLEN_SOUL_VISUAL has shapeshift effect, but not implemented feature in mangos for this spell. //SPELL_STOLEN_SOUL_VISUAL has shapeshift effect, but not implemented feature in Trinity for this spell.
summoned->SetDisplayId(soulmodel); summoned->SetDisplayId(soulmodel);
summoned->CastSpell(summoned,SPELL_STOLEN_SOUL_VISUAL,false); summoned->CastSpell(summoned,SPELL_STOLEN_SOUL_VISUAL,false);
@@ -347,7 +347,7 @@ CreatureAI* GetAI_boss_exarch_maladaar(Creature *_Creature)
#define SPELL_MORTAL_STRIKE 16856 #define SPELL_MORTAL_STRIKE 16856
#define SPELL_SUNDER_ARMOR 16145 #define SPELL_SUNDER_ARMOR 16145
struct MANGOS_DLL_DECL mob_avatar_of_martyredAI : public ScriptedAI struct TRINITY_DLL_DECL mob_avatar_of_martyredAI : public ScriptedAI
{ {
mob_avatar_of_martyredAI(Creature *c) : ScriptedAI(c) {Reset();} mob_avatar_of_martyredAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
+2 -2
View File
@@ -59,7 +59,7 @@ EndContentData */
#define ENTRY_BEACON 18431 #define ENTRY_BEACON 18431
struct MANGOS_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI
{ {
boss_nexusprince_shaffarAI(Creature *c) : ScriptedAI(c) {Reset();} boss_nexusprince_shaffarAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -231,7 +231,7 @@ CreatureAI* GetAI_boss_nexusprince_shaffar(Creature *_Creature)
#define SPELL_ARCANE_BOLT 15254 #define SPELL_ARCANE_BOLT 15254
#define SPELL_ETHEREAL_APPRENTICE 32372 // Summon 18430 #define SPELL_ETHEREAL_APPRENTICE 32372 // Summon 18430
struct MANGOS_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI
{ {
mob_ethereal_beaconAI(Creature *c) : ScriptedAI(c) mob_ethereal_beaconAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ EndScriptData */
#define SPELL_DARK_SHELL 32358 #define SPELL_DARK_SHELL 32358
#define H_SPELL_DARK_SHELL 38759 #define H_SPELL_DARK_SHELL 38759
struct MANGOS_DLL_DECL boss_pandemoniusAI : public ScriptedAI struct TRINITY_DLL_DECL boss_pandemoniusAI : public ScriptedAI
{ {
boss_pandemoniusAI(Creature *c) : ScriptedAI(c) boss_pandemoniusAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp
+5 -5
View File
@@ -62,7 +62,7 @@ EndScriptData */
#define SPELL_SHADOW_BUFFET 33529 #define SPELL_SHADOW_BUFFET 33529
#define H_SPELL_SHADOW_BUFFET 38143 #define H_SPELL_SHADOW_BUFFET 38143
struct MANGOS_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI
{ {
boss_darkweaver_sythAI(Creature *c) : ScriptedAI(c) {Reset();} boss_darkweaver_sythAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -227,7 +227,7 @@ CreatureAI* GetAI_boss_darkweaver_syth(Creature *_Creature)
/* ELEMENTALS */ /* ELEMENTALS */
struct MANGOS_DLL_DECL mob_syth_fireAI : public ScriptedAI struct TRINITY_DLL_DECL mob_syth_fireAI : public ScriptedAI
{ {
mob_syth_fireAI(Creature *c) : ScriptedAI(c) {Reset();} mob_syth_fireAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -273,7 +273,7 @@ CreatureAI* GetAI_mob_syth_fire(Creature *_Creature)
return new mob_syth_fireAI (_Creature); return new mob_syth_fireAI (_Creature);
} }
struct MANGOS_DLL_DECL mob_syth_arcaneAI : public ScriptedAI struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI
{ {
mob_syth_arcaneAI(Creature *c) : ScriptedAI(c) {Reset();} mob_syth_arcaneAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -319,7 +319,7 @@ CreatureAI* GetAI_mob_syth_arcane(Creature *_Creature)
return new mob_syth_arcaneAI (_Creature); return new mob_syth_arcaneAI (_Creature);
} }
struct MANGOS_DLL_DECL mob_syth_frostAI : public ScriptedAI struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI
{ {
mob_syth_frostAI(Creature *c) : ScriptedAI(c) {Reset();} mob_syth_frostAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -365,7 +365,7 @@ CreatureAI* GetAI_mob_syth_frost(Creature *_Creature)
return new mob_syth_frostAI (_Creature); return new mob_syth_frostAI (_Creature);
} }
struct MANGOS_DLL_DECL mob_syth_shadowAI : public ScriptedAI struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI
{ {
mob_syth_shadowAI(Creature *c) : ScriptedAI(c) {Reset();} mob_syth_shadowAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ EndScriptData */
#define SPELL_ARCANE_EXPLOSION 38197 #define SPELL_ARCANE_EXPLOSION 38197
#define H_SPELL_ARCANE_EXPLOSION 40425 #define H_SPELL_ARCANE_EXPLOSION 40425
struct MANGOS_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI
{ {
boss_talon_king_ikissAI(Creature *c) : ScriptedAI(c) boss_talon_king_ikissAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ EndScriptData */
#define IKISS_DOOR 177203 #define IKISS_DOOR 177203
struct MANGOS_DLL_DECL instance_sethekk_halls : public ScriptedInstance struct TRINITY_DLL_DECL instance_sethekk_halls : public ScriptedInstance
{ {
instance_sethekk_halls(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_sethekk_halls(Map *Map) : ScriptedInstance(Map) {Initialize();};
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ EndScriptData */
#define SPELL_FEAR 33547 #define SPELL_FEAR 33547
#define SPELL_ENRAGE 0 //need to find proper spell #define SPELL_ENRAGE 0 //need to find proper spell
struct MANGOS_DLL_DECL boss_ambassador_hellmawAI : public ScriptedAI struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public ScriptedAI
{ {
boss_ambassador_hellmawAI(Creature *c) : ScriptedAI(c) boss_ambassador_hellmawAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ EndScriptData */
#define SOUND_SLAY3 10499 #define SOUND_SLAY3 10499
#define SOUND_DEATH 10491 #define SOUND_DEATH 10491
struct MANGOS_DLL_DECL boss_blackheart_the_inciterAI : public ScriptedAI struct TRINITY_DLL_DECL boss_blackheart_the_inciterAI : public ScriptedAI
{ {
boss_blackheart_the_inciterAI(Creature *c) : ScriptedAI(c) boss_blackheart_the_inciterAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ EndScriptData */
#define LOCY -264.02f #define LOCY -264.02f
#define LOCZ 17.08 #define LOCZ 17.08
struct MANGOS_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
{ {
boss_grandmaster_vorpilAI(Creature *c) : ScriptedAI(c) boss_grandmaster_vorpilAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ EndScriptData */
#define SPELL_RESONANCE 33657 #define SPELL_RESONANCE 33657
#define SPELL_SHOCKWAVE 33686 #define SPELL_SHOCKWAVE 33686
struct MANGOS_DLL_DECL boss_murmurAI : public ScriptedAI struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI
{ {
boss_murmurAI(Creature *c) : ScriptedAI(c) {Reset();} boss_murmurAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ EndScriptData */
4 - Murmur event 4 - Murmur event
*/ */
struct MANGOS_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
{ {
instance_shadow_labyrinth(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_shadow_labyrinth(Map *Map) : ScriptedInstance(Map) {Initialize();};
src/bindings/scripts/scripts/zone/azshara/azshara.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ EndContentData */
## mobs_spitelashes ## mobs_spitelashes
######*/ ######*/
struct MANGOS_DLL_DECL mobs_spitelashesAI : public ScriptedAI struct TRINITY_DLL_DECL mobs_spitelashesAI : public ScriptedAI
{ {
mobs_spitelashesAI(Creature *c) : ScriptedAI(c) {Reset();} mobs_spitelashesAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ EndScriptData */
#define SPELL_CLEAVE 8255 //Perhaps not right ID #define SPELL_CLEAVE 8255 //Perhaps not right ID
#define SPELL_ENRAGE 23537 #define SPELL_ENRAGE 23537
struct MANGOS_DLL_DECL boss_azuregosAI : public ScriptedAI struct TRINITY_DLL_DECL boss_azuregosAI : public ScriptedAI
{ {
boss_azuregosAI(Creature *c) : ScriptedAI(c) {Reset();} boss_azuregosAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp
+4 -4
View File
@@ -45,7 +45,7 @@ EndContentData */
#define HELP3 "Ughhh... I hurt. Can you help me?" #define HELP3 "Ughhh... I hurt. Can you help me?"
#define HELP4 "I don't know if I can make it, please help me..." #define HELP4 "I don't know if I can make it, please help me..."
struct MANGOS_DLL_DECL npc_draenei_survivorAI : public ScriptedAI struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI
{ {
npc_draenei_survivorAI(Creature *c) : ScriptedAI(c) {Reset();} npc_draenei_survivorAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -201,7 +201,7 @@ CreatureAI* GetAI_npc_draenei_survivor(Creature *_Creature)
#define ATTACK_YELL "Now I cut you!" #define ATTACK_YELL "Now I cut you!"
#define SPELL_DYNAMITE 7978 #define SPELL_DYNAMITE 7978
struct MANGOS_DLL_DECL npc_engineer_spark_overgrindAI : public ScriptedAI struct TRINITY_DLL_DECL npc_engineer_spark_overgrindAI : public ScriptedAI
{ {
npc_engineer_spark_overgrindAI(Creature *c) : ScriptedAI(c) {Reset();} npc_engineer_spark_overgrindAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -272,7 +272,7 @@ bool GossipSelect_npc_engineer_spark_overgrind(Player *player, Creature *_Creatu
## npc_injured_draenei ## npc_injured_draenei
######*/ ######*/
struct MANGOS_DLL_DECL npc_injured_draeneiAI : public ScriptedAI struct TRINITY_DLL_DECL npc_injured_draeneiAI : public ScriptedAI
{ {
npc_injured_draeneiAI(Creature *c) : ScriptedAI(c) {Reset();} npc_injured_draeneiAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -334,7 +334,7 @@ bool GossipSelect_npc_susurrus(Player *player, Creature *_Creature, uint32 sende
nodes.resize(2); nodes.resize(2);
nodes[0] = 92; //from susurrus nodes[0] = 92; //from susurrus
nodes[1] = 91; //end at exodar nodes[1] = 91; //end at exodar
player->ActivateTaxiPathTo(nodes,11686); //TaxiPath 506. Using invisible model, possible mangos must allow 0(from dbc) for cases like this. player->ActivateTaxiPathTo(nodes,11686); //TaxiPath 506. Using invisible model, possible Trinity must allow 0(from dbc) for cases like this.
} }
return true; return true;
} }
src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp
+3 -3
View File
@@ -24,7 +24,7 @@ EndScriptData */
/* ContentData /* ContentData
npc_beaten_corpse npc_beaten_corpse
npc_sputtervalve npc_sputtervalve
npc_taskmaster_fizzule remove hack when mangos implement feature/detect spell kind to not aggro npc_taskmaster_fizzule remove hack when Trinity implement feature/detect spell kind to not aggro
EndContentData */ EndContentData */
#include "precompiled.h" #include "precompiled.h"
@@ -89,7 +89,7 @@ bool GossipSelect_npc_sputtervalve(Player *player, Creature *_Creature, uint32 s
#define SPELL_FLARE 10113 #define SPELL_FLARE 10113
#define SPELL_FOLLY 10137 #define SPELL_FOLLY 10137
struct MANGOS_DLL_DECL npc_taskmaster_fizzuleAI : public ScriptedAI struct TRINITY_DLL_DECL npc_taskmaster_fizzuleAI : public ScriptedAI
{ {
npc_taskmaster_fizzuleAI(Creature* c) : ScriptedAI(c) { Reset(); } npc_taskmaster_fizzuleAI(Creature* c) : ScriptedAI(c) { Reset(); }
@@ -107,7 +107,7 @@ struct MANGOS_DLL_DECL npc_taskmaster_fizzuleAI : public ScriptedAI
} }
//This is a hack. Spellcast will make creature aggro but that is not //This is a hack. Spellcast will make creature aggro but that is not
//supposed to happen (mangos not implemented/not found way to detect this spell kind) //supposed to happen (Trinity not implemented/not found way to detect this spell kind)
void DoUglyHack() void DoUglyHack()
{ {
m_creature->RemoveAllAuras(); m_creature->RemoveAllAuras();
src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ struct TargetDistanceOrder : public std::binary_function<const Unit, const Unit,
} }
}; };
struct MANGOS_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
{ {
boss_gurtogg_bloodboilAI(Creature *c) : ScriptedAI(c) boss_gurtogg_bloodboilAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp
+18 -18
View File
@@ -281,7 +281,7 @@ static Animation DemonTransformation[]=
}; };
/**** Demon Fire will be used for Eye Blast. Illidan needs to have access to it's vars and functions, so we'll set it here ****/ /**** Demon Fire will be used for Eye Blast. Illidan needs to have access to it's vars and functions, so we'll set it here ****/
struct MANGOS_DLL_DECL demonfireAI : public ScriptedAI struct TRINITY_DLL_DECL demonfireAI : public ScriptedAI
{ {
demonfireAI(Creature *c) : ScriptedAI(c) demonfireAI(Creature *c) : ScriptedAI(c)
{ {
@@ -351,7 +351,7 @@ struct MANGOS_DLL_DECL demonfireAI : public ScriptedAI
}; };
/******* Functions and vars for Akama's AI ******/ /******* Functions and vars for Akama's AI ******/
struct MANGOS_DLL_SPEC npc_akama_illidanAI : public ScriptedAI struct TRINITY_DLL_SPEC npc_akama_illidanAI : public ScriptedAI
{ {
npc_akama_illidanAI(Creature* c) : ScriptedAI(c) npc_akama_illidanAI(Creature* c) : ScriptedAI(c)
{ {
@@ -825,7 +825,7 @@ class AgonizingFlamesTargetCheck
}; };
/************************************** Illidan's AI ***************************************/ /************************************** Illidan's AI ***************************************/
struct MANGOS_DLL_SPEC boss_illidan_stormrageAI : public ScriptedAI struct TRINITY_DLL_SPEC boss_illidan_stormrageAI : public ScriptedAI
{ {
boss_illidan_stormrageAI(Creature* c) : ScriptedAI(c) boss_illidan_stormrageAI(Creature* c) : ScriptedAI(c)
{ {
@@ -1117,15 +1117,15 @@ struct MANGOS_DLL_SPEC boss_illidan_stormrageAI : public ScriptedAI
// We'll use grid searching for this, using a custom searcher that selects a player that is at a distance >15 yards // We'll use grid searching for this, using a custom searcher that selects a player that is at a distance >15 yards
Player* target = NULL; Player* target = NULL;
CellPair pair(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); CellPair pair(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY()));
Cell cell(pair); Cell cell(pair);
cell.data.Part.reserved = ALL_DISTRICT; cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate(); cell.SetNoCreate();
AgonizingFlamesTargetCheck check(m_creature); AgonizingFlamesTargetCheck check(m_creature);
MaNGOS::PlayerSearcher<AgonizingFlamesTargetCheck> searcher(target, check); Trinity::PlayerSearcher<AgonizingFlamesTargetCheck> searcher(target, check);
TypeContainerVisitor TypeContainerVisitor
<MaNGOS::PlayerSearcher<AgonizingFlamesTargetCheck>, GridTypeMapContainer> visitor(searcher); <Trinity::PlayerSearcher<AgonizingFlamesTargetCheck>, GridTypeMapContainer> visitor(searcher);
CellLock<GridReadGuard> cell_lock(cell, pair); CellLock<GridReadGuard> cell_lock(cell, pair);
cell_lock->Visit(cell_lock, visitor, *(m_creature->GetMap())); cell_lock->Visit(cell_lock, visitor, *(m_creature->GetMap()));
@@ -1941,7 +1941,7 @@ bool GossipHello_npc_akama_at_illidan(Player *player, Creature *_Creature)
return true; return true;
} }
struct MANGOS_DLL_SPEC boss_maievAI : public ScriptedAI struct TRINITY_DLL_SPEC boss_maievAI : public ScriptedAI
{ {
boss_maievAI(Creature *c) : ScriptedAI(c) boss_maievAI(Creature *c) : ScriptedAI(c)
{ {
@@ -1999,7 +1999,7 @@ struct MANGOS_DLL_SPEC boss_maievAI : public ScriptedAI
} }
}; };
struct MANGOS_DLL_DECL cage_trap_triggerAI : public ScriptedAI struct TRINITY_DLL_DECL cage_trap_triggerAI : public ScriptedAI
{ {
cage_trap_triggerAI(Creature *c) : ScriptedAI(c) {Reset();} cage_trap_triggerAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -2075,16 +2075,16 @@ bool GOHello_cage_trap(Player* plr, GameObject* go)
Creature* trigger = NULL; Creature* trigger = NULL;
CellPair pair(MaNGOS::ComputeCellPair(x, y)); CellPair pair(Trinity::ComputeCellPair(x, y));
Cell cell(pair); Cell cell(pair);
cell.data.Part.reserved = ALL_DISTRICT; cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate(); cell.SetNoCreate();
// Grid search for nearest live creature of entry 23304 within 10 yards // Grid search for nearest live creature of entry 23304 within 10 yards
MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck check(*plr, 23304, true, 10); Trinity::NearestCreatureEntryWithLiveStateInObjectRangeCheck check(*plr, 23304, true, 10);
MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(trigger, check); Trinity::CreatureLastSearcher<Trinity::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(trigger, check);
TypeContainerVisitor<MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck>, GridTypeMapContainer> cSearcher(searcher); TypeContainerVisitor<Trinity::CreatureLastSearcher<Trinity::NearestCreatureEntryWithLiveStateInObjectRangeCheck>, GridTypeMapContainer> cSearcher(searcher);
CellLock<GridReadGuard> cell_lock(cell, pair); CellLock<GridReadGuard> cell_lock(cell, pair);
cell_lock->Visit(cell_lock, cSearcher, *(plr->GetMap())); cell_lock->Visit(cell_lock, cSearcher, *(plr->GetMap()));
@@ -2113,7 +2113,7 @@ struct TargetDistanceOrder : public std::binary_function<const Unit, const Unit,
} }
}; };
struct MANGOS_DLL_DECL flame_of_azzinothAI : public ScriptedAI struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI
{ {
flame_of_azzinothAI(Creature *c) : ScriptedAI(c) {Reset();} flame_of_azzinothAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -2188,7 +2188,7 @@ struct MANGOS_DLL_DECL flame_of_azzinothAI : public ScriptedAI
} }
}; };
struct MANGOS_DLL_DECL shadow_demonAI : public ScriptedAI struct TRINITY_DLL_DECL shadow_demonAI : public ScriptedAI
{ {
shadow_demonAI(Creature *c) : ScriptedAI(c) {Reset();} shadow_demonAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -2229,7 +2229,7 @@ struct MANGOS_DLL_DECL shadow_demonAI : public ScriptedAI
} }
}; };
struct MANGOS_DLL_DECL flamecrashAI : public ScriptedAI struct TRINITY_DLL_DECL flamecrashAI : public ScriptedAI
{ {
flamecrashAI(Creature *c) : ScriptedAI(c) {Reset();} flamecrashAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -2265,7 +2265,7 @@ struct MANGOS_DLL_DECL flamecrashAI : public ScriptedAI
}; };
// Shadowfiends interact with Illidan, setting more targets in Illidan's hashmap // Shadowfiends interact with Illidan, setting more targets in Illidan's hashmap
struct MANGOS_DLL_SPEC mob_parasitic_shadowfiendAI : public ScriptedAI struct TRINITY_DLL_SPEC mob_parasitic_shadowfiendAI : public ScriptedAI
{ {
mob_parasitic_shadowfiendAI(Creature* c) : ScriptedAI(c) mob_parasitic_shadowfiendAI(Creature* c) : ScriptedAI(c)
{ {
@@ -2293,7 +2293,7 @@ struct MANGOS_DLL_SPEC mob_parasitic_shadowfiendAI : public ScriptedAI
} }
}; };
struct MANGOS_DLL_DECL blazeAI : public ScriptedAI struct TRINITY_DLL_DECL blazeAI : public ScriptedAI
{ {
blazeAI(Creature *c) : ScriptedAI(c) {Reset();} blazeAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -2328,7 +2328,7 @@ struct MANGOS_DLL_DECL blazeAI : public ScriptedAI
} }
}; };
struct MANGOS_DLL_DECL blade_of_azzinothAI : public ScriptedAI struct TRINITY_DLL_DECL blade_of_azzinothAI : public ScriptedAI
{ {
blade_of_azzinothAI(Creature* c) : ScriptedAI(c) { Reset(); } blade_of_azzinothAI(Creature* c) : ScriptedAI(c) { Reset(); }
src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ static Locations TeleportPoint[]=
{965.997, 278.398, 195.777} {965.997, 278.398, 195.777}
}; };
struct MANGOS_DLL_DECL boss_shahrazAI : public ScriptedAI struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
{ {
boss_shahrazAI(Creature *c) : ScriptedAI(c) boss_shahrazAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp
+5 -5
View File
@@ -113,7 +113,7 @@ static Position Coords[]=
{450.4, 168.3} {450.4, 168.3}
}; };
struct MANGOS_DLL_DECL npc_enslaved_soulAI : public ScriptedAI struct TRINITY_DLL_DECL npc_enslaved_soulAI : public ScriptedAI
{ {
npc_enslaved_soulAI(Creature *c) : ScriptedAI(c) {Reset();} npc_enslaved_soulAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -149,7 +149,7 @@ struct MANGOS_DLL_DECL npc_enslaved_soulAI : public ScriptedAI
void JustDied(Unit *killer); void JustDied(Unit *killer);
}; };
struct MANGOS_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI
{ {
boss_reliquary_of_soulsAI(Creature *c) : ScriptedAI(c) boss_reliquary_of_soulsAI(Creature *c) : ScriptedAI(c)
{ {
@@ -583,7 +583,7 @@ struct TargetDistanceOrder : public std::binary_function<const Unit, const Unit,
} }
}; };
struct MANGOS_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI
{ {
boss_essence_of_sufferingAI(Creature *c) : ScriptedAI(c) {Reset();} boss_essence_of_sufferingAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -733,7 +733,7 @@ struct MANGOS_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
}; };
struct MANGOS_DLL_DECL boss_essence_of_desireAI : public ScriptedAI struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI
{ {
boss_essence_of_desireAI(Creature *c) : ScriptedAI(c) {Reset();} boss_essence_of_desireAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -851,7 +851,7 @@ struct MANGOS_DLL_DECL boss_essence_of_desireAI : public ScriptedAI
} }
}; };
struct MANGOS_DLL_DECL boss_essence_of_angerAI : public ScriptedAI struct TRINITY_DLL_DECL boss_essence_of_angerAI : public ScriptedAI
{ {
boss_essence_of_angerAI(Creature *c) : ScriptedAI(c) {Reset();} boss_essence_of_angerAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp
+8 -8
View File
@@ -110,7 +110,7 @@ static Location BrokenWP[]=
const uint32 spawnEntries[4]= { 23523, 23318, 23524 }; const uint32 spawnEntries[4]= { 23523, 23318, 23524 };
struct MANGOS_DLL_DECL mob_ashtongue_channelerAI : public ScriptedAI struct TRINITY_DLL_DECL mob_ashtongue_channelerAI : public ScriptedAI
{ {
mob_ashtongue_channelerAI(Creature* c) : ScriptedAI(c) { Reset(); } mob_ashtongue_channelerAI(Creature* c) : ScriptedAI(c) { Reset(); }
@@ -124,7 +124,7 @@ struct MANGOS_DLL_DECL mob_ashtongue_channelerAI : public ScriptedAI
void UpdateAI(const uint32 diff) {} void UpdateAI(const uint32 diff) {}
}; };
struct MANGOS_DLL_DECL mob_ashtongue_sorcererAI : public ScriptedAI struct TRINITY_DLL_DECL mob_ashtongue_sorcererAI : public ScriptedAI
{ {
mob_ashtongue_sorcererAI(Creature* c) : ScriptedAI(c) { Reset(); } mob_ashtongue_sorcererAI(Creature* c) : ScriptedAI(c) { Reset(); }
@@ -168,7 +168,7 @@ struct MANGOS_DLL_DECL mob_ashtongue_sorcererAI : public ScriptedAI
} }
}; };
struct MANGOS_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
{ {
boss_shade_of_akamaAI(Creature* c) : ScriptedAI(c) boss_shade_of_akamaAI(Creature* c) : ScriptedAI(c)
{ {
@@ -319,16 +319,16 @@ struct MANGOS_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
void FindChannelers() void FindChannelers()
{ {
CellPair pair(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); CellPair pair(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY()));
Cell cell(pair); Cell cell(pair);
cell.data.Part.reserved = ALL_DISTRICT; cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate(); cell.SetNoCreate();
std::list<Creature*> ChannelerList; std::list<Creature*> ChannelerList;
MaNGOS::AllCreaturesOfEntryInRange check(m_creature, CREATURE_CHANNELER, 50); Trinity::AllCreaturesOfEntryInRange check(m_creature, CREATURE_CHANNELER, 50);
MaNGOS::CreatureListSearcher<MaNGOS::AllCreaturesOfEntryInRange> searcher(ChannelerList, check); Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(ChannelerList, check);
TypeContainerVisitor<MaNGOS::CreatureListSearcher<MaNGOS::AllCreaturesOfEntryInRange>, GridTypeMapContainer> visitor(searcher); TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange>, GridTypeMapContainer> visitor(searcher);
CellLock<GridReadGuard> cell_lock(cell, pair); CellLock<GridReadGuard> cell_lock(cell, pair);
cell_lock->Visit(cell_lock, visitor, *(m_creature->GetMap())); cell_lock->Visit(cell_lock, visitor, *(m_creature->GetMap()));
@@ -480,7 +480,7 @@ void mob_ashtongue_sorcererAI::JustDied(Unit* killer)
else error_log("SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama."); else error_log("SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama.");
} }
struct MANGOS_DLL_DECL npc_akamaAI : public ScriptedAI struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
{ {
npc_akamaAI(Creature* c) : ScriptedAI(c) npc_akamaAI(Creature* c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp
+3 -3
View File
@@ -37,7 +37,7 @@ EndScriptData */
#define CREATURE_VOLCANO 23085 #define CREATURE_VOLCANO 23085
#define CREATURE_STALKER 23095 #define CREATURE_STALKER 23095
struct MANGOS_DLL_DECL molten_flameAI : public ScriptedAI struct TRINITY_DLL_DECL molten_flameAI : public ScriptedAI
{ {
molten_flameAI(Creature *c) : ScriptedAI(c) molten_flameAI(Creature *c) : ScriptedAI(c)
{ {
@@ -101,7 +101,7 @@ struct MANGOS_DLL_DECL molten_flameAI : public ScriptedAI
} }
}; };
struct MANGOS_DLL_DECL npc_volcanoAI : public ScriptedAI struct TRINITY_DLL_DECL npc_volcanoAI : public ScriptedAI
{ {
npc_volcanoAI(Creature *c) : ScriptedAI(c) {Reset();} npc_volcanoAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -145,7 +145,7 @@ struct MANGOS_DLL_DECL npc_volcanoAI : public ScriptedAI
} }
}; };
struct MANGOS_DLL_DECL boss_supremusAI : public ScriptedAI struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
{ {
boss_supremusAI(Creature *c) : ScriptedAI(c) boss_supremusAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp
+4 -4
View File
@@ -68,7 +68,7 @@ EndScriptData */
#define CREATURE_DOOM_BLOSSOM 23123 #define CREATURE_DOOM_BLOSSOM 23123
#define CREATURE_SHADOWY_CONSTRUCT 23111 #define CREATURE_SHADOWY_CONSTRUCT 23111
struct MANGOS_DLL_DECL mob_doom_blossomAI : public ScriptedAI struct TRINITY_DLL_DECL mob_doom_blossomAI : public ScriptedAI
{ {
mob_doom_blossomAI(Creature *c) : ScriptedAI(c) mob_doom_blossomAI(Creature *c) : ScriptedAI(c)
{ {
@@ -133,7 +133,7 @@ struct TargetDistanceOrder : public std::binary_function<const Unit, const Unit,
} }
}; };
struct MANGOS_DLL_DECL mob_shadowy_constructAI : public ScriptedAI struct TRINITY_DLL_DECL mob_shadowy_constructAI : public ScriptedAI
{ {
mob_shadowy_constructAI(Creature* c) : ScriptedAI(c) mob_shadowy_constructAI(Creature* c) : ScriptedAI(c)
{ {
@@ -225,7 +225,7 @@ struct MANGOS_DLL_DECL mob_shadowy_constructAI : public ScriptedAI
} }
}; };
struct MANGOS_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
{ {
boss_teron_gorefiendAI(Creature *c) : ScriptedAI(c) boss_teron_gorefiendAI(Creature *c) : ScriptedAI(c)
{ {
@@ -364,7 +364,7 @@ struct MANGOS_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
{ {
/************************************************************************/ /************************************************************************/
/** NOTE FOR FUTURE DEVELOPER: PROPERLY IMPLEMENT THE GHOST PORTION *****/ /** NOTE FOR FUTURE DEVELOPER: PROPERLY IMPLEMENT THE GHOST PORTION *****/
/** ONLY AFTER MaNGOS FULLY IMPLEMENTS MIND CONTROL ABILITIES *****/ /** ONLY AFTER TrinIty FULLY IMPLEMENTS MIND CONTROL ABILITIES *****/
/** THE CURRENT CODE IN THIS FUNCTION IS ONLY THE BEGINNING OF *****/ /** THE CURRENT CODE IN THIS FUNCTION IS ONLY THE BEGINNING OF *****/
/** WHAT IS FULLY NECESSARY FOR GOREFIEND TO BE 100% COMPLETE *****/ /** WHAT IS FULLY NECESSARY FOR GOREFIEND TO BE 100% COMPLETE *****/
/************************************************************************/ /************************************************************************/
src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp
+2 -2
View File
@@ -71,7 +71,7 @@ EndScriptData */
#define DISPLAYID_SPINE 7362 #define DISPLAYID_SPINE 7362
struct MANGOS_DLL_DECL mob_najentus_spineAI : public ScriptedAI struct TRINITY_DLL_DECL mob_najentus_spineAI : public ScriptedAI
{ {
mob_najentus_spineAI(Creature *c) : ScriptedAI(c) mob_najentus_spineAI(Creature *c) : ScriptedAI(c)
{ {
@@ -110,7 +110,7 @@ struct MANGOS_DLL_DECL mob_najentus_spineAI : public ScriptedAI
void UpdateAI(const uint32 diff) {} void UpdateAI(const uint32 diff) {}
}; };
struct MANGOS_DLL_DECL boss_najentusAI : public ScriptedAI struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI
{ {
boss_najentusAI(Creature *c) : ScriptedAI(c) boss_najentusAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp
+7 -7
View File
@@ -133,7 +133,7 @@ static CouncilYells CouncilEnrage[]=
{"Sha'amoor sine menoor!", 11446, 0}, // Zerevor {"Sha'amoor sine menoor!", 11446, 0}, // Zerevor
}; };
struct MANGOS_DLL_DECL mob_blood_elf_council_voice_triggerAI : public ScriptedAI struct TRINITY_DLL_DECL mob_blood_elf_council_voice_triggerAI : public ScriptedAI
{ {
mob_blood_elf_council_voice_triggerAI(Creature* c) : ScriptedAI(c) mob_blood_elf_council_voice_triggerAI(Creature* c) : ScriptedAI(c)
{ {
@@ -216,7 +216,7 @@ struct MANGOS_DLL_DECL mob_blood_elf_council_voice_triggerAI : public ScriptedAI
} }
}; };
struct MANGOS_DLL_DECL mob_illidari_councilAI : public ScriptedAI struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
{ {
mob_illidari_councilAI(Creature *c) : ScriptedAI(c) mob_illidari_councilAI(Creature *c) : ScriptedAI(c)
{ {
@@ -370,7 +370,7 @@ struct MANGOS_DLL_DECL mob_illidari_councilAI : public ScriptedAI
} }
}; };
struct MANGOS_DLL_DECL boss_illidari_councilAI : public ScriptedAI struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI
{ {
boss_illidari_councilAI(Creature* c) : ScriptedAI(c) boss_illidari_councilAI(Creature* c) : ScriptedAI(c)
{ {
@@ -439,7 +439,7 @@ struct MANGOS_DLL_DECL boss_illidari_councilAI : public ScriptedAI
} }
}; };
struct MANGOS_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_councilAI struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_councilAI
{ {
boss_gathios_the_shattererAI(Creature *c) : boss_illidari_councilAI(c) { Reset(); } boss_gathios_the_shattererAI(Creature *c) : boss_illidari_councilAI(c) { Reset(); }
@@ -556,7 +556,7 @@ struct MANGOS_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_counc
} }
}; };
struct MANGOS_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_councilAI struct TRINITY_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_councilAI
{ {
boss_high_nethermancer_zerevorAI(Creature *c) : boss_illidari_councilAI(c) { Reset(); } boss_high_nethermancer_zerevorAI(Creature *c) : boss_illidari_councilAI(c) { Reset(); }
@@ -650,7 +650,7 @@ struct MANGOS_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_c
} }
}; };
struct MANGOS_DLL_DECL boss_lady_malandeAI : public boss_illidari_councilAI struct TRINITY_DLL_DECL boss_lady_malandeAI : public boss_illidari_councilAI
{ {
boss_lady_malandeAI(Creature *c) : boss_illidari_councilAI(c) { Reset(); } boss_lady_malandeAI(Creature *c) : boss_illidari_councilAI(c) { Reset(); }
@@ -719,7 +719,7 @@ struct MANGOS_DLL_DECL boss_lady_malandeAI : public boss_illidari_councilAI
} }
}; };
struct MANGOS_DLL_DECL boss_veras_darkshadowAI : public boss_illidari_councilAI struct TRINITY_DLL_DECL boss_veras_darkshadowAI : public boss_illidari_councilAI
{ {
boss_veras_darkshadowAI(Creature *c) : boss_illidari_councilAI(c) { Reset(); } boss_veras_darkshadowAI(Creature *c) : boss_illidari_councilAI(c) { Reset(); }
src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ EndScriptData */
8 - Illidan Stormrage Event 8 - Illidan Stormrage Event
*/ */
struct MANGOS_DLL_DECL instance_black_temple : public ScriptedInstance struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance
{ {
instance_black_temple(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_black_temple(Map *Map) : ScriptedInstance(Map) {Initialize();};
src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ EndContentData */
#define SPELL_FIREBALLVOLLEY 22425 #define SPELL_FIREBALLVOLLEY 22425
#define SPELL_MIGHTYBLOW 14099 #define SPELL_MIGHTYBLOW 14099
struct MANGOS_DLL_DECL mob_phalanxAI : public ScriptedAI struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI
{ {
mob_phalanxAI(Creature *c) : ScriptedAI(c) {Reset();} mob_phalanxAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ EndScriptData */
#define SPELL_FIREBLAST 15573 #define SPELL_FIREBLAST 15573
struct MANGOS_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI
{ {
boss_ambassador_flamelashAI(Creature *c) : ScriptedAI(c) {Reset();} boss_ambassador_flamelashAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_angerrel.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ EndScriptData */
#define SPELL_SHIELDBLOCK 12169 #define SPELL_SHIELDBLOCK 12169
#define SPELL_STRIKE 15580 #define SPELL_STRIKE 15580
struct MANGOS_DLL_DECL boss_angerrelAI : public ScriptedAI struct TRINITY_DLL_DECL boss_angerrelAI : public ScriptedAI
{ {
boss_angerrelAI(Creature *c) : ScriptedAI(c) {Reset();} boss_angerrelAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ EndScriptData */
#define SPELL_DEMONARMOR 11735 #define SPELL_DEMONARMOR 11735
#define SPELL_ENVELOPINGWEB 15471 #define SPELL_ENVELOPINGWEB 15471
struct MANGOS_DLL_DECL boss_anubshiahAI : public ScriptedAI struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI
{ {
boss_anubshiahAI(Creature *c) : ScriptedAI(c) {Reset();} boss_anubshiahAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_doomrel.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ EndScriptData */
#define SPELL_CURSEOFWEAKNESS 17227 #define SPELL_CURSEOFWEAKNESS 17227
#define SPELL_DEMONARMOR 11735 #define SPELL_DEMONARMOR 11735
struct MANGOS_DLL_DECL boss_doomrelAI : public ScriptedAI struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI
{ {
boss_doomrelAI(Creature *c) : ScriptedAI(c) {Reset();} boss_doomrelAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_doperel.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ EndScriptData */
#define SPELL_BACKSTAB 15582 #define SPELL_BACKSTAB 15582
#define SPELL_GOUGE 13579 #define SPELL_GOUGE 13579
struct MANGOS_DLL_DECL boss_doperelAI : public ScriptedAI struct TRINITY_DLL_DECL boss_doperelAI : public ScriptedAI
{ {
boss_doperelAI(Creature *c) : ScriptedAI(c) {Reset();} boss_doperelAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ EndScriptData */
#define SAY_AGGRO "Come to aid the Throne!" #define SAY_AGGRO "Come to aid the Throne!"
#define SAY_SLAY "Hail to the king, baby!" #define SAY_SLAY "Hail to the king, baby!"
struct MANGOS_DLL_DECL boss_draganthaurissanAI : public ScriptedAI struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI
{ {
boss_draganthaurissanAI(Creature *c) : ScriptedAI(c) {Reset();} boss_draganthaurissanAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ EndScriptData */
#define SPELL_HAMSTRING 9080 #define SPELL_HAMSTRING 9080
#define SPELL_CLEAVE 20691 #define SPELL_CLEAVE 20691
struct MANGOS_DLL_DECL boss_general_angerforgeAI : public ScriptedAI struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI
{ {
boss_general_angerforgeAI(Creature *c) : ScriptedAI(c) {Reset();} boss_general_angerforgeAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_gloomrel.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ EndScriptData */
#define SPELL_CLEAVE 15579 #define SPELL_CLEAVE 15579
#define SPELL_MORTALSTRIKE 15708 #define SPELL_MORTALSTRIKE 15708
struct MANGOS_DLL_DECL boss_gloomrelAI : public ScriptedAI struct TRINITY_DLL_DECL boss_gloomrelAI : public ScriptedAI
{ {
boss_gloomrelAI(Creature *c) : ScriptedAI(c) {Reset();} boss_gloomrelAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ EndScriptData */
#define SPELL_WHIRLWIND 15589 #define SPELL_WHIRLWIND 15589
#define SPELL_MORTALSTRIKE 24573 #define SPELL_MORTALSTRIKE 24573
struct MANGOS_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI struct TRINITY_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI
{ {
boss_gorosh_the_dervishAI(Creature *c) : ScriptedAI(c) {Reset();} boss_gorosh_the_dervishAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ EndScriptData */
#define SPELL_GROUNDTREMOR 6524 #define SPELL_GROUNDTREMOR 6524
#define SPELL_FRENZY 28371 #define SPELL_FRENZY 28371
struct MANGOS_DLL_DECL boss_grizzleAI : public ScriptedAI struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI
{ {
boss_grizzleAI(Creature *c) : ScriptedAI(c) {Reset();} boss_grizzleAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_haterel.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ EndScriptData */
#define SPELL_SHADOWSHIELD 22417 #define SPELL_SHADOWSHIELD 22417
#define SPELL_STRIKE 15580 #define SPELL_STRIKE 15580
struct MANGOS_DLL_DECL boss_haterelAI : public ScriptedAI struct TRINITY_DLL_DECL boss_haterelAI : public ScriptedAI
{ {
boss_haterelAI(Creature *c) : ScriptedAI(c) {Reset();} boss_haterelAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ EndScriptData */
#define SPELL_PSYCHICSCREAM 8122 #define SPELL_PSYCHICSCREAM 8122
#define SPELL_SHADOWSHIELD 22417 #define SPELL_SHADOWSHIELD 22417
struct MANGOS_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI
{ {
boss_high_interrogator_gerstahnAI(Creature *c) : ScriptedAI(c) {Reset();} boss_high_interrogator_gerstahnAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ EndScriptData */
#define SPELL_FIERYBURST 13900 #define SPELL_FIERYBURST 13900
#define SPELL_WARSTOMP 24375 #define SPELL_WARSTOMP 24375
struct MANGOS_DLL_DECL boss_magmusAI : public ScriptedAI struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI
{ {
boss_magmusAI(Creature *c) : ScriptedAI(c) {Reset();} boss_magmusAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ EndScriptData */
#define SPELL_SHADOWWORDPAIN 10894 #define SPELL_SHADOWWORDPAIN 10894
#define SPELL_SMITE 10934 #define SPELL_SMITE 10934
struct MANGOS_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI struct TRINITY_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI
{ {
boss_moira_bronzebeardAI(Creature *c) : ScriptedAI(c) {Reset();} boss_moira_bronzebeardAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_seethrel.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ EndScriptData */
#define SPELL_FROSTNOVA 15063 #define SPELL_FROSTNOVA 15063
#define SPELL_FROSTWARD 15004 #define SPELL_FROSTWARD 15004
struct MANGOS_DLL_DECL boss_seethrelAI : public ScriptedAI struct TRINITY_DLL_DECL boss_seethrelAI : public ScriptedAI
{ {
boss_seethrelAI(Creature *c) : ScriptedAI(c) {Reset();} boss_seethrelAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_vilerel.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ EndScriptData */
#define SPELL_PRAYEROFHEALING 15585 #define SPELL_PRAYEROFHEALING 15585
#define SPELL_SHIELD 10901 #define SPELL_SHIELD 10901
struct MANGOS_DLL_DECL boss_vilerelAI : public ScriptedAI struct TRINITY_DLL_DECL boss_vilerelAI : public ScriptedAI
{ {
boss_vilerelAI(Creature *c) : ScriptedAI(c) {Reset();} boss_vilerelAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ EndScriptData */
#define SPELL_CONFLIGURATION 16805 #define SPELL_CONFLIGURATION 16805
#define SPELL_THUNDERCLAP 15548 //Not sure if right ID. 23931 would be a harder possibility. #define SPELL_THUNDERCLAP 15548 //Not sure if right ID. 23931 would be a harder possibility.
struct MANGOS_DLL_DECL boss_drakkisathAI : public ScriptedAI struct TRINITY_DLL_DECL boss_drakkisathAI : public ScriptedAI
{ {
boss_drakkisathAI(Creature *c) : ScriptedAI(c) {Reset();} boss_drakkisathAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ EndScriptData */
#define SPELL_FREEZE 18763 #define SPELL_FREEZE 18763
#define SPELL_FLAMEBREATH 20712 #define SPELL_FLAMEBREATH 20712
struct MANGOS_DLL_DECL boss_gythAI : public ScriptedAI struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI
{ {
boss_gythAI(Creature *c) : ScriptedAI(c) {Reset();} boss_gythAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ EndScriptData */
#define ADD_1Z 64.401443 #define ADD_1Z 64.401443
#define ADD_1O 3.124724 #define ADD_1O 3.124724
struct MANGOS_DLL_DECL boss_halyconAI : public ScriptedAI struct TRINITY_DLL_DECL boss_halyconAI : public ScriptedAI
{ {
boss_halyconAI(Creature *c) : ScriptedAI(c) {Reset();} boss_halyconAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ EndScriptData */
#define SPELL_KNOCKAWAY 20686 #define SPELL_KNOCKAWAY 20686
#define SPELL_SLOW 22356 #define SPELL_SLOW 22356
struct MANGOS_DLL_DECL boss_highlordomokkAI : public ScriptedAI struct TRINITY_DLL_DECL boss_highlordomokkAI : public ScriptedAI
{ {
boss_highlordomokkAI(Creature *c) : ScriptedAI(c) {Reset();} boss_highlordomokkAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ EndScriptData */
#define SPELL_MOTHERSMILK 16468 #define SPELL_MOTHERSMILK 16468
#define SPELL_SUMMON_SPIRE_SPIDERLING 16103 #define SPELL_SUMMON_SPIRE_SPIDERLING 16103
struct MANGOS_DLL_DECL boss_mothersmolderwebAI : public ScriptedAI struct TRINITY_DLL_DECL boss_mothersmolderwebAI : public ScriptedAI
{ {
boss_mothersmolderwebAI(Creature *c) : ScriptedAI(c) {Reset();} boss_mothersmolderwebAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ EndScriptData */
#define ADD_2Z 88.195160 #define ADD_2Z 88.195160
#define ADD_2O 4.613114 #define ADD_2O 4.613114
struct MANGOS_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI struct TRINITY_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI
{ {
boss_overlordwyrmthalakAI(Creature *c) : ScriptedAI(c) {Reset();} boss_overlordwyrmthalakAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ EndScriptData */
#define SPELL_FLAMEBUFFET 23341 #define SPELL_FLAMEBUFFET 23341
#define SPELL_PYROBLAST 17274 #define SPELL_PYROBLAST 17274
struct MANGOS_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI struct TRINITY_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI
{ {
boss_pyroguard_emberseerAI(Creature *c) : ScriptedAI(c) {Reset();} boss_pyroguard_emberseerAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ EndScriptData */
#define SPELL_HEALING_POTION 15504 #define SPELL_HEALING_POTION 15504
#define SPELL_HOOKEDNET 15609 #define SPELL_HOOKEDNET 15609
struct MANGOS_DLL_DECL boss_quatermasterzigrisAI : public ScriptedAI struct TRINITY_DLL_DECL boss_quatermasterzigrisAI : public ScriptedAI
{ {
boss_quatermasterzigrisAI(Creature *c) : ScriptedAI(c) {Reset();} boss_quatermasterzigrisAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ EndScriptData */
#define SPELL_CLEAVE 20691 #define SPELL_CLEAVE 20691
#define SPELL_THUNDERCLAP 23931 //Not sure if he cast this spell #define SPELL_THUNDERCLAP 23931 //Not sure if he cast this spell
struct MANGOS_DLL_DECL boss_rend_blackhandAI : public ScriptedAI struct TRINITY_DLL_DECL boss_rend_blackhandAI : public ScriptedAI
{ {
boss_rend_blackhandAI(Creature *c) : ScriptedAI(c) {Reset();} boss_rend_blackhandAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ EndScriptData */
#define SPELL_HEX 16708 #define SPELL_HEX 16708
#define SPELL_CLEAVE 20691 #define SPELL_CLEAVE 20691
struct MANGOS_DLL_DECL boss_shadowvoshAI : public ScriptedAI struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI
{ {
boss_shadowvoshAI(Creature *c) : ScriptedAI(c) {Reset();} boss_shadowvoshAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ EndScriptData */
#define SPELL_IMMOLATE 20294 #define SPELL_IMMOLATE 20294
#define SPELL_TERRIFYINGROAR 14100 #define SPELL_TERRIFYINGROAR 14100
struct MANGOS_DLL_DECL boss_thebeastAI : public ScriptedAI struct TRINITY_DLL_DECL boss_thebeastAI : public ScriptedAI
{ {
boss_thebeastAI(Creature *c) : ScriptedAI(c) {Reset();} boss_thebeastAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ EndScriptData */
#define SPELL_PUMMEL 15615 #define SPELL_PUMMEL 15615
#define SPELL_THROWAXE 16075 #define SPELL_THROWAXE 16075
struct MANGOS_DLL_DECL boss_warmastervooneAI : public ScriptedAI struct TRINITY_DLL_DECL boss_warmastervooneAI : public ScriptedAI
{ {
boss_warmastervooneAI(Creature *c) : ScriptedAI(c) {Reset();} boss_warmastervooneAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ EndScriptData */
#define SOUND_AGGRO 8286 #define SOUND_AGGRO 8286
#define SOUND_LEASH 8287 #define SOUND_LEASH 8287
struct MANGOS_DLL_DECL boss_broodlordAI : public ScriptedAI struct TRINITY_DLL_DECL boss_broodlordAI : public ScriptedAI
{ {
boss_broodlordAI(Creature *c) : ScriptedAI(c) {Reset();} boss_broodlordAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ EndScriptData */
#define TEMP_MUTATE_WHISPER "[SD2 Debug] You would be mind controlled here!" #define TEMP_MUTATE_WHISPER "[SD2 Debug] You would be mind controlled here!"
struct MANGOS_DLL_DECL boss_chromaggusAI : public ScriptedAI struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI
{ {
boss_chromaggusAI(Creature *c) : ScriptedAI(c) boss_chromaggusAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ EndScriptData */
#define SPELL_SHADOWOFEBONROC 23340 #define SPELL_SHADOWOFEBONROC 23340
#define SPELL_HEAL 41386 //Thea Heal spell of his Shadow #define SPELL_HEAL 41386 //Thea Heal spell of his Shadow
struct MANGOS_DLL_DECL boss_ebonrocAI : public ScriptedAI struct TRINITY_DLL_DECL boss_ebonrocAI : public ScriptedAI
{ {
boss_ebonrocAI(Creature *c) : ScriptedAI(c) {Reset();} boss_ebonrocAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ EndScriptData */
#define SPELL_WINGBUFFET 23339 #define SPELL_WINGBUFFET 23339
#define SPELL_FLAMEBUFFET 23341 #define SPELL_FLAMEBUFFET 23341
struct MANGOS_DLL_DECL boss_firemawAI : public ScriptedAI struct TRINITY_DLL_DECL boss_firemawAI : public ScriptedAI
{ {
boss_firemawAI(Creature *c) : ScriptedAI(c) {Reset();} boss_firemawAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ EndScriptData */
#define SPELL_WINGBUFFET 23339 #define SPELL_WINGBUFFET 23339
#define SPELL_FRENZY 23342 //This spell periodically triggers fire nova #define SPELL_FRENZY 23342 //This spell periodically triggers fire nova
struct MANGOS_DLL_DECL boss_flamegorAI : public ScriptedAI struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI
{ {
boss_flamegorAI(Creature *c) : ScriptedAI(c) {Reset();} boss_flamegorAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ EndScriptData */
#define SAY_HUNTER "Hunters and your annoying pea-shooters!" #define SAY_HUNTER "Hunters and your annoying pea-shooters!"
#define SAY_ROGUE "Rogues? Stop hiding and face me!" #define SAY_ROGUE "Rogues? Stop hiding and face me!"
struct MANGOS_DLL_DECL boss_nefarianAI : public ScriptedAI struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI
{ {
boss_nefarianAI(Creature *c) : ScriptedAI(c) {Reset();} boss_nefarianAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ EndScriptData */
#define SPELL_FIREBALLVOLLEY 22425 #define SPELL_FIREBALLVOLLEY 22425
#define SPELL_CONFLAGRATION 23023 #define SPELL_CONFLAGRATION 23023
struct MANGOS_DLL_DECL boss_razorgoreAI : public ScriptedAI struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI
{ {
boss_razorgoreAI(Creature *c) : ScriptedAI(c) {Reset();} boss_razorgoreAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ EndScriptData */
#define GOSSIP_ITEM "Start Event <Needs Gossip Text>" #define GOSSIP_ITEM "Start Event <Needs Gossip Text>"
struct MANGOS_DLL_DECL boss_vaelAI : public ScriptedAI struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
{ {
boss_vaelAI(Creature *c) : ScriptedAI(c) boss_vaelAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp
+3 -3
View File
@@ -71,7 +71,7 @@ EndScriptData */
//If nefarian dies then he will kill himself then he will kill himself in his hiding place //If nefarian dies then he will kill himself then he will kill himself in his hiding place
//To prevent players from doing the event twice //To prevent players from doing the event twice
struct MANGOS_DLL_DECL boss_victor_nefariusAI : public ScriptedAI struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
{ {
boss_victor_nefariusAI(Creature *c) : ScriptedAI(c) boss_victor_nefariusAI(Creature *c) : ScriptedAI(c)
{ {
@@ -194,7 +194,7 @@ struct MANGOS_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
DoYell(SAY_GAMESBEGIN_2,LANG_UNIVERSAL,NULL); DoYell(SAY_GAMESBEGIN_2,LANG_UNIVERSAL,NULL);
DoPlaySoundToSet(m_creature,SOUND_GAMESBEGIN); DoPlaySoundToSet(m_creature,SOUND_GAMESBEGIN);
//MaNGOS::Singleton<MapManager>::Instance().GetMap(m_creature->GetMapId(), m_creature)->GetPlayers().begin(); //Trinity::Singleton<MapManager>::Instance().GetMap(m_creature->GetMapId(), m_creature)->GetPlayers().begin();
/* /*
list <Player*>::iterator i = MapManager::Instance().GetMap(m_creature->GetMapId(), m_creature)->GetPlayers().begin(); list <Player*>::iterator i = MapManager::Instance().GetMap(m_creature->GetMapId(), m_creature)->GetPlayers().begin();
@@ -310,7 +310,7 @@ struct MANGOS_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
//Make super invis //Make super invis
DoCast(m_creature,8149); DoCast(m_creature,8149);
//Teleport self to a hiding spot (this causes errors in the mangos log but no real issues) //Teleport self to a hiding spot (this causes errors in the Trinity log but no real issues)
m_creature->Relocate(HIDE_X,HIDE_Y,HIDE_Z,0); m_creature->Relocate(HIDE_X,HIDE_Y,HIDE_Z,0);
m_creature->SendMonsterMove(HIDE_X,HIDE_Y,HIDE_Z,0,true,0); m_creature->SendMonsterMove(HIDE_X,HIDE_Y,HIDE_Z,0,true,0);
m_creature->addUnitState(UNIT_STAT_FLEEING); m_creature->addUnitState(UNIT_STAT_FLEEING);
src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp
+3 -3
View File
@@ -37,7 +37,7 @@ EndContentData */
######*/ ######*/
//TODO: add support for quest 10512 + creature abilities //TODO: add support for quest 10512 + creature abilities
struct MANGOS_DLL_DECL mobs_bladespire_ogreAI : public ScriptedAI struct TRINITY_DLL_DECL mobs_bladespire_ogreAI : public ScriptedAI
{ {
mobs_bladespire_ogreAI(Creature *c) : ScriptedAI(c) {Reset();} mobs_bladespire_ogreAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -82,7 +82,7 @@ CreatureAI* GetAI_mobs_bladespire_ogre(Creature *_Creature)
#define SPELL_MANA_BURN 38884 #define SPELL_MANA_BURN 38884
#define SPELL_INTANGIBLE_PRESENCE 36513 #define SPELL_INTANGIBLE_PRESENCE 36513
struct MANGOS_DLL_DECL mobs_nether_drakeAI : public ScriptedAI struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI
{ {
mobs_nether_drakeAI(Creature *c) : ScriptedAI(c) {Reset();} mobs_nether_drakeAI(Creature *c) : ScriptedAI(c) {Reset();}
@@ -261,7 +261,7 @@ CreatureAI* GetAI_mobs_nether_drake(Creature *_Creature)
## npc_daranelle ## npc_daranelle
######*/ ######*/
struct MANGOS_DLL_DECL npc_daranelleAI : public ScriptedAI struct TRINITY_DLL_DECL npc_daranelleAI : public ScriptedAI
{ {
npc_daranelleAI(Creature *c) : ScriptedAI(c) {Reset();} npc_daranelleAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ EndScriptData */
#define SPELL_RAGE 21340 #define SPELL_RAGE 21340
#define SPELL_CAPTURESOUL 21054 #define SPELL_CAPTURESOUL 21054
struct MANGOS_DLL_DECL boss_kruulAI : public ScriptedAI struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI
{ {
boss_kruulAI(Creature *c) : ScriptedAI(c) {Reset();} boss_kruulAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ EndContentData */
//possible creatures to be spawned //possible creatures to be spawned
const uint32 possibleSpawns[32] = {17322, 17661, 17496, 17522, 17340, 17352, 17333, 17524, 17654, 17348, 17339, 17345, 17359, 17353, 17336, 17550, 17330, 17701, 17321, 17680, 17325, 17320, 17683, 17342, 17715, 17334, 17341, 17338, 17337, 17346, 17344, 17327}; const uint32 possibleSpawns[32] = {17322, 17661, 17496, 17522, 17340, 17352, 17333, 17524, 17654, 17348, 17339, 17345, 17359, 17353, 17336, 17550, 17330, 17701, 17321, 17680, 17325, 17320, 17683, 17342, 17715, 17334, 17341, 17338, 17337, 17346, 17344, 17327};
struct MANGOS_DLL_DECL mob_webbed_creatureAI : public ScriptedAI struct TRINITY_DLL_DECL mob_webbed_creatureAI : public ScriptedAI
{ {
mob_webbed_creatureAI(Creature *c) : ScriptedAI(c) {Reset();} mob_webbed_creatureAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ EndContentData */
## npc_ragged_john ## npc_ragged_john
######*/ ######*/
struct MANGOS_DLL_DECL npc_ragged_johnAI : public ScriptedAI struct TRINITY_DLL_DECL npc_ragged_johnAI : public ScriptedAI
{ {
npc_ragged_johnAI(Creature *c) : ScriptedAI(c) { Reset(); } npc_ragged_johnAI(Creature *c) : ScriptedAI(c) { Reset(); }
src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ EndScriptData */
#define SOUND_SLAY2 10404 #define SOUND_SLAY2 10404
#define SOUND_DEATH 10405 #define SOUND_DEATH 10405
struct MANGOS_DLL_DECL boss_aeonusAI : public ScriptedAI struct TRINITY_DLL_DECL boss_aeonusAI : public ScriptedAI
{ {
boss_aeonusAI(Creature *c) : ScriptedAI(c) {Reset();} boss_aeonusAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ EndScriptData */
#define SOUND_SLAY2 10416 #define SOUND_SLAY2 10416
#define SOUND_DEATH 10417 #define SOUND_DEATH 10417
struct MANGOS_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI struct TRINITY_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI
{ {
boss_chrono_lord_dejaAI(Creature *c) : ScriptedAI(c) {Reset();} boss_chrono_lord_dejaAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ EndScriptData */
#define SOUND_SLAY2 10446 #define SOUND_SLAY2 10446
#define SOUND_DEATH 10447 #define SOUND_DEATH 10447
struct MANGOS_DLL_DECL boss_temporusAI : public ScriptedAI struct TRINITY_DLL_DECL boss_temporusAI : public ScriptedAI
{ {
boss_temporusAI(Creature *c) : ScriptedAI(c) {Reset();} boss_temporusAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp
+3 -3
View File
@@ -146,7 +146,7 @@ struct mob_ancient_wispAI : public ScriptedAI
/* This script controls the Doomfire mob. Unlike the other Doomfire mob, this one does not stalk players. /* This script controls the Doomfire mob. Unlike the other Doomfire mob, this one does not stalk players.
Instead, this doomfire will simply stand in one place after spawning and deal damage to any players that Instead, this doomfire will simply stand in one place after spawning and deal damage to any players that
are within 3 yards. Another creature called Doomfire Targetting spawns this creature as well as stalks. */ are within 3 yards. Another creature called Doomfire Targetting spawns this creature as well as stalks. */
struct MANGOS_DLL_DECL mob_doomfireAI : public ScriptedAI struct TRINITY_DLL_DECL mob_doomfireAI : public ScriptedAI
{ {
mob_doomfireAI(Creature* c) : ScriptedAI(c) mob_doomfireAI(Creature* c) : ScriptedAI(c)
{ {
@@ -241,7 +241,7 @@ struct MANGOS_DLL_DECL mob_doomfireAI : public ScriptedAI
}; };
/* This is the script for the Doomfire Targetting Mob. This mob simply follows players and/or travels in random directions and spawns the actual Doomfire which does damage to anyone that moves close. */ /* This is the script for the Doomfire Targetting Mob. This mob simply follows players and/or travels in random directions and spawns the actual Doomfire which does damage to anyone that moves close. */
struct MANGOS_DLL_DECL mob_doomfire_targettingAI : public ScriptedAI struct TRINITY_DLL_DECL mob_doomfire_targettingAI : public ScriptedAI
{ {
mob_doomfire_targettingAI(Creature* c) : ScriptedAI(c) mob_doomfire_targettingAI(Creature* c) : ScriptedAI(c)
{ {
@@ -351,7 +351,7 @@ struct TargetDistanceOrder : public std::binary_function<const Unit, const Unit,
} }
}; };
struct MANGOS_DLL_DECL boss_archimondeAI : public ScriptedAI struct TRINITY_DLL_DECL boss_archimondeAI : public ScriptedAI
{ {
boss_archimondeAI(Creature *c) : ScriptedAI(c) boss_archimondeAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp
+7 -7
View File
@@ -309,25 +309,25 @@ void hyjalAI::UpdateWorldState(uint32 field, uint32 value)
void hyjalAI::Retreat() void hyjalAI::Retreat()
{ {
CellPair pair(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); CellPair pair(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY()));
Cell cell(pair); Cell cell(pair);
cell.data.Part.reserved = ALL_DISTRICT; cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate(); cell.SetNoCreate();
// First get all creatures. // First get all creatures.
std::list<Creature*> creatures; std::list<Creature*> creatures;
MaNGOS::AllFriendlyCreaturesInGrid creature_check(m_creature); Trinity::AllFriendlyCreaturesInGrid creature_check(m_creature);
MaNGOS::CreatureListSearcher<MaNGOS::AllFriendlyCreaturesInGrid> creature_searcher(creatures, creature_check); Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid> creature_searcher(creatures, creature_check);
TypeContainerVisitor TypeContainerVisitor
<MaNGOS::CreatureListSearcher<MaNGOS::AllFriendlyCreaturesInGrid>, <Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid>,
GridTypeMapContainer> creature_visitor(creature_searcher); GridTypeMapContainer> creature_visitor(creature_searcher);
// Then get all Ancient Gem Veins. NOTE: Grid Search will only be able to find those in the grid. // Then get all Ancient Gem Veins. NOTE: Grid Search will only be able to find those in the grid.
std::list<GameObject*> goList; std::list<GameObject*> goList;
MaNGOS::AllGameObjectsWithEntryInGrid go_check(185557); Trinity::AllGameObjectsWithEntryInGrid go_check(185557);
MaNGOS::GameObjectListSearcher<MaNGOS::AllGameObjectsWithEntryInGrid> go_search(goList, go_check); Trinity::GameObjectListSearcher<Trinity::AllGameObjectsWithEntryInGrid> go_search(goList, go_check);
TypeContainerVisitor TypeContainerVisitor
<MaNGOS::GameObjectListSearcher<MaNGOS::AllGameObjectsWithEntryInGrid>, GridTypeMapContainer> go_visit(go_search); <Trinity::GameObjectListSearcher<Trinity::AllGameObjectsWithEntryInGrid>, GridTypeMapContainer> go_visit(go_search);
CellLock<GridReadGuard> cell_lock(cell, pair); CellLock<GridReadGuard> cell_lock(cell, pair);
// Get Creatures // Get Creatures
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h
+1 -1
View File
@@ -216,7 +216,7 @@ static Yells ThrallQuotes[]=
{DEATH, "Uraaa...", 11034}, {DEATH, "Uraaa...", 11034},
}; };
struct MANGOS_DLL_DECL hyjalAI : public ScriptedAI struct TRINITY_DLL_DECL hyjalAI : public ScriptedAI
{ {
hyjalAI(Creature *c); hyjalAI(Creature *c);
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ EndScriptData */
4 - Archimonde event 4 - Archimonde event
*/ */
struct MANGOS_DLL_DECL instance_mount_hyjal : public ScriptedInstance struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
{ {
instance_mount_hyjal(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_mount_hyjal(Map *Map) : ScriptedInstance(Map) {Initialize();};
src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ EndScriptData */
#define SOUND_SLAY2 10410 #define SOUND_SLAY2 10410
#define SOUND_DEATH 10411 #define SOUND_DEATH 10411
struct MANGOS_DLL_DECL boss_captain_skarlocAI : public ScriptedAI struct TRINITY_DLL_DECL boss_captain_skarlocAI : public ScriptedAI
{ {
boss_captain_skarlocAI(Creature *c) : ScriptedAI(c) boss_captain_skarlocAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ EndScriptData */
#define SPELL_MAGIC_DISRUPTION_AURA 33834 #define SPELL_MAGIC_DISRUPTION_AURA 33834
#define SPELL_WING_BUFFET 31475 #define SPELL_WING_BUFFET 31475
struct MANGOS_DLL_DECL boss_epoch_hunterAI : public ScriptedAI struct TRINITY_DLL_DECL boss_epoch_hunterAI : public ScriptedAI
{ {
boss_epoch_hunterAI(Creature *c) : ScriptedAI(c) boss_epoch_hunterAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
+2 -2
View File
@@ -17,7 +17,7 @@
/* ScriptData /* ScriptData
SDName: Boss_Luetenant_Drake SDName: Boss_Luetenant_Drake
SD%Complete: 70 SD%Complete: 70
SDComment: Missing proper code for patrolling area after being spawned. Also script for GO (barrels)(missing mangos support) SDComment: Missing proper code for patrolling area after being spawned. Also script for GO (barrels)(missing Trinity support)
SDCategory: Caverns of Time, Old Hillsbrad Foothills SDCategory: Caverns of Time, Old Hillsbrad Foothills
EndScriptData */ EndScriptData */
@@ -110,7 +110,7 @@ static Location DrakeWP[]=
{18, 2128.20, 70.9763, 64.4221} {18, 2128.20, 70.9763, 64.4221}
}; };
struct MANGOS_DLL_DECL boss_lieutenant_drakeAI : public ScriptedAI struct TRINITY_DLL_DECL boss_lieutenant_drakeAI : public ScriptedAI
{ {
boss_lieutenant_drakeAI(Creature *c) : ScriptedAI(c) {Reset();} boss_lieutenant_drakeAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ EndScriptData */
#define THRALL_ENTRY 17876 #define THRALL_ENTRY 17876
#define TARETHA_ENTRY 18887 #define TARETHA_ENTRY 18887
struct MANGOS_DLL_DECL instance_old_hillsbrad : public ScriptedInstance struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
{ {
instance_old_hillsbrad(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_old_hillsbrad(Map *Map) : ScriptedInstance(Map) {Initialize();};
src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
+2 -2
View File
@@ -218,7 +218,7 @@ bool GossipSelect_npc_erozion(Player *player, Creature *_Creature, uint32 sender
#define THRALL_LEAVE_COMBAT3 "I will not waste this chance. I will seek out my destiny." #define THRALL_LEAVE_COMBAT3 "I will not waste this chance. I will seek out my destiny."
#define SOUND_LEAVE_COMBAT3 10457 #define SOUND_LEAVE_COMBAT3 10457
struct MANGOS_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
{ {
npc_thrall_old_hillsbradAI(Creature *c) : npc_escortAI(c) npc_thrall_old_hillsbradAI(Creature *c) : npc_escortAI(c)
{ {
@@ -799,7 +799,7 @@ bool GossipSelect_npc_thrall_old_hillsbrad(Player *player, Creature *_Creature,
#define TARETHA_FREE "I'm free! Thank you all!" #define TARETHA_FREE "I'm free! Thank you all!"
struct MANGOS_DLL_DECL npc_tarethaAI : public npc_escortAI struct TRINITY_DLL_DECL npc_tarethaAI : public npc_escortAI
{ {
npc_tarethaAI(Creature *c) : npc_escortAI(c) npc_tarethaAI(Creature *c) : npc_escortAI(c)
{ {
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
+4 -4
View File
@@ -65,7 +65,7 @@ EndScriptData */
#define OLUM_O 0.401581f #define OLUM_O 0.401581f
//Fathom-Lord Karathress AI //Fathom-Lord Karathress AI
struct MANGOS_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI
{ {
boss_fathomlord_karathressAI(Creature *c) : ScriptedAI(c) boss_fathomlord_karathressAI(Creature *c) : ScriptedAI(c)
{ {
@@ -242,7 +242,7 @@ struct MANGOS_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI
}; };
//Fathom-Guard Sharkkis AI //Fathom-Guard Sharkkis AI
struct MANGOS_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI
{ {
boss_fathomguard_sharkkisAI(Creature *c) : ScriptedAI(c) boss_fathomguard_sharkkisAI(Creature *c) : ScriptedAI(c)
{ {
@@ -325,7 +325,7 @@ struct MANGOS_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI
}; };
//Fathom-Guard Tidalvess AI //Fathom-Guard Tidalvess AI
struct MANGOS_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI
{ {
boss_fathomguard_tidalvessAI(Creature *c) : ScriptedAI(c) boss_fathomguard_tidalvessAI(Creature *c) : ScriptedAI(c)
{ {
@@ -399,7 +399,7 @@ struct MANGOS_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI
}; };
//Fathom-Guard Caribdis AI //Fathom-Guard Caribdis AI
struct MANGOS_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI
{ {
boss_fathomguard_caribdisAI(Creature *c) : ScriptedAI(c) boss_fathomguard_caribdisAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ EndScriptData */
#define SPAWN_X_DIFF4 12.577011 #define SPAWN_X_DIFF4 12.577011
#define SPAWN_Y_DIFF4 4.72702 #define SPAWN_Y_DIFF4 4.72702
struct MANGOS_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI
{ {
boss_hydross_the_unstableAI(Creature *c) : ScriptedAI(c) boss_hydross_the_unstableAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
+5 -5
View File
@@ -116,7 +116,7 @@ float ShieldGeneratorChannelPos[4][4] =
}; };
//Lady Vashj AI //Lady Vashj AI
struct MANGOS_DLL_DECL boss_lady_vashjAI : public ScriptedAI struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
{ {
boss_lady_vashjAI (Creature *c) : ScriptedAI(c) boss_lady_vashjAI (Creature *c) : ScriptedAI(c)
{ {
@@ -525,7 +525,7 @@ struct MANGOS_DLL_DECL boss_lady_vashjAI : public ScriptedAI
//Enchanted Elemental //Enchanted Elemental
//If one of them reaches Vashj he will increase her damage done by 5%. //If one of them reaches Vashj he will increase her damage done by 5%.
struct MANGOS_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI
{ {
mob_enchanted_elementalAI(Creature *c) : ScriptedAI(c) mob_enchanted_elementalAI(Creature *c) : ScriptedAI(c)
{ {
@@ -585,7 +585,7 @@ struct MANGOS_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI
//Tainted Elemental //Tainted Elemental
//This mob has 7,900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3,000 nature damage and placing a posion doing 2,000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental //This mob has 7,900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3,000 nature damage and placing a posion doing 2,000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental
struct MANGOS_DLL_DECL mob_tainted_elementalAI : public ScriptedAI struct TRINITY_DLL_DECL mob_tainted_elementalAI : public ScriptedAI
{ {
mob_tainted_elementalAI(Creature *c) : ScriptedAI(c) mob_tainted_elementalAI(Creature *c) : ScriptedAI(c)
{ {
@@ -636,7 +636,7 @@ struct MANGOS_DLL_DECL mob_tainted_elementalAI : public ScriptedAI
//Fathom Sporebat //Fathom Sporebat
//Toxic Spores: Used in Phase 3 by the Spore Bats, it creates a contaminated green patch of ground, dealing about 2775-3225 nature damage every second to anyone who stands in it. //Toxic Spores: Used in Phase 3 by the Spore Bats, it creates a contaminated green patch of ground, dealing about 2775-3225 nature damage every second to anyone who stands in it.
struct MANGOS_DLL_DECL mob_fathom_sporebatAI : public ScriptedAI struct TRINITY_DLL_DECL mob_fathom_sporebatAI : public ScriptedAI
{ {
mob_fathom_sporebatAI(Creature *c) : ScriptedAI(c) mob_fathom_sporebatAI(Creature *c) : ScriptedAI(c)
{ {
@@ -739,7 +739,7 @@ CreatureAI* GetAI_mob_coilfang_strider(Creature *_Creature)
return ai; return ai;
} }
struct MANGOS_DLL_DECL mob_shield_generator_channelAI : public ScriptedAI struct TRINITY_DLL_DECL mob_shield_generator_channelAI : public ScriptedAI
{ {
mob_shield_generator_channelAI(Creature *c) : ScriptedAI(c) mob_shield_generator_channelAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
+2 -2
View File
@@ -60,7 +60,7 @@ EndScriptData */
#define DEMON_FORM 21845 #define DEMON_FORM 21845
//Original Leotheras the Blind AI //Original Leotheras the Blind AI
struct MANGOS_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
{ {
boss_leotheras_the_blindAI(Creature *c) : ScriptedAI(c) boss_leotheras_the_blindAI(Creature *c) : ScriptedAI(c)
{ {
@@ -242,7 +242,7 @@ struct MANGOS_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
}; };
//Leotheras the Blind Demon Form AI //Leotheras the Blind Demon Form AI
struct MANGOS_DLL_DECL boss_leotheras_the_blind_demonformAI : public ScriptedAI struct TRINITY_DLL_DECL boss_leotheras_the_blind_demonformAI : public ScriptedAI
{ {
boss_leotheras_the_blind_demonformAI(Creature *c) : ScriptedAI(c) boss_leotheras_the_blind_demonformAI(Creature *c) : ScriptedAI(c)
{ {
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
+2 -2
View File
@@ -70,7 +70,7 @@ EndScriptData */
#define TIDEWALKER_LURKER 21920 #define TIDEWALKER_LURKER 21920
//Morogrim Tidewalker AI //Morogrim Tidewalker AI
struct MANGOS_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
{ {
boss_morogrim_tidewalkerAI(Creature *c) : ScriptedAI(c) boss_morogrim_tidewalkerAI(Creature *c) : ScriptedAI(c)
{ {
@@ -326,7 +326,7 @@ struct MANGOS_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
}; };
//Water Globule AI //Water Globule AI
struct MANGOS_DLL_DECL mob_water_globuleAI : public ScriptedAI struct TRINITY_DLL_DECL mob_water_globuleAI : public ScriptedAI
{ {
mob_water_globuleAI(Creature *c) : ScriptedAI(c) {Reset();} mob_water_globuleAI(Creature *c) : ScriptedAI(c) {Reset();}
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ EndScriptData */
5 - Lady Vashj Event 5 - Lady Vashj Event
*/ */
struct MANGOS_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
{ {
instance_serpentshrine_cavern(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_serpentshrine_cavern(Map *Map) : ScriptedInstance(Map) {Initialize();};

Some files were not shown because too many files have changed in this diff Show More