fix: Converts houses/deeds to serialization generator (#2288)

### Summary
* Converts HouseDeeds to serialization generator
* Converts Houses to serialization generator
* Converts ContestHouses to serialization generator
This commit is contained in:
Kamron Batman 2025-12-04 21:26:39 -08:00 committed by GitHub
parent d984961b38
commit 771cb50919
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
63 changed files with 1872 additions and 2528 deletions

File diff suppressed because it is too large Load diff

View file

@ -1,586 +1,388 @@
using ModernUO.Serialization;
using Server.Items;
using Server.Multis.Deeds;
namespace Server.Multis
namespace Server.Multis;
[SerializationGenerator(0, false)]
public partial class SmallOldHouse : BaseHouse
{
public class SmallOldHouse : BaseHouse
public static readonly Rectangle2D[] AreaArray = [new(-3, -3, 7, 7), new(-1, 4, 3, 1)];
public SmallOldHouse(Mobile owner, int id) : base(id, owner, 425, 3)
{
public static Rectangle2D[] AreaArray = { new(-3, -3, 7, 7), new(-1, 4, 3, 1) };
var keyValue = CreateKeys(owner);
public SmallOldHouse(Mobile owner, int id) : base(id, owner, 425, 3)
{
var keyValue = CreateKeys(owner);
AddSouthDoor(0, 3, 7, keyValue);
AddSouthDoor(0, 3, 7, keyValue);
SetSign(2, 4, 5);
}
public SmallOldHouse(Serial serial) : base(serial)
{
}
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(2, 4, 0);
public override int DefaultPrice => 43800;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[0];
public override HouseDeed GetDeed()
{
return ItemID switch
{
0x64 => new StonePlasterHouseDeed(),
0x66 => new FieldStoneHouseDeed(),
0x68 => new SmallBrickHouseDeed(),
0x6A => new WoodHouseDeed(),
0x6C => new WoodPlasterHouseDeed(),
0x6E => new ThatchedRoofCottageDeed(),
_ => new ThatchedRoofCottageDeed()
};
}
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();
}
SetSign(2, 4, 5);
}
public class GuildHouse : BaseHouse
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(2, 4, 0);
public override int DefaultPrice => 43800;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[0];
public override HouseDeed GetDeed()
{
public static Rectangle2D[] AreaArray = { new(-7, -7, 14, 14), new(-2, 7, 4, 1) };
public GuildHouse(Mobile owner) : base(0x74, owner, 1100, 8)
return ItemID switch
{
var keyValue = CreateKeys(owner);
AddSouthDoors(-1, 6, 7, keyValue);
SetSign(4, 8, 16);
AddSouthDoor(-3, -1, 7);
AddSouthDoor(3, -1, 7);
}
public GuildHouse(Serial serial) : base(serial)
{
}
public override int DefaultPrice => 144500;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[20];
public override int ConvertOffsetX => -1;
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(4, 8, 0);
public override HouseDeed GetDeed() => new BrickHouseDeed();
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();
}
}
public class TwoStoryHouse : BaseHouse
{
public static Rectangle2D[] AreaArray =
{ new(-7, 0, 14, 7), new(-7, -7, 9, 7), new(-4, 7, 4, 1) };
public TwoStoryHouse(Mobile owner, int id) : base(id, owner, 1370, 10)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(-3, 6, 7, keyValue);
SetSign(2, 8, 16);
AddSouthDoor(-3, 0, 7);
AddSouthDoor(id == 0x76 ? -2 : -3, 0, 27);
}
public TwoStoryHouse(Serial serial) : base(serial)
{
}
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(2, 8, 0);
public override int DefaultPrice => 192400;
public override HouseDeed GetDeed()
{
return ItemID switch
{
0x76 => new TwoStoryWoodPlasterHouseDeed(),
0x78 => new TwoStoryStonePlasterHouseDeed(),
_ => new TwoStoryStonePlasterHouseDeed()
};
}
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();
}
}
public class Tower : BaseHouse
{
public static Rectangle2D[] AreaArray =
{
new(-7, -7, 16, 14), new(-1, 7, 4, 2), new(-11, 0, 4, 7),
new(9, 0, 4, 7)
0x64 => new StonePlasterHouseDeed(),
0x66 => new FieldStoneHouseDeed(),
0x68 => new SmallBrickHouseDeed(),
0x6A => new WoodHouseDeed(),
0x6C => new WoodPlasterHouseDeed(),
_ => new ThatchedRoofCottageDeed()
};
}
}
[SerializationGenerator(0, false)]
public partial class GuildHouse : BaseHouse
{
public static readonly Rectangle2D[] AreaArray = [new(-7, -7, 14, 14), new(-2, 7, 4, 1)];
public GuildHouse(Mobile owner) : base(0x74, owner, 1100, 8)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(-1, 6, 7, keyValue);
SetSign(4, 8, 16);
AddSouthDoor(-3, -1, 7);
AddSouthDoor(3, -1, 7);
}
public override int DefaultPrice => 144500;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[20];
public override int ConvertOffsetX => -1;
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(4, 8, 0);
public override HouseDeed GetDeed() => new BrickHouseDeed();
}
[SerializationGenerator(0, false)]
public partial class TwoStoryHouse : BaseHouse
{
public static readonly Rectangle2D[] AreaArray =
[new(-7, 0, 14, 7), new(-7, -7, 9, 7), new(-4, 7, 4, 1)];
public TwoStoryHouse(Mobile owner, int id) : base(id, owner, 1370, 10)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(-3, 6, 7, keyValue);
SetSign(2, 8, 16);
AddSouthDoor(-3, 0, 7);
AddSouthDoor(id == 0x76 ? -2 : -3, 0, 27);
}
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(2, 8, 0);
public override int DefaultPrice => 192400;
public override HouseDeed GetDeed()
{
return ItemID switch
{
0x76 => new TwoStoryWoodPlasterHouseDeed(),
_ => new TwoStoryStonePlasterHouseDeed()
};
}
}
[SerializationGenerator(0, false)]
public partial class Tower : BaseHouse
{
public static readonly Rectangle2D[] AreaArray =
[
new(-7, -7, 16, 14), new(-1, 7, 4, 2), new(-11, 0, 4, 7),
new(9, 0, 4, 7)
];
public Tower(Mobile owner) : base(0x7A, owner, 2119, 15)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(false, 0, 6, 6, keyValue);
SetSign(5, 8, 16);
AddSouthDoor(false, 3, -2, 6);
AddEastDoor(false, 1, 4, 26);
AddEastDoor(false, 1, 4, 46);
}
public override int DefaultPrice => 433200;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[37];
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(5, 8, 0);
public override HouseDeed GetDeed() => new TowerDeed();
}
[SerializationGenerator(0, false)]
public partial class Keep : BaseHouse // warning: ODD shape!
{
public static readonly Rectangle2D[] AreaArray =
[
new(-11, -11, 7, 8), new(-11, 5, 7, 8), new(6, -11, 7, 8),
new(6, 5, 7, 8), new(-9, -3, 5, 8), new(6, -3, 5, 8),
new(-4, -9, 10, 20), new(-1, 11, 4, 1)
];
public Keep(Mobile owner) : base(0x7C, owner, 2625, 18)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(false, 0, 10, 6, keyValue);
SetSign(5, 12, 16);
}
public override int DefaultPrice => 665200;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(5, 13, 0);
public override HouseDeed GetDeed() => new KeepDeed();
}
[SerializationGenerator(0, false)]
public partial class Castle : BaseHouse
{
public static readonly Rectangle2D[] AreaArray = [new(-15, -15, 31, 31), new(-1, 16, 4, 1)];
public Castle(Mobile owner) : base(0x7E, owner, 4076, 28)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(false, 0, 15, 6, keyValue);
SetSign(5, 17, 16);
AddSouthDoors(false, 0, 11, 6, true);
AddSouthDoors(false, 0, 5, 6, false);
AddSouthDoors(false, -1, -11, 6, false);
}
public override int DefaultPrice => 1022800;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(5, 17, 0);
public override HouseDeed GetDeed() => new CastleDeed();
}
[SerializationGenerator(0, false)]
public partial class LargePatioHouse : BaseHouse
{
public static readonly Rectangle2D[] AreaArray = [new(-7, -7, 15, 14), new(-5, 7, 4, 1)];
public LargePatioHouse(Mobile owner) : base(0x8C, owner, 1100, 8)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(-4, 6, 7, keyValue);
SetSign(1, 8, 16);
AddEastDoor(1, 4, 7);
AddEastDoor(1, -4, 7);
AddSouthDoor(4, -1, 7);
}
public override int DefaultPrice => 152800;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[29];
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(1, 8, 0);
public override HouseDeed GetDeed() => new LargePatioDeed();
}
[SerializationGenerator(0, false)]
public partial class LargeMarbleHouse : BaseHouse
{
public static readonly Rectangle2D[] AreaArray = [new(-7, -7, 15, 14), new(-6, 7, 6, 1)];
public LargeMarbleHouse(Mobile owner) : base(0x96, owner, 1370, 10)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(false, -4, 3, 4, keyValue);
SetSign(1, 8, 11);
}
public override int DefaultPrice => 192000;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[29];
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(1, 8, 0);
public override HouseDeed GetDeed() => new LargeMarbleDeed();
}
[SerializationGenerator(0, false)]
public partial class SmallTower : BaseHouse
{
public static readonly Rectangle2D[] AreaArray = [new(-3, -3, 8, 7), new(2, 4, 3, 1)];
public SmallTower(Mobile owner) : base(0x98, owner, 580, 4)
{
var keyValue = CreateKeys(owner);
AddSouthDoor(false, 3, 3, 6, keyValue);
SetSign(1, 4, 5);
}
public override int DefaultPrice => 88500;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[6];
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(1, 4, 0);
public override HouseDeed GetDeed() => new SmallTowerDeed();
}
[SerializationGenerator(0, false)]
public partial class LogCabin : BaseHouse
{
public static readonly Rectangle2D[] AreaArray = [new(-3, -6, 8, 13)];
public LogCabin(Mobile owner) : base(0x9A, owner, 1100, 8)
{
var keyValue = CreateKeys(owner);
AddSouthDoor(1, 4, 8, keyValue);
SetSign(5, 8, 20);
AddSouthDoor(1, 0, 29);
}
public override int DefaultPrice => 97800;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[12];
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(5, 8, 0);
public override HouseDeed GetDeed() => new LogCabinDeed();
}
[SerializationGenerator(0, false)]
public partial class SandStonePatio : BaseHouse
{
public static readonly Rectangle2D[] AreaArray = [new(-5, -4, 12, 8), new(-2, 4, 3, 1)];
public SandStonePatio(Mobile owner) : base(0x9C, owner, 850, 6)
{
var keyValue = CreateKeys(owner);
AddSouthDoor(-1, 3, 6, keyValue);
SetSign(4, 6, 24);
}
public override int DefaultPrice => 90900;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[35];
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(4, 6, 0);
public override HouseDeed GetDeed() => new SandstonePatioDeed();
}
[SerializationGenerator(0, false)]
public partial class TwoStoryVilla : BaseHouse
{
public static readonly Rectangle2D[] AreaArray = [new(-5, -5, 11, 11), new(2, 6, 4, 1)];
public TwoStoryVilla(Mobile owner) : base(0x9E, owner, 1100, 8)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(3, 1, 5, keyValue);
SetSign(3, 8, 24);
AddEastDoor(1, 0, 25);
AddSouthDoor(-3, -1, 25);
}
public override int DefaultPrice => 136500;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[31];
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(3, 8, 0);
public override HouseDeed GetDeed() => new VillaDeed();
}
[SerializationGenerator(0, false)]
public partial class SmallShop : BaseHouse
{
public static readonly Rectangle2D[] AreaArray1 = [new(-3, -3, 7, 7), new(-1, 4, 4, 1)];
public static readonly Rectangle2D[] AreaArray2 = [new(-3, -3, 7, 7), new(-2, 4, 3, 1)];
public SmallShop(Mobile owner, int id) : base(id, owner, 425, 3)
{
var keyValue = CreateKeys(owner);
var door = MakeDoor(false, DoorFacing.EastCW);
door.Locked = true;
door.KeyValue = keyValue;
if (door is BaseHouseDoor houseDoor)
{
houseDoor.Facing = DoorFacing.EastCCW;
}
AddDoor(door, -2, 0, id == 0xA2 ? 24 : 27);
// AddSouthDoor( false, -2, 0, 27 - (id == 0xA2 ? 3 : 0), keyValue );
SetSign(3, 4, 7 - (id == 0xA2 ? 2 : 0));
}
public override Rectangle2D[] Area => ItemID == 0x40A2 ? AreaArray1 : AreaArray2;
public override Point3D BaseBanLocation => new(3, 4, 0);
public override int DefaultPrice => 63000;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[0];
public override HouseDeed GetDeed()
{
return ItemID switch
{
0xA0 => new StoneWorkshopDeed(),
_ => new MarbleWorkshopDeed()
};
public Tower(Mobile owner) : base(0x7A, owner, 2119, 15)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(false, 0, 6, 6, keyValue);
SetSign(5, 8, 16);
AddSouthDoor(false, 3, -2, 6);
AddEastDoor(false, 1, 4, 26);
AddEastDoor(false, 1, 4, 46);
}
public Tower(Serial serial) : base(serial)
{
}
public override int DefaultPrice => 433200;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[37];
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(5, 8, 0);
public override HouseDeed GetDeed() => new TowerDeed();
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();
}
}
public class Keep : BaseHouse // warning: ODD shape!
{
public static Rectangle2D[] AreaArray =
{
new(-11, -11, 7, 8), new(-11, 5, 7, 8), new(6, -11, 7, 8),
new(6, 5, 7, 8), new(-9, -3, 5, 8), new(6, -3, 5, 8),
new(-4, -9, 10, 20), new(-1, 11, 4, 1)
};
public Keep(Mobile owner) : base(0x7C, owner, 2625, 18)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(false, 0, 10, 6, keyValue);
SetSign(5, 12, 16);
}
public Keep(Serial serial) : base(serial)
{
}
public override int DefaultPrice => 665200;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(5, 13, 0);
public override HouseDeed GetDeed() => new KeepDeed();
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();
}
}
public class Castle : BaseHouse
{
public static Rectangle2D[] AreaArray = { new(-15, -15, 31, 31), new(-1, 16, 4, 1) };
public Castle(Mobile owner) : base(0x7E, owner, 4076, 28)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(false, 0, 15, 6, keyValue);
SetSign(5, 17, 16);
AddSouthDoors(false, 0, 11, 6, true);
AddSouthDoors(false, 0, 5, 6, false);
AddSouthDoors(false, -1, -11, 6, false);
}
public Castle(Serial serial) : base(serial)
{
}
public override int DefaultPrice => 1022800;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(5, 17, 0);
public override HouseDeed GetDeed() => new CastleDeed();
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();
}
}
public class LargePatioHouse : BaseHouse
{
public static Rectangle2D[] AreaArray = { new(-7, -7, 15, 14), new(-5, 7, 4, 1) };
public LargePatioHouse(Mobile owner) : base(0x8C, owner, 1100, 8)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(-4, 6, 7, keyValue);
SetSign(1, 8, 16);
AddEastDoor(1, 4, 7);
AddEastDoor(1, -4, 7);
AddSouthDoor(4, -1, 7);
}
public LargePatioHouse(Serial serial) : base(serial)
{
}
public override int DefaultPrice => 152800;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[29];
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(1, 8, 0);
public override HouseDeed GetDeed() => new LargePatioDeed();
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();
}
}
public class LargeMarbleHouse : BaseHouse
{
public static Rectangle2D[] AreaArray = { new(-7, -7, 15, 14), new(-6, 7, 6, 1) };
public LargeMarbleHouse(Mobile owner) : base(0x96, owner, 1370, 10)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(false, -4, 3, 4, keyValue);
SetSign(1, 8, 11);
}
public LargeMarbleHouse(Serial serial) : base(serial)
{
}
public override int DefaultPrice => 192000;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[29];
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(1, 8, 0);
public override HouseDeed GetDeed() => new LargeMarbleDeed();
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();
}
}
public class SmallTower : BaseHouse
{
public static Rectangle2D[] AreaArray = { new(-3, -3, 8, 7), new(2, 4, 3, 1) };
public SmallTower(Mobile owner) : base(0x98, owner, 580, 4)
{
var keyValue = CreateKeys(owner);
AddSouthDoor(false, 3, 3, 6, keyValue);
SetSign(1, 4, 5);
}
public SmallTower(Serial serial) : base(serial)
{
}
public override int DefaultPrice => 88500;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[6];
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(1, 4, 0);
public override HouseDeed GetDeed() => new SmallTowerDeed();
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();
}
}
public class LogCabin : BaseHouse
{
public static Rectangle2D[] AreaArray = { new(-3, -6, 8, 13) };
public LogCabin(Mobile owner) : base(0x9A, owner, 1100, 8)
{
var keyValue = CreateKeys(owner);
AddSouthDoor(1, 4, 8, keyValue);
SetSign(5, 8, 20);
AddSouthDoor(1, 0, 29);
}
public LogCabin(Serial serial) : base(serial)
{
}
public override int DefaultPrice => 97800;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[12];
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(5, 8, 0);
public override HouseDeed GetDeed() => new LogCabinDeed();
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();
}
}
public class SandStonePatio : BaseHouse
{
public static Rectangle2D[] AreaArray = { new(-5, -4, 12, 8), new(-2, 4, 3, 1) };
public SandStonePatio(Mobile owner) : base(0x9C, owner, 850, 6)
{
var keyValue = CreateKeys(owner);
AddSouthDoor(-1, 3, 6, keyValue);
SetSign(4, 6, 24);
}
public SandStonePatio(Serial serial) : base(serial)
{
}
public override int DefaultPrice => 90900;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[35];
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(4, 6, 0);
public override HouseDeed GetDeed() => new SandstonePatioDeed();
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();
}
}
public class TwoStoryVilla : BaseHouse
{
public static Rectangle2D[] AreaArray = { new(-5, -5, 11, 11), new(2, 6, 4, 1) };
public TwoStoryVilla(Mobile owner) : base(0x9E, owner, 1100, 8)
{
var keyValue = CreateKeys(owner);
AddSouthDoors(3, 1, 5, keyValue);
SetSign(3, 8, 24);
AddEastDoor(1, 0, 25);
AddSouthDoor(-3, -1, 25);
}
public TwoStoryVilla(Serial serial) : base(serial)
{
}
public override int DefaultPrice => 136500;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[31];
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new(3, 8, 0);
public override HouseDeed GetDeed() => new VillaDeed();
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();
}
}
public class SmallShop : BaseHouse
{
public static Rectangle2D[] AreaArray1 = { new(-3, -3, 7, 7), new(-1, 4, 4, 1) };
public static Rectangle2D[] AreaArray2 = { new(-3, -3, 7, 7), new(-2, 4, 3, 1) };
public SmallShop(Mobile owner, int id) : base(id, owner, 425, 3)
{
var keyValue = CreateKeys(owner);
var door = MakeDoor(false, DoorFacing.EastCW);
door.Locked = true;
door.KeyValue = keyValue;
if (door is BaseHouseDoor houseDoor)
{
houseDoor.Facing = DoorFacing.EastCCW;
}
AddDoor(door, -2, 0, id == 0xA2 ? 24 : 27);
// AddSouthDoor( false, -2, 0, 27 - (id == 0xA2 ? 3 : 0), keyValue );
SetSign(3, 4, 7 - (id == 0xA2 ? 2 : 0));
}
public SmallShop(Serial serial) : base(serial)
{
}
public override Rectangle2D[] Area => ItemID == 0x40A2 ? AreaArray1 : AreaArray2;
public override Point3D BaseBanLocation => new(3, 4, 0);
public override int DefaultPrice => 63000;
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[0];
public override HouseDeed GetDeed()
{
return ItemID switch
{
0xA0 => new StoneWorkshopDeed(),
0xA2 => new MarbleWorkshopDeed(),
_ => new MarbleWorkshopDeed()
};
}
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();
}
}
}

View file

@ -1,346 +1,303 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Items;
using Server.Network;
namespace Server.Multis
namespace Server.Multis;
[SerializationGenerator(0)]
public partial class MovingCrate : Container
{
public class MovingCrate : Container
private const int MaxItemsPerSubcontainer = 20;
private const int Rows = 3;
private const int Columns = 5;
private const int HorizontalSpacing = 25;
private const int VerticalSpacing = 25;
private Timer _internalizeTimer;
[SerializableField(0)]
private BaseHouse _house;
public MovingCrate(BaseHouse house) : base(0xE3D)
{
public static readonly int MaxItemsPerSubcontainer = 20;
public static readonly int Rows = 3;
public static readonly int Columns = 5;
public static readonly int HorizontalSpacing = 25;
public static readonly int VerticalSpacing = 25;
Hue = 0x8A5;
Movable = false;
private Timer m_InternalizeTimer;
House = house;
}
public MovingCrate(BaseHouse house) : base(0xE3D)
public override int LabelNumber => 1061690; // Packing Crate
public override int DefaultMaxItems => 0;
public override int DefaultMaxWeight => 0;
public override bool IsDecoContainer => false;
/*
public override void AddNameProperties( ObjectPropertyList list )
{
base.AddNameProperties( list );
if (House != null && House.InternalizedVendors.Count > 0)
list.Add( 1061833, House.InternalizedVendors.Count.ToString() ); // This packing crate contains ~1_COUNT~ vendors/barkeepers.
}
*/
public override void DropItem(Item dropped)
{
// 1. Try to stack the item
foreach (var item in Items)
{
Hue = 0x8A5;
Movable = false;
House = house;
}
public MovingCrate(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1061690; // Packing Crate
public BaseHouse House { get; set; }
public override int DefaultMaxItems => 0;
public override int DefaultMaxWeight => 0;
public override bool IsDecoContainer => false;
/*
public override void AddNameProperties( ObjectPropertyList list )
{
base.AddNameProperties( list );
if (House != null && House.InternalizedVendors.Count > 0)
list.Add( 1061833, House.InternalizedVendors.Count.ToString() ); // This packing crate contains ~1_COUNT~ vendors/barkeepers.
}
*/
public override void DropItem(Item dropped)
{
// 1. Try to stack the item
foreach (var item in Items)
if (item is PackingBox)
{
if (item is PackingBox)
var subItems = item.Items;
for (var i = 0; i < subItems.Count; i++)
{
var subItems = item.Items;
var subItem = subItems[i];
for (var i = 0; i < subItems.Count; i++)
if (subItem is not Container && subItem.StackWith(null, dropped, false))
{
var subItem = subItems[i];
if (subItem is not Container && subItem.StackWith(null, dropped, false))
{
return;
}
}
}
}
// 2. Try to drop the item into an existing container
foreach (var item in Items)
{
if (item is PackingBox packingBox)
{
var subItems = packingBox.Items;
if (subItems.Count < MaxItemsPerSubcontainer)
{
packingBox.DropItem(dropped);
return;
}
}
}
// 3. Drop the item into a new container
var subContainer = new PackingBox();
subContainer.DropItem(dropped);
var location = GetFreeLocation();
if (location != Point3D.Zero)
{
AddItem(subContainer);
subContainer.Location = location;
}
else
{
base.DropItem(subContainer);
}
}
private Point3D GetFreeLocation()
// 2. Try to drop the item into an existing container
foreach (var item in Items)
{
var positions = new bool[Rows, Columns];
foreach (var item in Items)
if (item is PackingBox packingBox)
{
if (item is PackingBox)
var subItems = packingBox.Items;
if (subItems.Count < MaxItemsPerSubcontainer)
{
var i = (item.Y - Bounds.Y) / VerticalSpacing;
if (i < 0)
{
i = 0;
}
else if (i >= Rows)
{
i = Rows - 1;
}
var j = (item.X - Bounds.X) / HorizontalSpacing;
if (j < 0)
{
j = 0;
}
else if (j >= Columns)
{
j = Columns - 1;
}
positions[i, j] = true;
packingBox.DropItem(dropped);
return;
}
}
for (var i = 0; i < Rows; i++)
{
for (var j = 0; j < Columns; j++)
{
if (!positions[i, j])
{
var x = Bounds.X + j * HorizontalSpacing;
var y = Bounds.Y + i * VerticalSpacing;
return new Point3D(x, y, 0);
}
}
}
return Point3D.Zero;
}
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight)
{
if (m.AccessLevel < AccessLevel.GameMaster)
{
m.SendLocalizedMessage(1061145); // You cannot place items into a house moving crate.
return false;
}
// 3. Drop the item into a new container
var subContainer = new PackingBox();
subContainer.DropItem(dropped);
return base.CheckHold(m, item, message, checkItems, plusItems, plusWeight);
var location = GetFreeLocation();
if (location != Point3D.Zero)
{
AddItem(subContainer);
subContainer.Location = location;
}
public override bool CheckLift(Mobile from, Item item, ref LRReason reject) => House?.Deleted == false &&
base.CheckLift(from, item, ref reject) && House.IsOwner(from);
public override bool CheckItemUse(Mobile from, Item item) =>
House?.Deleted == false && base.CheckItemUse(from, item) && House.IsOwner(from);
public override void OnItemRemoved(Item item)
else
{
base.OnItemRemoved(item);
if (TotalItems == 0)
{
Delete();
}
}
public void RestartTimer()
{
if (m_InternalizeTimer == null)
{
m_InternalizeTimer = new InternalizeTimer(this);
m_InternalizeTimer.Start();
}
else
{
m_InternalizeTimer.Stop();
m_InternalizeTimer.Start();
}
}
public void Hide()
{
if (m_InternalizeTimer != null)
{
m_InternalizeTimer.Stop();
m_InternalizeTimer = null;
}
var toRemove = new List<Item>();
foreach (var item in Items)
{
if (item is PackingBox && item.Items.Count == 0)
{
toRemove.Add(item);
}
}
foreach (var item in toRemove)
{
item.Delete();
}
if (TotalItems == 0)
{
Delete();
}
else
{
Internalize();
}
}
public override void OnAfterDelete()
{
base.OnAfterDelete();
if (House?.MovingCrate == this)
{
House.MovingCrate = null;
}
m_InternalizeTimer?.Stop();
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(1);
writer.Write(House);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
House = reader.ReadEntity<BaseHouse>();
if (House != null)
{
House.MovingCrate = this;
Timer.StartTimer(Hide);
}
else
{
Timer.StartTimer(Delete);
}
if (version == 0)
{
MaxItems = -1; // reset to default
}
}
public class InternalizeTimer : Timer
{
private readonly MovingCrate m_Crate;
public InternalizeTimer(MovingCrate crate) : base(TimeSpan.FromMinutes(5.0))
{
m_Crate = crate;
}
protected override void OnTick()
{
m_Crate.Hide();
}
base.DropItem(subContainer);
}
}
public class PackingBox : BaseContainer
private Point3D GetFreeLocation()
{
public PackingBox() : base(0x9A8) => Movable = false;
var positions = new bool[Rows, Columns];
public PackingBox(Serial serial) : base(serial)
foreach (var item in Items)
{
}
public override int LabelNumber => 1061690; // Packing Crate
public override int DefaultGumpID => 0x4B;
public override int DefaultDropSound => 0x42;
public override Rectangle2D Bounds => new(16, 51, 168, 73);
public override int DefaultMaxItems => 0;
public override int DefaultMaxWeight => 0;
public override void SendCantStoreMessage(Mobile to, Item item)
{
to.SendLocalizedMessage(1061145); // You cannot place items into a house moving crate.
}
public override void OnItemRemoved(Item item)
{
base.OnItemRemoved(item);
if (item.GetBounce() == null && TotalItems == 0)
if (item is PackingBox)
{
Delete();
var i = (item.Y - Bounds.Y) / VerticalSpacing;
if (i < 0)
{
i = 0;
}
else if (i >= Rows)
{
i = Rows - 1;
}
var j = (item.X - Bounds.X) / HorizontalSpacing;
if (j < 0)
{
j = 0;
}
else if (j >= Columns)
{
j = Columns - 1;
}
positions[i, j] = true;
}
}
public override void OnItemBounceCleared(Item item)
for (var i = 0; i < Rows; i++)
{
base.OnItemBounceCleared(item);
if (TotalItems == 0)
for (var j = 0; j < Columns; j++)
{
Delete();
if (!positions[i, j])
{
var x = Bounds.X + j * HorizontalSpacing;
var y = Bounds.Y + i * VerticalSpacing;
return new Point3D(x, y, 0);
}
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
return Point3D.Zero;
}
writer.WriteEncodedInt(1); // version
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight)
{
if (m.AccessLevel < AccessLevel.GameMaster)
{
m.SendLocalizedMessage(1061145); // You cannot place items into a house moving crate.
return false;
}
public override void Deserialize(IGenericReader reader)
return base.CheckHold(m, item, message, checkItems, plusItems, plusWeight);
}
public override bool CheckLift(Mobile from, Item item, ref LRReason reject) => House?.Deleted == false &&
base.CheckLift(from, item, ref reject) && House.IsOwner(from);
public override bool CheckItemUse(Mobile from, Item item) =>
House?.Deleted == false && base.CheckItemUse(from, item) && House.IsOwner(from);
public override void OnItemRemoved(Item item)
{
base.OnItemRemoved(item);
if (TotalItems == 0)
{
base.Deserialize(reader);
Delete();
}
}
var version = reader.ReadEncodedInt();
public void RestartTimer()
{
if (_internalizeTimer == null)
{
_internalizeTimer = new InternalizeTimer(this);
_internalizeTimer.Start();
}
else
{
_internalizeTimer.Stop();
_internalizeTimer.Start();
}
}
if (version == 0)
public void Hide()
{
if (_internalizeTimer != null)
{
_internalizeTimer.Stop();
_internalizeTimer = null;
}
var toRemove = new List<Item>();
foreach (var item in Items)
{
if (item is PackingBox && item.Items.Count == 0)
{
MaxItems = -1; // reset to default
toRemove.Add(item);
}
}
foreach (var item in toRemove)
{
item.Delete();
}
if (TotalItems == 0)
{
Delete();
}
else
{
Internalize();
}
}
public override void OnAfterDelete()
{
base.OnAfterDelete();
if (House?.MovingCrate == this)
{
House.MovingCrate = null;
}
_internalizeTimer?.Stop();
}
[AfterDeserialization]
private void AfterDeserialization()
{
if (House != null)
{
House.MovingCrate = this;
Timer.StartTimer(Hide);
}
else
{
Timer.StartTimer(Delete);
}
}
public class InternalizeTimer : Timer
{
private readonly MovingCrate m_Crate;
public InternalizeTimer(MovingCrate crate) : base(TimeSpan.FromMinutes(5.0))
{
m_Crate = crate;
}
protected override void OnTick()
{
m_Crate.Hide();
}
}
}
[SerializationGenerator(0)]
public partial class PackingBox : BaseContainer
{
public PackingBox() : base(0x9A8) => Movable = false;
public override int LabelNumber => 1061690; // Packing Crate
public override int DefaultGumpID => 0x4B;
public override int DefaultDropSound => 0x42;
public override Rectangle2D Bounds => new(16, 51, 168, 73);
public override int DefaultMaxItems => 0;
public override int DefaultMaxWeight => 0;
public override void SendCantStoreMessage(Mobile to, Item item)
{
to.SendLocalizedMessage(1061145); // You cannot place items into a house moving crate.
}
public override void OnItemRemoved(Item item)
{
base.OnItemRemoved(item);
if (item.GetBounce() == null && TotalItems == 0)
{
Delete();
}
}
public override void OnItemBounceCleared(Item item)
{
base.OnItemBounceCleared(item);
if (TotalItems == 0)
{
Delete();
}
}
}

View file

@ -1,147 +1,117 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Items;
namespace Server.Multis
namespace Server.Multis;
[SerializationGenerator(0, false)]
public partial class PreviewHouse : BaseMulti
{
public class PreviewHouse : BaseMulti
[SerializableField(0)]
private List<Item> _previewComponents;
private Timer _timer;
public PreviewHouse(int multiID) : base(multiID)
{
private List<Item> m_Components;
private Timer m_Timer;
var mcl = Components;
public PreviewHouse(int multiID) : base(multiID)
for (var i = 1; i < mcl.List.Length; ++i)
{
m_Components = new List<Item>();
var entry = mcl.List[i];
var mcl = Components;
for (var i = 1; i < mcl.List.Length; ++i)
if (entry.Flags == 0)
{
var entry = mcl.List[i];
Item item = new Static(entry.ItemId);
item.MoveToWorld(new Point3D(X + entry.OffsetX, Y + entry.OffsetY, Z + entry.OffsetZ), Map);
if (entry.Flags == 0)
{
Item item = new Static(entry.ItemId);
item.MoveToWorld(new Point3D(X + entry.OffsetX, Y + entry.OffsetY, Z + entry.OffsetZ), Map);
m_Components.Add(item);
}
}
m_Timer = new DecayTimer(this);
m_Timer.Start();
}
public PreviewHouse(Serial serial) : base(serial)
{
}
public override void OnLocationChange(Point3D oldLocation)
{
base.OnLocationChange(oldLocation);
if (m_Components == null)
{
return;
}
var xOffset = X - oldLocation.X;
var yOffset = Y - oldLocation.Y;
var zOffset = Z - oldLocation.Z;
for (var i = 0; i < m_Components.Count; ++i)
{
var item = m_Components[i];
item.MoveToWorld(new Point3D(item.X + xOffset, item.Y + yOffset, item.Z + zOffset), Map);
_previewComponents ??= [];
_previewComponents.Add(item);
}
}
public override void OnMapChange()
_timer = new DecayTimer(this);
_timer.Start();
}
public override void OnLocationChange(Point3D oldLocation)
{
base.OnLocationChange(oldLocation);
if (_previewComponents == null)
{
base.OnMapChange();
if (m_Components == null)
{
return;
}
for (var i = 0; i < m_Components.Count; ++i)
{
var item = m_Components[i];
item.Map = Map;
}
return;
}
public override void OnDelete()
var xOffset = X - oldLocation.X;
var yOffset = Y - oldLocation.Y;
var zOffset = Z - oldLocation.Z;
for (var i = 0; i < _previewComponents.Count; ++i)
{
base.OnDelete();
var item = _previewComponents[i];
if (m_Components == null)
{
return;
}
item.MoveToWorld(new Point3D(item.X + xOffset, item.Y + yOffset, item.Z + zOffset), Map);
}
}
for (var i = 0; i < m_Components.Count; ++i)
{
var item = m_Components[i];
public override void OnMapChange()
{
base.OnMapChange();
item.Delete();
}
if (_previewComponents == null)
{
return;
}
public override void OnAfterDelete()
for (var i = 0; i < _previewComponents.Count; ++i)
{
m_Timer?.Stop();
_previewComponents[i].Map = Map;
}
}
m_Timer = null;
public override void OnDelete()
{
base.OnDelete();
base.OnAfterDelete();
if (_previewComponents == null)
{
return;
}
public override void Serialize(IGenericWriter writer)
for (var i = 0; i < _previewComponents.Count; ++i)
{
base.Serialize(writer);
_previewComponents[i]?.Delete();
}
}
writer.Write(0); // version
public override void OnAfterDelete()
{
_timer?.Stop();
_timer = null;
writer.Write(m_Components);
base.OnAfterDelete();
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
private class DecayTimer : Timer
{
private readonly Item _item;
public DecayTimer(Item item) : base(TimeSpan.FromSeconds(20.0))
{
_item = item;
}
public override void Deserialize(IGenericReader reader)
protected override void OnTick()
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{
case 0:
{
m_Components = reader.ReadEntityList<Item>();
break;
}
}
Timer.StartTimer(Delete);
}
private class DecayTimer : Timer
{
private readonly Item m_Item;
public DecayTimer(Item item) : base(TimeSpan.FromSeconds(20.0))
{
m_Item = item;
}
protected override void OnTick()
{
m_Item.Delete();
}
_item.Delete();
}
}
}