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

*Fix build.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-19 22:30:30 -06:00
parent 21b4930682
commit 53d0bf87ad
10 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/include/sc_creature.cpp
+7 -7
View File
@@ -231,23 +231,23 @@ void ScriptedAI::DoSay(const char* text, uint32 language, Unit* target, bool Say
{
if (target)
{
m_creature->Say(text, language, target->GetGUID());
m_creature->MonsterSay(text, language, target->GetGUID());
if(SayEmote)
m_creature->HandleEmoteCommand(EMOTE_ONESHOT_TALK);
}
else m_creature->Say(text, language, 0);
else m_creature->MonsterSay(text, language, 0);
}
void ScriptedAI::DoYell(const char* text, uint32 language, Unit* target)
{
if (target) m_creature->Yell(text, language, target->GetGUID());
else m_creature->Yell(text, language, 0);
if (target) m_creature->MonsterYell(text, language, target->GetGUID());
else m_creature->MonsterYell(text, language, 0);
}
void ScriptedAI::DoTextEmote(const char* text, Unit* target, bool IsBossEmote)
{
if (target) m_creature->TextEmote(text, target->GetGUID(), IsBossEmote);
else m_creature->TextEmote(text, 0, IsBossEmote);
if (target) m_creature->MonsterTextEmote(text, target->GetGUID(), IsBossEmote);
else m_creature->MonsterTextEmote(text, 0, IsBossEmote);
}
void ScriptedAI::DoWhisper(const char* text, Unit* reciever, bool IsBossWhisper)
@@ -255,7 +255,7 @@ void ScriptedAI::DoWhisper(const char* text, Unit* reciever, bool IsBossWhisper)
if (!reciever || reciever->GetTypeId() != TYPEID_PLAYER)
return;
m_creature->Whisper(text, reciever->GetGUID(), IsBossWhisper);
m_creature->MonsterWhisper(text, reciever->GetGUID(), IsBossWhisper);
}
void ScriptedAI::DoPlaySoundToSet(Unit* unit, uint32 sound)
src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp
+2 -2
View File
@@ -531,7 +531,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
if(Conversation[count].emote)
creature->HandleEmoteCommand(Conversation[count].emote); // Make the creature do some animation!
if(Conversation[count].text)
creature->Yell(Conversation[count].text, LANG_UNIVERSAL, 0); // Have the creature yell out some text
creature->MonsterYell(Conversation[count].text, LANG_UNIVERSAL, 0); // Have the creature yell out some text
if(Conversation[count].sound)
DoPlaySoundToSet(creature, Conversation[count].sound); // Play some sound on the creature
}
@@ -1194,7 +1194,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
if(GETCRE(Illidan, IllidanGUID))
{
((boss_illidan_stormrageAI*)Illidan->AI())->Timer[EVENT_TAUNT] += 30000;
Illidan->Yell(SAY_AKAMA_MINION, LANG_UNIVERSAL, 0);
Illidan->MonsterYell(SAY_AKAMA_MINION, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(Illidan, SOUND_AKAMA_MINION);
}
Timer = 8000;
src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp
+2 -2
View File
@@ -69,7 +69,7 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
CannonBlast_Timer = CANNON_BLAST_TIMER;
// it's a hack - Mr. Smite should do that but his too far away
IronCladDoor->SetName("Mr. Smite");
IronCladDoor->Yell(SAY_MR_SMITE_ALARM1, LANG_UNIVERSAL, 0);
IronCladDoor->MonsterYell(SAY_MR_SMITE_ALARM1, LANG_UNIVERSAL, 0);
DoPlaySound(IronCladDoor, SOUND_MR_SMITE_ALARM1);
State=CANNON_BLAST_INITIATED;
break;
@@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
ShootCannon();
BlastOutDoor();
LeverStucked();
IronCladDoor->Yell(SAY_MR_SMITE_ALARM2, LANG_UNIVERSAL, 0);
IronCladDoor->MonsterYell(SAY_MR_SMITE_ALARM2, LANG_UNIVERSAL, 0);
DoPlaySound(IronCladDoor, SOUND_MR_SMITE_ALARM2);
State = PIRATES_ATTACK;
}else
src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
+1 -1
View File
@@ -166,7 +166,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
Creature *Magtheridon = instance->GetCreatureInMap(MagtheridonGUID);
if(Magtheridon && Magtheridon->isAlive())
{
Magtheridon->TextEmote("'s bonds begin to weaken!", 0);
Magtheridon->MonsterTextEmote("'s bonds begin to weaken!", 0);
CageTimer = 120000;
}
if(GameObject *Door = instance->GetGameObjectInMap(DoorGUID))
src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp
+9 -9
View File
@@ -526,25 +526,25 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
{
case 0: return 9999999;
case 1:
m_creature->Yell(SAY_DIALOG_MEDIVH_1,LANG_UNIVERSAL,NULL);
m_creature->MonsterYell(SAY_DIALOG_MEDIVH_1,LANG_UNIVERSAL,NULL);
return 10000;
case 2:
if(arca)
((Creature*)arca)->Yell(SAY_DIALOG_ARCANAGOS_2,LANG_UNIVERSAL,NULL);
((Creature*)arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_2,LANG_UNIVERSAL,NULL);
return 20000;
case 3:
m_creature->Yell(SAY_DIALOG_MEDIVH_3,LANG_UNIVERSAL,NULL);
m_creature->MonsterYell(SAY_DIALOG_MEDIVH_3,LANG_UNIVERSAL,NULL);
return 10000;
case 4:
if(arca)
((Creature*)arca)->Yell(SAY_DIALOG_ARCANAGOS_4, LANG_UNIVERSAL, NULL);
((Creature*)arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_4, LANG_UNIVERSAL, NULL);
return 20000;
case 5:
m_creature->Yell(SAY_DIALOG_MEDIVH_5, LANG_UNIVERSAL, NULL);
m_creature->MonsterYell(SAY_DIALOG_MEDIVH_5, LANG_UNIVERSAL, NULL);
return 20000;
case 6:
if(arca)
((Creature*)arca)->Yell(SAY_DIALOG_ARCANAGOS_6, LANG_UNIVERSAL, NULL);
((Creature*)arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_6, LANG_UNIVERSAL, NULL);
return 10000;
case 7:
FireArcanagosTimer = 500;
@@ -554,7 +554,7 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
DoCast(m_creature, SPELL_MANA_SHIELD);
return 10000;
case 9:
m_creature->TextEmote(EMOTE_DIALOG_MEDIVH_7, 0, false);
m_creature->MonsterTextEmote(EMOTE_DIALOG_MEDIVH_7, 0, false);
return 10000;
case 10:
if(arca)
@@ -562,7 +562,7 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
return 1000;
case 11:
if(arca)
((Creature*)arca)->Yell(SAY_DIALOG_ARCANAGOS_8, LANG_UNIVERSAL, NULL);
((Creature*)arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_8, LANG_UNIVERSAL, NULL);
return 5000;
case 12:
arca->GetMotionMaster()->MovePoint(0, -11010.82,-1761.18, 156.47);
@@ -571,7 +571,7 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
arca->SetSpeed(MOVE_FLIGHT, 2.0f);
return 10000;
case 13:
m_creature->Yell(SAY_DIALOG_MEDIVH_9, LANG_UNIVERSAL, NULL);
m_creature->MonsterYell(SAY_DIALOG_MEDIVH_9, LANG_UNIVERSAL, NULL);
return 10000;
case 14:
m_creature->SetVisibility(VISIBILITY_OFF);
src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp
+8 -8
View File
@@ -546,31 +546,31 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
case 0: DoPlaySoundToSet(m_creature,SOUND_INTRO); return 0;
case 1:
if(Sacrolash)
Sacrolash->Yell(YELL_INTRO_SAC_1, LANG_UNIVERSAL,NULL);
Sacrolash->MonsterYell(YELL_INTRO_SAC_1, LANG_UNIVERSAL,NULL);
return 1000;
case 2:
m_creature->Yell(YELL_INTRO_ALY_2, LANG_UNIVERSAL,NULL);
m_creature->MonsterYell(YELL_INTRO_ALY_2, LANG_UNIVERSAL,NULL);
return 1000;
case 3:
if(Sacrolash)
Sacrolash->Yell(YELL_INTRO_SAC_3, LANG_UNIVERSAL,NULL);
Sacrolash->MonsterYell(YELL_INTRO_SAC_3, LANG_UNIVERSAL,NULL);
return 2000;
case 4:
m_creature->Yell(YELL_INTRO_ALY_4, LANG_UNIVERSAL,NULL);
m_creature->MonsterYell(YELL_INTRO_ALY_4, LANG_UNIVERSAL,NULL);
return 1000;
case 5:
if(Sacrolash)
Sacrolash->Yell(YELL_INTRO_SAC_5, LANG_UNIVERSAL,NULL);
Sacrolash->MonsterYell(YELL_INTRO_SAC_5, LANG_UNIVERSAL,NULL);
return 2000;
case 6:
m_creature->Yell(YELL_INTRO_ALY_6, LANG_UNIVERSAL,NULL);
m_creature->MonsterYell(YELL_INTRO_ALY_6, LANG_UNIVERSAL,NULL);
return 1000;
case 7:
if(Sacrolash)
Sacrolash->Yell(YELL_INTRO_SAC_7, LANG_UNIVERSAL,NULL);
Sacrolash->MonsterYell(YELL_INTRO_SAC_7, LANG_UNIVERSAL,NULL);
return 3000;
case 8:
m_creature->Yell(YELL_INTRO_ALY_8, LANG_UNIVERSAL,NULL);
m_creature->MonsterYell(YELL_INTRO_ALY_8, LANG_UNIVERSAL,NULL);
return 900000;
}
return 10000;