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

fix: Fixes ore stacking (#1162)

Browse source
This commit is contained in:
Kamron Batman 2022-09-05 18:11:27 -07:00 • committed by GitHub
parent 5a374e75c9
commit 2dec2f2fd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Projects/UOContent/Items/Resources/Blacksmithing/Ore.cs
View file

@ -73,15 +73,17 @@ namespace Server.Items
private static int RandomSize() => private static int RandomSize() =>
Utility.RandomDouble() switch Utility.RandomDouble() switch
{ {
< 0.12 => 0x19B7, // Small < 0.125 => 0x19B7, // Small
< 0.18 => 0x19B8, // Medium clump < 0.1875 => 0x19B8, // Medium clump
< 0.25 => 0x19BA, // Medium < 0.25 => 0x19BA, // Medium
_ => 0x19B9 // Large _ => 0x19B9 // Large
}; };
public override bool CanStackWith(Item dropped) => public override bool CanStackWith(Item dropped) =>
dropped.Stackable && Stackable && dropped.GetType() == GetType() && dropped.Hue == Hue && dropped.Stackable && Stackable && dropped.Hue == Hue &&
dropped.Name == Name && dropped.Amount + Amount <= 60000 && dropped != this; dropped.GetType() == GetType() && dropped.ItemID == ItemID &&
(dropped as BaseOre)?._resource == _resource && dropped.Name == Name &&
dropped.Amount + Amount <= 60000 && dropped != this;
public override void AddNameProperty(IPropertyList list) public override void AddNameProperty(IPropertyList list)
{ {
@ -210,9 +212,8 @@ namespace Server.Items
if (m_Ore.ItemID == 0x19B7 && m_Ore.Amount < 2) if (m_Ore.ItemID == 0x19B7 && m_Ore.Amount < 2)
{ {
from.SendLocalizedMessage( // There is not enough metal-bearing ore in this pile to make an ingot.
501987 from.SendLocalizedMessage(501987);
); // There is not enough metal-bearing ore in this pile to make an ingot.
return; return;
} }