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

@ -2,129 +2,137 @@ using Server.Engines.VeteranRewards;
namespace Server.Items
{
public class ContestMiniHouse : MiniHouseAddon
{
public override BaseAddonDeed Deed
{
get
{
ContestMiniHouseDeed deed = new ContestMiniHouseDeed( Type );
deed.IsRewardItem = m_IsRewardItem;
public class ContestMiniHouse : MiniHouseAddon
{
private bool m_IsRewardItem;
return deed;
}
}
[Constructible]
public ContestMiniHouse() : base(MiniHouseType.MalasMountainPass)
{
}
private bool m_IsRewardItem;
[Constructible]
public ContestMiniHouse(MiniHouseType type) : base(type)
{
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
public ContestMiniHouse(Serial serial) : base(serial)
{
}
[Constructible]
public ContestMiniHouse() : base( MiniHouseType.MalasMountainPass )
{
}
public override BaseAddonDeed Deed
{
get
{
ContestMiniHouseDeed deed = new ContestMiniHouseDeed(Type);
deed.IsRewardItem = m_IsRewardItem;
[Constructible]
public ContestMiniHouse( MiniHouseType type ) : base( type )
{
}
return deed;
}
}
public ContestMiniHouse( Serial serial ) : base( serial )
{
}
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem
{
get => m_IsRewardItem;
set
{
m_IsRewardItem = value;
InvalidateProperties();
}
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
writer.WriteEncodedInt(0); // version
writer.Write( (bool) m_IsRewardItem );
}
writer.Write(m_IsRewardItem);
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
m_IsRewardItem = reader.ReadBool();
}
}
int version = reader.ReadEncodedInt();
public class ContestMiniHouseDeed : MiniHouseDeed, IRewardItem
{
public override BaseAddon Addon
{
get
{
ContestMiniHouse addon = new ContestMiniHouse( Type );
addon.IsRewardItem = m_IsRewardItem;
m_IsRewardItem = reader.ReadBool();
}
}
return addon;
}
}
private bool m_IsRewardItem;
public class ContestMiniHouseDeed : MiniHouseDeed, IRewardItem
{
private bool m_IsRewardItem;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
[Constructible]
public ContestMiniHouseDeed() : base( MiniHouseType.MalasMountainPass )
{
}
[Constructible]
public ContestMiniHouseDeed() : base(MiniHouseType.MalasMountainPass)
{
}
[Constructible]
public ContestMiniHouseDeed( MiniHouseType type ) : base( type )
{
}
[Constructible]
public ContestMiniHouseDeed(MiniHouseType type) : base(type)
{
}
public ContestMiniHouseDeed( Serial serial ) : base( serial )
{
}
public override void OnDoubleClick( Mobile from )
{
if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, new object[] { Type } ) )
return;
public ContestMiniHouseDeed(Serial serial) : base(serial)
{
}
base.OnDoubleClick( from );
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
if ( Core.ML && m_IsRewardItem )
list.Add( 1076217 ); // 1st Year Veteran Reward
}
public override BaseAddon Addon
{
get
{
ContestMiniHouse addon = new ContestMiniHouse(Type);
addon.IsRewardItem = m_IsRewardItem;
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
return addon;
}
}
writer.WriteEncodedInt( 0 ); // version
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem
{
get => m_IsRewardItem;
set
{
m_IsRewardItem = value;
InvalidateProperties();
}
}
writer.Write( (bool) m_IsRewardItem );
}
public override void OnDoubleClick(Mobile from)
{
if (m_IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this, new object[] { Type }))
return;
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
base.OnDoubleClick(from);
}
int version = reader.ReadEncodedInt();
m_IsRewardItem = reader.ReadBool();
}
}
}
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
if (Core.ML && m_IsRewardItem)
list.Add(1076217); // 1st Year Veteran Reward
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
writer.Write(m_IsRewardItem);
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
m_IsRewardItem = reader.ReadBool();
}
}
}