From 2c056116d0bdfce8df2dac519e346ed835e08e30 Mon Sep 17 00:00:00 2001 From: poszer Date: Tue, 8 Jan 2019 09:00:47 +0100 Subject: [PATCH 1/4] DB/Quest Ulag the Cleaver Move Ulag the Cleaver to SAI --- .../rev_1546933586341240000.sql | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1546933586341240000.sql diff --git a/data/sql/updates/pending_db_world/rev_1546933586341240000.sql b/data/sql/updates/pending_db_world/rev_1546933586341240000.sql new file mode 100644 index 000000000..41cafe117 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1546933586341240000.sql @@ -0,0 +1,31 @@ +INSERT INTO version_db_world (`sql_rev`) VALUES ('1546933586341240000'); + +-- Ulag the cleaver SAI +SET @OGUID =1532; +DELETE FROM `gameobject` WHERE `guid`=@OGUID; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`animprogress`,`state`, `rotation2`, `rotation3`) VALUES +(@OGUID,103813,0,1,1,2388.808, 338.269, 37.013, 2.242750, 10, 255,1, -0.891996, -0.452044); + +UPDATE `gameobject_template` SET `ScriptName`="" WHERE `entry` IN (104593,176594); +UPDATE `gameobject_template` SET `flags`=`flags`|16 WHERE `entry` IN (176594,103813); +UPDATE `gameobject_template` SET `ScriptName`="" WHERE `entry` IN (104593,176594); +UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry` IN (104593); +UPDATE `creature_template` SET `AIName`="SmartAI", `type_flags`=`type_flags`|2048 WHERE `entry` IN (6390); +DELETE FROM `smart_scripts` WHERE `entryorguid`=104593 AND `source_type`=1; +DELETE FROM `smart_scripts` WHERE `entryorguid`=6390 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (639000,10459300) AND `source_type`=9; +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`,`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 +(104593,1,0,0,70,0,100,0,2,0,0,0,80,10459300,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mausoleum Trigger - Gob activated - action list"), +(10459300,9,0,0,0,0,100,0,0,0,0,0,12,6390,3,180000,0,0,0,8,0,0,0,2390.26, 336.47, 40.01, 2.26,"Mausoleum Trigger - action list - Summon Ulag"), +(10459300,9,1,0,0,0,100,0,0,0,0,0,9,0,0,0,0,0,0,20,103813,50,0,0,0,0,0,"Mausoleum Trigger - action list - Activate gob"), +(10459300,9,2,0,0,0,100,0,3000,3000,0,0,9,0,0,0,0,0,0,20,176594,50,0,0,0,0,0,"Mausoleum Trigger - action list - Activate gob"), +(10459300,9,3,0,0,0,100,0,6000,6000,0,0,9,0,0,0,0,0,0,20,103813,50,0,0,0,0,0,"Mausoleum Trigger - action list - Activate gob"), +(6390,0,0,0,63,0,100,0,0,0,0,0,80,639000,2,0,0,0,0,1,0,0,0,0,0,0,0,"Ulag - On just summoned - action list"), +(639000,9,0,0,0,0,100,0,0,0,0,0,43,0,10721,0,0,0,0,1,0,0,0,0,0,0,0,"Ulag - action list - mount"), +(639000,9,1,0,0,0,100,0,4000,4000,0,0,69,0,0,0,0,0,0,8,0,0,0,2371.5554, 358.37, 38.092,0,"Ulag - action list - move to pos"), +(639000,9,2,0,0,0,100,0,4000,4000,0,0,43,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ulag - action list - desmount"), +(6390,0,1,0,7,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ulag - On evadde - despawn"); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=104593; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(22,1,104593,1,0,29,1,6390,100,0,1,0,0,"","SAI triggers if Ulag is not summoned"); From cfef52d19049e61c4a6c39471b8c356dac097bf2 Mon Sep 17 00:00:00 2001 From: poszer Date: Tue, 8 Jan 2019 13:48:11 +0100 Subject: [PATCH 2/4] Update zone_tirisfal_glades.cpp Removed script --- .../EasternKingdoms/zone_tirisfal_glades.cpp | 58 ------------------- 1 file changed, 58 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp index 571663b89..09f12e112 100644 --- a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp @@ -145,65 +145,7 @@ public: }; }; -/*###### -## go_mausoleum_door -## go_mausoleum_trigger -######*/ - -enum Mausoleum -{ - QUEST_ULAG = 1819, - NPC_ULAG = 6390, - GO_TRIGGER = 104593, - GO_DOOR = 176594 -}; - -class go_mausoleum_door : public GameObjectScript -{ -public: - go_mausoleum_door() : GameObjectScript("go_mausoleum_door") { } - - bool OnGossipHello(Player* player, GameObject* /*go*/) - { - if (player->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE) - return false; - - if (!player->FindNearestCreature(NPC_ULAG, 50.0f)) - if (GameObject* pTrigger = player->FindNearestGameObject(GO_TRIGGER, 30.0f)) - { - pTrigger->SetGoState(GO_STATE_READY); - player->SummonCreature(NPC_ULAG, 2390.26f, 336.47f, 40.01f, 2.26f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 300000); - return false; - } - - return false; - } -}; - -class go_mausoleum_trigger : public GameObjectScript -{ -public: - go_mausoleum_trigger() : GameObjectScript("go_mausoleum_trigger") { } - - bool OnGossipHello(Player* player, GameObject* go) - { - if (player->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE) - return false; - - if (GameObject* pDoor = player->FindNearestGameObject(GO_DOOR, 30.0f)) - { - go->SetGoState(GO_STATE_ACTIVE); - pDoor->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); - return true; - } - - return false; - } -}; - void AddSC_tirisfal_glades() { new npc_calvin_montague(); - new go_mausoleum_door(); - new go_mausoleum_trigger(); } From 13c854c34569f110620e086f0420f037cb1af14b Mon Sep 17 00:00:00 2001 From: Poszer <41213210+poszer@users.noreply.github.com> Date: Thu, 10 Jan 2019 11:52:31 +0100 Subject: [PATCH 3/4] DB/Quest Ulag the Cleaver Update: Way path is correct now --- data/sql/updates/pending_db_world/rev_1546933586341240000.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/sql/updates/pending_db_world/rev_1546933586341240000.sql b/data/sql/updates/pending_db_world/rev_1546933586341240000.sql index 41cafe117..1aab2689c 100644 --- a/data/sql/updates/pending_db_world/rev_1546933586341240000.sql +++ b/data/sql/updates/pending_db_world/rev_1546933586341240000.sql @@ -22,7 +22,7 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type (10459300,9,3,0,0,0,100,0,6000,6000,0,0,9,0,0,0,0,0,0,20,103813,50,0,0,0,0,0,"Mausoleum Trigger - action list - Activate gob"), (6390,0,0,0,63,0,100,0,0,0,0,0,80,639000,2,0,0,0,0,1,0,0,0,0,0,0,0,"Ulag - On just summoned - action list"), (639000,9,0,0,0,0,100,0,0,0,0,0,43,0,10721,0,0,0,0,1,0,0,0,0,0,0,0,"Ulag - action list - mount"), -(639000,9,1,0,0,0,100,0,4000,4000,0,0,69,0,0,0,0,0,0,8,0,0,0,2371.5554, 358.37, 38.092,0,"Ulag - action list - move to pos"), +(639000,9,1,0,0,0,100,0,4000,4000,0,0,69,0,0,0,0,0,0,8,0,0,0,2375.29, 354.41, 38.09,0,"Ulag - action list - move to pos"), (639000,9,2,0,0,0,100,0,4000,4000,0,0,43,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ulag - action list - desmount"), (6390,0,1,0,7,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ulag - On evadde - despawn"); From 2fea4fea8b1a633f11d4c3f470cdc62803728f80 Mon Sep 17 00:00:00 2001 From: Poszer <41213210+poszer@users.noreply.github.com> Date: Sun, 13 Jan 2019 01:35:47 +0100 Subject: [PATCH 4/4] Update rev_1546933586341240000.sql Changed game object GUID --- data/sql/updates/pending_db_world/rev_1546933586341240000.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/sql/updates/pending_db_world/rev_1546933586341240000.sql b/data/sql/updates/pending_db_world/rev_1546933586341240000.sql index 1aab2689c..a73441c23 100644 --- a/data/sql/updates/pending_db_world/rev_1546933586341240000.sql +++ b/data/sql/updates/pending_db_world/rev_1546933586341240000.sql @@ -1,7 +1,7 @@ INSERT INTO version_db_world (`sql_rev`) VALUES ('1546933586341240000'); -- Ulag the cleaver SAI -SET @OGUID =1532; +SET @OGUID =195629; DELETE FROM `gameobject` WHERE `guid`=@OGUID; INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`animprogress`,`state`, `rotation2`, `rotation3`) VALUES (@OGUID,103813,0,1,1,2388.808, 338.269, 37.013, 2.242750, 10, 255,1, -0.891996, -0.452044);