Upgrades code style - First batch (#22)

This commit is contained in:
Kamron Batman 2018-08-14 06:16:50 +08:00 • committed by GitHub
parent 8ee42c8ea2
commit 632e8b4757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1834 changed files with 10245 additions and 10437 deletions

View file

@ -9,7 +9,7 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } }
public override NpcGuild NpcGuild => NpcGuild.MagesGuild;
[Constructible]
public Alchemist() : base( "the alchemist" )
@ -53,4 +53,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -9,7 +9,7 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } }
public override NpcGuild NpcGuild => NpcGuild.TinkersGuild;
[Constructible]
public Architect() : base( "the architect" )
@ -42,4 +42,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -9,7 +9,7 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.BardsGuild; } }
public override NpcGuild NpcGuild => NpcGuild.BardsGuild;
[Constructible]
public Bard() : base( "the bard" )
@ -45,4 +45,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -11,15 +11,15 @@ namespace Server.Mobiles
{
public class Barkeeper : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override void InitSBInfo()
{
m_SBInfos.Add( new SBBarkeeper() );
m_SBInfos.Add( new SBBarkeeper() );
}
public override VendorShoeType ShoeType{ get{ return Utility.RandomBool() ? VendorShoeType.ThighBoots : VendorShoeType.Boots; } }
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.ThighBoots : VendorShoeType.Boots;
public override void InitOutfit()
{
@ -51,4 +51,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -1,42 +1,42 @@
using System;
using System.Collections.Generic;
using Server;
using System;
using System.Collections.Generic;
using Server;
namespace Server.Mobiles
{
public class Beekeeper : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
namespace Server.Mobiles
{
public class Beekeeper : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
[Constructible]
public Beekeeper() : base( "the beekeeper" )
{
}
public override void InitSBInfo()
{
m_SBInfos.Add( new SBBeekeeper() );
public Beekeeper() : base( "the beekeeper" )
{
}
public override VendorShoeType ShoeType{ get{ return VendorShoeType.Boots; } }
public Beekeeper( Serial serial ) : base( serial )
{
public override void InitSBInfo()
{
m_SBInfos.Add( new SBBeekeeper() );
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override VendorShoeType ShoeType => VendorShoeType.Boots;
writer.Write( (int) 0 ); // version
}
public Beekeeper( Serial serial ) : base( serial )
{
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
int version = reader.ReadInt();
}
}
}
writer.Write( (int) 0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
}

View file

@ -10,7 +10,7 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.BlacksmithsGuild; } }
public override NpcGuild NpcGuild => NpcGuild.BlacksmithsGuild;
[Constructible]
public Blacksmith() : base( "the blacksmith" )
@ -44,11 +44,11 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBMaceWeapon() );
m_SBInfos.Add( new SBSpearForkWeapon() );
m_SBInfos.Add( new SBSwordWeapon() );*/
m_SBInfos.Add( new SBBlacksmith() );
if ( IsTokunoVendor )
{
m_SBInfos.Add( new SBSEArmor() );
m_SBInfos.Add( new SBSEArmor() );
m_SBInfos.Add( new SBSEWeapons() );
}
}
@ -145,4 +145,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -9,7 +9,7 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } }
public override NpcGuild NpcGuild => NpcGuild.TinkersGuild;
[Constructible]
public Carpenter() : base( "the carpenter" )
@ -23,7 +23,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBStavesWeapon() );
m_SBInfos.Add( new SBCarpenter() );
m_SBInfos.Add( new SBWoodenShields() );
if ( IsTokunoVendor )
m_SBInfos.Add( new SBSECarpenter() );
}
@ -53,4 +53,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -9,7 +9,7 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.FishermensGuild; } }
public override NpcGuild NpcGuild => NpcGuild.FishermensGuild;
[Constructible]
public Fisherman() : base( "the fisher" )
@ -47,4 +47,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -10,7 +10,7 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } }
public override NpcGuild NpcGuild => NpcGuild.MagesGuild;
[Constructible]
public Glassblower() : base( "the alchemist" )
@ -46,4 +46,4 @@ namespace Server.Mobiles
Body = 0x2F6;
}
}
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class BardGuildmaster : BaseGuildmaster
{
public override NpcGuild NpcGuild{ get{ return NpcGuild.BardsGuild; } }
public override NpcGuild NpcGuild => NpcGuild.BardsGuild;
[Constructible]
public BardGuildmaster() : base( "bard" )
@ -37,4 +37,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class BlacksmithGuildmaster : BaseGuildmaster
{
public override NpcGuild NpcGuild{ get{ return NpcGuild.BlacksmithsGuild; } }
public override NpcGuild NpcGuild => NpcGuild.BlacksmithsGuild;
public override bool IsActiveVendor => true;

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class FisherGuildmaster : BaseGuildmaster
{
public override NpcGuild NpcGuild{ get{ return NpcGuild.FishermensGuild; } }
public override NpcGuild NpcGuild => NpcGuild.FishermensGuild;
[Constructible]
public FisherGuildmaster() : base( "fisher" )
@ -32,4 +32,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class HealerGuildmaster : BaseGuildmaster
{
public override NpcGuild NpcGuild{ get{ return NpcGuild.HealersGuild; } }
public override NpcGuild NpcGuild => NpcGuild.HealersGuild;
[Constructible]
public HealerGuildmaster() : base( "healer" )
@ -48,4 +48,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class MageGuildmaster : BaseGuildmaster
{
public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } }
public override NpcGuild NpcGuild => NpcGuild.MagesGuild;
[Constructible]
public MageGuildmaster() : base( "mage" )
@ -51,4 +51,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class MerchantGuildmaster : BaseGuildmaster
{
public override NpcGuild NpcGuild{ get{ return NpcGuild.MerchantsGuild; } }
public override NpcGuild NpcGuild => NpcGuild.MerchantsGuild;
[Constructible]
public MerchantGuildmaster() : base( "merchant" )
@ -33,4 +33,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class MinerGuildmaster : BaseGuildmaster
{
public override NpcGuild NpcGuild{ get{ return NpcGuild.MinersGuild; } }
public override NpcGuild NpcGuild => NpcGuild.MinersGuild;
[Constructible]
public MinerGuildmaster() : base( "miner" )
@ -33,4 +33,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class RangerGuildmaster : BaseGuildmaster
{
public override NpcGuild NpcGuild{ get{ return NpcGuild.RangersGuild; } }
public override NpcGuild NpcGuild => NpcGuild.RangersGuild;
[Constructible]
public RangerGuildmaster() : base( "ranger" )
@ -42,4 +42,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class TailorGuildmaster : BaseGuildmaster
{
public override NpcGuild NpcGuild{ get{ return NpcGuild.TailorsGuild; } }
public override NpcGuild NpcGuild => NpcGuild.TailorsGuild;
[Constructible]
public TailorGuildmaster() : base( "tailor" )
@ -32,4 +32,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -7,9 +7,9 @@ namespace Server.Mobiles
{
public class ThiefGuildmaster : BaseGuildmaster
{
public override NpcGuild NpcGuild{ get{ return NpcGuild.ThievesGuild; } }
public override NpcGuild NpcGuild => NpcGuild.ThievesGuild;
public override TimeSpan JoinAge{ get{ return TimeSpan.FromDays( 7.0 ); } }
public override TimeSpan JoinAge => TimeSpan.FromDays( 7.0 );
[Constructible]
public ThiefGuildmaster() : base( "thief" )
@ -124,4 +124,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -9,7 +9,7 @@ namespace Server.Mobiles
{
public class TinkerGuildmaster : BaseGuildmaster
{
public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } }
public override NpcGuild NpcGuild => NpcGuild.TinkersGuild;
[Constructible]
public TinkerGuildmaster() : base( "tinker" )
@ -38,20 +38,20 @@ namespace Server.Mobiles
}
public override void AddCustomContextEntries( Mobile from, List<ContextMenuEntry> list )
{
{
if ( Core.ML && from.Alive )
{
RechargeEntry entry = new RechargeEntry( from, this );
if ( WeaponEngravingTool.Find( from ) == null )
entry.Enabled = false;
list.Add( entry );
}
base.AddCustomContextEntries( from, list );
}
private class RechargeEntry : ContextMenuEntry
{
private Mobile m_From;
@ -67,9 +67,9 @@ namespace Server.Mobiles
{
if ( !Core.ML || m_Vendor == null || m_Vendor.Deleted )
return;
WeaponEngravingTool tool = WeaponEngravingTool.Find( m_From );
if ( tool != null && tool.UsesRemaining <= 0 )
{
if ( Banker.GetBalance( m_From ) >= 100000 )
@ -82,4 +82,4 @@ namespace Server.Mobiles
}
}
}
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class WarriorGuildmaster : BaseGuildmaster
{
public override NpcGuild NpcGuild{ get{ return NpcGuild.WarriorsGuild; } }
public override NpcGuild NpcGuild => NpcGuild.WarriorsGuild;
[Constructible]
public WarriorGuildmaster() : base( "warrior" )
@ -38,4 +38,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -12,7 +12,7 @@ namespace Server.Mobiles
public class GypsyBanker : Banker
{
public override bool IsActiveVendor => false;
public override NpcGuild NpcGuild{ get{ return NpcGuild.None; } }
public override NpcGuild NpcGuild => NpcGuild.None;
public override bool ClickTitle => false;
[Constructible]

View file

@ -1,50 +1,50 @@
using System;
using System.Collections.Generic;
using Server;
using System;
using System.Collections.Generic;
using Server;
namespace Server.Mobiles
{
public class Herbalist : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
namespace Server.Mobiles
{
public class Herbalist : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } }
public override NpcGuild NpcGuild => NpcGuild.MagesGuild;
[Constructible]
public Herbalist() : base( "the herbalist" )
{
public Herbalist() : base( "the herbalist" )
{
SetSkill( SkillName.Alchemy, 80.0, 100.0 );
SetSkill( SkillName.Cooking, 80.0, 100.0 );
SetSkill( SkillName.TasteID, 80.0, 100.0 );
}
}
public override void InitSBInfo()
{
m_SBInfos.Add( new SBHerbalist() );
}
public override void InitSBInfo()
{
m_SBInfos.Add( new SBHerbalist() );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; }
get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; }
}
public Herbalist( Serial serial ) : base( serial )
{
}
public Herbalist( Serial serial ) : base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 ); // version
}
writer.Write( (int) 0 ); // version
}
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();
}
}
}

View file

@ -9,7 +9,7 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } }
public override NpcGuild NpcGuild => NpcGuild.MagesGuild;
[Constructible]
public Mage() : base( "the mage" )
@ -57,4 +57,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -9,7 +9,7 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } }
public override NpcGuild NpcGuild => NpcGuild.MagesGuild;
private DateTime m_NextShush;
public static readonly TimeSpan ShushDelay = TimeSpan.FromMinutes( 1 );
@ -77,4 +77,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -10,7 +10,7 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } }
public override NpcGuild NpcGuild => NpcGuild.TinkersGuild;
[Constructible]
public StoneCrafter() : base( "the stone crafter" )
@ -47,4 +47,4 @@ namespace Server.Mobiles
Title = "the stone crafter";
}
}
}
}

View file

@ -10,7 +10,7 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.TailorsGuild; } }
public override NpcGuild NpcGuild => NpcGuild.TailorsGuild;
[Constructible]
public Tailor() : base( "the tailor" )

View file

@ -9,7 +9,7 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } }
public override NpcGuild NpcGuild => NpcGuild.TinkersGuild;
[Constructible]
public Tinker() : base( "the tinker" )
@ -42,4 +42,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -10,7 +10,7 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override NpcGuild NpcGuild{ get{ return NpcGuild.TailorsGuild; } }
public override NpcGuild NpcGuild => NpcGuild.TailorsGuild;
[Constructible]
public Weaver() : base( "the weaver" )
@ -96,4 +96,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}