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

Adds style cop (#109)

Browse source
This commit is contained in:
Kamron Batman 2020-04-26 00:16:02 -07:00 • committed by GitHub
parent 3e715bcb60
commit 556a17aba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1725 changed files with 33831 additions and 38046 deletions
Download patch file Download diff file Expand all files Collapse all files

312
Projects/Scripts/Items/Food/Beverage.cs
View file

@ -23,7 +23,7 @@ namespace Server.Items
public interface IHasQuantity
{
int Quantity{ get; set; }
int Quantity { get; set; }
}
public interface IWaterSource : IHasQuantity
@ -81,29 +81,29 @@ namespace Server.Items
switch (version)
{
case 0:
{
if (CheckType("BottleAle"))
{
Quantity = MaxQuantity;
Content = BeverageType.Ale;
}
else if (CheckType("BottleLiquor"))
{
Quantity = MaxQuantity;
Content = BeverageType.Liquor;
}
else if (CheckType("BottleWine"))
{
Quantity = MaxQuantity;
Content = BeverageType.Wine;
}
else
{
throw new Exception(World.LoadingType);
}
if (CheckType("BottleAle"))
{
Quantity = MaxQuantity;
Content = BeverageType.Ale;
}
else if (CheckType("BottleLiquor"))
{
Quantity = MaxQuantity;
Content = BeverageType.Liquor;
}
else if (CheckType("BottleWine"))
{
Quantity = MaxQuantity;
Content = BeverageType.Wine;
}
else
{
throw new Exception(World.LoadingType);
}
break;
}
break;
}
}
}
}
@ -300,12 +300,12 @@ namespace Server.Items
return Content switch
{
BeverageType.Ale => (ItemID == 0x9EF ? 0x9EF : 0x9EE),
BeverageType.Cider => (ItemID >= 0x1F7D && ItemID <= 0x1F80 ? ItemID : 0x1F7D),
BeverageType.Liquor => (ItemID >= 0x1F85 && ItemID <= 0x1F88 ? ItemID : 0x1F85),
BeverageType.Milk => (ItemID >= 0x1F89 && ItemID <= 0x1F8C ? ItemID : 0x1F89),
BeverageType.Wine => (ItemID >= 0x1F8D && ItemID <= 0x1F90 ? ItemID : 0x1F8D),
BeverageType.Water => (ItemID >= 0x1F91 && ItemID <= 0x1F94 ? ItemID : 0x1F91),
BeverageType.Ale => ItemID == 0x9EF ? 0x9EF : 0x9EE,
BeverageType.Cider => ItemID >= 0x1F7D && ItemID <= 0x1F80 ? ItemID : 0x1F7D,
BeverageType.Liquor => ItemID >= 0x1F85 && ItemID <= 0x1F88 ? ItemID : 0x1F85,
BeverageType.Milk => ItemID >= 0x1F89 && ItemID <= 0x1F8C ? ItemID : 0x1F89,
BeverageType.Wine => ItemID >= 0x1F8D && ItemID <= 0x1F90 ? ItemID : 0x1F8D,
BeverageType.Water => ItemID >= 0x1F91 && ItemID <= 0x1F94 ? ItemID : 0x1F91,
_ => 0
};
}
@ -326,44 +326,44 @@ namespace Server.Items
switch (version)
{
case 0:
{
if (CheckType("MugAle"))
{
Quantity = MaxQuantity;
Content = BeverageType.Ale;
}
else if (CheckType("GlassCider"))
{
Quantity = MaxQuantity;
Content = BeverageType.Cider;
}
else if (CheckType("GlassLiquor"))
{
Quantity = MaxQuantity;
Content = BeverageType.Liquor;
}
else if (CheckType("GlassMilk"))
{
Quantity = MaxQuantity;
Content = BeverageType.Milk;
}
else if (CheckType("GlassWine"))
{
Quantity = MaxQuantity;
Content = BeverageType.Wine;
}
else if (CheckType("GlassWater"))
{
Quantity = MaxQuantity;
Content = BeverageType.Water;
}
else
{
throw new Exception(World.LoadingType);
}
if (CheckType("MugAle"))
{
Quantity = MaxQuantity;
Content = BeverageType.Ale;
}
else if (CheckType("GlassCider"))
{
Quantity = MaxQuantity;
Content = BeverageType.Cider;
}
else if (CheckType("GlassLiquor"))
{
Quantity = MaxQuantity;
Content = BeverageType.Liquor;
}
else if (CheckType("GlassMilk"))
{
Quantity = MaxQuantity;
Content = BeverageType.Milk;
}
else if (CheckType("GlassWine"))
{
Quantity = MaxQuantity;
Content = BeverageType.Wine;
}
else if (CheckType("GlassWater"))
{
Quantity = MaxQuantity;
Content = BeverageType.Water;
}
else
{
throw new Exception(World.LoadingType);
}
break;
}
break;
}
}
}
}
@ -402,47 +402,47 @@ namespace Server.Items
switch (Content)
{
case BeverageType.Ale:
{
if (ItemID == 0x1F96)
return ItemID;
{
if (ItemID == 0x1F96)
return ItemID;
return 0x1F95;
}
return 0x1F95;
}
case BeverageType.Cider:
{
if (ItemID == 0x1F98)
return ItemID;
{
if (ItemID == 0x1F98)
return ItemID;
return 0x1F97;
}
return 0x1F97;
}
case BeverageType.Liquor:
{
if (ItemID == 0x1F9A)
return ItemID;
{
if (ItemID == 0x1F9A)
return ItemID;
return 0x1F99;
}
return 0x1F99;
}
case BeverageType.Milk:
{
if (ItemID == 0x9AD)
return ItemID;
{
if (ItemID == 0x9AD)
return ItemID;
return 0x9F0;
}
return 0x9F0;
}
case BeverageType.Wine:
{
if (ItemID == 0x1F9C)
return ItemID;
{
if (ItemID == 0x1F9C)
return ItemID;
return 0x1F9B;
}
return 0x1F9B;
}
case BeverageType.Water:
{
if (ItemID == 0xFF8 || ItemID == 0xFF9 || ItemID == 0x1F9E)
return ItemID;
{
if (ItemID == 0xFF8 || ItemID == 0xFF9 || ItemID == 0x1F9E)
return ItemID;
return 0x1F9D;
}
return 0x1F9D;
}
}
return 0;
@ -467,56 +467,56 @@ namespace Server.Items
switch (version)
{
case 0:
{
if (CheckType("PitcherAle"))
{
Quantity = MaxQuantity;
Content = BeverageType.Ale;
}
else if (CheckType("PitcherCider"))
{
Quantity = MaxQuantity;
Content = BeverageType.Cider;
}
else if (CheckType("PitcherLiquor"))
{
Quantity = MaxQuantity;
Content = BeverageType.Liquor;
}
else if (CheckType("PitcherMilk"))
{
Quantity = MaxQuantity;
Content = BeverageType.Milk;
}
else if (CheckType("PitcherWine"))
{
Quantity = MaxQuantity;
Content = BeverageType.Wine;
}
else if (CheckType("PitcherWater"))
{
Quantity = MaxQuantity;
Content = BeverageType.Water;
}
else if (CheckType("GlassPitcher"))
{
Quantity = 0;
Content = BeverageType.Water;
}
else
{
throw new Exception(World.LoadingType);
}
if (CheckType("PitcherAle"))
{
Quantity = MaxQuantity;
Content = BeverageType.Ale;
}
else if (CheckType("PitcherCider"))
{
Quantity = MaxQuantity;
Content = BeverageType.Cider;
}
else if (CheckType("PitcherLiquor"))
{
Quantity = MaxQuantity;
Content = BeverageType.Liquor;
}
else if (CheckType("PitcherMilk"))
{
Quantity = MaxQuantity;
Content = BeverageType.Milk;
}
else if (CheckType("PitcherWine"))
{
Quantity = MaxQuantity;
Content = BeverageType.Wine;
}
else if (CheckType("PitcherWater"))
{
Quantity = MaxQuantity;
Content = BeverageType.Water;
}
else if (CheckType("GlassPitcher"))
{
Quantity = 0;
Content = BeverageType.Water;
}
else
{
throw new Exception(World.LoadingType);
}
break;
}
break;
}
}
}
}
public abstract class BaseBeverage : Item, IHasQuantity
{
private static int[] m_SwampTiles =
private static readonly int[] m_SwampTiles =
{
0x9C4, 0x9EB,
0x3D65, 0x3D65,
@ -564,7 +564,7 @@ namespace Server.Items
public virtual int EmptyLabelNumber => base.LabelNumber;
public virtual int BaseLabelNumber => 0;
public abstract int MaxQuantity{ get; }
public abstract int MaxQuantity { get; }
[CommandProperty(AccessLevel.GameMaster)]
public bool IsEmpty => m_Quantity <= 0;
@ -576,10 +576,10 @@ namespace Server.Items
public bool IsFull => m_Quantity >= MaxQuantity;
[CommandProperty(AccessLevel.GameMaster)]
public Poison Poison{ get; set; }
public Poison Poison { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public Mobile Poisoner{ get; set; }
public Mobile Poisoner { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public BeverageType Content
@ -711,7 +711,7 @@ namespace Server.Items
}
else if (targ is BaseWaterContainer bwc)
{
if (Quantity == 0 || Content == BeverageType.Water && !IsFull)
if (Quantity == 0 || (Content == BeverageType.Water && !IsFull))
{
int iNeed = Math.Min(MaxQuantity - Quantity, bwc.Quantity);
@ -910,7 +910,7 @@ namespace Server.Items
BaseAddon vat = component.Addon;
if (vat.X > 5784 && vat.X < 5814 && vat.Y > 1903 && vat.Y < 1934 &&
(qs.RedSolen && vat.Map == Map.Trammel || !qs.RedSolen && vat.Map == Map.Felucca))
((qs.RedSolen && vat.Map == Map.Trammel) || (!qs.RedSolen && vat.Map == Map.Felucca)))
{
if (obj.CurProgress + Quantity > obj.MaxProgress)
{
@ -1025,23 +1025,21 @@ namespace Server.Items
switch (version)
{
case 1:
{
Poisoner = reader.ReadMobile();
goto case 0;
}
{
Poisoner = reader.ReadMobile();
goto case 0;
}
case 0:
{
Poison = Poison.Deserialize(reader);
m_Content = (BeverageType)reader.ReadInt();
m_Quantity = reader.ReadInt();
break;
}
{
Poison = Poison.Deserialize(reader);
m_Content = (BeverageType)reader.ReadInt();
m_Quantity = reader.ReadInt();
break;
}
}
}
#region Effects of achohol
private static Dictionary<Mobile, Timer> m_Table = new Dictionary<Mobile, Timer>();
private static readonly Dictionary<Mobile, Timer> m_Table = new Dictionary<Mobile, Timer>();
public static void Initialize()
{
@ -1080,7 +1078,7 @@ namespace Server.Items
private class HeaveTimer : Timer
{
private Mobile m_Drunk;
private readonly Mobile m_Drunk;
public HeaveTimer(Mobile drunk)
: base(TimeSpan.FromSeconds(5.0), TimeSpan.FromSeconds(5.0))
@ -1103,7 +1101,7 @@ namespace Server.Items
m_Drunk.BAC = 60;
// chance to get sober
if (10 > Utility.Random(100))
if (Utility.Random(100) < 10)
--m_Drunk.BAC;
// lose some stats
@ -1135,7 +1133,5 @@ namespace Server.Items
}
}
}
#endregion
}
}

35
Projects/Scripts/Items/Food/CookableFood.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
public abstract class CookableFood : Item
{
[CommandProperty(AccessLevel.GameMaster)]
public int CookingLevel{ get; set; }
public int CookingLevel { get; set; }
public CookableFood(int itemID, int cookingLevel) : base(itemID) => CookingLevel = cookingLevel;
@ -34,24 +34,14 @@ namespace Server.Items
switch (version)
{
case 1:
{
CookingLevel = reader.ReadInt();
{
CookingLevel = reader.ReadInt();
break;
}
break;
}
}
}
#if false
public override void OnDoubleClick( Mobile from )
{
if ( !Movable )
return;
from.Target = new InternalTarget( this );
}
#endif
public static bool IsHeatSource(object targeted)
{
int itemID;
@ -83,7 +73,7 @@ namespace Server.Items
private class InternalTarget : Target
{
private CookableFood m_Item;
private readonly CookableFood m_Item;
public InternalTarget(CookableFood item) : base(1, false, TargetFlags.None) => m_Item = item;
@ -111,10 +101,10 @@ namespace Server.Items
private class InternalTimer : Timer
{
private CookableFood m_CookableFood;
private Mobile m_From;
private Map m_Map;
private IPoint3D m_Point;
private readonly CookableFood m_CookableFood;
private readonly Mobile m_From;
private readonly Map m_Map;
private readonly IPoint3D m_Point;
public InternalTimer(Mobile from, IPoint3D p, Map map, CookableFood cookableFood) : base(
TimeSpan.FromSeconds(5.0))
@ -129,7 +119,7 @@ namespace Server.Items
{
m_From.EndAction<CookableFood>();
if (m_From.Map != m_Map || m_Point != null && m_From.GetDistanceToSqrt(m_Point) > 3)
if (m_From.Map != m_Map || (m_Point != null && m_From.GetDistanceToSqrt(m_Point) > 3))
{
m_From.SendLocalizedMessage(500686); // You burn the food to a crisp! It's ruined.
return;
@ -183,7 +173,6 @@ namespace Server.Items
public override Food Cook() => new Ribs();
}
// ********** RawLambLeg **********
public class RawLambLeg : CookableFood
{
@ -249,7 +238,6 @@ namespace Server.Items
public override Food Cook() => new ChickenLeg();
}
// ********** RawBird **********
public class RawBird : CookableFood
{
@ -282,7 +270,6 @@ namespace Server.Items
public override Food Cook() => new CookedBird();
}
// ********** UnbakedPeachCobbler **********
public class UnbakedPeachCobbler : CookableFood
{

60
Projects/Scripts/Items/Food/Cooking.cs
View file

@ -46,19 +46,9 @@ namespace Server.Items
int version = reader.ReadInt();
}
#if false
public override void OnDoubleClick( Mobile from )
{
if ( !Movable )
return;
from.Target = new InternalTarget( this );
}
#endif
private class InternalTarget : Target
{
private Dough m_Item;
private readonly Dough m_Item;
public InternalTarget(Dough item) : base(1, false, TargetFlags.None) => m_Item = item;
@ -134,19 +124,9 @@ namespace Server.Items
Hue = 150;
}
#if false
public override void OnDoubleClick( Mobile from )
{
if ( !Movable )
return;
from.Target = new InternalTarget( this );
}
#endif
private class InternalTarget : Target
{
private SweetDough m_Item;
private readonly SweetDough m_Item;
public InternalTarget(SweetDough item) : base(1, false, TargetFlags.None) => m_Item = item;
@ -172,8 +152,8 @@ namespace Server.Items
private class InternalTimer : Timer
{
private Campfire m_Campfire;
private Mobile m_From;
private readonly Campfire m_Campfire;
private readonly Mobile m_From;
public InternalTimer(Mobile from, Campfire campfire) : base(TimeSpan.FromSeconds(5.0))
{
@ -234,7 +214,7 @@ namespace Server.Items
/*public override void OnDoubleClick( Mobile from )
{
if ( !Movable )
if (!Movable)
return;
from.Target = new InternalTarget( this );
@ -242,7 +222,7 @@ namespace Server.Items
private class InternalTarget : Target
{
private JarHoney m_Item;
private readonly JarHoney m_Item;
public InternalTarget(JarHoney item) : base(1, false, TargetFlags.None) => m_Item = item;
@ -348,7 +328,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( !Movable )
if (!Movable)
return;
from.Target = new InternalTarget( this );
@ -365,9 +345,9 @@ namespace Server.Items
protected override void OnTarget( Mobile from, object targeted )
{
if ( m_Item.Deleted ) return;
if (m_Item.Deleted ) return;
if ( targeted is BowlFlour )
if (targeted is BowlFlour)
{
m_Item.Delete();
((BowlFlour)targeted).Delete();
@ -430,15 +410,15 @@ namespace Server.Items
{
case 2:
case 1:
{
m_Quantity = reader.ReadInt();
break;
}
{
m_Quantity = reader.ReadInt();
break;
}
case 0:
{
m_Quantity = 20;
break;
}
{
m_Quantity = 20;
break;
}
}
if (version < 2 && Weight == 1.0)
@ -452,12 +432,6 @@ namespace Server.Items
if (ItemID == 0x1039 || ItemID == 0x1045)
++ItemID;
#if false
this.Delete();
from.AddToBackpack( new SackFlourOpen() );
#endif
}
}

55
Projects/Scripts/Items/Food/Food.cs
View file

@ -17,13 +17,13 @@ namespace Server.Items
}
[CommandProperty(AccessLevel.GameMaster)]
public Mobile Poisoner{ get; set; }
public Mobile Poisoner { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public Poison Poison{ get; set; }
public Poison Poison { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int FillFactor{ get; set; }
public int FillFactor { get; set; }
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
{
@ -121,35 +121,35 @@ namespace Server.Items
switch (version)
{
case 1:
{
Poison = reader.ReadInt() switch
{
0 => null,
1 => Poison.Lesser,
2 => Poison.Regular,
3 => Poison.Greater,
4 => Poison.Deadly,
_ => Poison
};
Poison = reader.ReadInt() switch
{
0 => null,
1 => Poison.Lesser,
2 => Poison.Regular,
3 => Poison.Greater,
4 => Poison.Deadly,
_ => Poison
};
break;
}
break;
}
case 2:
{
Poison = Poison.Deserialize(reader);
break;
}
{
Poison = Poison.Deserialize(reader);
break;
}
case 3:
{
Poison = Poison.Deserialize(reader);
FillFactor = reader.ReadInt();
break;
}
{
Poison = Poison.Deserialize(reader);
FillFactor = reader.ReadInt();
break;
}
case 4:
{
Poisoner = reader.ReadMobile();
goto case 3;
}
{
Poisoner = reader.ReadMobile();
goto case 3;
}
}
}
}
@ -370,7 +370,6 @@ namespace Server.Items
}
}
public class FriedEggs : Food
{
[Constructible]