Skip to content

Commit

Permalink
Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
Rochet2 committed Feb 26, 2024
2 parents 049b7e8 + abcc740 commit 2643584
Show file tree
Hide file tree
Showing 18 changed files with 561 additions and 113 deletions.
5 changes: 5 additions & 0 deletions sql/updates/world/3.3.5/2024_02_25_00_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- Fix wrong quest item condition for Dr. Terrible's "Building a Better Flesh Giant"
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 1 AND `SourceGroup` = 30409 AND `SourceEntry` = 42772;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(1, 30409, 42772, 0, 0, 47, 0, 13042, 74, 0, 0, 0, 0, '', 'Dr. Terribles "Building a Better Flesh Giant" only drops if player has state_mask 74 Deep in the Bowels of The Underhalls'),
(1, 30409, 42772, 0, 0, 2, 0, 42772, 1, 1, 1, 0, 0, '', 'Dr. Terribles "Building a Better Flesh Giant" will drop only if the player doesn\'t have it already');
2 changes: 2 additions & 0 deletions sql/updates/world/3.3.5/2024_02_25_01_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- Quest: The Bloodsail Buccaneers (1) (595)
UPDATE `quest_offer_reward` SET `RewardText` = "On top of the barrel, you discover a map with some hastily written text on it along with some coins." WHERE `ID` = 595;
2 changes: 2 additions & 0 deletions sql/updates/world/3.3.5/2024_02_25_02_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- Quest 3122 "Return to Witch Doctor Uzer'i"
UPDATE `quest_request_items` SET `CompletionText`= "Have you spoken to Xerash?" WHERE `ID` = 3122;
3 changes: 3 additions & 0 deletions sql/updates/world/3.3.5/2024_02_25_03_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- Update gossip text for Darnassus Sentinel for Mage & Paladin directions
SET @text="You will find a pair of draenei conversing with Tyrande Whisperwind in the upper level of The Temple of the Moon.$B$BThey will know how to help you.";
UPDATE `npc_text` SET `text0_0`=@text, `text0_1`=@text,`BroadcastTextID0`=0, `VerifiedBuild`=49705 WHERE `ID`=15906;
9 changes: 9 additions & 0 deletions sql/updates/world/3.3.5/2024_02_25_04_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
-- Crystalline Ice Giant
DELETE FROM `creature` WHERE `guid`=74033;
INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
(74033, 26291, 571, 0, 0, 1, 1, 0, 1, 5001.1665, 292.13882, 156.07475, 0.994837641716003417, 300, 0, 0, 29820, 0, 0, 0, 0, 0, '', 53262);

-- Emote OneShotAttackUnarmed
DELETE FROM `creature_addon` WHERE `guid`=74033;
INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `StandState`, `AnimTier`, `VisFlags`, `SheathState`, `PvpFlags`, `emote`, `auras`) VALUES
(74033, 0, 0, 0, 0, 0, 1, 0, 35, ''); -- Crystalline Ice Giant
47 changes: 47 additions & 0 deletions sql/updates/world/3.3.5/2024_02_25_05_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
-- Tavara should spawn with a HP pool of 68/102
UPDATE `creature` SET `curhealth`=68 WHERE `id`=17551;

-- Blizz like respawn time for "Tavara" (Timed it on WotLK Classic)
UPDATE `creature` SET `spawntimesecs`=10 WHERE `ID`=17551;

-- Tavara Script after she gets healed during "Help Tavara" (9586)
DELETE FROM `creature_text` WHERE `CreatureID`=17551;
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
(17551,0,0,"Thank you, kind $gsir:lady;!",12,35,100,2,0,0,17578,0,"Tavara"),
(17551,1,0,"Please tell Guvan that I'll be fine, thanks to you.",12,35,100,3,0,0,14224,0,"Tavara");

DELETE FROM `waypoints` WHERE `entry`=17551;
INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
(17551,1,-4101.234,-12806.457,6.095,'Tavara'),
(17551,2,-4073.742,-12840.701,1.473,'Tavara'),
(17551,3,-4071.070,-12850.257,2.570,'Tavara'),
(17551,4,-4074.439,-12862.463,2.199,'Tavara');

DELETE FROM `smart_scripts` WHERE `entryorguid`=17551 AND `event_type` IN (8,40);
DELETE FROM `smart_scripts` WHERE `entryorguid`=1755100 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
(17551,0,0,0,40,0,100,0,4,17551,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tavara - On Waypoint 4 Reached - Despawn"),
(17551,0,1,0,8,0,100,0,2050,0,0,0,0,33,17551,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Tavara - On Spellhit - Give Quest Credit"),
(17551,0,2,0,8,0,100,0,2052,0,0,0,0,33,17551,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Tavara - On Spellhit - Give Quest Credit"),
(17551,0,3,0,8,0,100,0,59544,0,0,0,0,33,17551,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Tavara - On Spellhit - Give Quest Credit"),
(17551,0,4,0,8,0,100,0,139,0,0,0,0,33,17551,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Tavara - On Spellhit - Give Quest Credit"),
(17551,0,5,0,8,0,100,1,2050,0,0,0,0,80,1755100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tavara - On Spellhit - Run Script"),
(17551,0,6,0,8,0,100,1,2052,0,0,0,0,80,1755100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tavara - On Spellhit - Run Script"),
(17551,0,7,0,8,0,100,1,59544,0,0,0,0,80,1755100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tavara - On Spellhit - Run Script"),
(17551,0,8,0,8,0,100,1,139,0,0,0,0,80,1755100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tavara - On Spellhit - Run Script"),
(1755100,9,0,0,0,0,100,0,500,500,0,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tavara - On Script - Remove Flag Standstate 'Kneel'"),
(1755100,9,1,0,0,0,100,0,2000,2000,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Tavara - On Script - Set Orientation Invoker"),
(1755100,9,2,0,0,0,100,0,1000,1000,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Tavara - On Script - Say Line 0"),
(1755100,9,3,0,0,0,100,0,3000,3000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tavara - On Script - Say Line 1"),
(1755100,9,4,0,0,0,100,0,4000,4000,0,0,0,53,1,17551,0,0,0,2,1,0,0,0,0,0,0,0,0,"Tavara - On Script - Start Waypoint");

DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=17551;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(22,2,17551,0,0,47,0,9586,10,0,0,0,0,"","Smart Event 1 for creature Tavara only executes if player has quest 'Help Tavara' in progress or completed"),
(22,3,17551,0,0,47,0,9586,10,0,0,0,0,"","Smart Event 2 for creature Tavara only executes if player has quest 'Help Tavara' in progress or completed"),
(22,4,17551,0,0,47,0,9586,10,0,0,0,0,"","Smart Event 3 for creature Tavara only executes if player has quest 'Help Tavara' in progress or completed"),
(22,5,17551,0,0,47,0,9586,10,0,0,0,0,"","Smart Event 4 for creature Tavara only executes if player has quest 'Help Tavara' in progress or completed"),
(22,6,17551,0,0,47,0,9586,10,0,0,0,0,"","Smart Event 5 for creature Tavara only executes if player has quest 'Help Tavara' in progress or completed"),
(22,7,17551,0,0,47,0,9586,10,0,0,0,0,"","Smart Event 6 for creature Tavara only executes if player has quest 'Help Tavara' in progress or completed"),
(22,8,17551,0,0,47,0,9586,10,0,0,0,0,"","Smart Event 7 for creature Tavara only executes if player has quest 'Help Tavara' in progress or completed"),
(22,9,17551,0,0,47,0,9586,10,0,0,0,0,"","Smart Event 8 for creature Tavara only executes if player has quest 'Help Tavara' in progress or completed");
47 changes: 47 additions & 0 deletions sql/updates/world/3.3.5/2024_02_25_06_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
-- Fix Daedal's Outro for quest "An Alternative Alternative" (9473)
-- Daedal's Waypoints
DELETE FROM `waypoints` WHERE `entry`=17215;
INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
(17215,1,-4193.0980,-12475.6787,45.8185,"Daedal"),
(17215,2,-4195.5728,-12477.2754,45.7839,"Daedal"),
(17215,3,-4198.7573,-12476.4922,45.7583,"Daedal"),
(17215,4,-4200.5928,-12472.1885,45.6273,"Daedal"),
(17215,5,-4196.8164,-12473.2051,45.6863,"Daedal"),
(17215,6,-4193.4995,-12472.7910,45.6340,"Daedal"),
(17215,7,-4191.1499,-12470.0,45.6375,"Daedal");

-- Daedal's Script
DELETE FROM `smart_scripts` WHERE `entryorguid`=17215 AND `id` IN (4,5,6,7);
DELETE FROM `smart_scripts` WHERE `entryorguid`=17117 AND `source_type`=0;
DELETE FROM `smart_scripts` WHERE `entryorguid` IN (1721500,1711700) 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
(17215,0,4,5,20,0,100,0,9473,0,0,0,0,83,18,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Quest 'An Alternative Alternative' Rewarded - Remove Npc Flag Questgiver+Trainer"),
(17215,0,5,0,61,0,100,0,0,0,0,0,0,53,0,17215,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Link - Start WP"),
(17215,0,6,0,40,0,100,0,4,17215,0,0,0,80,1721500,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Waypoint 4 Reached - Run Script"),
(1721500,9,0,0,0,0,100,0,0,0,0,0,0,54,26000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Script - Pause Waypoint"),
(1721500,9,1,0,0,0,100,0,1000,1000,0,0,0,66,0,0,0,0,0,0,19,17117,0,0,0,0,0,0,0,"Daedal - On Script - Set Orientation"),
(1721500,9,2,0,0,0,100,0,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Script - Say Line 1"),
(1721500,9,3,0,0,0,100,0,0,0,0,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Script - Set Emote State"),
(1721500,9,4,0,0,0,100,0,4000,4000,0,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Script - Set Emote State"),
(1721500,9,5,0,0,0,100,0,1000,1000,0,0,0,5,16,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Script - Play Emote"),
(1721500,9,6,0,0,0,100,0,3000,3000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Script - Say Line 2"),
(1721500,9,7,0,0,0,100,0,4000,4000,0,0,0,1,0,0,0,0,0,0,19,17117,0,0,0,0,0,0,0,"Daedal - On Script - Say Line 0 (Injured Night Elf Priestess)"),
(1721500,9,8,0,0,0,100,0,3000,3000,0,0,0,1,1,0,0,0,0,0,19,17117,0,0,0,0,0,0,0,"Daedal - On Script - Say Line 1 (Injured Night Elf Priestess)"),
(1721500,9,9,0,0,0,100,0,0,0,0,0,0,45,1,1,0,0,0,0,9,17117,0,10,0,0,0,0,0,"Daedal - On Script - Set Data 1 1 To Injured Night Elf Priestess"),
(1721500,9,10,0,0,0,100,0,2000,2000,0,0,0,1,2,0,0,0,0,0,19,17117,0,0,0,0,0,0,0,"Daedal - On Script - Say Line 2 (Injured Night Elf Priestess)"),
(1721500,9,11,0,0,0,100,0,5000,5000,0,0,0,1,3,0,0,0,0,0,19,17117,0,0,0,0,0,0,0,"Daedal - On Script - Say Line 3 (Injured Night Elf Priestess)"),
(1721500,9,12,0,0,0,100,0,6000,6000,0,0,0,1,4,0,0,0,0,0,19,17117,0,0,0,0,0,0,0,"Daedal - On Script - Say Line 4 (Injured Night Elf Priestess)"),
(1721500,9,13,0,0,0,100,0,2000,2000,0,0,0,1,2,0,0,0,0,0,19,17214,0,0,0,0,0,0,0,"Daedal - On Script - Say Line 2 (Anchorite Fateema)"),
(1721500,9,14,0,0,0,100,0,500,500,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0,4.1765,"Daedal - On Script - Set Orientation"),
(1721500,9,15,0,0,0,100,0,0,0,0,0,0,82,18,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Script - Add Npc Flag Questgiver+Trainer"),

-- Injured Night Elf Priestess Script
(17117,0,0,1,54,0,100,0,0,0,0,0,0,91,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Just Summoned - Remove Flag Standstate Sleep"),
(17117,0,1,0,61,0,100,0,0,0,0,0,0,82,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Link - Add Npc Flag Gossip"),
(17117,0,2,0,64,0,100,0,0,0,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Gossip Hello - Say Line 5"),
(17117,0,3,0,38,0,100,0,1,1,0,0,0,80,1711700,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Data Set 1 1 - Run Script"),
(1711700,9,1,0,0,0,100,0,0,0,0,0,0,91,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Script - Set Stand State"),
(1711700,9,2,0,0,0,100,0,400,400,0,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Script - Set Stand State"),
(1711700,9,3,0,0,0,100,0,10000,10000,0,0,0,5,25,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Script - Play Emote"),
(1711700,9,4,0,0,0,100,0,3000,3000,0,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Script - Set Stand State"),
(1711700,9,5,0,0,0,100,0,400,400,0,0,0,90,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Script - Set Stand State");
19 changes: 19 additions & 0 deletions sql/updates/world/3.3.5/2024_02_25_07_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
-- Outro for quest "Where Kings Walk" (13188)
-- Text
DELETE FROM `creature_text` WHERE `CreatureID`=29611 AND `GroupID` IN (0,1,2,3);
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
(29611,0,0,"People of Stormwind! Citizens of the Alliance! Your king speaks!",14,7,100,22,0,0,31675,0,"King Varian Wrynn"),
(29611,1,0,"Today marks the first of many defeats for the Scourge! Death knights, once in service of the Lich King, have broken free of his grasp and formed a new alliance against his tyranny!",14,7,100,22,0,0,31676,0,"King Varian Wrynn"),
(29611,2,0,"You will welcome these former heroes of the Alliance and treat them with the respect that you would give to any ally of Stormwind!",14,7,100,22,0,0,31677,0,"King Varian Wrynn"),
(29611,3,0,"Glory to the Alliance!",14,7,100,4,0,0,31678,0,"King Varian Wrynn");

-- Script
DELETE FROM `smart_scripts` WHERE `entryorguid`=29611 AND `id`=2;
DELETE FROM `smart_scripts` WHERE `entryorguid`=2961100 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
(29611,0,2,0,20,0,100,0,13188,0,0,0,0,80,2961100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"King Varian Wrynn - On Quest 'Where Kings Walk' Rewarded - Run Script"),

(2961100,9,0,0,0,0,100,0,2000,2000,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"King Varian Wrynn - On Script - Say Line 0"),
(2961100,9,1,0,0,0,100,0,5000,5000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"King Varian Wrynn - On Script - Say Line 1"),
(2961100,9,2,0,0,0,100,0,8000,8000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"King Varian Wrynn - On Script - Say Line 2"),
(2961100,9,3,0,0,0,100,0,9000,9000,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"King Varian Wrynn - On Script - Say Line 3");
3 changes: 3 additions & 0 deletions sql/updates/world/3.3.5/2024_02_25_08_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
--
-- https://www.wowhead.com/wotlk/fr/item=4432/lettre-de-sully-balloo
UPDATE page_text_locale SET `Text`='Mais, ô ma Sara, si les morts peuvent revenir à Azeroth et entourer, invisibles, ceux qu\'ils aiment, je serai toujours à vos côtés dans les jours heureux comme dans les nuits les plus sombres, partageant vos heures de joie comme vos moments de tristesse. Si jamais vous sentez une douce brise sur votre joue, ce sera mon souffle ; si l\'air rafraîchit vos tempes, ce sera mon esprit qui passe.$B$BSara, ne me pleurez pas, pensez que je suis parti et que je vous attends, car nous nous reverrons.$B$B--Sully' WHERE ID=332 AND locale='frFR';
Loading

0 comments on commit 2643584

Please sign in to comment.