Skip to content

Commit

Permalink
Merge 3.3.5-base_patch to 3.3.5-passive_anticheat
Browse files Browse the repository at this point in the history
  • Loading branch information
Github Actions committed Feb 19, 2024
2 parents 180a0ad + d3f50b2 commit 9db6042
Show file tree
Hide file tree
Showing 51 changed files with 815 additions and 139 deletions.
2 changes: 2 additions & 0 deletions sql/updates/world/3.3.5/2024_02_13_00_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--
DELETE FROM `trinity_string` WHERE `entry` IN (216, 1126);
2 changes: 2 additions & 0 deletions sql/updates/world/3.3.5/2024_02_14_00_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--
UPDATE `quest_template_addon` SET `RequiredMinRepValue`=3000 WHERE `ID` IN (25247,24822,24821,24820,24819);
2 changes: 2 additions & 0 deletions sql/updates/world/3.3.5/2024_02_14_01_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--
UPDATE `quest_template_addon` SET `SpecialFlags`=1 WHERE `ID` IN (12618,12656);
2 changes: 2 additions & 0 deletions sql/updates/world/3.3.5/2024_02_14_02_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- Add repair flag Quartermaster Vaskess
UPDATE `creature_template` SET `npcflag`=`npcflag`|4096 WHERE `entry` = 31115;
14 changes: 14 additions & 0 deletions sql/updates/world/3.3.5/2024_02_15_00_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
UPDATE `smart_scripts` SET `target_type`=8 WHERE
(`entryorguid`=137300 AND `source_type`=9 AND `id`=19 AND `link`=0) OR
(`entryorguid`=137300 AND `source_type`=9 AND `id`=20 AND `link`=0) OR
(`entryorguid`=1433800 AND `source_type`=9 AND `id`=4 AND `link`=0) OR
(`entryorguid`=2129100 AND `source_type`=9 AND `id`=1 AND `link`=0) OR
(`entryorguid`=2129100 AND `source_type`=9 AND `id`=13 AND `link`=0) OR
(`entryorguid`=2711300 AND `source_type`=9 AND `id`=1 AND `link`=0) OR
(`entryorguid`=2711300 AND `source_type`=9 AND `id`=3 AND `link`=0) OR
(`entryorguid`=2711400 AND `source_type`=9 AND `id`=1 AND `link`=0) OR
(`entryorguid`=2711400 AND `source_type`=9 AND `id`=3 AND `link`=0) OR
(`entryorguid`=2711500 AND `source_type`=9 AND `id`=1 AND `link`=0) OR
(`entryorguid`=2711600 AND `source_type`=9 AND `id`=3 AND `link`=0) OR
(`entryorguid`=2875000 AND `source_type`=9 AND `id`=3 AND `link`=0) OR
(`entryorguid`=3019000 AND `source_type`=9 AND `id`=13 AND `link`=0);
8 changes: 8 additions & 0 deletions sql/updates/world/3.3.5/2024_02_15_01_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--
DELETE FROM `quest_request_items` WHERE `ID` = 14488;
INSERT INTO `quest_request_items` (`ID`, `EmoteOnComplete`, `EmoteOnIncomplete`, `CompletionText`, `VerifiedBuild`) VALUES
(14488, 1, 0, "I don't remember ordering a cleaning service... why yes, I am Apothecary Hummel.$B$B...wait, what is the meaning of this? You think these meaningless papers can stop me? Hah!", 12340);

DELETE FROM `quest_offer_reward` WHERE `ID` = 14488;
INSERT INTO `quest_offer_reward` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `RewardText`, `VerifiedBuild`) VALUES
(14488, 1, 0, 0, 0, 0, 0, 0, 0, "What we do here is none of your business...", 12340);
2 changes: 2 additions & 0 deletions sql/updates/world/3.3.5/2024_02_16_00_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- Quest "Abandoned Mail" should have "Autocomplete" flag
UPDATE `quest_template` SET `Flags`=`Flags`| 65536 WHERE `ID`=12711;
2 changes: 2 additions & 0 deletions sql/updates/world/3.3.5/2024_02_16_01_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- Fix quest Cleansing the Scar by updating Eversong Ranger PvpFlags with retail 10.2.5.53262 build: V10_2_5_53262 sniffed value.
UPDATE `creature_template_addon` SET `PvpFlags`=1 WHERE `entry`=15938; -- 15938 (Eversong Ranger)
2 changes: 2 additions & 0 deletions sql/updates/world/3.3.5/2024_02_16_02_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- Fix some dberrors
UPDATE `creature` SET `MovementType`=0 WHERE `guid` IN (43202,43203);
25 changes: 25 additions & 0 deletions sql/updates/world/3.3.5/2024_02_16_03_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
-- Honor Hold Archer
UPDATE `creature_template_addon` SET `SheathState`=2, `PvpFlags`=1 WHERE `entry`=16896;
UPDATE `creature_addon` SET `SheathState`=2, `PvpFlags`=1 WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` = 16896);

UPDATE `creature_addon` SET `SheathState`=0 WHERE `guid` =58446;

DELETE FROM `creature_addon` WHERE `guid` IN (58443, 58444, 58445, 58447);
INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `MountCreatureID`, `StandState`, `AnimTier`, `VisFlags`, `SheathState`, `PvPFlags`, `emote`, `visibilityDistanceType`, `auras`) VALUES
(58443, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, NULL),
(58444, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, NULL),
(58445, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, NULL),
(58447, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, NULL);

-- SAI
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = -58454);
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
(-58454, 0, 0, 0, 1, 0, 100, 0, 6000, 6000, 6000, 6000, 0, 11, 33796, 0, 0, 0, 0, 0, 10, 69107, 19376, 0, 0, 0, 0, 0, 0, "Honor Hold Archer - Out of Combat - Cast 'Shoot Bow'");

-- Delete wrong condition
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceGroup` = 1 AND `ConditionValue2` = 16898 AND `SourceEntry` = 33796;

-- ConditionTarget
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceGroup` = 1 AND `ConditionValue2` = 19376 AND `SourceEntry` = 33796;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(13, 1, 33796, 0, 0, 31, 0, 3, 19376, 0, 0, 0, 0, '', 'Spell 33796 targets Honor Hold Target Dummy Tower');
97 changes: 97 additions & 0 deletions sql/updates/world/3.3.5/2024_02_16_04_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
-- small correction
DELETE FROM `npc_vendor` WHERE `item` IN (21829,21833);
DELETE FROM `game_event_npc_vendor` WHERE `guid` IN (42755,21575,24772,4661,22681,79841,38407,199,14139,14986,28340,9460,46341,17865,7671,28304,80346,66978,6889,42181,33073,54188,15287,41839,1745,690,46343,32451,537,13550,29233,50060,11273,15326,28474,30676,10076,8219,37069,24774,4208,31947,50059,92923,92884,29239) AND `item`=21829;
DELETE FROM `game_event_npc_vendor` WHERE `guid` IN (42755,21575,24772,4661,22681,79841,38407,199,14139,14986,28340,9460,46341,17865,7671,28304,80346,66978,6889,42181,33073,54188,15287,41839,1745,690,46343,32451,537,13550,29233,50060,11273,15326,28474,30676,10076,8219,37069,24774,4208,31947,50059,92923,92884,29239) AND `item`=21833;
INSERT INTO `game_event_npc_vendor` (`eventEntry`, `guid`, `slot`, `item`, `maxcount`, `incrtime`, `ExtendedCost`) VALUES
(8, 42755, 0, 21829, 0, 0, 0),
(8, 42755, 1, 21833, 0, 0, 0),
(8, 21575, 0, 21829, 0, 0, 0),
(8, 21575, 1, 21833, 0, 0, 0),
(8, 24772, 0, 21829, 0, 0, 0),
(8, 24772, 1, 21833, 0, 0, 0),
(8, 4661, 0, 21829, 0, 0, 0),
(8, 4661, 1, 21833, 0, 0, 0),
(8, 22681, 0, 21829, 0, 0, 0),
(8, 22681, 1, 21833, 0, 0, 0),
(8, 79841, 0, 21829, 0, 0, 0),
(8, 79841, 1, 21833, 0, 0, 0),
(8, 38407, 0, 21829, 0, 0, 0),
(8, 38407, 1, 21833, 0, 0, 0),
(8, 199, 0, 21829, 0, 0, 0),
(8, 199, 1, 21833, 0, 0, 0),
(8, 14139, 0, 21829, 0, 0, 0),
(8, 14139, 1, 21833, 0, 0, 0),
(8, 14986, 0, 21829, 0, 0, 0),
(8, 14986, 1, 21833, 0, 0, 0),
(8, 28340, 0, 21829, 0, 0, 0),
(8, 28340, 1, 21833, 0, 0, 0),
(8, 9460, 0, 21829, 0, 0, 0),
(8, 9460, 1, 21833, 0, 0, 0),
(8, 46341, 0, 21829, 0, 0, 0),
(8, 46341, 1, 21833, 0, 0, 0),
(8, 17865, 0, 21829, 0, 0, 0),
(8, 17865, 1, 21833, 0, 0, 0),
(8, 7671, 0, 21829, 0, 0, 0),
(8, 7671, 1, 21833, 0, 0, 0),
(8, 28304, 0, 21829, 0, 0, 0),
(8, 28304, 1, 21833, 0, 0, 0),
(8, 80346, 0, 21829, 0, 0, 0),
(8, 80346, 1, 21833, 0, 0, 0),
(8, 66978, 0, 21829, 0, 0, 0),
(8, 66978, 1, 21833, 0, 0, 0),
(8, 6889, 0, 21829, 0, 0, 0),
(8, 6889, 1, 21833, 0, 0, 0),
(8, 42181, 0, 21829, 0, 0, 0),
(8, 42181, 1, 21833, 0, 0, 0),
(8, 33073, 0, 21829, 0, 0, 0),
(8, 33073, 1, 21833, 0, 0, 0),
(8, 54188, 0, 21829, 0, 0, 0),
(8, 54188, 1, 21833, 0, 0, 0),
(8, 15287, 0, 21829, 0, 0, 0),
(8, 15287, 1, 21833, 0, 0, 0),
(8, 41839, 0, 21829, 0, 0, 0),
(8, 41839, 1, 21833, 0, 0, 0),
(8, 1745, 0, 21829, 0, 0, 0),
(8, 1745, 1, 21833, 0, 0, 0),
(8, 690, 0, 21829, 0, 0, 0),
(8, 690, 1, 21833, 0, 0, 0),
(8, 46343, 0, 21829, 0, 0, 0),
(8, 46343, 1, 21833, 0, 0, 0),
(8, 32451, 0, 21829, 0, 0, 0),
(8, 32451, 1, 21833, 0, 0, 0),
(8, 537, 0, 21829, 0, 0, 0),
(8, 537, 1, 21833, 0, 0, 0),
(8, 13550, 0, 21829, 0, 0, 0),
(8, 13550, 1, 21833, 0, 0, 0),
(8, 29233, 0, 21829, 0, 0, 0),
(8, 29233, 1, 21833, 0, 0, 0),
(8, 50060, 0, 21829, 0, 0, 0),
(8, 50060, 1, 21833, 0, 0, 0),
(8, 11273, 0, 21829, 0, 0, 0),
(8, 11273, 1, 21833, 0, 0, 0),
(8, 15326, 0, 21829, 0, 0, 0),
(8, 15326, 1, 21833, 0, 0, 0),
(8, 28474, 0, 21829, 0, 0, 0),
(8, 28474, 1, 21833, 0, 0, 0),
(8, 30676, 0, 21829, 0, 0, 0),
(8, 30676, 1, 21833, 0, 0, 0),
(8, 10076, 0, 21829, 0, 0, 0),
(8, 10076, 1, 21833, 0, 0, 0),
(8, 8219, 0, 21829, 0, 0, 0),
(8, 8219, 1, 21833, 0, 0, 0),
(8, 37069, 0, 21829, 0, 0, 0),
(8, 37069, 1, 21833, 0, 0, 0),
(8, 24774, 0, 21829, 0, 0, 0),
(8, 24774, 1, 21833, 0, 0, 0),
(8, 4208, 0, 21829, 0, 0, 0),
(8, 4208, 1, 21833, 0, 0, 0),
(8, 31947, 0, 21829, 0, 0, 0),
(8, 31947, 1, 21833, 0, 0, 0),
(8, 50059, 0, 21829, 0, 0, 0),
(8, 50059, 1, 21833, 0, 0, 0),
(8, 92923, 0, 21829, 0, 0, 0),
(8, 92923, 1, 21833, 0, 0, 0),
(8, 92884, 0, 21829, 0, 0, 0),
(8, 92884, 1, 21833, 0, 0, 0),
(8, 29239, 0, 21829, 0, 0, 0),
(8, 29239, 1, 21833, 0, 0, 0);
41 changes: 41 additions & 0 deletions sql/updates/world/3.3.5/2024_02_16_05_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
-- Gondria https://www.wowhead.com/wotlk/npc=33776/gondria#abilities
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 33776;
DELETE FROM `smart_scripts` WHERE `entryorguid` = 33776 AND `source_type` = 0;
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
(33776, 0, 0, 0, 0, 0, 100, 0, 3000, 7000, 12000, 15000, 0, 11, 61184, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, "Gondria - In Combat - Cast 'Pounce'"),
(33776, 0, 1, 0, 0, 0, 100, 0, 5000, 9000, 8000, 13000, 0, 11, 61186, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, "Gondria - In Combat - Cast 'Frozen Bite'");

-- Loque'nahak added again missing frozen bite https://www.wowhead.com/wotlk/npc=32517/loquenahak#abilities
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 32517;
DELETE FROM `smart_scripts` WHERE `entryorguid` = 32517 AND `source_type` = 0 AND `id` = 1;
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
(32517, 0, 1, 0, 0, 0, 100, 0, 1000, 5000, 8000, 13000, 0, 11, 61186, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, "Loque\'nahak - In Combat - Cast 'Frozen Bite'");

-- Skoll added again missing frozen bite https://www.wowhead.com/wotlk/npc=35189/skoll#abilities
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 35189;
DELETE FROM `smart_scripts` WHERE `entryorguid` = 35189 AND `source_type` = 0 AND `id` = 1;
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
(35189, 0, 1, 0, 0, 0, 100, 0, 1000, 5000, 8000, 13000, 0, 11, 61186, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, "Skoll - In Combat - Cast 'Frozen Bite'");

-- Azurous rename wrong comment and correct sai order id https://www.wowhead.com/wotlk/npc=10202/azurous#abilities
UPDATE `smart_scripts` SET `id` = 0, `comment` = "Azurous - In Combat - Cast 'Frost Breath'" WHERE `entryorguid` = 10202 AND `source_type` = 0 AND `id` = 1;

-- Avruu https://www.wowhead.com/wotlk/npc=17084/avruu#abilities
UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=17084;
DELETE FROM `smart_scripts` WHERE `entryorguid`=17084 AND `source_type`=0;
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
(17084, 0, 0, 0, 74, 0, 100, 0, 0, 40, 15000, 18000, 30, 11, 16588, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, "Avruu - On Friendly Between 0-40% Health - Cast 'Dark Mending'"),
(17084, 0, 1, 0, 0, 0, 100, 0, 0, 0, 8000, 8000, 0, 11, 34112, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, "Avruu - In Combat - Cast 'Judgement of Darkness'");

-- Warmaul Brute https://www.wowhead.com/wotlk/npc=18065/warmaul-brute#abilities;mode:normal
UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=18065;
DELETE FROM `smart_scripts` WHERE `entryorguid`=18065 AND `source_type`=0;
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
(18065, 0, 0, 0, 0, 0, 100, 0, 4000, 7000, 9000, 12000, 0, 11, 10966, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, "Warmaul Brute - In Combat - Cast 'Uppercut'");

-- Warp Monstrosity https://www.wowhead.com/wotlk/npc=20516/warp-monstrosity#abilities
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 20516;
DELETE FROM `smart_scripts` WHERE `entryorguid` = 20516 AND `source_type` = 0;
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
(20516, 0, 0, 0, 0, 0, 100, 0, 3000, 7000, 12000, 15000, 0, 11, 13901, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, "Warp Monstrosity - In Combat - Cast 'Arcane Bolt'"),
(20516, 0, 1, 0, 0, 0, 100, 1, 5000, 9000, 8000, 13000, 0, 11, 36577, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Warp Monstrosity - In Combat - Cast 'Warp Storm'");
Loading

0 comments on commit 9db6042

Please sign in to comment.