From 672e6766c76c7de2ed17c733509ddc7ef8a0ab95 Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Tue, 8 Oct 2019 02:10:49 -0500
Subject: [PATCH] More logging [skip ci]

---
 utils/mods/legacy_combat.lua |  8 +++++---
 zone/attack.cpp              | 22 +++++++++++++++++-----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/utils/mods/legacy_combat.lua b/utils/mods/legacy_combat.lua
index d212cc8aa..bf1630992 100644
--- a/utils/mods/legacy_combat.lua
+++ b/utils/mods/legacy_combat.lua
@@ -344,9 +344,11 @@ function TryCriticalHit(e)
     end
 
     eq.debug(
-            string.format("[%s] [Mob::TryCriticalHit] CritChance [%i]",
+            string.format("[%s] [Mob::TryCriticalHit] CritChance [%i] CritChanceBonus [%i] Dex [%i] Post-Dex-Block",
                     e.self:GetCleanName(),
-                    critChance
+                    critChance,
+                    CritChanceBonus,
+                    e.self:GetDEX()
             )
     );
 
@@ -463,7 +465,7 @@ function GetCriticalChanceBonus(self, skill)
 
     eq.debug(
             string.format("[%s] [Mob::GetCriticalChanceBonus] Bonuses | Item [%i] Spell [%i] AA [%i] | 2nd Item [%i] Spell [%i] AA [%i] Final Chance [%i]",
-                    e.self:GetCleanName(),
+                    self:GetCleanName(),
                     itembonuses:CriticalHitChance(Skill.HIGHEST_SKILL + 1),
                     spellbonuses:CriticalHitChance(Skill.HIGHEST_SKILL + 1),
                     aabonuses:CriticalHitChance(Skill.HIGHEST_SKILL + 1),
diff --git a/zone/attack.cpp b/zone/attack.cpp
index d4e5ee9da..98a83a7f5 100644
--- a/zone/attack.cpp
+++ b/zone/attack.cpp
@@ -3995,13 +3995,25 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage, ExtraAttack
 
 		//Get Base CritChance from Dex. (200 = ~1.6%, 255 = ~2.0%, 355 = ~2.20%) Fall off rate > 255
 		//http://giline.versus.jp/shiden/su.htm , http://giline.versus.jp/shiden/damage_e.htm
-		if (GetDEX() <= 255)
+		if (GetDEX() <= 255) {
 			critChance += (float(GetDEX()) / 125.0f);
-		else if (GetDEX() > 255)
-			critChance += (float(GetDEX()-255)/ 500.0f) + 2.0f;
-		critChance += critChance*(float)CritChanceBonus /100.0f;
+		}
+		else if (GetDEX() > 255) {
+			critChance += (float(GetDEX() - 255) / 500.0f) + 2.0f;
+		}
+		critChance += critChance * (float) CritChanceBonus / 100.0f;
 	}
 
+	Log.Out(
+		Logs::General,
+		Logs::Combat,
+		"[%s] [Mob::TryCriticalHit] CritChance [%.2f] CritChanceBonus [%i] Dex [%i] Post-Dex-Block",
+		GetCleanName(),
+		critChance,
+		CritChanceBonus,
+		GetDEX()
+	);
+
 	if(opts) {
 		critChance *= opts->crit_percent;
 		critChance += opts->crit_flat;
@@ -4010,7 +4022,7 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage, ExtraAttack
 	Log.Out(
 		Logs::General,
 		Logs::Combat,
-		"[%s] [Mob::TryCriticalHit] CritChance [%i]",
+		"[%s] [Mob::TryCriticalHit] CritChance [%.2f]",
 		GetCleanName(),
 		critChance
 	);