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)
{
case 1: DoScriptText(SAY_PERSUADED1, me); uiSpeech_timer = 8000; break;
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);
case 1:
DoScriptText(SAY_PERSUADED1, me);
uiSpeech_timer = 8000;
break;
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);
//me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
//me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -704,7 +725,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -732,7 +755,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -760,7 +785,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -788,7 +815,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -816,7 +845,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -844,7 +875,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -872,7 +905,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -900,7 +935,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -928,7 +965,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -956,7 +995,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 10:
DoScriptText(SAY_EXEC_WAITING, me, player);
break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -978,7 +1019,6 @@ public:
}
}
};
};
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)
{
case 4:Talk(SAY_PROGRESS_2, player->GetGUID());break;
case 5:Talk(SAY_PROGRESS_3, player->GetGUID());break;
case 8:Talk(EMOTE_PROGRESS_4);break;
case 4:
Talk(SAY_PROGRESS_2, player->GetGUID());
break;
case 5:
Talk(SAY_PROGRESS_3, player->GetGUID());
break;
case 8:
Talk(EMOTE_PROGRESS_4);
break;
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);
break;
}
case 10:Talk(SAY_PROGRESS_5, player->GetGUID());break;
case 10:
Talk(SAY_PROGRESS_5, player->GetGUID());
break;
case 11:
Talk(SAY_PROGRESS_6, player->GetGUID());
SetRun();
break;
case 19:Talk(SAY_PROGRESS_7, player->GetGUID()); break;
case 19:
Talk(SAY_PROGRESS_7, player->GetGUID());
break;
case 20:
Talk(EMOTE_PROGRESS_8);
Talk(SAY_PROGRESS_9, player->GetGUID());