Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-02 15:17:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add more #defines for some scripts with hard coded text that didn't already have them, Almost done.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Chaz Brown
2009-08-23 15:02:11 -04:00
parent c59dcbbb85
commit ce0a3afc19
6 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
View File

@@ -488,6 +488,7 @@ bool GossipSelect_npc_death_knight_initiate(Player* pPlayer, Creature* pCreature
######*/
#define DESPAWN_HORSE 52267
#define SAY_DARK_RIDER "The realm of shadows awaits..."
struct TRINITY_DLL_DECL npc_dark_rider_of_acherusAI : public ScriptedAI
{
@@ -516,7 +517,7 @@ struct TRINITY_DLL_DECL npc_dark_rider_of_acherusAI : public ScriptedAI
switch(Phase)
{
case 0:
m_creature->MonsterSay("The realm of shadows awaits...", LANG_UNIVERSAL, 0);
m_creature->MonsterSay(SAY_DARK_RIDER, LANG_UNIVERSAL, 0);
PhaseTimer = 5000;
Phase = 1;
break;
@@ -754,6 +755,9 @@ CreatureAI* GetAI_npc_scarlet_miner_cart(Creature *_Creature)
## npc_scarlet_miner
####*/
#define SAY_SCARLET_MINER1 "Where'd this come from? I better get this down to the ships before the foreman sees it!"
#define SAY_SCARLET_MINER2 "Now I can have a rest!"
struct TRINITY_DLL_DECL npc_scarlet_minerAI : public npc_escortAI
{
npc_scarlet_minerAI(Creature *c) : npc_escortAI(c)
@@ -823,7 +827,7 @@ struct TRINITY_DLL_DECL npc_scarlet_minerAI : public npc_escortAI
me->SetInFront(car);
me->SendMovementFlagUpdate();
}
me->MonsterSay("Where'd this come from? I better get this down to the ships before the foreman sees it!",LANG_UNIVERSAL,NULL);
me->MonsterSay(SAY_SCARLET_MINER1,LANG_UNIVERSAL,NULL);
SetRun(true);
IntroTimer = 4000;
IntroPhase = 1;
@@ -839,7 +843,7 @@ struct TRINITY_DLL_DECL npc_scarlet_minerAI : public npc_escortAI
//car->GetMotionMaster()->MovePoint(0, car->GetPositionX(), car->GetPositionY(), me->GetPositionZ());
car->RemoveAura(SPELL_CART_DRAG);
}
me->MonsterSay("Now I can have a rest!",LANG_UNIVERSAL,NULL);
me->MonsterSay(SAY_SCARLET_MINER2,LANG_UNIVERSAL,NULL);
break;
default:
break;

9
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
View File

@@ -128,6 +128,8 @@ static Summon Text[]=
{"Now, know demise!"}
};
#define EMOTE_LAUGHS "laughs"
struct TRINITY_DLL_DECL mob_wisp_invisAI : public ScriptedAI
{
mob_wisp_invisAI(Creature *c) : ScriptedAI(c)
@@ -298,7 +300,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI
Creature *speaker = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,1000);
if (speaker)
speaker->CastSpell(speaker,SPELL_HEAD_SPEAKS,false);
m_creature->MonsterTextEmote("laughs",NULL);
m_creature->MonsterTextEmote(EMOTE_LAUGHS,NULL);
} else laugh -= diff;
} else {
@@ -338,7 +340,8 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
{
speed->Effect[1] = SPELL_EFFECT_APPLY_AURA;
speed->EffectApplyAuraName[1] = SPELL_AURA_MOD_CONFUSE;
}*/
}
*/
pInstance = c->GetInstanceData();
}
@@ -654,7 +657,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
if (laugh < diff) {
laugh = 11000 + rand()%12 * 1000;
m_creature->MonsterTextEmote("laughs",NULL);
m_creature->MonsterTextEmote(EMOTE_LAUGHS,NULL);
DoPlaySoundToSet(m_creature, RandomLaugh[rand()%3]);
} else laugh -= diff;

4
src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
View File

@@ -85,6 +85,8 @@ enum Creatures
#define GO_FAILED "You are unable to use this currently."
#define EMOTE_UNABLE_TO_FIND "is unable to find Kalecgos"
#define FLY_X 1679
#define FLY_Y 900
#define FLY_Z 82
@@ -390,7 +392,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
}
else
{
me->MonsterTextEmote("is unable to find Kalecgos", NULL);
me->MonsterTextEmote(EMOTE_UNABLE_TO_FIND, NULL);
EnterEvadeMode();
return;
}

49
src/bindings/scripts/scripts/eastern_kingdoms/uldaman/uldaman.cpp
View File

@@ -88,10 +88,27 @@ CreatureAI* GetAI_mob_jadespine_basilisk(Creature* pCreature)
## npc_lore_keeper_of_norgannon
######*/
#define GOSSIP_HELLO_KEEPER "Who are the Earthen?"
#define GOSSIP_SELECT_KEEPER1 "What is a \"subterranean being matrix\"?"
#define GOSSIP_SELECT_KEEPER2 "What are the anomalies you speak of?"
#define GOSSIP_SELECT_KEEPER3 "What is a resilient foundation of construction?"
#define GOSSIP_SELECT_KEEPER4 "So... the Earthen were made out of stone?"
#define GOSSIP_SELECT_KEEPER5 "Anything else I should know about the Earthen?"
#define GOSSIP_SELECT_KEEPER6 "I think I understand the Creators' design intent for the Earthen now. What are the Earthen's anomalies that you spoke of earlier?"
#define GOSSIP_SELECT_KEEPER7 "What high-stress environments would cause the Earthen to destabilize?"
#define GOSSIP_SELECT_KEEPER8 "What happens when the Earthen destabilize?"
#define GOSSIP_SELECT_KEEPER9 "Troggs?! Are the troggs you mention the same as the ones in the world today?"
#define GOSSIP_SELECT_KEEPER10 "You mentioned two results when the Earthen destabilize. What is the second?"
#define GOSSIP_SELECT_KEEPER11 "Dwarves!!! Now you're telling me that dwarves originally came from the Earthen?!"
#define GOSSIP_SELECT_KEEPER12 "These dwarves are the same ones today, yes? Do the dwarves maintain any other links to the Earthen?"
#define GOSSIP_SELECT_KEEPER13 "Who are the Creators?"
#define GOSSIP_SELECT_KEEPER14 "This is a lot to think about."
#define GOSSIP_SELECT_KEEPER15 "I will access the discs now."
bool GossipHello_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature* pCreature)
{
if (pPlayer->GetQuestStatus(2278) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Who are the Earthen?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_KEEPER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(1079, pCreature->GetGUID());
@@ -103,63 +120,63 @@ bool GossipSelect_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature* pCreat
switch (uiAction)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What is a \"subterranean being matrix\"?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(1080, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What are the anomalies you speak of?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(1081, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What is a resilient foundation of construction?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(1082, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "So... the Earthen were made out of stone?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(1083, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Anything else I should know about the Earthen?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
pPlayer->SEND_GOSSIP_MENU(1084, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I think I understand the Creators' design intent for the Earthen now. What are the Earthen's anomalies that you spoke of earlier?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
pPlayer->SEND_GOSSIP_MENU(1085, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+7:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What high-stress environments would cause the Earthen to destabilize?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8);
pPlayer->SEND_GOSSIP_MENU(1086, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+8:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What happens when the Earthen destabilize?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
pPlayer->SEND_GOSSIP_MENU(1087, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+9:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Troggs?! Are the troggs you mention the same as the ones in the world today?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10);
pPlayer->SEND_GOSSIP_MENU(1088, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+10:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "You mentioned two results when the Earthen destabilize. What is the second?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+11);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+11);
pPlayer->SEND_GOSSIP_MENU(1089, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+11:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Dwarves!!! Now you're telling me that dwarves originally came from the Earthen?!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+12);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+12);
pPlayer->SEND_GOSSIP_MENU(1090, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+12:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "These dwarves are the same ones today, yes? Do the dwarves maintain any other links to the Earthen?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+13);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER12, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+13);
pPlayer->SEND_GOSSIP_MENU(1091, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+13:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Who are the Creators?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+14);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER13, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+14);
pPlayer->SEND_GOSSIP_MENU(1092, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+14:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "This is a lot to think about.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+15);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER14, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+15);
pPlayer->SEND_GOSSIP_MENU(1093, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+15:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will access the discs now.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+16);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER15, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+16);
pPlayer->SEND_GOSSIP_MENU(1094, pCreature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+16:

8
src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
View File

@@ -89,13 +89,13 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
aqsentinelAI(Creature *c) : ScriptedAI(c)
{
ClearBudyList();
ClearBuddyList();
abselected = 0; // just initialization of variable
}
Creature *nearby[3];
void ClearBudyList()
void ClearBuddyList()
{
nearby[0] = nearby[1] = nearby[2] = NULL;
}
@@ -183,7 +183,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
memset(chosenAbilities, 0, 9*sizeof(bool));
selectAbility(pickAbilityRandom(chosenAbilities));
ClearBudyList();
ClearBuddyList();
AddSentinelsNear(m_creature);
int bli;
for (bli = 0; bli < 3; ++bli)
@@ -216,7 +216,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
nearby[i]->Respawn();
}
}
ClearBudyList();
ClearBuddyList();
gatherOthersWhenAggro = true;
}

4
src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp
View File

@@ -41,6 +41,8 @@ enum Events
EVENT_SUMMON,
};
#define EMOTE_NEARBY " spots a nearby zombie to devour!"
struct TRINITY_DLL_DECL boss_gluthAI : public BossAI
{
boss_gluthAI(Creature *c) : BossAI(c, BOSS_GLUTH)
@@ -62,7 +64,7 @@ struct TRINITY_DLL_DECL boss_gluthAI : public BossAI
if (who->GetEntry() == MOB_ZOMBIE && me->IsWithinDistInMap(who, 20))
{
SetGazeOn(who);
me->MonsterTextEmote(" spots a nearby zombie to devour!", 0, true);
me->MonsterTextEmote(EMOTE_NEARBY, 0, true);
}
else
BossAI::MoveInLineOfSight(who);