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

Core/Script: Code style and remove unused core.

Browse Source 
Signed-off-by: Gyx <[email protected]>
This commit is contained in:
Gyx
2012-03-17 12:17:15 +08:00
parent 68ad764e2e
commit 7877eae6ba
19 changed files with 434 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+57 -17
View File
@@ -111,12 +111,33 @@ public:
switch (uiSpeech_counter) switch (uiSpeech_counter)
{ {
case 1: DoScriptText(SAY_PERSUADED1, me); uiSpeech_timer = 8000; break; case 1:
case 2: DoScriptText(SAY_PERSUADED2, me); uiSpeech_timer = 8000; break; DoScriptText(SAY_PERSUADED1, me);
case 3: DoScriptText(SAY_PERSUADED3, me); uiSpeech_timer = 8000; break; uiSpeech_timer = 8000;
case 4: DoScriptText(SAY_PERSUADED4, me); uiSpeech_timer = 8000; break; break;
case 5: DoScriptText(SAY_PERSUADED5, player); uiSpeech_timer = 8000; break;
case 6: DoScriptText(SAY_PERSUADED6, me); case 2:
DoScriptText(SAY_PERSUADED2, me);
uiSpeech_timer = 8000;
break;
case 3:
DoScriptText(SAY_PERSUADED3, me);
uiSpeech_timer = 8000;
break;
case 4:
DoScriptText(SAY_PERSUADED4, me);
uiSpeech_timer = 8000;
break;
case 5:
DoScriptText(SAY_PERSUADED5, player);
uiSpeech_timer = 8000;
break;
case 6:
DoScriptText(SAY_PERSUADED6, me);
player->Kill(me); player->Kill(me);
//me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
//me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); //me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -704,7 +725,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break; case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -732,7 +755,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break; case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -760,7 +785,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break; case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -788,7 +815,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break; case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -816,7 +845,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break; case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -844,7 +875,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break; case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -872,7 +905,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break; case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -900,7 +935,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break; case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -928,7 +965,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break; case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -956,7 +995,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break; case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -978,7 +1019,6 @@ public:
} }
} }
}; };
}; };
void AddSC_the_scarlet_enclave_c2() void AddSC_the_scarlet_enclave_c2()
src/server/scripts/EasternKingdoms/arathi_highlands.cpp
+15 -7
View File
@@ -73,21 +73,29 @@ class npc_professor_phizzlethorpe : public CreatureScript
switch (uiPointId) switch (uiPointId)
{ {
case 4:Talk(SAY_PROGRESS_2, player->GetGUID());break; case 4:
case 5:Talk(SAY_PROGRESS_3, player->GetGUID());break; Talk(SAY_PROGRESS_2, player->GetGUID());
case 8:Talk(EMOTE_PROGRESS_4);break; break;
case 5:
Talk(SAY_PROGRESS_3, player->GetGUID());
break;
case 8:
Talk(EMOTE_PROGRESS_4);
break;
case 9: case 9:
{
me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
break; break;
} case 10:
case 10:Talk(SAY_PROGRESS_5, player->GetGUID());break; Talk(SAY_PROGRESS_5, player->GetGUID());
break;
case 11: case 11:
Talk(SAY_PROGRESS_6, player->GetGUID()); Talk(SAY_PROGRESS_6, player->GetGUID());
SetRun(); SetRun();
break; break;
case 19:Talk(SAY_PROGRESS_7, player->GetGUID()); break; case 19:
Talk(SAY_PROGRESS_7, player->GetGUID());
break;
case 20: case 20:
Talk(EMOTE_PROGRESS_8); Talk(EMOTE_PROGRESS_8);
Talk(SAY_PROGRESS_9, player->GetGUID()); Talk(SAY_PROGRESS_9, player->GetGUID());
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+11 -3
View File
@@ -896,9 +896,17 @@ void hyjalAI::UpdateAI(const uint32 diff)
switch (Spells[i].TargetType) switch (Spells[i].TargetType)
{ {
case TARGETTYPE_SELF: target = me; break; case TARGETTYPE_SELF:
case TARGETTYPE_RANDOM: target = SelectTarget(SELECT_TARGET_RANDOM, 0); break; target = me;
case TARGETTYPE_VICTIM: target = me->getVictim(); break; break;
case TARGETTYPE_RANDOM:
target = SelectTarget(SELECT_TARGET_RANDOM, 0);
break;
case TARGETTYPE_VICTIM:
target = me->getVictim();
break;
} }
if (target && target->isAlive()) if (target && target->isAlive())
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+19 -8
View File
@@ -176,17 +176,23 @@ public:
{ {
switch (type) switch (type)
{ {
case DATA_RAGEWINTERCHILLEVENT: m_auiEncounter[0] = data; break; case DATA_RAGEWINTERCHILLEVENT:
m_auiEncounter[0] = data;
break;
case DATA_ANETHERONEVENT: case DATA_ANETHERONEVENT:
m_auiEncounter[1] = data; m_auiEncounter[1] = data;
break; break;
case DATA_KAZROGALEVENT: m_auiEncounter[2] = data; break; case DATA_KAZROGALEVENT:
m_auiEncounter[2] = data;
break;
case DATA_AZGALOREVENT: case DATA_AZGALOREVENT:
{ {
m_auiEncounter[3] = data; m_auiEncounter[3] = data;
if (data == DONE) if (data == DONE)
{ {
if (ArchiYell)break; if (ArchiYell)
break;
ArchiYell = true; ArchiYell = true;
Creature* creature = instance->GetCreature(Azgalor); Creature* creature = instance->GetCreature(Azgalor);
@@ -220,12 +226,17 @@ public:
} }
} }
break; break;
case DATA_ARCHIMONDEEVENT: m_auiEncounter[4] = data; break; case DATA_ARCHIMONDEEVENT:
case DATA_RESET_TRASH_COUNT: Trash = 0; break; m_auiEncounter[4] = data;
break;
case DATA_RESET_TRASH_COUNT:
Trash = 0;
break;
case DATA_TRASH: case DATA_TRASH:
if (data) Trash = data; if (data)
else Trash--; Trash = data;
else
Trash--;
DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, Trash); DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, Trash);
break; break;
case TYPE_RETREAT: case TYPE_RETREAT:
src/server/scripts/Kalimdor/azshara.cpp
-1
View File
@@ -516,7 +516,6 @@ public:
{ {
} }
}; };
}; };
void AddSC_azshara() void AddSC_azshara()
src/server/scripts/Kalimdor/azuremyst_isle.cpp
+7 -2
View File
@@ -309,8 +309,13 @@ public:
me->SetHealth(me->CountPctFromMaxHealth(15)); me->SetHealth(me->CountPctFromMaxHealth(15));
switch (rand()%2) switch (rand()%2)
{ {
case 0: me->SetStandState(UNIT_STAND_STATE_SIT); break; case 0:
case 1: me->SetStandState(UNIT_STAND_STATE_SLEEP); break; me->SetStandState(UNIT_STAND_STATE_SIT);
break;
case 1:
me->SetStandState(UNIT_STAND_STATE_SLEEP);
break;
} }
} }
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
+7 -2
View File
@@ -402,8 +402,13 @@ public:
switch (go->GetEntry()) switch (go->GetEntry())
{ {
case GO_SPHERE1: instance->SetData(DATA_SPHERE1_EVENT, IN_PROGRESS); break; case GO_SPHERE1:
case GO_SPHERE2: instance->SetData(DATA_SPHERE2_EVENT, IN_PROGRESS); break; instance->SetData(DATA_SPHERE1_EVENT, IN_PROGRESS);
break;
case GO_SPHERE2:
instance->SetData(DATA_SPHERE2_EVENT, IN_PROGRESS);
break;
} }
CAST_AI(boss_taldaram::boss_taldaramAI, pPrinceTaldaram->AI())->CheckSpheres(); CAST_AI(boss_taldaram::boss_taldaramAI, pPrinceTaldaram->AI())->CheckSpheres();
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp
+44 -16
View File
@@ -110,26 +110,37 @@ public:
{ {
switch (go->GetEntry()) switch (go->GetEntry())
{ {
case 193564: Prince_TaldaramPlatform = go->GetGUID(); case 193564:
if (m_auiEncounter[1] == DONE) HandleGameObject(0, true, go); break; Prince_TaldaramPlatform = go->GetGUID();
case 193093: Prince_TaldaramSpheres[0] = go->GetGUID(); if (m_auiEncounter[1] == DONE)
HandleGameObject(0, true, go);
break;
case 193093:
Prince_TaldaramSpheres[0] = go->GetGUID();
if (spheres[0] == IN_PROGRESS) if (spheres[0] == IN_PROGRESS)
{ {
go->SetGoState(GO_STATE_ACTIVE); go->SetGoState(GO_STATE_ACTIVE);
go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
} }
else go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); else
go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
break; break;
case 193094: Prince_TaldaramSpheres[1] = go->GetGUID(); case 193094:
Prince_TaldaramSpheres[1] = go->GetGUID();
if (spheres[1] == IN_PROGRESS) if (spheres[1] == IN_PROGRESS)
{ {
go->SetGoState(GO_STATE_ACTIVE); go->SetGoState(GO_STATE_ACTIVE);
go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
} }
else go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); else
go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
break;
case 192236:
Prince_TaldaramGate = go->GetGUID(); // Web gate past Prince Taldaram
if (m_auiEncounter[1] == DONE)
HandleGameObject(0, true, go);
break; break;
case 192236: Prince_TaldaramGate = go->GetGUID(); // Web gate past Prince Taldaram
if (m_auiEncounter[1] == DONE)HandleGameObject(0, true, go);break;
} }
} }
@@ -137,8 +148,13 @@ public:
{ {
switch (idx) switch (idx)
{ {
case DATA_ADD_JEDOGA_OPFER: JedogaSacrifices = guid; break; case DATA_ADD_JEDOGA_OPFER:
case DATA_PL_JEDOGA_TARGET: JedogaTarget = guid; break; JedogaSacrifices = guid;
break;
case DATA_PL_JEDOGA_TARGET:
JedogaTarget = guid;
break;
} }
} }
@@ -179,7 +195,9 @@ public:
{ {
switch (type) switch (type)
{ {
case DATA_ELDER_NADOX_EVENT: m_auiEncounter[0] = data; break; case DATA_ELDER_NADOX_EVENT:
m_auiEncounter[0] = data;
break;
case DATA_PRINCE_TALDARAM_EVENT: case DATA_PRINCE_TALDARAM_EVENT:
if (data == DONE) if (data == DONE)
HandleGameObject(Prince_TaldaramGate, true); HandleGameObject(Prince_TaldaramGate, true);
@@ -201,11 +219,21 @@ public:
} }
} }
break; break;
case DATA_HERALD_VOLAZJ_EVENT: m_auiEncounter[3] = data; break; case DATA_HERALD_VOLAZJ_EVENT:
case DATA_AMANITAR_EVENT: m_auiEncounter[4] = data; break; m_auiEncounter[3] = data;
case DATA_SPHERE1_EVENT: spheres[0] = data; break; break;
case DATA_SPHERE2_EVENT: spheres[1] = data; break; case DATA_AMANITAR_EVENT:
case DATA_JEDOGA_TRIGGER_SWITCH: switchtrigger = data; break; m_auiEncounter[4] = data;
break;
case DATA_SPHERE1_EVENT:
spheres[0] = data;
break;
case DATA_SPHERE2_EVENT:
spheres[1] = data;
break;
case DATA_JEDOGA_TRIGGER_SWITCH:
switchtrigger = data;
break;
case DATA_JEDOGA_RESET_INITIANDS: case DATA_JEDOGA_RESET_INITIANDS:
for (std::set<uint64>::const_iterator itr = InitiandGUIDs.begin(); itr != InitiandGUIDs.end(); ++itr) for (std::set<uint64>::const_iterator itr = InitiandGUIDs.begin(); itr != InitiandGUIDs.end(); ++itr)
{ {
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+11 -3
View File
@@ -426,9 +426,17 @@ public:
{ {
switch (urand(0, 2)) switch (urand(0, 2))
{ {
case 0: me->SummonCreature(CREATURE_YMIRJAR_WARRIOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 0:
case 1: me->SummonCreature(CREATURE_YMIRJAR_WITCH_DOCTOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; me->SummonCreature(CREATURE_YMIRJAR_WARRIOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
case 2: me->SummonCreature(CREATURE_YMIRJAR_HARPOONER, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; break;
case 1:
me->SummonCreature(CREATURE_YMIRJAR_WITCH_DOCTOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
break;
case 2:
me->SummonCreature(CREATURE_YMIRJAR_HARPOONER, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
break;
} }
} }
} }
src/server/scripts/Northrend/grizzly_hills.cpp
+7 -2
View File
@@ -323,8 +323,13 @@ public:
DoCast(me, SPELL_DUST_FIELD, true); DoCast(me, SPELL_DUST_FIELD, true);
switch (m_gender) switch (m_gender)
{ {
case GENDER_FEMALE: DoPlaySoundToSet(me, SOUND_FEMALE); break; case GENDER_FEMALE:
case GENDER_MALE: DoPlaySoundToSet(me, SOUND_MALE); break; DoPlaySoundToSet(me, SOUND_FEMALE);
break;
case GENDER_MALE:
DoPlaySoundToSet(me, SOUND_MALE);
break;
} }
} }
} }
src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+7 -2
View File
@@ -543,8 +543,13 @@ public:
{ {
switch (urand(0, 1)) switch (urand(0, 1))
{ {
case 0: DoCast(unit, SPELL_BLESS_SPELLWARD); break; case 0:
case 1: DoCast(unit, SPELL_BLESS_PROTECTION); break; DoCast(unit, SPELL_BLESS_SPELLWARD);
break;
case 1:
DoCast(unit, SPELL_BLESS_PROTECTION);
break;
} }
} }
BlessingTimer = 60000; BlessingTimer = 60000;
src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+94 -45
View File
@@ -164,28 +164,75 @@ public:
{ {
switch (go->GetEntry()) switch (go->GetEntry())
{ {
case 185483: NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards) case 185483:
if (m_auiEncounter[0] == DONE)HandleGameObject(0, true, go);break; NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards)
case 185882: MainTempleDoors = go->GetGUID();// Main Temple Doors - right past Supermoose (Supremus) if (m_auiEncounter[0] == DONE)
if (m_auiEncounter[1] == DONE)HandleGameObject(0, true, go);break; HandleGameObject(0, true, go);
case 185478: ShadeOfAkamaDoor = go->GetGUID();break; break;
case 185480: CommonDoor = go->GetGUID();
if (m_auiEncounter[3] == DONE)HandleGameObject(0, true, go);break; case 185882:
case 186153: TeronDoor = go->GetGUID(); MainTempleDoors = go->GetGUID();// Main Temple Doors - right past Supermoose (Supremus)
if (m_auiEncounter[3] == DONE)HandleGameObject(0, true, go);break; if (m_auiEncounter[1] == DONE)
case 185892: GuurtogDoor = go->GetGUID(); HandleGameObject(0, true, go);
if (m_auiEncounter[4] == DONE)HandleGameObject(0, true, go);break; break;
case 185479: TempleDoor = go->GetGUID();
if (m_auiEncounter[5] == DONE)HandleGameObject(0, true, go);break; case 185478:
case 185482: MotherDoor = go->GetGUID(); ShadeOfAkamaDoor = go->GetGUID();
if (m_auiEncounter[6] == DONE)HandleGameObject(0, true, go);break; break;
case 185481: CouncilDoor = go->GetGUID();
if (m_auiEncounter[7] == DONE)HandleGameObject(0, true, go);break; case 185480:
case 186152: SimpleDoor = go->GetGUID(); CommonDoor = go->GetGUID();
if (m_auiEncounter[7] == DONE)HandleGameObject(0, true, go);break; if (m_auiEncounter[3] == DONE)
case 185905: IllidanGate = go->GetGUID(); break; // Gate leading to Temple Summit HandleGameObject(0, true, go);
case 186261: IllidanDoor[0] = go->GetGUID(); break; // Right door at Temple Summit break;
case 186262: IllidanDoor[1] = go->GetGUID(); break; // Left door at Temple Summit
case 186153:
TeronDoor = go->GetGUID();
if (m_auiEncounter[3] == DONE)
HandleGameObject(0, true, go);
break;
case 185892:
GuurtogDoor = go->GetGUID();
if (m_auiEncounter[4] == DONE)
HandleGameObject(0, true, go);
break;
case 185479:
TempleDoor = go->GetGUID();
if (m_auiEncounter[5] == DONE)
HandleGameObject(0, true, go);
break;
case 185482:
MotherDoor = go->GetGUID();
if (m_auiEncounter[6] == DONE)
HandleGameObject(0, true, go);
break;
case 185481:
CouncilDoor = go->GetGUID();
if (m_auiEncounter[7] == DONE)
HandleGameObject(0, true, go);
break;
case 186152:
SimpleDoor = go->GetGUID();
if (m_auiEncounter[7] == DONE)
HandleGameObject(0, true, go);
break;
case 185905:
IllidanGate = go->GetGUID(); // Gate leading to Temple Summit
break;
case 186261:
IllidanDoor[0] = go->GetGUID(); // Right door at Temple Summit
break;
case 186262:
IllidanDoor[1] = go->GetGUID(); // Left door at Temple Summit
break;
} }
} }
@@ -221,63 +268,65 @@ public:
{ {
case DATA_HIGHWARLORDNAJENTUSEVENT: case DATA_HIGHWARLORDNAJENTUSEVENT:
if (data == DONE) if (data == DONE)
{
HandleGameObject(NajentusGate, true); HandleGameObject(NajentusGate, true);
} m_auiEncounter[0] = data;
m_auiEncounter[0] = data;break; break;
case DATA_SUPREMUSEVENT: case DATA_SUPREMUSEVENT:
if (data == DONE) if (data == DONE)
{
HandleGameObject(NajentusGate, true); HandleGameObject(NajentusGate, true);
} m_auiEncounter[1] = data;
m_auiEncounter[1] = data; break; break;
case DATA_SHADEOFAKAMAEVENT: case DATA_SHADEOFAKAMAEVENT:
if (data == IN_PROGRESS) if (data == IN_PROGRESS)
{
HandleGameObject(ShadeOfAkamaDoor, false); HandleGameObject(ShadeOfAkamaDoor, false);
} else HandleGameObject(ShadeOfAkamaDoor, true); else
m_auiEncounter[2] = data; break; HandleGameObject(ShadeOfAkamaDoor, true);
m_auiEncounter[2] = data;
break;
case DATA_TERONGOREFIENDEVENT: case DATA_TERONGOREFIENDEVENT:
if (data == IN_PROGRESS) if (data == IN_PROGRESS)
{ {
HandleGameObject(TeronDoor, false); HandleGameObject(TeronDoor, false);
HandleGameObject(CommonDoor, false); HandleGameObject(CommonDoor, false);
}else }
else
{ {
HandleGameObject(TeronDoor, true); HandleGameObject(TeronDoor, true);
HandleGameObject(CommonDoor, true); HandleGameObject(CommonDoor, true);
} }
m_auiEncounter[3] = data; break; m_auiEncounter[3] = data;
break;
case DATA_GURTOGGBLOODBOILEVENT: case DATA_GURTOGGBLOODBOILEVENT:
if (data == DONE) if (data == DONE)
{
HandleGameObject(GuurtogDoor, true); HandleGameObject(GuurtogDoor, true);
} m_auiEncounter[4] = data;
m_auiEncounter[4] = data; break; break;
case DATA_RELIQUARYOFSOULSEVENT: case DATA_RELIQUARYOFSOULSEVENT:
if (data == DONE) if (data == DONE)
{
HandleGameObject(TempleDoor, true); HandleGameObject(TempleDoor, true);
} m_auiEncounter[5] = data;
m_auiEncounter[5] = data; break; break;
case DATA_MOTHERSHAHRAZEVENT: case DATA_MOTHERSHAHRAZEVENT:
if (data == DONE) if (data == DONE)
{
HandleGameObject(MotherDoor, true); HandleGameObject(MotherDoor, true);
} m_auiEncounter[6] = data;
m_auiEncounter[6] = data; break; break;
case DATA_ILLIDARICOUNCILEVENT: case DATA_ILLIDARICOUNCILEVENT:
if (data == IN_PROGRESS) if (data == IN_PROGRESS)
{ {
HandleGameObject(CouncilDoor, false); HandleGameObject(CouncilDoor, false);
HandleGameObject(SimpleDoor, false); HandleGameObject(SimpleDoor, false);
}else }
else
{ {
HandleGameObject(CouncilDoor, true); HandleGameObject(CouncilDoor, true);
HandleGameObject(SimpleDoor, true); HandleGameObject(SimpleDoor, true);
} }
m_auiEncounter[7] = data; break; m_auiEncounter[7] = data;
case DATA_ILLIDANSTORMRAGEEVENT: m_auiEncounter[8] = data; break; break;
case DATA_ILLIDANSTORMRAGEEVENT:
m_auiEncounter[8] = data;
break;
} }
if (data == DONE) if (data == DONE)
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+46 -17
View File
@@ -177,13 +177,9 @@ public:
void KilledUnit(Unit* /*victim*/) void KilledUnit(Unit* /*victim*/)
{ {
if (CorruptedForm) if (CorruptedForm)
{
DoScriptText(RAND(SAY_CORRUPT_SLAY1, SAY_CORRUPT_SLAY2), me); DoScriptText(RAND(SAY_CORRUPT_SLAY1, SAY_CORRUPT_SLAY2), me);
}
else else
{
DoScriptText(RAND(SAY_CLEAN_SLAY1, SAY_CLEAN_SLAY2), me); DoScriptText(RAND(SAY_CLEAN_SLAY1, SAY_CLEAN_SLAY2), me);
}
} }
void JustSummoned(Creature* summoned) void JustSummoned(Creature* summoned)
@@ -242,12 +238,29 @@ public:
switch (MarkOfCorruption_Count) switch (MarkOfCorruption_Count)
{ {
case 0: mark_spell = SPELL_MARK_OF_CORRUPTION1; break; case 0:
case 1: mark_spell = SPELL_MARK_OF_CORRUPTION2; break; mark_spell = SPELL_MARK_OF_CORRUPTION1;
case 2: mark_spell = SPELL_MARK_OF_CORRUPTION3; break; break;
case 3: mark_spell = SPELL_MARK_OF_CORRUPTION4; break;
case 4: mark_spell = SPELL_MARK_OF_CORRUPTION5; break; case 1:
case 5: mark_spell = SPELL_MARK_OF_CORRUPTION6; break; mark_spell = SPELL_MARK_OF_CORRUPTION2;
break;
case 2:
mark_spell = SPELL_MARK_OF_CORRUPTION3;
break;
case 3:
mark_spell = SPELL_MARK_OF_CORRUPTION4;
break;
case 4:
mark_spell = SPELL_MARK_OF_CORRUPTION5;
break;
case 5:
mark_spell = SPELL_MARK_OF_CORRUPTION6;
break;
} }
DoCast(me->getVictim(), mark_spell); DoCast(me->getVictim(), mark_spell);
@@ -309,12 +322,29 @@ public:
switch (MarkOfHydross_Count) switch (MarkOfHydross_Count)
{ {
case 0: mark_spell = SPELL_MARK_OF_HYDROSS1; break; case 0:
case 1: mark_spell = SPELL_MARK_OF_HYDROSS2; break; mark_spell = SPELL_MARK_OF_HYDROSS1;
case 2: mark_spell = SPELL_MARK_OF_HYDROSS3; break; break;
case 3: mark_spell = SPELL_MARK_OF_HYDROSS4; break;
case 4: mark_spell = SPELL_MARK_OF_HYDROSS5; break; case 1:
case 5: mark_spell = SPELL_MARK_OF_HYDROSS6; break; mark_spell = SPELL_MARK_OF_HYDROSS2;
break;
case 2:
mark_spell = SPELL_MARK_OF_HYDROSS3;
break;
case 3:
mark_spell = SPELL_MARK_OF_HYDROSS4;
break;
case 4:
mark_spell = SPELL_MARK_OF_HYDROSS5;
break;
case 5:
mark_spell = SPELL_MARK_OF_HYDROSS6;
break;
} }
DoCast(me->getVictim(), mark_spell); DoCast(me->getVictim(), mark_spell);
@@ -375,7 +405,6 @@ public:
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
}; };
}; };
void AddSC_boss_hydross_the_unstable() void AddSC_boss_hydross_the_unstable()
src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+7 -2
View File
@@ -130,8 +130,13 @@ public:
{ {
switch (urand(0, 1)) switch (urand(0, 1))
{ {
case 0: target->CastSpell(target, SPELL_MAGNETIC_PULL, true, NULL, NULL, me->GetGUID()); break; case 0:
case 1: target->CastSpell(target, SPELL_KNOCK_BACK, true, NULL, NULL, me->GetGUID()); break; target->CastSpell(target, SPELL_MAGNETIC_PULL, true, NULL, NULL, me->GetGUID());
break;
case 1:
target->CastSpell(target, SPELL_KNOCK_BACK, true, NULL, NULL, me->GetGUID());
break;
} }
} }
} }
src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+11 -5
View File
@@ -137,12 +137,18 @@ public:
switch (type) switch (type)
{ {
case DATA_MAULGAREVENT: case DATA_MAULGAREVENT:
if (data == DONE) HandleGameObject(MaulgarDoor, true); if (data == DONE)
m_auiEncounter[0] = data; break; HandleGameObject(MaulgarDoor, true);
m_auiEncounter[0] = data;
break;
case DATA_GRUULEVENT: case DATA_GRUULEVENT:
if (data == IN_PROGRESS) HandleGameObject(GruulDoor, false); if (data == IN_PROGRESS)
else HandleGameObject(GruulDoor, true); HandleGameObject(GruulDoor, false);
m_auiEncounter[1] = data; break; else
HandleGameObject(GruulDoor, true);
m_auiEncounter[1] = data;
break;
} }
if (data == DONE) if (data == DONE)
src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+35 -9
View File
@@ -103,15 +103,41 @@ class instance_arcatraz : public InstanceMapScript
{ {
switch (go->GetEntry()) switch (go->GetEntry())
{ {
case CONTAINMENT_CORE_SECURITY_FIELD_ALPHA: Containment_Core_Security_Field_AlphaGUID = go->GetGUID(); break; case CONTAINMENT_CORE_SECURITY_FIELD_ALPHA:
case CONTAINMENT_CORE_SECURITY_FIELD_BETA: Containment_Core_Security_Field_BetaGUID = go->GetGUID(); break; Containment_Core_Security_Field_AlphaGUID = go->GetGUID();
case POD_ALPHA: Pod_AlphaGUID = go->GetGUID(); break; break;
case POD_GAMMA: Pod_GammaGUID = go->GetGUID(); break;
case POD_BETA: Pod_BetaGUID = go->GetGUID(); break; case CONTAINMENT_CORE_SECURITY_FIELD_BETA:
case POD_DELTA: Pod_DeltaGUID = go->GetGUID(); break; Containment_Core_Security_Field_BetaGUID = go->GetGUID();
case POD_OMEGA: Pod_OmegaGUID = go->GetGUID(); break; break;
case SEAL_SPHERE: GoSphereGUID = go->GetGUID(); break;
//case WARDENS_SHIELD: Wardens_ShieldGUID = go->GetGUID(); break; case POD_ALPHA:
Pod_AlphaGUID = go->GetGUID();
break;
case POD_GAMMA:
Pod_GammaGUID = go->GetGUID();
break;
case POD_BETA:
Pod_BetaGUID = go->GetGUID();
break;
case POD_DELTA:
Pod_DeltaGUID = go->GetGUID();
break;
case POD_OMEGA:
Pod_OmegaGUID = go->GetGUID();
break;
case SEAL_SPHERE:
GoSphereGUID = go->GetGUID();
break;
/*case WARDENS_SHIELD:
Wardens_ShieldGUID = go->GetGUID();
break;*/
} }
} }
src/server/scripts/Outland/blades_edge_mountains.cpp
+30 -8
View File
@@ -790,20 +790,42 @@ class npc_simon_bunny : public CreatureScript
{ {
switch (go->GetGOInfo()->displayId) switch (go->GetGOInfo()->displayId)
{ {
case GO_BLUE_CLUSTER_DISPLAY_LARGE: clusterIds[SIMON_BLUE] = go->GetEntry(); break; case GO_BLUE_CLUSTER_DISPLAY_LARGE:
case GO_RED_CLUSTER_DISPLAY_LARGE: clusterIds[SIMON_RED] = go->GetEntry(); break; clusterIds[SIMON_BLUE] = go->GetEntry();
case GO_GREEN_CLUSTER_DISPLAY_LARGE: clusterIds[SIMON_GREEN] = go->GetEntry(); break; break;
case GO_YELLOW_CLUSTER_DISPLAY_LARGE: clusterIds[SIMON_YELLOW] = go->GetEntry(); break;
case GO_RED_CLUSTER_DISPLAY_LARGE:
clusterIds[SIMON_RED] = go->GetEntry();
break;
case GO_GREEN_CLUSTER_DISPLAY_LARGE:
clusterIds[SIMON_GREEN] = go->GetEntry();
break;
case GO_YELLOW_CLUSTER_DISPLAY_LARGE:
clusterIds[SIMON_YELLOW] = go->GetEntry();
break;
} }
} }
else else
{ {
switch (go->GetGOInfo()->displayId) switch (go->GetGOInfo()->displayId)
{ {
case GO_BLUE_CLUSTER_DISPLAY: clusterIds[SIMON_BLUE] = go->GetEntry(); break; case GO_BLUE_CLUSTER_DISPLAY:
case GO_RED_CLUSTER_DISPLAY: clusterIds[SIMON_RED] = go->GetEntry(); break; clusterIds[SIMON_BLUE] = go->GetEntry();
case GO_GREEN_CLUSTER_DISPLAY: clusterIds[SIMON_GREEN] = go->GetEntry(); break; break;
case GO_YELLOW_CLUSTER_DISPLAY: clusterIds[SIMON_YELLOW] = go->GetEntry(); break;
case GO_RED_CLUSTER_DISPLAY:
clusterIds[SIMON_RED] = go->GetEntry();
break;
case GO_GREEN_CLUSTER_DISPLAY:
clusterIds[SIMON_GREEN] = go->GetEntry();
break;
case GO_YELLOW_CLUSTER_DISPLAY:
clusterIds[SIMON_YELLOW] = go->GetEntry();
break;
} }
} }
} }
src/server/scripts/World/areatrigger_scripts.cpp
+7 -2
View File
@@ -252,8 +252,13 @@ class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript
{ {
switch (trigger->id) switch (trigger->id)
{ {
case AT_SHOLAZAR: player->CastSpell(player, SPELL_SHOLAZAR_TO_UNGORO_TELEPORT, false); break; case AT_SHOLAZAR:
case AT_UNGORO: player->CastSpell(player, SPELL_UNGORO_TO_SHOLAZAR_TELEPORT, false); break; player->CastSpell(player, SPELL_SHOLAZAR_TO_UNGORO_TELEPORT, false);
break;
case AT_UNGORO:
player->CastSpell(player, SPELL_UNGORO_TO_SHOLAZAR_TELEPORT, false);
break;
} }
} }
src/server/scripts/World/guards.cpp
+19 -5
View File
@@ -195,12 +195,26 @@ public:
{ {
switch (emote) switch (emote)
{ {
case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break; case TEXT_EMOTE_KISS:
case TEXT_EMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break; me->HandleEmoteCommand(EMOTE_ONESHOT_BOW);
case TEXT_EMOTE_SALUTE: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); break; break;
case TEXT_EMOTE_SHY: me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX); break;
case TEXT_EMOTE_WAVE:
me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE);
break;
case TEXT_EMOTE_SALUTE:
me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE);
break;
case TEXT_EMOTE_SHY:
me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX);
break;
case TEXT_EMOTE_RUDE: case TEXT_EMOTE_RUDE:
case TEXT_EMOTE_CHICKEN: me->HandleEmoteCommand(EMOTE_ONESHOT_POINT); break; case TEXT_EMOTE_CHICKEN:
me->HandleEmoteCommand(EMOTE_ONESHOT_POINT);
break;
} }
} }