josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Spell code for 322a. Part 2

Browse Source 
--HG--
branch : trunk
This commit is contained in:
n0n4m3
2009-12-17 12:23:01 +01:00
parent 515cf192ef
commit 772cf54fb5
6 changed files with 550 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/SpellAuras.cpp
+245 -145
View File
@@ -122,7 +122,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
&Aura::HandleFeignDeath, // 66 SPELL_AURA_FEIGN_DEATH &Aura::HandleFeignDeath, // 66 SPELL_AURA_FEIGN_DEATH
&Aura::HandleAuraModDisarm, // 67 SPELL_AURA_MOD_DISARM &Aura::HandleAuraModDisarm, // 67 SPELL_AURA_MOD_DISARM
&Aura::HandleAuraModStalked, // 68 SPELL_AURA_MOD_STALKED &Aura::HandleAuraModStalked, // 68 SPELL_AURA_MOD_STALKED
&Aura::HandleNoImmediateEffect, // 69 SPELL_AURA_SCHOOL_ABSORB implemented in Unit::CalcAbsorbResist &Aura::HandleSchoolAbsorb, // 69 SPELL_AURA_SCHOOL_ABSORB implemented in Unit::CalcAbsorbResist
&Aura::HandleUnused, // 70 SPELL_AURA_EXTRA_ATTACKS Useless, used by only one spell that has only visual effect &Aura::HandleUnused, // 70 SPELL_AURA_EXTRA_ATTACKS Useless, used by only one spell that has only visual effect
&Aura::HandleModSpellCritChanceShool, // 71 SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL &Aura::HandleModSpellCritChanceShool, // 71 SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL
&Aura::HandleModPowerCostPCT, // 72 SPELL_AURA_MOD_POWER_COST_SCHOOL_PCT &Aura::HandleModPowerCostPCT, // 72 SPELL_AURA_MOD_POWER_COST_SCHOOL_PCT
@@ -258,7 +258,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
&Aura::HandleNoImmediateEffect, //202 SPELL_AURA_CANNOT_BE_DODGED implemented in Unit::RollPhysicalOutcomeAgainst &Aura::HandleNoImmediateEffect, //202 SPELL_AURA_CANNOT_BE_DODGED implemented in Unit::RollPhysicalOutcomeAgainst
&Aura::HandleNoImmediateEffect, //203 SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_DAMAGE implemented in Unit::CalculateMeleeDamage and Unit::CalculateSpellDamage &Aura::HandleNoImmediateEffect, //203 SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_DAMAGE implemented in Unit::CalculateMeleeDamage and Unit::CalculateSpellDamage
&Aura::HandleNoImmediateEffect, //204 SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_DAMAGE implemented in Unit::CalculateMeleeDamage and Unit::CalculateSpellDamage &Aura::HandleNoImmediateEffect, //204 SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_DAMAGE implemented in Unit::CalculateMeleeDamage and Unit::CalculateSpellDamage
&Aura::HandleNULL, //205 SPELL_AURA_MOD_SCHOOL_CRIT_DMG_TAKEN &Aura::HandleNoImmediateEffect, //205 SPELL_AURA_MOD_SCHOOL_CRIT_DMG_TAKEN
&Aura::HandleAuraModIncreaseFlightSpeed, //206 SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED &Aura::HandleAuraModIncreaseFlightSpeed, //206 SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED
&Aura::HandleAuraModIncreaseFlightSpeed, //207 SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED &Aura::HandleAuraModIncreaseFlightSpeed, //207 SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED
&Aura::HandleAuraModIncreaseFlightSpeed, //208 SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED &Aura::HandleAuraModIncreaseFlightSpeed, //208 SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED
@@ -326,7 +326,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
&Aura::HandleNoImmediateEffect, //270 SPELL_AURA_MOD_ABILITY_IGNORE_TARGET_RESIST implemented in Unit::CalcAbsorbResist and CalcArmorReducedDamage &Aura::HandleNoImmediateEffect, //270 SPELL_AURA_MOD_ABILITY_IGNORE_TARGET_RESIST implemented in Unit::CalcAbsorbResist and CalcArmorReducedDamage
&Aura::HandleNoImmediateEffect, //271 SPELL_AURA_MOD_DAMAGE_FROM_CASTER implemented in Unit::SpellDamageBonus &Aura::HandleNoImmediateEffect, //271 SPELL_AURA_MOD_DAMAGE_FROM_CASTER implemented in Unit::SpellDamageBonus
&Aura::HandleNULL, //272 unknown &Aura::HandleNULL, //272 unknown
&Aura::HandleUnused, //273 clientside &Aura::HandleNoImmediateEffect, //273 SPELL_AURA_X_RAY (client side implementation)
&Aura::HandleNoImmediateEffect, //274 SPELL_AURA_CONSUME_NO_AMMO implemented in spell::CalculateDamageDoneForAllTargets &Aura::HandleNoImmediateEffect, //274 SPELL_AURA_CONSUME_NO_AMMO implemented in spell::CalculateDamageDoneForAllTargets
&Aura::HandleNoImmediateEffect, //275 SPELL_AURA_MOD_IGNORE_SHAPESHIFT Use SpellClassMask for spell select &Aura::HandleNoImmediateEffect, //275 SPELL_AURA_MOD_IGNORE_SHAPESHIFT Use SpellClassMask for spell select
&Aura::HandleNULL, //276 mod damage % mechanic? &Aura::HandleNULL, //276 mod damage % mechanic?
@@ -337,7 +337,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
&Aura::HandleNoImmediateEffect, //281 SPELL_AURA_MOD_HONOR_GAIN_PCT implemented in Player::RewardHonor &Aura::HandleNoImmediateEffect, //281 SPELL_AURA_MOD_HONOR_GAIN_PCT implemented in Player::RewardHonor
&Aura::HandleAuraIncreaseBaseHealthPercent, //282 SPELL_AURA_INCREASE_BASE_HEALTH_PERCENT &Aura::HandleAuraIncreaseBaseHealthPercent, //282 SPELL_AURA_INCREASE_BASE_HEALTH_PERCENT
&Aura::HandleNoImmediateEffect, //283 SPELL_AURA_MOD_HEALING_RECEIVED implemented in Unit::SpellHealingBonus &Aura::HandleNoImmediateEffect, //283 SPELL_AURA_MOD_HEALING_RECEIVED implemented in Unit::SpellHealingBonus
&Aura::HandleAuraLinked, //284 SPELL_AURA_LINKED &Aura::HandleAuraLinked, //284 SPELL_AURA_LINKED 51 spells using
&Aura::HandleAuraModAttackPowerOfArmor, //285 SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR implemented in Player::UpdateAttackPowerAndDamage &Aura::HandleAuraModAttackPowerOfArmor, //285 SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR implemented in Player::UpdateAttackPowerAndDamage
&Aura::HandleNoImmediateEffect, //286 SPELL_AURA_ABILITY_PERIODIC_CRIT implemented in AuraEffect::PeriodicTick &Aura::HandleNoImmediateEffect, //286 SPELL_AURA_ABILITY_PERIODIC_CRIT implemented in AuraEffect::PeriodicTick
&Aura::HandleNoImmediateEffect, //287 SPELL_AURA_DEFLECT_SPELLS implemented in Unit::MagicSpellHitResult and Unit::MeleeSpellHitResult &Aura::HandleNoImmediateEffect, //287 SPELL_AURA_DEFLECT_SPELLS implemented in Unit::MagicSpellHitResult and Unit::MeleeSpellHitResult
@@ -347,7 +347,19 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
&Aura::HandleNoImmediateEffect, //291 SPELL_AURA_MOD_XP_QUEST_PCT implemented in Player::RewardQuest &Aura::HandleNoImmediateEffect, //291 SPELL_AURA_MOD_XP_QUEST_PCT implemented in Player::RewardQuest
&Aura::HandleNULL, //292 call stabled pet &Aura::HandleNULL, //292 call stabled pet
&Aura::HandleNULL, //293 2 test spells &Aura::HandleNULL, //293 2 test spells
&Aura::HandleNoImmediateEffect //294 SPELL_AURA_PREVENT_REGENERATE_POWER implemented in Player::Regenerate(Powers power) &Aura::HandleNoImmediateEffect, //294 SPELL_AURA_PREVENT_REGENERATE_POWER implemented in Player::Regenerate(Powers power)
&Aura::HandleNULL, //295 unused
&Aura::HandleNULL, //296 2 spells
&Aura::HandleNULL, //297 1 spell (counter spell school?)
&Aura::HandleNULL, //298 unused
&Aura::HandleNULL, //299 unused
&Aura::HandleNULL, //300 3 spells (share damage?)
&Aura::HandleNULL, //301 5 spells
&Aura::HandleNULL, //302 unused
&Aura::HandleNULL, //303 17 spells
&Aura::HandleNULL, //304 2 spells (alcohol effect?)
&Aura::HandleAuraModIncreaseSpeed, //305 SPELL_AURA_MOD_MINIMUM_SPEED
&Aura::HandleNULL //306 1 spell
}; };
#undef Aura #undef Aura
@@ -931,6 +943,131 @@ void AuraEffect::CleanupTriggeredSpells()
m_target->RemoveAurasDueToSpell(tSpellId, GetCasterGUID()); m_target->RemoveAurasDueToSpell(tSpellId, GetCasterGUID());
} }
void AuraEffect::HandleSchoolAbsorb(bool apply, bool Real, bool changeAmount)
{
if(!Real)
return;
Unit* caster = GetCaster();
if(!caster)
return;
if (apply)
{
// prevent double apply bonuses
if (m_target->GetTypeId()!=TYPEID_PLAYER || !((Player*)m_target)->GetSession()->PlayerLoading())
{
float DoneActualBenefit = 0.0f;
switch(m_spellProto->SpellFamilyName)
{
case SPELLFAMILY_PRIEST:
// Power Word: Shield
if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000001))
//+80.68% from +spell bonus
DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
break;
case SPELLFAMILY_MAGE:
// Frost Ward, Fire Ward
if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000108))
//+10% from +spell bonus
DoneActualBenefit = caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.1f;
// Ice Barrier
else if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000100000000))
//+80.67% from +spell bonus
DoneActualBenefit = caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8067f;
break;
case SPELLFAMILY_WARLOCK:
// Shadow Ward
if (m_spellProto->SpellIconID == 207)
//+30% from +spell bonus
DoneActualBenefit = caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.30f;
break;
case SPELLFAMILY_PALADIN:
// Sacred Shield
// (check not strictly needed, only Sacred Shield has SPELL_AURA_SCHOOL_ABSORB in SPELLFAMILY_PALADIN at this time)
if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0008000000000000))
{
// +75% from spell power
DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(m_spellProto)) * 0.75f;
}
break;
default:
break;
}
DoneActualBenefit *= caster->CalculateLevelPenalty(GetSpellProto());
m_amount += (int32)DoneActualBenefit;
}
}
else
{
if (caster &&
// Power Word: Shield
m_spellProto->SpellFamilyName == SPELLFAMILY_PRIEST && m_spellProto->Mechanic == MECHANIC_SHIELD &&
(m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000001)) &&
// completely absorbed or dispelled
((m_parentAura->GetRemoveMode() == AURA_REMOVE_BY_DEFAULT && m_amount) || m_parentAura->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE))
{
Unit::AuraEffectList const& vDummyAuras = caster->GetAurasByType(SPELL_AURA_DUMMY);
for(Unit::AuraEffectList::const_iterator itr = vDummyAuras.begin(); itr != vDummyAuras.end(); ++itr)
{
SpellEntry const* vSpell = (*itr)->GetSpellProto();
// Rapture (main spell)
if(vSpell->SpellFamilyName == SPELLFAMILY_PRIEST && vSpell->SpellIconID == 2894 && vSpell->Effect[1])
{
switch((*itr)->m_effIndex)
{
case 0:
{
// energize caster
int32 manapct1000 = 5 * ((*itr)->m_amount + spellmgr.GetSpellRank(vSpell->Id));
int32 basepoints0 = caster->GetMaxPower(POWER_MANA) * manapct1000 / 1000;
caster->CastCustomSpell(caster, 47755, &basepoints0, NULL, NULL, true);
break;
}
case 1:
{
// energize target
if (!roll_chance_i((*itr)->m_amount) || caster->HasAura(63853))
break;
switch(m_target->getPowerType())
{
case POWER_RUNIC_POWER:
m_target->CastSpell(m_target, 63652, true, NULL, NULL, GetCasterGUID());
break;
case POWER_RAGE:
m_target->CastSpell(m_target, 63653, true, NULL, NULL, GetCasterGUID());
break;
case POWER_MANA:
{
int32 basepoints0 = m_target->GetMaxPower(POWER_MANA) * 2 / 100;
m_target->CastCustomSpell(m_target, 63654, &basepoints0, NULL, NULL, true);
break;
}
case POWER_ENERGY:
m_target->CastSpell(m_target, 63655, true, NULL, NULL, GetCasterGUID());
break;
default:
break;
}
//cooldwon aura
caster->CastSpell(caster, 63853, true);
break;
}
default:
sLog.outError("Changes in R-dummy spell???: effect 3");
break;
}
}
}
}
}
}
void Aura::ApplyAllModifiers(bool apply, bool Real) void Aura::ApplyAllModifiers(bool apply, bool Real)
{ {
for (uint8 i = 0; i<MAX_SPELL_EFFECTS; ++i) for (uint8 i = 0; i<MAX_SPELL_EFFECTS; ++i)
@@ -1504,6 +1641,9 @@ void AuraEffect::HandleAuraEffectSpecificMods(bool apply, bool Real, bool change
// Innervate // Innervate
else if (m_spellProto->Id == 29166 && GetAuraName() == SPELL_AURA_PERIODIC_ENERGIZE) else if (m_spellProto->Id == 29166 && GetAuraName() == SPELL_AURA_PERIODIC_ENERGIZE)
m_amount = m_target->GetCreatePowers(POWER_MANA) * m_amount / (GetTotalTicks() * 100.0f); m_amount = m_target->GetCreatePowers(POWER_MANA) * m_amount / (GetTotalTicks() * 100.0f);
// Owlkin Frenzy
else if (m_spellProto->Id == 48391)
m_amount = m_target->GetCreatePowers(POWER_MANA) * 2 / 100;
// Thorns // Thorns
else if (m_spellProto->SpellFamilyFlags[0] & 0x100 && GetAuraName() == SPELL_AURA_DAMAGE_SHIELD) else if (m_spellProto->SpellFamilyFlags[0] & 0x100 && GetAuraName() == SPELL_AURA_DAMAGE_SHIELD)
// 3.3% from sp bonus // 3.3% from sp bonus
@@ -1534,7 +1674,13 @@ void AuraEffect::HandleAuraEffectSpecificMods(bool apply, bool Real, bool change
if (m_spellProto->SpellFamilyFlags[1] & 0x80000 && GetAuraName() == SPELL_AURA_SCHOOL_ABSORB) if (m_spellProto->SpellFamilyFlags[1] & 0x80000 && GetAuraName() == SPELL_AURA_SCHOOL_ABSORB)
{ {
// 0.75 from sp bonus // 0.75 from sp bonus
DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(m_spellProto)) * 0.75f; float koef = 1.0f;
if (caster->HasAura(53527))
koef = 1.1f;
if (caster->HasAura(53530))
koef = 1.2f;
DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(m_spellProto)) * 0.75f * koef;
} }
break; break;
case SPELLFAMILY_SHAMAN: case SPELLFAMILY_SHAMAN:
@@ -1579,26 +1725,6 @@ void AuraEffect::HandleAuraEffectSpecificMods(bool apply, bool Real, bool change
DoneActualBenefit *= caster->CalculateLevelPenalty(GetSpellProto()); DoneActualBenefit *= caster->CalculateLevelPenalty(GetSpellProto());
m_amount += (int32)DoneActualBenefit; m_amount += (int32)DoneActualBenefit;
} }
// we have exact amount now so apply mods affecting all boni
switch (m_spellProto->SpellFamilyName)
{
case SPELLFAMILY_PRIEST:
// Glyph of Power Word: Shield
if (m_spellProto->SpellFamilyFlags[0] & 0x1 && m_spellProto->SpellFamilyFlags[2] & 0x400 &&
GetAuraName() == SPELL_AURA_SCHOOL_ABSORB)
{
if (AuraEffect* glyph = caster->GetAuraEffect(55672,0))
{
// instantly heal m_amount% of the absorb-value
int32 heal = (glyph->GetAmount() * m_amount)/100;
caster->CastCustomSpell(m_target, 56160, &heal, NULL, NULL, true, 0, this);
}
}
break;
default:
break;
}
} }
} }
} }
@@ -2079,8 +2205,10 @@ void AuraEffect::HandleShapeshiftBoosts(bool apply)
case FORM_SHADOW: case FORM_SHADOW:
spellId = 49868; spellId = 49868;
break; break;
case FORM_GHOUL:
case FORM_GHOSTWOLF: case FORM_GHOSTWOLF:
spellId = 67116;
break;
case FORM_GHOUL:
case FORM_AMBIENT: case FORM_AMBIENT:
case FORM_STEALTH: case FORM_STEALTH:
case FORM_CREATURECAT: case FORM_CREATURECAT:
@@ -2287,7 +2415,6 @@ void AuraEffect::HandleAddModifier(bool apply, bool Real, bool changeAmount)
mod->value = m_amount; mod->value = m_amount;
mod->type = SpellModType(m_auraName); // SpellModType value == spell aura types mod->type = SpellModType(m_auraName); // SpellModType value == spell aura types
mod->spellId = GetId(); mod->spellId = GetId();
mod->mask = m_spellProto->EffectSpellClassMask[m_effIndex]; mod->mask = m_spellProto->EffectSpellClassMask[m_effIndex];
mod->charges = GetParentAura()->GetAuraCharges(); mod->charges = GetParentAura()->GetAuraCharges();
@@ -2922,7 +3049,7 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
{ {
if (m_target->GetMap()->IsDungeon()) if (m_target->GetMap()->IsDungeon())
{ {
uint32 spellId = m_target->GetMap()->IsHeroic() ? 46163 : 44190; uint32 spellId = ((InstanceMap*)m_target->GetMap())->GetDifficulty() == REGULAR_DIFFICULTY ? 44190 : 46163;
m_target->CastSpell(m_target, spellId, true, NULL, this); m_target->CastSpell(m_target, spellId, true, NULL, this);
} }
@@ -2959,6 +3086,30 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
return; return;
} }
break; break;
case SPELLFAMILY_PALADIN:
switch (GetSpellProto()->SpellIconID)
{
// Blessing of Sanctuary
// Greater Blessing of Sanctuary
case 19:
case 1804:
{
if (!caster || !m_target)
return;
if (apply)
{
// Greater Blessing of Sanctuary does not provide strength bonus
int32 bp1 = 0;
caster->CastCustomSpell(m_target, 67480, NULL, (GetSpellProto()->SpellIconID == 1804) ? &bp1 : NULL, NULL, true);
}
else
m_target->RemoveAurasDueToSpell(67480);
return;
}
}
break;
case SPELLFAMILY_PRIEST: case SPELLFAMILY_PRIEST:
// Vampiric Touch // Vampiric Touch
if (m_spellProto->SpellFamilyFlags[1] & 0x0400 && GetParentAura()->GetRemoveMode() == AURA_REMOVE_BY_ENEMY_SPELL) if (m_spellProto->SpellFamilyFlags[1] & 0x0400 && GetParentAura()->GetRemoveMode() == AURA_REMOVE_BY_ENEMY_SPELL)
@@ -3371,7 +3522,30 @@ void AuraEffect::HandleAuraFeatherFall(bool apply, bool Real, bool /*changeAmoun
WorldPacket data; WorldPacket data;
if (apply) if (apply)
{
Unit* caster = GetCaster();
if (!caster)
return;
if (caster->GetGUID() == m_target->GetGUID())
{
m_target->RemoveAurasByType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED);
m_target->RemoveAurasByType(SPELL_AURA_FLY);
}
if (GetId() == 61243) // No fly zone - Parachute
{
float x, y, z;
caster->GetPosition(x, y, z);
float ground_Z = caster->GetMap()->GetVmapHeight(x, y, z, true);
if (fabs(ground_Z - z) < 0.1f)
{
m_target->RemoveAura(GetId());
return;
}
}
data.Initialize(SMSG_MOVE_FEATHER_FALL, 8+4); data.Initialize(SMSG_MOVE_FEATHER_FALL, 8+4);
}
else else
data.Initialize(SMSG_MOVE_NORMAL_FALL, 8+4); data.Initialize(SMSG_MOVE_NORMAL_FALL, 8+4);
data.append(m_target->GetPackGUID()); data.append(m_target->GetPackGUID());
@@ -3417,89 +3591,36 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun
switch(form) switch(form)
{ {
case FORM_CAT: case FORM_CAT:
if(Player::TeamForRace(m_target->getRace())==ALLIANCE) case FORM_GHOUL:
modelid = 892;
else
modelid = 8571;
PowerType = POWER_ENERGY; PowerType = POWER_ENERGY;
break; break;
case FORM_TRAVEL:
modelid = 632;
break;
case FORM_AQUA:
if(Player::TeamForRace(m_target->getRace())==ALLIANCE)
modelid = 2428;
else
modelid = 2428;
break;
case FORM_BEAR: case FORM_BEAR:
if(Player::TeamForRace(m_target->getRace())==ALLIANCE)
modelid = 2281;
else
modelid = 2289;
PowerType = POWER_RAGE;
break;
case FORM_GHOUL:
modelid = 24994;
PowerType = POWER_ENERGY;
break;
case FORM_DIREBEAR: case FORM_DIREBEAR:
if(Player::TeamForRace(m_target->getRace())==ALLIANCE)
modelid = 2281;
else
modelid = 2289;
PowerType = POWER_RAGE;
break;
case FORM_CREATUREBEAR:
modelid = 902;
break;
case FORM_GHOSTWOLF:
modelid = 4613;
break;
case FORM_FLIGHT:
if(Player::TeamForRace(m_target->getRace())==ALLIANCE)
modelid = 20857;
else
modelid = 20872;
break;
case FORM_MOONKIN:
if(Player::TeamForRace(m_target->getRace())==ALLIANCE)
modelid = 15374;
else
modelid = 15375;
break;
case FORM_FLIGHT_EPIC:
if(Player::TeamForRace(m_target->getRace())==ALLIANCE)
modelid = 21243;
else
modelid = 21244;
break;
case FORM_MASTER_ANGLER:
modelid = 15234;
break;
case FORM_METAMORPHOSIS:
modelid = 25277;
break;
case FORM_AMBIENT:
case FORM_SHADOW:
case FORM_STEALTH:
case FORM_UNDEAD:
case FORM_SHADOW_DANCE:
break;
case FORM_TREE:
modelid = 864;
break;
case FORM_BATTLESTANCE: case FORM_BATTLESTANCE:
case FORM_BERSERKERSTANCE: case FORM_BERSERKERSTANCE:
case FORM_DEFENSIVESTANCE: case FORM_DEFENSIVESTANCE:
PowerType = POWER_RAGE; PowerType = POWER_RAGE;
break; break;
case FORM_TRAVEL:
case FORM_AQUA:
case FORM_CREATUREBEAR:
case FORM_GHOSTWOLF:
case FORM_FLIGHT:
case FORM_MOONKIN:
case FORM_FLIGHT_EPIC:
case FORM_METAMORPHOSIS:
case FORM_AMBIENT:
case FORM_SHADOW:
case FORM_STEALTH:
case FORM_UNDEAD:
case FORM_SHADOW_DANCE:
case FORM_TREE:
case FORM_SPIRITOFREDEMPTION: case FORM_SPIRITOFREDEMPTION:
modelid = 16031;
break; break;
default: default:
sLog.outError("Auras: Unknown Shapeshift Type: %u", GetMiscValue()); sLog.outError("Auras: Unknown Shapeshift Type: %u", GetMiscValue());
} }
modelid = m_target->GetModelForForm(form);
// remove polymorph before changing display id to keep new display id // remove polymorph before changing display id to keep new display id
switch ( form ) switch ( form )
@@ -3566,7 +3687,10 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun
case FORM_BEAR: case FORM_BEAR:
case FORM_DIREBEAR: case FORM_DIREBEAR:
if (urand(0,99) < FurorChance) if (urand(0,99) < FurorChance)
m_target->CastSpell(m_target, 17057, true); {
int32 basePoints = 100; // Not sure if 100 is correct basePoints, maybe it should be 10?
m_target->CastCustomSpell(m_target, 17057, &basePoints, NULL, NULL, true, NULL, this);
}
default: default:
{ {
uint32 newEnergy = std::min(m_target->GetPower(POWER_ENERGY), FurorChance); uint32 newEnergy = std::min(m_target->GetPower(POWER_ENERGY), FurorChance);
@@ -4632,21 +4756,26 @@ void AuraEffect::HandleAuraModStalked(bool apply, bool Real, bool /*changeAmount
void AuraEffect::HandlePeriodicTriggerSpell(bool apply, bool Real, bool /*changeAmount*/) void AuraEffect::HandlePeriodicTriggerSpell(bool apply, bool Real, bool /*changeAmount*/)
{ {
m_isPeriodic = apply; m_isPeriodic = apply;
if (!apply)
{
switch(m_spellProto->Id)
{
case 66: // Invisibility
m_target->CastSpell(m_target, 32612, true, NULL, this);
return;
case 42783: //Wrath of the Astrom...
m_target->CastSpell(m_target, m_spellProto->CalculateSimpleValue(GetEffIndex()+1), true);
return;
default:
break;
}
}
} }
void AuraEffect::HandlePeriodicTriggerSpellWithValue(bool apply, bool Real, bool /*changeAmount*/) void AuraEffect::HandlePeriodicTriggerSpellWithValue(bool apply, bool Real, bool /*changeAmount*/)
{ {
m_isPeriodic = apply; m_isPeriodic = apply;
SpellEntry const* spell = GetSpellProto();
switch (spell->Id)
{
case 58730: // No fly zone - Wintergrasp (3.1.3 only 3.2.2 Does not call this aura)
if (apply)
if (m_target->GetTypeId() == TYPEID_PLAYER)
((Player *)m_target)->GetSession()->SendNotification(LANG_ZONE_NOFLYZONE);
break;
}
} }
void AuraEffect::HandlePeriodicEnergize(bool apply, bool Real, bool changeAmount) void AuraEffect::HandlePeriodicEnergize(bool apply, bool Real, bool changeAmount)
@@ -4672,26 +4801,18 @@ void AuraEffect::HandleAuraPeriodicDummy(bool apply, bool Real, bool changeAmoun
{ {
case SPELLFAMILY_GENERIC: case SPELLFAMILY_GENERIC:
{ {
switch(spell->Id) if(spell->Id == 62399) // Overload Circuit
{ {
case 62399: // Overload Circuit if(m_target->GetMap()->IsDungeon())
if(m_target->GetMap()->IsDungeon() && m_target->GetAuras().count(62399) >= (m_target->GetMap()->IsHeroic() ? 4 : 2)) if(m_target->GetAuras().count(62399) >= (((InstanceMap*)m_target->GetMap())->GetDifficulty() == REGULAR_DIFFICULTY ? 2 : 4))
{ {
m_target->CastSpell(m_target, 62475, true); // System Shutdown m_target->CastSpell(m_target, 62475, true); // System Shutdown
if(Unit *veh = m_target->GetVehicleBase()) if(Unit *veh = m_target->GetVehicleBase())
veh->CastSpell(m_target, 62475, true); veh->CastSpell(m_target, 62475, true);
} }
break;
case 58600: // No fly zone - Dalaran
if (apply && m_target->GetTypeId() == TYPEID_PLAYER)
((Player *)m_target)->GetSession()->SendNotification(LANG_ZONE_NOFLYZONE);
break;
default:
break;
} }
break; break;
} }
case SPELLFAMILY_WARLOCK: case SPELLFAMILY_WARLOCK:
{ {
switch (spell->Id) switch (spell->Id)
@@ -4709,7 +4830,6 @@ void AuraEffect::HandleAuraPeriodicDummy(bool apply, bool Real, bool changeAmoun
} }
break; break;
} }
break;
} }
case SPELLFAMILY_DEATHKNIGHT: case SPELLFAMILY_DEATHKNIGHT:
{ {
@@ -5935,10 +6055,9 @@ void AuraEffect::PeriodicTick()
if (crit) if (crit)
pdamage = pCaster->SpellCriticalDamageBonus(m_spellProto, pdamage, m_target); pdamage = pCaster->SpellCriticalDamageBonus(m_spellProto, pdamage, m_target);
//As of 2.2 resilience reduces damage from DoT ticks as much as the chance to not be critically hit // Reduce dot damage from resilience for players.
// Reduce dot damage from resilience for players
if (m_target->GetTypeId() == TYPEID_PLAYER) if (m_target->GetTypeId() == TYPEID_PLAYER)
pdamage-=((Player*)m_target)->GetDotDamageReduction(pdamage); pdamage-=((Player*)m_target)->GetSpellDamageReduction(pdamage);
pCaster->CalcAbsorbResist(m_target, GetSpellSchoolMask(GetSpellProto()), DOT, pdamage, &absorb, &resist, m_spellProto); pCaster->CalcAbsorbResist(m_target, GetSpellSchoolMask(GetSpellProto()), DOT, pdamage, &absorb, &resist, m_spellProto);
@@ -6007,10 +6126,9 @@ void AuraEffect::PeriodicTick()
pdamage = pdamageReductedArmor; pdamage = pdamageReductedArmor;
} }
//As of 2.2 resilience reduces damage from DoT ticks as much as the chance to not be critically hit // Reduce dot damage from resilience for players.
// Reduce dot damage from resilience for players
if (m_target->GetTypeId() == TYPEID_PLAYER) if (m_target->GetTypeId() == TYPEID_PLAYER)
pdamage-=((Player*)m_target)->GetDotDamageReduction(pdamage); pdamage-=((Player*)m_target)->GetSpellDamageReduction(pdamage);
pCaster->CalcAbsorbResist(m_target, GetSpellSchoolMask(GetSpellProto()), DOT, pdamage, &absorb, &resist, m_spellProto); pCaster->CalcAbsorbResist(m_target, GetSpellSchoolMask(GetSpellProto()), DOT, pdamage, &absorb, &resist, m_spellProto);
@@ -6566,24 +6684,6 @@ void AuraEffect::PeriodicDummyTick()
// 7053 Forsaken Skill: Shadow // 7053 Forsaken Skill: Shadow
return; return;
} }
case 45472: // Parachute
if (m_target->GetTypeId() == TYPEID_PLAYER)
{
Player *plr = (Player*)m_target;
if (plr->IsFalling())
{
plr->RemoveAurasDueToSpell(45472);
plr->CastSpell(plr, 44795, true);
}
}
break;
case 58600: // No fly Zone - Dalaran
if (10 == m_tickNumber)
{
m_target->RemoveAurasByType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED);
m_target->RemoveAurasByType(SPELL_AURA_FLY);
}
break;
case 58549: // Tenacity case 58549: // Tenacity
case 59911: // Tenacity (vehicle) case 59911: // Tenacity (vehicle)
GetParentAura()->RefreshAura(); GetParentAura()->RefreshAura();
src/game/SpellAuras.h
+1
View File
@@ -321,6 +321,7 @@ class TRINITY_DLL_SPEC AuraEffect
void HandleForceMoveForward(bool apply, bool Real, bool changeAmount); void HandleForceMoveForward(bool apply, bool Real, bool changeAmount);
void HandleAuraModResistenceOfStatPercent(bool apply, bool Real, bool changeAmount); void HandleAuraModResistenceOfStatPercent(bool apply, bool Real, bool changeAmount);
void HandleAuraPowerBurn(bool apply, bool Real, bool changeAmount); void HandleAuraPowerBurn(bool apply, bool Real, bool changeAmount);
void HandleSchoolAbsorb(bool apply, bool Real, bool changeAmount);
void HandlePreventFleeing(bool apply, bool Real, bool changeAmount); void HandlePreventFleeing(bool apply, bool Real, bool changeAmount);
void HandleArenaPreparation(bool apply, bool Real, bool changeAmount); void HandleArenaPreparation(bool apply, bool Real, bool changeAmount);
void HandleAuraConvertRune(bool apply, bool Real, bool changeAmount); void HandleAuraConvertRune(bool apply, bool Real, bool changeAmount);
src/game/SpellEffects.cpp
+227 -250
View File
@@ -161,7 +161,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
&Spell::EffectSelfResurrect, // 94 SPELL_EFFECT_SELF_RESURRECT &Spell::EffectSelfResurrect, // 94 SPELL_EFFECT_SELF_RESURRECT
&Spell::EffectSkinning, // 95 SPELL_EFFECT_SKINNING &Spell::EffectSkinning, // 95 SPELL_EFFECT_SKINNING
&Spell::EffectCharge, // 96 SPELL_EFFECT_CHARGE &Spell::EffectCharge, // 96 SPELL_EFFECT_CHARGE
&Spell::EffectUnused, // 97 SPELL_EFFECT_97 &Spell::EffectCastButtons, // 97 SPELL_EFFECT_CAST_BUTTON (totem bar since 3.2.2a)
&Spell::EffectKnockBack, // 98 SPELL_EFFECT_KNOCK_BACK &Spell::EffectKnockBack, // 98 SPELL_EFFECT_KNOCK_BACK
&Spell::EffectDisEnchant, // 99 SPELL_EFFECT_DISENCHANT &Spell::EffectDisEnchant, // 99 SPELL_EFFECT_DISENCHANT
&Spell::EffectInebriate, //100 SPELL_EFFECT_INEBRIATE &Spell::EffectInebriate, //100 SPELL_EFFECT_INEBRIATE
@@ -377,7 +377,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
break; break;
// Consumption // Consumption
case 28865: case 28865:
damage = (m_caster->GetMap()->IsHeroic() ? 4250 : 2750); damage = (((InstanceMap*)m_caster->GetMap())->GetDifficulty() == REGULAR_DIFFICULTY ? 2750 : 4250);
break; break;
// percent from health with min // percent from health with min
case 25599: // Thundercrash case 25599: // Thundercrash
@@ -420,8 +420,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
damage = unitTarget->GetMaxHealth() / 10; damage = unitTarget->GetMaxHealth() / 10;
break; break;
} }
// Gargoyle Strike case 51963: // Gargoyle Strike
case 51963:
{ {
// about +4 base spell dmg per level // about +4 base spell dmg per level
damage = (m_caster->getLevel() - 60) * 4 + 60; damage = (m_caster->getLevel() - 60) * 4 + 60;
@@ -535,7 +534,23 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
if (unitTarget->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x100000, 0, 0, m_caster->GetGUID())) if (unitTarget->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x100000, 0, 0, m_caster->GetGUID()))
damage += damage * aurEff->GetAmount() / 100; damage += damage * aurEff->GetAmount() / 100;
} }
// Improved Mind Blast (Mind Blast in shadow form bonus)
else if (m_caster->m_form == FORM_SHADOW && (m_spellInfo->SpellFamilyFlags[0] & 0x00002000))
{
Unit::AuraEffectList const& ImprMindBlast = m_caster->GetAurasByType(SPELL_AURA_ADD_FLAT_MODIFIER);
for(Unit::AuraEffectList::const_iterator i = ImprMindBlast.begin(); i != ImprMindBlast.end(); ++i)
{
if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_PRIEST &&
((*i)->GetSpellProto()->SpellIconID == 95))
{
int chance = (*i)->GetSpellProto()->CalculateSimpleValue(1);
if (roll_chance_i(chance))
// Mind Trauma
m_caster->CastSpell(unitTarget, 48301, true, 0);
break;
}
}
}
break; break;
} }
case SPELLFAMILY_DRUID: case SPELLFAMILY_DRUID:
@@ -687,7 +702,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
damage += int32(0.25f*ap + 0.4f*sp); damage += int32(0.25f*ap + 0.4f*sp);
} }
// Judgement of Wisdom, Light, Justice // Judgement of Wisdom, Light, Justice
else if (m_spellInfo->SpellFamilyFlags[0] & 0x00800000 && m_spellInfo->Id != 31804 && m_spellInfo->Id != 53733) else if(m_spellInfo->Id == 54158)
{ {
float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK); float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK);
float sp = m_caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellInfo)); float sp = m_caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellInfo));
@@ -850,6 +865,22 @@ void Spell::EffectDummy(uint32 i)
m_caster->CastSpell(unitTarget,spell_id,true,NULL); m_caster->CastSpell(unitTarget,spell_id,true,NULL);
return; return;
} }
case 67019: // Flask of the North
{
if (m_caster->GetTypeId() != TYPEID_PLAYER)
return;
uint32 spell_id;
switch(urand(1, 3))
{
case 1: spell_id = 67016; break;
case 2: spell_id = 67017; break;
default:spell_id = 67018; break;
}
m_caster->CastSpell(m_caster, spell_id, true, NULL);
return;
}
case 13280: // Gnomish Death Ray case 13280: // Gnomish Death Ray
{ {
if (!unitTarget) if (!unitTarget)
@@ -945,10 +976,6 @@ void Spell::EffectDummy(uint32 i)
creatureTarget->ForcedDespawn(); creatureTarget->ForcedDespawn();
WorldPacket data(SMSG_GAMEOBJECT_SPAWN_ANIM_OBSOLETE, 8);
data << uint64(Crystal_Prison->GetGUID());
m_caster->SendMessageToSet(&data, true);
return; return;
} }
case 23074: // Arcanite Dragonling case 23074: // Arcanite Dragonling
@@ -1354,13 +1381,6 @@ void Spell::EffectDummy(uint32 i)
case 58418: // Portal to Orgrimmar case 58418: // Portal to Orgrimmar
case 58420: // Portal to Stormwind case 58420: // Portal to Stormwind
return; // implemented in EffectScript[0] return; // implemented in EffectScript[0]
case 58601:
if (Player *plr = (Player*)unitTarget)
{
plr->RemoveAurasByType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED);
plr->RemoveAurasByType(SPELL_AURA_FLY);
}
break;
case 59640: // Underbelly Elixir case 59640: // Underbelly Elixir
{ {
if(m_caster->GetTypeId() != TYPEID_PLAYER) if(m_caster->GetTypeId() != TYPEID_PLAYER)
@@ -1426,29 +1446,6 @@ void Spell::EffectDummy(uint32 i)
} }
} }
//All IconID Check in there
switch(m_spellInfo->SpellIconID)
{
// Berserking (troll racial traits)
case 1661:
{
uint32 healthPerc = uint32((float(m_caster->GetHealth())/m_caster->GetMaxHealth())*100);
int32 melee_mod = 10;
if (healthPerc <= 40)
melee_mod = 30;
if (healthPerc < 100 && healthPerc > 40)
melee_mod = 10+(100-healthPerc)/3;
int32 hasteModBasePoints0 = melee_mod; // (EffectBasePoints[0]+1)-1+(5-melee_mod) = (melee_mod-1+1)-1+5-melee_mod = 5-1
int32 hasteModBasePoints1 = (5-melee_mod);
int32 hasteModBasePoints2 = 5;
// FIXME: custom spell required this aura state by some unknown reason, we not need remove it anyway
m_caster->ModifyAuraState(AURA_STATE_BERSERKING,true);
m_caster->CastCustomSpell(m_caster, 26635, &hasteModBasePoints0, &hasteModBasePoints1, &hasteModBasePoints2, true, NULL);
return;
}
}
break; break;
} }
case SPELLFAMILY_MAGE: case SPELLFAMILY_MAGE:
@@ -1501,6 +1498,10 @@ void Spell::EffectDummy(uint32 i)
{ {
int32 chargeBasePoints0 = damage; int32 chargeBasePoints0 = damage;
m_caster->CastCustomSpell(m_caster, 34846, &chargeBasePoints0, NULL, NULL, true); m_caster->CastCustomSpell(m_caster, 34846, &chargeBasePoints0, NULL, NULL, true);
//Juggernaut crit bonus
if(m_caster->HasAura(64976))
m_caster->CastSpell(m_caster, 65156, true);
return; return;
} }
//Slam //Slam
@@ -1533,8 +1534,8 @@ void Spell::EffectDummy(uint32 i)
} }
else else
{ {
rage += m_caster->GetPower(POWER_RAGE); rage += m_powerCost;
m_caster->SetPower(POWER_RAGE,0); m_caster->ModifyPower(POWER_RAGE,- m_powerCost);
} }
bp = damage+int32(rage * m_spellInfo->DmgMultiplier[i] + bp = damage+int32(rage * m_spellInfo->DmgMultiplier[i] +
@@ -1629,8 +1630,8 @@ void Spell::EffectDummy(uint32 i)
if (!unitTarget || !unitTarget->isAlive()) if (!unitTarget || !unitTarget->isAlive())
return; return;
uint32 hurt = 0; int hurt = 0;
uint32 heal = 0; int heal = 0;
switch(m_spellInfo->Id) switch(m_spellInfo->Id)
{ {
case 47540: hurt = 47758; heal = 47757; break; case 47540: hurt = 47758; heal = 47757; break;
@@ -1697,7 +1698,7 @@ void Spell::EffectDummy(uint32 i)
if(!pEnchant) if(!pEnchant)
return; return;
for (uint8 s = 0; s < 3; ++s) for (int s=0; s<3; s++)
{ {
if(pEnchant->type[s]!=ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL) if(pEnchant->type[s]!=ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL)
continue; continue;
@@ -1742,10 +1743,17 @@ void Spell::EffectDummy(uint32 i)
{ {
case 781: // Disengage case 781: // Disengage
{ {
if (m_caster->GetTypeId() != TYPEID_PLAYER || !m_caster->isInCombat()) // Does not require a target, but m_caster must be in combat (3.0.3?) if (m_caster->GetTypeId() != TYPEID_PLAYER)
return; return;
m_caster->JumpTo(15.0f, 7.0f, false); WorldPacket data(SMSG_MOVE_KNOCK_BACK, 50);
data.append(m_caster->GetPackGUID());
data << getMSTime();
data << float(cosf(m_caster->GetOrientation()+M_PI));
data << float(sinf(m_caster->GetOrientation()+M_PI));
data << float(15);
data << float(-7.0f);
((Player*)m_caster)->GetSession()->SendPacket(&data);
return; return;
} }
case 23989: // Readiness talent case 23989: // Readiness talent
@@ -1759,7 +1767,7 @@ void Spell::EffectDummy(uint32 i)
{ {
SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first); SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
if (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && spellInfo->Id != 23989 && GetSpellRecoveryTime(spellInfo) > 0) if (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && spellInfo->Id != 23989 && spellInfo->Id != 19574 && GetSpellRecoveryTime(spellInfo) > 0 )
((Player*)m_caster)->RemoveSpellCooldown((itr++)->first,true); ((Player*)m_caster)->RemoveSpellCooldown((itr++)->first,true);
else else
++itr; ++itr;
@@ -1812,8 +1820,8 @@ void Spell::EffectDummy(uint32 i)
if (!unitTarget) if (!unitTarget)
return; return;
uint32 hurt = 0; int hurt = 0;
uint32 heal = 0; int heal = 0;
switch(m_spellInfo->Id) switch(m_spellInfo->Id)
{ {
@@ -1825,7 +1833,7 @@ void Spell::EffectDummy(uint32 i)
case 48824: hurt = 48822; heal = 48820; break; case 48824: hurt = 48822; heal = 48820; break;
case 48825: hurt = 48823; heal = 48821; break; case 48825: hurt = 48823; heal = 48821; break;
default: default:
sLog.outError("Spell::EffectDummy: Spell %u not handled in Holy Shock",m_spellInfo->Id); sLog.outError("Spell::EffectDummy: Spell %u not handled in HS",m_spellInfo->Id);
return; return;
} }
@@ -1858,12 +1866,25 @@ void Spell::EffectDummy(uint32 i)
} }
case 31789: // Righteous Defense (step 1) case 31789: // Righteous Defense (step 1)
{ {
if (m_caster->GetTypeId() != TYPEID_PLAYER)
{
SendCastResult(SPELL_FAILED_TARGET_AFFECTING_COMBAT);
return;
}
// 31989 -> dummy effect (step 1) + dummy effect (step 2) -> 31709 (taunt like spell for each target) // 31989 -> dummy effect (step 1) + dummy effect (step 2) -> 31709 (taunt like spell for each target)
// non-standard cast requirement check Unit* friendTarget = !unitTarget || unitTarget->IsFriendlyTo(m_caster) ? unitTarget : unitTarget->getVictim();
if (!unitTarget || unitTarget->getAttackers().empty()) if (friendTarget)
{
Player* player = friendTarget->GetCharmerOrOwnerPlayerOrPlayerItself();
if (!player || !player->IsInSameRaidWith((Player*)m_caster))
friendTarget = NULL;
}
// non-standard cast requirement check
if (!friendTarget || friendTarget->getAttackers().empty())
{ {
if (m_caster->GetTypeId() == TYPEID_PLAYER)
((Player*)m_caster)->RemoveSpellCooldown(m_spellInfo->Id,true); ((Player*)m_caster)->RemoveSpellCooldown(m_spellInfo->Id,true);
SendCastResult(SPELL_FAILED_TARGET_AFFECTING_COMBAT); SendCastResult(SPELL_FAILED_TARGET_AFFECTING_COMBAT);
return; return;
@@ -1874,18 +1895,16 @@ void Spell::EffectDummy(uint32 i)
for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
ihit->effectMask &= ~(1<<1); ihit->effectMask &= ~(1<<1);
// not empty (checked) // not empty (checked), copy
Unit::AttackerSet const& attackers = unitTarget->getAttackers(); Unit::AttackerSet attackers = friendTarget->getAttackers();
// chance to be selected from list // selected from list 3
float chance = 100.0f / attackers.size(); for(int i = 0; i < std::min(size_t(3),attackers.size()); ++i)
uint32 count = 0;
for (Unit::AttackerSet::const_iterator aItr = attackers.begin(); aItr != attackers.end() && count < 3; ++aItr)
{ {
if (!roll_chance_f(chance)) Unit::AttackerSet::iterator aItr = attackers.begin();
continue; std::advance(aItr, rand() % attackers.size());
++count;
AddUnitTarget((*aItr), 1); AddUnitTarget((*aItr), 1);
attackers.erase(aItr);
} }
// now let next effect cast spell at each target. // now let next effect cast spell at each target.
@@ -1912,55 +1931,6 @@ void Spell::EffectDummy(uint32 i)
} }
break; break;
case SPELLFAMILY_SHAMAN: case SPELLFAMILY_SHAMAN:
// Rockbiter Weapon
if (m_spellInfo->SpellFamilyFlags[0] & 0x400000)
{
// TODO: use expect spell for enchant (if exist talent)
// In 3.0.3 no mods present for rockbiter
uint32 spell_id = 0;
switch (m_spellInfo->Id)
{
case 8017: spell_id = 36494; break; // Rank 1
case 8018: spell_id = 36750; break; // Rank 2
case 8019: spell_id = 36755; break; // Rank 3
case 10399: spell_id = 36759; break; // Rank 4
default:
sLog.outError("Spell::EffectDummy: Spell %u not handled in RW", m_spellInfo->Id);
return;
}
SpellEntry const *spellInfo = sSpellStore.LookupEntry( spell_id );
if (!spellInfo)
{
sLog.outError("WORLD: unknown spell id %i", spell_id);
return;
}
if (m_caster->GetTypeId() != TYPEID_PLAYER)
return;
for (uint8 j = BASE_ATTACK; j <= OFF_ATTACK; ++j)
{
if (Item* item = ((Player*)m_caster)->GetWeaponForAttack(WeaponAttackType(j)))
{
if (item->IsFitToSpellRequirements(m_spellInfo))
{
Spell *spell = new Spell(m_caster, spellInfo, true);
// enchanting spell selected by calculated damage-per-sec in enchanting effect
// at calculation applied affect from Elemental Weapons talent
// real enchantment damage-1
spell->m_currentBasePoints[1] = damage-1;
SpellCastTargets targets;
targets.setItemTarget(item);
spell->prepare(&targets);
}
}
}
return;
}
// Cleansing Totem Pulse // Cleansing Totem Pulse
if (m_spellInfo->SpellFamilyFlags[0] & 0x04000000 && m_spellInfo->SpellIconID==1673) if (m_spellInfo->SpellFamilyFlags[0] & 0x04000000 && m_spellInfo->SpellIconID==1673)
{ {
@@ -2817,19 +2787,6 @@ void Spell::SpellDamageHeal(uint32 /*i*/)
//addhealth += tickheal * tickcount; //addhealth += tickheal * tickcount;
//addhealth = caster->SpellHealingBonus(m_spellInfo, addhealth,HEAL, unitTarget); //addhealth = caster->SpellHealingBonus(m_spellInfo, addhealth,HEAL, unitTarget);
} }
// Glyph of Nourish
else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[1] & 0x2000000)
{
addhealth = caster->SpellHealingBonus(unitTarget, m_spellInfo, addhealth, HEAL);
Unit::AuraEffectList const& Periodic = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_HEAL);
for (Unit::AuraEffectList::const_iterator i = Periodic.begin(); i != Periodic.end(); ++i)
{
if (m_caster->HasAura(62971))
if (m_caster->GetGUID() == (*i)->GetCasterGUID())
addhealth += addhealth * (*i)->GetParentAura()->GetStackAmount() * 0.06f;
}
}
// Riptide - increase healing done by Chain Heal // Riptide - increase healing done by Chain Heal
else if (m_spellInfo->SpellFamilyName==SPELLFAMILY_SHAMAN && m_spellInfo->SpellFamilyFlags[0] & 0x100) else if (m_spellInfo->SpellFamilyName==SPELLFAMILY_SHAMAN && m_spellInfo->SpellFamilyFlags[0] & 0x100)
{ {
@@ -3375,6 +3332,7 @@ void Spell::EffectOpenLock(uint32 effIndex)
return; return;
} }
} }
// TODO: Add script for spell 41920 - Filling, becouse server it freze when use this spell
// handle outdoor pvp object opening, return true if go was registered for handling // handle outdoor pvp object opening, return true if go was registered for handling
// these objects must have been spawned by outdoorpvp! // these objects must have been spawned by outdoorpvp!
else if(gameObjTarget->GetGOInfo()->type == GAMEOBJECT_TYPE_GOOBER && sOutdoorPvPMgr.HandleOpenGo(player, gameObjTarget->GetGUID())) else if(gameObjTarget->GetGOInfo()->type == GAMEOBJECT_TYPE_GOOBER && sOutdoorPvPMgr.HandleOpenGo(player, gameObjTarget->GetGUID()))
@@ -4109,65 +4067,62 @@ void Spell::EffectEnchantItemTmp(uint32 i)
Player* p_caster = (Player*)m_caster; Player* p_caster = (Player*)m_caster;
// Rockbiter Weapon apply to both weapon
if (!itemTarget)
return;
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->SpellFamilyFlags[0] & 0x400000)
{
uint32 spell_id = 0;
// enchanting spell selected by calculated damage-per-sec stored in Effect[1] base value
// Note: damage calculated (correctly) with rounding int32(float(v)) but
// RW enchantments applied damage int32(float(v)+0.5), this create 0..1 difference sometime
switch(damage)
{
// Rank 1
case 2: spell_id = 36744; break; // 0% [ 7% == 2, 14% == 2, 20% == 2]
// Rank 2
case 4: spell_id = 36753; break; // 0% [ 7% == 4, 14% == 4]
case 5: spell_id = 36751; break; // 20%
// Rank 3
case 6: spell_id = 36754; break; // 0% [ 7% == 6, 14% == 6]
case 7: spell_id = 36755; break; // 20%
// Rank 4
case 9: spell_id = 36761; break; // 0% [ 7% == 6]
case 10: spell_id = 36758; break; // 14%
case 11: spell_id = 36760; break; // 20%
default:
sLog.outError("Spell::EffectEnchantItemTmp: Damage %u not handled in S'RW",damage);
return;
}
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
if (!spellInfo)
{
sLog.outError("Spell::EffectEnchantItemTmp: unknown spell id %i", spell_id);
return;
}
for(int j = BASE_ATTACK; j <= OFF_ATTACK; ++j)
{
if (Item* item = p_caster->GetWeaponForAttack(WeaponAttackType(j)))
{
if (item->IsFitToSpellRequirements(m_spellInfo))
{
Spell *spell = new Spell(m_caster, spellInfo, true);
SpellCastTargets targets;
targets.setItemTarget( item );
spell->prepare(&targets);
}
}
}
return;
}
if (!itemTarget) if (!itemTarget)
return; return;
uint32 enchant_id = m_spellInfo->EffectMiscValue[i]; uint32 enchant_id = m_spellInfo->EffectMiscValue[i];
// Shaman Rockbiter Weapon
if (i == 0 && m_spellInfo->Effect[1] == SPELL_EFFECT_DUMMY)
{
int32 enchnting_damage = CalculateDamage(1, NULL);//+1;
// enchanting id selected by calculated damage-per-sec stored in Effect[1] base value
// with already applied percent bonus from Elemental Weapons talent
// Note: damage calculated (correctly) with rounding int32(float(v)) but
// RW enchantments applied damage int32(float(v)+0.5), this create 0..1 difference sometime
switch (enchnting_damage)
{
// Rank 1
case 2: enchant_id = 29; break; // 0% [ 7% == 2, 14% == 2, 20% == 2]
// Rank 2
case 4: enchant_id = 6; break; // 0% [ 7% == 4, 14% == 4]
case 5: enchant_id = 3025; break; // 20%
// Rank 3
case 6: enchant_id = 1; break; // 0% [ 7% == 6, 14% == 6]
case 7: enchant_id = 3027; break; // 20%
// Rank 4
case 9: enchant_id = 3032; break; // 0% [ 7% == 6]
case 10: enchant_id = 503; break; // 14%
case 11: enchant_id = 3031; break; // 20%
// Rank 5
case 15: enchant_id = 3035; break; // 0%
case 16: enchant_id = 1663; break; // 7%
case 17: enchant_id = 3033; break; // 14%
case 18: enchant_id = 3034; break; // 20%
// Rank 6
case 28: enchant_id = 3038; break; // 0%
case 29: enchant_id = 683; break; // 7%
case 31: enchant_id = 3036; break; // 14%
case 33: enchant_id = 3037; break; // 20%
// Rank 7
case 40: enchant_id = 3041; break; // 0%
case 42: enchant_id = 1664; break; // 7%
case 45: enchant_id = 3039; break; // 14%
case 48: enchant_id = 3040; break; // 20%
// Rank 8
case 49: enchant_id = 3044; break; // 0%
case 52: enchant_id = 2632; break; // 7%
case 55: enchant_id = 3042; break; // 14%
case 58: enchant_id = 3043; break; // 20%
// Rank 9
case 62: enchant_id = 2633; break; // 0%
case 66: enchant_id = 3018; break; // 7%
case 70: enchant_id = 3019; break; // 14%
case 74: enchant_id = 3020; break; // 20%
default:
sLog.outError("Spell::EffectEnchantItemTmp: Damage %u not handled in S'RW",enchnting_damage);
return;
}
}
if (!enchant_id) if (!enchant_id)
{ {
sLog.outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have 0 as enchanting id",m_spellInfo->Id,i); sLog.outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have 0 as enchanting id",m_spellInfo->Id,i);
@@ -4400,6 +4355,13 @@ void Spell::EffectTaunt(uint32 /*i*/)
return; return;
} }
if (m_spellInfo->Id == 62124)
{
int32 damageDone = 1 + m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.5f;
m_caster->DealDamage(unitTarget, damageDone, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_HOLY, m_spellInfo, false);
m_caster->SendSpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, damageDone, SPELL_SCHOOL_MASK_HOLY, 0, 0, false, false, false);
}
// Also use this effect to set the taunter's threat to the taunted creature's highest value // Also use this effect to set the taunter's threat to the taunted creature's highest value
if (unitTarget->getThreatManager().getCurrentVictim()) if (unitTarget->getThreatManager().getCurrentVictim())
{ {
@@ -4581,15 +4543,6 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
else else
m_caster->CastCustomSpell(m_caster, 53725, &damagePoint, NULL, NULL, true); m_caster->CastCustomSpell(m_caster, 53725, &damagePoint, NULL, NULL, true);
} }
// Seal of Blood/of the Martyr backlash damage (10%)
else if (m_spellInfo->SpellIconID==2293)
{
int32 damagePoint = m_damage * 10 / 100;
if(m_spellInfo->Id == 31893)
m_caster->CastCustomSpell(m_caster, 32221, &damagePoint, NULL, NULL, true);
else
m_caster->CastCustomSpell(m_caster, 53718, &damagePoint, NULL, NULL, true);
}
} }
case SPELLFAMILY_SHAMAN: case SPELLFAMILY_SHAMAN:
{ {
@@ -4674,8 +4627,8 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
} }
bool normalized = false; bool normalized = false;
float weaponDamagePercentMod = 1.0f; float weaponDamagePercentMod = 1.0;
for (uint8 j = 0; j < 3; ++j) for (int j = 0; j < 3; ++j)
{ {
switch(m_spellInfo->Effect[j]) switch(m_spellInfo->Effect[j])
{ {
@@ -4720,7 +4673,7 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
int32 weaponDamage = m_caster->CalculateDamage(m_attackType, normalized, true); int32 weaponDamage = m_caster->CalculateDamage(m_attackType, normalized, true);
// Sequence is important // Sequence is important
for (uint8 j = 0; j < 3; ++j) for (int j = 0; j < 3; ++j)
{ {
// We assume that a spell have at most one fixed_bonus // We assume that a spell have at most one fixed_bonus
// and at most one weaponDamagePercentMod // and at most one weaponDamagePercentMod
@@ -5218,8 +5171,14 @@ void Spell::EffectScriptEffect(uint32 effIndex)
{ {
case 75: unitTarget->CastSpell(unitTarget, 51621, true); break;; case 75: unitTarget->CastSpell(unitTarget, 51621, true); break;;
case 150: unitTarget->CastSpell(unitTarget, 48024, true); break; case 150: unitTarget->CastSpell(unitTarget, 48024, true); break;
case 225: unitTarget->CastSpell(unitTarget, 51617, true); break; case 225:
case 300: unitTarget->CastSpell(unitTarget, 48023, true); break; if(((Player*)unitTarget)->GetMapId()==571 || ((Player*)unitTarget)->GetMapId()==530)
unitTarget->CastSpell(unitTarget, 51617, true);
break;
case 300:
if(((Player*)unitTarget)->GetMapId()==571 || ((Player*)unitTarget)->GetMapId()==530)
unitTarget->CastSpell(unitTarget, 48023, true);
break;
default: break; default: break;
} }
break; break;
@@ -5490,25 +5449,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
} }
return; return;
} }
// Great Feast
case 57337:
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget, 58067, true);
break;
}
//Fish Feast
case 57397:
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget, 58648, true);
unitTarget->CastSpell(unitTarget, 57398, true);
break;
}
case 58418: // Portal to Orgrimmar case 58418: // Portal to Orgrimmar
case 58420: // Portal to Stormwind case 58420: // Portal to Stormwind
{ {
@@ -5523,26 +5463,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
return; return;
} }
// Gigantic Feast
case 58466:
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget, 58648, true);
unitTarget->CastSpell(unitTarget, 58467, true);
break;
}
// Small Feast
case 58475:
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget, 58648, true);
unitTarget->CastSpell(unitTarget, 58477, true);
break;
}
case 58941: // Rock Shards case 58941: // Rock Shards
if(unitTarget && m_originalCaster) if(unitTarget && m_originalCaster)
{ {
@@ -5551,16 +5471,16 @@ void Spell::EffectScriptEffect(uint32 effIndex)
m_originalCaster->CastSpell(unitTarget, 58689, true); m_originalCaster->CastSpell(unitTarget, 58689, true);
m_originalCaster->CastSpell(unitTarget, 58692, true); m_originalCaster->CastSpell(unitTarget, 58692, true);
} }
if(m_originalCaster->GetMap()->IsHeroic()) if(((InstanceMap*)m_originalCaster->GetMap())->GetDifficulty() == REGULAR_DIFFICULTY)
{
m_originalCaster->CastSpell(unitTarget, 60883, true);
m_originalCaster->CastSpell(unitTarget, 60884, true);
}
else
{ {
m_originalCaster->CastSpell(unitTarget, 58695, true); m_originalCaster->CastSpell(unitTarget, 58695, true);
m_originalCaster->CastSpell(unitTarget, 58696, true); m_originalCaster->CastSpell(unitTarget, 58696, true);
} }
else
{
m_originalCaster->CastSpell(unitTarget, 60883, true);
m_originalCaster->CastSpell(unitTarget, 60884, true);
}
} }
return; return;
case 58983: // Big Blizzard Bear case 58983: // Big Blizzard Bear
@@ -5627,6 +5547,41 @@ void Spell::EffectScriptEffect(uint32 effIndex)
} }
} }
return; return;
case 57337: //Great Feast
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget,58067,true);
break;
}
case 57397: //Fish Feast
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget,58648,true);
unitTarget->CastSpell(unitTarget,57398,true);
break;
}
case 58466: //Gigantic Feast
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget,58648,true);
unitTarget->CastSpell(unitTarget,58467,true);
break;
}
case 58475: //Small Feast
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget,58648,true);
unitTarget->CastSpell(unitTarget,58477,true);
break;
}
case 60123: // Lightwell case 60123: // Lightwell
{ {
if (m_caster->GetTypeId() != TYPEID_UNIT || !((Creature*)m_caster)->isSummon()) if (m_caster->GetTypeId() != TYPEID_UNIT || !((Creature*)m_caster)->isSummon())
@@ -5801,9 +5756,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
AuraDivinePlea->RefreshAura(); AuraDivinePlea->RefreshAura();
return; return;
} }
case 45634: //Neural Needle
unitTarget->CastSpell(unitTarget, 45702, true); //Neural Needle Impact
return;
} }
break; break;
} }
@@ -6065,7 +6017,7 @@ void Spell::EffectScriptEffect(uint32 effIndex)
case SPELLFAMILY_WARRIOR: case SPELLFAMILY_WARRIOR:
{ {
// Shattering Throw // Shattering Throw
if ( m_spellInfo->SpellFamilyFlags[1] & 0x1 ) if (m_spellInfo->SpellFamilyFlags[1] & 0x00400000)
{ {
if(!unitTarget) if(!unitTarget)
return; return;
@@ -6096,7 +6048,7 @@ void Spell::EffectSanctuary(uint32 /*i*/)
if(!(*iter)->hasUnitState(UNIT_STAT_CASTING)) if(!(*iter)->hasUnitState(UNIT_STAT_CASTING))
continue; continue;
for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; ++i) for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; i++)
{ {
if((*iter)->GetCurrentSpell(i) if((*iter)->GetCurrentSpell(i)
&& (*iter)->GetCurrentSpell(i)->m_targets.getUnitTargetGUID() == unitTarget->GetGUID()) && (*iter)->GetCurrentSpell(i)->m_targets.getUnitTargetGUID() == unitTarget->GetGUID())
@@ -6495,9 +6447,6 @@ void Spell::EffectSummonObject(uint32 i)
m_caster->AddGameObject(pGameObj); m_caster->AddGameObject(pGameObj);
map->Add(pGameObj); map->Add(pGameObj);
WorldPacket data(SMSG_GAMEOBJECT_SPAWN_ANIM_OBSOLETE, 8);
data << uint64(pGameObj->GetGUID());
m_caster->SendMessageToSet(&data, true);
m_caster->m_ObjectSlot[slot] = pGameObj->GetGUID(); m_caster->m_ObjectSlot[slot] = pGameObj->GetGUID();
} }
@@ -7087,10 +7036,6 @@ void Spell::EffectTransmitted(uint32 effIndex)
cMap->Add(pGameObj); cMap->Add(pGameObj);
WorldPacket data(SMSG_GAMEOBJECT_SPAWN_ANIM_OBSOLETE, 8);
data << uint64(pGameObj->GetGUID());
m_caster->SendMessageToSet(&data,true);
if(uint32 linkedEntry = pGameObj->GetGOInfo()->GetLinkedGameObjectEntry()) if(uint32 linkedEntry = pGameObj->GetGOInfo()->GetLinkedGameObjectEntry())
{ {
GameObject* linkedGO = new GameObject; GameObject* linkedGO = new GameObject;
@@ -7397,6 +7342,7 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const *
} }
else else
summon->SetDisplayId(1126); summon->SetDisplayId(1126);
summon->AI()->EnterEvadeMode(); summon->AI()->EnterEvadeMode();
} }
} }
@@ -7482,3 +7428,34 @@ void Spell::EffectActivateSpec(uint32 /*eff_idx*/)
((Player*)unitTarget)->ActivateSpec(damage-1); // damage is 1 or 2, spec is 0 or 1 ((Player*)unitTarget)->ActivateSpec(damage-1); // damage is 1 or 2, spec is 0 or 1
} }
void Spell::EffectCastButtons(uint32 i)
{
if (!unitTarget || m_caster->GetTypeId() != TYPEID_PLAYER)
return;
Player *p_caster = (Player*)m_caster;
uint32 button_id = m_spellInfo->EffectMiscValue[i] + 132;
uint32 n_buttons = m_spellInfo->EffectMiscValueB[i];
for (; n_buttons; n_buttons--, button_id++)
{
if (uint32 spell_id = p_caster->GetActionButtonSpell(button_id))
{
if (!spell_id)
continue;
if (p_caster->HasSpellCooldown(spell_id))
continue;
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
uint32 cost = CalculatePowerCost(spellInfo, m_caster, GetSpellSchoolMask(spellInfo));
if (m_caster->GetPower(POWER_MANA) < cost)
break;
m_caster->CastSpell(unitTarget, spell_id, true);
m_caster->ModifyPower(POWER_MANA, -(int32)cost);
p_caster->AddSpellAndCategoryCooldowns(spellInfo, 0);
}
}
}
src/game/SpellHandler.cpp
+10 -3
View File
@@ -325,7 +325,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
else else
{ {
// not have spell in spellbook or spell passive and not casted by client // not have spell in spellbook or spell passive and not casted by client
if (!((Creature*)mover)->HasSpell(spellId) || IsPassiveSpell(spellId) ) if ((mover->GetTypeId() == TYPEID_UNIT && !((Creature*)mover)->HasSpell(spellId)) || IsPassiveSpell(spellId))
{ {
//cheater? kick? ban? //cheater? kick? ban?
recvPacket.rpos(recvPacket.wpos()); // prevent spam at ignore packet recvPacket.rpos(recvPacket.wpos()); // prevent spam at ignore packet
@@ -356,11 +356,19 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
{ {
//recvPacket.read_skip<float>(); // unk1, coords? //recvPacket.read_skip<float>(); // unk1, coords?
//recvPacket.read_skip<float>(); // unk1, coords? //recvPacket.read_skip<float>(); // unk1, coords?
recvPacket.read_skip<uint8>(); // >> 1 uint8 unk1;
recvPacket >> unk1; // >> 1 or 0
if(unk1)
{
recvPacket.read_skip<uint32>(); // >> MSG_MOVE_STOP recvPacket.read_skip<uint32>(); // >> MSG_MOVE_STOP
uint64 guid; // guid - unused
if(!recvPacket.readPackGUID(guid))
return;
MovementInfo movementInfo; MovementInfo movementInfo;
ReadMovementInfo(recvPacket, &movementInfo); ReadMovementInfo(recvPacket, &movementInfo);
} }
}
// auto-selection buff level base at target level (in spellInfo) // auto-selection buff level base at target level (in spellInfo)
if(targets.getUnitTarget()) if(targets.getUnitTarget())
@@ -632,4 +640,3 @@ void WorldSession::HandleMirrrorImageDataRequest( WorldPacket & recv_data )
} }
SendPacket( &data ); SendPacket( &data );
} }
src/game/SpellMgr.cpp
+12 -21
View File
@@ -819,6 +819,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
case 38638: // Nether Exhaustion (green) case 38638: // Nether Exhaustion (green)
case 38639: // Nether Exhaustion (blue) case 38639: // Nether Exhaustion (blue)
case 11196: // Recently Bandaged case 11196: // Recently Bandaged
case 44689: // Relay Race Accept Hidden Debuff - DND
return false; return false;
default: default:
break; break;
@@ -3033,28 +3034,14 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
if(auraSpell) if(auraSpell)
{ {
// not have expected aura // not have expected aura
if (!player || auraSpell > 0 && !player->HasAura(auraSpell) || auraSpell < 0 && player->HasAura(-auraSpell)) if(!player)
return false; return false;
} if(auraSpell > 0)
// have expected aura
// Extra conditions return player->HasAura(auraSpell);
switch(spellId) else
{ // not have expected aura
case 58045: // Essence of Wintergrasp - Wintergrasp return !player->HasAura(-auraSpell);
case 57940: // Essence of Wintergrasp - Northrend
if (!player || player->GetTeamId() != sWorld.getState(WORLDSTATE_WINTERGRASP_CONTROLING_FACTION))
return false;
break;
case 58600: // No fly Zone - Dalaran (Krasus Landing exception)
if (!player || player->GetAreaId() == 4564 || !player->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) && !player->HasAuraType(SPELL_AURA_FLY)
|| player->HasAura(44795))
return false;
break;
case 58730: // No fly Zone - Wintergrasp
if (!player || !player->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) && !player->HasAuraType(SPELL_AURA_FLY)
|| player->HasAura(45472) || player->HasAura(44795))
return false;
break;
} }
return true; return true;
@@ -3656,6 +3643,10 @@ void SpellMgr::LoadSpellCustomAttr()
case 32182: case 32182:
spellInfo->excludeCasterAuraSpell = 57723; // Exhaustion spellInfo->excludeCasterAuraSpell = 57723; // Exhaustion
break; break;
// Bloodlust
case 2825:
spellInfo->excludeCasterAuraSpell = 57724; // Sated
break;
// Heart of the Crusader // Heart of the Crusader
case 20335: case 20335:
case 20336: case 20336:
src/game/SpellMgr.h
-1
View File
@@ -1191,4 +1191,3 @@ class SpellMgr
#define spellmgr SpellMgr::Instance() #define spellmgr SpellMgr::Instance()
#endif #endif