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

2
Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs
View file

@ -10,7 +10,7 @@ namespace Server.Factions
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public Faction Faction
{
get{ return m_Faction; }
get => m_Faction;
set
{
m_Faction = value;

23
Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs
View file

@ -18,19 +18,16 @@ namespace Server.Factions
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public Faction Faction
{
get{ return m_Faction; }
get => m_Faction;
set{ Unregister(); m_Faction = value; Register(); }
}
public Orders Orders
{
get{ return m_Orders; }
}
public Orders Orders => m_Orders;
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public Town Town
{
get{ return m_Town; }
get => m_Town;
set{ Unregister(); m_Town = value; Register(); }
}
@ -48,10 +45,7 @@ namespace Server.Factions
public abstract GuardAI GuardAI{ get; }
protected override BaseAI ForcedAI
{
get { return new FactionGuardAI( this ); }
}
protected override BaseAI ForcedAI => new FactionGuardAI( this );
public override TimeSpan ReacquireDelay => TimeSpan.FromSeconds( 2.0 );
@ -442,7 +436,7 @@ namespace Server.Factions
public Mobile Rider
{
get{ return m_Item.Rider; }
get => m_Item.Rider;
set{}
}
@ -461,7 +455,7 @@ namespace Server.Factions
private Mobile m_Rider;
private VirtualMount m_Mount;
public Mobile Rider{ get{ return m_Rider; } }
public Mobile Rider => m_Rider;
public VirtualMountItem( Mobile mob ) : base( 0x3EA0 )
{
@ -471,10 +465,7 @@ namespace Server.Factions
m_Mount = new VirtualMount( this );
}
public IMount Mount
{
get{ return m_Mount; }
}
public IMount Mount => m_Mount;
public VirtualMountItem( Serial serial ) : base( serial )
{

20
Scripts/Engines/Factions/Mobiles/Guards/GuardAI.cs
View file

@ -30,9 +30,9 @@ namespace Server.Factions
private TimeSpan m_Hold;
private int m_Chance;
public Type Spell{ get{ return m_Spell; } }
public TimeSpan Hold{ get{ return m_Hold; } }
public int Chance{ get{ return m_Chance; } }
public Type Spell => m_Spell;
public TimeSpan Hold => m_Hold;
public int Chance => m_Chance;
public ComboEntry( Type spell ) : this( spell, 100, TimeSpan.Zero )
{
@ -55,8 +55,8 @@ namespace Server.Factions
private int m_Mana;
private ComboEntry[] m_Entries;
public int Mana{ get{ return m_Mana; } }
public ComboEntry[] Entries{ get{ return m_Entries; } }
public int Mana => m_Mana;
public ComboEntry[] Entries => m_Entries;
public SpellCombo( int mana, params ComboEntry[] entries )
{
@ -121,15 +121,9 @@ namespace Server.Factions
return ( ( m_Guard.GuardAI & flag ) == flag );
}
public bool IsDamaged
{
get{ return ( m_Guard.Hits < m_Guard.HitsMax ); }
}
public bool IsDamaged => ( m_Guard.Hits < m_Guard.HitsMax );
public bool IsPoisoned
{
get{ return m_Guard.Poisoned; }
}
public bool IsPoisoned => m_Guard.Poisoned;
public TimeSpan TimeUntilBandage
{

16
Scripts/Engines/Factions/Mobiles/Guards/Orders.cs
View file

@ -21,8 +21,10 @@ namespace Server.Factions.AI
private Faction m_Faction;
private ReactionType m_Type;
public Faction Faction{ get{ return m_Faction; } }
public ReactionType Type{ get{ return m_Type; } set{ m_Type = value; } }
public Faction Faction => m_Faction;
public ReactionType Type{ get => m_Type;
set => m_Type = value;
}
public Reaction( Faction faction, ReactionType type )
{
@ -63,10 +65,14 @@ namespace Server.Factions.AI
private MovementType m_Movement;
private Mobile m_Follow;
public BaseFactionGuard Guard{ get{ return m_Guard; } }
public BaseFactionGuard Guard => m_Guard;
public MovementType Movement{ get{ return m_Movement; } set{ m_Movement = value; } }
public Mobile Follow{ get{ return m_Follow; } set{ m_Follow = value; } }
public MovementType Movement{ get => m_Movement;
set => m_Movement = value;
}
public Mobile Follow{ get => m_Follow;
set => m_Follow = value;
}
public Reaction GetReaction( Faction faction )
{

6
Scripts/Engines/Factions/Mobiles/Vendors/BaseFactionVendor.cs
View file

@ -11,14 +11,14 @@ namespace Server.Factions
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public Town Town
{
get{ return m_Town; }
get => m_Town;
set{ Unregister(); m_Town = value; Register(); }
}
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public Faction Faction
{
get{ return m_Faction; }
get => m_Faction;
set{ Unregister(); m_Faction = value; Register(); }
}
@ -43,7 +43,7 @@ namespace Server.Factions
}
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override void InitSBInfo()
{

5
Scripts/Engines/Factions/Mobiles/Vendors/FactionBottleVendor.cs
View file

@ -17,10 +17,7 @@ namespace Server.Factions
SBInfos.Add( new SBFactionBottle() );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals;
public override void InitOutfit()
{

5
Scripts/Engines/Factions/Mobiles/Vendors/FactionHorseVendor.cs
View file

@ -18,10 +18,7 @@ namespace Server.Factions
{
}
public override VendorShoeType ShoeType
{
get{ return Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots; }
}
public override VendorShoeType ShoeType => Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots;
public override int GetShoeHue()
{

5
Scripts/Engines/Factions/Mobiles/Vendors/FactionReagentVendor.cs
View file

@ -21,10 +21,7 @@ namespace Server.Factions
SBInfos.Add( new SBFactionReagent() );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals;
public override void InitOutfit()
{