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

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

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)