diff options
| author | Killyana <morphone1@gmail.com> | 2020-04-10 20:05:26 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-01 13:48:05 +0100 |
| commit | 281e695c5655475ed5c39f6c612afe31f0202f0e (patch) | |
| tree | f4efcca99e72dc4375eb43fa2cef0e7c9ebd5751 | |
| parent | 9d70595957d1ae26fd5e328ce2818f55d289cfc8 (diff) | |
Creature: Gorkun Ironskull & Martin Victus in The Pit of Saron
Still some events are missing in this instance
(cherry picked from commit d0f9ace67970f51bd1e9fb153a0844555f2b1ca2)
3 files changed, 15 insertions, 4 deletions
diff --git a/sql/updates/world/master/2022_01_01_05_world_2020_04_10_00_world.sql b/sql/updates/world/master/2022_01_01_05_world_2020_04_10_00_world.sql new file mode 100644 index 00000000000..c89daf465e3 --- /dev/null +++ b/sql/updates/world/master/2022_01_01_05_world_2020_04_10_00_world.sql @@ -0,0 +1,9 @@ +-- +UPDATE `creature` SET `modelid`=0 WHERE `id`=37592; +UPDATE `creature_template` SET `gossip_menu_id`=10925 WHERE `entry` IN (37618); +UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry` IN (37614,37580); +UPDATE `creature_template` SET `gossip_menu_id`=10922 WHERE `entry` IN (37592,37591,37607,37606); -- must be changed to 10923 for the summoned npcs once Forgemaster Garfrost killed +-- missing gossip used by Arthas in COS "Are you ready to face Mal'Ganis with me?" +DELETE FROM `gossip_menu` WHERE `MenuId`=9712 AND `TextId`=13287; +INSERT INTO `gossip_menu` (`MenuId`, `TextId`, `VerifiedBuild`) VALUES +(9712, 13287, 11159); -- 26499 diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index 3194315b881..12dcb97e494 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -138,8 +138,10 @@ class instance_pit_of_saron : public InstanceMapScript return _teamInInstance == ALLIANCE ? NPC_FREED_SLAVE_3_ALLIANCE : NPC_FREED_SLAVE_3_HORDE; case NPC_RESCUED_SLAVE_HORDE: return _teamInInstance == ALLIANCE ? NPC_RESCUED_SLAVE_ALLIANCE : NPC_RESCUED_SLAVE_HORDE; + case NPC_GORKUN_IRONSKULL_1: + return _teamInInstance == ALLIANCE ? NPC_MARTIN_VICTUS_1 : NPC_GORKUN_IRONSKULL_1; case NPC_GORKUN_IRONSKULL_2: - return _teamInInstance == ALLIANCE ? NPC_MARTIN_VICTUS_1 : NPC_GORKUN_IRONSKULL_2; + return _teamInInstance == ALLIANCE ? NPC_MARTIN_VICTUS_2 : NPC_GORKUN_IRONSKULL_2; default: return entry; } @@ -164,7 +166,7 @@ class instance_pit_of_saron : public InstanceMapScript } else { - if (TempSummon* summon = instance->SummonCreature(NPC_GORKUN_IRONSKULL_2, SlaveLeaderPos)) + if (TempSummon* summon = instance->SummonCreature(NPC_GORKUN_IRONSKULL_1, SlaveLeaderPos)) summon->SetTempSummonType(TEMPSUMMON_MANUAL_DESPAWN); } } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h index 79d24822577..9ee7961bd1b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h @@ -85,8 +85,8 @@ enum POSCreatureIds NPC_RESCUED_SLAVE_HORDE = 36889, NPC_MARTIN_VICTUS_1 = 37591, NPC_MARTIN_VICTUS_2 = 37580, - NPC_GORKUN_IRONSKULL_1 = 37581, - NPC_GORKUN_IRONSKULL_2 = 37592, + NPC_GORKUN_IRONSKULL_1 = 37592, + NPC_GORKUN_IRONSKULL_2 = 37581, NPC_FORGEMASTER_STALKER = 36495, NPC_EXPLODING_ORB = 36610, |