diff options
| -rw-r--r-- | sql/updates/world/master/2021_10_22_20_world_2018_08_26_09_world.sql | 96 | ||||
| -rw-r--r-- | src/server/scripts/World/areatrigger_scripts.cpp | 52 |
2 files changed, 96 insertions, 52 deletions
diff --git a/sql/updates/world/master/2021_10_22_20_world_2018_08_26_09_world.sql b/sql/updates/world/master/2021_10_22_20_world_2018_08_26_09_world.sql new file mode 100644 index 00000000000..a5b0e2e8ad4 --- /dev/null +++ b/sql/updates/world/master/2021_10_22_20_world_2018_08_26_09_world.sql @@ -0,0 +1,96 @@ +-- NAXXANAR +-- AREATRIGGER-ID +-- SKY +-- 5338 roof +-- 5339 upper chamber +-- 5340 upper platform +-- 5334 lower platform +-- 5332 ground +-- GROUND +DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5332,5334,5340,5339,5338); +INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES +(5332, "SmartTrigger"), +(5334, "SmartTrigger"), +(5340, "SmartTrigger"), +(5339, "SmartTrigger"), +(5338, "SmartTrigger"); + +DELETE FROM `smart_scripts` WHERE `source_type` = 2 AND `entryorguid` IN (5332,5334,5340,5339,5338); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(5332, 2, 0, 0, 46, 0, 100, 0, 5332, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 3733.68, 3563.25, 290.812, 3.6651, "Areatrigger - On Trigger - Teleport player"), +(5334, 2, 0, 0, 46, 0, 100, 0, 5334, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 3802.38, 3585.95, 49.576, 0.0, "Areatrigger - On Trigger - Teleport player"), +(5340, 2, 0, 0, 46, 0, 100, 0, 5340, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 3687.91, 3577.28, 473.342, 0.0, "Areatrigger - On Trigger - Teleport player"), +(5340, 2, 1, 0, 46, 0, 100, 0, 5340, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 3744.80, 3570.65, 341.66, 0.6, "Areatrigger - On Trigger - Teleport player"), +(5339, 2, 0, 0, 46, 0, 100, 0, 5339, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 3733.68, 3563.25, 290.812, 3.6651, "Areatrigger - On Trigger - Teleport player"), +(5338, 2, 0, 0, 46, 0, 100, 0, 5338, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 3733.68, 3563.25, 290.812, 3.6651, "Areatrigger - On Trigger - Teleport player"); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` IN (5332,5334,5340,5339,5338); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(22, 1, 5332, 2, 0, 8, 0, 12019, 0, 0, 0, 0, 0, "", "SAI areatrigger 5332 requires quest Breaking Through turned in OR"), +(22, 1, 5332, 2, 1, 9, 0, 12019, 0, 0, 0, 0, 0, "", "SAI areatrigger 5332 requires quest Breaking Through in the log OR"), +(22, 1, 5332, 2, 2,28, 0, 12019, 0, 0, 0, 0, 0, "", "SAI areatrigger 5332 requires quest Breaking Through completed OR"), +(22, 1, 5332, 2, 3, 8, 0, 11898, 0, 0, 0, 0, 0, "", "SAI areatrigger 5332 requires quest Last Rites turned in OR"), +(22, 1, 5332, 2, 4, 9, 0, 11898, 0, 0, 0, 0, 0, "", "SAI areatrigger 5332 requires quest Last Rites in the log OR"), +(22, 1, 5332, 2, 5,28, 0, 11898, 0, 0, 0, 0, 0, "", "SAI areatrigger 5332 requires quest Last Rites completed OR"), +(22, 1, 5340, 2, 0, 6, 0, 469, 0, 0, 0, 0, 0, "", "SAI areatrigger 5340.0 triggers only if player is alliance"), +(22, 2, 5340, 2, 0, 6, 0, 67, 0, 0, 0, 0, 0, "", "SAI areatrigger 5340.1 triggers only if player is horde"); + +-- VOLTARUS +-- BUNNY-GUID AREATRIGGER-ID SPELL-ID TELE-ID +-- SKY +-- 114831 5080 52089 52091 +-- 114830 5079 52676 52677 +-- 114829 5061 52239 52240 +-- 114832 5051 52089 52091 +-- GROUND + +-- Drakuramas Teleport Bunnies should not move or spawn of center +UPDATE `creature` SET `spawndist` = 0, `MovementType` = 0 WHERE `id` IN (28617, 28751); + +DELETE FROM `areatrigger_teleport` WHERE `ID` IN (5051, 5061, 5079, 5080); +DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5051, 5061, 5079, 5080); +INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES +(5051, "SmartTrigger"), +(5061, "SmartTrigger"), +(5079, "SmartTrigger"), +(5080, "SmartTrigger"); + +UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`="" WHERE `entry`=28617; +DELETE FROM `smart_scripts` WHERE `source_type` = 2 AND `entryorguid` IN (5051, 5061, 5079, 5080); +DELETE FROM `smart_scripts` WHERE `source_type` = 9 AND `entryorguid` IN (2861700, 2861701, 2861702, 2861703); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(5051, 2, 0, 1, 46, 0, 100, 0, 5051, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Store target"), +(5051, 2, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 10, 114832, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Send target"), +(5051, 2, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 2861700, 0, 0, 0, 0, 0, 10, 114832, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Action list"), +(5061, 2, 0, 1, 46, 0, 100, 0, 5061, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Store target"), +(5061, 2, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 10, 114829, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Send target"), +(5061, 2, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 2861701, 0, 0, 0, 0, 0, 10, 114829, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Action list"), +(5079, 2, 0, 1, 46, 0, 100, 0, 5079, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Store target"), +(5079, 2, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 10, 114830, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Send target"), +(5079, 2, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 2861702, 0, 0, 0, 0, 0, 10, 114830, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Action list"), +(5080, 2, 0, 1, 46, 0, 100, 0, 5080, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Store target"), +(5080, 2, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 10, 114831, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Send target"), +(5080, 2, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 2861703, 0, 0, 0, 0, 0, 10, 114831, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Action list"), +(2861700, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 85, 52089, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport Script 01' on self"), +(2861700, 9, 1, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 85, 52091, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport 01' on stored target"), +(2861701, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 85, 52239, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport Script 02' on self"), +(2861701, 9, 1, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 85, 52240, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport 02' on stored target"), +(2861702, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 85, 52676, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport Script 03' on self"), +(2861702, 9, 1, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 85, 52677, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport 03' on stored target"), +(2861703, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 85, 52089, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport Script 01' on self"), +(2861703, 9, 1, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 85, 52091, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport 01' on stored target"); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` IN (5051, 5061, 5079, 5080); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(22, 1, 5051, 2, 0, 1, 0, 51966, 0, 0, 0, 0, 0, "", "SAI areatrigger 5051 triggers if player has aura 'Scourge Disguise'"), +(22, 1, 5061, 2, 0, 1, 0, 51966, 0, 0, 0, 0, 0, "", "SAI areatrigger 5061 triggers if player has aura 'Scourge Disguise'"), +(22, 1, 5079, 2, 0, 1, 0, 51966, 0, 0, 0, 0, 0, "", "SAI areatrigger 5079 triggers if player has aura 'Scourge Disguise' AND"), +(22, 1, 5079, 2, 0, 2, 0, 39319, 1, 0, 0, 0, 0, "", "SAI areatrigger 5079 triggers if player has item 'Scepter of Domination' AND"), +(22, 1, 5080, 2, 0, 1, 0, 51966, 0, 0, 0, 0, 0, "", "SAI areatrigger 5080 triggers if player has aura 'Scourge Disguise'"); + +-- DELETE FROM `spell_target_position` WHERE `id` IN (52240); +-- INSERT INTO `spell_target_position` (`ID`, `EffectIndex`, `MapID`, `PositionX`, `PositionY`, `PositionZ`, `Orientation`, `VerifiedBuild`) VALUES +-- (52240, 0, 571, 6175.59, -2000.67, 241.769, 1.54, 0); + +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (52089,52239,52676); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (52089, 52091, 52239, 52676, 52240,52677); diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index f67e5547c72..ed78160b499 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -161,57 +161,6 @@ class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript } }; -/*##### -## at_last_rites -#####*/ - -enum AtLastRites -{ - QUEST_LAST_RITES = 12019, - QUEST_BREAKING_THROUGH = 11898, -}; - -class AreaTrigger_at_last_rites : public AreaTriggerScript -{ - public: - AreaTrigger_at_last_rites() : AreaTriggerScript("at_last_rites") { } - - bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger, bool /*entered*/) override - { - if (!(player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE || - player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_COMPLETE || - player->GetQuestStatus(QUEST_BREAKING_THROUGH) == QUEST_STATUS_INCOMPLETE || - player->GetQuestStatus(QUEST_BREAKING_THROUGH) == QUEST_STATUS_COMPLETE)) - return false; - - WorldLocation pPosition; - - switch (areaTrigger->ID) - { - case 5332: - case 5338: - pPosition = WorldLocation(571, 3733.68f, 3563.25f, 290.812f, 3.665192f); - break; - case 5334: - pPosition = WorldLocation(571, 3802.38f, 3585.95f, 49.5765f, 0.0f); - break; - case 5340: - if (player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE || - player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_COMPLETE) - pPosition = WorldLocation(571, 3687.91f, 3577.28f, 473.342f); - else - pPosition = WorldLocation(571, 3739.38f, 3567.09f, 341.58f); - break; - default: - return false; - } - - player->TeleportTo(pPosition); - - return false; - } -}; - /*###### ## at_sholazar_waygate ######*/ @@ -484,7 +433,6 @@ void AddSC_areatrigger_scripts() new AreaTrigger_at_legion_teleporter(); new AreaTrigger_at_stormwright_shelf(); new AreaTrigger_at_scent_larkorwi(); - new AreaTrigger_at_last_rites(); new AreaTrigger_at_sholazar_waygate(); new AreaTrigger_at_nats_landing(); new AreaTrigger_at_brewfest(); |