Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -1,135 +1,145 @@
using System;
namespace Server.Items
{
[Flippable]
public class LeatherGloves : BaseArmor, IArcaneEquip
{
public override int BasePhysicalResistance => 2;
public override int BaseFireResistance => 4;
public override int BaseColdResistance => 3;
public override int BasePoisonResistance => 3;
public override int BaseEnergyResistance => 3;
[Flippable]
public class LeatherGloves : BaseArmor, IArcaneEquip
{
[Constructible]
public LeatherGloves() : base(0x13C6)
{
Weight = 1.0;
}
public override int InitMinHits => 30;
public override int InitMaxHits => 40;
public LeatherGloves(Serial serial) : base(serial)
{
}
public override int AosStrReq => 20;
public override int OldStrReq => 10;
public override int BasePhysicalResistance => 2;
public override int BaseFireResistance => 4;
public override int BaseColdResistance => 3;
public override int BasePoisonResistance => 3;
public override int BaseEnergyResistance => 3;
public override int ArmorBase => 13;
public override int InitMinHits => 30;
public override int InitMaxHits => 40;
public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather;
public override CraftResource DefaultResource => CraftResource.RegularLeather;
public override int AosStrReq => 20;
public override int OldStrReq => 10;
public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All;
public override int ArmorBase => 13;
[Constructible]
public LeatherGloves() : base( 0x13C6 )
{
Weight = 1.0;
}
public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather;
public override CraftResource DefaultResource => CraftResource.RegularLeather;
public LeatherGloves( Serial serial ) : base( serial )
{
}
public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All;
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 1 ); // version
writer.Write(1); // version
if ( IsArcane )
{
writer.Write( true );
writer.Write( (int) m_CurArcaneCharges );
writer.Write( (int) m_MaxArcaneCharges );
}
else
{
writer.Write( false );
}
}
if (IsArcane)
{
writer.Write(true);
writer.Write(m_CurArcaneCharges);
writer.Write(m_MaxArcaneCharges);
}
else
{
writer.Write(false);
}
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
int version = reader.ReadInt();
switch ( version )
{
case 1:
{
if ( reader.ReadBool() )
{
m_CurArcaneCharges = reader.ReadInt();
m_MaxArcaneCharges = reader.ReadInt();
switch (version)
{
case 1:
{
if (reader.ReadBool())
{
m_CurArcaneCharges = reader.ReadInt();
m_MaxArcaneCharges = reader.ReadInt();
if ( Hue == 2118 )
Hue = ArcaneGem.DefaultArcaneHue;
}
if (Hue == 2118)
Hue = ArcaneGem.DefaultArcaneHue;
}
break;
}
}
}
break;
}
}
}
#region Arcane Impl
private int m_MaxArcaneCharges, m_CurArcaneCharges;
#region Arcane Impl
[CommandProperty( AccessLevel.GameMaster )]
public int MaxArcaneCharges
{
get => m_MaxArcaneCharges;
set{ m_MaxArcaneCharges = value; InvalidateProperties(); Update(); }
}
private int m_MaxArcaneCharges, m_CurArcaneCharges;
[CommandProperty( AccessLevel.GameMaster )]
public int CurArcaneCharges
{
get => m_CurArcaneCharges;
set{ m_CurArcaneCharges = value; InvalidateProperties(); Update(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public int MaxArcaneCharges
{
get => m_MaxArcaneCharges;
set
{
m_MaxArcaneCharges = value;
InvalidateProperties();
Update();
}
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsArcane => ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 );
[CommandProperty(AccessLevel.GameMaster)]
public int CurArcaneCharges
{
get => m_CurArcaneCharges;
set
{
m_CurArcaneCharges = value;
InvalidateProperties();
Update();
}
}
public void Update()
{
if ( IsArcane )
ItemID = 0x26B0;
else if ( ItemID == 0x26B0 )
ItemID = 0x13C6;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsArcane => m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0;
if ( IsArcane && CurArcaneCharges == 0 )
Hue = 0;
}
public void Update()
{
if (IsArcane)
ItemID = 0x26B0;
else if (ItemID == 0x26B0)
ItemID = 0x13C6;
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
if (IsArcane && CurArcaneCharges == 0)
Hue = 0;
}
if ( IsArcane )
list.Add( 1061837, "{0}\t{1}", m_CurArcaneCharges, m_MaxArcaneCharges ); // arcane charges: ~1_val~ / ~2_val~
}
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
public override void OnSingleClick( Mobile from )
{
base.OnSingleClick( from );
if (IsArcane)
list.Add(1061837, "{0}\t{1}", m_CurArcaneCharges, m_MaxArcaneCharges); // arcane charges: ~1_val~ / ~2_val~
}
if ( IsArcane )
LabelTo( from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}");
}
public override void OnSingleClick(Mobile from)
{
base.OnSingleClick(from);
public void Flip()
{
if ( ItemID == 0x13C6 )
ItemID = 0x13CE;
else if ( ItemID == 0x13CE )
ItemID = 0x13C6;
}
#endregion
}
}
if (IsArcane)
LabelTo(from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}");
}
public void Flip()
{
if (ItemID == 0x13C6)
ItemID = 0x13CE;
else if (ItemID == 0x13CE)
ItemID = 0x13C6;
}
#endregion
}
}