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

14
Scripts/Engines/Plants/MiscItems/GreenThorns.cs
View file

@ -8,7 +8,7 @@ namespace Server.Items
{
public class GreenThorns : Item
{
public override int LabelNumber { get { return 1060837; } } // green thorns
public override int LabelNumber => 1060837; // green thorns
[Constructible]
public GreenThorns() : this( 1 )
@ -151,8 +151,8 @@ namespace Server.Items
private int[] m_Tiles;
private Type m_Effect;
public int[] Tiles { get { return m_Tiles; } }
public Type Effect { get { return m_Effect; } }
public int[] Tiles => m_Tiles;
public Type Effect => m_Effect;
public TilesAndEffect( int[] tiles, Type effect )
{
@ -293,9 +293,9 @@ namespace Server.Items
private Map m_Map;
private Mobile m_From;
public Point3D Location { get { return m_Location; } }
public Map Map { get { return m_Map; } }
public Mobile From { get { return m_From; } }
public Point3D Location => m_Location;
public Map Map => m_Map;
public Mobile From => m_From;
public GreenThornsEffect( Point3D location, Map map, Mobile from ) : base( TimeSpan.FromSeconds( 2.5 ) )
{
@ -724,4 +724,4 @@ namespace Server.Items
Delete();
}
}
}
}

8
Scripts/Engines/Plants/MiscItems/OrangePetals.cs
View file

@ -8,7 +8,7 @@ namespace Server.Items
{
public class OrangePetals : Item
{
public override int LabelNumber { get { return 1053122; } } // orange petals
public override int LabelNumber => 1053122; // orange petals
public override double DefaultWeight
{
@ -32,8 +32,8 @@ namespace Server.Items
{
}
public override bool CheckItemUse( Mobile from, Item item )
{
public override bool CheckItemUse( Mobile from, Item item )
{
if ( item != this )
return base.CheckItemUse( from, item );
@ -146,4 +146,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Plants/MiscItems/RedLeaves.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class RedLeaves : Item
{
public override int LabelNumber { get { return 1053123; } } // red leaves
public override int LabelNumber => 1053123; // red leaves
public override double DefaultWeight
{
@ -105,4 +105,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Engines/Plants/MiscMobiles/GiantIceWorm.cs
View file

@ -47,11 +47,11 @@ namespace Server.Mobiles
MinTameSkill = 71.1;
}
public override Poison PoisonImmune { get { return Poison.Greater; } }
public override Poison PoisonImmune => Poison.Greater;
public override Poison HitPoison { get { return Poison.Greater; } }
public override Poison HitPoison => Poison.Greater;
public override FoodType FavoriteFood { get { return FoodType.Meat; } }
public override FoodType FavoriteFood => FoodType.Meat;
public GiantIceWorm( Serial serial ) : base ( serial )
{

4
Scripts/Engines/Plants/PlantBowl.cs
View file

@ -8,7 +8,7 @@ namespace Server.Engines.Plants
{
public class PlantBowl : Item
{
public override int LabelNumber { get { return 1060834; } } // a plant bowl
public override int LabelNumber => 1060834; // a plant bowl
[Constructible]
public PlantBowl() : base( 0x15FD )
@ -190,4 +190,4 @@ namespace Server.Engines.Plants
0x72C9, 0x72CA,
};
}
}
}

14
Scripts/Engines/Plants/PlantHue.cs
View file

@ -69,9 +69,7 @@ namespace Server.Engines.Plants
public static PlantHueInfo GetInfo( PlantHue plantHue )
{
PlantHueInfo info = null;
if (m_Table.TryGetValue(plantHue, out info))
if (m_Table.TryGetValue( plantHue, out PlantHueInfo info ))
return info;
else
return m_Table[PlantHue.Plain];
@ -150,10 +148,10 @@ namespace Server.Engines.Plants
private PlantHue m_PlantHue;
private int m_GumpHue;
public int Hue { get { return m_Hue; } }
public int Name { get { return m_Name; } }
public PlantHue PlantHue { get { return m_PlantHue; } }
public int GumpHue { get { return m_GumpHue; } }
public int Hue => m_Hue;
public int Name => m_Name;
public PlantHue PlantHue => m_PlantHue;
public int GumpHue => m_GumpHue;
private PlantHueInfo( int hue, int name, PlantHue plantHue ) : this( hue, name, plantHue, hue )
{
@ -187,4 +185,4 @@ namespace Server.Engines.Plants
return IsPrimary( m_PlantHue );
}
}
}
}

2
Scripts/Engines/Plants/PlantItem.cs
View file

@ -55,7 +55,7 @@ namespace Server.Engines.Plants
set{ m_Level = value; }
}
public PlantSystem PlantSystem { get { return m_PlantSystem; } }
public PlantSystem PlantSystem => m_PlantSystem;
public override bool ForceShowProperties => ObjectPropertyList.Enabled;

8
Scripts/Engines/Plants/PlantResources.cs
View file

@ -34,9 +34,9 @@ namespace Server.Engines.Plants
private PlantHue m_PlantHue;
private Type m_ResourceType;
public PlantType PlantType { get { return m_PlantType; } }
public PlantHue PlantHue { get { return m_PlantHue; } }
public Type ResourceType { get { return m_ResourceType; } }
public PlantType PlantType => m_PlantType;
public PlantHue PlantHue => m_PlantHue;
public Type ResourceType => m_ResourceType;
private PlantResourceInfo( PlantType plantType, PlantHue plantHue, Type resourceType )
{
@ -50,4 +50,4 @@ namespace Server.Engines.Plants
return (Item)Activator.CreateInstance( m_ResourceType );
}
}
}
}

4
Scripts/Engines/Plants/PlantSystem.cs
View file

@ -55,7 +55,7 @@ namespace Server.Engines.Plants
private int m_AvailableResources;
private int m_LeftResources;
public PlantItem Plant { get { return m_Plant; } }
public PlantItem Plant => m_Plant;
public bool FertileDirt
{
@ -712,4 +712,4 @@ namespace Server.Engines.Plants
m_SeedHue |= PlantHue.Reproduces;
}
}
}
}

20
Scripts/Engines/Plants/PlantType.cs
View file

@ -322,17 +322,17 @@ namespace Server.Engines.Plants
private int m_SeedLabel;
private int m_SeedLabelPlural;
public int ItemID { get { return m_ItemID; } }
public int OffsetX { get { return m_OffsetX; } }
public int OffsetY { get { return m_OffsetY; } }
public PlantType PlantType { get { return m_PlantType; } }
public PlantCategory PlantCategory { get { return m_PlantCategory; } }
public int ItemID => m_ItemID;
public int OffsetX => m_OffsetX;
public int OffsetY => m_OffsetY;
public PlantType PlantType => m_PlantType;
public PlantCategory PlantCategory => m_PlantCategory;
public int Name { get { return ( m_ItemID < 0x4000 ) ? 1020000 + m_ItemID : 1078872 + m_ItemID; } }
public bool ContainsPlant { get { return m_ContainsPlant; } }
public bool Flowery { get { return m_Flowery; } }
public bool Crossable { get { return m_Crossable; } }
public bool Reproduces { get { return m_Reproduces; } }
public bool ContainsPlant => m_ContainsPlant;
public bool Flowery => m_Flowery;
public bool Crossable => m_Crossable;
public bool Reproduces => m_Reproduces;
private PlantTypeInfo( int itemID, int offsetX, int offsetY, PlantType plantType, bool containsPlant, bool flowery, bool crossable, bool reproduces, PlantCategory plantCategory )
: this( itemID, offsetX, offsetY, plantType, containsPlant, flowery, crossable, reproduces, plantCategory, -1, -1, -1, -1, -1, -1 )
@ -358,4 +358,4 @@ namespace Server.Engines.Plants
m_SeedLabelPlural = seedLabelPlural;
}
}
}
}

2
Scripts/Engines/Plants/Seed.cs
View file

@ -45,7 +45,7 @@ namespace Server.Engines.Plants
}
}
public override int LabelNumber{ get { return 1060810; } } // seed
public override int LabelNumber => 1060810; // seed
public static Seed RandomBonsaiSeed()
{