fix: Codegens shields (#1273)

This commit is contained in:
Kamron Batman 2022-11-23 16:42:17 -08:00 • committed by GitHub
parent 82637a77cd
commit b75a8f72ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 434 additions and 652 deletions

View file

@ -1,6 +1,9 @@
namespace Server.Items using ModernUO.Serialization;
{
public class Aegis : HeaterShield namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class Aegis : HeaterShield
{ {
[Constructible] [Constructible]
public Aegis() public Aegis()
@ -12,10 +15,6 @@ namespace Server.Items
Attributes.LowerManaCost = 8; Attributes.LowerManaCost = 8;
} }
public Aegis(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1061602; // Ægis public override int LabelNumber => 1061602; // Ægis
public override int ArtifactRarity => 11; public override int ArtifactRarity => 11;
@ -23,24 +22,4 @@ namespace Server.Items
public override int InitMinHits => 255; public override int InitMinHits => 255;
public override int InitMaxHits => 255; public override int InitMaxHits => 255;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(1);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (version < 1)
{
PhysicalBonus = 0;
}
}
}
} }

View file

@ -1,6 +1,9 @@
namespace Server.Items using ModernUO.Serialization;
{
public class ArcaneShield : WoodenKiteShield namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class ArcaneShield : WoodenKiteShield
{ {
[Constructible] [Constructible]
public ArcaneShield() public ArcaneShield()
@ -13,33 +16,9 @@ namespace Server.Items
Attributes.CastSpeed = 1; Attributes.CastSpeed = 1;
} }
public ArcaneShield(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1061101; // Arcane Shield public override int LabelNumber => 1061101; // Arcane Shield
public override int ArtifactRarity => 11; public override int ArtifactRarity => 11;
public override int InitMinHits => 255; public override int InitMinHits => 255;
public override int InitMaxHits => 255; public override int InitMaxHits => 255;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (Attributes.NightSight == 0)
{
Attributes.NightSight = 1;
}
}
}
} }

View file

@ -1,18 +1,16 @@
using System; using System;
using ModernUO.Serialization;
using Server.Network; using Server.Network;
namespace Server.Items namespace Server.Items;
{
public class BaseShield : BaseArmor [SerializationGenerator(0, false)]
public partial class BaseShield : BaseArmor
{ {
public BaseShield(int itemID) : base(itemID) public BaseShield(int itemID) : base(itemID)
{ {
} }
public BaseShield(Serial serial) : base(serial)
{
}
public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate;
public override double ArmorRating public override double ArmorRating
@ -31,35 +29,6 @@ namespace Server.Items
} }
} }
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(1); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (version < 1)
{
if (this is Aegis)
{
return;
}
// The 15 bonus points to resistances are not applied to shields on OSI.
PhysicalBonus = 0;
FireBonus = 0;
ColdBonus = 0;
PoisonBonus = 0;
EnergyBonus = 0;
}
}
public override int OnHit(BaseWeapon weapon, int damage) public override int OnHit(BaseWeapon weapon, int damage)
{ {
if (Core.AOS) if (Core.AOS)
@ -71,46 +40,9 @@ namespace Server.Items
else else
{ {
var halfArmor = ArmorRating / 2.0; var halfArmor = ArmorRating / 2.0;
var absorbed = (int)(halfArmor + halfArmor * Utility.RandomDouble()); var absorbed = Math.Max(2, (int)(halfArmor + halfArmor * Utility.RandomDouble()));
if (absorbed < 2) TryLowerDurability(weapon.Type == WeaponType.Bashing ? absorbed / 2 : Utility.Random(2));
{
absorbed = 2;
}
var wear = weapon.Type == WeaponType.Bashing ? absorbed / 2 : Utility.Random(2);
if (wear > 0 && MaxHitPoints > 0)
{
if (HitPoints >= wear)
{
HitPoints -= wear;
wear = 0;
}
else
{
wear -= HitPoints;
HitPoints = 0;
}
if (wear > 0)
{
if (MaxHitPoints > wear)
{
MaxHitPoints -= wear;
if (Parent is Mobile mobile)
{
// Your equipment is severely damaged.
mobile.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061121);
}
}
else
{
Delete();
}
}
}
} }
return 0; return 0;
@ -137,10 +69,20 @@ namespace Server.Items
if (Utility.Random(100) < 25) // 25% chance to lower durability if (Utility.Random(100) < 25) // 25% chance to lower durability
{ {
var wear = Utility.Random(2); TryLowerDurability(Utility.Random(2));
}
}
if (wear > 0 && MaxHitPoints > 0) return damage;
}
private void TryLowerDurability(int wear)
{ {
if (wear <= 0 || MaxHitPoints <= 0)
{
return;
}
if (HitPoints >= wear) if (HitPoints >= wear)
{ {
HitPoints -= wear; HitPoints -= wear;
@ -152,14 +94,17 @@ namespace Server.Items
HitPoints = 0; HitPoints = 0;
} }
if (wear > 0) if (wear <= 0)
{ {
return;
}
if (MaxHitPoints > wear) if (MaxHitPoints > wear)
{ {
MaxHitPoints -= wear; MaxHitPoints -= wear;
// Your equipment is severely damaged. // Your equipment is severely damaged.
((Mobile)Parent).LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061121); (Parent as Mobile)?.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1061121);
} }
else else
{ {
@ -167,10 +112,3 @@ namespace Server.Items
} }
} }
} }
}
}
return damage;
}
}
}

View file

@ -1,14 +1,13 @@
namespace Server.Items using ModernUO.Serialization;
{
public class BronzeShield : BaseShield namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class BronzeShield : BaseShield
{ {
[Constructible] [Constructible]
public BronzeShield() : base(0x1B72) => Weight = 6.0; public BronzeShield() : base(0x1B72) => Weight = 6.0;
public BronzeShield(Serial serial) : base(serial)
{
}
public override int BasePhysicalResistance => 0; public override int BasePhysicalResistance => 0;
public override int BaseFireResistance => 0; public override int BaseFireResistance => 0;
public override int BaseColdResistance => 1; public override int BaseColdResistance => 1;
@ -21,19 +20,4 @@ namespace Server.Items
public override int AosStrReq => 35; public override int AosStrReq => 35;
public override int ArmorBase => 10; public override int ArmorBase => 10;
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
}
} }

View file

@ -1,14 +1,13 @@
namespace Server.Items using ModernUO.Serialization;
{
public class Buckler : BaseShield namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class Buckler : BaseShield
{ {
[Constructible] [Constructible]
public Buckler() : base(0x1B73) => Weight = 5.0; public Buckler() : base(0x1B73) => Weight = 5.0;
public Buckler(Serial serial) : base(serial)
{
}
public override int BasePhysicalResistance => 0; public override int BasePhysicalResistance => 0;
public override int BaseFireResistance => 0; public override int BaseFireResistance => 0;
public override int BaseColdResistance => 0; public override int BaseColdResistance => 0;
@ -21,19 +20,4 @@ namespace Server.Items
public override int AosStrReq => 20; public override int AosStrReq => 20;
public override int ArmorBase => 7; public override int ArmorBase => 7;
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
}
} }

View file

@ -1,8 +1,10 @@
using ModernUO.Serialization;
using Server.Guilds; using Server.Guilds;
namespace Server.Items namespace Server.Items;
{
public class ChaosShield : BaseShield [SerializationGenerator(0, false)]
public partial class ChaosShield : BaseShield
{ {
[Constructible] [Constructible]
public ChaosShield() : base(0x1BC3) public ChaosShield() : base(0x1BC3)
@ -15,10 +17,6 @@ namespace Server.Items
Weight = 5.0; Weight = 5.0;
} }
public ChaosShield(Serial serial) : base(serial)
{
}
public override int BasePhysicalResistance => 1; public override int BasePhysicalResistance => 1;
public override int BaseFireResistance => 0; public override int BaseFireResistance => 0;
public override int BaseColdResistance => 0; public override int BaseColdResistance => 0;
@ -32,20 +30,6 @@ namespace Server.Items
public override int ArmorBase => 32; public override int ArmorBase => 32;
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override bool OnEquip(Mobile from) => Validate(from) && base.OnEquip(from); public override bool OnEquip(Mobile from) => Validate(from) && base.OnEquip(from);
public override void OnSingleClick(Mobile from) public override void OnSingleClick(Mobile from)
@ -58,12 +42,12 @@ namespace Server.Items
public virtual bool Validate(Mobile m) public virtual bool Validate(Mobile m)
{ {
if (m?.Player != true || m.AccessLevel != AccessLevel.Player || Core.AOS) if (Core.AOS || m is not { Player: true, AccessLevel: AccessLevel.Player })
{ {
return true; return true;
} }
if (m.Guild is not Guild g || g.Type != GuildType.Chaos) if (m.Guild is not Guild { Type: GuildType.Chaos })
{ {
m.FixedEffect(0x3728, 10, 13); m.FixedEffect(0x3728, 10, 13);
Delete(); Delete();
@ -74,4 +58,3 @@ namespace Server.Items
return true; return true;
} }
} }
}

View file

@ -1,7 +1,7 @@
using ModernUO.Serialization; using ModernUO.Serialization;
namespace Server.Items namespace Server.Items;
{
[Flippable(0x4200, 0x4207)] [Flippable(0x4200, 0x4207)]
[SerializationGenerator(0)] [SerializationGenerator(0)]
public partial class GargishWoodenShield : BaseShield public partial class GargishWoodenShield : BaseShield
@ -20,4 +20,3 @@ namespace Server.Items
public override int RequiredRaces => Race.AllowGargoylesOnly; public override int RequiredRaces => Race.AllowGargoylesOnly;
} }
}

View file

@ -1,14 +1,13 @@
namespace Server.Items using ModernUO.Serialization;
{
public class HeaterShield : BaseShield namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class HeaterShield : BaseShield
{ {
[Constructible] [Constructible]
public HeaterShield() : base(0x1B76) => Weight = 8.0; public HeaterShield() : base(0x1B76) => Weight = 8.0;
public HeaterShield(Serial serial) : base(serial)
{
}
public override int BasePhysicalResistance => 0; public override int BasePhysicalResistance => 0;
public override int BaseFireResistance => 1; public override int BaseFireResistance => 1;
public override int BaseColdResistance => 0; public override int BaseColdResistance => 0;
@ -21,19 +20,4 @@ namespace Server.Items
public override int AosStrReq => 90; public override int AosStrReq => 90;
public override int ArmorBase => 23; public override int ArmorBase => 23;
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
}
} }

View file

@ -1,14 +1,13 @@
namespace Server.Items using ModernUO.Serialization;
{
public class MetalKiteShield : BaseShield, IDyable namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class MetalKiteShield : BaseShield, IDyable
{ {
[Constructible] [Constructible]
public MetalKiteShield() : base(0x1B74) => Weight = 7.0; public MetalKiteShield() : base(0x1B74) => Weight = 7.0;
public MetalKiteShield(Serial serial) : base(serial)
{
}
public override int BasePhysicalResistance => 0; public override int BasePhysicalResistance => 0;
public override int BaseFireResistance => 0; public override int BaseFireResistance => 0;
public override int BaseColdResistance => 0; public override int BaseColdResistance => 0;
@ -33,24 +32,4 @@ namespace Server.Items
return true; return true;
} }
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (Weight == 5.0)
{
Weight = 7.0;
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
}
} }

View file

@ -1,14 +1,13 @@
namespace Server.Items using ModernUO.Serialization;
{
public class MetalShield : BaseShield namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class MetalShield : BaseShield
{ {
[Constructible] [Constructible]
public MetalShield() : base(0x1B7B) => Weight = 6.0; public MetalShield() : base(0x1B7B) => Weight = 6.0;
public MetalShield(Serial serial) : base(serial)
{
}
public override int BasePhysicalResistance => 0; public override int BasePhysicalResistance => 0;
public override int BaseFireResistance => 1; public override int BaseFireResistance => 1;
public override int BaseColdResistance => 0; public override int BaseColdResistance => 0;
@ -21,19 +20,4 @@ namespace Server.Items
public override int AosStrReq => 45; public override int AosStrReq => 45;
public override int ArmorBase => 11; public override int ArmorBase => 11;
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
}
} }

View file

@ -1,8 +1,10 @@
using ModernUO.Serialization;
using Server.Guilds; using Server.Guilds;
namespace Server.Items namespace Server.Items;
{
public class OrderShield : BaseShield [SerializationGenerator(0, false)]
public partial class OrderShield : BaseShield
{ {
[Constructible] [Constructible]
public OrderShield() : base(0x1BC4) public OrderShield() : base(0x1BC4)
@ -15,10 +17,6 @@ namespace Server.Items
Weight = 7.0; Weight = 7.0;
} }
public OrderShield(Serial serial) : base(serial)
{
}
public override int BasePhysicalResistance => 1; public override int BasePhysicalResistance => 1;
public override int BaseFireResistance => 0; public override int BaseFireResistance => 0;
public override int BaseColdResistance => 0; public override int BaseColdResistance => 0;
@ -32,25 +30,6 @@ namespace Server.Items
public override int ArmorBase => 30; public override int ArmorBase => 30;
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (Weight == 6.0)
{
Weight = 7.0;
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override bool OnEquip(Mobile from) => Validate(from) && base.OnEquip(from); public override bool OnEquip(Mobile from) => Validate(from) && base.OnEquip(from);
public override void OnSingleClick(Mobile from) public override void OnSingleClick(Mobile from)
@ -63,12 +42,12 @@ namespace Server.Items
public virtual bool Validate(Mobile m) public virtual bool Validate(Mobile m)
{ {
if (Core.AOS || m?.Player != true || m.AccessLevel != AccessLevel.Player) if (Core.AOS || m is not { Player: true, AccessLevel: AccessLevel.Player })
{ {
return true; return true;
} }
if (m.Guild is not Guild g || g.Type != GuildType.Order) if (m.Guild is not Guild { Type: GuildType.Order })
{ {
m.FixedEffect(0x3728, 10, 13); m.FixedEffect(0x3728, 10, 13);
Delete(); Delete();
@ -79,4 +58,3 @@ namespace Server.Items
return true; return true;
} }
} }
}

View file

@ -1,14 +1,13 @@
namespace Server.Items using ModernUO.Serialization;
{
public class WoodenKiteShield : BaseShield namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class WoodenKiteShield : BaseShield
{ {
[Constructible] [Constructible]
public WoodenKiteShield() : base(0x1B79) => Weight = 5.0; public WoodenKiteShield() : base(0x1B79) => Weight = 5.0;
public WoodenKiteShield(Serial serial) : base(serial)
{
}
public override int BasePhysicalResistance => 0; public override int BasePhysicalResistance => 0;
public override int BaseFireResistance => 0; public override int BaseFireResistance => 0;
public override int BaseColdResistance => 0; public override int BaseColdResistance => 0;
@ -21,24 +20,4 @@ namespace Server.Items
public override int AosStrReq => 20; public override int AosStrReq => 20;
public override int ArmorBase => 12; public override int ArmorBase => 12;
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (Weight == 7.0)
{
Weight = 5.0;
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
}
} }

View file

@ -1,14 +1,13 @@
namespace Server.Items using ModernUO.Serialization;
{
public class WoodenShield : BaseShield namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class WoodenShield : BaseShield
{ {
[Constructible] [Constructible]
public WoodenShield() : base(0x1B7A) => Weight = 5.0; public WoodenShield() : base(0x1B7A) => Weight = 5.0;
public WoodenShield(Serial serial) : base(serial)
{
}
public override int BasePhysicalResistance => 0; public override int BasePhysicalResistance => 0;
public override int BaseFireResistance => 0; public override int BaseFireResistance => 0;
public override int BaseColdResistance => 0; public override int BaseColdResistance => 0;
@ -21,19 +20,4 @@ namespace Server.Items
public override int AosStrReq => 20; public override int AosStrReq => 20;
public override int ArmorBase => 8; public override int ArmorBase => 8;
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
}
} }

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.Aegis"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.ArcaneShield"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.BaseShield"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.BronzeShield"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.Buckler"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.ChaosShield"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.HeaterShield"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.MetalKiteShield"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.MetalShield"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.OrderShield"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.WoodenKiteShield"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.WoodenShield"
}