fix: Codegens treasure/paragon chests & strongboxes (#948)

This commit is contained in:
Kamron Batman 2022-02-27 17:22:38 -08:00 • committed by GitHub
parent 9bc6d5bdb8
commit 17f8d3563a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 431 additions and 518 deletions

View file

@ -1,8 +1,9 @@
using System; using System;
namespace Server.Items namespace Server.Items;
{
public class BaseTreasureChest : LockableContainer [Serializable(1, false)]
public partial class BaseTreasureChest : LockableContainer
{ {
public enum TreasureLevel public enum TreasureLevel
{ {
@ -14,12 +15,14 @@ namespace Server.Items
Level6 Level6
} }
private TreasureResetTimer m_ResetTimer; private TimerExecutionToken _resetTimer;
public BaseTreasureChest(int itemID, TreasureLevel level = TreasureLevel.Level2) public BaseTreasureChest(int itemID, TreasureLevel level = TreasureLevel.Level2) : base(itemID)
: base(itemID)
{ {
Level = level; _level = level;
_minSpawnTime = TimeSpan.FromMinutes(10);
_maxSpawnTime = TimeSpan.FromMinutes(60);
Locked = true; Locked = true;
Movable = false; Movable = false;
@ -27,18 +30,17 @@ namespace Server.Items
GenerateTreasure(); GenerateTreasure();
} }
public BaseTreasureChest(Serial serial) : base(serial) [SerializableField(0)]
{ [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
} private TreasureLevel _level;
[CommandProperty(AccessLevel.GameMaster)] [SerializableField(1)]
public TreasureLevel Level { get; set; } [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private TimeSpan _minSpawnTime;
[CommandProperty(AccessLevel.GameMaster)] [SerializableField(2)]
public short MaxSpawnTime { get; set; } = 60; [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private TimeSpan _maxSpawnTime;
[CommandProperty(AccessLevel.GameMaster)]
public short MinSpawnTime { get; set; } = 10;
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public override bool Locked public override bool Locked
@ -60,48 +62,27 @@ namespace Server.Items
public override bool IsDecoContainer => false; public override bool IsDecoContainer => false;
public override string DefaultName public override string DefaultName => Locked ? "a locked treasure chest" : "a treasure chest";
[AfterDeserialization]
private void AfterDeserialization()
{ {
get
{
if (Locked)
{
return "a locked treasure chest";
}
return "a treasure chest";
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
writer.Write((byte)Level);
writer.Write(MinSpawnTime);
writer.Write(MaxSpawnTime);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
Level = (TreasureLevel)reader.ReadByte();
MinSpawnTime = reader.ReadShort();
MaxSpawnTime = reader.ReadShort();
if (!Locked) if (!Locked)
{ {
StartResetTimer(); StartResetTimer();
} }
} }
private void Deserialize(IGenericReader reader, int version)
{
_level = (TreasureLevel)reader.ReadByte();
_minSpawnTime = TimeSpan.FromMinutes(reader.ReadShort());
_maxSpawnTime = TimeSpan.FromMinutes(reader.ReadShort());
}
protected virtual void SetLockLevel() protected virtual void SetLockLevel()
{ {
RequiredSkill = Level switch RequiredSkill = _level switch
{ {
TreasureLevel.Level1 => LockLevel = 5, TreasureLevel.Level1 => LockLevel = 5,
TreasureLevel.Level2 => LockLevel = 20, TreasureLevel.Level2 => LockLevel = 20,
@ -109,63 +90,31 @@ namespace Server.Items
TreasureLevel.Level4 => LockLevel = 70, TreasureLevel.Level4 => LockLevel = 70,
TreasureLevel.Level5 => LockLevel = 90, TreasureLevel.Level5 => LockLevel = 90,
TreasureLevel.Level6 => LockLevel = 100, TreasureLevel.Level6 => LockLevel = 100,
_ => RequiredSkill _ => LockLevel = 120
}; };
} }
private void StartResetTimer() private void StartResetTimer()
{ {
if (m_ResetTimer == null) _resetTimer.Cancel();
{
m_ResetTimer = new TreasureResetTimer(this);
}
else
{
m_ResetTimer.Delay = TimeSpan.FromMinutes(Utility.Random(MinSpawnTime, MaxSpawnTime));
}
m_ResetTimer.Start(); var randomDuration = Utility.RandomMinMax(_minSpawnTime.Ticks, _maxSpawnTime.Ticks);
Timer.StartTimer(TimeSpan.FromTicks(randomDuration), Reset, out _resetTimer);
} }
protected virtual void GenerateTreasure() protected virtual void GenerateTreasure()
{ {
var MinGold = 1; var gold = _level switch
var MaxGold = 2;
switch (Level)
{ {
case TreasureLevel.Level1: TreasureLevel.Level1 => Utility.RandomMinMax(100, 300),
MinGold = 100; TreasureLevel.Level2 => Utility.RandomMinMax(300, 600),
MaxGold = 300; TreasureLevel.Level3 => Utility.RandomMinMax(600, 900),
break; TreasureLevel.Level4 => Utility.RandomMinMax(900, 1200),
TreasureLevel.Level5 => Utility.RandomMinMax(1200, 5000),
_ => Utility.RandomMinMax(5000, 9000),
};
case TreasureLevel.Level2: DropItem(new Gold(gold));
MinGold = 300;
MaxGold = 600;
break;
case TreasureLevel.Level3:
MinGold = 600;
MaxGold = 900;
break;
case TreasureLevel.Level4:
MinGold = 900;
MaxGold = 1200;
break;
case TreasureLevel.Level5:
MinGold = 1200;
MaxGold = 5000;
break;
case TreasureLevel.Level6:
MinGold = 5000;
MaxGold = 9000;
break;
}
DropItem(new Gold(MinGold, MaxGold));
} }
public void ClearContents() public void ClearContents()
@ -181,34 +130,9 @@ namespace Server.Items
public void Reset() public void Reset()
{ {
if (m_ResetTimer != null) _resetTimer.Cancel();
{
if (m_ResetTimer.Running)
{
m_ResetTimer.Stop();
}
}
Locked = true; Locked = true;
ClearContents(); ClearContents();
GenerateTreasure(); GenerateTreasure();
} }
private class TreasureResetTimer : Timer
{
private readonly BaseTreasureChest m_Chest;
public TreasureResetTimer(BaseTreasureChest chest) : base(
TimeSpan.FromMinutes(Utility.Random(chest.MinSpawnTime, chest.MaxSpawnTime))
)
{
m_Chest = chest;
}
protected override void OnTick()
{
m_Chest.Reset();
}
}
}
} }

View file

@ -1,44 +1,43 @@
namespace Server.Items namespace Server.Items;
{
[Flippable] [Flippable]
public class ParagonChest : LockableContainer [Serializable(0, false)]
public partial class ParagonChest : LockableContainer
{ {
private static readonly int[] m_ItemIDs = private static readonly int[] _itemIDs =
{ {
0x9AB, 0xE40, 0xE41, 0xE7C 0x9AB, 0xE40, 0xE41, 0xE7C
}; };
private static readonly int[] m_Hues = private static readonly int[] _hues =
{ {
0x0, 0x455, 0x47E, 0x89F, 0x8A5, 0x8AB, 0x0, 0x455, 0x47E, 0x89F, 0x8A5, 0x8AB,
0x966, 0x96D, 0x972, 0x973, 0x979 0x966, 0x96D, 0x972, 0x973, 0x979
}; };
private string m_Name; [InternString]
[SerializableField(0, "private", "private")]
private string _name;
[Constructible] [Constructible]
public ParagonChest(string name, int level) : base(m_ItemIDs.RandomElement()) public ParagonChest(string name, int level) : base(_itemIDs.RandomElement())
{ {
m_Name = name; _name = name;
Hue = m_Hues.RandomElement(); Hue = _hues.RandomElement();
Fill(level); Fill(level);
} }
public ParagonChest(Serial serial) : base(serial)
{
}
public override void OnSingleClick(Mobile from) public override void OnSingleClick(Mobile from)
{ {
base.OnSingleClick(from); base.OnSingleClick(from);
LabelTo(from, 1063449, m_Name); LabelTo(from, 1063449, _name);
} }
public override void GetProperties(ObjectPropertyList list) public override void GetProperties(ObjectPropertyList list)
{ {
base.GetProperties(list); base.GetProperties(list);
list.Add(1063449, m_Name); list.Add(1063449, _name);
} }
private static void GetRandomAOSStats(out int attributeCount, out int min, out int max) private static void GetRandomAOSStats(out int attributeCount, out int min, out int max)
@ -118,16 +117,7 @@ namespace Server.Items
for (var i = 0; i < level * 2; ++i) for (var i = 0; i < level * 2; ++i)
{ {
Item item; var item = Core.AOS ? Loot.RandomArmorOrShieldOrWeaponOrJewelry() : Loot.RandomArmorOrShieldOrWeapon();
if (Core.AOS)
{
item = Loot.RandomArmorOrShieldOrWeaponOrJewelry();
}
else
{
item = Loot.RandomArmorOrShieldOrWeapon();
}
if (item is BaseWeapon weapon) if (item is BaseWeapon weapon)
{ {
@ -194,23 +184,4 @@ namespace Server.Items
DropItem(new TreasureMap(level + 1, Utility.RandomBool() ? Map.Felucca : Map.Trammel)); DropItem(new TreasureMap(level + 1, Utility.RandomBool() ? Map.Felucca : Map.Trammel));
} }
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
writer.Write(m_Name);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
m_Name = Utility.Intern(reader.ReadString());
}
}
} }

View file

@ -2,98 +2,67 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using Server.Multis; using Server.Multis;
namespace Server.Items namespace Server.Items;
{
[Flippable(0xE80, 0x9A8)] [Flippable(0xE80, 0x9A8)]
public class StrongBox : BaseContainer, IChoppable [Serializable(0, false)]
public partial class StrongBox : BaseContainer, IChoppable
{ {
private BaseHouse m_House; [InvalidateProperties]
private Mobile m_Owner; [SerializableField(0)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private Mobile _owner;
[InvalidateProperties]
[SerializableField(1)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private BaseHouse _house;
public StrongBox(Mobile owner, BaseHouse house) : base(0xE80) public StrongBox(Mobile owner, BaseHouse house) : base(0xE80)
{ {
m_Owner = owner; _owner = owner;
m_House = house; _house = house;
MaxItems = 25; MaxItems = 25;
} }
public StrongBox(Serial serial) : base(serial)
{
}
public override double DefaultWeight => 100; public override double DefaultWeight => 100;
public override int LabelNumber => 1023712; public override int LabelNumber => 1023712;
[CommandProperty(AccessLevel.GameMaster)]
public Mobile Owner
{
get => m_Owner;
set
{
m_Owner = value;
InvalidateProperties();
}
}
public override int DefaultMaxWeight => 0; public override int DefaultMaxWeight => 0;
public override bool Decays => m_House == null || m_Owner?.Deleted != false || !m_House.IsCoOwner(m_Owner); public override bool Decays => _house == null || _owner?.Deleted != false || !_house.IsCoOwner(_owner);
public override TimeSpan DecayTime => TimeSpan.FromMinutes(30.0); public override TimeSpan DecayTime => TimeSpan.FromMinutes(30.0);
public void OnChop(Mobile from) public void OnChop(Mobile from)
{ {
if (m_House?.Deleted != false || m_Owner?.Deleted != false || from == m_Owner || m_House.IsOwner(from)) if (_house?.Deleted != false || _owner?.Deleted != false || from == _owner || _house.IsOwner(from))
{ {
Chop(from); Chop(from);
} }
} }
public override void Serialize(IGenericWriter writer) [AfterDeserialization]
private void AfterDeserialization()
{ {
base.Serialize(writer);
writer.Write(0); // version
writer.Write(m_Owner);
writer.Write(m_House);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{
case 0:
{
m_Owner = reader.ReadEntity<Mobile>();
m_House = reader.ReadEntity<BaseHouse>();
break;
}
}
Timer.StartTimer(TimeSpan.FromSeconds(1.0), Validate); Timer.StartTimer(TimeSpan.FromSeconds(1.0), Validate);
} }
private void Validate() private void Validate()
{ {
if (m_Owner != null && m_House?.IsCoOwner(m_Owner) == false) if (_owner != null && _house?.IsCoOwner(_owner) == false)
{ {
Console.WriteLine("Warning: Destroying strongbox of {0}", m_Owner.Name); Console.WriteLine("Warning: Destroying strongbox of {0}", _owner.Name);
Destroy(); Destroy();
} }
} }
public override void AddNameProperty(ObjectPropertyList list) public override void AddNameProperty(ObjectPropertyList list)
{ {
if (m_Owner != null) if (_owner != null)
{ {
list.Add(1042887, m_Owner.Name); // a strong box owned by ~1_OWNER_NAME~ list.Add(1042887, _owner.Name); // a strong box owned by ~1_OWNER_NAME~
} }
else else
{ {
@ -103,25 +72,24 @@ namespace Server.Items
public override void OnSingleClick(Mobile from) public override void OnSingleClick(Mobile from)
{ {
if (m_Owner != null) if (_owner == null)
{ {
LabelTo(from, 1042887, m_Owner.Name); // a strong box owned by ~1_OWNER_NAME~ base.OnSingleClick(from);
return;
}
LabelTo(from, 1042887, _owner.Name); // a strong box owned by ~1_OWNER_NAME~
if (CheckContentDisplay(from)) if (CheckContentDisplay(from))
{ {
LabelTo(from, "({0} items, {1} stones)", TotalItems, TotalWeight); LabelTo(from, "({0} items, {1} stones)", TotalItems, TotalWeight);
} }
} }
else
{
base.OnSingleClick(from);
}
}
public override bool IsAccessibleTo(Mobile m) => public override bool IsAccessibleTo(Mobile m) =>
m_Owner?.Deleted != false || m_House?.Deleted != false || _owner?.Deleted != false || _house?.Deleted != false ||
m.AccessLevel >= AccessLevel.GameMaster || m.AccessLevel >= AccessLevel.GameMaster ||
m == m_Owner && m_House.IsCoOwner(m) && base.IsAccessibleTo(m); m == _owner && _house.IsCoOwner(m) && base.IsAccessibleTo(m);
private void Chop(Mobile from) private void Chop(Mobile from)
{ {
@ -145,4 +113,3 @@ namespace Server.Items
return metalBox; return metalBox;
} }
} }
}

View file

@ -0,0 +1,21 @@
{
"version": 1,
"type": "Server.Items.BaseTreasureChest",
"properties": [
{
"name": "Level",
"type": "Server.Items.BaseTreasureChest.TreasureLevel",
"rule": "EnumMigrationRule"
},
{
"name": "MinSpawnTime",
"type": "System.TimeSpan",
"rule": "PrimitiveTypeMigrationRule"
},
{
"name": "MaxSpawnTime",
"type": "System.TimeSpan",
"rule": "PrimitiveTypeMigrationRule"
}
]
}

View file

@ -0,0 +1,14 @@
{
"version": 0,
"type": "Server.Items.ParagonChest",
"properties": [
{
"name": "Name",
"type": "string",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
"InternString"
]
}
]
}

View file

@ -0,0 +1,16 @@
{
"version": 0,
"type": "Server.Items.StrongBox",
"properties": [
{
"name": "Owner",
"type": "Server.Mobile",
"rule": "SerializableInterfaceMigrationRule"
},
{
"name": "House",
"type": "Server.Multis.BaseHouse",
"rule": "SerializableInterfaceMigrationRule"
}
]
}