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

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-09-03 10:17:45 -06:00
committed by GitHub
parent ac5bcfae12 31892275b0
commit 31f36b25f2
8 changed files with 71 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3953,20 +3953,11 @@ void AuraEffect::HandleAuraModBaseResistancePCT(AuraApplication const* aurApp, u
return;
Unit* target = aurApp->GetTarget();
// only players have base stats
if (target->GetTypeId() != TYPEID_PLAYER)
for (int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL; x++)
{
//pets only have base armor
if (target->IsPet() && (GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL))
target->HandleStatModifier(UNIT_MOD_ARMOR, BASE_PCT, float(GetAmount()), apply);
}
else
{
for (int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL; x++)
if (GetMiscValue() & int32(1 << x))
{
if (GetMiscValue() & int32(1 << x))
target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), BASE_PCT, float(GetAmount()), apply);
target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), BASE_PCT, float(GetAmount()), apply);
}
}
}
@@ -3998,16 +3989,11 @@ void AuraEffect::HandleModBaseResistance(AuraApplication const* aurApp, uint8 mo
return;
Unit* target = aurApp->GetTarget();
// only players and pets have base stats
if (target->IsPlayer() || target->IsPet())
for (uint8 i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++)
{
for (uint8 i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++)
if (GetMiscValue() & (1 << i))
{
if (GetMiscValue() & (1 << i))
{
target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_VALUE, float(GetAmount()), apply);
}
target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_VALUE, float(GetAmount()), apply);
}
}
}

10
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
View File

@@ -40,7 +40,7 @@ enum Spells
SPELL_CURSE_OF_TONGUES = 25195,
SPELL_ENVELOPING_WINDS = 25189,
SPELL_WAR_STOMP = 25188,
SPELL_STRENGHT_OF_OSSIRIAN = 25176,
SPELL_STRENGTH_OF_OSSIRIAN = 25176,
SPELL_SAND_STORM = 25160,
SPELL_SUMMON_CRYSTAL = 25192,
SPELL_SUMMON_SMALL_OBSIDIAN_CHUNK = 27627, // Server-side
@@ -148,7 +148,7 @@ struct boss_ossirian : public BossAI
{
if (spell->Id == weakness)
{
me->RemoveAurasDueToSpell(SPELL_STRENGHT_OF_OSSIRIAN);
me->RemoveAurasDueToSpell(SPELL_STRENGTH_OF_OSSIRIAN);
}
}
}
@@ -169,7 +169,7 @@ struct boss_ossirian : public BossAI
events.ScheduleEvent(EVENT_SILENCE, 30s);
events.ScheduleEvent(EVENT_CYCLONE, 20s);
events.ScheduleEvent(EVENT_STOMP, 30s);
DoCastSelf(SPELL_STRENGHT_OF_OSSIRIAN);
DoCastSelf(SPELL_STRENGTH_OF_OSSIRIAN);
Talk(SAY_AGGRO);
Map* map = me->GetMap();
@@ -253,7 +253,7 @@ struct boss_ossirian : public BossAI
events.Update(diff);
bool applySupreme = true;
if (me->HasAura(SPELL_STRENGHT_OF_OSSIRIAN))
if (me->HasAura(SPELL_STRENGTH_OF_OSSIRIAN))
{
applySupreme = false;
}
@@ -271,7 +271,7 @@ struct boss_ossirian : public BossAI
if (applySupreme)
{
DoCastSelf(SPELL_STRENGHT_OF_OSSIRIAN);
DoCastSelf(SPELL_STRENGTH_OF_OSSIRIAN);
Talk(SAY_SUPREME);
}

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

@@ -4478,7 +4478,8 @@ enum AQSpells
SPELL_CONSUME_LEECH_HEAL_AQ20 = 25378,
SPELL_CONSUME_SPIT_OUT = 25383,
SPELL_HIVEZARA_CATALYST = 25187
SPELL_HIVEZARA_CATALYST = 25187,
SPELL_VEKNISS_CATALYST = 26078
};
class spell_gen_consume : public AuraScript
@@ -4706,4 +4707,5 @@ void AddSC_generic_spell_scripts()
RegisterSpellScript(spell_gen_remove_impairing_auras);
RegisterSpellScriptWithArgs(spell_gen_consume, "spell_consume_aq20", SPELL_CONSUME_LEECH_AQ20, SPELL_CONSUME_LEECH_HEAL_AQ20);
RegisterSpellScriptWithArgs(spell_gen_apply_aura_after_expiration, "spell_itch_aq20", SPELL_HIVEZARA_CATALYST, EFFECT_0, SPELL_AURA_DUMMY);
RegisterSpellScriptWithArgs(spell_gen_apply_aura_after_expiration, "spell_itch_aq40", SPELL_VEKNISS_CATALYST, EFFECT_0, SPELL_AURA_DUMMY);
}