From 7714c389550b2def80d6233124bd2fa8ee7fe15e Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Thu, 6 Feb 2025 00:28:25 -0800 Subject: [PATCH] Reverts damage --- .../UOContent/Items/Weapons/BaseWeapon.cs | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/Projects/UOContent/Items/Weapons/BaseWeapon.cs b/Projects/UOContent/Items/Weapons/BaseWeapon.cs index edd4c6f21..7bd36c7fc 100644 --- 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;