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

fix: Fixes commodity resource property hue (#1875)

Browse source 
### Summary

- Fixes resource commodities so the hue changes when setting the resource
- Fixes some commodities not being able to be modified in-game.
This commit is contained in:
Kamron Batman 2024-07-20 15:37:16 -07:00 • committed by GitHub
parent eed11be012
commit 3cb688a2fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 151 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Items/Food/Cooking.cs
View file

@ -65,8 +65,8 @@ public partial class SackFlour : Item, IHasQuantity
_quantity = 20;
}
[CommandProperty(AccessLevel.GameMaster)]
[SerializableProperty(0)]
[CommandProperty(AccessLevel.GameMaster)]
public int Quantity
{
get => _quantity;

25
Projects/UOContent/Items/Resources/Blacksmithing/Ingots.cs
View file

@ -5,11 +5,6 @@ namespace Server.Items;
[SerializationGenerator(2, false)]
public abstract partial class BaseIngot : Item, ICommodity
{
[InvalidateProperties]
[SerializedCommandProperty(AccessLevel.GameMaster)]
[SerializableField(0)]
private CraftResource _resource;
public BaseIngot(CraftResource resource, int amount = 1) : base(0x1BF2)
{
Stackable = true;
@ -21,6 +16,24 @@ public abstract partial class BaseIngot : Item, ICommodity
public override double DefaultWeight => 0.1;
[SerializableProperty(0)]
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => _resource;
set
{
if (_resource != value)
{
_resource = value;
Hue = CraftResources.GetHue(value);
InvalidateProperties();
this.MarkDirty();
}
}
}
public override int LabelNumber
{
get
@ -162,4 +175,4 @@ public partial class ValoriteIngot : BaseIngot
public ValoriteIngot(int amount = 1) : base(CraftResource.Valorite, amount)
{
}
}
}

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

@ -17,10 +17,23 @@ public abstract partial class BaseOre : Item
_resource = resource;
}
[InvalidateProperties]
[SerializedCommandProperty(AccessLevel.GameMaster)]
[SerializableField(0)]
private CraftResource _resource;
[SerializableProperty(0)]
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => _resource;
set
{
if (_resource != value)
{
_resource = value;
Hue = CraftResources.GetHue(value);
InvalidateProperties();
this.MarkDirty();
}
}
}
public override int LabelNumber
{

23
Projects/UOContent/Items/Resources/Blacksmithing/Scales.cs
View file

@ -5,11 +5,6 @@ namespace Server.Items;
[SerializationGenerator(1, false)]
public abstract partial class BaseScales : Item, ICommodity
{
[InvalidateProperties]
[SerializableField(0)]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private CraftResource _resource;
public BaseScales(CraftResource resource, int amount = 1) : base(0x26B4)
{
Stackable = true;
@ -19,6 +14,24 @@ public abstract partial class BaseScales : Item, ICommodity
_resource = resource;
}
[SerializableProperty(0)]
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => _resource;
set
{
if (_resource != value)
{
_resource = value;
Hue = CraftResources.GetHue(value);
InvalidateProperties();
this.MarkDirty();
}
}
}
public override int LabelNumber => 1053139; // dragon scales
public override double DefaultWeight => 0.1;

23
Projects/UOContent/Items/Resources/Masonry/Granite.cs
View file

@ -5,11 +5,6 @@ namespace Server.Items;
[SerializationGenerator(2, false)]
public abstract partial class BaseGranite : Item
{
[InvalidateProperties]
[SerializableField(0)]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private CraftResource _resource;
public BaseGranite(CraftResource resource) : base(0x1779)
{
Hue = CraftResources.GetHue(resource);
@ -20,6 +15,24 @@ public abstract partial class BaseGranite : Item
public override double DefaultWeight => Core.ML ? 1.0 : 10.0;
[SerializableProperty(0)]
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => _resource;
set
{
if (_resource != value)
{
_resource = value;
Hue = CraftResources.GetHue(value);
InvalidateProperties();
this.MarkDirty();
}
}
}
public override int LabelNumber => 1044607; // high quality granite
private void Deserialize(IGenericReader reader, int version)

26
Projects/UOContent/Items/Resources/Tailor/Hides.cs
View file

@ -1,15 +1,11 @@
using ModernUO.Serialization;
using Server.Engines.Craft;
namespace Server.Items;
[SerializationGenerator(2, false)]
public abstract partial class BaseHides : Item, ICommodity
{
[InvalidateProperties]
[SerializedCommandProperty(AccessLevel.GameMaster)]
[SerializableField(0)]
private CraftResource _resource;
public BaseHides(CraftResource resource, int amount = 1) : base(0x1079)
{
Stackable = true;
@ -20,6 +16,24 @@ public abstract partial class BaseHides : Item, ICommodity
_resource = resource;
}
[SerializableProperty(0)]
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => _resource;
set
{
if (_resource != value)
{
_resource = value;
Hue = CraftResources.GetHue(value);
InvalidateProperties();
this.MarkDirty();
}
}
}
public override int LabelNumber
{
get
@ -183,4 +197,4 @@ public partial class BarbedHides : BaseHides, IScissorable
return true;
}
}
}

25
Projects/UOContent/Items/Resources/Tailor/Leathers.cs
View file

@ -5,11 +5,6 @@ namespace Server.Items;
[SerializationGenerator(2, false)]
public abstract partial class BaseLeather : Item, ICommodity
{
[InvalidateProperties]
[SerializedCommandProperty(AccessLevel.GameMaster)]
[SerializableField(0)]
private CraftResource _resource;
public BaseLeather(CraftResource resource, int amount = 1) : base(0x1081)
{
Stackable = true;
@ -20,6 +15,24 @@ public abstract partial class BaseLeather : Item, ICommodity
_resource = resource;
}
[SerializableProperty(0)]
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => _resource;
set
{
if (_resource != value)
{
_resource = value;
Hue = CraftResources.GetHue(value);
InvalidateProperties();
this.MarkDirty();
}
}
}
public override int LabelNumber
{
get
@ -111,4 +124,4 @@ public partial class BarbedLeather : BaseLeather
public BarbedLeather(int amount = 1) : base(CraftResource.BarbedLeather, amount)
{
}
}
}

22
Projects/UOContent/Items/Skill Items/Carpenter Items/Board.cs
View file

@ -6,10 +6,6 @@ namespace Server.Items;
[SerializationGenerator(4, false)]
public partial class Board : Item, ICommodity
{
[InvalidateProperties]
[SerializableField(0)]
private CraftResource _resource;
[Constructible]
public Board(int amount = 1) : this(CraftResource.RegularWood, amount)
{
@ -25,6 +21,24 @@ public partial class Board : Item, ICommodity
Hue = CraftResources.GetHue(resource);
}
[SerializableProperty(0)]
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => _resource;
set
{
if (_resource != value)
{
_resource = value;
Hue = CraftResources.GetHue(value);
InvalidateProperties();
this.MarkDirty();
}
}
}
int ICommodity.DescriptionNumber
{
get

2
Projects/UOContent/Items/Skill Items/Fishing/Misc/MessageInABottle.cs
View file

@ -24,8 +24,8 @@ public partial class MessageInABottle : Item
public override int LabelNumber => 1041080; // a message in a bottle
[CommandProperty(AccessLevel.GameMaster)]
[SerializableProperty(0)]
[CommandProperty(AccessLevel.GameMaster)]
public int Level
{
get => _level;

2
Projects/UOContent/Items/Skill Items/Fishing/Misc/SOS.cs
View file

@ -103,8 +103,8 @@ public partial class SOS : Item
[CommandProperty(AccessLevel.GameMaster)]
public bool IsAncient => _level >= 4;
[CommandProperty(AccessLevel.GameMaster)]
[SerializableProperty(0)]
[CommandProperty(AccessLevel.GameMaster)]
public int Level
{
get => _level;

23
Projects/UOContent/Items/Skill Items/Lumberjack/Log.cs
View file

@ -6,11 +6,6 @@ namespace Server.Items;
[Flippable(0x1bdd, 0x1be0)]
public partial class Log : Item, ICommodity, IAxe
{
[InvalidateProperties]
[SerializedCommandProperty(AccessLevel.GameMaster)]
[SerializableField(0)]
private CraftResource _resource;
[Constructible]
public Log(int amount = 1) : this(CraftResource.RegularWood, amount)
{
@ -32,6 +27,24 @@ public partial class Log : Item, ICommodity, IAxe
Hue = CraftResources.GetHue(resource);
}
[SerializableProperty(0)]
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => _resource;
set
{
if (_resource != value)
{
_resource = value;
Hue = CraftResources.GetHue(value);
InvalidateProperties();
this.MarkDirty();
}
}
}
public virtual bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 0, new Board());
int ICommodity.DescriptionNumber => CraftResources.IsStandard(_resource)

2
Projects/UOContent/Items/Special/MiniHouses.cs
View file

@ -14,8 +14,8 @@ public partial class MiniHouseAddon : BaseAddon
Construct();
}
[CommandProperty(AccessLevel.GameMaster)]
[SerializableProperty(0)]
[CommandProperty(AccessLevel.GameMaster)]
public MiniHouseType Type
{
get => _type;