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

fix: Codegens some armors & Fixes code genning of some base addons (#687)

Browse source
This commit is contained in:
Kamron Batman 2021-08-16 16:11:20 -07:00 • committed by GitHub
parent 1323162628
commit 69af652a18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
101 changed files with 365 additions and 1088 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Projects/UOContent/Items/Addons/ElvenStoveSouthAddon.cs
View file

@ -12,17 +12,14 @@ namespace Server.Items
public override BaseAddonDeed Deed => new ElvenStoveSouthDeed();
}
public class ElvenStoveSouthDeed : BaseAddonDeed
[Serializable(0)]
public partial class ElvenStoveSouthDeed : BaseAddonDeed
{
[Constructible]
public ElvenStoveSouthDeed()
{
}
public ElvenStoveSouthDeed(Serial serial) : base(serial)
{
}
public override BaseAddon Addon => new ElvenStoveSouthAddon();
public override int LabelNumber => 1073394; // elven oven (south)
}

18
Projects/UOContent/Items/Addons/ElvenWashbasinEastAddon.cs
View file

@ -1,6 +1,7 @@
namespace Server.Items
{
public class ElvenWashBasinEastAddon : BaseAddon
[Serializable(0)]
public partial class ElvenWashBasinEastAddon : BaseAddon
{
[Constructible]
public ElvenWashBasinEastAddon()
@ -9,29 +10,18 @@ namespace Server.Items
AddComponent(new AddonComponent(0x30E0), 0, 1, 0);
}
public ElvenWashBasinEastAddon(Serial serial) : base(serial)
{
}
public override BaseAddonDeed Deed => new ElvenWashBasinEastDeed();
}
public class ElvenWashBasinEastDeed : BaseAddonDeed
[Serializable(0)]
public partial class ElvenWashBasinEastDeed : BaseAddonDeed
{
[Constructible]
public ElvenWashBasinEastDeed()
{
}
public ElvenWashBasinEastDeed(Serial serial) : base(serial)
{
}
public override BaseAddon Addon => new ElvenWashBasinEastAddon();
public override int LabelNumber => 1073387; // elven wash basin (east)
}
}

18
Projects/UOContent/Items/Addons/ElvenWashbasinSouthAddon.cs
View file

@ -1,6 +1,7 @@
namespace Server.Items
{
public class ElvenWashBasinSouthAddon : BaseAddon
[Serializable(0)]
public partial class ElvenWashBasinSouthAddon : BaseAddon
{
[Constructible]
public ElvenWashBasinSouthAddon()
@ -9,29 +10,18 @@ namespace Server.Items
AddComponent(new AddonComponent(0x30E2), 1, 0, 0);
}
public ElvenWashBasinSouthAddon(Serial serial) : base(serial)
{
}
public override BaseAddonDeed Deed => new ElvenWashBasinSouthDeed();
}
public class ElvenWashBasinSouthDeed : BaseAddonDeed
[Serializable(0)]
public partial class ElvenWashBasinSouthDeed : BaseAddonDeed
{
[Constructible]
public ElvenWashBasinSouthDeed()
{
}
public ElvenWashBasinSouthDeed(Serial serial) : base(serial)
{
}
public override BaseAddon Addon => new ElvenWashBasinSouthAddon();
public override int LabelNumber => 1072865; // elven wash basin (south)
}
}

18
Projects/UOContent/Items/Addons/FancyElvenTableEastAddon.cs
View file

@ -1,6 +1,7 @@
namespace Server.Items
{
public class FancyElvenTableEastAddon : BaseAddon
[Serializable(0)]
public partial class FancyElvenTableEastAddon : BaseAddon
{
[Constructible]
public FancyElvenTableEastAddon()
@ -10,29 +11,18 @@ namespace Server.Items
AddComponent(new AddonComponent(0x3092), 1, 0, 0);
}
public FancyElvenTableEastAddon(Serial serial) : base(serial)
{
}
public override BaseAddonDeed Deed => new FancyElvenTableEastDeed();
}
public class FancyElvenTableEastDeed : BaseAddonDeed
[Serializable(0)]
public partial class FancyElvenTableEastDeed : BaseAddonDeed
{
[Constructible]
public FancyElvenTableEastDeed()
{
}
public FancyElvenTableEastDeed(Serial serial) : base(serial)
{
}
public override BaseAddon Addon => new FancyElvenTableEastAddon();
public override int LabelNumber => 1073386; // hardwood table (east)
}
}

6
Projects/UOContent/Items/Addons/FlourMillEastAddon.cs
View file

@ -16,7 +16,7 @@ namespace Server.Items
Working
}
[Serializable(1, false)]
[Serializable(0, false)]
public partial class FlourMillEastAddon : BaseAddon, IFlourMill
{
private static readonly int[][] m_StageTable =
@ -164,10 +164,6 @@ namespace Server.Items
}
}
private void Deserialize(IGenericReader reader, int version)
{
}
[AfterDeserialization]
private void AfterDeserialization()
{

19
Projects/UOContent/Items/Addons/FlourMillSouthAddon.cs
View file

@ -3,7 +3,7 @@ using Server.Network;
namespace Server.Items
{
[Serializable(1, false)]
[Serializable(0, false)]
public partial class FlourMillSouthAddon : BaseAddon, IFlourMill
{
private static readonly int[][] m_StageTable =
@ -13,7 +13,7 @@ namespace Server.Items
new[] { 0x1930, 0x1930, 0x1934 }
};
private int m_Flour;
private int _flour;
[Constructible]
public FlourMillSouthAddon()
@ -26,10 +26,10 @@ namespace Server.Items
public override BaseAddonDeed Deed => new FlourMillSouthDeed();
[CommandProperty(AccessLevel.GameMaster)]
public bool HasFlour => m_Flour > 0;
public bool HasFlour => _flour > 0;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsFull => m_Flour >= MaxFlour;
public bool IsFull => _flour >= MaxFlour;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsWorking { get; private set; }
@ -37,13 +37,14 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public int MaxFlour => 2;
[SerializableField(0)]
[CommandProperty(AccessLevel.GameMaster)]
public int CurFlour
{
get => m_Flour;
get => _flour;
set
{
m_Flour = Math.Max(0, Math.Min(value, MaxFlour));
_flour = Math.Max(0, Math.Min(value, MaxFlour));
UpdateStage();
}
}
@ -72,7 +73,7 @@ namespace Server.Items
if (from.PlaceInBackpack(flour))
{
m_Flour = 0;
_flour = 0;
}
else
{
@ -151,10 +152,6 @@ namespace Server.Items
}
}
private void Deserialize(IGenericReader reader, int version)
{
}
[AfterDeserialization]
private void AfterDeserialization()
{

6
Projects/UOContent/Items/Addons/LoomEastAddon.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
int Phase { get; set; }
}
[Serializable(1, false)]
[Serializable(0, false)]
public partial class LoomEastAddon : BaseAddon, ILoom
{
[SerializableField(0)]
@ -19,10 +19,6 @@ namespace Server.Items
}
public override BaseAddonDeed Deed => new LoomEastDeed();
private void Deserialize(IGenericReader reader, int version)
{
}
}
[Serializable(0, false)]

6
Projects/UOContent/Items/Addons/LoomSouthAddon.cs
View file

@ -1,6 +1,6 @@
namespace Server.Items
{
[Serializable(1, false)]
[Serializable(0, false)]
public partial class LoomSouthAddon : BaseAddon, ILoom
{
[SerializableField(0)]
@ -14,10 +14,6 @@ namespace Server.Items
}
public override BaseAddonDeed Deed => new LoomSouthDeed();
private void Deserialize(IGenericReader reader, int version)
{
}
}
[Serializable(0, false)]

3
Projects/UOContent/Items/Addons/SquirrelStatueSouthAddon.cs
View file

@ -12,7 +12,8 @@ namespace Server.Items
public override BaseAddonDeed Deed => new SquirrelStatueSouthDeed();
}
public class SquirrelStatueSouthDeed : BaseAddonDeed
[Serializable(0)]
public partial class SquirrelStatueSouthDeed : BaseAddonDeed
{
[Constructible]
public SquirrelStatueSouthDeed()