nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-22 05:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core/Spell): Move some SpellImmune from script to db (#4381)

Browse Source 
* refactor(Core/Spell): Move some SpellImmune from script to db
This commit is contained in:
Kitzunu
2021-02-06 00:57:51 +01:00
committed by GitHub
parent 158b1bcf73
commit bfcc3c6f87
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
data/sql/updates/pending_db_world/rev_1612059439455457600.sql Normal file
View File

@@ -0,0 +1,13 @@
INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1612059439455457600');
-- SPELL_SCHOOL_FIRE
UPDATE `creature_template` SET `spell_school_immune_mask` = 4 WHERE `entry` IN (17267,15438);
-- SPELL_SCHOOL_NATURE
UPDATE `creature_template` SET `spell_school_immune_mask` = 8 WHERE `entry` IN (30258,31463,15352);
-- SPELL_SCHOOL_FROST
UPDATE `creature_template` SET `spell_school_immune_mask` = 16 WHERE `entry` IN (37994,510,17167);
-- School ALL
UPDATE `creature_template` SET `spell_school_immune_mask`=`spell_school_immune_mask`|1|2|4|8|16|32|64 WHERE `entry` IN (28912);

2
src/server/game/Entities/Pet/Pet.cpp
View File

@@ -867,7 +867,6 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
AddAura(SPELL_MAGE_PET_SCALING_02, this);
AddAura(SPELL_MAGE_PET_SCALING_03, this);
AddAura(SPELL_MAGE_PET_SCALING_04, this);
ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
break;
}
}
@@ -939,7 +938,6 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
AddAura(SPELL_MAGE_PET_SCALING_02, this);
AddAura(SPELL_MAGE_PET_SCALING_03, this);
AddAura(SPELL_MAGE_PET_SCALING_04, this);
ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
break;
}
case NPC_TREANT: //force of nature

4
src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
View File

@@ -410,7 +410,6 @@ public:
ElementalOne->CombatStart(target);
ElementalOne->setFaction(me->getFaction());
ElementalOne->SetUnitMovementFlags(MOVEMENTFLAG_ROOT);
ElementalOne->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
ElementalOne->SetModifierValue(UNIT_MOD_RESISTANCE_FROST, BASE_VALUE, 0);
}
@@ -425,7 +424,6 @@ public:
ElementalTwo->CombatStart(target);
ElementalTwo->setFaction(me->getFaction());
ElementalTwo->SetUnitMovementFlags(MOVEMENTFLAG_ROOT);
ElementalTwo->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
ElementalTwo->SetModifierValue(UNIT_MOD_RESISTANCE_FROST, BASE_VALUE, 0);
}
@@ -440,7 +438,6 @@ public:
ElementalThree->CombatStart(target);
ElementalThree->setFaction(me->getFaction());
ElementalThree->SetUnitMovementFlags(MOVEMENTFLAG_ROOT);
ElementalThree->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
ElementalThree->SetModifierValue(UNIT_MOD_RESISTANCE_FROST, BASE_VALUE, 0);
}
@@ -455,7 +452,6 @@ public:
ElementalFour->CombatStart(target);
ElementalFour->setFaction(me->getFaction());
ElementalFour->SetUnitMovementFlags(MOVEMENTFLAG_ROOT);
ElementalFour->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
ElementalFour->SetModifierValue(UNIT_MOD_RESISTANCE_FROST, BASE_VALUE, 0);
}

2
src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
View File

@@ -206,8 +206,6 @@ public:
void Reset() override
{
FireboltTimer = 2000;
me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
}
void EnterCombat(Unit* /*who*/) override { }

1
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
View File

@@ -225,7 +225,6 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->LoadEquipment(0, true);
me->RemoveAllAuras();
me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ALL, true);
summons.DespawnAll();
}
}

1
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
View File

@@ -43,7 +43,6 @@ public:
boss_amanitarAI(Creature* c) : ScriptedAI(c), summons(me)
{
pInstance = c->GetInstanceScript();
me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);
}
InstanceScript* pInstance;

10
src/server/scripts/Pet/pet_shaman.cpp
View File

@@ -46,10 +46,7 @@ public:
_events.ScheduleEvent(EVENT_SHAMAN_ANGEREDEARTH, 0);
}
void InitializeAI() override
{
me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);
}
void InitializeAI() override { }
void UpdateAI(uint32 diff) override
{
@@ -97,10 +94,7 @@ public:
{
npc_pet_shaman_fire_elementalAI(Creature* creature) : ScriptedAI(creature), _initAttack(true) { }
void InitializeAI() override
{
me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
}
void InitializeAI() override { }
void EnterCombat(Unit*) override
{