From 5bb39bc73a1ddbe93fa7cfab03ef687ebb9566b6 Mon Sep 17 00:00:00 2001 From: Salja Date: Fri, 24 Aug 2012 19:11:20 +0200 Subject: [PATCH] [0178] Dire Bear Form was removed in 4.0.1 Thanks Tuxity for pointing. Signed-off-by: Salja --- src/game/Player.cpp | 1 - src/game/SharedDefines.h | 1 - src/game/SpellAuras.cpp | 12 +----------- src/game/StatSystem.cpp | 3 --- src/game/Unit.h | 2 +- src/game/UnitAuraProcHandler.cpp | 6 ++---- 6 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index b764a3956..442049562 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -19362,7 +19362,6 @@ void Player::InitDataForForm(bool reapplyMods) break; } case FORM_BEAR: - case FORM_DIREBEAR: { if (getPowerType() != POWER_RAGE) setPowerType(POWER_RAGE); diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index 975712436..c6311a2fb 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -2856,7 +2856,6 @@ enum ShapeshiftForm FORM_BEAR = 0x05, FORM_AMBIENT = 0x06, FORM_GHOUL = 0x07, - FORM_DIREBEAR = 0x08, FORM_STEVES_GHOUL = 0x09, FORM_THARONJA_SKELETON = 0x0A, FORM_TEST_OF_STRENGTH = 0x0B, diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index feb2644b8..44529a46a 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -3446,7 +3446,6 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real) case FORM_TRAVEL: case FORM_AQUA: case FORM_BEAR: - case FORM_DIREBEAR: case FORM_FLIGHT_EPIC: case FORM_FLIGHT: case FORM_MOONKIN: @@ -3503,7 +3502,6 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real) PowerType = POWER_ENERGY; break; case FORM_BEAR: - case FORM_DIREBEAR: case FORM_BATTLESTANCE: case FORM_BERSERKERSTANCE: case FORM_DEFENSIVESTANCE: @@ -3523,7 +3521,6 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real) { case FORM_CAT: case FORM_BEAR: - case FORM_DIREBEAR: { // get furor proc chance int32 furorChance = 0; @@ -3605,7 +3602,6 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real) { // Nordrassil Harness - bonus case FORM_BEAR: - case FORM_DIREBEAR: case FORM_CAT: if (Aura* dummy = target->GetDummyAura(37315)) target->CastSpell(target, 37316, true, NULL, dummy); @@ -6672,12 +6668,6 @@ void Aura::HandleShapeshiftBoosts(bool apply) HotWSpellId = 24899; MasterShaperSpellId = 48418; break; - case FORM_DIREBEAR: - spellId1 = 9635; - spellId2 = 21178; - HotWSpellId = 24899; - MasterShaperSpellId = 48418; - break; case FORM_BATTLESTANCE: spellId1 = 21156; break; @@ -6788,7 +6778,7 @@ void Aura::HandleShapeshiftBoosts(bool apply) target->CastSpell(target, 62071, true); // Survival of the Fittest (Armor part) - if (form == FORM_BEAR || form == FORM_DIREBEAR) + if (form == FORM_BEAR) { Unit::AuraList const& modAuras = target->GetAurasByType(SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE); for (Unit::AuraList::const_iterator i = modAuras.begin(); i != modAuras.end(); ++i) diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp index 2f59add36..a35d90f89 100644 --- a/src/game/StatSystem.cpp +++ b/src/game/StatSystem.cpp @@ -273,7 +273,6 @@ void Player::UpdateAttackPowerAndDamage(bool ranged) { case FORM_CAT: case FORM_BEAR: - case FORM_DIREBEAR: val2 = 0.0f; break; default: val2 = GetStat(STAT_AGILITY) - 10.0f; break; @@ -302,7 +301,6 @@ void Player::UpdateAttackPowerAndDamage(bool ranged) { case FORM_CAT: case FORM_BEAR: - case FORM_DIREBEAR: case FORM_MOONKIN: { Unit::AuraList const& mDummy = GetAurasByType(SPELL_AURA_DUMMY); @@ -331,7 +329,6 @@ void Player::UpdateAttackPowerAndDamage(bool ranged) case FORM_CAT: val2 = GetStat(STAT_STRENGTH) * 2.0f + GetStat(STAT_AGILITY) - 20.0f + mLevelBonus + m_baseFeralAP + mBonusWeaponAtt; break; case FORM_BEAR: - case FORM_DIREBEAR: val2 = GetStat(STAT_STRENGTH) * 2.0f - 20.0f + mLevelBonus + m_baseFeralAP + mBonusWeaponAtt; break; case FORM_MOONKIN: val2 = GetStat(STAT_STRENGTH) * 2.0f - 20.0f + m_baseFeralAP + mBonusWeaponAtt; break; diff --git a/src/game/Unit.h b/src/game/Unit.h index 8f7729a76..2b96c7e2c 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1649,7 +1649,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject bool IsInFeralForm() const { ShapeshiftForm form = GetShapeshiftForm(); - return form == FORM_CAT || form == FORM_BEAR || form == FORM_DIREBEAR; + return form == FORM_CAT || form == FORM_BEAR; } bool IsInDisallowedMountForm() const diff --git a/src/game/UnitAuraProcHandler.cpp b/src/game/UnitAuraProcHandler.cpp index 3380957c6..7e9e608f0 100644 --- a/src/game/UnitAuraProcHandler.cpp +++ b/src/game/UnitAuraProcHandler.cpp @@ -3252,8 +3252,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit* pVictim, uint32 d { case FORM_NONE: trigger_spell_id = 37344; break; case FORM_CAT: trigger_spell_id = 37341; break; - case FORM_BEAR: - case FORM_DIREBEAR: trigger_spell_id = 37340; break; + case FORM_BEAR: trigger_spell_id = 37340; break; case FORM_TREE: trigger_spell_id = 37342; break; case FORM_MOONKIN: trigger_spell_id = 37343; break; default: @@ -3266,8 +3265,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit* pVictim, uint32 d switch (GetShapeshiftForm()) { case FORM_CAT: trigger_spell_id = 67355; break; - case FORM_BEAR: - case FORM_DIREBEAR: trigger_spell_id = 67354; break; + case FORM_BEAR: trigger_spell_id = 67354; break; default: return SPELL_AURA_PROC_FAILED; }