mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[0178] Dire Bear Form was removed in 4.0.1 Thanks Tuxity for pointing.

Browse source 
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-24 19:11:20 +02:00 • committed by Antz
parent a8ba4103b6
commit 5bb39bc73a
6 changed files with 4 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/game/Player.cpp
View file

@ -19362,7 +19362,6 @@ void Player::InitDataForForm(bool reapplyMods)
break;
}
case FORM_BEAR:
case FORM_DIREBEAR:
{
if (getPowerType() != POWER_RAGE)
setPowerType(POWER_RAGE);

1
src/game/SharedDefines.h
View file

@ -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,

12
src/game/SpellAuras.cpp
View file

@ -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)

3
src/game/StatSystem.cpp
View file

@ -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;

2
src/game/Unit.h
View file

@ -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

6
src/game/UnitAuraProcHandler.cpp
View file

@ -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;
}