diff --git a/Projects/UOContent/Items/Weapons/Axes/BaseAxe.cs b/Projects/UOContent/Items/Weapons/Axes/BaseAxe.cs index 9b1c0ae66..13c41d0c4 100644 --- a/Projects/UOContent/Items/Weapons/Axes/BaseAxe.cs +++ b/Projects/UOContent/Items/Weapons/Axes/BaseAxe.cs @@ -112,7 +112,7 @@ namespace Server.Items { base.OnHit(attacker, defender, damageBonus); - if (!Core.AOS && (attacker.Player || attacker.Body.IsHuman) && Layer == Layer.TwoHanded && + if (!Core.AOS && Core.UOR && (attacker.Player || attacker.Body.IsHuman) && Layer == Layer.TwoHanded && attacker.Skills.Anatomy.Value >= 80 && attacker.Skills.Anatomy.Value / 400.0 >= Utility.RandomDouble() && DuelContext.AllowSpecialAbility(attacker, "Concussion Blow", false)) diff --git a/Projects/UOContent/Items/Weapons/BaseWeapon.cs b/Projects/UOContent/Items/Weapons/BaseWeapon.cs index 81cf9ee5a..b3397a59c 100644 --- a/Projects/UOContent/Items/Weapons/BaseWeapon.cs +++ b/Projects/UOContent/Items/Weapons/BaseWeapon.cs @@ -2615,7 +2615,7 @@ public abstract partial class BaseWeapon // Passively check Anatomy for gain attacker.CheckSkill(SkillName.Anatomy, 0.0, attacker.Skills.Anatomy.Cap); - if (Type == WeaponType.Axe) + if (Core.UOR && Type == WeaponType.Axe) { // Passively check Lumberjacking for gain attacker.CheckSkill(SkillName.Lumberjacking, 0.0, 100.0); @@ -2636,27 +2636,27 @@ public abstract partial class BaseWeapon /* Compute anatomy modifier * : 1% bonus for every 5 points of anatomy - * : +10% bonus at Grandmaster or higher + * : +10% bonus at Grandmaster or higher (UOTD+) */ var anatomyValue = attacker.Skills.Anatomy.Value; modifiers += anatomyValue / 5.0 / 100.0; - if (anatomyValue >= 100.0) + if (Core.UOTD && anatomyValue >= 100.0) { modifiers += 0.1; } - /* Compute lumberjacking bonus + /* Compute lumberjacking bonus (UOR+) * : 1% bonus for every 5 points of lumberjacking - * : +10% bonus at Grandmaster or higher + * : +10% bonus at Grandmaster or higher (UOTD+) */ - if (Type == WeaponType.Axe) + if (Core.UOR && Type == WeaponType.Axe) { var lumberValue = attacker.Skills.Lumberjacking.Value; modifiers += lumberValue / 5.0 / 100.0; - if (lumberValue >= 100.0) + if (Core.UOTD && lumberValue >= 100.0) { modifiers += 0.1; } diff --git a/Projects/UOContent/Items/Weapons/Fists.cs b/Projects/UOContent/Items/Weapons/Fists.cs index fc4dd2584..ba73fb665 100644 --- a/Projects/UOContent/Items/Weapons/Fists.cs +++ b/Projects/UOContent/Items/Weapons/Fists.cs @@ -45,6 +45,12 @@ namespace Server.Items public override double GetDefendSkillValue(Mobile attacker, Mobile defender) { var wresValue = defender.Skills.Wrestling.Value; + + if (!Core.LBR) + { + return wresValue; + } + var anatValue = defender.Skills.Anatomy.Value; var evalValue = defender.Skills.EvalInt.Value; var incrValue = Math.Min((anatValue + evalValue + 20.0) * 0.5, 120.0); @@ -54,7 +60,7 @@ namespace Server.Items private static void CheckPreAOSMoves(Mobile attacker, Mobile defender) { - if (!attacker.CanBeginAction()) + if (!Core.UOR || !attacker.CanBeginAction()) { return; } @@ -197,7 +203,7 @@ namespace Server.Items public static void DisarmRequest(Mobile m) { - if (Core.AOS) + if (Core.AOS || !Core.UOR) { return; } @@ -230,7 +236,7 @@ namespace Server.Items public static void StunRequest(Mobile m) { - if (Core.AOS || !DuelContext.AllowSpecialAbility(m, "Stun", true)) + if (Core.AOS || !Core.UOR || !DuelContext.AllowSpecialAbility(m, "Stun", true)) { return; } diff --git a/Projects/UOContent/Items/Weapons/Maces/BaseBashing.cs b/Projects/UOContent/Items/Weapons/Maces/BaseBashing.cs index b9870332b..40ab2c919 100644 --- a/Projects/UOContent/Items/Weapons/Maces/BaseBashing.cs +++ b/Projects/UOContent/Items/Weapons/Maces/BaseBashing.cs @@ -28,7 +28,7 @@ namespace Server.Items { var damage = base.GetBaseDamage(attacker); - if (!Core.AOS && (attacker.Player || attacker.Body.IsHuman) && Layer == Layer.TwoHanded && + if (!Core.AOS && Core.UOR && (attacker.Player || attacker.Body.IsHuman) && Layer == Layer.TwoHanded && attacker.Skills.Anatomy.Value >= 80 && attacker.Skills.Anatomy.Value / 400.0 >= Utility.RandomDouble() && DuelContext.AllowSpecialAbility(attacker, "Crushing Blow", false)) diff --git a/Projects/UOContent/Items/Weapons/SpearsAndForks/BaseSpear.cs b/Projects/UOContent/Items/Weapons/SpearsAndForks/BaseSpear.cs index 612ce7033..0cedb68db 100644 --- a/Projects/UOContent/Items/Weapons/SpearsAndForks/BaseSpear.cs +++ b/Projects/UOContent/Items/Weapons/SpearsAndForks/BaseSpear.cs @@ -22,7 +22,7 @@ namespace Server.Items { base.OnHit(attacker, defender, damageBonus); - if (!Core.AOS && Layer == Layer.TwoHanded && + if (!Core.AOS && Core.UOR && Layer == Layer.TwoHanded && attacker.Skills.Anatomy.Value / 400.0 >= Utility.RandomDouble() && DuelContext.AllowSpecialAbility(attacker, "Paralyzing Blow", false)) {