warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Reverts GetProtOffset, Adds PreT2A Weapon Damage & PreUOR Armor Durability (#2114)

Browse source
This commit is contained in:
Bohica 2025-02-06 01:27:40 -08:00 • committed by GitHub
parent 51367df0d2
commit 772511d1e8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 43 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

73
Projects/UOContent/Items/Armor/BaseArmor.cs
View file

@ -887,61 +887,40 @@ namespace Server.Items
public int GetProtOffset() public int GetProtOffset()
{ {
if (Core.T2A) return _protectionLevel switch
{ {
return _protectionLevel switch ArmorProtectionLevel.Guarding => 1,
{ ArmorProtectionLevel.Hardening => 2,
ArmorProtectionLevel.Defense => 5, ArmorProtectionLevel.Fortification => 3,
ArmorProtectionLevel.Guarding => 10, ArmorProtectionLevel.Invulnerability => 4,
ArmorProtectionLevel.Hardening => 15, _ => 0
ArmorProtectionLevel.Fortification => 20, };
ArmorProtectionLevel.Invulnerability => 25,
_ => 0 // regular
};
}
else
{
return _protectionLevel switch
{
ArmorProtectionLevel.Defense => 2,
ArmorProtectionLevel.Guarding => 4,
ArmorProtectionLevel.Hardening => 6,
ArmorProtectionLevel.Fortification => 8,
ArmorProtectionLevel.Invulnerability => 10,
_ => 0 // regular
};
}
} }
public int GetDurabilityBonus() public int GetDurabilityBonus()
{ {
if (Core.UOR) if (!Core.UOR)
{ {
var bonus = _durability switch return (int)_durability * 5 + ((int)_quality - 1) * 10;
{
ArmorDurabilityLevel.Durable => 20,
ArmorDurabilityLevel.Substantial => 50,
ArmorDurabilityLevel.Massive => 70,
ArmorDurabilityLevel.Fortified => 100,
ArmorDurabilityLevel.Indestructible => 120,
_ => 0
};
if (Core.AOS)
{
var resInfo = CraftResources.GetInfo(_resource);
bonus += ArmorAttributes.DurabilityBonus + (resInfo?.AttributeInfo?.ArmorDurability ?? 0);
}
if (_quality == ArmorQuality.Exceptional)
{
return bonus + 20;
}
return bonus;
} }
return (int)_durability * 5 + ((int)_quality - 1) * 10; var bonus = _durability switch
{
ArmorDurabilityLevel.Durable => 20,
ArmorDurabilityLevel.Substantial => 50,
ArmorDurabilityLevel.Massive => 70,
ArmorDurabilityLevel.Fortified => 100,
ArmorDurabilityLevel.Indestructible => 120,
_ => 0
};
if (Core.AOS)
{
var resInfo = CraftResources.GetInfo(_resource);
bonus += ArmorAttributes.DurabilityBonus + (resInfo?.AttributeInfo?.ArmorDurability ?? 0);
}
return _quality == ArmorQuality.Exceptional ? bonus + 20 : bonus;
} }
public static void ValidateMobile(Mobile m) public static void ValidateMobile(Mobile m)

35
Projects/UOContent/Items/Weapons/BaseWeapon.cs
View file

@ -941,9 +941,12 @@ public abstract partial class BaseWeapon
public int GetDurabilityBonus() public int GetDurabilityBonus()
{ {
var bonus = _quality == WeaponQuality.Exceptional ? 20 : 0; if (!Core.UOR)
{
return (int)_durabilityLevel * 5 + ((int)_quality - 1) * 10;
}
bonus += _durabilityLevel switch var bonus = _durabilityLevel switch
{ {
WeaponDurabilityLevel.Durable => 20, WeaponDurabilityLevel.Durable => 20,
WeaponDurabilityLevel.Substantial => 50, WeaponDurabilityLevel.Substantial => 50,
@ -955,23 +958,11 @@ public abstract partial class BaseWeapon
if (Core.AOS) if (Core.AOS)
{ {
bonus += WeaponAttributes.DurabilityBonus;
var resInfo = CraftResources.GetInfo(_resource); var resInfo = CraftResources.GetInfo(_resource);
CraftAttributeInfo attrInfo = null; bonus += WeaponAttributes.DurabilityBonus + (resInfo?.AttributeInfo?.WeaponDurability ?? 0);
if (resInfo != null)
{
attrInfo = resInfo.AttributeInfo;
}
if (attrInfo != null)
{
bonus += attrInfo.WeaponDurability;
}
} }
return bonus; return _quality == WeaponQuality.Exceptional ? bonus + 20 : bonus;
} }
public int GetLowerStatReq() public int GetLowerStatReq()
@ -1354,7 +1345,7 @@ public abstract partial class BaseWeapon
theirValue = Math.Max(0.1, defValue + 50.0); theirValue = Math.Max(0.1, defValue + 50.0);
} }
var chance = ourValue / (theirValue * 2.0) * 1.0 + (double)bonus / 100; var chance = ourValue / (theirValue * 2.0) * 1.0 + (double)bonus / 100;;
if (Core.AOS && chance < 0.02) if (Core.AOS && chance < 0.02)
{ {
@ -2484,7 +2475,15 @@ public abstract partial class BaseWeapon
*/ */
if (_damageLevel != WeaponDamageLevel.Regular) if (_damageLevel != WeaponDamageLevel.Regular)
{ {
damage += 2 * (int)_damageLevel - 1; // Toward the end of T2A, calculations were changed
if (!Core.T2A)
{
damage += (int)_damageLevel;
}
else
{
damage += 2 * (int)_damageLevel - 1;
}
} }
return damage; return damage;