From 3996a70037a7bfd2c7818af16f95a8442d056d7f Mon Sep 17 00:00:00 2001
From: "Michael Cook (mackal)" <mcook@mackal.net>
Date: Thu, 31 Dec 2015 01:08:04 -0500
Subject: [PATCH] 2h DB should match client closer

I think the dev missed something when making it pretty for the forums
This should match it better.
---
 zone/attack.cpp | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/zone/attack.cpp b/zone/attack.cpp
index 5f7b19e80..ad5be845a 100644
--- a/zone/attack.cpp
+++ b/zone/attack.cpp
@@ -2703,16 +2703,38 @@ uint8 Mob::GetWeaponDamageBonus(const Item_Struct *weapon, bool offhand)
 		}
 	} else {
 		// 2h damage bonus
+		int damage_bonus = 1 + (level - 28) / 3;
 		if (delay <= 27)
-			return 1 + ((level - 28) / 3);
-		else if (delay < 40)
-			return 1 + ((level - 28) / 3) + ((level - 30) / 5);
-		else if (delay < 43)
-			return 2 + ((level - 28) / 3) + ((level - 30) / 5) + ((delay - 40) / 3);
-		else if (delay < 45)
-			return 3 + ((level - 28) / 3) + ((level - 30) / 5) + ((delay - 40) / 3);
-		else if (delay >= 45)
-			return 4 + ((level - 28) / 3) + ((level - 30) / 5) + ((delay - 40) / 3);
+			return damage_bonus + 1;
+		// Client isn't reflecting what the dev quoted, this matches better
+		if (level > 29) {
+			int level_bonus = (level - 30) / 5 + 1;
+			if (level > 50) {
+				level_bonus++;
+				int level_bonus2 = level - 50;
+				if (level > 67)
+					level_bonus2 += 5;
+				else if (level > 59)
+					level_bonus2 += 4;
+				else if (level > 58)
+					level_bonus2 += 3;
+				else if (level > 56)
+					level_bonus2 += 2;
+				else if (level > 54)
+					level_bonus2++;
+				level_bonus += level_bonus2 * delay / 40;
+			}
+			damage_bonus += level_bonus;
+		}
+		if (delay >= 40) {
+			int delay_bonus = (delay - 40) / 3 + 1;
+			if (delay >= 45)
+				delay_bonus += 2;
+			else if (delay >= 43)
+				delay_bonus++;
+			damage_bonus += delay_bonus;
+		}
+		return damage_bonus;
 	}
 }