Scripts/Spells: Warlock Rain of Fire #19345

Traesh · 2017-03-22T00:06:32Z

Changes proposed:

Fix Warlock spell "Rain of Fire" (http://www.wowhead.com/spell=5740). The Warlock can have multiple "Rain of Fire" areatrigger spawned, but a single target will always receive damage only once per tick
Minor cleanup (delete 1 old spell, removed from game)

Target branch(es):

master

Issues addressed: None

Tests performed: (Does it build, tested in-game, etc.)
Compiled, tested ingame

Known issues and TODO list:

None

Exodius · 2017-03-22T01:12:16Z

src/server/scripts/Spells/spell_warlock.cpp

@@ -1438,9 +1399,49 @@ class spell_warl_unstable_affliction : public SpellScriptLoader
        }
 };

+// 5740 - Demonic Circle: Summon


Shouldn't this line say
// 5740 - Rain of Fire
? 😄

Yup, bad copy paste x)

Shauren · 2017-03-22T09:18:40Z

src/server/scripts/Spells/spell_warlock.cpp

+
+            for (AreaTrigger* rainOfFireAreaTrigger : rainOfFireAreaTriggers)
+            {
+                GuidUnorderedSet insideTargets = rainOfFireAreaTrigger->GetInsideUnits();


const& - dont copy

joschiwald · 2017-03-22T14:48:59Z

sql/updates/world/master/9999_99_99_19344_world.sql

@@ -0,0 +1,11 @@
+DELETE FROM `areatrigger_template` WHERE `Id`=10133;
+INSERT INTO `areatrigger_template` (`Id`, `Type`, `Flags`, `Data0`, `Data1`, `Data2`, `Data3`, `Data4`, `Data5`, `ScriptName`, `VerifiedBuild`) VALUES
+(10133, 0, 0, 8, 8, 0, 0, 0, 0, "", 23420);


we already have this areatrigger_template in db

ghost · 2017-03-25T08:42:57Z

sql/updates/world/master/9999_99_99_19344_world.sql

+INSERT INTO `spell_areatrigger` (`SpellMiscId`, `AreaTriggerId`, `MoveCurveId`, `ScaleCurveId`, `MorphCurveId`, `FacingCurveId`, `DecalPropertiesId`, `TimeToTarget`, `TimeToTargetScale`, `VerifiedBuild`) VALUES
+(5420, 10133, 0, 0, 0, 0, 0, 0, 7177, 23420); -- SpellId : 5740
+
+DELETE FROM `spell_script_names` WHERE `spell_id`=5740;


Please delete by ScriptName instead of spell_id to remove any existing spell script names using a different spell ID.

Keader · 2017-03-25T13:22:28Z

sql/updates/world/master/9999_99_99_19345_world.sql

@@ -2,6 +2,6 @@ DELETE FROM `spell_areatrigger` WHERE (`SpellMiscId`=5420 AND `AreaTriggerId`=10
 INSERT INTO `spell_areatrigger` (`SpellMiscId`, `AreaTriggerId`, `MoveCurveId`, `ScaleCurveId`, `MorphCurveId`, `FacingCurveId`, `DecalPropertiesId`, `TimeToTarget`, `TimeToTargetScale`, `VerifiedBuild`) VALUES
 (5420, 10133, 0, 0, 0, 0, 0, 0, 7177, 23420); -- SpellId : 5740

-DELETE FROM `spell_script_names` WHERE `spell_id`=5740;
+DELETE FROM `spell_script_names` WHERE `spell_id`=5740 OR `ScriptName`="spell_warl_rain_of_fire";


We always use ScriptName because 1 id can have multiple scripts linked to him

Yes, that is taken care of already in commit 42591e5. Notice the use of OR as a divider.
Deleting any spell scripts using spell_id 5740 is just an extra precaution. :-)

OR is not AND, it should delete only by ScriptName, not by spell_id

Well, if you think about the use of AND, it is very selective whereas OR is not.
This variant opens for deleting both for all cases of ScriptName='spell_warl_rain_of_fire'
as well as deleting that special case of spell_id= 5740.

[edit] ... in case anyone had used that ID in a differently named spell.

@tkrokli you still don't get it..... delete just by scriptname.... what about spell 5740 maybe has another script linked..... for example for a talent???? then you just unlink it too????

Delete only by ScriptName please.

Long story short:

-DELETE FROM `spell_script_names` WHERE `spell_id`=5740 OR `ScriptName`="spell_warl_rain_of_fire"; +DELETE FROM `spell_script_names` WHERE `ScriptName`="spell_warl_rain_of_fire";

I am gonna write some nonsense for those who don't get what @Keader and @ariel- are talking about.

If there is more than 1 script attached to ID 5740, example, "spell_warl_rain_of_fire" and "spell_warl_rain_of_fire_trigger" and you use

DELETE FROM `spell_script_names` WHERE `spell_id`=5740 OR `ScriptName`="spell_warl_rain_of_fire";

query will delete all scripts related to spell_id=5740 AND all scripts related to ScriptName="spell_warl_rain_of_fire".
So, if there is something that does not need to be deleted like "spell_warl_rain_of_fire_trigger"
If spell spell_id=5740 is linked to some other script, it will delete them as well...

If you use

DELETE FROM `spell_script_names` WHERE `spell_id`=5740 AND `ScriptName`="spell_warl_rain_of_fire";

query will delete only spell_id=5740 related to ScriptName="spell_warl_rain_of_fire" but, it is still better to delete only by the ScriptName so...

DELETE FROM `spell_script_names` WHERE `ScriptName`="spell_warl_rain_of_fire";

is the correct way to do it.

Warlock rain of fire

426cc42

Exodius suggested changes Mar 22, 2017

View reviewed changes

Typo

fbc4cbe

Shauren requested changes Mar 22, 2017

View reviewed changes

Don't copy

1e09d1d

Shauren approved these changes Mar 22, 2017

View reviewed changes

joschiwald reviewed Mar 22, 2017

View reviewed changes

Remove already inserted areatrigger_template

1298d13

Aokromes added Branch-master Comp-C++Script Feedback-PatchFix labels Mar 23, 2017

ghost reviewed Mar 25, 2017

View reviewed changes

Also remove from spell_script_names by ScriptName

42591e5

ghost approved these changes Mar 25, 2017

View reviewed changes

ghost changed the title ~~Script/Spell : Warlock Rain of Fire~~ Scripts/Spells: Warlock Rain of Fire Mar 25, 2017

ghost added the Sub-Spells label Mar 25, 2017

Keader reviewed Mar 25, 2017

View reviewed changes

Exodius approved these changes Mar 25, 2017

View reviewed changes

Traesh and others added 2 commits March 28, 2017 00:42

Update 9999_99_99_19345_world.sql

66491fe

Update and rename 9999_99_99_19345_world.sql to 2017_04_01_00_world.sql

a24b20a

Shauren merged commit 8ae2374 into TrinityCore:master Apr 1, 2017

Krudor pushed a commit to Krudor/TrinityCore that referenced this pull request Jul 13, 2017

Scripts/Spells: Warlock Rain of Fire (TrinityCore#19345)

3ea8164

Jinnaix mentioned this pull request Dec 16, 2019

Warlock Spells-Fear-Rain of Fire #23971

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Scripts/Spells: Warlock Rain of Fire #19345

Scripts/Spells: Warlock Rain of Fire #19345

Traesh commented Mar 22, 2017 •

edited

Exodius Mar 22, 2017 •

edited

Traesh Mar 22, 2017

Shauren Mar 22, 2017

joschiwald Mar 22, 2017

ghost Mar 25, 2017

Keader Mar 25, 2017

ghost Mar 25, 2017

ariel- Mar 25, 2017

ghost Mar 25, 2017 •

edited by ghost

adrianrp1988 Mar 27, 2017

Keader Mar 27, 2017

Exodius Mar 27, 2017 •

edited

Scripts/Spells: Warlock Rain of Fire #19345

Scripts/Spells: Warlock Rain of Fire #19345

Conversation

Traesh commented Mar 22, 2017 • edited

Exodius Mar 22, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost Mar 25, 2017 • edited by ghost

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Exodius Mar 27, 2017 • edited

Choose a reason for hiding this comment

Traesh commented Mar 22, 2017 •

edited

Exodius Mar 22, 2017 •

edited

ghost Mar 25, 2017 •

edited by ghost

Exodius Mar 27, 2017 •

edited