removed old and incorrect 80-120% honor bonus (leftover from preBC O.o)

added new honor formula for player kills
added new formula for bonus honor calculation (*HK)
pls test and compare with retial

--HG--
branch : trunk

2 files changed, 2 insertions, 3 deletions

diff --git a/src/game/Formulas.h b/src/game/Formulas.h
index 81c7383de37..e5961834a78 100644
--- a/src/game/Formulas.h
+++ b/src/game/Formulas.h
@@ -29,7 +29,7 @@ namespace Trinity
     {
         inline uint32 hk_honor_at_level(uint8 level, uint32 count = 1)
         {
-            return uint32(ceil(count*2*(-0.53177f + 0.59357f * exp((level + 23.54042f) / 26.07859f))));
+            return uint32(ceil(count * (33.333f * ((float)level) / 21.50537f)));
         }
     }
     namespace XP
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 5e74fc99e3e..8883a503be6 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -6579,7 +6579,7 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt
             int32 v_rank =1;                                //need more info
 
             honor = ((f * diff_level * (190 + v_rank*10))/6);
-            honor *= ((float)k_level) / 70.0f;              //factor of dependence on levels of the killer
+            honor *= ((float)k_level) / 21.50537f;              //factor of dependence on levels of the killer
 
             // count the number of playerkills in one day
             ApplyModUInt32Value(PLAYER_FIELD_KILLS, 1, true);
@@ -6608,7 +6608,6 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt
 
         // apply honor multiplier from aura (not stacking-get highest)
         honor = int32(float(honor) * (float(GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HONOR_GAIN_PCT))+100.0f)/100.0f);
-        honor *= (((float)urand(8,12))/10);                 // approx honor: 80% - 120% of real honor
     }
 
     // honor - for show honor points in log