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

fix: Fixes fist disarm (pre-aos) (#2214)

Browse source
This commit is contained in:
Kamron Batman 2025-06-07 15:22:54 -10:00 • committed by GitHub
parent c8d489b72b
commit a286e282a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 50 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

93
Projects/UOContent/Items/Weapons/Fists.cs
View file

@ -50,7 +50,7 @@ namespace Server.Items
return wresValue > incrValue ? wresValue : incrValue;
}
private void CheckPreAOSMoves(Mobile attacker, Mobile defender)
private static void CheckPreAOSMoves(Mobile attacker, Mobile defender)
{
if (!attacker.CanBeginAction<Fists>())
{
@ -90,60 +90,67 @@ namespace Server.Items
attacker.SendLocalizedMessage(1004010); // You failed in your attempt to stun.
defender.SendLocalizedMessage(1004011); // Your opponent tried to stun you and failed.
}
return;
}
else if (attacker.DisarmReady)
if (!attacker.DisarmReady)
{
if (!defender.Player && !defender.Body.IsHuman)
{
attacker.SendLocalizedMessage(1004001); // You cannot disarm your opponent.
return;
}
return;
}
if (attacker.Skills.ArmsLore.Value < 80.0 || attacker.Skills.Wrestling.Value < 80.0)
{
attacker.SendLocalizedMessage(1004002); // You are not skilled enough to disarm your opponent.
attacker.DisarmReady = false;
return;
}
if (!defender.Player && !defender.Body.IsHuman)
{
attacker.SendLocalizedMessage(1004001); // You cannot disarm your opponent.
return;
}
if (attacker.Stam < 15)
{
attacker.SendLocalizedMessage(1004003); // You are too fatigued to attempt anything.
return;
}
if (attacker.Skills.ArmsLore.Value < 80.0 || attacker.Skills.Wrestling.Value < 80.0)
{
attacker.SendLocalizedMessage(1004002); // You are not skilled enough to disarm your opponent.
attacker.DisarmReady = false;
return;
}
var toDisarm = defender.FindItemOnLayer(Layer.OneHanded);
if (attacker.Stam < 15)
{
attacker.SendLocalizedMessage(1004003); // You are too fatigued to attempt anything.
return;
}
if (toDisarm?.Movable == false)
{
toDisarm = defender.FindItemOnLayer(Layer.TwoHanded);
}
var toDisarm = defender.FindItemOnLayer(Layer.OneHanded);
var pack = defender.Backpack;
if (toDisarm?.Movable != true)
{
toDisarm = defender.FindItemOnLayer(Layer.TwoHanded);
}
if (pack == null || toDisarm?.Movable == false)
{
attacker.SendLocalizedMessage(1004001); // You cannot disarm your opponent.
}
else if (CheckMove(attacker, SkillName.ArmsLore))
{
StartMoveDelay(attacker);
var pack = defender.Backpack;
attacker.Stam -= 15;
attacker.DisarmReady = false;
if (pack == null || toDisarm?.Movable != true)
{
attacker.SendLocalizedMessage(1004001); // You cannot disarm your opponent.
return;
}
attacker.SendLocalizedMessage(1004006); // You successfully disarm your opponent!
defender.SendLocalizedMessage(1004007); // You have been disarmed!
if (CheckMove(attacker, SkillName.ArmsLore))
{
StartMoveDelay(attacker);
pack.DropItem(toDisarm);
}
else
{
attacker.Stam -= 15;
attacker.Stam -= 15;
attacker.DisarmReady = false;
attacker.SendLocalizedMessage(1004004); // You failed in your attempt to disarm.
defender.SendLocalizedMessage(1004005); // Your opponent tried to disarm you but failed.
}
attacker.SendLocalizedMessage(1004006); // You successfully disarm your opponent!
defender.SendLocalizedMessage(1004007); // You have been disarmed!
pack.DropItem(toDisarm);
}
else
{
attacker.Stam -= 15;
attacker.SendLocalizedMessage(1004004); // You failed in your attempt to disarm.
defender.SendLocalizedMessage(1004005); // Your opponent tried to disarm you but failed.
}
}