[fix] ICC, FoS, Boss Bronjahm, ConsumeSoulSpell

[Auntie Mangos]

Little bump in combined version:

Author = me, Toinan67, tested on rev 10997

Combined fixes for Bronjahm, original threads: - also updated "my" threads with recentish versions.

http://getmangos.eu/community/topic/15116/fix-icc-fos-boss-bronjahm-magics-bane-spell/ (Toinan67)

http://getmangos.eu/community/topic/14878/fix-icc-fos-boss-bronjahm-corruptsoulspell/

http://getmangos.eu/community/topic/14876/fix-icc-fos-boss-bronjahm-fearspell/

and this one here

Edit - this collection of fixes is obsolete by now, if I am not mistaken, only the part of this topic is still missing

From 6da42f4d6b7486f2f9dc0ad24b1a82215fdb6b3d Mon Sep 17 00:00:00 2001
From: Schmoozerd <[email protected]>
Date: Sat, 30 Oct 2010 17:36:34 +0200
Subject: [PATCH 1/2] Bronjahm Consume Soul, Corrupt Sould and Fear

---
src/game/Spell.cpp        |    1 +
src/game/SpellAuras.cpp   |    4 ++++
src/game/SpellEffects.cpp |    4 ++++
3 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 11df7b1..24e2eb5 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1489,6 +1489,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                case 38794:                                 // Murmur's Touch (h)
                case 50988:                                 // Glare of the Tribunal (Halls of Stone)
                case 59870:                                 // Glare of the Tribunal (h) (Halls of Stone)
+                case 68950:                                 // Fear (ICC: Forge of Souls)
                    unMaxTargets = 1;
                    break;
                case 28542:                                 // Life Drain
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index f4b6575..b9f5272 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -2333,6 +2333,10 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                }
                return;
            }
+            case 68839:                                     // Corrupt Soul
+                target->CastSpell(target, 68848, true, NULL, this);
+                target->CastSpell(target, 68846, true, NULL, this);
+                return;
        }

        // Living Bomb
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 30befc2..a83c1c9 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -6486,6 +6486,10 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
                    unitTarget->CastSpell(unitTarget, 66747, true);
                    return;
                }
+                case 68861:                                 // Consume Soul (ICC FoS: Bronjahm)
+                    if (unitTarget)
+                        unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    return;
                case 69377:                                 // Fortitude
                {
                    if (!unitTarget)
-- 
1.7.3.1.msysgit.0


From b271bf3feb3ca6a01d72e46374f6ac6f3b5a7a11 Mon Sep 17 00:00:00 2001
From: Toinan67 <[email protected]>
Date: Tue, 11 Jan 2011 18:25:02 +0100
Subject: [PATCH 2/2] Bronjahm - Magic's Bane

---
src/game/SpellEffects.cpp |   20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index a83c1c9..92df911 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -373,6 +373,26 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                    case 67485:
                        damage += uint32(0.5f * m_caster->GetTotalAttackPowerValue(BASE_ATTACK));
                        break;
+                    //Magic Bane normal (Forge of Souls - Bronjahm)
+                    case 68793:
+                    {
+                        damage += uint32(unitTarget->GetMaxPower(POWER_MANA) / 2);
+
+                        if (damage > 10000)
+                            damage = 10000;
+
+                        break;
+                    }
+                    //Magic Bane heroic (Forge of Souls - Bronjahm)
+                    case 69050:
+                    {
+                        damage += uint32(unitTarget->GetMaxPower(POWER_MANA) / 2);
+
+                        if (damage > 15000)
+                            damage = 15000;
+
+                        break;
+                    }
                }
                break;
            }
-- 
1.7.3.1.msysgit.0

[Schmoozerd]

What bug does the patch fix? What features does the patch add?

Implement ScriptEffect for Spell Consume Soul in Boss Bronjahm Encounter

http://www.wowhead.com/spell=68861

This Spell should trigger the selfhealing of Bronjahm,

done with http://www.wowhead.com/spell=68858(or by SpellDifficulty heroic: 69047)

For which repository revision was the patch created?

10340

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

no

Who has been writing this patch? Please include either forum user names or email addresses.

me

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 30befc2..a83c1c9 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -6486,6 +6486,10 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
                    unitTarget->CastSpell(unitTarget, 66747, true);
                    return;
                }
+                case 68861:                                 // Consume Soul (ICC FoS: Bronjahm)
+                    if (unitTarget)
+                        unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    return;
                case 69377:                                 // Fortitude
                {
                    if (!unitTarget)

Remark2: The spell needs the boss as target

DELETE FROM spell_script_target WHERE entry=68861;

INSERT INTO spell_script_target VALUES

(68861, 1, 36497);

[Toinan67]

Bump! The patch is correct

[Toinan67]

bump :)

[vladex]

yea works nice !!! anyone here to apply it on the master?

[darkstalker]

there are lots of spells with another triggered spell_id in basepoints, maybe needs a generic implementation?

[VladimirMangos]

Look like with [11553] all added from original and later patches. Thank you