From b59020657b4838f9717baae3475f4c0ac8177bc1 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sun, 4 Jan 2009 23:27:53 -0600
Subject: [PATCH] *Mangos [7027] Add descriptions to new options. By
 VladimirMangos. *Mangos [7028] Code fix on client change.  Remove not need
 code. Fix some SPELL_AURA_OVERRIDE_CLASS_SCRIPTS aura use. By DiSlord.

--HG--
branch : trunk
---
 src/game/Unit.cpp                | 25 +++++--------------------
 src/mangosd/mangosd.conf.dist.in |  7 +++++++
 src/shared/revision_nr.h         |  2 +-
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 73157da31d..c5aeeb2e08 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -1798,7 +1798,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
         {
             if(Unit* caster = (*i)->GetCaster())
             {
-                AuraList const& vOverRideCS = caster->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
+                AuraList const& vOverRideCS = caster->GetAurasByType(SPELL_AURA_DUMMY);
                 for(AuraList::const_iterator k = vOverRideCS.begin(); k != vOverRideCS.end(); ++k)
                 {
                     switch((*k)->GetModifier()->m_miscvalue)
@@ -1806,8 +1806,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
                         case 5065:                          // Rank 1
                         case 5064:                          // Rank 2
                         case 5063:                          // Rank 3
-                        case 5062:                          // Rank 4
-                        case 5061:                          // Rank 5
                         {
                             if(RemainingDamage >= (*i)->GetModifier()->m_amount)
                                 reflectDamage = (*i)->GetModifier()->m_amount * (*k)->GetModifier()->m_amount/100;
@@ -7139,7 +7137,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
         {
             //Molten Fury
             case 4920: case 4919:
-                if(pVictim->HasAuraState(AURA_STATE_HEALTHLESS_20_PERCENT))
+                if(pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT))
                     TakenTotalMod *= (100.0f+(*i)->GetModifier()->m_amount)/100.0f; break;
         }
     }
@@ -7550,11 +7548,9 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
                     {
                         switch((*i)->GetModifier()->m_miscvalue)
                         {
-                            case 849: crit_chance+= 10.0f; break; //Shatter Rank 1
-                            case 910: crit_chance+= 20.0f; break; //Shatter Rank 2
-                            case 911: crit_chance+= 30.0f; break; //Shatter Rank 3
-                            case 912: crit_chance+= 40.0f; break; //Shatter Rank 4
-                            case 913: crit_chance+= 50.0f; break; //Shatter Rank 5
+                            case 849: crit_chance+= 17.0f; break; //Shatter Rank 1
+                            case 910: crit_chance+= 34.0f; break; //Shatter Rank 2
+                            case 911: crit_chance+= 50.0f; break; //Shatter Rank 3
                         }
                     }
                 }
@@ -10146,17 +10142,6 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
                 if (triggeredByAura->m_procCharges == 0)
                    removedSpells.push_back(triggeredByAura->GetId());
                 break;
-            case SPELL_AURA_MELEE_ATTACK_POWER_ATTACKER_BONUS:
-            case SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS:
-                // Hunter's Mark (1-4 Rangs)
-                if (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && (spellInfo->SpellFamilyFlags&0x0000000000000400LL))
-                {
-                    uint32 basevalue = triggeredByAura->GetBasePoints();
-                    auraModifier->m_amount += basevalue/10;
-                    if (auraModifier->m_amount > basevalue*4)
-                        auraModifier->m_amount = basevalue*4;
-                }
-                break;
             case SPELL_AURA_MOD_CASTING_SPEED:
                 // Skip melee hits or instant cast spells
                 if (procSpell == NULL || GetSpellCastTime(procSpell) == 0)
diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in
index a488c4f196..62ff7a296e 100644
--- a/src/mangosd/mangosd.conf.dist.in
+++ b/src/mangosd/mangosd.conf.dist.in
@@ -1154,6 +1154,13 @@ Death.CorpseReclaimDelay.PvE = 1
 #                         in days
 #             Default: 7 (weekly)
 #
+# ArenaSeason.ID: current area season id show in client
+#             Default: 1
+#
+# ArenaSeason.InProgress: current area season state
+#             Default: 1 (active)
+#                      0 (finished)
+#
 ###################################################################################################################
 
 Arena.MaxRatingDifference = 0
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index eea659c9bd..213a86ca7f 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7026"
+ #define REVISION_NR "7028"
 #endif // __REVISION_NR_H__