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: Transfer Nurturing Instinct in spell_druid.cpp (#25307)

Browse Source 
* Scripts/Spells: Transfer Nurturing Instinct in spell_druid.cpp

* Fix travis

* Rename 2020_08_xx_xx_world.sql to 2020_08_29_01_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
This commit is contained in:
Moki
2020-08-29 14:09:16 +03:00
committed by GitHub
parent cfc8f7b442
commit 18e88653b9
3 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/world/3.3.5/2020_08_29_01_world.sql Normal file
View File

@@ -0,0 +1,3 @@
-- [Druid] Nurturing Instinct
DELETE FROM `spell_script_names` WHERE `spell_id` IN (-33872, 33872, 33873);
INSERT INTO `spell_script_names` VALUES (-33872, 'spell_dru_nurturing_instinct');

15
src/server/game/Spells/Auras/SpellAuraEffects.cpp
View File

@@ -1216,21 +1216,6 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const
// Savage Roar
if (target->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, 0, 0x10000000, 0))
target->CastSpell(target, 62071, true);
// Nurturing Instinct
if (AuraEffect const* aurEff = target->GetAuraEffect(SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT, SPELLFAMILY_DRUID, 2254, 0))
{
uint32 spellId3 = 0;
switch (aurEff->GetId())
{
case 33872:
spellId3 = 47179;
break;
case 33873:
spellId3 = 47180;
break;
}
target->CastSpell(target, spellId3, this);
}
// Master Shapeshifter - Cat
if (AuraEffect const* aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0))
{

28
src/server/scripts/Spells/spell_druid.cpp
View File

@@ -91,7 +91,9 @@ enum DruidSpells
SPELL_DRUID_BARKSKIN_01 = 63058,
SPELL_DRUID_RESTORATION_T10_2P_BONUS = 70658,
SPELL_DRUID_FRENZIED_REGENERATION_HEAL = 22845,
SPELL_DRUID_GLYPH_OF_NOURISH = 62971
SPELL_DRUID_GLYPH_OF_NOURISH = 62971,
SPELL_DRUID_NURTURING_INSTINCT_R1 = 47179,
SPELL_DRUID_NURTURING_INSTINCT_R2 = 47180
};
enum MiscSpells
@@ -1892,6 +1894,29 @@ class spell_dru_wild_growth_aura : public AuraScript
float _baseReduction = 2.f;
};
class spell_dru_nurturing_instinct : public AuraScript
{
PrepareAuraScript(spell_dru_nurturing_instinct);
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Player* player = GetTarget()->ToPlayer())
player->AddAura(GetSpellInfo()->GetRank() == 1 ? SPELL_DRUID_NURTURING_INSTINCT_R1 : SPELL_DRUID_NURTURING_INSTINCT_R2, player);
}
void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Player* player = GetTarget()->ToPlayer())
player->RemoveAura(GetSpellInfo()->GetRank() == 1 ? SPELL_DRUID_NURTURING_INSTINCT_R1 : SPELL_DRUID_NURTURING_INSTINCT_R2);
}
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dru_nurturing_instinct::AfterApply, EFFECT_0, SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_nurturing_instinct::AfterRemove, EFFECT_0, SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT, AURA_EFFECT_HANDLE_REAL);
}
};
void AddSC_druid_spell_scripts()
{
RegisterSpellScript(spell_dru_barkskin);
@@ -1943,4 +1968,5 @@ void AddSC_druid_spell_scripts()
RegisterSpellScript(spell_dru_t10_restoration_4p_bonus);
RegisterSpellScript(spell_dru_t10_restoration_4p_bonus_dummy);
RegisterSpellAndAuraScriptPair(spell_dru_wild_growth, spell_dru_wild_growth_aura);
RegisterSpellScript(spell_dru_nurturing_instinct);
}