warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrades code style - First batch (#22)

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
Scripts/Mobiles/Vendors/NPC/Guildmasters/BardGuildmaster.cs
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();
}
}
}
}

2
Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs
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;

4
Scripts/Mobiles/Vendors/NPC/Guildmasters/FisherGuildmaster.cs
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();
}
}
}
}

4
Scripts/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs
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();
}
}
}
}

4
Scripts/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs
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();
}
}
}
}

4
Scripts/Mobiles/Vendors/NPC/Guildmasters/MerchantGuildmaster.cs
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();
}
}
}
}

4
Scripts/Mobiles/Vendors/NPC/Guildmasters/MinerGuildmaster.cs
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();
}
}
}
}

4
Scripts/Mobiles/Vendors/NPC/Guildmasters/RangerGuildmaster.cs
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();
}
}
}
}

4
Scripts/Mobiles/Vendors/NPC/Guildmasters/TailorGuildmaster.cs
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();
}
}
}
}

6
Scripts/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs
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();
}
}
}
}

18
Scripts/Mobiles/Vendors/NPC/Guildmasters/TinkerGuildmaster.cs
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
}
}
}
}
}

4
Scripts/Mobiles/Vendors/NPC/Guildmasters/WarriorGuildmaster.cs
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();
}
}
}
}