From c91404202fd1f2ffe49649344a76b8dfcafa39d8 Mon Sep 17 00:00:00 2001 From: st4rgaze Date: Fri, 25 Feb 2011 10:42:43 +0700 Subject: [PATCH] starfix: HoR fix!!! wave+team check fix+2 bos jalan...kurang LK nya + PR:lootannya kedikitan --- sql/starcore/updates/2011_02_25_2_Hor.sql | 33 +++++++++++++++++++++- .../HallsOfReflection/halls_of_reflection.h | 2 ++ .../instance_halls_of_reflection.cpp | 12 ++++---- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/sql/starcore/updates/2011_02_25_2_Hor.sql b/sql/starcore/updates/2011_02_25_2_Hor.sql index bdf7375d4..295924070 100644 --- a/sql/starcore/updates/2011_02_25_2_Hor.sql +++ b/sql/starcore/updates/2011_02_25_2_Hor.sql @@ -1,4 +1,35 @@ --- bnerin npc loralen biar kgk statusnya dead +-- bnerin npc loralen sm jaina biar kgk statusnya dead n gk agro UPDATE `creature_template` SET `dynamicflags`=8 WHERE `entry`=37779 LIMIT 1; +UPDATE `creature_template` SET `flags_extra`=2 WHERE `entry`=37779 LIMIT 1; +UPDATE `creature_template` SET `flags_extra`=2 WHERE `entry`=37221 LIMIT 1; + +-- falric sm marwyn blm ada d default db world +DELETE FROM `creature` WHERE `id` = 38112; +DELETE FROM `creature` WHERE `id` = 38113; + +SET @GUID :=300000; +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `DeathState`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES (@GUID+0, 38112, 668, 1, 1, 0, 1866, 5283.75, 2030.99, 709.319, 5.57907, 300, 0, 0, 377468, 0, 0, 0, 0, 0, 0); +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `DeathState`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES (@GUID+1, 38112, 668, 2, 1, 0, 1866, 5283.75, 2030.99, 709.319, 5.57907, 300, 0, 0, 633607, 0, 0, 0, 0, 0, 0); + +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `DeathState`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES (@GUID+2, 38113, 668, 1, 1, 0, 1867, 5334.95, 1982.31, 709.319, 2.40606, 300, 0, 0, 539240, 0, 0, 0, 0, 0, 0); +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `DeathState`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES (@GUID+3, 38113, 668, 2, 1, 0, 1867, 5334.95, 1982.31, 709.319, 2.40606, 300, 0, 0, 903227, 0, 0, 0, 0, 0, 0); + +-- apus uther sm lk mereka di spawn d script instance bkn dr db + +DELETE FROM `creature` WHERE `id` = 37726; +DELETE FROM `creature` WHERE `id` = 37225; +DELETE FROM `creature` WHERE `id` = 37226; + +-- set flag npc trigger biar bner jadi invis plus kgk agro + +UPDATE `creature_template` SET `flags_extra`=130 WHERE `entry`=37906 LIMIT 1; +UPDATE `creature_template` SET `flags_extra`=130 WHERE `entry`=37704 LIMIT 1; + +-- fix TM biar bisa d attack +UPDATE `creature_template` SET `type_flags`=0, `unit_flags`=0 WHERE `entry`=38177 ; +UPDATE `creature_template` SET `type_flags`=0, `unit_flags`=0 WHERE `entry`=38173 ; +UPDATE `creature_template` SET `type_flags`=0, `unit_flags`=0 WHERE `entry`=38176 ; +UPDATE `creature_template` SET `type_flags`=0, `unit_flags`=0 WHERE `entry`=38175 ; +UPDATE `creature_template` SET `type_flags`=0, `unit_flags`=0 WHERE `entry`=38172 ; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index c7d1baabe..0c9b23efe 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -47,6 +47,8 @@ enum Creatures NPC_JAINA_PART2 = 36955, NPC_SYLVANAS_PART1 = 37223, NPC_SYLVANAS_PART2 = 37554, + NPC_LORALEN = 37779, + NPC_KORELN = 37582, NPC_WAVE_MERCENARY = 38177, NPC_WAVE_FOOTMAN = 38173, diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 6441b72b2..2e3350539 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -168,12 +168,14 @@ public: case NPC_LICH_KING_EVENT: uiLichKingEvent = creature->GetGUID(); break; - case NPC_JAINA_PART1: - uiJainaPart1 = creature->GetGUID(); - break; case NPC_SYLVANAS_PART1: - uiSylvanasPart1 = creature->GetGUID(); - break; + if (uiTeamInInstance == ALLIANCE) + creature->UpdateEntry(NPC_JAINA_PART1, ALLIANCE); + break; + case NPC_LORALEN: + if (uiTeamInInstance == ALLIANCE) + creature->UpdateEntry(NPC_KORELN, ALLIANCE); + break; } } -- 2.11.4.GIT