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

fix: Converts ethics system to generic entity persistence (#1824)

Browse source 
### Summary

Converts ethics system to entity persistence and removes the persistence item.


### TODO

1. The enable/disable toggle doesn't propagate to all code that does Ethics checks (notoriety, pvp, etc).
2. We need commands to remove them from an ethic.
This commit is contained in:
Kamron Batman 2024-06-16 10:26:09 -07:00 • committed by GitHub
parent f87c8f73ab
commit 20596e52fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
36 changed files with 1327 additions and 1338 deletions
Download patch file Download diff file Expand all files Collapse all files

250
Projects/UOContent/Engines/Ethics/Core/Player.cs
View file

@ -1,169 +1,141 @@
using System;
using System.Collections.ObjectModel;
using ModernUO.Serialization;
using Server.Mobiles;
namespace Server.Ethics
namespace Server.Ethics;
[PropertyObject]
[SerializationGenerator(1)]
public partial class Player : EthicsEntity
{
public class PlayerCollection : Collection<Player>
[SerializableField(0, setter: "private")]
private Mobile _mobile;
[SerializableField(1)]
[SerializedCommandProperty(AccessLevel.GameMaster, AccessLevel.Administrator)]
private int _power;
[SerializableField(2)]
[SerializedCommandProperty(AccessLevel.GameMaster, AccessLevel.Administrator)]
private int _history;
[SerializableField(3)]
[SerializedCommandProperty(AccessLevel.GameMaster, AccessLevel.Administrator)]
private Mobile _steed;
[SerializableField(4)]
[SerializedCommandProperty(AccessLevel.GameMaster, AccessLevel.Administrator)]
private Mobile _familiar;
[DeltaDateTime]
[SerializableField(5, setter: "private")]
private DateTime _shield;
[SerializableField(6, setter: "private")]
private Ethic _ethic;
public Player(Ethic ethic, Mobile mobile)
{
_ethic = ethic;
_mobile = mobile;
_power = 5;
_history = 5;
}
[PropertyObject]
public class Player
private void Deserialize(IGenericReader reader, int version)
{
private DateTime m_Shield;
// Don't call the base Deserialize
public Player(Ethic ethic, Mobile mobile)
_mobile = reader.ReadEntity<Mobile>();
_power = reader.ReadEncodedInt();
_history = reader.ReadEncodedInt();
_steed = reader.ReadEntity<Mobile>();
_familiar = reader.ReadEntity<Mobile>();
_shield = reader.ReadDeltaTime();
}
[CommandProperty(AccessLevel.GameMaster)]
public bool IsShielded
{
get
{
Ethic = ethic;
Mobile = mobile;
Power = 5;
History = 5;
}
public Player(Ethic ethic, IGenericReader reader)
{
Ethic = ethic;
var version = reader.ReadEncodedInt();
switch (version)
if (_shield == DateTime.MinValue)
{
case 0:
{
Mobile = reader.ReadEntity<Mobile>();
Power = reader.ReadEncodedInt();
History = reader.ReadEncodedInt();
Steed = reader.ReadEntity<Mobile>();
Familiar = reader.ReadEntity<Mobile>();
m_Shield = reader.ReadDeltaTime();
break;
}
}
}
public Ethic Ethic { get; }
public Mobile Mobile { get; }
[CommandProperty(AccessLevel.GameMaster, AccessLevel.Administrator)]
public int Power { get; set; }
[CommandProperty(AccessLevel.GameMaster, AccessLevel.Administrator)]
public int History { get; set; }
[CommandProperty(AccessLevel.GameMaster, AccessLevel.Administrator)]
public Mobile Steed { get; set; }
[CommandProperty(AccessLevel.GameMaster, AccessLevel.Administrator)]
public Mobile Familiar { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public bool IsShielded
{
get
{
if (m_Shield == DateTime.MinValue)
{
return false;
}
if (Core.Now < m_Shield + TimeSpan.FromHours(1.0))
{
return true;
}
FinishShield();
return false;
}
if (Core.Now < _shield + TimeSpan.FromHours(1.0))
{
return true;
}
FinishShield();
return false;
}
}
public static Player Find(Mobile mob) => Find(mob, false);
public static Player Find(Mobile mob) => Find(mob, false);
public static Player Find(Mobile mob, bool inherit)
public static Player Find(Mobile mob, bool inherit)
{
var pm = mob as PlayerMobile;
if (pm == null)
{
var pm = mob as PlayerMobile;
if (inherit && mob is BaseCreature bc)
{
pm = bc.GetMaster() as PlayerMobile;
}
if (pm == null)
{
if (inherit && mob is BaseCreature bc)
{
if (bc.Controlled)
{
pm = bc.ControlMaster as PlayerMobile;
}
else if (bc.Summoned)
{
pm = bc.SummonMaster as PlayerMobile;
}
}
if (pm == null)
{
return null;
}
}
var pl = pm.EthicPlayer;
if (pl?.Ethic.IsEligible(pl.Mobile) == false)
{
pm.EthicPlayer = pl = null;
}
return pl;
}
public void BeginShield() => m_Shield = Core.Now;
public void FinishShield() => m_Shield = DateTime.MinValue;
public void CheckAttach()
{
if (Ethic.IsEligible(Mobile))
{
Attach();
return null;
}
}
public void Attach()
{
if (Mobile is PlayerMobile mobile)
{
mobile.EthicPlayer = this;
}
var pl = pm.EthicPlayer;
Ethic.Players.Add(this);
if (pl?.Ethic.IsEligible(pl.Mobile) == false)
{
pm.EthicPlayer = pl = null;
}
public void Detach()
return pl;
}
public void BeginShield() => _shield = Core.Now;
public void FinishShield() => _shield = DateTime.MinValue;
public void CheckAttach()
{
if (Ethic.IsEligible(Mobile))
{
if (Mobile is PlayerMobile mobile)
{
mobile.EthicPlayer = null;
}
Ethic.Players.Remove(this);
}
public void Serialize(IGenericWriter writer)
{
writer.WriteEncodedInt(0); // version
writer.Write(Mobile);
writer.WriteEncodedInt(Power);
writer.WriteEncodedInt(History);
writer.Write(Steed);
writer.Write(Familiar);
writer.WriteDeltaTime(m_Shield);
Attach();
}
}
public void Attach()
{
if (Mobile is PlayerMobile mobile)
{
mobile.EthicPlayer = this;
}
Ethic.Players.Add(this);
}
public void Detach()
{
if (Mobile is PlayerMobile mobile)
{
mobile.EthicPlayer = null;
}
Ethic.Players.Remove(this);
}
}