Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Spells: Void Zone's Consumption (#27265)

Browse Source 
(cherry picked from commit 44a6d393d7)
This commit is contained in:
offl
2021-11-20 21:49:56 +02:00
committed by Shauren
parent 8f02596162
commit 5eac5ee2db
4 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/updates/world/master/2022_03_22_03_world_2021_11_20_02_world.sql Normal file
View File

@@ -0,0 +1,14 @@
-- It looked like 34000 and 34001 are heroic and normal entries but they're not. Even in CreatureDifficulty they are separate entries
-- Spell 64206 is simply not used but looks like was created for heroic, 64207 probably triggers it
-- We'll use 64209 as trigger of 64208
UPDATE `serverside_spell` SET `ProcChance` = 101 WHERE `Id` = 64209;
DELETE FROM `serverside_spell_effect` WHERE `SpellID`=64209;
INSERT INTO `serverside_spell_effect` (`SpellID`, `Effect`, `EffectAura`, `EffectAuraPeriod`, `EffectChainAmplitude`, `ImplicitTarget1`) VALUES
(64209,6,23,1000,1,1);
UPDATE `spell_script_names` SET `ScriptName` = 'spell_gen_consumption' WHERE `ScriptName` = 'spell_four_horsemen_consumption';
DELETE FROM `spell_script_names` WHERE `spell_id` = 64208 AND `ScriptName` = 'spell_gen_consumption';
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
(64208,'spell_gen_consumption');

18
src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
View File

@@ -699,23 +699,6 @@ class spell_four_horsemen_mark : public AuraScript
}
};
// 28865 - Consumption
class spell_four_horsemen_consumption : public SpellScript
{
PrepareSpellScript(spell_four_horsemen_consumption);
void HandleDamageCalc(SpellEffIndex /*effIndex*/)
{
uint32 damage = GetCaster()->GetMap()->IsHeroic() ? 4250 : 2750;
SetEffectValue(damage);
}
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_four_horsemen_consumption::HandleDamageCalc, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
void AddSC_boss_four_horsemen()
{
RegisterNaxxramasCreatureAI(boss_four_horsemen_baron);
@@ -723,5 +706,4 @@ void AddSC_boss_four_horsemen()
RegisterNaxxramasCreatureAI(boss_four_horsemen_lady);
RegisterNaxxramasCreatureAI(boss_four_horsemen_sir);
RegisterSpellScript(spell_four_horsemen_mark);
RegisterSpellScript(spell_four_horsemen_consumption);
}

17
src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
View File

@@ -57,7 +57,7 @@ enum Spells
SPELL_HEART_LIGHTNING_TETHER = 64799,
// Void Zone
SPELL_CONSUMPTION = 64208,
SPELL_CONSUMPTION = 64209,
// Life Spark
SPELL_ARCANE_POWER_STATE = 49411,
@@ -649,20 +649,11 @@ struct npc_xt_void_zone : public PassiveAI
{
npc_xt_void_zone(Creature* creature) : PassiveAI(creature) { }
void Reset() override
void JustAppeared() override
{
int32 bp = 0;
if (SpellInfo const* createdBySpell = sSpellMgr->GetSpellInfo(me->m_unitData->CreatedBySpell, me->GetMap()->GetDifficultyID()))
if (createdBySpell->GetEffects().size() > EFFECT_1)
bp = createdBySpell->GetEffect(EFFECT_1).CalcValue();
_scheduler.Schedule(1s, [this, bp](TaskContext consumption)
_scheduler.Schedule(2500ms, [this](TaskContext /*task*/)
{
CastSpellExtraArgs args(false);
if (bp)
args.AddSpellBP0(bp);
DoCastSelf(SPELL_CONSUMPTION, args);
consumption.Repeat();
DoCastSelf(SPELL_CONSUMPTION);
});
}

27
src/server/scripts/Spells/spell_generic.cpp
View File

@@ -1030,6 +1030,32 @@ private:
int32 _damagePct;
};
// 28865 - Consumption
// 64208 - Consumption
class spell_gen_consumption : public SpellScript
{
PrepareSpellScript(spell_gen_consumption);
void HandleDamageCalc(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
if (!caster || caster->GetTypeId() != TYPEID_UNIT)
return;
int32 damage = 0;
if (SpellInfo const* createdBySpell = sSpellMgr->GetSpellInfo(caster->m_unitData->CreatedBySpell, GetCastDifficulty()))
damage = createdBySpell->GetEffect(EFFECT_1).CalcValue();
if (damage)
SetEffectValue(damage);
}
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_gen_consumption::HandleDamageCalc, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
// 63845 - Create Lance
enum CreateLanceSpells
{
@@ -4853,6 +4879,7 @@ void AddSC_generic_spell_scripts()
RegisterSpellScript(spell_gen_clone);
RegisterSpellScript(spell_gen_clone_weapon);
RegisterSpellScript(spell_gen_clone_weapon_aura);
RegisterSpellScript(spell_gen_consumption);
RegisterSpellScriptWithArgs(spell_gen_count_pct_from_max_hp, "spell_gen_default_count_pct_from_max_hp");
RegisterSpellScriptWithArgs(spell_gen_count_pct_from_max_hp, "spell_gen_50pct_count_pct_from_max_hp", 50);
RegisterSpellScript(spell_gen_create_lance);