diff options
| author | SnapperRy <snapperryen@gmail.com> | 2016-06-18 14:11:09 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-01-29 21:51:06 +0100 |
| commit | 416bcdd8523439e12d913a1b14d36f8693852979 (patch) | |
| tree | bb2193965c9b7887a442fe1eaafe0c2d1c7a2b01 | |
| parent | db7d279cdea1f9d98d0f531585cbde532d4b4226 (diff) | |
Script/Quest: Improvements for quest Corrosion Prevention (27347): (#17385)
- Energized! spell should target only the caster and any player around.
- Prevent trigger from gaining threat from beneficial spell casts, getting stuck in a "gaining threat but cannot attack, reset" situation.
- The Power Core Fragment near the zeppelin crash should always be active.
(cherry picked from commit 764daeb9ccdd8c38b53860ae0765e5d3c3c2a538)
Rename 9999_99_99_99_world.sql to 2016_06_18_01_world.sql
(cherry picked from commit ce236d37c8560c86cdc3597e4153f98b2e629fcc)
| -rw-r--r-- | sql/updates/world/master/2017_01_29_20_world_2016_06_18_01_world.sql | 8 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sql/updates/world/master/2017_01_29_20_world_2016_06_18_01_world.sql b/sql/updates/world/master/2017_01_29_20_world_2016_06_18_01_world.sql new file mode 100644 index 00000000000..1a9d8fbce85 --- /dev/null +++ b/sql/updates/world/master/2017_01_29_20_world_2016_06_18_01_world.sql @@ -0,0 +1,8 @@ +DELETE FROM `conditions` WHERE `SourceEntry`=42490 AND `SourceTypeOrReferenceId`=13; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 1, 42490, 0, 0, 31, 0, 4, 0, 0, 0, 0, 0, "", "Spell 'Energized!' targets players"), +(13, 1, 42490, 0, 1, 31, 0, 3, 23832, 0, 0, 0, 0, "", "Spell 'Energized!' targets creature 'Zeppelin Power Core'"); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=-18587; +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 +('-18587','0','0','0','63','0','100','0','0','0','0','0','11','42491','2','0','0','0','0','1','0','0','0','0','0','0','0',"Zeppelin Power Core - On Reset - Cast 'Energized Periodic'"); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 154982cc6fd..926bee516cf 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3170,6 +3170,10 @@ void SpellMgr::LoadSpellInfoCorrections() case 198300: // Gathering Storms spellInfo->ProcCharges = 1; // override proc charges, has 0 (unlimited) in db2 break; + case 42490: // Energized! + case 42492: // Cast Energized + spellInfo->AttributesEx |= SPELL_ATTR1_NO_THREAT; + break; // VIOLET HOLD SPELLS // case 54258: // Water Globule (Ichoron) |