fix(codegen): Codegens Weapons (#698)

This commit is contained in:
Michael Dijkstra 2021-08-20 02:12:24 +10:00 • committed by GitHub
parent 3293ffcf06
commit 3fc2b76468
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
267 changed files with 873 additions and 2705 deletions

View file

@ -1,15 +1,12 @@
namespace Server.Items
{
[Flippable(0xF4D, 0xF4E)]
public class Bardiche : BasePoleArm
[Serializable(0, false)]
public partial class Bardiche : BasePoleArm
{
[Constructible]
public Bardiche() : base(0xF4D) => Weight = 7.0;
public Bardiche(Serial serial) : base(serial)
{
}
public override WeaponAbility PrimaryAbility => WeaponAbility.ParalyzingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount;
@ -26,19 +23,5 @@ namespace Server.Items
public override int InitMinHits => 31;
public override int InitMaxHits => 100;
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();
}
}
}

View file

@ -6,17 +6,20 @@ using Server.Engines.Harvest;
namespace Server.Items
{
public abstract class BasePoleArm : BaseMeleeWeapon, IUsesRemaining
[Serializable(0, false)]
public abstract partial class BasePoleArm : BaseMeleeWeapon, IUsesRemaining
{
private bool m_ShowUsesRemaining;
[SerializableField(0)]
[InvalidateProperties]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private bool _showUsesRemaining;
private int m_UsesRemaining;
[SerializableField(1)]
[InvalidateProperties]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private int _usesRemaining;
public BasePoleArm(int itemID) : base(itemID) => m_UsesRemaining = 150;
public BasePoleArm(Serial serial) : base(serial)
{
}
public BasePoleArm(int itemID) : base(itemID) => _usesRemaining = 150;
public override int DefHitSound => 0x237;
public override int DefMissSound => 0x238;
@ -27,28 +30,6 @@ namespace Server.Items
public virtual HarvestSystem HarvestSystem => Lumberjacking.System;
[CommandProperty(AccessLevel.GameMaster)]
public int UsesRemaining
{
get => m_UsesRemaining;
set
{
m_UsesRemaining = value;
InvalidateProperties();
}
}
[CommandProperty(AccessLevel.GameMaster)]
public bool ShowUsesRemaining
{
get => m_ShowUsesRemaining;
set
{
m_ShowUsesRemaining = value;
InvalidateProperties();
}
}
public override void OnDoubleClick(Mobile from)
{
if (HarvestSystem == null)
@ -76,47 +57,6 @@ namespace Server.Items
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(2); // version
writer.Write(m_ShowUsesRemaining);
writer.Write(m_UsesRemaining);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{
case 2:
{
m_ShowUsesRemaining = reader.ReadBool();
goto case 1;
}
case 1:
{
m_UsesRemaining = reader.ReadInt();
goto case 0;
}
case 0:
{
if (m_UsesRemaining < 1)
{
m_UsesRemaining = 150;
}
break;
}
}
}
public override void OnHit(Mobile attacker, Mobile defender, double damageBonus = 1)
{
base.OnHit(attacker, defender, damageBonus);

View file

@ -1,15 +1,12 @@
namespace Server.Items
{
[Flippable(0x143E, 0x143F)]
public class Halberd : BasePoleArm
[Serializable(0, false)]
public partial class Halberd : BasePoleArm
{
[Constructible]
public Halberd() : base(0x143E) => Weight = 16.0;
public Halberd(Serial serial) : base(serial)
{
}
public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow;
@ -26,19 +23,5 @@ namespace Server.Items
public override int InitMinHits => 31;
public override int InitMaxHits => 80;
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();
}
}
}

View file

@ -3,15 +3,12 @@ using Server.Engines.Harvest;
namespace Server.Items
{
[Flippable(0x26BA, 0x26C4)]
public class Scythe : BasePoleArm
[Serializable(0, false)]
public partial class Scythe : BasePoleArm
{
[Constructible]
public Scythe() : base(0x26BA) => Weight = 5.0;
public Scythe(Serial serial) : base(serial)
{
}
public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
@ -30,24 +27,5 @@ namespace Server.Items
public override int InitMaxHits => 100;
public override HarvestSystem HarvestSystem => null;
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();
if (Weight == 15.0)
{
Weight = 5.0;
}
}
}
}