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

#W# Merge: Merged with upstream. Conflicts resolved.

Browse source
This commit is contained in:
WarrentyExpired 2026-10-27 19:56:03 -04:00
commit f6f50470a9
276 changed files with 6742 additions and 8845 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Projects/UOContent/Items/Weapons/Abilities/MovingShot.cs
View file

@ -11,8 +11,9 @@ namespace Server.Items
public override bool ValidatesDuringHit => false;
// Mana is only checked here; OnHit/OnMiss charge it, since they run only for a shot that actually fired.
public override bool OnBeforeSwing(Mobile attacker, Mobile defender) =>
Validate(attacker) && CheckMana(attacker, true);
Validate(attacker) && CheckMana(attacker, false);
public override void OnMiss(Mobile attacker, Mobile defender)
{
@ -20,7 +21,10 @@ namespace Server.Items
ClearCurrentAbility(attacker);
attacker.SendLocalizedMessage(1060089); // You fail to execute your special move
if (CheckMana(attacker, true))
{
attacker.SendLocalizedMessage(1060089); // You fail to execute your special move
}
}
public override void OnHit(Mobile attacker, Mobile defender, int damage, WorldLocation worldLocation)
@ -29,7 +33,10 @@ namespace Server.Items
ClearCurrentAbility(attacker);
attacker.SendLocalizedMessage(1060216); // Your shot was successful
if (CheckMana(attacker, true))
{
attacker.SendLocalizedMessage(1060216); // Your shot was successful
}
}
}
}

2
Projects/UOContent/Items/Weapons/Ranged/BaseRanged.cs
View file

@ -206,7 +206,7 @@ namespace Server.Items
var result = base.OnCraft(quality, makersMark, from, craftSystem, typeRes, tool, craftItem, resHue);
if (Core.ML)
{
ApplyWoodBonuses(typeRes);
ApplyWoodBonuses(typeRes ?? craftItem.Resources[0].ItemType);
}
return result;