From 8fc9c45d50130a7540f7d86d0b198938feebca4c Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sat, 22 Aug 2020 16:24:59 -0400 Subject: [PATCH] Misc cleanups/DB updates Port From (https://github.com/TrinityCore/TrinityCore) --- Source/Game/Spells/SpellInfo.cs | 7 +++-- .../TrialOfTheChampion/GrandChampions.cs | 4 +-- ...020_08_16_00_world_2017_07_07_00_world.sql | 8 ++++++ ...020_08_16_01_world_2017_07_07_01_world.sql | 4 +++ ...020_08_16_02_world_2017_07_08_00_world.sql | 9 +++++++ ...020_08_16_03_world_2017_07_12_00_world.sql | 12 +++++++++ ...020_08_16_04_world_2017_07_12_01_world.sql | 2 ++ ...020_08_16_05_world_2017_07_12_02_world.sql | 2 ++ ...020_08_16_06_world_2017_07_12_03_world.sql | 2 ++ ...020_08_18_00_world_2017_07_02_01_world.sql | 3 +++ ...020_08_18_01_world_2017_07_06_00_world.sql | 3 +++ ...020_08_18_02_world_2017_07_16_00_world.sql | 27 +++++++++++++++++++ ...020_08_19_02_world_2017_07_21_00_world.sql | 3 +++ ...020_08_19_03_world_2017_07_21_01_world.sql | 4 +++ 14 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 sql/updates/world/master/2020_08_16_00_world_2017_07_07_00_world.sql create mode 100644 sql/updates/world/master/2020_08_16_01_world_2017_07_07_01_world.sql create mode 100644 sql/updates/world/master/2020_08_16_02_world_2017_07_08_00_world.sql create mode 100644 sql/updates/world/master/2020_08_16_03_world_2017_07_12_00_world.sql create mode 100644 sql/updates/world/master/2020_08_16_04_world_2017_07_12_01_world.sql create mode 100644 sql/updates/world/master/2020_08_16_05_world_2017_07_12_02_world.sql create mode 100644 sql/updates/world/master/2020_08_16_06_world_2017_07_12_03_world.sql create mode 100644 sql/updates/world/master/2020_08_18_00_world_2017_07_02_01_world.sql create mode 100644 sql/updates/world/master/2020_08_18_01_world_2017_07_06_00_world.sql create mode 100644 sql/updates/world/master/2020_08_18_02_world_2017_07_16_00_world.sql create mode 100644 sql/updates/world/master/2020_08_19_02_world_2017_07_21_00_world.sql create mode 100644 sql/updates/world/master/2020_08_19_03_world_2017_07_21_01_world.sql diff --git a/Source/Game/Spells/SpellInfo.cs b/Source/Game/Spells/SpellInfo.cs index 53c6cb34a..ccfdf83e0 100644 --- a/Source/Game/Spells/SpellInfo.cs +++ b/Source/Game/Spells/SpellInfo.cs @@ -654,10 +654,9 @@ namespace Game.Spells if (HasAttribute(SpellAttr1.UnaffectedBySchoolImmune) || HasAttribute(SpellAttr2.UnaffectedByAuraSchoolImmune)) { // ...but not these (Divine shield, Ice block, Cyclone and Banish for example) - if (auraSpellInfo == null || - (auraSpellInfo.Mechanic != Mechanics.ImmuneShield && - auraSpellInfo.Mechanic != Mechanics.Invulnerability && - (auraSpellInfo.Mechanic != Mechanics.Banish || (IsRankOf(auraSpellInfo) && auraSpellInfo.Dispel != DispelType.None)))) // Banish shouldn't be immune to itself, but Cyclone should + if (auraSpellInfo.Mechanic != Mechanics.ImmuneShield && + auraSpellInfo.Mechanic != Mechanics.Invulnerability && + (auraSpellInfo.Mechanic != Mechanics.Banish || (IsRankOf(auraSpellInfo) && auraSpellInfo.Dispel != DispelType.None))) // Banish shouldn't be immune to itself, but Cyclone should return true; } diff --git a/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/GrandChampions.cs b/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/GrandChampions.cs index 6bd1e6de9..5c71ca8f2 100644 --- a/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/GrandChampions.cs +++ b/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/GrandChampions.cs @@ -176,7 +176,7 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheChampion if (player && !player.IsGameMaster() && me.IsInRange(player, 8.0f, 25.0f, false)) { ResetThreatList(); - me.GetThreatManager().AddThreat(player, 1.0f); + AddThreat(player, 1.0f); DoCast(player, TrialOfChampionSpells.CHARGE); break; } @@ -387,7 +387,7 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheChampion if (player && !player.IsGameMaster() && me.IsInRange(player, 8.0f, 25.0f, false)) { ResetThreatList(); - me.GetThreatManager().AddThreat(player, 5.0f); + AddThreat(player, 5.0f); DoCast(player, TrialOfChampionSpells.INTERCEPT); break; } diff --git a/sql/updates/world/master/2020_08_16_00_world_2017_07_07_00_world.sql b/sql/updates/world/master/2020_08_16_00_world_2017_07_07_00_world.sql new file mode 100644 index 000000000..53110a362 --- /dev/null +++ b/sql/updates/world/master/2020_08_16_00_world_2017_07_07_00_world.sql @@ -0,0 +1,8 @@ +-- +DELETE FROM `creature` WHERE `guid` IN (80435,80436); +INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnDifficulties`, `PhaseId`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `VerifiedBuild`) VALUES +(80435, 23512, 530, 0, 0, '0', 0, 0, 0, 1474.1, 7256.4, 375.19, 3.921138, 300, 0, 0, 0, 0, 0, 0, 0, 0, 0), +(80436, 23512, 530, 0, 0, '0', 0, 0, 0, 2948.5, 7076, 370.8263, 5.262608, 300, 0, 0, 0, 0, 0, 0, 0, 0, 0); + +DELETE FROM `creature_template_addon` WHERE `entry` = 23512; +INSERT INTO `creature_template_addon` (`entry`,`auras`) VALUES (23512, '35411'); diff --git a/sql/updates/world/master/2020_08_16_01_world_2017_07_07_01_world.sql b/sql/updates/world/master/2020_08_16_01_world_2017_07_07_01_world.sql new file mode 100644 index 000000000..1acfe5dcc --- /dev/null +++ b/sql/updates/world/master/2020_08_16_01_world_2017_07_07_01_world.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `gameobject` WHERE `guid`=69; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnDifficulties`, `PhaseId`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `state`) VALUES +(69, 175746, 530, '0', 0, 9556.93, -7210.03, 27.1505, 5.37153, 0, 0, 0.440206, -0.897897, 300, 1); \ No newline at end of file diff --git a/sql/updates/world/master/2020_08_16_02_world_2017_07_08_00_world.sql b/sql/updates/world/master/2020_08_16_02_world_2017_07_08_00_world.sql new file mode 100644 index 000000000..ed7be436e --- /dev/null +++ b/sql/updates/world/master/2020_08_16_02_world_2017_07_08_00_world.sql @@ -0,0 +1,9 @@ +-- +DELETE FROM `pool_template` WHERE `entry`=377; +INSERT INTO pool_template (`entry`,`max_limit`,`description`) VALUES +(377,1, 'Tivax the Breaker (1 out 2)'); + +DELETE FROM `pool_creature` WHERE `pool_entry`=377; +INSERT INTO pool_creature(`guid`,`pool_entry`,`chance`,`description`) VALUES +(109685,377,0, 'Tivax the Breaker 1'), +(109693,377,0, 'Tivax the Breaker 2'); diff --git a/sql/updates/world/master/2020_08_16_03_world_2017_07_12_00_world.sql b/sql/updates/world/master/2020_08_16_03_world_2017_07_12_00_world.sql new file mode 100644 index 000000000..6fa8f5cc3 --- /dev/null +++ b/sql/updates/world/master/2020_08_16_03_world_2017_07_12_00_world.sql @@ -0,0 +1,12 @@ +-- +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10040 AND `SourceEntry`=3; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15,10040,3,0,0,28,0,13231,0,0,0,0,0,'','Only show gossip option 3 if player has quest 13231 Complete'), +(15,10040,3,0,0,14,0,13232,0,0,0,0,0,'','Only show gossip option 3 if player has quest 13232 Not Taken'), +(15,10040,3,0,1,8,0,13231,0,0,0,0,0,'','Only show gossip option 3 if player has quest 13231 Rewarded'), +(15,10040,3,0,1,14,0,13232,0,0,0,0,0,'','Only show gossip option 3 if player has quest 13232 Not Taken'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry`=13232; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(19,0,13232,0,0,28,0,13231,0,0,0,0,0,'','Quest 13232 Finish Me! Requires Quest 13231 The Broken Front to be complete'), +(19,0,13232,0,1,8,0,13231,0,0,0,0,0,'','Quest 13232 Finish Me! Requires Quest 13231 The Broken Front to be rewarded'); diff --git a/sql/updates/world/master/2020_08_16_04_world_2017_07_12_01_world.sql b/sql/updates/world/master/2020_08_16_04_world_2017_07_12_01_world.sql new file mode 100644 index 000000000..3ca8a570e --- /dev/null +++ b/sql/updates/world/master/2020_08_16_04_world_2017_07_12_01_world.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `creature` WHERE `guid`=125031 AND `id`=32250; diff --git a/sql/updates/world/master/2020_08_16_05_world_2017_07_12_02_world.sql b/sql/updates/world/master/2020_08_16_05_world_2017_07_12_02_world.sql new file mode 100644 index 000000000..69d3367ab --- /dev/null +++ b/sql/updates/world/master/2020_08_16_05_world_2017_07_12_02_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `quest_template_addon` SET `NextQuestID`=13614 WHERE `ExclusiveGroup` IN (-13611); diff --git a/sql/updates/world/master/2020_08_16_06_world_2017_07_12_03_world.sql b/sql/updates/world/master/2020_08_16_06_world_2017_07_12_03_world.sql new file mode 100644 index 000000000..bc606d307 --- /dev/null +++ b/sql/updates/world/master/2020_08_16_06_world_2017_07_12_03_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `quest_template_addon` SET `NextQuestID`=13818 WHERE `ExclusiveGroup` IN (-13824); diff --git a/sql/updates/world/master/2020_08_18_00_world_2017_07_02_01_world.sql b/sql/updates/world/master/2020_08_18_00_world_2017_07_02_01_world.sql new file mode 100644 index 000000000..92838126f --- /dev/null +++ b/sql/updates/world/master/2020_08_18_00_world_2017_07_02_01_world.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_text` SET `CreatureID`=19651, `GroupID`=0 WHERE `CreatureID`=16580 AND `GroupID`=6 AND `ID`=0; +UPDATE `smart_scripts` SET `action_param1`=0, `target_type`=19, `target_param1`=19651, `target_param2`=0 WHERE `entryorguid`=5754101 AND `source_type`=9 AND `id`=8 AND `link`=0; diff --git a/sql/updates/world/master/2020_08_18_01_world_2017_07_06_00_world.sql b/sql/updates/world/master/2020_08_18_01_world_2017_07_06_00_world.sql new file mode 100644 index 000000000..7bea97109 --- /dev/null +++ b/sql/updates/world/master/2020_08_18_01_world_2017_07_06_00_world.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_text` SET `CreatureID`=19561, `GroupID`=0 WHERE `CreatureID`=19651 AND `GroupID`=0 AND `ID`=0; +UPDATE `smart_scripts` SET `action_param1`=0, `target_type`=19, `target_param1`=19561, `target_param2`=0 WHERE `entryorguid`=5754101 AND `source_type`=9 AND `id`=8 AND `link`=0; diff --git a/sql/updates/world/master/2020_08_18_02_world_2017_07_16_00_world.sql b/sql/updates/world/master/2020_08_18_02_world_2017_07_16_00_world.sql new file mode 100644 index 000000000..94f0e6b8d --- /dev/null +++ b/sql/updates/world/master/2020_08_18_02_world_2017_07_16_00_world.sql @@ -0,0 +1,27 @@ +-- +DELETE FROM `creature` WHERE `guid` IN (80437,80438,80439,80441,80442,80451,80452,80468,80469,80474,80476,80478,80479,80480,80481,80482,80487,80490,80492,80493,80499,80500,80501); +INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnDifficulties`, `phaseUseFlags`, `PhaseId`, `PhaseGroup`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES +(80437, 20878, 530, 0, 0, 1, 0, 0, 0, 0, 1, -3374.05, 2096.69, 33.9606, 4.98658, 300, 0, 0, 6761, 0, 0, 0, 0, 0, "", 0), +(80438, 19754, 530, 0, 0, 1, 0, 0, 0, 0, 0, -3482.37, 2189.11, 33.4005, 2.94297, 300, 0, 0, 6542, 0, 0, 0, 0, 0, "", 0), +(80439, 19754, 530, 0, 0, 1, 0, 0, 0, 0, 0, -3450.09, 2222.93, 33.4608, 5.09496, 300, 5, 0, 6761, 0, 1, 0, 0, 0, "", 0), +(80441, 19754, 530, 0, 0, 1, 0, 0, 0, 0, 0, -3437.45, 2248.48, 33.6584, 2.29266, 300, 5, 0, 6542, 0, 1, 0, 0, 0, "", 0), +(80442, 19754, 530, 0, 0, 1, 0, 0, 0, 0, 0, -3408.19, 2264.77, 33.8722, 0.311879, 300, 5, 0, 6542, 0, 1, 0, 0, 0, "", 0), +(80451, 20878, 530, 0, 0, 1, 0, 0, 0, 0, 1, -3408.75, 2293.33, 33.9996, 4.81143, 300, 0, 0, 6761, 0, 0, 0, 0, 0, "", 0), +(80452, 20878, 530, 0, 0, 1, 0, 0, 0, 0, 1, -3420.39, 2292.38, 33.8544, 4.81143, 300, 0, 0, 6761, 0, 0, 0, 0, 0, "", 0), +(80468, 20887, 530, 0, 0, 1, 0, 0, 0, 0, 0, -3419.58, 2319.73, 36.8641, 4.84441, 300, 5, 0, 1518, 2933, 1, 0, 0, 0, "", 0), +(80469, 20872, 530, 0, 0, 1, 0, 0, 0, 0, 1, -3409.13, 2322.22, 37.1603, 4.9451, 300, 0, 0, 4869, 3080, 0, 0, 0, 0, "", 0), +(80474, 19759, 530, 0, 0, 1, 0, 0, 0, 0, 0, -3439.65, 2237.67, 33.706, 0.552004, 300, 5, 0, 6761, 0, 1, 0, 0, 0, "", 0), +(80476, 19759, 530, 0, 0, 1, 0, 0, 0, 0, 0, -3416.91, 2263.98, 33.6662, 1.36833, 300, 5, 0, 6761, 0, 1, 0, 0, 0, "", 0), +(80478, 21080, 530, 0, 0, 1, 0, 0, 0, 0, 0, -3426.86, 2279.58, 33.224, 6.11549, 300, 0, 0, 6761, 0, 0, 0, 0, 0, "", 0), +(80479, 20878, 530, 0, 0, 1, 0, 0, 0, 0, 1, -3542.3, 2175.09, 34.605, 0.112182, 300, 0, 0, 6542, 0, 0, 0, 0, 0, "", 0), +(80480, 20878, 530, 0, 0, 1, 0, 0, 0, 0, 1, -3539.62, 2158.01, 33.6429, 0.362725, 300, 0, 0, 6761, 0, 0, 0, 0, 0, "", 0), +(80481, 19759, 530, 0, 0, 1, 0, 0, 0, 0, 0, -3554.47, 2144.46, 24.5201, 0.812755, 300, 5, 0, 6761, 0, 1, 0, 0, 0, "", 0), +(80482, 19759, 530, 0, 0, 1, 0, 0, 0, 0, 0, -3594.73, 2116.83, 20.2744, 0.626613, 300, 5, 0, 6761, 0, 1, 0, 0, 0, "", 0), +(80487, 20878, 530, 0, 0, 1, 0, 0, 0, 0, 1, -3662.5, 2072.94, 10.3361, 5.55746, 300, 0, 0, 6542, 0, 0, 0, 0, 0, "", 0), +(80490, 20878, 530, 0, 0, 1, 0, 0, 0, 0, 1, -3652.5, 2084.2, 10.5056, 5.55746, 300, 0, 0, 6761, 0, 0, 0, 0, 0, "", 0), +(80492, 20878, 530, 0, 0, 1, 0, 0, 0, 0, 1, -3644.13, 2055.73, 9.68677, 2.40328, 300, 0, 0, 6542, 0, 0, 0, 0, 0, "", 0), +(80493, 20878, 530, 0, 0, 1, 0, 0, 0, 0, 1, -3637.7, 2038.1, 10.4644, 1.91553, 300, 0, 0, 6542, 0, 0, 0, 0, 0, "", 0), +(80499, 20878, 530, 0, 0, 1, 0, 0, 0, 0, 1, -3622.26, 2053.14, 9.36395, 2.79277, 300, 0, 0, 6542, 0, 0, 0, 0, 0, "", 0), +(80500, 20872, 530, 0, 0, 1, 0, 0, 0, 0, 1, -3649.29, 2072, 9.88089, 4.49401, 300, 5, 0, 4869, 3080, 1, 0, 0, 0, "", 0), +(80501, 20887, 530, 0, 0, 1, 0, 0, 0, 0, 0, -3651.97, 2070.35, 9.96041, 4.50972, 300, 5, 0, 1518, 2933, 1, 0, 0, 0, "", 0); +UPDATE `creature` SET `position_x`=-3666.342, `position_y`=2086.453, `position_z`=10.4205, `orientation`=5.6084 WHERE `guid`=213829; diff --git a/sql/updates/world/master/2020_08_19_02_world_2017_07_21_00_world.sql b/sql/updates/world/master/2020_08_19_02_world_2017_07_21_00_world.sql new file mode 100644 index 000000000..804c0ba9d --- /dev/null +++ b/sql/updates/world/master/2020_08_19_02_world_2017_07_21_00_world.sql @@ -0,0 +1,3 @@ +-- +DELETE FROM `spell_script_names` WHERE `scriptname`="spell_blackheart_incite_chaos"; +INSERT INTO `spell_script_names` (`spell_id`,`scriptname`) VALUES (33676,"spell_blackheart_incite_chaos"); diff --git a/sql/updates/world/master/2020_08_19_03_world_2017_07_21_01_world.sql b/sql/updates/world/master/2020_08_19_03_world_2017_07_21_01_world.sql new file mode 100644 index 000000000..32377f8da --- /dev/null +++ b/sql/updates/world/master/2020_08_19_03_world_2017_07_21_01_world.sql @@ -0,0 +1,4 @@ +-- hahahahahahahahahahahahaha oh god this is the most ridiculous blizzlike hack ever +-- seriously blizz devs WHAT WERE YOU THINKING +UPDATE `creature_template` SET `faction`=(1761+(`entry`-19300)),`scriptname`="boss_blackheart_the_inciter_mc_dummy" WHERE `entry` BETWEEN 19300 AND 19304; +DELETE FROM `creature` WHERE `id` BETWEEN 19300 and 19304;