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

8
Scripts/Mobiles/Animals/Cows/Cow.cs
View file

@ -10,8 +10,8 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public DateTime MilkedOn
{
get { return m_MilkedOn; }
set { m_MilkedOn = value; }
get => m_MilkedOn;
set => m_MilkedOn = value;
}
private int m_Milk;
@ -19,8 +19,8 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public int Milk
{
get { return m_Milk; }
set { m_Milk = value; }
get => m_Milk;
set => m_Milk = value;
}
public override string DefaultName => "a cow";

2
Scripts/Mobiles/Animals/Misc/Sheep.cs
View file

@ -12,7 +12,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public DateTime NextWoolTime
{
get{ return m_NextWoolTime; }
get => m_NextWoolTime;
set{ m_NextWoolTime = value; Body = ( DateTime.UtcNow >= m_NextWoolTime ) ? 0xCF : 0xDF; }
}

33
Scripts/Mobiles/Animals/Mounts/BaseMount.cs
View file

@ -15,14 +15,14 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public DateTime NextMountAbility
{
get { return m_NextMountAbility; }
set { m_NextMountAbility = value; }
get => m_NextMountAbility;
set => m_NextMountAbility = value;
}
protected Item InternalItem { get { return m_InternalItem; } }
protected Item InternalItem => m_InternalItem;
public virtual bool AllowMaleRider{ get{ return true; } }
public virtual bool AllowFemaleRider{ get{ return true; } }
public virtual bool AllowMaleRider => true;
public virtual bool AllowFemaleRider => true;
public BaseMount( string name, int bodyID, int itemID, AIType aiType, FightMode fightMode, int rangePerception, int rangeFight, double activeSpeed, double passiveSpeed ) : base ( aiType, fightMode, rangePerception, rangeFight, activeSpeed, passiveSpeed )
{
@ -35,10 +35,7 @@ namespace Server.Mobiles
[Hue, CommandProperty( AccessLevel.GameMaster )]
public override int Hue
{
get
{
return base.Hue;
}
get => base.Hue;
set
{
base.Hue = value;
@ -190,10 +187,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public int ItemID
{
get
{
return m_InternalItem?.ItemID ?? 0;
}
get => m_InternalItem?.ItemID ?? 0;
set
{
if ( m_InternalItem != null )
@ -212,10 +206,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Rider
{
get
{
return m_Rider;
}
get => m_Rider;
set
{
if ( m_Rider != value )
@ -367,13 +358,7 @@ namespace Server.Mobiles
}
}
public IMount Mount
{
get
{
return m_Mount;
}
}
public IMount Mount => m_Mount;
}
}

2
Scripts/Mobiles/Animals/Mounts/Beetle.cs
View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
public class Beetle : BaseMount
{
public override string CorpseName => "a giant beetle corpse";
public virtual double BoostedSpeed{ get{ return 0.1; } }
public virtual double BoostedSpeed => 0.1;
[Constructible]
public Beetle() : this( "a giant beetle" )

42
Scripts/Mobiles/Animals/Mounts/Ethereals.cs
View file

@ -16,19 +16,16 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get { return m_IsRewardItem; }
set { m_IsRewardItem = value; }
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
public override double DefaultWeight
{
get { return 1.0; }
}
public override double DefaultWeight => 1.0;
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public bool IsDonationItem
{
get { return m_IsDonationItem; }
get => m_IsDonationItem;
set { m_IsDonationItem = value; InvalidateProperties(); }
}
@ -61,10 +58,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public int MountedID
{
get
{
return m_MountedID;
}
get => m_MountedID;
set
{
if ( m_MountedID != value )
@ -80,10 +74,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public int RegularID
{
get
{
return m_RegularID;
}
get => m_RegularID;
set
{
if ( m_RegularID != value )
@ -253,10 +244,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Rider
{
get
{
return m_Rider;
}
get => m_Rider;
set
{
if ( value != m_Rider )
@ -334,13 +322,7 @@ namespace Server.Mobiles
ProcessDelta();
}
public IMount Mount
{
get
{
return this;
}
}
public IMount Mount => this;
public static void StopMounting( Mobile mob )
{
@ -375,13 +357,7 @@ namespace Server.Mobiles
public override double CastDelayFastScalar => 0;
public override TimeSpan CastDelayBase
{
get
{
return TimeSpan.FromSeconds( ( ( m_Mount.IsDonationItem && RewardSystem.GetRewardLevel( m_Rider ) < 3 ) ? ( 7.5 + ( Core.AOS ? 3.0 : 2.0 ) ) : ( Core.AOS ? 3.0 : 2.0 ) ) );
}
}
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( ( ( m_Mount.IsDonationItem && RewardSystem.GetRewardLevel( m_Rider ) < 3 ) ? ( 7.5 + ( Core.AOS ? 3.0 : 2.0 ) ) : ( Core.AOS ? 3.0 : 2.0 ) ) );
public override int GetMana()
{

5
Scripts/Mobiles/Animals/Mounts/Kirin.cs
View file

@ -98,10 +98,7 @@ namespace Server.Mobiles
c.DropItem( new KirinBrains() );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override int Meat => 3;
public override int Hides => 10;

15
Scripts/Mobiles/Animals/Mounts/SwampDragon.cs
View file

@ -14,28 +14,28 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public Mobile BardingCrafter
{
get{ return m_BardingCrafter; }
get => m_BardingCrafter;
set{ m_BardingCrafter = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool BardingExceptional
{
get{ return m_BardingExceptional; }
get => m_BardingExceptional;
set{ m_BardingExceptional = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int BardingHP
{
get{ return m_BardingHP; }
get => m_BardingHP;
set{ m_BardingHP = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool HasBarding
{
get{ return m_HasBarding; }
get => m_HasBarding;
set
{
m_HasBarding = value;
@ -60,7 +60,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public CraftResource BardingResource
{
get{ return m_BardingResource; }
get => m_BardingResource;
set
{
m_BardingResource = value;
@ -73,10 +73,7 @@ namespace Server.Mobiles
}
[CommandProperty( AccessLevel.GameMaster )]
public int BardingMaxHP
{
get{ return m_BardingExceptional ? 2500 : 1000; }
}
public int BardingMaxHP => m_BardingExceptional ? 2500 : 1000;
[Constructible]
public SwampDragon() : this( "a swamp dragon" )

5
Scripts/Mobiles/Animals/Mounts/Unicorn.cs
View file

@ -107,10 +107,7 @@ namespace Server.Mobiles
c.DropItem( new UnicornRibs() );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override Poison PoisonImmune => Poison.Lethal;
public override int Meat => 3;