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

Fixes body expression style.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 08:46:14 -07:00
parent 3f0a72a62f
commit 33f5e77a24
957 changed files with 7424 additions and 15973 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -660,10 +660,7 @@ namespace Server.Items
new InternalTimer( tele ).Start();
}
public override string DefaultName
{
get { return "a hole"; }
}
public override string DefaultName => "a hole";
private GreenThornsSHTeleporter() : base( 0x913 )
{

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

@ -8,10 +8,7 @@ namespace Server.Items
{
public override int LabelNumber => 1053122; // orange petals
public override double DefaultWeight
{
get { return 0.1; }
}
public override double DefaultWeight => 0.1;
[Constructible]
public OrangePetals() : this( 1 )
@ -122,7 +119,7 @@ namespace Server.Items
{
private Timer m_Timer;
public Timer Timer{ get{ return m_Timer; } }
public Timer Timer => m_Timer;
public OrangePetalsContext( Timer timer )
{

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

@ -6,10 +6,7 @@ namespace Server.Items
{
public override int LabelNumber => 1053123; // red leaves
public override double DefaultWeight
{
get { return 0.1; }
}
public override double DefaultWeight => 0.1;
[Constructible]
public RedLeaves() : this( 1 )

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

@ -50,8 +50,8 @@ namespace Server.Engines.Plants
[CommandProperty( AccessLevel.GameMaster )]
public SecureLevel Level
{
get{ return m_Level; }
set{ m_Level = value; }
get => m_Level;
set => m_Level = value;
}
public PlantSystem PlantSystem => m_PlantSystem;
@ -73,7 +73,7 @@ namespace Server.Engines.Plants
[CommandProperty( AccessLevel.GameMaster )]
public PlantStatus PlantStatus
{
get { return m_PlantStatus; }
get => m_PlantStatus;
set
{
if ( m_PlantStatus == value || value < PlantStatus.BowlOfDirt || value > PlantStatus.DeadTwigs )
@ -111,7 +111,7 @@ namespace Server.Engines.Plants
[CommandProperty( AccessLevel.GameMaster )]
public PlantType PlantType
{
get { return m_PlantType; }
get => m_PlantType;
set
{
m_PlantType = value;
@ -122,7 +122,7 @@ namespace Server.Engines.Plants
[CommandProperty( AccessLevel.GameMaster )]
public PlantHue PlantHue
{
get { return m_PlantHue; }
get => m_PlantHue;
set
{
m_PlantHue = value;
@ -133,7 +133,7 @@ namespace Server.Engines.Plants
[CommandProperty( AccessLevel.GameMaster )]
public bool ShowType
{
get { return m_ShowType; }
get => m_ShowType;
set
{
m_ShowType = value;
@ -165,26 +165,17 @@ namespace Server.Engines.Plants
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsGrowable
{
get { return m_PlantStatus >= PlantStatus.BowlOfDirt && m_PlantStatus <= PlantStatus.Stage9; }
}
public bool IsGrowable => m_PlantStatus >= PlantStatus.BowlOfDirt && m_PlantStatus <= PlantStatus.Stage9;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsCrossable
{
get { return PlantHueInfo.IsCrossable( this.PlantHue ) && PlantTypeInfo.IsCrossable( this.PlantType ); }
}
public bool IsCrossable => PlantHueInfo.IsCrossable( this.PlantHue ) && PlantTypeInfo.IsCrossable( this.PlantType );
[CommandProperty( AccessLevel.GameMaster )]
public bool Reproduces
{
get { return PlantHueInfo.CanReproduce( this.PlantHue ) && PlantTypeInfo.CanReproduce( this.PlantType ); }
}
public bool Reproduces => PlantHueInfo.CanReproduce( this.PlantHue ) && PlantTypeInfo.CanReproduce( this.PlantType );
private static ArrayList m_Instances = new ArrayList();
public static ArrayList Plants{ get{ return m_Instances; } }
public static ArrayList Plants => m_Instances;
[Constructible]
public PlantItem() : this( false )

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

@ -58,24 +58,19 @@ namespace Server.Engines.Plants
public bool FertileDirt
{
get { return m_FertileDirt; }
set { m_FertileDirt = value; }
get => m_FertileDirt;
set => m_FertileDirt = value;
}
public DateTime NextGrowth
{
get { return m_NextGrowth; }
}
public DateTime NextGrowth => m_NextGrowth;
public PlantGrowthIndicator GrowthIndicator
{
get { return m_GrowthIndicator; }
}
public PlantGrowthIndicator GrowthIndicator => m_GrowthIndicator;
public bool IsFullWater => m_Water >= 4;
public bool IsFullWater { get { return m_Water >= 4; } }
public int Water
{
get { return m_Water; }
get => m_Water;
set
{
if ( value < 0 )
@ -91,7 +86,7 @@ namespace Server.Engines.Plants
public int Hits
{
get { return m_Hits; }
get => m_Hits;
set
{
if ( m_Hits == value )
@ -111,10 +106,7 @@ namespace Server.Engines.Plants
}
}
public int MaxHits
{
get { return 10 + (int)m_Plant.PlantStatus * 2; }
}
public int MaxHits => 10 + (int)m_Plant.PlantStatus * 2;
public PlantHealth Health
{
@ -135,7 +127,7 @@ namespace Server.Engines.Plants
public int Infestation
{
get { return m_Infestation; }
get => m_Infestation;
set
{
if ( value < 0 )
@ -149,7 +141,7 @@ namespace Server.Engines.Plants
public int Fungus
{
get { return m_Fungus; }
get => m_Fungus;
set
{
if ( value < 0 )
@ -163,7 +155,7 @@ namespace Server.Engines.Plants
public int Poison
{
get { return m_Poison; }
get => m_Poison;
set
{
if ( value < 0 )
@ -177,7 +169,7 @@ namespace Server.Engines.Plants
public int Disease
{
get { return m_Disease; }
get => m_Disease;
set
{
if ( value < 0 )
@ -189,10 +181,11 @@ namespace Server.Engines.Plants
}
}
public bool IsFullPoisonPotion { get { return m_PoisonPotion >= 2; } }
public bool IsFullPoisonPotion => m_PoisonPotion >= 2;
public int PoisonPotion
{
get { return m_PoisonPotion; }
get => m_PoisonPotion;
set
{
if ( value < 0 )
@ -204,10 +197,11 @@ namespace Server.Engines.Plants
}
}
public bool IsFullCurePotion { get { return m_CurePotion >= 2; } }
public bool IsFullCurePotion => m_CurePotion >= 2;
public int CurePotion
{
get { return m_CurePotion; }
get => m_CurePotion;
set
{
if ( value < 0 )
@ -219,10 +213,11 @@ namespace Server.Engines.Plants
}
}
public bool IsFullHealPotion { get { return m_HealPotion >= 2; } }
public bool IsFullHealPotion => m_HealPotion >= 2;
public int HealPotion
{
get { return m_HealPotion; }
get => m_HealPotion;
set
{
if ( value < 0 )
@ -234,10 +229,11 @@ namespace Server.Engines.Plants
}
}
public bool IsFullStrengthPotion { get { return m_StrengthPotion >= 2; } }
public bool IsFullStrengthPotion => m_StrengthPotion >= 2;
public int StrengthPotion
{
get { return m_StrengthPotion; }
get => m_StrengthPotion;
set
{
if ( value < 0 )
@ -249,20 +245,14 @@ namespace Server.Engines.Plants
}
}
public bool HasMaladies
{
get { return Infestation > 0 || Fungus > 0 || Poison > 0 || Disease > 0 || Water != 2; }
}
public bool HasMaladies => Infestation > 0 || Fungus > 0 || Poison > 0 || Disease > 0 || Water != 2;
public bool PollenProducing
{
get { return m_Plant.IsCrossable && m_Plant.PlantStatus >= PlantStatus.FullGrownPlant; }
}
public bool PollenProducing => m_Plant.IsCrossable && m_Plant.PlantStatus >= PlantStatus.FullGrownPlant;
public bool Pollinated
{
get { return m_Pollinated; }
set { m_Pollinated = value; }
get => m_Pollinated;
set => m_Pollinated = value;
}
public PlantType SeedType
@ -274,7 +264,7 @@ namespace Server.Engines.Plants
else
return m_Plant.PlantType;
}
set { m_SeedType = value; }
set => m_SeedType = value;
}
public PlantHue SeedHue
@ -286,30 +276,30 @@ namespace Server.Engines.Plants
else
return m_Plant.PlantHue;
}
set { m_SeedHue = value; }
set => m_SeedHue = value;
}
public int AvailableSeeds
{
get { return m_AvailableSeeds; }
get => m_AvailableSeeds;
set { if ( value >= 0 ) m_AvailableSeeds = value; }
}
public int LeftSeeds
{
get { return m_LeftSeeds; }
get => m_LeftSeeds;
set { if ( value >= 0 ) m_LeftSeeds = value; }
}
public int AvailableResources
{
get { return m_AvailableResources; }
get => m_AvailableResources;
set { if ( value >= 0 ) m_AvailableResources = value; }
}
public int LeftResources
{
get { return m_LeftResources; }
get => m_LeftResources;
set { if ( value >= 0 ) m_LeftResources = value; }
}

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

@ -324,7 +324,7 @@ namespace Server.Engines.Plants
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 int Name => ( m_ItemID < 0x4000 ) ? 1020000 + m_ItemID : 1078872 + m_ItemID;
public bool ContainsPlant => m_ContainsPlant;
public bool Flowery => m_Flowery;

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

@ -12,7 +12,7 @@ namespace Server.Engines.Plants
[CommandProperty( AccessLevel.GameMaster )]
public PlantType PlantType
{
get { return m_PlantType; }
get => m_PlantType;
set
{
m_PlantType = value;
@ -23,7 +23,7 @@ namespace Server.Engines.Plants
[CommandProperty( AccessLevel.GameMaster )]
public PlantHue PlantHue
{
get { return m_PlantHue; }
get => m_PlantHue;
set
{
m_PlantHue = value;
@ -35,7 +35,7 @@ namespace Server.Engines.Plants
[CommandProperty( AccessLevel.GameMaster )]
public bool ShowType
{
get { return m_ShowType; }
get => m_ShowType;
set
{
m_ShowType = value;