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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

241
Projects/UOContent/Items/Containers/Strongbox.cs
View file

@ -2,147 +2,114 @@ using System;
using System.Collections.Generic;
using Server.Multis;
namespace Server.Items
namespace Server.Items;
[Flippable(0xE80, 0x9A8)]
[Serializable(0, false)]
public partial class StrongBox : BaseContainer, IChoppable
{
[Flippable(0xE80, 0x9A8)]
public class StrongBox : BaseContainer, IChoppable
[InvalidateProperties]
[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)
{
private BaseHouse m_House;
private Mobile m_Owner;
_owner = owner;
_house = house;
public StrongBox(Mobile owner, BaseHouse house) : base(0xE80)
MaxItems = 25;
}
public override double DefaultWeight => 100;
public override int LabelNumber => 1023712;
public override int DefaultMaxWeight => 0;
public override bool Decays => _house == null || _owner?.Deleted != false || !_house.IsCoOwner(_owner);
public override TimeSpan DecayTime => TimeSpan.FromMinutes(30.0);
public void OnChop(Mobile from)
{
if (_house?.Deleted != false || _owner?.Deleted != false || from == _owner || _house.IsOwner(from))
{
m_Owner = owner;
m_House = house;
MaxItems = 25;
}
public StrongBox(Serial serial) : base(serial)
{
}
public override double DefaultWeight => 100;
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 bool Decays => m_House == null || m_Owner?.Deleted != false || !m_House.IsCoOwner(m_Owner);
public override TimeSpan DecayTime => TimeSpan.FromMinutes(30.0);
public void OnChop(Mobile from)
{
if (m_House?.Deleted != false || m_Owner?.Deleted != false || from == m_Owner || m_House.IsOwner(from))
{
Chop(from);
}
}
public override void Serialize(IGenericWriter writer)
{
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);
}
private void Validate()
{
if (m_Owner != null && m_House?.IsCoOwner(m_Owner) == false)
{
Console.WriteLine("Warning: Destroying strongbox of {0}", m_Owner.Name);
Destroy();
}
}
public override void AddNameProperty(ObjectPropertyList list)
{
if (m_Owner != null)
{
list.Add(1042887, m_Owner.Name); // a strong box owned by ~1_OWNER_NAME~
}
else
{
base.AddNameProperty(list);
}
}
public override void OnSingleClick(Mobile from)
{
if (m_Owner != null)
{
LabelTo(from, 1042887, m_Owner.Name); // a strong box owned by ~1_OWNER_NAME~
if (CheckContentDisplay(from))
{
LabelTo(from, "({0} items, {1} stones)", TotalItems, TotalWeight);
}
}
else
{
base.OnSingleClick(from);
}
}
public override bool IsAccessibleTo(Mobile m) =>
m_Owner?.Deleted != false || m_House?.Deleted != false ||
m.AccessLevel >= AccessLevel.GameMaster ||
m == m_Owner && m_House.IsCoOwner(m) && base.IsAccessibleTo(m);
private void Chop(Mobile from)
{
Effects.PlaySound(Location, Map, 0x3B3);
from.SendLocalizedMessage(500461); // You destroy the item.
Destroy();
}
public Container ConvertToStandardContainer()
{
Container metalBox = new MetalBox();
var subItems = new List<Item>(Items);
foreach (var subItem in subItems)
{
metalBox.AddItem(subItem);
}
Delete();
return metalBox;
Chop(from);
}
}
[AfterDeserialization]
private void AfterDeserialization()
{
Timer.StartTimer(TimeSpan.FromSeconds(1.0), Validate);
}
private void Validate()
{
if (_owner != null && _house?.IsCoOwner(_owner) == false)
{
Console.WriteLine("Warning: Destroying strongbox of {0}", _owner.Name);
Destroy();
}
}
public override void AddNameProperty(ObjectPropertyList list)
{
if (_owner != null)
{
list.Add(1042887, _owner.Name); // a strong box owned by ~1_OWNER_NAME~
}
else
{
base.AddNameProperty(list);
}
}
public override void OnSingleClick(Mobile from)
{
if (_owner == null)
{
base.OnSingleClick(from);
return;
}
LabelTo(from, 1042887, _owner.Name); // a strong box owned by ~1_OWNER_NAME~
if (CheckContentDisplay(from))
{
LabelTo(from, "({0} items, {1} stones)", TotalItems, TotalWeight);
}
}
public override bool IsAccessibleTo(Mobile m) =>
_owner?.Deleted != false || _house?.Deleted != false ||
m.AccessLevel >= AccessLevel.GameMaster ||
m == _owner && _house.IsCoOwner(m) && base.IsAccessibleTo(m);
private void Chop(Mobile from)
{
Effects.PlaySound(Location, Map, 0x3B3);
from.SendLocalizedMessage(500461); // You destroy the item.
Destroy();
}
public Container ConvertToStandardContainer()
{
Container metalBox = new MetalBox();
var subItems = new List<Item>(Items);
foreach (var subItem in subItems)
{
metalBox.AddItem(subItem);
}
Delete();
return metalBox;
}
}