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

38
Scripts/Items/Food/Beverage.cs
View file

@ -34,8 +34,8 @@ namespace Server.Items
[TypeAlias( "Server.Items.BottleAle", "Server.Items.BottleLiquor", "Server.Items.BottleWine" )]
public class BeverageBottle : BaseBeverage
{
public override int BaseLabelNumber { get { return 1042959; } } // a bottle of Ale
public override int MaxQuantity { get { return 5; } }
public override int BaseLabelNumber => 1042959; // a bottle of Ale
public override int MaxQuantity => 5;
public override bool Fillable => false;
public override int ComputeItemID()
@ -113,8 +113,8 @@ namespace Server.Items
public class Jug : BaseBeverage
{
public override int BaseLabelNumber { get { return 1042965; } } // a jug of Ale
public override int MaxQuantity { get { return 10; } }
public override int BaseLabelNumber => 1042965; // a jug of Ale
public override int MaxQuantity => 10;
public override bool Fillable => false;
public override int ComputeItemID()
@ -154,8 +154,8 @@ namespace Server.Items
public class CeramicMug : BaseBeverage
{
public override int BaseLabelNumber { get { return 1042982; } } // a ceramic mug of Ale
public override int MaxQuantity { get { return 1; } }
public override int BaseLabelNumber => 1042982; // a ceramic mug of Ale
public override int MaxQuantity => 1;
public override int ComputeItemID()
{
@ -202,8 +202,8 @@ namespace Server.Items
public class PewterMug : BaseBeverage
{
public override int BaseLabelNumber { get { return 1042994; } } // a pewter mug with Ale
public override int MaxQuantity { get { return 1; } }
public override int BaseLabelNumber => 1042994; // a pewter mug with Ale
public override int MaxQuantity => 1;
public override int ComputeItemID()
{
@ -248,8 +248,8 @@ namespace Server.Items
public class Goblet : BaseBeverage
{
public override int BaseLabelNumber { get { return 1043000; } } // a goblet of Ale
public override int MaxQuantity { get { return 1; } }
public override int BaseLabelNumber => 1043000; // a goblet of Ale
public override int MaxQuantity => 1;
public override int ComputeItemID()
{
@ -296,9 +296,9 @@ namespace Server.Items
"Server.Items.GlassMilk", "Server.Items.GlassWine", "Server.Items.GlassWater" )]
public class GlassMug : BaseBeverage
{
public override int EmptyLabelNumber { get { return 1022456; } } // mug
public override int BaseLabelNumber { get { return 1042976; } } // a mug of Ale
public override int MaxQuantity { get { return 5; } }
public override int EmptyLabelNumber => 1022456; // mug
public override int BaseLabelNumber => 1042976; // a mug of Ale
public override int MaxQuantity => 5;
public override int ComputeItemID()
{
@ -399,8 +399,8 @@ namespace Server.Items
"Server.Items.GlassPitcher" )]
public class Pitcher : BaseBeverage
{
public override int BaseLabelNumber { get { return 1048128; } } // a Pitcher of Ale
public override int MaxQuantity { get { return 5; } }
public override int BaseLabelNumber => 1048128; // a Pitcher of Ale
public override int MaxQuantity => 5;
public override int ComputeItemID()
{
@ -566,11 +566,11 @@ namespace Server.Items
}
public virtual bool ShowQuantity { get { return ( MaxQuantity > 1 ); } }
public virtual bool Fillable { get { return true; } }
public virtual bool Pourable { get { return true; } }
public virtual bool Fillable => true;
public virtual bool Pourable => true;
public virtual int EmptyLabelNumber { get { return base.LabelNumber; } }
public virtual int BaseLabelNumber { get { return 0; } }
public virtual int EmptyLabelNumber => base.LabelNumber;
public virtual int BaseLabelNumber => 0;
public abstract int MaxQuantity { get; }

32
Scripts/Items/Food/Chocolatiering.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class CocoaLiquor : Item
{
public override int LabelNumber { get { return 1080007; } } // Cocoa liquor
public override double DefaultWeight { get { return 1.0; } }
public override int LabelNumber => 1080007; // Cocoa liquor
public override double DefaultWeight => 1.0;
[Constructible]
public CocoaLiquor()
@ -37,8 +37,8 @@ namespace Server.Items
public class SackOfSugar : Item
{
public override int LabelNumber { get { return 1080003; } } // Sack of sugar
public override double DefaultWeight { get { return 1.0; } }
public override int LabelNumber => 1080003; // Sack of sugar
public override double DefaultWeight => 1.0;
[Constructible]
public SackOfSugar()
@ -77,8 +77,8 @@ namespace Server.Items
public class CocoaButter : Item
{
public override int LabelNumber { get { return 1080005; } } // Cocoa butter
public override double DefaultWeight { get { return 1.0; } }
public override int LabelNumber => 1080005; // Cocoa butter
public override double DefaultWeight => 1.0;
[Constructible]
public CocoaButter()
@ -109,8 +109,8 @@ namespace Server.Items
public class Vanilla : Item
{
public override int LabelNumber { get { return 1080009; } } // Vanilla
public override double DefaultWeight { get { return 1.0; } }
public override int LabelNumber => 1080009; // Vanilla
public override double DefaultWeight => 1.0;
[Constructible]
public Vanilla()
@ -149,8 +149,8 @@ namespace Server.Items
public class CocoaPulp : Item
{
public override int LabelNumber { get { return 1080530; } } // cocoa pulp
public override double DefaultWeight { get { return 1.0; } }
public override int LabelNumber => 1080530; // cocoa pulp
public override double DefaultWeight => 1.0;
[Constructible]
public CocoaPulp()
@ -189,8 +189,8 @@ namespace Server.Items
public class DarkChocolate : CandyCane
{
public override int LabelNumber { get { return 1079994; } } // Dark chocolate
public override double DefaultWeight { get { return 1.0; } }
public override int LabelNumber => 1079994; // Dark chocolate
public override double DefaultWeight => 1.0;
[Constructible]
public DarkChocolate()
@ -222,8 +222,8 @@ namespace Server.Items
public class MilkChocolate : CandyCane
{
public override int LabelNumber { get { return 1079995; } } // Milk chocolate
public override double DefaultWeight { get { return 1.0; } }
public override int LabelNumber => 1079995; // Milk chocolate
public override double DefaultWeight => 1.0;
[Constructible]
public MilkChocolate()
@ -255,8 +255,8 @@ namespace Server.Items
public class WhiteChocolate : CandyCane
{
public override int LabelNumber { get { return 1079996; } } // White chocolate
public override double DefaultWeight { get { return 1.0; } }
public override int LabelNumber => 1079996; // White chocolate
public override double DefaultWeight => 1.0;
[Constructible]
public WhiteChocolate()

22
Scripts/Items/Food/CookableFood.cs
View file

@ -136,7 +136,7 @@ namespace Server.Items
private IPoint3D m_Point;
private Map m_Map;
private CookableFood m_CookableFood;
public InternalTimer( Mobile from, IPoint3D p, Map map, CookableFood cookableFood ) : base( TimeSpan.FromSeconds( 5.0 ) )
{
m_From = from;
@ -333,7 +333,7 @@ namespace Server.Items
// ********** UnbakedPeachCobbler **********
public class UnbakedPeachCobbler : CookableFood
{
public override int LabelNumber{ get{ return 1041335; } } // unbaked peach cobbler
public override int LabelNumber => 1041335; // unbaked peach cobbler
[Constructible]
public UnbakedPeachCobbler() : base( 0x1042, 25 )
@ -367,7 +367,7 @@ namespace Server.Items
// ********** UnbakedFruitPie **********
public class UnbakedFruitPie : CookableFood
{
public override int LabelNumber{ get{ return 1041334; } } // unbaked fruit pie
public override int LabelNumber => 1041334; // unbaked fruit pie
[Constructible]
public UnbakedFruitPie() : base( 0x1042, 25 )
@ -402,7 +402,7 @@ namespace Server.Items
// ********** UnbakedMeatPie **********
public class UnbakedMeatPie : CookableFood
{
public override int LabelNumber{ get{ return 1041338; } } // unbaked meat pie
public override int LabelNumber => 1041338; // unbaked meat pie
[Constructible]
public UnbakedMeatPie() : base( 0x1042, 25 )
@ -437,7 +437,7 @@ namespace Server.Items
// ********** UnbakedPumpkinPie **********
public class UnbakedPumpkinPie : CookableFood
{
public override int LabelNumber{ get{ return 1041342; } } // unbaked pumpkin pie
public override int LabelNumber => 1041342; // unbaked pumpkin pie
[Constructible]
public UnbakedPumpkinPie() : base( 0x1042, 25 )
@ -472,7 +472,7 @@ namespace Server.Items
// ********** UnbakedApplePie **********
public class UnbakedApplePie : CookableFood
{
public override int LabelNumber{ get{ return 1041336; } } // unbaked apple pie
public override int LabelNumber => 1041336; // unbaked apple pie
[Constructible]
public UnbakedApplePie() : base( 0x1042, 25 )
@ -508,7 +508,7 @@ namespace Server.Items
[TypeAlias( "Server.Items.UncookedPizza" )]
public class UncookedCheesePizza : CookableFood
{
public override int LabelNumber{ get{ return 1041341; } } // uncooked cheese pizza
public override int LabelNumber => 1041341; // uncooked cheese pizza
[Constructible]
public UncookedCheesePizza() : base( 0x1083, 20 )
@ -549,7 +549,7 @@ namespace Server.Items
// ********** UncookedSausagePizza **********
public class UncookedSausagePizza : CookableFood
{
public override int LabelNumber{ get{ return 1041337; } } // uncooked sausage pizza
public override int LabelNumber => 1041337; // uncooked sausage pizza
[Constructible]
public UncookedSausagePizza() : base( 0x1083, 20 )
@ -625,7 +625,7 @@ namespace Server.Items
// ********** UnbakedQuiche **********
public class UnbakedQuiche : CookableFood
{
public override int LabelNumber{ get{ return 1041339; } } // unbaked quiche
public override int LabelNumber => 1041339; // unbaked quiche
[Constructible]
public UnbakedQuiche() : base( 0x1042, 25 )
@ -747,7 +747,7 @@ namespace Server.Items
// ********** EasterEggs **********
public class EasterEggs : CookableFood
{
public override int LabelNumber{ get{ return 1016105; } } // Easter Eggs
public override int LabelNumber => 1016105; // Easter Eggs
[Constructible]
public EasterEggs() : base( 0x9B5, 15 )
@ -816,7 +816,7 @@ namespace Server.Items
// ********** CakeMix **********
public class CakeMix : CookableFood
{
public override int LabelNumber{ get{ return 1041002; } } // cake mix
public override int LabelNumber => 1041002; // cake mix
[Constructible]
public CakeMix() : base( 0x103F, 40 )

12
Scripts/Items/Food/Cooking.cs
View file

@ -115,7 +115,7 @@ namespace Server.Items
// ********** SweetDough **********
public class SweetDough : Item
{
public override int LabelNumber{ get{ return 1041340; } } // sweet dough
public override int LabelNumber => 1041340; // sweet dough
[Constructible]
public SweetDough() : base( 0x103d )
@ -184,12 +184,12 @@ namespace Server.Items
t.Start();
}
}
private class InternalTimer : Timer
{
private Mobile m_From;
private Campfire m_Campfire;
public InternalTimer( Mobile from, Campfire campfire ) : base( TimeSpan.FromSeconds( 5.0 ) )
{
m_From = from;
@ -276,7 +276,7 @@ namespace Server.Items
from.AddToBackpack( new SweetDough() );
}
if (targeted is BowlFlour)
{
((BowlFlour)targeted).Delete();
@ -490,7 +490,7 @@ namespace Server.Items
// ********** SackFlourOpen **********
public class SackFlourOpen : Item
{
public override int LabelNumber{ get{ return 1024166; } } // open sack of flour
public override int LabelNumber => 1024166; // open sack of flour
[Constructible]
public SackFlourOpen() : base(UtilityItem.RandomChoice( 0x1046, 0x103a ))
@ -653,4 +653,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

18
Scripts/Items/Food/Food.cs
View file

@ -751,7 +751,7 @@ namespace Server.Items
[TypeAlias( "Server.Items.Pizza" )]
public class CheesePizza : Food
{
public override int LabelNumber{ get{ return 1044516; } } // cheese pizza
public override int LabelNumber => 1044516; // cheese pizza
[Constructible]
public CheesePizza() : base( 0x1040 )
@ -782,7 +782,7 @@ namespace Server.Items
public class SausagePizza : Food
{
public override int LabelNumber{ get{ return 1044517; } } // sausage pizza
public override int LabelNumber => 1044517; // sausage pizza
[Constructible]
public SausagePizza() : base( 0x1040 )
@ -844,7 +844,7 @@ namespace Server.Items
public class FruitPie : Food
{
public override int LabelNumber{ get{ return 1041346; } } // baked fruit pie
public override int LabelNumber => 1041346; // baked fruit pie
[Constructible]
public FruitPie() : base( 0x1041 )
@ -875,7 +875,7 @@ namespace Server.Items
public class MeatPie : Food
{
public override int LabelNumber{ get{ return 1041347; } } // baked meat pie
public override int LabelNumber => 1041347; // baked meat pie
[Constructible]
public MeatPie() : base( 0x1041 )
@ -906,7 +906,7 @@ namespace Server.Items
public class PumpkinPie : Food
{
public override int LabelNumber{ get{ return 1041348; } } // baked pumpkin pie
public override int LabelNumber => 1041348; // baked pumpkin pie
[Constructible]
public PumpkinPie() : base( 0x1041 )
@ -937,7 +937,7 @@ namespace Server.Items
public class ApplePie : Food
{
public override int LabelNumber{ get{ return 1041343; } } // baked apple pie
public override int LabelNumber => 1041343; // baked apple pie
[Constructible]
public ApplePie() : base( 0x1041 )
@ -968,7 +968,7 @@ namespace Server.Items
public class PeachCobbler : Food
{
public override int LabelNumber{ get{ return 1041344; } } // baked peach cobbler
public override int LabelNumber => 1041344; // baked peach cobbler
[Constructible]
public PeachCobbler() : base( 0x1041 )
@ -999,7 +999,7 @@ namespace Server.Items
public class Quiche : Food
{
public override int LabelNumber{ get{ return 1041345; } } // baked quiche
public override int LabelNumber => 1041345; // baked quiche
[Constructible]
public Quiche() : base( 0x1041 )
@ -1289,4 +1289,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}