Skip to content

Commit

Permalink
Core/Script: Gnomeregan - Deleting duplicate texts and adjusted the s…
Browse files Browse the repository at this point in the history 
…cript
  • Loading branch information
@durotar
durotar committed Oct 20, 2012
1 parent 1252e16 commit 998c74e
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 76 deletions.
36 changes: 0 additions & 36 deletions sql/updates/world/2012_10_19_00_world_creature_text.sql
View file

This file was deleted.

27 changes: 27 additions & 0 deletions sql/updates/world/2012_10_20_02_world_creature_text.sql
View file
@@ -0,0 +1,27 @@
-- Gnomeregan/Blastmaster Emi Shortfuse's event
DELETE FROM `script_texts` WHERE `entry` BETWEEN -1090028 AND -1090000;
DELETE FROM `creature_text` WHERE `entry` IN (7361,7998);
INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES
-- Emi Shortfuse
(7998,0,0, 'With your help, I can evaluate these tunnels.',12,0,100,0,0,0, 'SAY_BLASTMASTER_0'),
(7998,1,0, 'Let''s see if we can find out where these Troggs are coming from... and put a stop to the invasion!',12,0,100,0,0,0, 'SAY_BLASTMASTER_1'),
(7998,2,0, 'Such devastation... what horrible mess...',12,0,100,0,0,0, 'SAY_BLASTMASTER_2'),
(7998,3,0, 'It''s quiet here...',12,0,100,0,0,0, 'SAY_BLASTMASTER_3'),
(7998,4,0, '...too quiet.',12,0,100,0,0,0, 'SAY_BLASTMASTER_4'),
(7998,5,0, 'Look! Over there at the tunnel wall!',12,0,100,0,0,0, 'SAY_BLASTMASTER_5'),
(7998,6,0, 'Trogg incrusion! Defend me while I blast the hole closed!',12,0,100,0,0,0, 'SAY_BLASTMASTER_6'),
(7998,7,0, 'I don''t think one charge is going to cut it. Keep fending them off!',12,0,100,0,0,0, 'SAY_BLASTMASTER_7'),
(7998,8,0, 'The charges are set. Get back before they blow!',12,0,100,0,0,0, 'SAY_BLASTMASTER_8'),
(7998,9,0, 'Incoming blast in 10 seconds!',14,0,100,0,0,0, 'SAY_BLASTMASTER_9'),
(7998,10,0, 'Incoming blast in 5 seconds. Clear the tunnel!',14,0,100,0,0,0, 'SAY_BLASTMASTER_10'),
(7998,11,0, 'FIRE IN THE HOLE!',14,0,100,0,0,0, 'SAY_BLASTMASTER_11'),
(7998,12,0, 'Well done! Without your help I would have never been able to thwart that wave of troggs.',12,0,100,0,0,0, 'SAY_BLASTMASTER_12'),
(7998,13,0, 'Did you hear something?',12,0,100,0,0,0, 'SAY_BLASTMASTER_13'),
(7998,14,0, 'I heard something over there.',12,0,100,0,0,0, 'SAY_BLASTMASTER_14'),
(7998,15,0, 'More troggs! Ward them off as I prepare the explosives!',12,0,100,0,0,0, 'SAY_BLASTMASTER_15'),
(7998,16,0, 'The final charge is set. Stand back!',12,0,100,0,0,0, 'SAY_BLASTMASTER_16'),
(7998,17,0, '10 seconds to blast! Stand back!!!',14,0,100,0,0,0, 'SAY_BLASTMASTER_17'),
(7998,18,0, '5 seconds until detonation!!',14,0,100,0,0,0, 'SAY_BLASTMASTER_18'),
(7998,19,0, 'Superb! Because of your help, my people stand a chance of re-taking our belowed city. Three cheers to you!',12,0,100,0,0,0, 'SAY_BLASTMASTER_19'),
-- Grubbis
(7361,0,0, 'We come from below! You can never stop us!',14,0,100,0,0,0, 'SAY_GRUBBIS');
66 changes: 26 additions & 40 deletions src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
View file
Expand Up @@ -54,15 +54,6 @@ enum BlastmasterEmi
SAY_BLASTMASTER_17 = 17,
SAY_BLASTMASTER_18 = 18,
SAY_BLASTMASTER_19 = 19,
SAY_BLASTMASTER_20 = 20,
SAY_BLASTMASTER_21 = 21,
SAY_BLASTMASTER_22 = 22,
SAY_BLASTMASTER_23 = 23,
SAY_BLASTMASTER_24 = 24,
SAY_BLASTMASTER_25 = 25,
SAY_BLASTMASTER_26 = 26,
SAY_BLASTMASTER_27 = 27,
SAY_BLASTMASTER_28 = 28,

SAY_GRUBBIS = 0
};
Expand Down Expand Up @@ -304,12 +295,12 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript
NextStep(25000, false, 18);
break;
case 13:
Summon(7);
Summon(6);
NextStep(25000, false, 19);
break;
case 14:
SetInFace(false);
Talk(SAY_BLASTMASTER_26);
Talk(SAY_BLASTMASTER_17);
SetEscortPaused(true);
NextStep(5000, false, 20);
break;
Expand Down Expand Up @@ -372,7 +363,7 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
Talk(SAY_BLASTMASTER_19);
Talk(SAY_BLASTMASTER_7);
break;
case 4:
if (GameObject* go = me->SummonGameObject(183410, -542.199f, -96.854f, -155.790f, 0, 0, 0, 0, 0, 1000))
Expand All @@ -382,39 +373,33 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript
}
break;
case 5:
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
Talk(SAY_BLASTMASTER_15);
break;
case 6:
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[10], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[11], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[12], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[13], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[14], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
break;
case 7:
case 6:
if (GameObject* go = me->SummonGameObject(183410, -507.820f, -103.333f, -151.353f, 0, 0, 0, 0, 0, 1000))
{
GoSummonList.push_back(go->GetGUID());
go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it!
Summon(6);
Summon(5);
}
break;
case 8:
case 7:
if (GameObject* go = me->SummonGameObject(183410, -511.829f, -86.249f, -151.431f, 0, 0, 0, 0, 0, 1000))
{
GoSummonList.push_back(go->GetGUID());
go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it!
}
break;
case 9:
case 8:
if (Creature* grubbis = me->SummonCreature(NPC_GRUBBIS, SpawnPosition[15], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000))
grubbis->AI()->Talk(SAY_GRUBBIS);
me->SummonCreature(NPC_CHOMPER, SpawnPosition[16], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
break;
case 10:
case 9:
me->SummonGameObject(GO_RED_ROCKET, SpawnPosition[17].GetPositionX(), SpawnPosition[17].GetPositionY(), SpawnPosition[17].GetPositionZ(), SpawnPosition[17].GetOrientation(), 0, 0, 0, 0, 7200);
me->SummonGameObject(GO_RED_ROCKET, SpawnPosition[18].GetPositionX(), SpawnPosition[18].GetPositionY(), SpawnPosition[18].GetPositionZ(), SpawnPosition[18].GetOrientation(), 0, 0, 0, 0, 7200);
me->SummonGameObject(GO_RED_ROCKET, SpawnPosition[19].GetPositionX(), SpawnPosition[19].GetPositionY(), SpawnPosition[19].GetPositionZ(), SpawnPosition[19].GetOrientation(), 0, 0, 0, 0, 7200);
Expand Down Expand Up @@ -475,31 +460,32 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript
break;
case 10:
Summon(4);
Talk(SAY_BLASTMASTER_8);
NextStep(0, false);
break;
case 11:
Talk(SAY_BLASTMASTER_17);
Talk(SAY_BLASTMASTER_9);
NextStep(5000, true);
break;
case 12:
Talk(SAY_BLASTMASTER_18);
Talk(SAY_BLASTMASTER_10);
NextStep(5000, true);
break;
case 13:
Talk(SAY_BLASTMASTER_20);
Talk(SAY_BLASTMASTER_11);
CaveDestruction(true);
NextStep(8000, true);
break;
case 14:
Talk(SAY_BLASTMASTER_21);
Talk(SAY_BLASTMASTER_12);
NextStep(8500, true);
break;
case 15:
Talk(SAY_BLASTMASTER_22);
Talk(SAY_BLASTMASTER_13);
NextStep(2000, true);
break;
case 16:
Talk(SAY_BLASTMASTER_23);
Talk(SAY_BLASTMASTER_14);
SetInFace(false);
if (instance)
if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
Expand All @@ -508,36 +494,36 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript
break;
case 17:
SetEscortPaused(false);
Talk(SAY_BLASTMASTER_24);
Summon(6);
Talk(SAY_BLASTMASTER_15);
Summon(5);
NextStep(0, false);
break;
case 18:
Summon(7);
Summon(6);
NextStep(0, false);
break;
case 19:
SetInFace(false);
Summon(8);
Talk(SAY_BLASTMASTER_25);
Summon(7);
Talk(SAY_BLASTMASTER_16);
NextStep(0, false);
break;
case 20:
Talk(SAY_BLASTMASTER_27);
Talk(SAY_BLASTMASTER_18);
NextStep(2000, true);
break;
case 21:
Summon(9);
Summon(8);
NextStep(0, false);
break;
case 22:
CaveDestruction(false);
Talk(SAY_BLASTMASTER_20);
NextStep(2000, true);
Talk(SAY_BLASTMASTER_11);
NextStep(3000, true);
break;
case 23:
Summon(10);
Talk(SAY_BLASTMASTER_28);
Summon(9);
Talk(SAY_BLASTMASTER_19);
NextStep(0, false);
break;
}
Expand Down

0 comments on commit 998c74e

Please sign in to comment.