Reverts damage

modernuo · Feb 6, 2025 · 7714c38 · 7714c38
1 parent e363134
commit 7714c38
Showing 1 changed file with 10 additions and 22 deletions.
diff --git a/Projects/UOContent/Items/Weapons/BaseWeapon.cs b/Projects/UOContent/Items/Weapons/BaseWeapon.cs
@@ -2470,29 +2470,17 @@ public virtual double GetBaseDamage(Mobile attacker)
             return damage;
         }
 
-        if (Core.UOR)
-        {
-            damage += _damageLevel switch
-            {
-                WeaponDamageLevel.Ruin  => 1,
-                WeaponDamageLevel.Might => 3,
-                WeaponDamageLevel.Force => 5,
-                WeaponDamageLevel.Power => 7,
-                WeaponDamageLevel.Vanq  => 9,
-                _                       => 0
-            };
-        }
-        else
+        /* Apply damage level offset
+         * : Regular : 0
+         * : Ruin    : 1
+         * : Might   : 3
+         * : Force   : 5
+         * : Power   : 7
+         * : Vanq    : 9
+         */
+        if (_damageLevel != WeaponDamageLevel.Regular)
         {
-            damage += _damageLevel switch
-            {
-                WeaponDamageLevel.Ruin  => 5,
-                WeaponDamageLevel.Might => 10,
-                WeaponDamageLevel.Force => 15,
-                WeaponDamageLevel.Power => 20,
-                WeaponDamageLevel.Vanq  => 25,
-                _                       => 0
-            };
+            damage += 2 * (int)_damageLevel - 1;
         }
 
         return damage;