From 936c8cce4b53bedf3a81ee4920e9538793caef63 Mon Sep 17 00:00:00 2001 From: Tabasco Date: Thu, 1 Aug 2013 14:41:27 -0500 Subject: [PATCH] Fixed a regression with level 10 and 20 hit caps. --- zone/attack.cpp | 4 ++-- zone/bot.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zone/attack.cpp b/zone/attack.cpp index 3abbf243b..61da974a6 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -1191,9 +1191,9 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b int min_hit = 1; int max_hit = (2*weapon_damage*GetDamageTable(skillinuse)) / 100; - if(GetLevel() < 10 && max_hit > 20) + if(GetLevel() < 10 && max_hit > RuleI(Combat, HitCapPre10)) max_hit = (RuleI(Combat, HitCapPre10)); - else if(GetLevel() < 20 && max_hit > 40) + else if(GetLevel() < 20 && max_hit > RuleI(Combat, HitCapPre20)) max_hit = (RuleI(Combat, HitCapPre20)); CheckIncreaseSkill(skillinuse, other, -15); diff --git a/zone/bot.cpp b/zone/bot.cpp index aa16aca9b..6c74e7e1e 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -6464,9 +6464,9 @@ bool Bot::Attack(Mob* other, int Hand, bool FromRiposte, bool IsStrikethrough, b int min_hit = 1; int max_hit = (2*weapon_damage*GetDamageTable(skillinuse)) / 100; - if(GetLevel() < 10 && max_hit > 20) + if(GetLevel() < 10 && max_hit > RuleI(Combat, HitCapPre10)) max_hit = (RuleI(Combat, HitCapPre10)); - else if(GetLevel() < 20 && max_hit > 40) + else if(GetLevel() < 20 && max_hit > RuleI(Combat, HitCapPre20)) max_hit = (RuleI(Combat, HitCapPre20)); // ***************************************************************