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

fix: Codegens construction items (#1520)

Browse source
This commit is contained in:
Kamron Batman 2023-09-29 23:28:51 -07:00 • committed by GitHub
parent 972949455b
commit 5dc2d09392
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
83 changed files with 972 additions and 1859 deletions
Download patch file Download diff file Expand all files Collapse all files

131
Projects/UOContent/Items/Construction/Misc/BarrelParts.cs
View file

@ -1,101 +1,34 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class BarrelLid : Item
{
public class BarrelLid : Item
{
[Constructible]
public BarrelLid() : base(0x1DB8) => Weight = 2;
public BarrelLid(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
[Flippable(0x1EB1, 0x1EB2, 0x1EB3, 0x1EB4)]
public class BarrelStaves : Item
{
[Constructible]
public BarrelStaves() : base(0x1EB1) => Weight = 1;
public BarrelStaves(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class BarrelHoops : Item
{
[Constructible]
public BarrelHoops() : base(0x1DB7) => Weight = 5;
public BarrelHoops(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1011228; // Barrel hoops
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class BarrelTap : Item
{
[Constructible]
public BarrelTap() : base(0x1004) => Weight = 1;
public BarrelTap(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
[Constructible]
public BarrelLid() : base(0x1DB8) => Weight = 2;
}
[Flippable(0x1EB1, 0x1EB2, 0x1EB3, 0x1EB4)]
[SerializationGenerator(0, false)]
public partial class BarrelStaves : Item
{
[Constructible]
public BarrelStaves() : base(0x1EB1) => Weight = 1;
}
[SerializationGenerator(0, false)]
public partial class BarrelHoops : Item
{
[Constructible]
public BarrelHoops() : base(0x1DB7) => Weight = 5;
public override int LabelNumber => 1011228; // Barrel hoops
}
[SerializationGenerator(0, false)]
public partial class BarrelTap : Item
{
[Constructible]
public BarrelTap() : base(0x1004) => Weight = 1;
}

43
Projects/UOContent/Items/Construction/Misc/Easel.cs
View file

@ -1,34 +1,13 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[Furniture]
[Flippable(0xF65, 0xF67, 0xF69)]
[TypeAlias("Server.Items.Easle")]
[SerializationGenerator(0, false)]
public partial class Easel : Item
{
[Furniture]
[Flippable(0xF65, 0xF67, 0xF69)]
[TypeAlias("Server.Items.Easle")]
public class Easel : Item
{
[Constructible]
public Easel() : base(0xF65) => Weight = 25.0;
public Easel(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (Weight == 10.0)
{
Weight = 25.0;
}
}
}
[Constructible]
public Easel() : base(0xF65) => Weight = 25.0;
}

40
Projects/UOContent/Items/Construction/Misc/MeltedWax.cs
View file

@ -1,32 +1,16 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class MeltedWax : Item
{
public class MeltedWax : Item
[Constructible]
public MeltedWax() : base(0x122A)
{
[Constructible]
public MeltedWax() : base(0x122A)
{
Movable = false;
Hue = 0x835;
}
public MeltedWax(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1016492; // melted wax
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
Movable = false;
Hue = 0x835;
}
public override int LabelNumber => 1016492; // melted wax
}

81
Projects/UOContent/Items/Construction/Misc/MusicStand.cs
View file

@ -1,64 +1,21 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[Furniture]
[Flippable(0xEBB, 0xEBC)]
[SerializationGenerator(0, false)]
public partial class TallMusicStand : Item
{
[Furniture]
[Flippable(0xEBB, 0xEBC)]
public class TallMusicStand : Item
{
[Constructible]
public TallMusicStand() : base(0xEBB) => Weight = 10.0;
public TallMusicStand(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (Weight == 8.0)
{
Weight = 10.0;
}
}
}
[Furniture]
[Flippable(0xEB6, 0xEB8)]
public class ShortMusicStand : Item
{
[Constructible]
public ShortMusicStand() : base(0xEB6) => Weight = 10.0;
public ShortMusicStand(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (Weight == 6.0)
{
Weight = 10.0;
}
}
}
[Constructible]
public TallMusicStand() : base(0xEBB) => Weight = 10.0;
}
[Furniture]
[Flippable(0xEB6, 0xEB8)]
[SerializationGenerator(0, false)]
public partial class ShortMusicStand : Item
{
[Constructible]
public ShortMusicStand() : base(0xEB6) => Weight = 10.0;
}

34
Projects/UOContent/Items/Construction/Misc/Obelisk.cs
View file

@ -1,28 +1,12 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class Obelisk : Item
{
public class Obelisk : Item
{
[Constructible]
public Obelisk() : base(0x1184) => Movable = false;
[Constructible]
public Obelisk() : base(0x1184) => Movable = false;
public Obelisk(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1016474; // an obelisk
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public override int LabelNumber => 1016474; // an obelisk
}

71
Projects/UOContent/Items/Construction/Misc/Screens.cs
View file

@ -1,54 +1,21 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[Furniture]
[Flippable(0x24D0, 0x24D1, 0x24D2, 0x24D3, 0x24D4)]
[SerializationGenerator(0, false)]
public partial class BambooScreen : Item
{
[Furniture]
[Flippable(0x24D0, 0x24D1, 0x24D2, 0x24D3, 0x24D4)]
public class BambooScreen : Item
{
[Constructible]
public BambooScreen() : base(0x24D0) => Weight = 20.0;
public BambooScreen(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
[Furniture]
[Flippable(0x24CB, 0x24CC, 0x24CD, 0x24CE, 0x24CF)]
public class ShojiScreen : Item
{
[Constructible]
public ShojiScreen() : base(0x24CB) => Weight = 20.0;
public ShojiScreen(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
[Constructible]
public BambooScreen() : base(0x24D0) => Weight = 20.0;
}
[Furniture]
[Flippable(0x24CB, 0x24CC, 0x24CD, 0x24CE, 0x24CF)]
[SerializationGenerator(0, false)]
public partial class ShojiScreen : Item
{
[Constructible]
public ShojiScreen() : base(0x24CB) => Weight = 20.0;
}

415
Projects/UOContent/Items/Construction/Misc/Statues.cs
View file

@ -1,312 +1,109 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class StatueSouth : Item
{
public class StatueSouth : Item
{
[Constructible]
public StatueSouth() : base(0x139A) => Weight = 10;
[Constructible]
public StatueSouth() : base(0x139A) => Weight = 10;
public StatueSouth(Serial serial) : base(serial)
{
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class StatueSouth2 : Item
{
[Constructible]
public StatueSouth2() : base(0x1227) => Weight = 10;
public StatueSouth2(Serial serial) : base(serial)
{
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class StatueNorth : Item
{
[Constructible]
public StatueNorth() : base(0x139B) => Weight = 10;
public StatueNorth(Serial serial) : base(serial)
{
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class StatueWest : Item
{
[Constructible]
public StatueWest() : base(0x1226) => Weight = 10;
public StatueWest(Serial serial) : base(serial)
{
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class StatueEast : Item
{
[Constructible]
public StatueEast() : base(0x139C) => Weight = 10;
public StatueEast(Serial serial) : base(serial)
{
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class StatueEast2 : Item
{
[Constructible]
public StatueEast2() : base(0x1224) => Weight = 10;
public StatueEast2(Serial serial) : base(serial)
{
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class StatueSouthEast : Item
{
[Constructible]
public StatueSouthEast() : base(0x1225) => Weight = 10;
public StatueSouthEast(Serial serial) : base(serial)
{
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class BustSouth : Item
{
[Constructible]
public BustSouth() : base(0x12CB) => Weight = 10;
public BustSouth(Serial serial) : base(serial)
{
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class BustEast : Item
{
[Constructible]
public BustEast() : base(0x12CA) => Weight = 10;
public BustEast(Serial serial) : base(serial)
{
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class StatuePegasus : Item
{
[Constructible]
public StatuePegasus() : base(0x139D) => Weight = 10;
public StatuePegasus(Serial serial) : base(serial)
{
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class StatuePegasus2 : Item
{
[Constructible]
public StatuePegasus2() : base(0x1228) => Weight = 10;
public StatuePegasus2(Serial serial) : base(serial)
{
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class SmallTowerSculpture : Item
{
[Constructible]
public SmallTowerSculpture() : base(0x241A) => Weight = 20.0;
public SmallTowerSculpture(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
}
[SerializationGenerator(0, false)]
public partial class StatueSouth2 : Item
{
[Constructible]
public StatueSouth2() : base(0x1227) => Weight = 10;
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
}
[SerializationGenerator(0, false)]
public partial class StatueNorth : Item
{
[Constructible]
public StatueNorth() : base(0x139B) => Weight = 10;
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
}
[SerializationGenerator(0, false)]
public partial class StatueWest : Item
{
[Constructible]
public StatueWest() : base(0x1226) => Weight = 10;
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
}
[SerializationGenerator(0, false)]
public partial class StatueEast : Item
{
[Constructible]
public StatueEast() : base(0x139C) => Weight = 10;
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
}
[SerializationGenerator(0, false)]
public partial class StatueEast2 : Item
{
[Constructible]
public StatueEast2() : base(0x1224) => Weight = 10;
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
}
[SerializationGenerator(0, false)]
public partial class StatueSouthEast : Item
{
[Constructible]
public StatueSouthEast() : base(0x1225) => Weight = 10;
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
}
[SerializationGenerator(0, false)]
public partial class BustSouth : Item
{
[Constructible]
public BustSouth() : base(0x12CB) => Weight = 10;
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
}
[SerializationGenerator(0, false)]
public partial class BustEast : Item
{
[Constructible]
public BustEast() : base(0x12CA) => Weight = 10;
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
}
[SerializationGenerator(0, false)]
public partial class StatuePegasus : Item
{
[Constructible]
public StatuePegasus() : base(0x139D) => Weight = 10;
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
}
[SerializationGenerator(0, false)]
public partial class StatuePegasus2 : Item
{
[Constructible]
public StatuePegasus2() : base(0x1228) => Weight = 10;
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
}
[SerializationGenerator(0, false)]
public partial class SmallTowerSculpture : Item
{
[Constructible]
public SmallTowerSculpture() : base(0x241A) => Weight = 20.0;
}

94
Projects/UOContent/Items/Construction/Misc/Vase.cs
View file

@ -1,74 +1,24 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class Vase : Item
{
public class Vase : Item
{
[Constructible]
public Vase() : base(0xB46) => Weight = 10;
public Vase(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class LargeVase : Item
{
[Constructible]
public LargeVase() : base(0xB45) => Weight = 15;
public LargeVase(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class SmallUrn : Item
{
[Constructible]
public SmallUrn() : base(0x241C) => Weight = 20.0;
public SmallUrn(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
[Constructible]
public Vase() : base(0xB46) => Weight = 10;
}
[SerializationGenerator(0, false)]
public partial class LargeVase : Item
{
[Constructible]
public LargeVase() : base(0xB45) => Weight = 15;
}
[SerializationGenerator(0, false)]
public partial class SmallUrn : Item
{
[Constructible]
public SmallUrn() : base(0x241C) => Weight = 20.0;
}

60
Projects/UOContent/Items/Construction/Misc/Vines.cs
View file

@ -1,42 +1,26 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class Vines : Item
{
public class Vines : Item
[Constructible]
public Vines() : this(Utility.Random(8))
{
[Constructible]
public Vines() : this(Utility.Random(8))
{
}
[Constructible]
public Vines(int v) : base(0xCEB)
{
if (v is < 0 or > 7)
{
v = 0;
}
ItemID += v;
Weight = 1.0;
}
public Vines(Serial serial) : base(serial)
{
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
[Constructible]
public Vines(int v) : base(0xCEB)
{
if (v is < 0 or > 7)
{
v = 0;
}
ItemID += v;
Weight = 1.0;
}
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
}