From 1272be7be91a1fb5b28d9047ff34c5ed5ea66b82 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Thu, 15 Aug 2024 18:32:25 -0700
Subject: [PATCH] fix: Fixes damage scale for AOS (#1931)

---
 Projects/UOContent/Items/Weapons/BaseWeapon.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Projects/UOContent/Items/Weapons/BaseWeapon.cs b/Projects/UOContent/Items/Weapons/BaseWeapon.cs
index cbc6fabd5..c4698011f 100644
--- a/Projects/UOContent/Items/Weapons/BaseWeapon.cs
+++ b/Projects/UOContent/Items/Weapons/BaseWeapon.cs
@@ -2552,12 +2552,9 @@ public abstract partial class BaseWeapon : Item, IWeapon, IFactionItem, ICraftab
         var strengthBonus = GetBonus(attacker.Str, 0.300, 100.0, 5.00);
         var anatomyBonus = GetBonus(attacker.Skills.Anatomy.Value, 0.500, 100.0, 5.00);
         var tacticsBonus = GetBonus(attacker.Skills.Tactics.Value, 0.625, 100.0, 6.25);
-        var lumberBonus = GetBonus(attacker.Skills.Lumberjacking.Value, 0.200, 100.0, 10.00);
-
-        if (Type != WeaponType.Axe)
-        {
-            lumberBonus = 0.0;
-        }
+        var lumberBonus = Type == WeaponType.Axe
+            ? GetBonus(attacker.Skills.Lumberjacking.Value, 0.200, 100.0, 10.00)
+            : 0.0;
 
         /*
          * The following are damage modifiers whose effect shows on the status bar.
@@ -2595,9 +2592,10 @@ public abstract partial class BaseWeapon : Item, IWeapon, IFactionItem, ICraftab
             damageBonus = 100;
         }
 
-        var totalBonus = strengthBonus + anatomyBonus + tacticsBonus + lumberBonus + damageBonus + GetDamageBonus();
+        var totalBonus = strengthBonus + anatomyBonus + tacticsBonus + lumberBonus +
+                         (damageBonus + GetDamageBonus()) / 100.0;
 
-        return damage + damage * totalBonus / 100.0;
+        return damage + damage * totalBonus;
     }
 
     public virtual int ComputeDamageAOS(Mobile attacker, Mobile defender) =>