* Backed out changeset c7c6faf26cbd

* A different solution to damage will be implemented
* You will need data from your DB provider if you don't have a backup

--HG--
branch : trunk

1 files changed, 6 insertions, 24 deletions

diff --git a/src/game/Creature.h b/src/game/Creature.h
index d3bee8d2eca..ad8dfc2b01c 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -89,7 +89,10 @@ struct CreatureInfo
     float   speed;
     float   scale;
     uint32  rank;
+    float   mindmg;
+    float   maxdmg;
     uint32  dmgschool;
+    uint32  attackpower;
     float   dmg_multiplier;
     uint32  baseattacktime;
     uint32  rangeattacktime;
@@ -101,6 +104,9 @@ struct CreatureInfo
     uint32  trainer_spell;
     uint32  trainer_class;
     uint32  trainer_race;
+    float   minrangedmg;
+    float   maxrangedmg;
+    uint32  rangedattackpower;
     uint32  type;                                           // enum CreatureType values
     uint32  type_flags;                                     // enum CreatureTypeFlags mask values
     uint32  lootid;
@@ -123,8 +129,6 @@ struct CreatureInfo
     float   ModHealth;
     float   ModMana;
     float   ModArmor;
-    float   ModDmg;
-    float   ModRangedDmg;
     bool    RacialLeader;
     uint32  questItems[6];
     uint32  movementId;
@@ -171,8 +175,6 @@ struct TRINITY_DLL_SPEC CreatureBaseStats
     uint32 BaseHealth[MAX_CREATURE_BASE_HP];
     uint32 BaseMana;
     uint32 BaseArmor;
-    uint32 BaseDmg;
-    uint32 BaseRangedDmg;
 
     // Helpers
 
@@ -195,26 +197,6 @@ struct TRINITY_DLL_SPEC CreatureBaseStats
         return uint32((BaseArmor * info->ModArmor) + 0.5f);
     }
 
-    uint32 GenerateMinDmg(CreatureInfo const* info) const
-    {
-        return uint32((BaseDmg * (info->baseattacktime / 1000.0f) / 2.5f) * info->ModDmg + 0.5f);
-    }
-
-    uint32 GenerateMaxDmg(CreatureInfo const* info) const
-    {
-        return uint32((BaseDmg * (info->baseattacktime / 1000) - GenerateMinDmg(info)) * info->ModDmg + 0.5f);
-    }
-
-    uint32 GenerateAttackPower(CreatureInfo const* info) const
-    {
-        return uint32(((GenerateMinDmg(info) + GenerateMaxDmg(info)) / 2.0f * 0.3f) * info->ModDmg + 0.5f);
-    }
-
-    uint32 GenerateRangedDmg(CreatureInfo const* info) const
-    {
-        return uint32((BaseDmg * (info->baseattacktime / 1000.0f) * info->ModRangedDmg) + 0.5f);
-    }
-
     static CreatureBaseStats const* GetBaseStats(uint32 level, uint8 unitClass);
 };