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

Spells/Scripts: Updated Gift of the Naaru script

Browse Source 
Closes #22468
This commit is contained in:
Matan Shukry
2021-04-12 22:32:53 +02:00
committed by Shauren
parent a9fa007f83
commit d2b70397ab
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/updates/world/master/2021_04_12_00_world_draenei_racial_spell.sql Normal file
View File

@@ -0,0 +1,10 @@
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_gift_of_naaru';
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
(28880, 'spell_gen_gift_of_naaru'), -- Warrior
(59542, 'spell_gen_gift_of_naaru'), -- Paladin
(59543, 'spell_gen_gift_of_naaru'), -- Hunter
(59544, 'spell_gen_gift_of_naaru'), -- Priest
(59545, 'spell_gen_gift_of_naaru'), -- Death Knight
(59547, 'spell_gen_gift_of_naaru'), -- Shaman
(59548, 'spell_gen_gift_of_naaru'), -- Mage
(121093, 'spell_gen_gift_of_naaru'); -- Monk

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

@@ -1436,7 +1436,14 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScript
}
};
// 28880 - Warrior
// 59542 - Paladin
// 59543 - Hunter
// 59544 - Priest
// 59545 - Death Knight
// 59547 - Shaman
// 59548 - Mage
// 121093 - Monk
class spell_gen_gift_of_naaru : public AuraScript
{
PrepareAuraScript(spell_gen_gift_of_naaru);
@@ -1446,30 +1453,13 @@ class spell_gen_gift_of_naaru : public AuraScript
if (!GetCaster() || !aurEff->GetTotalTicks())
return;
float heal = 0.0f;
switch (GetSpellInfo()->SpellFamilyName)
if (SpellEffectInfo const* eff1 = GetSpellInfo()->GetEffect(EFFECT_1))
{
case SPELLFAMILY_MAGE:
case SPELLFAMILY_WARLOCK:
case SPELLFAMILY_PRIEST:
heal = 1.885f * float(GetCaster()->SpellBaseDamageBonusDone(GetSpellInfo()->GetSchoolMask()));
break;
case SPELLFAMILY_PALADIN:
case SPELLFAMILY_SHAMAN:
heal = std::max(1.885f * float(GetCaster()->SpellBaseDamageBonusDone(GetSpellInfo()->GetSchoolMask())), 1.1f * float(GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK)));
break;
case SPELLFAMILY_WARRIOR:
case SPELLFAMILY_HUNTER:
case SPELLFAMILY_DEATHKNIGHT:
heal = 1.1f * float(std::max(GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK), GetCaster()->GetTotalAttackPowerValue(RANGED_ATTACK)));
break;
case SPELLFAMILY_GENERIC:
default:
break;
float healPct = eff1->CalcValue() / 100.0f;
float heal = healPct * GetCaster()->GetMaxHealth();
int32 healTick = std::floor(heal / aurEff->GetTotalTicks());
amount += healTick;
}
int32 healTick = std::floor(heal / aurEff->GetTotalTicks());
amount += int32(std::max(healTick, 0));
}
void Register() override