fix: Fixes doors as decorations & optimizes them (#1392)
This commit is contained in:
Kamron Batman
GitHub
parent
6c09e5a006
commit
79c6f0375c
38 changed files with 1369 additions and 1578 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -1,436 +1,216 @@
|
|||
namespace Server.Items
|
||||
using ModernUO.Serialization;
|
||||
|
||||
namespace Server.Items;
|
||||
|
||||
public enum DoorFacing
|
||||
{
|
||||
public enum DoorFacing
|
||||
WestCW,
|
||||
EastCCW,
|
||||
WestCCW,
|
||||
EastCW,
|
||||
SouthCW,
|
||||
NorthCCW,
|
||||
SouthCCW,
|
||||
NorthCW,
|
||||
|
||||
// Sliding Doors
|
||||
SouthSW,
|
||||
SouthSE,
|
||||
WestSS,
|
||||
WestSN
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class IronGateShort : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public IronGateShort(DoorFacing facing) : base(
|
||||
0x84c + 2 * (int)facing,
|
||||
0x84d + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class IronGate : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public IronGate(DoorFacing facing) : base(
|
||||
0x824 + 2 * (int)facing,
|
||||
0x825 + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class LightWoodGate : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public LightWoodGate(DoorFacing facing) : base(
|
||||
0x839 + 2 * (int)facing,
|
||||
0x83A + 2 * (int)facing,
|
||||
0xEB,
|
||||
0xF2,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class DarkWoodGate : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public DarkWoodGate(DoorFacing facing) : base(
|
||||
0x866 + 2 * (int)facing,
|
||||
0x867 + 2 * (int)facing,
|
||||
0xEB,
|
||||
0xF2,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class MetalDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public MetalDoor(DoorFacing facing) : base(
|
||||
0x675 + 2 * (int)facing,
|
||||
0x676 + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class BarredMetalDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public BarredMetalDoor(DoorFacing facing) : base(
|
||||
0x685 + 2 * (int)facing,
|
||||
0x686 + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class BarredMetalDoor2 : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public BarredMetalDoor2(DoorFacing facing) : base(
|
||||
0x1FED + 2 * (int)facing,
|
||||
0x1FEE + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class RattanDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public RattanDoor(DoorFacing facing) : base(
|
||||
0x695 + 2 * (int)facing,
|
||||
0x696 + 2 * (int)facing,
|
||||
0xEB,
|
||||
0xF2,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class DarkWoodDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public DarkWoodDoor(DoorFacing facing) : base(
|
||||
0x6A5 + 2 * (int)facing,
|
||||
0x6A6 + 2 * (int)facing,
|
||||
0xEA,
|
||||
0xF1,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class MediumWoodDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public MediumWoodDoor(DoorFacing facing) : base(
|
||||
0x6B5 + 2 * (int)facing,
|
||||
0x6B6 + 2 * (int)facing,
|
||||
0xEA,
|
||||
0xF1,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class MetalDoor2 : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public MetalDoor2(DoorFacing facing) : base(
|
||||
0x6C5 + 2 * (int)facing,
|
||||
0x6C6 + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class LightWoodDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public LightWoodDoor(DoorFacing facing) : base(
|
||||
0x6D5 + 2 * (int)facing,
|
||||
0x6D6 + 2 * (int)facing,
|
||||
0xEA,
|
||||
0xF1,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class StrongWoodDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public StrongWoodDoor(DoorFacing facing) : base(
|
||||
0x6E5 + 2 * (int)facing,
|
||||
0x6E6 + 2 * (int)facing,
|
||||
0xEA,
|
||||
0xF1,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
WestCW,
|
||||
EastCCW,
|
||||
WestCCW,
|
||||
EastCW,
|
||||
SouthCW,
|
||||
NorthCCW,
|
||||
SouthCCW,
|
||||
NorthCW,
|
||||
|
||||
// Sliding Doors
|
||||
SouthSW,
|
||||
SouthSE,
|
||||
WestSS,
|
||||
WestSN
|
||||
}
|
||||
|
||||
public class IronGateShort : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public IronGateShort(DoorFacing facing) : base(
|
||||
0x84c + 2 * (int)facing,
|
||||
0x84d + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public IronGateShort(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class IronGate : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public IronGate(DoorFacing facing) : base(
|
||||
0x824 + 2 * (int)facing,
|
||||
0x825 + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public IronGate(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class LightWoodGate : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public LightWoodGate(DoorFacing facing) : base(
|
||||
0x839 + 2 * (int)facing,
|
||||
0x83A + 2 * (int)facing,
|
||||
0xEB,
|
||||
0xF2,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public LightWoodGate(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class DarkWoodGate : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public DarkWoodGate(DoorFacing facing) : base(
|
||||
0x866 + 2 * (int)facing,
|
||||
0x867 + 2 * (int)facing,
|
||||
0xEB,
|
||||
0xF2,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public DarkWoodGate(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class MetalDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public MetalDoor(DoorFacing facing) : base(
|
||||
0x675 + 2 * (int)facing,
|
||||
0x676 + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public MetalDoor(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class BarredMetalDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public BarredMetalDoor(DoorFacing facing) : base(
|
||||
0x685 + 2 * (int)facing,
|
||||
0x686 + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public BarredMetalDoor(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class BarredMetalDoor2 : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public BarredMetalDoor2(DoorFacing facing) : base(
|
||||
0x1FED + 2 * (int)facing,
|
||||
0x1FEE + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public BarredMetalDoor2(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class RattanDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public RattanDoor(DoorFacing facing) : base(
|
||||
0x695 + 2 * (int)facing,
|
||||
0x696 + 2 * (int)facing,
|
||||
0xEB,
|
||||
0xF2,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public RattanDoor(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class DarkWoodDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public DarkWoodDoor(DoorFacing facing) : base(
|
||||
0x6A5 + 2 * (int)facing,
|
||||
0x6A6 + 2 * (int)facing,
|
||||
0xEA,
|
||||
0xF1,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public DarkWoodDoor(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class MediumWoodDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public MediumWoodDoor(DoorFacing facing) : base(
|
||||
0x6B5 + 2 * (int)facing,
|
||||
0x6B6 + 2 * (int)facing,
|
||||
0xEA,
|
||||
0xF1,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public MediumWoodDoor(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class MetalDoor2 : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public MetalDoor2(DoorFacing facing) : base(
|
||||
0x6C5 + 2 * (int)facing,
|
||||
0x6C6 + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public MetalDoor2(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class LightWoodDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public LightWoodDoor(DoorFacing facing) : base(
|
||||
0x6D5 + 2 * (int)facing,
|
||||
0x6D6 + 2 * (int)facing,
|
||||
0xEA,
|
||||
0xF1,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public LightWoodDoor(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class StrongWoodDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public StrongWoodDoor(DoorFacing facing) : base(
|
||||
0x6E5 + 2 * (int)facing,
|
||||
0x6E6 + 2 * (int)facing,
|
||||
0xEA,
|
||||
0xF1,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public StrongWoodDoor(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,291 +1,219 @@
|
|||
using System.Collections.Generic;
|
||||
using ModernUO.Serialization;
|
||||
using Server.ContextMenus;
|
||||
using Server.Gumps;
|
||||
using Server.Multis;
|
||||
|
||||
namespace Server.Items
|
||||
namespace Server.Items;
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class MetalHouseDoor : BaseHouseDoor
|
||||
{
|
||||
public class MetalHouseDoor : BaseHouseDoor
|
||||
[Constructible]
|
||||
public MetalHouseDoor(DoorFacing facing) : base(
|
||||
facing,
|
||||
0x675 + 2 * (int)facing,
|
||||
0x676 + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
[Constructible]
|
||||
public MetalHouseDoor(DoorFacing facing) : base(
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class DarkWoodHouseDoor : BaseHouseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public DarkWoodHouseDoor(DoorFacing facing) : base(
|
||||
facing,
|
||||
0x6A5 + 2 * (int)facing,
|
||||
0x6A6 + 2 * (int)facing,
|
||||
0xEA,
|
||||
0xF1,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class GenericHouseDoor : BaseHouseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public GenericHouseDoor(DoorFacing facing, int baseItemID, int openedSound, int closedSound, bool autoAdjust = true)
|
||||
: base(
|
||||
facing,
|
||||
0x675 + 2 * (int)facing,
|
||||
0x676 + 2 * (int)facing,
|
||||
0xEC,
|
||||
0xF3,
|
||||
baseItemID + (autoAdjust ? 2 * (int)facing : 0),
|
||||
baseItemID + 1 + (autoAdjust ? 2 * (int)facing : 0),
|
||||
openedSound,
|
||||
closedSound,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(2, false)]
|
||||
public abstract partial class BaseHouseDoor : BaseDoor, ISecurable
|
||||
{
|
||||
[SerializableField(0)]
|
||||
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
||||
private SecureLevel _level;
|
||||
|
||||
[SerializableField(1)]
|
||||
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
||||
private DoorFacing _facing;
|
||||
|
||||
public BaseHouseDoor(DoorFacing facing, int closedID, int openedID, int openedSound, int closedSound, Point3D offset)
|
||||
: base(closedID, openedID, openedSound, closedSound, offset)
|
||||
{
|
||||
_facing = facing;
|
||||
_level = SecureLevel.Anyone;
|
||||
}
|
||||
|
||||
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
|
||||
{
|
||||
base.GetContextMenuEntries(from, list);
|
||||
SetSecureLevelEntry.AddTo(from, this, list);
|
||||
}
|
||||
|
||||
public BaseHouse FindHouse()
|
||||
{
|
||||
Point3D loc;
|
||||
|
||||
if (Open)
|
||||
{
|
||||
loc = new Point3D(X - Offset.X, Y - Offset.Y, Z - Offset.Z);
|
||||
}
|
||||
else
|
||||
{
|
||||
loc = Location;
|
||||
}
|
||||
|
||||
public MetalHouseDoor(Serial serial) : base(serial)
|
||||
return BaseHouse.FindHouseAt(loc, Map, 20);
|
||||
}
|
||||
|
||||
public bool CheckAccess(Mobile m)
|
||||
{
|
||||
var house = FindHouse();
|
||||
|
||||
if (house == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
if (!house.IsAosRules)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
return true;
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
if (house.Public ? house.IsBanned(m) : !house.HasAccess(m))
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
return false;
|
||||
}
|
||||
|
||||
var version = reader.ReadInt();
|
||||
return house.HasSecureAccess(m, Level);
|
||||
}
|
||||
|
||||
public override void OnOpened(Mobile from)
|
||||
{
|
||||
var house = FindHouse();
|
||||
|
||||
if (house?.IsFriend(from) == true && from.AccessLevel == AccessLevel.Player && house.RefreshDecay())
|
||||
{
|
||||
from.SendLocalizedMessage(1043293); // Your house's age and contents have been refreshed.
|
||||
}
|
||||
|
||||
if (house?.Public == true && !house.IsFriend(from))
|
||||
{
|
||||
house.Visits++;
|
||||
}
|
||||
}
|
||||
|
||||
public class DarkWoodHouseDoor : BaseHouseDoor
|
||||
public override bool UseLocks() => FindHouse()?.IsAosRules != true;
|
||||
|
||||
public override void Use(Mobile from)
|
||||
{
|
||||
[Constructible]
|
||||
public DarkWoodHouseDoor(DoorFacing facing) : base(
|
||||
facing,
|
||||
0x6A5 + 2 * (int)facing,
|
||||
0x6A6 + 2 * (int)facing,
|
||||
0xEA,
|
||||
0xF1,
|
||||
GetOffset(facing)
|
||||
)
|
||||
if (!CheckAccess(from))
|
||||
{
|
||||
from.SendLocalizedMessage(1061637); // You are not allowed to access this.
|
||||
}
|
||||
|
||||
public DarkWoodHouseDoor(Serial serial) : base(serial)
|
||||
else
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
base.Use(from);
|
||||
}
|
||||
}
|
||||
|
||||
public class GenericHouseDoor : BaseHouseDoor
|
||||
private void Deserialize(IGenericReader reader, int version)
|
||||
{
|
||||
[Constructible]
|
||||
public GenericHouseDoor(DoorFacing facing, int baseItemID, int openedSound, int closedSound, bool autoAdjust = true)
|
||||
: base(
|
||||
facing,
|
||||
baseItemID + (autoAdjust ? 2 * (int)facing : 0),
|
||||
baseItemID + 1 + (autoAdjust ? 2 * (int)facing : 0),
|
||||
openedSound,
|
||||
closedSound,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public GenericHouseDoor(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
_level = (SecureLevel)reader.ReadInt();
|
||||
_facing = (DoorFacing)reader.ReadInt();
|
||||
}
|
||||
|
||||
public abstract class BaseHouseDoor : BaseDoor, ISecurable
|
||||
public override bool IsInside(Mobile from)
|
||||
{
|
||||
public BaseHouseDoor(DoorFacing facing, int closedID, int openedID, int openedSound, int closedSound, Point3D offset)
|
||||
: base(closedID, openedID, openedSound, closedSound, offset)
|
||||
int x, y, w, h;
|
||||
|
||||
const int r = 2;
|
||||
const int bs = r * 2 + 1;
|
||||
const int ss = r + 1;
|
||||
|
||||
switch (Facing)
|
||||
{
|
||||
Facing = facing;
|
||||
Level = SecureLevel.Anyone;
|
||||
}
|
||||
|
||||
public BaseHouseDoor(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public DoorFacing Facing { get; set; }
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public SecureLevel Level { get; set; }
|
||||
|
||||
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
|
||||
{
|
||||
base.GetContextMenuEntries(from, list);
|
||||
SetSecureLevelEntry.AddTo(from, this, list);
|
||||
}
|
||||
|
||||
public BaseHouse FindHouse()
|
||||
{
|
||||
Point3D loc;
|
||||
|
||||
if (Open)
|
||||
{
|
||||
loc = new Point3D(X - Offset.X, Y - Offset.Y, Z - Offset.Z);
|
||||
}
|
||||
else
|
||||
{
|
||||
loc = Location;
|
||||
}
|
||||
|
||||
return BaseHouse.FindHouseAt(loc, Map, 20);
|
||||
}
|
||||
|
||||
public bool CheckAccess(Mobile m)
|
||||
{
|
||||
var house = FindHouse();
|
||||
|
||||
if (house == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!house.IsAosRules)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (house.Public ? house.IsBanned(m) : !house.HasAccess(m))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return house.HasSecureAccess(m, Level);
|
||||
}
|
||||
|
||||
public override void OnOpened(Mobile from)
|
||||
{
|
||||
var house = FindHouse();
|
||||
|
||||
if (house?.IsFriend(from) == true && from.AccessLevel == AccessLevel.Player && house.RefreshDecay())
|
||||
{
|
||||
from.SendLocalizedMessage(1043293); // Your house's age and contents have been refreshed.
|
||||
}
|
||||
|
||||
if (house?.Public == true && !house.IsFriend(from))
|
||||
{
|
||||
house.Visits++;
|
||||
}
|
||||
}
|
||||
|
||||
public override bool UseLocks() => FindHouse()?.IsAosRules != true;
|
||||
|
||||
public override void Use(Mobile from)
|
||||
{
|
||||
if (!CheckAccess(from))
|
||||
{
|
||||
from.SendLocalizedMessage(1061637); // You are not allowed to access this.
|
||||
}
|
||||
else
|
||||
{
|
||||
base.Use(from);
|
||||
}
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(1); // version
|
||||
|
||||
writer.Write((int)Level);
|
||||
|
||||
writer.Write((int)Facing);
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
|
||||
switch (version)
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
Level = (SecureLevel)reader.ReadInt();
|
||||
goto case 0;
|
||||
}
|
||||
case 0:
|
||||
{
|
||||
if (version < 1)
|
||||
{
|
||||
Level = SecureLevel.Anyone;
|
||||
}
|
||||
|
||||
Facing = (DoorFacing)reader.ReadInt();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public override bool IsInside(Mobile from)
|
||||
{
|
||||
int x, y, w, h;
|
||||
|
||||
const int r = 2;
|
||||
const int bs = r * 2 + 1;
|
||||
const int ss = r + 1;
|
||||
|
||||
switch (Facing)
|
||||
{
|
||||
case DoorFacing.WestCW:
|
||||
case DoorFacing.EastCCW:
|
||||
case DoorFacing.WestCW:
|
||||
case DoorFacing.EastCCW:
|
||||
{
|
||||
x = -r;
|
||||
y = -r;
|
||||
w = bs;
|
||||
h = ss;
|
||||
break;
|
||||
}
|
||||
|
||||
case DoorFacing.EastCW:
|
||||
case DoorFacing.WestCCW:
|
||||
case DoorFacing.EastCW:
|
||||
case DoorFacing.WestCCW:
|
||||
{
|
||||
x = -r;
|
||||
y = 0;
|
||||
w = bs;
|
||||
h = ss;
|
||||
break;
|
||||
}
|
||||
|
||||
case DoorFacing.SouthCW:
|
||||
case DoorFacing.NorthCCW:
|
||||
case DoorFacing.SouthCW:
|
||||
case DoorFacing.NorthCCW:
|
||||
{
|
||||
x = -r;
|
||||
y = -r;
|
||||
w = ss;
|
||||
h = bs;
|
||||
break;
|
||||
}
|
||||
|
||||
case DoorFacing.NorthCW:
|
||||
case DoorFacing.SouthCCW:
|
||||
case DoorFacing.NorthCW:
|
||||
case DoorFacing.SouthCCW:
|
||||
{
|
||||
x = 0;
|
||||
y = -r;
|
||||
w = ss;
|
||||
h = bs;
|
||||
break;
|
||||
}
|
||||
|
||||
// No way to test the 'insideness' of SE Sliding doors on OSI, so leaving them default to false until further information gained
|
||||
// No way to test the 'insideness' of SE Sliding doors on OSI, so leaving them default to false until further information gained
|
||||
|
||||
default: return false;
|
||||
}
|
||||
|
||||
var rx = from.X - X;
|
||||
var ry = from.Y - Y;
|
||||
var az = (from.Z - Z).Abs();
|
||||
|
||||
return rx >= x && rx < x + w && ry >= y && ry < y + h && az <= 4;
|
||||
default:
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
var rx = from.X - X;
|
||||
var ry = from.Y - Y;
|
||||
var az = (from.Z - Z).Abs();
|
||||
|
||||
return rx >= x && rx < x + w && ry >= y && ry < y + h && az <= 4;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,58 +1,21 @@
|
|||
namespace Server.Items
|
||||
using ModernUO.Serialization;
|
||||
|
||||
namespace Server.Items;
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class PortcullisNS : BaseDoor
|
||||
{
|
||||
public class PortcullisNS : BaseDoor
|
||||
[Constructible]
|
||||
public PortcullisNS() : base(0x6F5, 0x6F5, 0xF0, 0xEF, new Point3D(0, 0, 20))
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class PortcullisEW : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public PortcullisEW() : base(0x6F6, 0x6F6, 0xF0, 0xEF, new Point3D(0, 0, 20))
|
||||
{
|
||||
[Constructible]
|
||||
public PortcullisNS() : base(0x6F5, 0x6F5, 0xF0, 0xEF, new Point3D(0, 0, 20))
|
||||
{
|
||||
}
|
||||
|
||||
public PortcullisNS(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override bool UseChainedFunctionality => true;
|
||||
|
||||
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 PortcullisEW : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public PortcullisEW() : base(0x6F6, 0x6F6, 0xF0, 0xEF, new Point3D(0, 0, 20))
|
||||
{
|
||||
}
|
||||
|
||||
public PortcullisEW(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override bool UseChainedFunctionality => true;
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,194 +1,93 @@
|
|||
namespace Server.Items
|
||||
using ModernUO.Serialization;
|
||||
|
||||
namespace Server.Items;
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class SecretStoneDoor1 : BaseDoor
|
||||
{
|
||||
public class SecretStoneDoor1 : BaseDoor
|
||||
[Constructible]
|
||||
public SecretStoneDoor1(DoorFacing facing) : base(
|
||||
0xE8 + 2 * (int)facing,
|
||||
0xE9 + 2 * (int)facing,
|
||||
0xED,
|
||||
0xF4,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class SecretDungeonDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public SecretDungeonDoor(DoorFacing facing) : base(
|
||||
0x314 + 2 * (int)facing,
|
||||
0x315 + 2 * (int)facing,
|
||||
0xED,
|
||||
0xF4,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class SecretStoneDoor2 : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public SecretStoneDoor2(DoorFacing facing) : base(
|
||||
0x324 + 2 * (int)facing,
|
||||
0x325 + 2 * (int)facing,
|
||||
0xED,
|
||||
0xF4,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class SecretWoodenDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public SecretWoodenDoor(DoorFacing facing) : base(
|
||||
0x334 + 2 * (int)facing,
|
||||
0x335 + 2 * (int)facing,
|
||||
0xED,
|
||||
0xF4,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class SecretLightWoodDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public SecretLightWoodDoor(DoorFacing facing) : base(
|
||||
0x344 + 2 * (int)facing,
|
||||
0x345 + 2 * (int)facing,
|
||||
0xED,
|
||||
0xF4,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class SecretStoneDoor3 : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public SecretStoneDoor3(DoorFacing facing) : base(
|
||||
0x354 + 2 * (int)facing,
|
||||
0x355 + 2 * (int)facing,
|
||||
0xED,
|
||||
0xF4,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
[Constructible]
|
||||
public SecretStoneDoor1(DoorFacing facing) : base(
|
||||
0xE8 + 2 * (int)facing,
|
||||
0xE9 + 2 * (int)facing,
|
||||
0xED,
|
||||
0xF4,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public SecretStoneDoor1(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class SecretDungeonDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public SecretDungeonDoor(DoorFacing facing) : base(
|
||||
0x314 + 2 * (int)facing,
|
||||
0x315 + 2 * (int)facing,
|
||||
0xED,
|
||||
0xF4,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public SecretDungeonDoor(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class SecretStoneDoor2 : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public SecretStoneDoor2(DoorFacing facing) : base(
|
||||
0x324 + 2 * (int)facing,
|
||||
0x325 + 2 * (int)facing,
|
||||
0xED,
|
||||
0xF4,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public SecretStoneDoor2(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class SecretWoodenDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public SecretWoodenDoor(DoorFacing facing) : base(
|
||||
0x334 + 2 * (int)facing,
|
||||
0x335 + 2 * (int)facing,
|
||||
0xED,
|
||||
0xF4,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public SecretWoodenDoor(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class SecretLightWoodDoor : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public SecretLightWoodDoor(DoorFacing facing) : base(
|
||||
0x344 + 2 * (int)facing,
|
||||
0x345 + 2 * (int)facing,
|
||||
0xED,
|
||||
0xF4,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public SecretLightWoodDoor(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class SecretStoneDoor3 : BaseDoor
|
||||
{
|
||||
[Constructible]
|
||||
public SecretStoneDoor3(DoorFacing facing) : base(
|
||||
0x354 + 2 * (int)facing,
|
||||
0x355 + 2 * (int)facing,
|
||||
0xED,
|
||||
0xF4,
|
||||
GetOffset(facing)
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public SecretStoneDoor3(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer) // Default Serialize method
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader) // Default Deserialize method
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue