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

fix: Fixes various issues (#748)

Browse source 
https://github.com/modernuo/ModernUO/pull/741/files
This commit is contained in:
Kamron Batman 2021-08-30 07:54:52 -07:00 • committed by GitHub
parent 28faf4346f
commit c789a7f78a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Items/Weapons/Abilities/Dismount.cs
View file

@ -23,7 +23,7 @@ namespace Server.Items
return false;
}
if (from.Mounted && !(from.Weapon is Lance))
if (from.Mounted && from.Weapon is not Lance)
{
from.SendLocalizedMessage(1061283); // You cannot perform that attack while mounted!
return false;

8
Projects/UOContent/Items/Weapons/Abilities/WeaponAbility.cs
View file

@ -174,7 +174,7 @@ namespace Server.Items
public virtual bool CheckWeaponSkill(Mobile from)
{
if (!(from.Weapon is BaseWeapon weapon))
if (from.Weapon is not BaseWeapon weapon)
{
return false;
}
@ -319,7 +319,7 @@ namespace Server.Items
return false;
}
return CheckSkills(from) && CheckMana(from, false);
return CheckSkills(from);
}
public static bool IsWeaponAbility(Mobile m, WeaponAbility a) =>
@ -342,7 +342,7 @@ namespace Server.Items
return null;
}
if (a?.ValidatesDuringHit == true && !a.Validate(m))
if (a?.ValidatesDuringHit == true && (!a.Validate(m) || !a.CheckMana(m, false)))
{
ClearCurrentAbility(m);
return null;
@ -365,7 +365,7 @@ namespace Server.Items
return false;
}
if (a?.Validate(m) == false)
if (a?.Validate(m) == false || a?.CheckMana(m, false) == false)
{
ClearCurrentAbility(m);
return false;

4
Projects/UOContent/Mobiles/Vendors/SBInfo/SBAnimalTrainer.cs
View file

@ -22,7 +22,9 @@ namespace Server.Mobiles
if (!Core.AOS)
{
Add(new AnimalBuyInfo(1, "an eagle", typeof(Eagle), 402, 10, 5, 0));
Add(new AnimalBuyInfo(1, "a brown bear", typeof(BrownBear), 855, 10, 167, 0));
// Using itemID 211 (old value) instead of 167 for compatibility with CUO. Brown bear was not added to UOP
// If/when it is added, CUO will be able to show the 167 value.
Add(new AnimalBuyInfo(1, "a brown bear", typeof(BrownBear), 855, 10, 211, 0));
Add(new AnimalBuyInfo(1, "a grizzly bear", typeof(GrizzlyBear), 1767, 10, 212, 0));
Add(new AnimalBuyInfo(1, "a panther", typeof(Panther), 1271, 10, 214, 0));
Add(new AnimalBuyInfo(1, "a timber wolf", typeof(TimberWolf), 768, 10, 225, 0));