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

More SD2 code style

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Kudlaty
2009-08-14 00:39:07 +02:00
parent ad4397b40d
commit 764f4b1815
352 changed files with 3079 additions and 3079 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/boss/boss_emeriss.cpp
+2 -2
View File
@@ -141,9 +141,9 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_emeriss(Creature *_Creature)
CreatureAI* GetAI_boss_emeriss(Creature* pCreature)
{
return new boss_emerissAI (_Creature);
return new boss_emerissAI (pCreature);
}
void AddSC_boss_emeriss()
src/bindings/scripts/scripts/boss/boss_taerar.cpp
+4 -4
View File
@@ -283,14 +283,14 @@ struct TRINITY_DLL_DECL boss_shadeoftaerarAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_taerar(Creature *_Creature)
CreatureAI* GetAI_boss_taerar(Creature* pCreature)
{
return new boss_taerarAI (_Creature);
return new boss_taerarAI (pCreature);
}
CreatureAI* GetAI_boss_shadeoftaerar(Creature *_Creature)
CreatureAI* GetAI_boss_shadeoftaerar(Creature* pCreature)
{
return new boss_shadeoftaerarAI (_Creature);
return new boss_shadeoftaerarAI (pCreature);
}
void AddSC_boss_taerar()
src/bindings/scripts/scripts/boss/boss_ysondre.cpp
+4 -4
View File
@@ -223,14 +223,14 @@ struct TRINITY_DLL_DECL mob_dementeddruidsAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_ysondre(Creature *_Creature)
CreatureAI* GetAI_boss_ysondre(Creature* pCreature)
{
return new boss_ysondreAI (_Creature);
return new boss_ysondreAI (pCreature);
}
CreatureAI* GetAI_mob_dementeddruids(Creature *_Creature)
CreatureAI* GetAI_mob_dementeddruids(Creature* pCreature)
{
return new mob_dementeddruidsAI (_Creature);
return new mob_dementeddruidsAI (pCreature);
}
void AddSC_boss_ysondre()
src/bindings/scripts/scripts/creature/mob_generic_creature.cpp
+8 -8
View File
@@ -157,9 +157,9 @@ struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI
}
};
CreatureAI* GetAI_generic_creature(Creature *_Creature)
CreatureAI* GetAI_generic_creature(Creature* pCreature)
{
return new generic_creatureAI (_Creature);
return new generic_creatureAI (pCreature);
}
struct TRINITY_DLL_DECL trigger_periodicAI : public NullCreatureAI
@@ -219,19 +219,19 @@ struct TRINITY_DLL_DECL mob_webwrapAI : public NullCreatureAI
}
};
CreatureAI* GetAI_trigger_periodic(Creature *_Creature)
CreatureAI* GetAI_trigger_periodic(Creature* pCreature)
{
return new trigger_periodicAI (_Creature);
return new trigger_periodicAI (pCreature);
}
CreatureAI* GetAI_trigger_death(Creature *_Creature)
CreatureAI* GetAI_trigger_death(Creature* pCreature)
{
return new trigger_deathAI (_Creature);
return new trigger_deathAI (pCreature);
}
CreatureAI* GetAI_mob_webwrap(Creature* _Creature)
CreatureAI* GetAI_mob_webwrap(Creature* pCreature)
{
return new mob_webwrapAI (_Creature);
return new mob_webwrapAI (pCreature);
}
void AddSC_generic_creature()
src/bindings/scripts/scripts/custom/custom_example.cpp
+11 -11
View File
@@ -210,45 +210,45 @@ struct TRINITY_DLL_DECL custom_exampleAI : public ScriptedAI
//This is the GetAI method used by all scripts that involve AI
//It is called every time a new creature using this script is created
CreatureAI* GetAI_custom_example(Creature *_Creature)
CreatureAI* GetAI_custom_example(Creature* pCreature)
{
return new custom_exampleAI (_Creature);
return new custom_exampleAI (pCreature);
}
//This function is called when the player clicks an option on the gossip menu
void SendDefaultMenu_custom_example(Player* pPlayer, Creature *_Creature, uint32 action)
void SendDefaultMenu_custom_example(Player* pPlayer, Creature* pCreature, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time
{
//Set our faction to hostile twoards all
_Creature->setFaction(24);
_Creature->Attack(pPlayer, true);
pCreature->setFaction(24);
pCreature->Attack(pPlayer, true);
pPlayer->PlayerTalkClass->CloseGossip();
}
}
//This function is called when the player clicks an option on the gossip menu
bool GossipSelect_custom_example(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_custom_example(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (sender == GOSSIP_SENDER_MAIN)
SendDefaultMenu_custom_example(pPlayer, _Creature, action);
SendDefaultMenu_custom_example(pPlayer, pCreature, action);
return true;
}
//This function is called when the player opens the gossip menu
bool GossipHello_custom_example(Player* pPlayer, Creature *_Creature)
bool GossipHello_custom_example(Player* pPlayer, Creature* pCreature)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
pPlayer->PlayerTalkClass->SendGossipMenu(907, pCreature->GetGUID());
return true;
}
//Our Recive emote function
bool ReceiveEmote_custom_example(Player* pPlayer, Creature *_Creature, uint32 emote)
bool ReceiveEmote_custom_example(Player* pPlayer, Creature* pCreature, uint32 emote)
{
_Creature->HandleEmoteCommand(emote);
pCreature->HandleEmoteCommand(emote);
if (emote == TEXTEMOTE_DANCE)
((custom_exampleAI*)_Creature->AI())->DoSay(SAY_DANCE,LANG_UNIVERSAL,NULL);
src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp
+9 -9
View File
@@ -25,27 +25,27 @@ EndScriptData */
#include <cstring>
//This function is called when the player opens the gossip menubool
bool GossipHello_custom_gossip_codebox(Player* pPlayer, Creature *_Creature)
bool GossipHello_custom_gossip_codebox(Player* pPlayer, Creature* pCreature)
{
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, "A quiz: what's your name?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'm not interested", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
pPlayer->PlayerTalkClass->SendGossipMenu(907, pCreature->GetGUID());
return true;
}
//This function is called when the player clicks an option on the gossip menubool
bool GossipSelect_custom_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_custom_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF+2)
{
_Creature->Say("Normal select, guess you're not interested.", LANG_UNIVERSAL, 0);
pCreature->Say("Normal select, guess you're not interested.", LANG_UNIVERSAL, 0);
pPlayer->CLOSE_GOSSIP_MENU();
}
return true;
}
bool GossipSelectWithCode_custom_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action, const char* sCode)
bool GossipSelectWithCode_custom_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action, const char* sCode)
{
if (sender == GOSSIP_SENDER_MAIN)
{
@@ -53,13 +53,13 @@ bool GossipSelectWithCode_custom_gossip_codebox(Player* pPlayer, Creature *_Crea
{
if (std::strcmp(sCode, pPlayer->GetName())!=0)
{
_Creature->Say("Wrong!", LANG_UNIVERSAL, 0);
_Creature->CastSpell(pPlayer, 12826, true);
pCreature->Say("Wrong!", LANG_UNIVERSAL, 0);
pCreature->CastSpell(pPlayer, 12826, true);
}
else
{
_Creature->Say("You're right, you are allowed to see my inner secrets.", LANG_UNIVERSAL, 0);
_Creature->CastSpell(pPlayer, 26990, true);
pCreature->Say("You're right, you are allowed to see my inner secrets.", LANG_UNIVERSAL, 0);
pCreature->CastSpell(pPlayer, 26990, true);
}
pPlayer->CLOSE_GOSSIP_MENU();
return true;
src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp
+3 -3
View File
@@ -3,16 +3,16 @@
#define GOSSIP_FLIGHT "I need a ride"
bool GossipHello_npc_acherus_taxi(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_acherus_taxi(Player* pPlayer, Creature* pCreature)
{
pPlayer->SetTaxiCheater(true);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(9978,_Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(9978, pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_acherus_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_acherus_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF + 1)
{
src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp
+9 -9
View File
@@ -8,18 +8,18 @@
#define GOSSIP_BOTTOM "Yes, Please. I would like to return to the ground floor of the temple."
#define GOSSIP_ONEDOWN "I would like to see Lord Afrasastrasz, in the middle of the temple."
bool GossipHello_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature* pCreature)
{
pPlayer->SetTaxiCheater(true);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DOWN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(12887,_Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(12887, pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF + 1)
{
@@ -35,20 +35,20 @@ bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature *_Cre
return true;
}
bool GossipHello_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature* pCreature)
{
pPlayer->SetTaxiCheater(true);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TOP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MIDDLE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(12713,_Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(12713, pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF + 4)
{
@@ -64,18 +64,18 @@ bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature *_Cre
return true;
}
bool GossipHello_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature* pCreature)
{
pPlayer->SetTaxiCheater(true);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BOTTOM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ONEDOWN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
pPlayer->SEND_GOSSIP_MENU(12714,_Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(12714, pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF + 5)
{
src/bindings/scripts/scripts/custom/test.cpp
+10 -10
View File
@@ -134,9 +134,9 @@ struct TRINITY_DLL_DECL npc_testAI : public npc_escortAI
}
};
CreatureAI* GetAI_test(Creature *_Creature)
CreatureAI* GetAI_test(Creature* pCreature)
{
npc_testAI* testAI = new npc_testAI(_Creature);
npc_testAI* testAI = new npc_testAI(pCreature);
testAI->AddWaypoint(0, 1231, -4419, 23);
testAI->AddWaypoint(1, 1198, -4440, 23, 0);
@@ -147,25 +147,25 @@ CreatureAI* GetAI_test(Creature *_Creature)
return (CreatureAI*)testAI;
}
bool GossipHello_npc_test(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_test(Player* pPlayer, Creature* pCreature)
{
pPlayer->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID());
_Creature->prepareGossipMenu(pPlayer,0);
pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID());
pCreature->prepareGossipMenu(pPlayer,0);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(Attack, Defend, Run)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(NoAttack, NoDefend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(NoAttack, Defend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
_Creature->sendPreparedGossip(pPlayer);
pCreature->sendPreparedGossip(pPlayer);
return true;
}
bool GossipSelect_npc_test(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_test(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF+1)
{
pPlayer->CLOSE_GOSSIP_MENU();
((npc_escortAI*)(_Creature->AI()))->Start(true, true, pPlayer->GetGUID());
((npc_escortAI*)(pCreature->AI()))->Start(true, true, pPlayer->GetGUID());
return true; // prevent Trinity core handling
}
@@ -173,7 +173,7 @@ bool GossipSelect_npc_test(Player* pPlayer, Creature *_Creature, uint32 sender,
if (action == GOSSIP_ACTION_INFO_DEF+2)
{
pPlayer->CLOSE_GOSSIP_MENU();
((npc_escortAI*)(_Creature->AI()))->Start(false, false, pPlayer->GetGUID());
((npc_escortAI*)(pCreature->AI()))->Start(false, false, pPlayer->GetGUID());
return true; // prevent Trinity core handling
}
@@ -181,7 +181,7 @@ bool GossipSelect_npc_test(Player* pPlayer, Creature *_Creature, uint32 sender,
if (action == GOSSIP_ACTION_INFO_DEF+3)
{
pPlayer->CLOSE_GOSSIP_MENU();
((npc_escortAI*)(_Creature->AI()))->Start(false, false, pPlayer->GetGUID());
((npc_escortAI*)(pCreature->AI()))->Start(false, false, pPlayer->GetGUID());
return true; // prevent Trinity core handling
}
src/bindings/scripts/scripts/examples/example_creature.cpp
+9 -9
View File
@@ -206,37 +206,37 @@ struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI
//This is the GetAI method used by all scripts that involve AI
//It is called every time a new creature using this script is created
CreatureAI* GetAI_example_creature(Creature *_Creature)
CreatureAI* GetAI_example_creature(Creature* pCreature)
{
return new example_creatureAI (_Creature);
return new example_creatureAI (pCreature);
}
//This function is called when the player clicks an option on the gossip menu
void SendDefaultMenu_example_creature(Player* pPlayer, Creature *_Creature, uint32 action)
void SendDefaultMenu_example_creature(Player* pPlayer, Creature* pCreature, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time
{
//Set our faction to hostile twoards all
_Creature->setFaction(24);
_Creature->Attack(pPlayer, true);
pCreature->setFaction(24);
pCreature->Attack(pPlayer, true);
pPlayer->PlayerTalkClass->CloseGossip();
}
}
//This function is called when the player clicks an option on the gossip menu
bool GossipSelect_example_creature(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_example_creature(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (sender == GOSSIP_SENDER_MAIN)
SendDefaultMenu_example_creature(pPlayer, _Creature, action);
SendDefaultMenu_example_creature(pPlayer, pCreature, action);
return true;
}
//This function is called when the player opens the gossip menu
bool GossipHello_example_creature(Player* pPlayer, Creature *_Creature)
bool GossipHello_example_creature(Player* pPlayer, Creature* pCreature)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
pPlayer->PlayerTalkClass->SendGossipMenu(907, pCreature->GetGUID());
return true;
}
src/bindings/scripts/scripts/examples/example_escort.cpp
+10 -10
View File
@@ -155,9 +155,9 @@ struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI
}
};
CreatureAI* GetAI_example_escort(Creature *_Creature)
CreatureAI* GetAI_example_escort(Creature* pCreature)
{
example_escortAI* testAI = new example_escortAI(_Creature);
example_escortAI* testAI = new example_escortAI(pCreature);
testAI->AddWaypoint(0, 1231, -4419, 23);
testAI->AddWaypoint(1, 1198, -4440, 23, 0);
@@ -168,25 +168,25 @@ CreatureAI* GetAI_example_escort(Creature *_Creature)
return testAI;
}
bool GossipHello_example_escort(Player* pPlayer, Creature *_Creature)
bool GossipHello_example_escort(Player* pPlayer, Creature* pCreature)
{
pPlayer->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID());
_Creature->prepareGossipMenu(pPlayer,0);
pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID());
pCreature->prepareGossipMenu(pPlayer,0);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
_Creature->sendPreparedGossip(pPlayer);
pCreature->sendPreparedGossip(pPlayer);
return true;
}
bool GossipSelect_example_escort(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_example_escort(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF+1)
{
pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, true, pPlayer->GetGUID());
CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, true, pPlayer->GetGUID());
return true; // prevent mangos core handling
}
@@ -194,7 +194,7 @@ bool GossipSelect_example_escort(Player* pPlayer, Creature *_Creature, uint32 se
if (action == GOSSIP_ACTION_INFO_DEF+2)
{
pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, false, pPlayer->GetGUID());
CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, false, pPlayer->GetGUID());
return true; // prevent mangos core handling
}
@@ -202,7 +202,7 @@ bool GossipSelect_example_escort(Player* pPlayer, Creature *_Creature, uint32 se
if (action == GOSSIP_ACTION_INFO_DEF+3)
{
pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, pPlayer->GetGUID());
CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID());
return true; // prevent mangos core handling
}
src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp
+9 -9
View File
@@ -32,27 +32,27 @@ EndScriptData */
#define GOSSIP_ITEM_2 "I'm not interested"
//This function is called when the player opens the gossip menubool
bool GossipHello_example_gossip_codebox(Player* pPlayer, Creature *_Creature)
bool GossipHello_example_gossip_codebox(Player* pPlayer, Creature* pCreature)
{
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
pPlayer->PlayerTalkClass->SendGossipMenu(907, pCreature->GetGUID());
return true;
}
//This function is called when the player clicks an option on the gossip menubool
bool GossipSelect_example_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_example_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF+2)
{
DoScriptText(SAY_NOT_INTERESTED, _Creature);
DoScriptText(SAY_NOT_INTERESTED, pCreature);
pPlayer->CLOSE_GOSSIP_MENU();
}
return true;
}
bool GossipSelectWithCode_example_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action, const char* sCode)
bool GossipSelectWithCode_example_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action, const char* sCode)
{
if (sender == GOSSIP_SENDER_MAIN)
{
@@ -60,13 +60,13 @@ bool GossipSelectWithCode_example_gossip_codebox(Player* pPlayer, Creature *_Cre
{
if (std::strcmp(sCode, pPlayer->GetName())!=0)
{
DoScriptText(SAY_WRONG, _Creature);
_Creature->CastSpell(pPlayer, 12826, true);
DoScriptText(SAY_WRONG, pCreature);
pCreature->CastSpell(pPlayer, 12826, true);
}
else
{
DoScriptText(SAY_CORRECT, _Creature);
_Creature->CastSpell(pPlayer, 26990, true);
DoScriptText(SAY_CORRECT, pCreature);
pCreature->CastSpell(pPlayer, 26990, true);
}
pPlayer->CLOSE_GOSSIP_MENU();
return true;
src/bindings/scripts/scripts/guard/guards.cpp
+781 -781
View File
File diff suppressed because it is too large Load Diff
src/bindings/scripts/scripts/npc/npc_innkeeper.cpp
+6 -6
View File
@@ -47,10 +47,10 @@ bool isEventActive()
return false;
}
bool GossipHello_npc_innkeeper(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_innkeeper(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (isEventActive()&& !pPlayer->GetAura(SPELL_TRICK_OR_TREATED, pPlayer->GetGUID()))
{
@@ -76,12 +76,12 @@ bool GossipHello_npc_innkeeper(Player* pPlayer, Creature *_Creature)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID);
}
pPlayer->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_innkeeper(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_innkeeper(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && isEventActive() && !pPlayer->GetAura(SPELL_TRICK_OR_TREATED, pPlayer->GetGUID()))
{
src/bindings/scripts/scripts/npc/npc_professions.cpp
+124 -124
View File
@@ -350,16 +350,16 @@ bool HasAlchemySpell(Player* pPlayer)
return false;
}
bool GossipHello_npc_prof_alchemy(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_prof_alchemy(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (_Creature->isVendor())
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pCreature->isVendor())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
if (_Creature->isTrainer())
if (pCreature->isTrainer())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
uint32 eCreature = _Creature->GetEntry();
uint32 eCreature = pCreature->GetEntry();
if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetBaseSkillValue(SKILL_ALCHEMY)>=350 && pPlayer->getLevel() > 67)
{
@@ -389,19 +389,19 @@ bool GossipHello_npc_prof_alchemy(Player* pPlayer, Creature *_Creature)
}
}
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint32 action)
void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 action)
{
switch(action)
{
case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
pPlayer->SEND_VENDORLIST(pCreature->GetGUID());
break;
case GOSSIP_ACTION_TRAIN:
pPlayer->SEND_TRAINERLIST(_Creature->GetGUID());
pPlayer->SEND_TRAINERLIST(pCreature->GetGUID());
break;
//Learn Alchemy
case GOSSIP_ACTION_INFO_DEF + 1:
@@ -410,7 +410,7 @@ void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint3
pPlayer->CastSpell(pPlayer, S_LEARN_TRANSMUTE, true);
pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
pPlayer->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 2:
@@ -419,7 +419,7 @@ void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint3
pPlayer->CastSpell(pPlayer, S_LEARN_ELIXIR, true);
pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
pPlayer->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 3:
@@ -428,100 +428,100 @@ void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint3
pPlayer->CastSpell(pPlayer, S_LEARN_POTION, true);
pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
pPlayer->CLOSE_GOSSIP_MENU();
break;
//Unlearn Alchemy
case GOSSIP_ACTION_INFO_DEF + 4:
if (pPlayer->GetMoney() >= DoHighUnlearnCost(pPlayer))
{
_Creature->CastSpell(pPlayer, S_UNLEARN_TRANSMUTE, true);
pCreature->CastSpell(pPlayer, S_UNLEARN_TRANSMUTE, true);
pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
pPlayer->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 5:
if (pPlayer->GetMoney() >= DoHighUnlearnCost(pPlayer))
{
_Creature->CastSpell(pPlayer, S_UNLEARN_ELIXIR, true);
pCreature->CastSpell(pPlayer, S_UNLEARN_ELIXIR, true);
pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
pPlayer->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 6:
if (pPlayer->GetMoney() >= DoHighUnlearnCost(pPlayer))
{
_Creature->CastSpell(pPlayer, S_UNLEARN_POTION, true);
pCreature->CastSpell(pPlayer, S_UNLEARN_POTION, true);
pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
pPlayer->CLOSE_GOSSIP_MENU();
break;
}
}
void SendConfirmLearn_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint32 action)
void SendConfirmLearn_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 action)
{
if (action)
{
uint32 eCreature = _Creature->GetEntry();
uint32 eCreature = pCreature->GetEntry();
switch(eCreature)
{
case 22427:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 19052:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR, GOSSIP_SENDER_CHECK, action);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 17909:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION, GOSSIP_SENDER_CHECK, action);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
}
}
}
void SendConfirmUnlearn_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint32 action)
void SendConfirmUnlearn_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 action)
{
if (action)
{
uint32 eCreature = _Creature->GetEntry();
uint32 eCreature = pCreature->GetEntry();
switch(eCreature)
{
case 22427: //Zarevhi
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 19052: //Lorokeem
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 17909: //Lauranna Thar'well
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
}
}
}
bool GossipSelect_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch(sender)
{
case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_alchemy(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_alchemy(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_alchemy(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_alchemy(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_alchemy(pPlayer, pCreature, action); break;
case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_alchemy(pPlayer, pCreature, action); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_alchemy(pPlayer, pCreature, action); break;
case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_alchemy(pPlayer, pCreature, action); break;
}
return true;
}
@@ -537,16 +537,16 @@ bool HasWeaponSub(Player* pPlayer)
return false;
}
bool GossipHello_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (_Creature->isVendor())
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pCreature->isVendor())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
if (_Creature->isTrainer())
if (pCreature->isTrainer())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
uint32 eCreature = _Creature->GetEntry();
uint32 eCreature = pCreature->GetEntry();
//WEAPONSMITH & ARMORSMITH
if (pPlayer->GetBaseSkillValue(SKILL_BLACKSMITHING)>=225)
{
@@ -597,19 +597,19 @@ bool GossipHello_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature)
}
}
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, uint32 action)
void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 action)
{
switch(action)
{
case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
pPlayer->SEND_VENDORLIST(pCreature->GetGUID());
break;
case GOSSIP_ACTION_TRAIN:
pPlayer->SEND_TRAINERLIST(_Creature->GetGUID());
pPlayer->SEND_TRAINERLIST(pCreature->GetGUID());
break;
//Learn Armor/Weapon
case GOSSIP_ACTION_INFO_DEF + 1:
@@ -633,7 +633,7 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui
if (HasWeaponSub(pPlayer))
{
//unknown textID (TALK_MUST_UNLEARN_WEAPON)
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
}
else if (EquippedOk(pPlayer,S_UNLEARN_WEAPON))
{
@@ -642,10 +642,10 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui
pPlayer->CastSpell(pPlayer, S_UNLEARN_WEAPON, true);
ProfessionUnlearnSpells(pPlayer, S_UNLEARN_WEAPON);
pPlayer->ModifyMoney(-DoLowUnlearnCost(pPlayer));
_Creature->CastSpell(pPlayer, S_REP_ARMOR, true);
pCreature->CastSpell(pPlayer, S_REP_ARMOR, true);
pPlayer->CLOSE_GOSSIP_MENU();
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
}
else
{
@@ -661,9 +661,9 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui
pPlayer->CastSpell(pPlayer, S_UNLEARN_ARMOR, true);
ProfessionUnlearnSpells(pPlayer, S_UNLEARN_ARMOR);
pPlayer->ModifyMoney(-DoLowUnlearnCost(pPlayer));
_Creature->CastSpell(pPlayer, S_REP_WEAPON, true);
pCreature->CastSpell(pPlayer, S_REP_WEAPON, true);
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
} else
pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
pPlayer->CLOSE_GOSSIP_MENU();
@@ -691,7 +691,7 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui
ProfessionUnlearnSpells(pPlayer, S_UNLEARN_HAMMER);
pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
} else
pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
pPlayer->CLOSE_GOSSIP_MENU();
@@ -705,7 +705,7 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui
ProfessionUnlearnSpells(pPlayer, S_UNLEARN_AXE);
pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
} else
pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
pPlayer->CLOSE_GOSSIP_MENU();
@@ -719,7 +719,7 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui
ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SWORD);
pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
} else
pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
pPlayer->CLOSE_GOSSIP_MENU();
@@ -727,37 +727,37 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui
}
}
void SendConfirmLearn_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, uint32 action)
void SendConfirmLearn_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 action)
{
if (action)
{
uint32 eCreature = _Creature->GetEntry();
uint32 eCreature = pCreature->GetEntry();
switch(eCreature)
{
case 11191:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, action);
//unknown textID (TALK_HAMMER_LEARN)
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 11192:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE, GOSSIP_SENDER_CHECK, action);
//unknown textID (TALK_AXE_LEARN)
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 11193:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD, GOSSIP_SENDER_CHECK, action);
//unknown textID (TALK_SWORD_LEARN)
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
}
}
}
void SendConfirmUnlearn_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, uint32 action)
void SendConfirmUnlearn_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 action)
{
if (action)
{
uint32 eCreature = _Creature->GetEntry();
uint32 eCreature = pCreature->GetEntry();
switch(eCreature)
{
case 11146: //Ironus Coldsteel
@@ -766,47 +766,47 @@ void SendConfirmUnlearn_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature
case 11177: //Okothos Ironrager
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(pPlayer),false);
//unknown textID (TALK_UNLEARN_AXEORWEAPON)
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 11191:
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false);
//unknown textID (TALK_HAMMER_UNLEARN)
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 11192:
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false);
//unknown textID (TALK_AXE_UNLEARN)
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 11193:
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false);
//unknown textID (TALK_SWORD_UNLEARN)
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
}
}
}
bool GossipSelect_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch(sender)
{
case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_blacksmith(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_blacksmith(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_blacksmith(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_blacksmith(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_blacksmith(pPlayer, pCreature, action); break;
case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_blacksmith(pPlayer, pCreature, action); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_blacksmith(pPlayer, pCreature, action); break;
case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_blacksmith(pPlayer, pCreature, action); break;
}
return true;
}
/*bool QuestComplete_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, Quest const *_Quest)
/*bool QuestComplete_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, Quest const *_Quest)
{
if ((_Quest->GetQuestId() == 5283) || (_Quest->GetQuestId() == 5301)) //armorsmith
_Creature->CastSpell(pPlayer, 17451, true);
pCreature->CastSpell(pPlayer, 17451, true);
if ((_Quest->GetQuestId() == 5284) || (_Quest->GetQuestId() == 5302)) //weaponsmith
_Creature->CastSpell(pPlayer, 17452, true);
pCreature->CastSpell(pPlayer, 17452, true);
return true;
}*/
@@ -947,16 +947,16 @@ bool GossipSelect_npc_engineering_tele_trinket(Player* pPlayer, Creature* pCreat
# start menues leatherworking
###*/
bool GossipHello_npc_prof_leather(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_prof_leather(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (_Creature->isVendor())
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pCreature->isVendor())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
if (_Creature->isTrainer())
if (pCreature->isTrainer())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
uint32 eCreature = _Creature->GetEntry();
uint32 eCreature = pCreature->GetEntry();
if (pPlayer->HasSkill(SKILL_LEATHERWORKING) && pPlayer->GetBaseSkillValue(SKILL_LEATHERWORKING)>=250 && pPlayer->getLevel() > 49)
{
@@ -980,19 +980,19 @@ bool GossipHello_npc_prof_leather(Player* pPlayer, Creature *_Creature)
}
}
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint32 action)
void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 action)
{
switch(action)
{
case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
pPlayer->SEND_VENDORLIST(pCreature->GetGUID());
break;
case GOSSIP_ACTION_TRAIN:
pPlayer->SEND_TRAINERLIST(_Creature->GetGUID());
pPlayer->SEND_TRAINERLIST(pCreature->GetGUID());
break;
//Unlearn Leather
case GOSSIP_ACTION_INFO_DEF + 1:
@@ -1004,7 +1004,7 @@ void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint3
ProfessionUnlearnSpells(pPlayer, S_UNLEARN_DRAGON);
pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
} else
pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
pPlayer->CLOSE_GOSSIP_MENU();
@@ -1018,7 +1018,7 @@ void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint3
ProfessionUnlearnSpells(pPlayer, S_UNLEARN_ELEMENTAL);
pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
} else
pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
pPlayer->CLOSE_GOSSIP_MENU();
@@ -1032,7 +1032,7 @@ void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint3
ProfessionUnlearnSpells(pPlayer, S_UNLEARN_TRIBAL);
pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
} else
pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
pPlayer->CLOSE_GOSSIP_MENU();
@@ -1040,42 +1040,42 @@ void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint3
}
}
void SendConfirmUnlearn_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint32 action)
void SendConfirmUnlearn_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 action)
{
if (action)
{
uint32 eCreature = _Creature->GetEntry();
uint32 eCreature = pCreature->GetEntry();
switch(eCreature)
{
case 7866: //Peter Galen
case 7867: //Thorkaf Dragoneye
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 7868: //Sarah Tanner
case 7869: //Brumn Winterhoof
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 7870: //Caryssia Moonhunter
case 7871: //Se'Jib
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
}
}
}
bool GossipSelect_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch(sender)
{
case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_leather(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_leather(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_leather(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_leather(pPlayer, pCreature, action); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_leather(pPlayer, pCreature, action); break;
case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_leather(pPlayer, pCreature, action); break;
}
return true;
}
@@ -1091,16 +1091,16 @@ bool HasTailorSpell(Player* pPlayer)
return false;
}
bool GossipHello_npc_prof_tailor(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_prof_tailor(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (_Creature->isVendor())
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pCreature->isVendor())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
if (_Creature->isTrainer())
if (pCreature->isTrainer())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
uint32 eCreature = _Creature->GetEntry();
uint32 eCreature = pCreature->GetEntry();
//TAILORING SPEC
if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING)>=350 && pPlayer->getLevel() > 59)
{
@@ -1130,19 +1130,19 @@ bool GossipHello_npc_prof_tailor(Player* pPlayer, Creature *_Creature)
}
}
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 action)
void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 action)
{
switch(action)
{
case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
pPlayer->SEND_VENDORLIST(pCreature->GetGUID());
break;
case GOSSIP_ACTION_TRAIN:
pPlayer->SEND_TRAINERLIST(_Creature->GetGUID());
pPlayer->SEND_TRAINERLIST(pCreature->GetGUID());
break;
//Learn Tailor
case GOSSIP_ACTION_INFO_DEF + 1:
@@ -1151,7 +1151,7 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32
pPlayer->CastSpell(pPlayer, S_LEARN_SPELLFIRE, true);
pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
pPlayer->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 2:
@@ -1160,7 +1160,7 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32
pPlayer->CastSpell(pPlayer, S_LEARN_MOONCLOTH, true);
pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
pPlayer->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 3:
@@ -1169,7 +1169,7 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32
pPlayer->CastSpell(pPlayer, S_LEARN_SHADOWEAVE, true);
pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
pPlayer->CLOSE_GOSSIP_MENU();
break;
//Unlearn Tailor
@@ -1182,7 +1182,7 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32
ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SPELLFIRE);
pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
} else
pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
pPlayer->CLOSE_GOSSIP_MENU();
@@ -1196,7 +1196,7 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32
ProfessionUnlearnSpells(pPlayer, S_UNLEARN_MOONCLOTH);
pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
} else
pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
pPlayer->CLOSE_GOSSIP_MENU();
@@ -1210,7 +1210,7 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32
ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SHADOWEAVE);
pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
} else
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
} else
pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
pPlayer->CLOSE_GOSSIP_MENU();
@@ -1218,66 +1218,66 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32
}
}
void SendConfirmLearn_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 action)
void SendConfirmLearn_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 action)
{
if (action)
{
uint32 eCreature = _Creature->GetEntry();
uint32 eCreature = pCreature->GetEntry();
switch(eCreature)
{
case 22213:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 22208:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, action);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 22212:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, action);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
}
}
}
void SendConfirmUnlearn_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 action)
void SendConfirmUnlearn_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 action)
{
if (action)
{
uint32 eCreature = _Creature->GetEntry();
uint32 eCreature = pCreature->GetEntry();
switch(eCreature)
{
case 22213: //Gidge Spellweaver
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 22208: //Nasmara Moonsong
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
case 22212: //Andrion Darkspinner
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, action,BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false);
//unknown textID ()
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
break;
}
}
}
bool GossipSelect_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch(sender)
{
case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_tailor(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_tailor(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_tailor(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_tailor(pPlayer, _Creature, action); break;
case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_tailor(pPlayer, pCreature, action); break;
case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_tailor(pPlayer, pCreature, action); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_tailor(pPlayer, pCreature, action); break;
case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_tailor(pPlayer, pCreature, action); break;
}
return true;
}
src/bindings/scripts/scripts/npc/npc_taxi.cpp
+7 -7
View File
@@ -24,12 +24,12 @@ EndScriptData
#include "precompiled.h"
bool GossipHello_npc_taxi(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_taxi(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
switch(_Creature->GetEntry()) {
switch(pCreature->GetEntry()) {
case 17435: // Azuremyst Isle - Susurrus
if (pPlayer->HasItemCount(23843,1,true))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
@@ -129,11 +129,11 @@ bool GossipHello_npc_taxi(Player* pPlayer, Creature *_Creature)
break;
}
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch(action) {
case GOSSIP_ACTION_INFO_DEF:
@@ -147,7 +147,7 @@ bool GossipSelect_npc_taxi(Player* pPlayer, Creature *_Creature, uint32 sender,
break;
case GOSSIP_ACTION_INFO_DEF + 2:
if (!pPlayer->HasItemCount(25853,1)) {
pPlayer->SEND_GOSSIP_MENU(9780, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(9780, pCreature->GetGUID());
} else {
pPlayer->CLOSE_GOSSIP_MENU();
pPlayer->ActivateTaxiPathTo(534); //TaxiPath 534
src/bindings/scripts/scripts/npc/npcs_special.cpp
+95 -95
View File
@@ -313,23 +313,23 @@ struct TRINITY_DLL_DECL npc_chicken_cluckAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_chicken_cluck(Creature *_Creature)
CreatureAI* GetAI_npc_chicken_cluck(Creature* pCreature)
{
return new npc_chicken_cluckAI(_Creature);
return new npc_chicken_cluckAI(pCreature);
}
bool QuestAccept_npc_chicken_cluck(Player* pPlayer, Creature *_Creature, const Quest *_Quest)
bool QuestAccept_npc_chicken_cluck(Player* pPlayer, Creature* pCreature, const Quest *_Quest)
{
if (_Quest->GetQuestId() == QUEST_CLUCK)
CAST_AI(npc_chicken_cluckAI, _Creature->AI())->Reset();
CAST_AI(npc_chicken_cluckAI, pCreature->AI())->Reset();
return true;
}
bool QuestComplete_npc_chicken_cluck(Player* pPlayer, Creature *_Creature, const Quest *_Quest)
bool QuestComplete_npc_chicken_cluck(Player* pPlayer, Creature* pCreature, const Quest *_Quest)
{
if (_Quest->GetQuestId() == QUEST_CLUCK)
CAST_AI(npc_chicken_cluckAI, _Creature->AI())->Reset();
CAST_AI(npc_chicken_cluckAI, pCreature->AI())->Reset();
return true;
}
@@ -406,9 +406,9 @@ struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_dancing_flames(Creature *_Creature)
CreatureAI* GetAI_npc_dancing_flames(Creature* pCreature)
{
return new npc_dancing_flamesAI(_Creature);
return new npc_dancing_flamesAI(pCreature);
}
/*######
@@ -637,9 +637,9 @@ struct TRINITY_DLL_DECL npc_injured_patientAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_injured_patient(Creature *_Creature)
CreatureAI* GetAI_npc_injured_patient(Creature* pCreature)
{
return new npc_injured_patientAI (_Creature);
return new npc_injured_patientAI (pCreature);
}
/*
@@ -791,9 +791,9 @@ bool QuestAccept_npc_doctor(Player* pPlayer, Creature *creature, Quest const *qu
return true;
}
CreatureAI* GetAI_npc_doctor(Creature *_Creature)
CreatureAI* GetAI_npc_doctor(Creature* pCreature)
{
return new npc_doctorAI (_Creature);
return new npc_doctorAI (pCreature);
}
/*######
@@ -1044,9 +1044,9 @@ struct TRINITY_DLL_DECL npc_guardianAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_guardian(Creature *_Creature)
CreatureAI* GetAI_npc_guardian(Creature* pCreature)
{
return new npc_guardianAI (_Creature);
return new npc_guardianAI (pCreature);
}
/*######
@@ -1091,14 +1091,14 @@ bool GossipSelect_npc_kingdom_of_dalaran_quests(Player* pPlayer, Creature* pCrea
## npc_mount_vendor
######*/
bool GossipHello_npc_mount_vendor(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_mount_vendor(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
bool canBuy;
canBuy = false;
uint32 vendor = _Creature->GetEntry();
uint32 vendor = pCreature->GetEntry();
uint8 race = pPlayer->getRace();
switch (vendor)
@@ -1108,69 +1108,69 @@ bool GossipHello_npc_mount_vendor(Player* pPlayer, Creature *_Creature)
case 2357: //Merideth Carlson
case 4885: //Gregor MacVince
if (pPlayer->GetReputationRank(72) != REP_EXALTED && race != RACE_HUMAN)
pPlayer->SEND_GOSSIP_MENU(5855, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(5855, pCreature->GetGUID());
else canBuy = true;
break;
case 1261: //Veron Amberstill
if (pPlayer->GetReputationRank(47) != REP_EXALTED && race != RACE_DWARF)
pPlayer->SEND_GOSSIP_MENU(5856, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(5856, pCreature->GetGUID());
else canBuy = true;
break;
case 3362: //Ogunaro Wolfrunner
if (pPlayer->GetReputationRank(76) != REP_EXALTED && race != RACE_ORC)
pPlayer->SEND_GOSSIP_MENU(5841, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(5841, pCreature->GetGUID());
else canBuy = true;
break;
case 3685: //Harb Clawhoof
if (pPlayer->GetReputationRank(81) != REP_EXALTED && race != RACE_TAUREN)
pPlayer->SEND_GOSSIP_MENU(5843, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(5843, pCreature->GetGUID());
else canBuy = true;
break;
case 4730: //Lelanai
if (pPlayer->GetReputationRank(69) != REP_EXALTED && race != RACE_NIGHTELF)
pPlayer->SEND_GOSSIP_MENU(5844, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(5844, pCreature->GetGUID());
else canBuy = true;
break;
case 4731: //Zachariah Post
if (pPlayer->GetReputationRank(68) != REP_EXALTED && race != RACE_UNDEAD_PLAYER)
pPlayer->SEND_GOSSIP_MENU(5840, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(5840, pCreature->GetGUID());
else canBuy = true;
break;
case 7952: //Zjolnir
if (pPlayer->GetReputationRank(530) != REP_EXALTED && race != RACE_TROLL)
pPlayer->SEND_GOSSIP_MENU(5842, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(5842, pCreature->GetGUID());
else canBuy = true;
break;
case 7955: //Milli Featherwhistle
if (pPlayer->GetReputationRank(54) != REP_EXALTED && race != RACE_GNOME)
pPlayer->SEND_GOSSIP_MENU(5857, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(5857, pCreature->GetGUID());
else canBuy = true;
break;
case 16264: //Winaestra
if (pPlayer->GetReputationRank(911) != REP_EXALTED && race != RACE_BLOODELF)
pPlayer->SEND_GOSSIP_MENU(10305, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(10305, pCreature->GetGUID());
else canBuy = true;
break;
case 17584: //Torallius the Pack Handler
if (pPlayer->GetReputationRank(930) != REP_EXALTED && race != RACE_DRAENEI)
pPlayer->SEND_GOSSIP_MENU(10239, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(10239, pCreature->GetGUID());
else canBuy = true;
break;
}
if (canBuy)
{
if (_Creature->isVendor())
if (pCreature->isVendor())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
}
return true;
}
bool GossipSelect_npc_mount_vendor(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_mount_vendor(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
pPlayer->SEND_VENDORLIST(pCreature->GetGUID());
return true;
}
@@ -1179,28 +1179,28 @@ bool GossipSelect_npc_mount_vendor(Player* pPlayer, Creature *_Creature, uint32
## npc_rogue_trainer
######*/
bool GossipHello_npc_rogue_trainer(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_rogue_trainer(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (_Creature->isTrainer())
if (pCreature->isTrainer())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
if (_Creature->isCanTrainingAndResetTalentsOf(pPlayer))
if (pCreature->isCanTrainingAndResetTalentsOf(pPlayer))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "I wish to unlearn my talents", GOSSIP_SENDER_MAIN, GOSSIP_OPTION_UNLEARNTALENTS);
if (pPlayer->getClass() == CLASS_ROGUE && pPlayer->getLevel() >= 24 && !pPlayer->HasItemCount(17126,1) && !pPlayer->GetQuestRewardStatus(6681))
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "<Take the letter>", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(5996, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(5996, pCreature->GetGUID());
} else
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch(action)
{
@@ -1209,11 +1209,11 @@ bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature *_Creature, uint32
pPlayer->CastSpell(pPlayer,21100,false);
break;
case GOSSIP_ACTION_TRAIN:
pPlayer->SEND_TRAINERLIST(_Creature->GetGUID());
pPlayer->SEND_TRAINERLIST(pCreature->GetGUID());
break;
case GOSSIP_OPTION_UNLEARNTALENTS:
pPlayer->CLOSE_GOSSIP_MENU();
pPlayer->SendTalentWipeConfirm(_Creature->GetGUID());
pPlayer->SendTalentWipeConfirm(pCreature->GetGUID());
break;
}
return true;
@@ -1233,10 +1233,10 @@ bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature *_Creature, uint32
#define SPELL_AGI 23736 //agi
#define SPELL_FORTUNE 23765 //faire fortune
bool GossipHello_npc_sayge(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_sayge(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pPlayer->HasSpellCooldown(SPELL_INT) ||
pPlayer->HasSpellCooldown(SPELL_ARM) ||
@@ -1246,17 +1246,17 @@ bool GossipHello_npc_sayge(Player* pPlayer, Creature *_Creature)
pPlayer->HasSpellCooldown(SPELL_AGI) ||
pPlayer->HasSpellCooldown(SPELL_STM) ||
pPlayer->HasSpellCooldown(SPELL_SPI))
pPlayer->SEND_GOSSIP_MENU(7393, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(7393, pCreature->GetGUID());
else
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(7339, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(7339, pCreature->GetGUID());
}
return true;
}
void SendAction_npc_sayge(Player* pPlayer, Creature *_Creature, uint32 action)
void SendAction_npc_sayge(Player* pPlayer, Creature* pCreature, uint32 action)
{
switch(action)
{
@@ -1265,89 +1265,89 @@ void SendAction_npc_sayge(Player* pPlayer, Creature *_Creature, uint32 action)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Turn him over to liege", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Confiscate the corn", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let him go and have the corn", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(7340, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(7340, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Execute your friend painfully", GOSSIP_SENDER_MAIN+1, GOSSIP_ACTION_INFO_DEF);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Execute your friend painlessly", GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let your friend go", GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(7341, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(7341, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Confront the diplomat", GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Show not so quiet defiance", GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Remain quiet", GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(7361, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(7361, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Speak against your brother openly", GOSSIP_SENDER_MAIN+6, GOSSIP_ACTION_INFO_DEF);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Help your brother in", GOSSIP_SENDER_MAIN+7, GOSSIP_ACTION_INFO_DEF);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Keep your brother out without letting him know", GOSSIP_SENDER_MAIN+8, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(7362, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(7362, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Take credit, keep gold", GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Take credit, share the gold", GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let the knight take credit", GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(7363, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(7363, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thanks", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
pPlayer->SEND_GOSSIP_MENU(7364, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(7364, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+6:
_Creature->CastSpell(pPlayer, SPELL_FORTUNE, false);
pPlayer->SEND_GOSSIP_MENU(7365, _Creature->GetGUID());
pCreature->CastSpell(pPlayer, SPELL_FORTUNE, false);
pPlayer->SEND_GOSSIP_MENU(7365, pCreature->GetGUID());
break;
}
}
bool GossipSelect_npc_sayge(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_sayge(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch(sender)
{
case GOSSIP_SENDER_MAIN:
SendAction_npc_sayge(pPlayer, _Creature, action);
SendAction_npc_sayge(pPlayer, pCreature, action);
break;
case GOSSIP_SENDER_MAIN+1:
_Creature->CastSpell(pPlayer, SPELL_DMG, false);
pCreature->CastSpell(pPlayer, SPELL_DMG, false);
pPlayer->AddSpellCooldown(SPELL_DMG,0,time(NULL) + 7200);
SendAction_npc_sayge(pPlayer, _Creature, action);
SendAction_npc_sayge(pPlayer, pCreature, action);
break;
case GOSSIP_SENDER_MAIN+2:
_Creature->CastSpell(pPlayer, SPELL_RES, false);
pCreature->CastSpell(pPlayer, SPELL_RES, false);
pPlayer->AddSpellCooldown(SPELL_RES,0,time(NULL) + 7200);
SendAction_npc_sayge(pPlayer, _Creature, action);
SendAction_npc_sayge(pPlayer, pCreature, action);
break;
case GOSSIP_SENDER_MAIN+3:
_Creature->CastSpell(pPlayer, SPELL_ARM, false);
pCreature->CastSpell(pPlayer, SPELL_ARM, false);
pPlayer->AddSpellCooldown(SPELL_ARM,0,time(NULL) + 7200);
SendAction_npc_sayge(pPlayer, _Creature, action);
SendAction_npc_sayge(pPlayer, pCreature, action);
break;
case GOSSIP_SENDER_MAIN+4:
_Creature->CastSpell(pPlayer, SPELL_SPI, false);
pCreature->CastSpell(pPlayer, SPELL_SPI, false);
pPlayer->AddSpellCooldown(SPELL_SPI,0,time(NULL) + 7200);
SendAction_npc_sayge(pPlayer, _Creature, action);
SendAction_npc_sayge(pPlayer, pCreature, action);
break;
case GOSSIP_SENDER_MAIN+5:
_Creature->CastSpell(pPlayer, SPELL_INT, false);
pCreature->CastSpell(pPlayer, SPELL_INT, false);
pPlayer->AddSpellCooldown(SPELL_INT,0,time(NULL) + 7200);
SendAction_npc_sayge(pPlayer, _Creature, action);
SendAction_npc_sayge(pPlayer, pCreature, action);
break;
case GOSSIP_SENDER_MAIN+6:
_Creature->CastSpell(pPlayer, SPELL_STM, false);
pCreature->CastSpell(pPlayer, SPELL_STM, false);
pPlayer->AddSpellCooldown(SPELL_STM,0,time(NULL) + 7200);
SendAction_npc_sayge(pPlayer, _Creature, action);
SendAction_npc_sayge(pPlayer, pCreature, action);
break;
case GOSSIP_SENDER_MAIN+7:
_Creature->CastSpell(pPlayer, SPELL_STR, false);
pCreature->CastSpell(pPlayer, SPELL_STR, false);
pPlayer->AddSpellCooldown(SPELL_STR,0,time(NULL) + 7200);
SendAction_npc_sayge(pPlayer, _Creature, action);
SendAction_npc_sayge(pPlayer, pCreature, action);
break;
case GOSSIP_SENDER_MAIN+8:
_Creature->CastSpell(pPlayer, SPELL_AGI, false);
pCreature->CastSpell(pPlayer, SPELL_AGI, false);
pPlayer->AddSpellCooldown(SPELL_AGI,0,time(NULL) + 7200);
SendAction_npc_sayge(pPlayer, _Creature, action);
SendAction_npc_sayge(pPlayer, pCreature, action);
break;
}
return true;
@@ -1376,9 +1376,9 @@ struct TRINITY_DLL_DECL npc_steam_tonkAI : public ScriptedAI
};
CreatureAI* GetAI_npc_steam_tonk(Creature *_Creature)
CreatureAI* GetAI_npc_steam_tonk(Creature* pCreature)
{
return new npc_steam_tonkAI(_Creature);
return new npc_steam_tonkAI(pCreature);
}
#define SPELL_TONK_MINE_DETONATE 25099
@@ -1412,16 +1412,16 @@ struct TRINITY_DLL_DECL npc_tonk_mineAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_tonk_mine(Creature *_Creature)
CreatureAI* GetAI_npc_tonk_mine(Creature* pCreature)
{
return new npc_tonk_mineAI(_Creature);
return new npc_tonk_mineAI(pCreature);
}
/*####
## npc_winter_reveler
####*/
bool ReceiveEmote_npc_winter_reveler(Player* pPlayer, Creature *_Creature, uint32 emote)
bool ReceiveEmote_npc_winter_reveler(Player* pPlayer, Creature* pCreature, uint32 emote)
{
//TODO: check auralist.
if (pPlayer->HasAura(26218))
@@ -1429,13 +1429,13 @@ bool ReceiveEmote_npc_winter_reveler(Player* pPlayer, Creature *_Creature, uint3
if (emote == TEXTEMOTE_KISS)
{
_Creature->CastSpell(_Creature, 26218, false);
pCreature->CastSpell(pCreature, 26218, false);
pPlayer->CastSpell(pPlayer, 26218, false);
switch(rand()%3)
{
case 0: _Creature->CastSpell(pPlayer, 26207, false); break;
case 1: _Creature->CastSpell(pPlayer, 26206, false); break;
case 2: _Creature->CastSpell(pPlayer, 45036, false); break;
case 0: pCreature->CastSpell(pPlayer, 26207, false); break;
case 1: pCreature->CastSpell(pPlayer, 26206, false); break;
case 2: pCreature->CastSpell(pPlayer, 45036, false); break;
}
}
return true;
@@ -1445,10 +1445,10 @@ bool ReceiveEmote_npc_winter_reveler(Player* pPlayer, Creature *_Creature, uint3
## npc_brewfest_reveler
####*/
bool ReceiveEmote_npc_brewfest_reveler(Player* pPlayer, Creature *_Creature, uint32 emote)
bool ReceiveEmote_npc_brewfest_reveler(Player* pPlayer, Creature* pCreature, uint32 emote)
{
if (emote == TEXTEMOTE_DANCE)
_Creature->CastSpell(pPlayer, 41586, false);
pCreature->CastSpell(pPlayer, 41586, false);
return true;
}
@@ -1570,9 +1570,9 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_snake_trap_serpents(Creature *_Creature)
CreatureAI* GetAI_npc_snake_trap_serpents(Creature* pCreature)
{
return new npc_snake_trap_serpentsAI(_Creature);
return new npc_snake_trap_serpentsAI(pCreature);
}
struct TRINITY_DLL_DECL mob_mojoAI : public ScriptedAI
@@ -1640,9 +1640,9 @@ struct TRINITY_DLL_DECL mob_mojoAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_mojo(Creature *_Creature)
CreatureAI* GetAI_mob_mojo(Creature* pCreature)
{
return new mob_mojoAI (_Creature);
return new mob_mojoAI (pCreature);
}
struct TRINITY_DLL_DECL npc_mirror_image : SpellCasterAI
@@ -1680,9 +1680,9 @@ struct TRINITY_DLL_DECL npc_mirror_image : SpellCasterAI
}
};
CreatureAI* GetAI_npc_mirror_image(Creature *_Creature)
CreatureAI* GetAI_npc_mirror_image(Creature* pCreature)
{
return new npc_mirror_image (_Creature);
return new npc_mirror_image (pCreature);
}
//TODO: 30% Attackdamage check for Lightwell
@@ -1714,9 +1714,9 @@ struct TRINITY_DLL_DECL npc_lightwellAI : public PassiveAI
*/
};
CreatureAI* GetAI_npc_lightwellAI(Creature *_Creature)
CreatureAI* GetAI_npc_lightwellAI(Creature* pCreature)
{
return new npc_lightwellAI (_Creature);
return new npc_lightwellAI (pCreature);
}
struct TRINITY_DLL_DECL npc_training_dummy : Scripted_NoMovementAI
@@ -1756,9 +1756,9 @@ struct TRINITY_DLL_DECL npc_training_dummy : Scripted_NoMovementAI
void MoveInLineOfSight(Unit *who){return;}
};
CreatureAI* GetAI_npc_training_dummy(Creature *_Creature)
CreatureAI* GetAI_npc_training_dummy(Creature* pCreature)
{
return new npc_training_dummy (_Creature);
return new npc_training_dummy (pCreature);
}
void AddSC_npcs_special()
src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp
+2 -2
View File
@@ -123,9 +123,9 @@ bool QuestAccept_npc_professor_phizzlethorpe(Player* pPlayer, Creature* creature
return true;
}
CreatureAI* GetAI_npc_professor_phizzlethorpeAI(Creature *_Creature)
CreatureAI* GetAI_npc_professor_phizzlethorpeAI(Creature* pCreature)
{
npc_professor_phizzlethorpeAI* professor_phizzlethorpeAI = new npc_professor_phizzlethorpeAI(_Creature);
npc_professor_phizzlethorpeAI* professor_phizzlethorpeAI = new npc_professor_phizzlethorpeAI(pCreature);
professor_phizzlethorpeAI->FillPointMovementListForCreature();
src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp
+2 -2
View File
@@ -249,9 +249,9 @@ bool QuestAccept_npc_ruul_snowhoof(Player* pPlayer, Creature* creature, Quest co
return true;
}
CreatureAI* GetAI_npc_ruul_snowhoofAI(Creature *_Creature)
CreatureAI* GetAI_npc_ruul_snowhoofAI(Creature* pCreature)
{
npc_ruul_snowhoofAI* ruul_snowhoofAI = new npc_ruul_snowhoofAI(_Creature);
npc_ruul_snowhoofAI* ruul_snowhoofAI = new npc_ruul_snowhoofAI(pCreature);
ruul_snowhoofAI->FillPointMovementListForCreature();
src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
+6 -6
View File
@@ -111,9 +111,9 @@ struct TRINITY_DLL_DECL mob_stolen_soulAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_stolen_soul(Creature *_Creature)
CreatureAI* GetAI_mob_stolen_soul(Creature* pCreature)
{
return new mob_stolen_soulAI (_Creature);
return new mob_stolen_soulAI (pCreature);
}
#define SAY_INTRO -1558000
@@ -293,9 +293,9 @@ struct TRINITY_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_exarch_maladaar(Creature *_Creature)
CreatureAI* GetAI_boss_exarch_maladaar(Creature* pCreature)
{
return new boss_exarch_maladaarAI (_Creature);
return new boss_exarch_maladaarAI (pCreature);
}
#define SPELL_AV_MORTAL_STRIKE 16856
@@ -331,9 +331,9 @@ struct TRINITY_DLL_DECL mob_avatar_of_martyredAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_avatar_of_martyred(Creature *_Creature)
CreatureAI* GetAI_mob_avatar_of_martyred(Creature* pCreature)
{
return new mob_avatar_of_martyredAI (_Creature);
return new mob_avatar_of_martyredAI (pCreature);
}
void AddSC_boss_exarch_maladaar()
src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
+4 -4
View File
@@ -143,9 +143,9 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_shirrak_the_dead_watcher(Creature *_Creature)
CreatureAI* GetAI_boss_shirrak_the_dead_watcher(Creature* pCreature)
{
return new boss_shirrak_the_dead_watcherAI (_Creature);
return new boss_shirrak_the_dead_watcherAI (pCreature);
}
struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI
@@ -189,9 +189,9 @@ struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_focus_fire(Creature *_Creature)
CreatureAI* GetAI_mob_focus_fire(Creature* pCreature)
{
return new mob_focus_fireAI (_Creature);
return new mob_focus_fireAI (pCreature);
}
void AddSC_boss_shirrak_the_dead_watcher()
src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
+6 -6
View File
@@ -210,9 +210,9 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_nexusprince_shaffar(Creature *_Creature)
CreatureAI* GetAI_boss_nexusprince_shaffar(Creature* pCreature)
{
return new boss_nexusprince_shaffarAI (_Creature);
return new boss_nexusprince_shaffarAI (pCreature);
}
enum
@@ -297,9 +297,9 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_ethereal_beacon(Creature *_Creature)
CreatureAI* GetAI_mob_ethereal_beacon(Creature* pCreature)
{
return new mob_ethereal_beaconAI (_Creature);
return new mob_ethereal_beaconAI (pCreature);
}
enum
@@ -342,9 +342,9 @@ struct TRINITY_DLL_DECL mob_ethereal_apprenticeAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_ethereal_apprentice(Creature *_Creature)
CreatureAI* GetAI_mob_ethereal_apprentice(Creature* pCreature)
{
return new mob_ethereal_apprenticeAI (_Creature);
return new mob_ethereal_apprenticeAI (pCreature);
}
void AddSC_boss_nexusprince_shaffar()
src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp
+2 -2
View File
@@ -122,9 +122,9 @@ struct TRINITY_DLL_DECL boss_pandemoniusAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_pandemonius(Creature *_Creature)
CreatureAI* GetAI_boss_pandemonius(Creature* pCreature)
{
return new boss_pandemoniusAI (_Creature);
return new boss_pandemoniusAI (pCreature);
}
void AddSC_boss_pandemonius()
src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp
+10 -10
View File
@@ -196,9 +196,9 @@ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_darkweaver_syth(Creature *_Creature)
CreatureAI* GetAI_boss_darkweaver_syth(Creature* pCreature)
{
return new boss_darkweaver_sythAI (_Creature);
return new boss_darkweaver_sythAI (pCreature);
}
/* ELEMENTALS */
@@ -249,9 +249,9 @@ struct TRINITY_DLL_DECL mob_syth_fireAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_syth_fire(Creature *_Creature)
CreatureAI* GetAI_mob_syth_fire(Creature* pCreature)
{
return new mob_syth_fireAI (_Creature);
return new mob_syth_fireAI (pCreature);
}
struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI
@@ -300,9 +300,9 @@ struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_syth_arcane(Creature *_Creature)
CreatureAI* GetAI_mob_syth_arcane(Creature* pCreature)
{
return new mob_syth_arcaneAI (_Creature);
return new mob_syth_arcaneAI (pCreature);
}
struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI
@@ -351,9 +351,9 @@ struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_syth_frost(Creature *_Creature)
CreatureAI* GetAI_mob_syth_frost(Creature* pCreature)
{
return new mob_syth_frostAI (_Creature);
return new mob_syth_frostAI (pCreature);
}
struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI
@@ -402,9 +402,9 @@ struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_syth_shadow(Creature *_Creature)
CreatureAI* GetAI_mob_syth_shadow(Creature* pCreature)
{
return new mob_syth_shadowAI (_Creature);
return new mob_syth_shadowAI (pCreature);
}
void AddSC_boss_darkweaver_syth()
src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
+2 -2
View File
@@ -205,9 +205,9 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_talon_king_ikiss(Creature *_Creature)
CreatureAI* GetAI_boss_talon_king_ikiss(Creature* pCreature)
{
return new boss_talon_king_ikissAI (_Creature);
return new boss_talon_king_ikissAI (pCreature);
}
void AddSC_boss_talon_king_ikiss()
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
+2 -2
View File
@@ -197,9 +197,9 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_ambassador_hellmaw(Creature *_Creature)
CreatureAI* GetAI_boss_ambassador_hellmaw(Creature* pCreature)
{
return new boss_ambassador_hellmawAI (_Creature);
return new boss_ambassador_hellmawAI (pCreature);
}
void AddSC_boss_ambassador_hellmaw()
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
+2 -2
View File
@@ -161,9 +161,9 @@ struct TRINITY_DLL_DECL boss_blackheart_the_inciterAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_blackheart_the_inciter(Creature *_Creature)
CreatureAI* GetAI_boss_blackheart_the_inciter(Creature* pCreature)
{
return new boss_blackheart_the_inciterAI (_Creature);
return new boss_blackheart_the_inciterAI (pCreature);
}
void AddSC_boss_blackheart_the_inciter()
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
+4 -4
View File
@@ -117,9 +117,9 @@ struct TRINITY_DLL_DECL mob_voidtravelerAI : public ScriptedAI
}else move -= diff;
}
};
CreatureAI* GetAI_mob_voidtraveler(Creature *_Creature)
CreatureAI* GetAI_mob_voidtraveler(Creature* pCreature)
{
return new mob_voidtravelerAI (_Creature);
return new mob_voidtravelerAI (pCreature);
}
struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
@@ -300,9 +300,9 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_grandmaster_vorpil(Creature *_Creature)
CreatureAI* GetAI_boss_grandmaster_vorpil(Creature* pCreature)
{
return new boss_grandmaster_vorpilAI (_Creature);
return new boss_grandmaster_vorpilAI (pCreature);
}
void AddSC_boss_grandmaster_vorpil()
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp
+2 -2
View File
@@ -191,9 +191,9 @@ struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_murmur(Creature *_Creature)
CreatureAI* GetAI_boss_murmur(Creature* pCreature)
{
return new boss_murmurAI (_Creature);
return new boss_murmurAI (pCreature);
}
void AddSC_boss_murmur()
src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp
+2 -2
View File
@@ -63,9 +63,9 @@ struct TRINITY_DLL_DECL boss_amanitarAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_amanitar(Creature *_Creature)
CreatureAI* GetAI_boss_amanitar(Creature* pCreature)
{
return new boss_amanitarAI (_Creature);
return new boss_amanitarAI (pCreature);
}
void AddSC_boss_amanitar()
src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
+4 -4
View File
@@ -194,9 +194,9 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_elder_nadox(Creature *_Creature)
CreatureAI* GetAI_boss_elder_nadox(Creature* pCreature)
{
return new boss_elder_nadoxAI(_Creature);
return new boss_elder_nadoxAI(pCreature);
}
#define SPELL_SPRINT 56354
@@ -253,9 +253,9 @@ struct TRINITY_DLL_DECL mob_ahnkahar_nerubianAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_ahnkahar_nerubian(Creature *_Creature)
CreatureAI* GetAI_mob_ahnkahar_nerubian(Creature* pCreature)
{
return new mob_ahnkahar_nerubianAI(_Creature);
return new mob_ahnkahar_nerubianAI(pCreature);
}
void AddSC_boss_elder_nadox()
src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
+2 -2
View File
@@ -95,9 +95,9 @@ struct TRINITY_DLL_DECL boss_volazjAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_volazj(Creature *_Creature)
CreatureAI* GetAI_boss_volazj(Creature* pCreature)
{
return new boss_volazjAI (_Creature);
return new boss_volazjAI (pCreature);
}
void AddSC_boss_volazj()
src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+2 -2
View File
@@ -93,9 +93,9 @@ struct TRINITY_DLL_DECL boss_jedogaAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_jedoga(Creature *_Creature)
CreatureAI* GetAI_boss_jedoga(Creature* pCreature)
{
return new boss_jedogaAI (_Creature);
return new boss_jedogaAI (pCreature);
}
void AddSC_boss_jedoga()
src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
+2 -2
View File
@@ -93,9 +93,9 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_taldaram(Creature *_Creature)
CreatureAI* GetAI_boss_taldaram(Creature* pCreature)
{
return new boss_taldaramAI (_Creature);
return new boss_taldaramAI (pCreature);
}
void AddSC_boss_taldaram()
src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp
+2 -2
View File
@@ -96,9 +96,9 @@ struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_anub_arak(Creature *_Creature)
CreatureAI* GetAI_boss_anub_arak(Creature* pCreature)
{
return new boss_anub_arakAI (_Creature);
return new boss_anub_arakAI (pCreature);
}
void AddSC_boss_anub_arak()
src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp
+2 -2
View File
@@ -98,9 +98,9 @@ struct TRINITY_DLL_DECL boss_hadronoxAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_hadronox(Creature *_Creature)
CreatureAI* GetAI_boss_hadronox(Creature* pCreature)
{
return new boss_hadronoxAI (_Creature);
return new boss_hadronoxAI (pCreature);
}
void AddSC_boss_hadronox()
src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
+2 -2
View File
@@ -99,9 +99,9 @@ struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_krik_thir(Creature *_Creature)
CreatureAI* GetAI_boss_krik_thir(Creature* pCreature)
{
return new boss_krik_thirAI (_Creature);
return new boss_krik_thirAI (pCreature);
}
void AddSC_boss_krik_thir()
src/bindings/scripts/scripts/zone/azshara/azshara.cpp
+22 -22
View File
@@ -88,19 +88,19 @@ struct TRINITY_DLL_DECL mobs_spitelashesAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_mobs_spitelashes(Creature *_Creature)
CreatureAI* GetAI_mobs_spitelashes(Creature* pCreature)
{
return new mobs_spitelashesAI (_Creature);
return new mobs_spitelashesAI (pCreature);
}
/*######
## npc_loramus_thalipedes
######*/
bool GossipHello_npc_loramus_thalipedes(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_loramus_thalipedes(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pPlayer->GetQuestStatus(2744) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Can you help me?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
@@ -108,12 +108,12 @@ bool GossipHello_npc_loramus_thalipedes(Player* pPlayer, Creature *_Creature)
if (pPlayer->GetQuestStatus(3141) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me your story", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_loramus_thalipedes(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_loramus_thalipedes(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch (action)
{
@@ -124,23 +124,23 @@ bool GossipSelect_npc_loramus_thalipedes(Player* pPlayer, Creature *_Creature, u
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Please continue", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
pPlayer->SEND_GOSSIP_MENU(1813, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1813, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+21:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I do not understand", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
pPlayer->SEND_GOSSIP_MENU(1814, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1814, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+22:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Indeed", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
pPlayer->SEND_GOSSIP_MENU(1815, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1815, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+23:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will do this with or your help, Loramus", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
pPlayer->SEND_GOSSIP_MENU(1816, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1816, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+24:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
pPlayer->SEND_GOSSIP_MENU(1817, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1817, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+25:
pPlayer->CLOSE_GOSSIP_MENU();
@@ -394,30 +394,30 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI
};
bool GossipHello_mob_rizzle_sprysprocket(Player* pPlayer, Creature *_Creature)
bool GossipHello_mob_rizzle_sprysprocket(Player* pPlayer, Creature* pCreature)
{
if (pPlayer->GetQuestStatus(10994) != QUEST_STATUS_INCOMPLETE)
return true;
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GET_MOONSTONE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(10811,_Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(10811, pCreature->GetGUID());
return true;
}
bool GossipSelect_mob_rizzle_sprysprocket(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_mob_rizzle_sprysprocket(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF + 1 && pPlayer->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE)
{
pPlayer->CLOSE_GOSSIP_MENU();
_Creature->CastSpell(pPlayer, SPELL_GIVE_SOUTHFURY_MOONSTONE, true);
CAST_AI(mob_rizzle_sprysprocketAI, _Creature->AI())->Must_Die_Timer = 3000;
CAST_AI(mob_rizzle_sprysprocketAI, _Creature->AI())->Must_Die = true;
pCreature->CastSpell(pPlayer, SPELL_GIVE_SOUTHFURY_MOONSTONE, true);
CAST_AI(mob_rizzle_sprysprocketAI, pCreature->AI())->Must_Die_Timer = 3000;
CAST_AI(mob_rizzle_sprysprocketAI, pCreature->AI())->Must_Die = true;
}
return true;
}
CreatureAI* GetAI_mob_rizzle_sprysprocket(Creature *_Creature)
CreatureAI* GetAI_mob_rizzle_sprysprocket(Creature* pCreature)
{
return new mob_rizzle_sprysprocketAI (_Creature);
return new mob_rizzle_sprysprocketAI (pCreature);
}
/*####
@@ -473,9 +473,9 @@ struct TRINITY_DLL_DECL mob_depth_chargeAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_depth_charge(Creature *_Creature)
CreatureAI* GetAI_mob_depth_charge(Creature* pCreature)
{
return new mob_depth_chargeAI (_Creature);
return new mob_depth_chargeAI (pCreature);
}
void AddSC_azshara()
src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp
+2 -2
View File
@@ -139,9 +139,9 @@ struct TRINITY_DLL_DECL boss_azuregosAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_azuregos(Creature *_Creature)
CreatureAI* GetAI_boss_azuregos(Creature* pCreature)
{
return new boss_azuregosAI (_Creature);
return new boss_azuregosAI (pCreature);
}
void AddSC_boss_azuregos()
src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp
+13 -13
View File
@@ -167,9 +167,9 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI
}else SayHelpTimer -= diff;
}
};
CreatureAI* GetAI_npc_draenei_survivor(Creature *_Creature)
CreatureAI* GetAI_npc_draenei_survivor(Creature* pCreature)
{
return new npc_draenei_survivorAI (_Creature);
return new npc_draenei_survivorAI (pCreature);
}
/*######
@@ -253,27 +253,27 @@ struct TRINITY_DLL_DECL npc_engineer_spark_overgrindAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_engineer_spark_overgrind(Creature *_Creature)
CreatureAI* GetAI_npc_engineer_spark_overgrind(Creature* pCreature)
{
return new npc_engineer_spark_overgrindAI (_Creature);
return new npc_engineer_spark_overgrindAI (pCreature);
}
bool GossipHello_npc_engineer_spark_overgrind(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_engineer_spark_overgrind(Player* pPlayer, Creature* pCreature)
{
if (pPlayer->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_engineer_spark_overgrind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_engineer_spark_overgrind(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF)
{
pPlayer->CLOSE_GOSSIP_MENU();
_Creature->setFaction(FACTION_HOSTILE);
CAST_AI(npc_engineer_spark_overgrindAI, _Creature->AI())->AttackStart(pPlayer);
pCreature->setFaction(FACTION_HOSTILE);
CAST_AI(npc_engineer_spark_overgrindAI, pCreature->AI())->AttackStart(pPlayer);
}
return true;
}
@@ -310,9 +310,9 @@ struct TRINITY_DLL_DECL npc_injured_draeneiAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_injured_draenei(Creature *_Creature)
CreatureAI* GetAI_npc_injured_draenei(Creature* pCreature)
{
return new npc_injured_draeneiAI (_Creature);
return new npc_injured_draeneiAI (pCreature);
}
/*######
@@ -536,9 +536,9 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_geezleAI(Creature *_Creature)
CreatureAI* GetAI_npc_geezleAI(Creature* pCreature)
{
return new npc_geezleAI(_Creature);
return new npc_geezleAI(pCreature);
}
/*######
src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp
+10 -10
View File
@@ -68,23 +68,23 @@ bool GossipSelect_npc_beaten_corpse(Player* pPlayer, Creature* pCreature, uint32
#define GOSSIP_SPUTTERVALVE "Can you tell me about this shard?"
bool GossipHello_npc_sputtervalve(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_sputtervalve(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pPlayer->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SPUTTERVALVE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_sputtervalve(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_sputtervalve(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF)
{
pPlayer->SEND_GOSSIP_MENU(2013, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2013, pCreature->GetGUID());
pPlayer->AreaExploredOrEventHappens(6981);
}
return true;
@@ -394,9 +394,9 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_twiggy_flathead(Creature *_Creature)
CreatureAI* GetAI_npc_twiggy_flathead(Creature* pCreature)
{
return new npc_twiggy_flatheadAI (_Creature);
return new npc_twiggy_flatheadAI (pCreature);
}
/*#####
@@ -509,9 +509,9 @@ bool QuestAccept_npc_wizzlecrank_shredder(Player* pPlayer, Creature* creature, Q
return true;
}
CreatureAI* GetAI_npc_wizzlecrank_shredderAI(Creature *_Creature)
CreatureAI* GetAI_npc_wizzlecrank_shredderAI(Creature* pCreature)
{
npc_wizzlecrank_shredderAI* thisAI = new npc_wizzlecrank_shredderAI(_Creature);
npc_wizzlecrank_shredderAI* thisAI = new npc_wizzlecrank_shredderAI(pCreature);
thisAI->AddWaypoint(0, 1109.15, -3104.11, 82.41, 6000);
thisAI->AddWaypoint(1, 1105.39, -3102.86, 82.74, 2000);
src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp
+4 -4
View File
@@ -35,18 +35,18 @@ EndContentData */
#define SPELL_TELEPORT 41566 // s41566 - Teleport to Ashtongue NPC's
#define GOSSIP_OLUM1 "Teleport me to the other Ashtongue Deathsworn"
bool GossipHello_npc_spirit_of_olum(Player* pPlayer, Creature* _Creature)
bool GossipHello_npc_spirit_of_olum(Player* pPlayer, Creature* pCreature)
{
ScriptedInstance* pInstance = (_Creature->GetInstanceData());
ScriptedInstance* pInstance = (pCreature->GetInstanceData());
if (pInstance && (pInstance->GetData(DATA_SUPREMUSEVENT) >= DONE) && (pInstance->GetData(DATA_HIGHWARLORDNAJENTUSEVENT) >= DONE))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_OLUM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_spirit_of_olum(Player* pPlayer, Creature* _Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_spirit_of_olum(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF + 1)
pPlayer->CLOSE_GOSSIP_MENU();
src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp
+2 -2
View File
@@ -328,9 +328,9 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_gurtogg_bloodboil(Creature *_Creature)
CreatureAI* GetAI_boss_gurtogg_bloodboil(Creature* pCreature)
{
return new boss_gurtogg_bloodboilAI (_Creature);
return new boss_gurtogg_bloodboilAI (pCreature);
}
void AddSC_boss_gurtogg_bloodboil()
src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp
+20 -20
View File
@@ -1568,20 +1568,20 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
};
bool GossipSelect_npc_akama_at_illidan(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_akama_at_illidan(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF) // Time to begin the Event
{
pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_akama_illidanAI, _Creature->AI())->EnterPhase(PHASE_CHANNEL);
CAST_AI(npc_akama_illidanAI, pCreature->AI())->EnterPhase(PHASE_CHANNEL);
}
return true;
}
bool GossipHello_npc_akama_at_illidan(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_akama_at_illidan(Player* pPlayer, Creature* pCreature)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(10465, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(10465, pCreature->GetGUID());
return true;
}
@@ -2114,44 +2114,44 @@ void boss_illidan_stormrageAI::EnterPhase(PhaseIllidan NextPhase)
Event = EVENT_NULL;
}
CreatureAI* GetAI_boss_illidan_stormrage(Creature *_Creature)
CreatureAI* GetAI_boss_illidan_stormrage(Creature* pCreature)
{
return new boss_illidan_stormrageAI (_Creature);
return new boss_illidan_stormrageAI (pCreature);
}
CreatureAI* GetAI_npc_akama_at_illidan(Creature *_Creature)
CreatureAI* GetAI_npc_akama_at_illidan(Creature* pCreature)
{
return new npc_akama_illidanAI(_Creature);
return new npc_akama_illidanAI(pCreature);
}
CreatureAI* GetAI_boss_maiev(Creature *_Creature)
CreatureAI* GetAI_boss_maiev(Creature* pCreature)
{
return new boss_maievAI (_Creature);
return new boss_maievAI (pCreature);
}
CreatureAI* GetAI_mob_flame_of_azzinoth(Creature *_Creature)
CreatureAI* GetAI_mob_flame_of_azzinoth(Creature* pCreature)
{
return new flame_of_azzinothAI (_Creature);
return new flame_of_azzinothAI (pCreature);
}
CreatureAI* GetAI_cage_trap_trigger(Creature *_Creature)
CreatureAI* GetAI_cage_trap_trigger(Creature* pCreature)
{
return new cage_trap_triggerAI (_Creature);
return new cage_trap_triggerAI (pCreature);
}
CreatureAI* GetAI_shadow_demon(Creature *_Creature)
CreatureAI* GetAI_shadow_demon(Creature* pCreature)
{
return new shadow_demonAI (_Creature);
return new shadow_demonAI (pCreature);
}
CreatureAI* GetAI_blade_of_azzinoth(Creature *_Creature)
CreatureAI* GetAI_blade_of_azzinoth(Creature* pCreature)
{
return new blade_of_azzinothAI (_Creature);
return new blade_of_azzinothAI (pCreature);
}
CreatureAI* GetAI_parasitic_shadowfiend(Creature *_Creature)
CreatureAI* GetAI_parasitic_shadowfiend(Creature* pCreature)
{
return new mob_parasitic_shadowfiendAI (_Creature);
return new mob_parasitic_shadowfiendAI (pCreature);
}
void AddSC_boss_illidan()
src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp
+2 -2
View File
@@ -299,9 +299,9 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_shahraz(Creature *_Creature)
CreatureAI* GetAI_boss_shahraz(Creature* pCreature)
{
return new boss_shahrazAI (_Creature);
return new boss_shahrazAI (pCreature);
}
void AddSC_boss_mother_shahraz()
src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp
+10 -10
View File
@@ -654,29 +654,29 @@ void npc_enslaved_soulAI::JustDied(Unit *killer)
DoCast(m_creature, SPELL_SOUL_RELEASE, true);
}
CreatureAI* GetAI_boss_reliquary_of_souls(Creature *_Creature)
CreatureAI* GetAI_boss_reliquary_of_souls(Creature* pCreature)
{
return new boss_reliquary_of_soulsAI (_Creature);
return new boss_reliquary_of_soulsAI (pCreature);
}
CreatureAI* GetAI_boss_essence_of_suffering(Creature *_Creature)
CreatureAI* GetAI_boss_essence_of_suffering(Creature* pCreature)
{
return new boss_essence_of_sufferingAI (_Creature);
return new boss_essence_of_sufferingAI (pCreature);
}
CreatureAI* GetAI_boss_essence_of_desire(Creature *_Creature)
CreatureAI* GetAI_boss_essence_of_desire(Creature* pCreature)
{
return new boss_essence_of_desireAI (_Creature);
return new boss_essence_of_desireAI (pCreature);
}
CreatureAI* GetAI_boss_essence_of_anger(Creature *_Creature)
CreatureAI* GetAI_boss_essence_of_anger(Creature* pCreature)
{
return new boss_essence_of_angerAI (_Creature);
return new boss_essence_of_angerAI (pCreature);
}
CreatureAI* GetAI_npc_enslaved_soul(Creature *_Creature)
CreatureAI* GetAI_npc_enslaved_soul(Creature* pCreature)
{
return new npc_enslaved_soulAI (_Creature);
return new npc_enslaved_soulAI (pCreature);
}
void AddSC_boss_reliquary_of_souls()
src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp
+12 -12
View File
@@ -800,43 +800,43 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_shade_of_akama(Creature *_Creature)
CreatureAI* GetAI_boss_shade_of_akama(Creature* pCreature)
{
return new boss_shade_of_akamaAI (_Creature);
return new boss_shade_of_akamaAI (pCreature);
}
CreatureAI* GetAI_mob_ashtongue_channeler(Creature *_Creature)
CreatureAI* GetAI_mob_ashtongue_channeler(Creature* pCreature)
{
return new mob_ashtongue_channelerAI (_Creature);
return new mob_ashtongue_channelerAI (pCreature);
}
CreatureAI* GetAI_mob_ashtongue_sorcerer(Creature *_Creature)
CreatureAI* GetAI_mob_ashtongue_sorcerer(Creature* pCreature)
{
return new mob_ashtongue_sorcererAI (_Creature);
return new mob_ashtongue_sorcererAI (pCreature);
}
CreatureAI* GetAI_npc_akama_shade(Creature *_Creature)
CreatureAI* GetAI_npc_akama_shade(Creature* pCreature)
{
return new npc_akamaAI (_Creature);
return new npc_akamaAI (pCreature);
}
bool GossipSelect_npc_akama(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_akama(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time
{
pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_akamaAI, _Creature->AI())->BeginEvent(pPlayer);
CAST_AI(npc_akamaAI, pCreature->AI())->BeginEvent(pPlayer);
}
return true;
}
bool GossipHello_npc_akama(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_akama(Player* pPlayer, Creature* pCreature)
{
if (pPlayer->isAlive())
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID());
}
return true;
src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp
+6 -6
View File
@@ -260,19 +260,19 @@ struct TRINITY_DLL_DECL npc_volcanoAI : public Scripted_NoMovementAI
};
CreatureAI* GetAI_boss_supremus(Creature *_Creature)
CreatureAI* GetAI_boss_supremus(Creature* pCreature)
{
return new boss_supremusAI (_Creature);
return new boss_supremusAI (pCreature);
}
CreatureAI* GetAI_molten_flame(Creature *_Creature)
CreatureAI* GetAI_molten_flame(Creature* pCreature)
{
return new molten_flameAI (_Creature);
return new molten_flameAI (pCreature);
}
CreatureAI* GetAI_npc_volcano(Creature *_Creature)
CreatureAI* GetAI_npc_volcano(Creature* pCreature)
{
return new npc_volcanoAI (_Creature);
return new npc_volcanoAI (pCreature);
}
void AddSC_boss_supremus()
src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp
+6 -6
View File
@@ -484,19 +484,19 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_doom_blossom(Creature *_Creature)
CreatureAI* GetAI_mob_doom_blossom(Creature* pCreature)
{
return new mob_doom_blossomAI(_Creature);
return new mob_doom_blossomAI(pCreature);
}
CreatureAI* GetAI_mob_shadowy_construct(Creature *_Creature)
CreatureAI* GetAI_mob_shadowy_construct(Creature* pCreature)
{
return new mob_shadowy_constructAI(_Creature);
return new mob_shadowy_constructAI(pCreature);
}
CreatureAI* GetAI_boss_teron_gorefiend(Creature *_Creature)
CreatureAI* GetAI_boss_teron_gorefiend(Creature* pCreature)
{
return new boss_teron_gorefiendAI (_Creature);
return new boss_teron_gorefiendAI (pCreature);
}
void AddSC_boss_teron_gorefiend()
src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp
+2 -2
View File
@@ -205,9 +205,9 @@ bool GOHello_go_najentus_spine(Player* pPlayer, GameObject* _GO)
return true;
}
CreatureAI* GetAI_boss_najentus(Creature *_Creature)
CreatureAI* GetAI_boss_najentus(Creature* pCreature)
{
return new boss_najentusAI (_Creature);
return new boss_najentusAI (pCreature);
}
void AddSC_boss_najentus()
src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp
+10 -10
View File
@@ -810,29 +810,29 @@ CreatureAI* GetAI_mob_blood_elf_council_voice_trigger(Creature* c)
return new mob_blood_elf_council_voice_triggerAI(c);
}
CreatureAI* GetAI_mob_illidari_council(Creature *_Creature)
CreatureAI* GetAI_mob_illidari_council(Creature* pCreature)
{
return new mob_illidari_councilAI (_Creature);
return new mob_illidari_councilAI (pCreature);
}
CreatureAI* GetAI_boss_gathios_the_shatterer(Creature *_Creature)
CreatureAI* GetAI_boss_gathios_the_shatterer(Creature* pCreature)
{
return new boss_gathios_the_shattererAI (_Creature);
return new boss_gathios_the_shattererAI (pCreature);
}
CreatureAI* GetAI_boss_lady_malande(Creature *_Creature)
CreatureAI* GetAI_boss_lady_malande(Creature* pCreature)
{
return new boss_lady_malandeAI (_Creature);
return new boss_lady_malandeAI (pCreature);
}
CreatureAI* GetAI_boss_veras_darkshadow(Creature *_Creature)
CreatureAI* GetAI_boss_veras_darkshadow(Creature* pCreature)
{
return new boss_veras_darkshadowAI (_Creature);
return new boss_veras_darkshadowAI (pCreature);
}
CreatureAI* GetAI_boss_high_nethermancer_zerevor(Creature *_Creature)
CreatureAI* GetAI_boss_high_nethermancer_zerevor(Creature* pCreature)
{
return new boss_high_nethermancer_zerevorAI (_Creature);
return new boss_high_nethermancer_zerevorAI (pCreature);
}
void AddSC_boss_illidari_council()
src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp
+51 -51
View File
@@ -304,9 +304,9 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI
}
};
CreatureAI* GetAI_npc_grimstone(Creature *_Creature)
CreatureAI* GetAI_npc_grimstone(Creature* pCreature)
{
npc_grimstoneAI* Grimstone_AI = new npc_grimstoneAI(_Creature);
npc_grimstoneAI* Grimstone_AI = new npc_grimstoneAI(pCreature);
Grimstone_AI->FillPointMovementListForCreature();
@@ -369,9 +369,9 @@ struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_mob_phalanx(Creature *_Creature)
CreatureAI* GetAI_mob_phalanx(Creature* pCreature)
{
return new mob_phalanxAI (_Creature);
return new mob_phalanxAI (pCreature);
}
/*######
@@ -393,10 +393,10 @@ CreatureAI* GetAI_mob_phalanx(Creature *_Creature)
#define GOSSIP_ITEM_KHARAN_9 "Indeed."
#define GOSSIP_ITEM_KHARAN_10 "The door is open, Kharan. You are a free man."
bool GossipHello_npc_kharan_mighthammer(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pPlayer->GetQuestStatus(QUEST_4001) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
@@ -405,49 +405,49 @@ bool GossipHello_npc_kharan_mighthammer(Player* pPlayer, Creature *_Creature)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
if (pPlayer->GetTeam() == HORDE)
pPlayer->SEND_GOSSIP_MENU(2473, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2473, pCreature->GetGUID());
else
pPlayer->SEND_GOSSIP_MENU(2474, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2474, pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch (action)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(2475, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2475, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(2476, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2476, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(2477, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2477, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(2478, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2478, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
pPlayer->SEND_GOSSIP_MENU(2479, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2479, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
pPlayer->SEND_GOSSIP_MENU(2480, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2480, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+7:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8);
pPlayer->SEND_GOSSIP_MENU(2481, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2481, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+8:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
pPlayer->SEND_GOSSIP_MENU(2482, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2482, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+9:
pPlayer->CLOSE_GOSSIP_MENU();
@@ -472,12 +472,12 @@ bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature *_Creature, u
#define GOSSIP_ITEM_SHOW_ACCESS "Show me what I have access to, Lothos."
#define GOSSIP_ITEM_GET_CONTRACT "Get Thorium Brotherhood Contract"
bool GossipHello_npc_lokhtos_darkbargainer(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (_Creature->isVendor() && pPlayer->GetReputationRank(59) >= REP_FRIENDLY)
if (pCreature->isVendor() && pPlayer->GetReputationRank(59) >= REP_FRIENDLY)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_ITEM_SHOW_ACCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
if (pPlayer->GetQuestRewardStatus(QUEST_A_BINDING_CONTRACT) != 1 &&
@@ -488,14 +488,14 @@ bool GossipHello_npc_lokhtos_darkbargainer(Player* pPlayer, Creature *_Creature)
}
if (pPlayer->GetReputationRank(59) < REP_FRIENDLY)
pPlayer->SEND_GOSSIP_MENU(3673, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(3673, pCreature->GetGUID());
else
pPlayer->SEND_GOSSIP_MENU(3677, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(3677, pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF + 1)
{
@@ -503,7 +503,7 @@ bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature *_Creature
pPlayer->CastSpell(pPlayer, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false);
}
if (action == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
pPlayer->SEND_VENDORLIST(pCreature->GetGUID());
return true;
}
@@ -568,9 +568,9 @@ struct TRINITY_DLL_DECL npc_dughal_stormwingAI : public npc_escortAI
npc_escortAI::UpdateAI(diff);
}
};
CreatureAI* GetAI_npc_dughal_stormwing(Creature *_Creature)
CreatureAI* GetAI_npc_dughal_stormwing(Creature* pCreature)
{
npc_dughal_stormwingAI* dughal_stormwingAI = new npc_dughal_stormwingAI(_Creature);
npc_dughal_stormwingAI* dughal_stormwingAI = new npc_dughal_stormwingAI(pCreature);
dughal_stormwingAI->AddWaypoint(0, 280.42,-82.86, -77.12,0);
dughal_stormwingAI->AddWaypoint(1, 287.64,-87.01, -76.79,0);
@@ -578,23 +578,23 @@ CreatureAI* GetAI_npc_dughal_stormwing(Creature *_Creature)
return dughal_stormwingAI;
}
bool GossipHello_npc_dughal_stormwing(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_dughal_stormwing(Player* pPlayer, Creature* pCreature)
{
if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DUGHAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(2846, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2846, pCreature->GetGUID());
}
return true;
}
bool GossipSelect_npc_dughal_stormwing(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_dughal_stormwing(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF + 1)
{
pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, pPlayer->GetGUID());
_Creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID());
pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS);
}
return true;
@@ -716,9 +716,9 @@ struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI
npc_escortAI::UpdateAI(diff);
}
};
CreatureAI* GetAI_npc_marshal_windsor(Creature *_Creature)
CreatureAI* GetAI_npc_marshal_windsor(Creature* pCreature)
{
npc_marshal_windsorAI* marshal_windsorAI = new npc_marshal_windsorAI(_Creature);
npc_marshal_windsorAI* marshal_windsorAI = new npc_marshal_windsorAI(pCreature);
marshal_windsorAI->AddWaypoint(0, 316.336,-225.528, -77.7258,7000);
marshal_windsorAI->AddWaypoint(1, 316.336,-225.528, -77.7258,2000);
@@ -928,9 +928,9 @@ struct TRINITY_DLL_DECL npc_marshal_reginald_windsorAI : public npc_escortAI
npc_escortAI::UpdateAI(diff);
}
};
CreatureAI* GetAI_npc_marshal_reginald_windsor(Creature *_Creature)
CreatureAI* GetAI_npc_marshal_reginald_windsor(Creature* pCreature)
{
npc_marshal_reginald_windsorAI* marshal_reginald_windsorAI = new npc_marshal_reginald_windsorAI(_Creature);
npc_marshal_reginald_windsorAI* marshal_reginald_windsorAI = new npc_marshal_reginald_windsorAI(pCreature);
marshal_reginald_windsorAI->AddWaypoint(0, 403.61,-52.71, -63.92,4000);
marshal_reginald_windsorAI->AddWaypoint(1, 403.61,-52.71, -63.92,4000);
@@ -1030,9 +1030,9 @@ struct TRINITY_DLL_DECL npc_tobias_seecherAI : public npc_escortAI
}
};
CreatureAI* GetAI_npc_tobias_seecher(Creature *_Creature)
CreatureAI* GetAI_npc_tobias_seecher(Creature* pCreature)
{
npc_tobias_seecherAI* tobias_seecherAI = new npc_tobias_seecherAI(_Creature);
npc_tobias_seecherAI* tobias_seecherAI = new npc_tobias_seecherAI(pCreature);
tobias_seecherAI->AddWaypoint(0, 549.21, -281.07, -75.27);
tobias_seecherAI->AddWaypoint(1, 554.39, -267.39, -73.68);
@@ -1043,23 +1043,23 @@ CreatureAI* GetAI_npc_tobias_seecher(Creature *_Creature)
return tobias_seecherAI;
}
bool GossipHello_npc_tobias_seecher(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_tobias_seecher(Player* pPlayer, Creature* pCreature)
{
if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Get out of here, Tobias, you're free!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(2847, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2847, pCreature->GetGUID());
}
return true;
}
bool GossipSelect_npc_tobias_seecher(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_tobias_seecher(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF + 1)
{
pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, pPlayer->GetGUID());
_Creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID());
pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
pInstance->SetData(DATA_TOBIAS,ENCOUNTER_STATE_IN_PROGRESS);
}
return true;
@@ -1165,18 +1165,18 @@ struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI
}
};
CreatureAI* GetAI_npc_rocknot(Creature *_Creature)
CreatureAI* GetAI_npc_rocknot(Creature* pCreature)
{
npc_rocknotAI* Rocknot_AI = new npc_rocknotAI(_Creature);
npc_rocknotAI* Rocknot_AI = new npc_rocknotAI(pCreature);
Rocknot_AI->FillPointMovementListForCreature();
return Rocknot_AI;
}
bool ChooseReward_npc_rocknot(Player* pPlayer, Creature *_Creature, const Quest *_Quest, uint32 item)
bool ChooseReward_npc_rocknot(Player* pPlayer, Creature* pCreature, const Quest *_Quest, uint32 item)
{
ScriptedInstance* pInstance = (_Creature->GetInstanceData());
ScriptedInstance* pInstance = (pCreature->GetInstanceData());
if (!pInstance)
return true;
@@ -1194,9 +1194,9 @@ bool ChooseReward_npc_rocknot(Player* pPlayer, Creature *_Creature, const Quest
//keep track of amount in instance script, returns SPECIAL if amount ok and event in progress
if (pInstance->GetData(TYPE_BAR) == SPECIAL)
{
DoScriptText(SAY_GOT_BEER, _Creature);
_Creature->CastSpell(_Creature,SPELL_DRUNKEN_RAGE,false);
CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, false);
DoScriptText(SAY_GOT_BEER, pCreature);
pCreature->CastSpell(pCreature,SPELL_DRUNKEN_RAGE,false);
CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, false);
}
}
src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp
+2 -2
View File
@@ -91,9 +91,9 @@ struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_ambassador_flamelash(Creature *_Creature)
CreatureAI* GetAI_boss_ambassador_flamelash(Creature* pCreature)
{
return new boss_ambassador_flamelashAI (_Creature);
return new boss_ambassador_flamelashAI (pCreature);
}
void AddSC_boss_ambassador_flamelash()
src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp
+2 -2
View File
@@ -100,9 +100,9 @@ struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_anubshiah(Creature *_Creature)
CreatureAI* GetAI_boss_anubshiah(Creature* pCreature)
{
return new boss_anubshiahAI (_Creature);
return new boss_anubshiahAI (pCreature);
}
void AddSC_boss_anubshiah()
src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
+2 -2
View File
@@ -90,9 +90,9 @@ struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_draganthaurissan(Creature *_Creature)
CreatureAI* GetAI_boss_draganthaurissan(Creature* pCreature)
{
return new boss_draganthaurissanAI (_Creature);
return new boss_draganthaurissanAI (pCreature);
}
void AddSC_boss_draganthaurissan()
src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp
+2 -2
View File
@@ -152,9 +152,9 @@ struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_general_angerforge(Creature *_Creature)
CreatureAI* GetAI_boss_general_angerforge(Creature* pCreature)
{
return new boss_general_angerforgeAI (_Creature);
return new boss_general_angerforgeAI (pCreature);
}
void AddSC_boss_general_angerforge()
src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp
+2 -2
View File
@@ -66,9 +66,9 @@ struct TRINITY_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_gorosh_the_dervish(Creature *_Creature)
CreatureAI* GetAI_boss_gorosh_the_dervish(Creature* pCreature)
{
return new boss_gorosh_the_dervishAI (_Creature);
return new boss_gorosh_the_dervishAI (pCreature);
}
void AddSC_boss_gorosh_the_dervish()
src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp
+2 -2
View File
@@ -73,9 +73,9 @@ struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_grizzle(Creature *_Creature)
CreatureAI* GetAI_boss_grizzle(Creature* pCreature)
{
return new boss_grizzleAI (_Creature);
return new boss_grizzleAI (pCreature);
}
void AddSC_boss_grizzle()
src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp
+2 -2
View File
@@ -90,9 +90,9 @@ struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_high_interrogator_gerstahn(Creature *_Creature)
CreatureAI* GetAI_boss_high_interrogator_gerstahn(Creature* pCreature)
{
return new boss_high_interrogator_gerstahnAI (_Creature);
return new boss_high_interrogator_gerstahnAI (pCreature);
}
void AddSC_boss_high_interrogator_gerstahn()
src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp
+2 -2
View File
@@ -69,9 +69,9 @@ struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_magmus(Creature *_Creature)
CreatureAI* GetAI_boss_magmus(Creature* pCreature)
{
return new boss_magmusAI (_Creature);
return new boss_magmusAI (pCreature);
}
void AddSC_boss_magmus()
src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp
+2 -2
View File
@@ -84,9 +84,9 @@ struct TRINITY_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_moira_bronzebeard(Creature *_Creature)
CreatureAI* GetAI_boss_moira_bronzebeard(Creature* pCreature)
{
return new boss_moira_bronzebeardAI (_Creature);
return new boss_moira_bronzebeardAI (pCreature);
}
void AddSC_boss_moira_bronzebeard()
src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp
+29 -29
View File
@@ -103,9 +103,9 @@ struct TRINITY_DLL_DECL boss_angerrelAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_angerrel(Creature *_Creature)
CreatureAI* GetAI_boss_angerrel(Creature* pCreature)
{
return new boss_angerrelAI (_Creature);
return new boss_angerrelAI (pCreature);
}
enum
@@ -187,9 +187,9 @@ struct TRINITY_DLL_DECL boss_doperelAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_doperel(Creature *_Creature)
CreatureAI* GetAI_boss_doperel(Creature* pCreature)
{
return new boss_doperelAI (_Creature);
return new boss_doperelAI (pCreature);
}
enum
@@ -283,9 +283,9 @@ struct TRINITY_DLL_DECL boss_haterelAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_haterel(Creature *_Creature)
CreatureAI* GetAI_boss_haterel(Creature* pCreature)
{
return new boss_haterelAI (_Creature);
return new boss_haterelAI (pCreature);
}
enum
@@ -377,9 +377,9 @@ struct TRINITY_DLL_DECL boss_vilerelAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_vilerel(Creature *_Creature)
CreatureAI* GetAI_boss_vilerel(Creature* pCreature)
{
return new boss_vilerelAI (_Creature);
return new boss_vilerelAI (pCreature);
}
enum
@@ -485,9 +485,9 @@ struct TRINITY_DLL_DECL boss_seethrelAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_seethrel(Creature *_Creature)
CreatureAI* GetAI_boss_seethrel(Creature* pCreature)
{
return new boss_seethrelAI (_Creature);
return new boss_seethrelAI (pCreature);
}
enum
@@ -571,16 +571,16 @@ struct TRINITY_DLL_DECL boss_gloomrelAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_gloomrel(Creature *_Creature)
CreatureAI* GetAI_boss_gloomrel(Creature* pCreature)
{
return new boss_gloomrelAI (_Creature);
return new boss_gloomrelAI (pCreature);
}
#define GOSSIP_ITEM_TEACH_1 "Teach me the art of smelting dark iron"
#define GOSSIP_ITEM_TEACH_2 "Continue..."
#define GOSSIP_ITEM_TRIBUTE "I want to pay tribute"
bool GossipHello_boss_gloomrel(Player* pPlayer, Creature *_Creature)
bool GossipHello_boss_gloomrel(Player* pPlayer, Creature* pCreature)
{
if (pPlayer->GetQuestRewardStatus(4083) == 1 && pPlayer->GetSkillValue(SKILL_MINING) >= 230 && !pPlayer->HasSpell(14891))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
@@ -588,29 +588,29 @@ bool GossipHello_boss_gloomrel(Player* pPlayer, Creature *_Creature)
if (pPlayer->GetQuestRewardStatus(4083) == 0 && pPlayer->GetSkillValue(SKILL_MINING) >= 230)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TRIBUTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
bool GossipSelect_boss_gloomrel(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_boss_gloomrel(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch (action)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
pPlayer->SEND_GOSSIP_MENU(2606, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2606, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+11:
pPlayer->CLOSE_GOSSIP_MENU();
_Creature->CastSpell(pPlayer, 14894, false);
pCreature->CastSpell(pPlayer, 14894, false);
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
pPlayer->SEND_GOSSIP_MENU(2604, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2604, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+22:
pPlayer->CLOSE_GOSSIP_MENU();
if (ScriptedInstance* pInstance = _Creature->GetInstanceData())
if (ScriptedInstance* pInstance = pCreature->GetInstanceData())
{
//are 5 minutes expected? go template may have data to despawn when used at quest
pInstance->DoRespawnGameObject(pInstance->GetData64(DATA_GO_CHALICE),MINUTE*5);
@@ -736,36 +736,36 @@ struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_doomrel(Creature *_Creature)
CreatureAI* GetAI_boss_doomrel(Creature* pCreature)
{
return new boss_doomrelAI (_Creature);
return new boss_doomrelAI (pCreature);
}
#define GOSSIP_ITEM_CHALLENGE "Your bondage is at an end, Doom'rel. I challenge you!"
bool GossipHello_boss_doomrel(Player* pPlayer, Creature *_Creature)
bool GossipHello_boss_doomrel(Player* pPlayer, Creature* pCreature)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(2601, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2601, pCreature->GetGUID());
return true;
}
bool GossipSelect_boss_doomrel(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_boss_doomrel(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch (action)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(2605, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2605, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->CLOSE_GOSSIP_MENU();
//start event here
_Creature->setFaction(FACTION_HOSTILE);
_Creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
_Creature->AI()->AttackStart(pPlayer);
ScriptedInstance* pInstance = _Creature->GetInstanceData();
pCreature->setFaction(FACTION_HOSTILE);
pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
pCreature->AI()->AttackStart(pPlayer);
ScriptedInstance* pInstance = pCreature->GetInstanceData();
if (pInstance)
pInstance->SetData64(DATA_EVENSTARTER,pPlayer->GetGUID());
break;
src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp
+2 -2
View File
@@ -86,9 +86,9 @@ struct TRINITY_DLL_DECL boss_drakkisathAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_drakkisath(Creature *_Creature)
CreatureAI* GetAI_boss_drakkisath(Creature* pCreature)
{
return new boss_drakkisathAI (_Creature);
return new boss_drakkisathAI (pCreature);
}
void AddSC_boss_drakkisath()
src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp
+2 -2
View File
@@ -190,9 +190,9 @@ struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_gyth(Creature *_Creature)
CreatureAI* GetAI_boss_gyth(Creature* pCreature)
{
return new boss_gythAI (_Creature);
return new boss_gythAI (pCreature);
}
void AddSC_boss_gyth()
src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp
+2 -2
View File
@@ -80,9 +80,9 @@ struct TRINITY_DLL_DECL boss_halyconAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_halycon(Creature *_Creature)
CreatureAI* GetAI_boss_halycon(Creature* pCreature)
{
return new boss_halyconAI (_Creature);
return new boss_halyconAI (pCreature);
}
void AddSC_boss_halycon()
src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp
+2 -2
View File
@@ -116,9 +116,9 @@ struct TRINITY_DLL_DECL boss_highlordomokkAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_highlordomokk(Creature *_Creature)
CreatureAI* GetAI_boss_highlordomokk(Creature* pCreature)
{
return new boss_highlordomokkAI (_Creature);
return new boss_highlordomokkAI (pCreature);
}
void AddSC_boss_highlordomokk()
src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp
+2 -2
View File
@@ -71,9 +71,9 @@ struct TRINITY_DLL_DECL boss_mothersmolderwebAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_mothersmolderweb(Creature *_Creature)
CreatureAI* GetAI_boss_mothersmolderweb(Creature* pCreature)
{
return new boss_mothersmolderwebAI (_Creature);
return new boss_mothersmolderwebAI (pCreature);
}
void AddSC_boss_mothersmolderweb()
src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp
+2 -2
View File
@@ -114,9 +114,9 @@ struct TRINITY_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_overlordwyrmthalak(Creature *_Creature)
CreatureAI* GetAI_boss_overlordwyrmthalak(Creature* pCreature)
{
return new boss_overlordwyrmthalakAI (_Creature);
return new boss_overlordwyrmthalakAI (pCreature);
}
void AddSC_boss_overlordwyrmthalak()
src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp
+2 -2
View File
@@ -78,9 +78,9 @@ struct TRINITY_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_pyroguard_emberseer(Creature *_Creature)
CreatureAI* GetAI_boss_pyroguard_emberseer(Creature* pCreature)
{
return new boss_pyroguard_emberseerAI (_Creature);
return new boss_pyroguard_emberseerAI (pCreature);
}
void AddSC_boss_pyroguard_emberseer()
src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp
+2 -2
View File
@@ -70,9 +70,9 @@ struct TRINITY_DLL_DECL boss_quatermasterzigrisAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_quatermasterzigris(Creature *_Creature)
CreatureAI* GetAI_boss_quatermasterzigris(Creature* pCreature)
{
return new boss_quatermasterzigrisAI (_Creature);
return new boss_quatermasterzigrisAI (pCreature);
}
void AddSC_boss_quatermasterzigris()
src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp
+2 -2
View File
@@ -76,9 +76,9 @@ struct TRINITY_DLL_DECL boss_rend_blackhandAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_rend_blackhand(Creature *_Creature)
CreatureAI* GetAI_boss_rend_blackhand(Creature* pCreature)
{
return new boss_rend_blackhandAI (_Creature);
return new boss_rend_blackhandAI (pCreature);
}
void AddSC_boss_rend_blackhand()
src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
+2 -2
View File
@@ -80,9 +80,9 @@ struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_shadowvosh(Creature *_Creature)
CreatureAI* GetAI_boss_shadowvosh(Creature* pCreature)
{
return new boss_shadowvoshAI (_Creature);
return new boss_shadowvoshAI (pCreature);
}
void AddSC_boss_shadowvosh()
src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp
+2 -2
View File
@@ -78,9 +78,9 @@ struct TRINITY_DLL_DECL boss_thebeastAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_thebeast(Creature *_Creature)
CreatureAI* GetAI_boss_thebeast(Creature* pCreature)
{
return new boss_thebeastAI (_Creature);
return new boss_thebeastAI (pCreature);
}
void AddSC_boss_thebeast()
src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp
+2 -2
View File
@@ -106,9 +106,9 @@ struct TRINITY_DLL_DECL boss_warmastervooneAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_warmastervoone(Creature *_Creature)
CreatureAI* GetAI_boss_warmastervoone(Creature* pCreature)
{
return new boss_warmastervooneAI (_Creature);
return new boss_warmastervooneAI (pCreature);
}
void AddSC_boss_warmastervoone()
src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp
+2 -2
View File
@@ -96,9 +96,9 @@ struct TRINITY_DLL_DECL boss_broodlordAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_broodlord(Creature *_Creature)
CreatureAI* GetAI_boss_broodlord(Creature* pCreature)
{
return new boss_broodlordAI (_Creature);
return new boss_broodlordAI (pCreature);
}
void AddSC_boss_broodlord()
src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp
+2 -2
View File
@@ -300,9 +300,9 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_chromaggus(Creature *_Creature)
CreatureAI* GetAI_boss_chromaggus(Creature* pCreature)
{
return new boss_chromaggusAI (_Creature);
return new boss_chromaggusAI (pCreature);
}
void AddSC_boss_chromaggus()
src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp
+2 -2
View File
@@ -88,9 +88,9 @@ struct TRINITY_DLL_DECL boss_ebonrocAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_ebonroc(Creature *_Creature)
CreatureAI* GetAI_boss_ebonroc(Creature* pCreature)
{
return new boss_ebonrocAI (_Creature);
return new boss_ebonrocAI (pCreature);
}
void AddSC_boss_ebonroc()
src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp
+2 -2
View File
@@ -79,9 +79,9 @@ struct TRINITY_DLL_DECL boss_firemawAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_firemaw(Creature *_Creature)
CreatureAI* GetAI_boss_firemaw(Creature* pCreature)
{
return new boss_firemawAI (_Creature);
return new boss_firemawAI (pCreature);
}
void AddSC_boss_firemaw()
src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp
+2 -2
View File
@@ -82,9 +82,9 @@ struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_flamegor(Creature *_Creature)
CreatureAI* GetAI_boss_flamegor(Creature* pCreature)
{
return new boss_flamegorAI (_Creature);
return new boss_flamegorAI (pCreature);
}
void AddSC_boss_flamegor()
src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp
+2 -2
View File
@@ -209,9 +209,9 @@ struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_nefarian(Creature *_Creature)
CreatureAI* GetAI_boss_nefarian(Creature* pCreature)
{
return new boss_nefarianAI (_Creature);
return new boss_nefarianAI (pCreature);
}
void AddSC_boss_nefarian()
src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp
+2 -2
View File
@@ -113,9 +113,9 @@ struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_razorgore(Creature *_Creature)
CreatureAI* GetAI_boss_razorgore(Creature* pCreature)
{
return new boss_razorgoreAI (_Creature);
return new boss_razorgoreAI (pCreature);
}
void AddSC_boss_razorgore()
src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp
+8 -8
View File
@@ -215,34 +215,34 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
}
};
void SendDefaultMenu_boss_vael(Player* pPlayer, Creature *_Creature, uint32 action)
void SendDefaultMenu_boss_vael(Player* pPlayer, Creature* pCreature, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time
{
pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(boss_vaelAI, _Creature->AI())->BeginSpeach(pPlayer);
CAST_AI(boss_vaelAI, pCreature->AI())->BeginSpeach(pPlayer);
}
}
bool GossipSelect_boss_vael(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_boss_vael(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (sender == GOSSIP_SENDER_MAIN)
SendDefaultMenu_boss_vael(pPlayer, _Creature, action);
SendDefaultMenu_boss_vael(pPlayer, pCreature, action);
return true;
}
bool GossipHello_boss_vael(Player* pPlayer, Creature *_Creature)
bool GossipHello_boss_vael(Player* pPlayer, Creature* pCreature)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(907,_Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID());
return true;
}
CreatureAI* GetAI_boss_vael(Creature *_Creature)
CreatureAI* GetAI_boss_vael(Creature* pCreature)
{
return new boss_vaelAI (_Creature);
return new boss_vaelAI (pCreature);
}
void AddSC_boss_vael()
src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp
+9 -9
View File
@@ -345,34 +345,34 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_victor_nefarius(Creature *_Creature)
CreatureAI* GetAI_boss_victor_nefarius(Creature* pCreature)
{
return new boss_victor_nefariusAI (_Creature);
return new boss_victor_nefariusAI (pCreature);
}
bool GossipHello_boss_victor_nefarius(Player* pPlayer, Creature *_Creature)
bool GossipHello_boss_victor_nefarius(Player* pPlayer, Creature* pCreature)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(7134,_Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(7134, pCreature->GetGUID());
return true;
}
bool GossipSelect_boss_victor_nefarius(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_boss_victor_nefarius(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch (action)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(7198, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(7198, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(7199, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(7199, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->CLOSE_GOSSIP_MENU();
DoScriptText(SAY_GAMESBEGIN_1, _Creature);
CAST_AI(boss_victor_nefariusAI, _Creature->AI())->BeginEvent(pPlayer);
DoScriptText(SAY_GAMESBEGIN_1, pCreature);
CAST_AI(boss_victor_nefariusAI, pCreature->AI())->BeginEvent(pPlayer);
break;
}
return true;
src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp
+16 -16
View File
@@ -60,9 +60,9 @@ struct TRINITY_DLL_DECL mobs_bladespire_ogreAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_mobs_bladespire_ogre(Creature *_Creature)
CreatureAI* GetAI_mobs_bladespire_ogre(Creature* pCreature)
{
return new mobs_bladespire_ogreAI (_Creature);
return new mobs_bladespire_ogreAI (pCreature);
}
/*######
@@ -233,9 +233,9 @@ struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI
}
};
CreatureAI* GetAI_mobs_nether_drake(Creature *_Creature)
CreatureAI* GetAI_mobs_nether_drake(Creature* pCreature)
{
return new mobs_nether_drakeAI (_Creature);
return new mobs_nether_drakeAI (pCreature);
}
/*######
@@ -272,30 +272,30 @@ struct TRINITY_DLL_DECL npc_daranelleAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_daranelle(Creature *_Creature)
CreatureAI* GetAI_npc_daranelle(Creature* pCreature)
{
return new npc_daranelleAI (_Creature);
return new npc_daranelleAI (pCreature);
}
/*######
## npc_overseer_nuaar
######*/
bool GossipHello_npc_overseer_nuaar(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_overseer_nuaar(Player* pPlayer, Creature* pCreature)
{
if (pPlayer->GetQuestStatus(10682) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Overseer, I am here to negotiate on behalf of the Cenarion Expedition.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(10532, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(10532, pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_overseer_nuaar(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_overseer_nuaar(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF+1)
{
pPlayer->SEND_GOSSIP_MENU(10533, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(10533, pCreature->GetGUID());
pPlayer->AreaExploredOrEventHappens(10682);
}
return true;
@@ -305,27 +305,27 @@ bool GossipSelect_npc_overseer_nuaar(Player* pPlayer, Creature *_Creature, uint3
## npc_saikkal_the_elder
######*/
bool GossipHello_npc_saikkal_the_elder(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_saikkal_the_elder(Player* pPlayer, Creature* pCreature)
{
if (pPlayer->GetQuestStatus(10980) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes... yes, it's me.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(10794, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(10794, pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_saikkal_the_elder(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_saikkal_the_elder(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch (action)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes elder. Tell me more of the book.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(10795, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(10795, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(10796, _Creature->GetGUID());
pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(10796, pCreature->GetGUID());
break;
}
return true;
src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp
+18 -18
View File
@@ -38,22 +38,22 @@ EndContentData */
#define SPELL_TELEPORT_SINGLE_IN_GROUP 13142
#define SPELL_TELEPORT_GROUP 27686
bool GossipHello_npc_deathly_usher(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_deathly_usher(Player* pPlayer, Creature* pCreature)
{
if (pPlayer->GetQuestStatus(3628) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(10757, 1))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_USHER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_deathly_usher(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_deathly_usher(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF)
{
pPlayer->CLOSE_GOSSIP_MENU();
_Creature->CastSpell(pPlayer, SPELL_TELEPORT_SINGLE, true);
pCreature->CastSpell(pPlayer, SPELL_TELEPORT_SINGLE, true);
}
return true;
@@ -73,10 +73,10 @@ bool GossipSelect_npc_deathly_usher(Player* pPlayer, Creature *_Creature, uint32
#define GOSSIP_ITEM_FALLEN4 "You can count on me, Hero"
#define GOSSIP_ITEM_FALLEN5 "I shall"
bool GossipHello_npc_fallen_hero_of_horde(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_fallen_hero_of_horde(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
@@ -87,53 +87,53 @@ bool GossipHello_npc_fallen_hero_of_horde(Player* pPlayer, Creature *_Creature)
if (pPlayer->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && pPlayer->GetTeam() == ALLIANCE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_fallen_hero_of_horde(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_fallen_hero_of_horde(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch (action)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
pPlayer->SEND_GOSSIP_MENU(1392, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1392, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+11:
pPlayer->SEND_GOSSIP_MENU(1411, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetGUID());
if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
pPlayer->AreaExploredOrEventHappens(2784);
if (pPlayer->GetTeam() == ALLIANCE)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(1411, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetGUID());
}
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
pPlayer->SEND_GOSSIP_MENU(1451, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1451, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+21:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
pPlayer->SEND_GOSSIP_MENU(1452, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1452, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+22:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
pPlayer->SEND_GOSSIP_MENU(1453, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1453, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+23:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
pPlayer->SEND_GOSSIP_MENU(1454, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1454, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+24:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
pPlayer->SEND_GOSSIP_MENU(1455, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1455, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+25:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26);
pPlayer->SEND_GOSSIP_MENU(1456, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1456, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+26:
pPlayer->CLOSE_GOSSIP_MENU();
src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp
+2 -2
View File
@@ -167,9 +167,9 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_kruul(Creature *_Creature)
CreatureAI* GetAI_boss_kruul(Creature* pCreature)
{
return new boss_kruulAI (_Creature);
return new boss_kruulAI (pCreature);
}
void AddSC_boss_kruul()
src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp
+12 -12
View File
@@ -68,9 +68,9 @@ struct TRINITY_DLL_DECL mob_webbed_creatureAI : public ScriptedAI
m_creature->SummonCreature(spawnCreatureID, 0.0f, 0.0f, 0.0f, m_creature->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
}
};
CreatureAI* GetAI_mob_webbed_creature(Creature *_Creature)
CreatureAI* GetAI_mob_webbed_creature(Creature* pCreature)
{
return new mob_webbed_creatureAI (_Creature);
return new mob_webbed_creatureAI (pCreature);
}
/*######
@@ -79,46 +79,46 @@ CreatureAI* GetAI_mob_webbed_creature(Creature *_Creature)
#define C_SUNHAWK_TRIGGER 17974
bool GossipHello_npc_captured_sunhawk_agent(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_captured_sunhawk_agent(Player* pPlayer, Creature* pCreature)
{
if (pPlayer->HasAura(31609) && pPlayer->GetQuestStatus(9756) == QUEST_STATUS_INCOMPLETE)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(9136, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(9136, pCreature->GetGUID());
}
else
pPlayer->SEND_GOSSIP_MENU(9134, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(9134, pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_captured_sunhawk_agent(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_captured_sunhawk_agent(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch (action)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(9137, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(9137, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(9138, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(9138, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(9139, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(9139, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(9140, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(9140, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
pPlayer->SEND_GOSSIP_MENU(9141, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(9141, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->CLOSE_GOSSIP_MENU();
pPlayer->TalkedToCreature(C_SUNHAWK_TRIGGER, _Creature->GetGUID());
pPlayer->TalkedToCreature(C_SUNHAWK_TRIGGER, pCreature->GetGUID());
break;
}
return true;
src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp
+12 -12
View File
@@ -34,14 +34,14 @@ EndContentData */
#define GOSSIP_ITEM_TELEPORT "Teleport me to Amber Ledge, please."
bool GossipHello_npc_tiare(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_tiare(Player* pPlayer, Creature* pCreature)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_GOSSIP);
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_tiare(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_tiare(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_OPTION_GOSSIP)
{
@@ -58,22 +58,22 @@ bool GossipSelect_npc_tiare(Player* pPlayer, Creature *_Creature, uint32 sender,
#define GOSSIP_ITEM_FREE_FLIGHT "I'd like passage to the Transitus Shield."
#define GOSSIP_ITEM_FLIGHT "May I use a drake to fly elsewhere?"
bool GossipHello_npc_surristrasz(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_surristrasz(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (_Creature->isTaxi())
if (pCreature->isTaxi())
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FREE_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_GOSSIP);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_TAXIVENDOR);
}
pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_surristrasz(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_surristrasz(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_OPTION_GOSSIP)
{
@@ -82,7 +82,7 @@ bool GossipSelect_npc_surristrasz(Player* pPlayer, Creature *_Creature, uint32 s
}
if (action == GOSSIP_OPTION_TAXIVENDOR)
{
pPlayer->GetSession()->SendTaxiMenu(_Creature);
pPlayer->GetSession()->SendTaxiMenu(pCreature);
}
return true;
}
@@ -226,9 +226,9 @@ struct TRINITY_DLL_DECL npc_khunok_the_behemothAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_khunok_the_behemoth(Creature *_Creature)
CreatureAI* GetAI_npc_khunok_the_behemoth(Creature* pCreature)
{
return new npc_khunok_the_behemothAI(_Creature);
return new npc_khunok_the_behemothAI(pCreature);
}
void AddSC_borean_tundra()
src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp
+18 -18
View File
@@ -67,70 +67,70 @@ struct TRINITY_DLL_DECL npc_ragged_johnAI : public ScriptedAI
void EnterCombat(Unit *who) {}
};
CreatureAI* GetAI_npc_ragged_john(Creature *_Creature)
CreatureAI* GetAI_npc_ragged_john(Creature* pCreature)
{
return new npc_ragged_johnAI (_Creature);
return new npc_ragged_johnAI (pCreature);
}
bool GossipHello_npc_ragged_john(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_ragged_john(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pPlayer->GetQuestStatus(4224) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(2713, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2713, pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_ragged_john(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_ragged_john(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
switch (action)
{
case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(2714, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2714, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(2715, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2715, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(2716, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2716, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
pPlayer->SEND_GOSSIP_MENU(2717, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2717, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
pPlayer->SEND_GOSSIP_MENU(2718, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2718, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
pPlayer->SEND_GOSSIP_MENU(2719, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2719, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
pPlayer->SEND_GOSSIP_MENU(2720, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2720, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+7:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
pPlayer->SEND_GOSSIP_MENU(2721, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2721, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+8:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
pPlayer->SEND_GOSSIP_MENU(2722, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2722, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+9:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
pPlayer->SEND_GOSSIP_MENU(2723, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2723, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+10:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
pPlayer->SEND_GOSSIP_MENU(2725, _Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(2725, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+11:
pPlayer->CLOSE_GOSSIP_MENU();
src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
+2 -2
View File
@@ -70,9 +70,9 @@ struct TRINITY_DLL_DECL boss_epochAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_epoch(Creature *_Creature)
CreatureAI* GetAI_boss_epoch(Creature* pCreature)
{
return new boss_epochAI (_Creature);
return new boss_epochAI (pCreature);
}
void AddSC_boss_epoch()
src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
+2 -2
View File
@@ -107,9 +107,9 @@ struct TRINITY_DLL_DECL boss_mal_ganisAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_mal_ganis(Creature *_Creature)
CreatureAI* GetAI_boss_mal_ganis(Creature* pCreature)
{
return new boss_mal_ganisAI (_Creature);
return new boss_mal_ganisAI (pCreature);
}
void AddSC_boss_mal_ganis()
src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
+2 -2
View File
@@ -122,9 +122,9 @@ struct TRINITY_DLL_DECL boss_meathookAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_meathook(Creature *_Creature)
CreatureAI* GetAI_boss_meathook(Creature* pCreature)
{
return new boss_meathookAI (_Creature);
return new boss_meathookAI (pCreature);
}
void AddSC_boss_meathook()
src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
+2 -2
View File
@@ -139,9 +139,9 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_salramm(Creature *_Creature)
CreatureAI* GetAI_boss_salramm(Creature* pCreature)
{
return new boss_salrammAI (_Creature);
return new boss_salrammAI (pCreature);
}
void AddSC_boss_salramm()
src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp
+2 -2
View File
@@ -135,9 +135,9 @@ struct TRINITY_DLL_DECL boss_aeonusAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_aeonus(Creature *_Creature)
CreatureAI* GetAI_boss_aeonus(Creature* pCreature)
{
return new boss_aeonusAI (_Creature);
return new boss_aeonusAI (pCreature);
}
void AddSC_boss_aeonus()
src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
+2 -2
View File
@@ -144,9 +144,9 @@ struct TRINITY_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_chrono_lord_deja(Creature *_Creature)
CreatureAI* GetAI_boss_chrono_lord_deja(Creature* pCreature)
{
return new boss_chrono_lord_dejaAI (_Creature);
return new boss_chrono_lord_dejaAI (pCreature);
}
void AddSC_boss_chrono_lord_deja()
src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp
+2 -2
View File
@@ -142,9 +142,9 @@ struct TRINITY_DLL_DECL boss_temporusAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_temporus(Creature *_Creature)
CreatureAI* GetAI_boss_temporus(Creature* pCreature)
{
return new boss_temporusAI (_Creature);
return new boss_temporusAI (pCreature);
}
void AddSC_boss_temporus()
src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp
+12 -12
View File
@@ -223,9 +223,9 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_medivh_bm(Creature *_Creature)
CreatureAI* GetAI_npc_medivh_bm(Creature* pCreature)
{
return new npc_medivh_bmAI (_Creature);
return new npc_medivh_bmAI (pCreature);
}
struct Wave
@@ -343,9 +343,9 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI
}
};
CreatureAI* GetAI_npc_time_rift(Creature *_Creature)
CreatureAI* GetAI_npc_time_rift(Creature* pCreature)
{
return new npc_time_riftAI (_Creature);
return new npc_time_riftAI (pCreature);
}
#define SAY_SAAT_WELCOME -1269019
@@ -354,34 +354,34 @@ CreatureAI* GetAI_npc_time_rift(Creature *_Creature)
#define SPELL_CHRONO_BEACON 34975
#define ITEM_CHRONO_BEACON 24289
bool GossipHello_npc_saat(Player* pPlayer, Creature *_Creature)
bool GossipHello_npc_saat(Player* pPlayer, Creature* pCreature)
{
if (_Creature->isQuestGiver())
pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1))
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(10000,_Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(10000, pCreature->GetGUID());
return true;
}
else if (pPlayer->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1))
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(10001,_Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(10001, pCreature->GetGUID());
return true;
}
pPlayer->SEND_GOSSIP_MENU(10002,_Creature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(10002, pCreature->GetGUID());
return true;
}
bool GossipSelect_npc_saat(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
bool GossipSelect_npc_saat(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{
if (action == GOSSIP_ACTION_INFO_DEF+1)
{
pPlayer->CLOSE_GOSSIP_MENU();
_Creature->CastSpell(pPlayer,SPELL_CHRONO_BEACON,false);
pCreature->CastSpell(pPlayer,SPELL_CHRONO_BEACON,false);
}
return true;
}
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp
+4 -4
View File
@@ -213,9 +213,9 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI
}
};
CreatureAI* GetAI_boss_anetheron(Creature *_Creature)
CreatureAI* GetAI_boss_anetheron(Creature* pCreature)
{
return new boss_anetheronAI (_Creature);
return new boss_anetheronAI (pCreature);
}
#define SPELL_IMMOLATION 31303
@@ -294,9 +294,9 @@ struct TRINITY_DLL_DECL mob_towering_infernalAI : public ScriptedAI
}
};
CreatureAI* GetAI_mob_towering_infernal(Creature *_Creature)
CreatureAI* GetAI_mob_towering_infernal(Creature* pCreature)
{
return new mob_towering_infernalAI (_Creature);
return new mob_towering_infernalAI (pCreature);
}
void AddSC_boss_anetheron()
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp
+8 -8
View File
@@ -595,24 +595,24 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI
void WaypointReached(uint32 i){}
};
CreatureAI* GetAI_boss_archimonde(Creature *_Creature)
CreatureAI* GetAI_boss_archimonde(Creature* pCreature)
{
return new boss_archimondeAI (_Creature);
return new boss_archimondeAI (pCreature);
}
CreatureAI* GetAI_mob_doomfire(Creature* _Creature)
CreatureAI* GetAI_mob_doomfire(Creature* pCreature)
{
return new mob_doomfireAI(_Creature);
return new mob_doomfireAI(pCreature);
}
CreatureAI* GetAI_mob_doomfire_targetting(Creature* _Creature)
CreatureAI* GetAI_mob_doomfire_targetting(Creature* pCreature)
{
return new mob_doomfire_targettingAI(_Creature);
return new mob_doomfire_targettingAI(pCreature);
}
CreatureAI* GetAI_mob_ancient_wisp(Creature* _Creature)
CreatureAI* GetAI_mob_ancient_wisp(Creature* pCreature)
{
return new mob_ancient_wispAI(_Creature);
return new mob_ancient_wispAI(pCreature);
}
void AddSC_boss_archimonde()
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp
+4 -4
View File
@@ -174,9 +174,9 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI
}
};
CreatureAI* GetAI_boss_azgalor(Creature *_Creature)
CreatureAI* GetAI_boss_azgalor(Creature* pCreature)
{
return new boss_azgalorAI (_Creature);
return new boss_azgalorAI (pCreature);
}
#define SPELL_THRASH 12787
@@ -268,9 +268,9 @@ struct TRINITY_DLL_DECL mob_lesser_doomguardAI : public hyjal_trashAI
}
};
CreatureAI* GetAI_mob_lesser_doomguard(Creature *_Creature)
CreatureAI* GetAI_mob_lesser_doomguard(Creature* pCreature)
{
return new mob_lesser_doomguardAI (_Creature);
return new mob_lesser_doomguardAI (pCreature);
}
void AddSC_boss_azgalor()

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