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

10
Scripts/Engines/Factions/Items/BaseMonolith.cs
View file

@ -11,7 +11,7 @@ namespace Server.Factions
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public Sigil Sigil
{
get{ return m_Sigil; }
get => m_Sigil;
set
{
if ( m_Sigil == value )
@ -32,7 +32,7 @@ namespace Server.Factions
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public Town Town
{
get{ return m_Town; }
get => m_Town;
set
{
m_Town = value;
@ -43,7 +43,7 @@ namespace Server.Factions
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public Faction Faction
{
get{ return m_Faction; }
get => m_Faction;
set
{
m_Faction = value;
@ -128,8 +128,8 @@ namespace Server.Factions
public static List<BaseMonolith> Monoliths
{
get{ return m_Monoliths; }
set{ m_Monoliths = value; }
get => m_Monoliths;
set => m_Monoliths = value;
}
}
}

4
Scripts/Engines/Factions/Items/BaseSystemController.cs
View file

@ -4,8 +4,8 @@ namespace Server.Factions
{
private int m_LabelNumber;
public virtual int DefaultLabelNumber{ get{ return base.LabelNumber; } }
public new virtual string DefaultName{ get{ return null; } }
public virtual int DefaultLabelNumber => base.LabelNumber;
public new virtual string DefaultName => null;
public override int LabelNumber
{

2
Scripts/Engines/Factions/Items/FactionStone.cs
View file

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

2
Scripts/Engines/Factions/Items/JoinStone.cs
View file

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

6
Scripts/Engines/Factions/Items/Power Faction Items/BloodRose.cs
View file

@ -2,11 +2,7 @@ using System;
namespace Server {
public sealed class BloodRose : PowerFactionItem {
public override string DefaultName {
get {
return "blood rose";
}
}
public override string DefaultName => "blood rose";
public BloodRose()
: base( Utility.RandomList( 6378, 9035 ) ) {

6
Scripts/Engines/Factions/Items/Power Faction Items/ClarityPotion.cs
View file

@ -2,11 +2,7 @@ using System;
namespace Server {
public sealed class ClarityPotion : PowerFactionItem {
public override string DefaultName {
get {
return "clarity potion";
}
}
public override string DefaultName => "clarity potion";
public ClarityPotion()
: base( 3628 ) {

6
Scripts/Engines/Factions/Items/Power Faction Items/GemOfEmpowerment.cs
View file

@ -2,11 +2,7 @@ using Server.Factions;
namespace Server {
public sealed class GemOfEmpowerment : PowerFactionItem {
public override string DefaultName {
get {
return "gem of empowerment";
}
}
public override string DefaultName => "gem of empowerment";
public GemOfEmpowerment()
: base( 7955 ) {

12
Scripts/Engines/Factions/Items/Power Faction Items/PowerFactionItem.cs
View file

@ -35,17 +35,9 @@ namespace Server {
private int _weight;
private Type _type;
public int Weight {
get {
return _weight;
}
}
public int Weight => _weight;
public Type Type {
get {
return _type;
}
}
public Type Type => _type;
public WeightedItem( int weight, Type type ) {
_weight = weight;

6
Scripts/Engines/Factions/Items/Power Faction Items/StormsEye.cs
View file

@ -5,11 +5,7 @@ using Server.Factions;
namespace Server {
public sealed class StormsEye : PowerFactionItem {
public override string DefaultName {
get {
return "storms eye";
}
}
public override string DefaultName => "storms eye";
public StormsEye()
: base( 3967 ) {

6
Scripts/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs
View file

@ -4,11 +4,7 @@ using Server.Factions;
namespace Server {
public sealed class UrnOfAscension : PowerFactionItem {
public override string DefaultName {
get {
return "urn of ascension";
}
}
public override string DefaultName => "urn of ascension";
public UrnOfAscension()
: base( 9246 ) {

48
Scripts/Engines/Factions/Items/Sigil.cs
View file

@ -36,82 +36,70 @@ namespace Server.Factions
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public DateTime LastStolen
{
get{ return m_LastStolen; }
set{ m_LastStolen = value; }
get => m_LastStolen;
set => m_LastStolen = value;
}
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public DateTime GraceStart
{
get{ return m_GraceStart; }
set{ m_GraceStart = value; }
get => m_GraceStart;
set => m_GraceStart = value;
}
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public DateTime CorruptionStart
{
get{ return m_CorruptionStart; }
set{ m_CorruptionStart = value; }
get => m_CorruptionStart;
set => m_CorruptionStart = value;
}
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public DateTime PurificationStart
{
get{ return m_PurificationStart; }
set{ m_PurificationStart = value; }
get => m_PurificationStart;
set => m_PurificationStart = value;
}
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public Town Town
{
get{ return m_Town; }
get => m_Town;
set{ m_Town = value; Update(); }
}
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public Faction Corrupted
{
get{ return m_Corrupted; }
get => m_Corrupted;
set{ m_Corrupted = value; Update(); }
}
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public Faction Corrupting
{
get{ return m_Corrupting; }
get => m_Corrupting;
set{ m_Corrupting = value; Update(); }
}
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public BaseMonolith LastMonolith
{
get{ return m_LastMonolith; }
set{ m_LastMonolith = value; }
get => m_LastMonolith;
set => m_LastMonolith = value;
}
[CommandProperty( AccessLevel.Counselor )]
public bool IsBeingCorrupted
{
get{ return ( m_LastMonolith is StrongholdMonolith && m_LastMonolith.Faction == m_Corrupting && m_Corrupting != null ); }
}
public bool IsBeingCorrupted => ( m_LastMonolith is StrongholdMonolith && m_LastMonolith.Faction == m_Corrupting && m_Corrupting != null );
[CommandProperty( AccessLevel.Counselor )]
public bool IsCorrupted
{
get{ return ( m_Corrupted != null ); }
}
public bool IsCorrupted => ( m_Corrupted != null );
[CommandProperty( AccessLevel.Counselor )]
public bool IsPurifying
{
get{ return ( m_PurificationStart != DateTime.MinValue ); }
}
public bool IsPurifying => ( m_PurificationStart != DateTime.MinValue );
[CommandProperty( AccessLevel.Counselor )]
public bool IsCorrupting
{
get{ return ( m_Corrupting != null && m_Corrupting != m_Corrupted ); }
}
public bool IsCorrupting => ( m_Corrupting != null && m_Corrupting != m_Corrupted );
public void Update()
{
@ -456,6 +444,6 @@ namespace Server.Factions
private static List<Sigil> m_Sigils = new List<Sigil>();
public static List<Sigil> Sigils{ get{ return m_Sigils; } }
public static List<Sigil> Sigils => m_Sigils;
}
}

5
Scripts/Engines/Factions/Items/Silver.cs
View file

@ -2,10 +2,7 @@ namespace Server.Factions
{
public class Silver : Item
{
public override double DefaultWeight
{
get { return 0.02; }
}
public override double DefaultWeight => 0.02;
[Constructible]
public Silver() : this( 1 )

2
Scripts/Engines/Factions/Items/TownStone.cs
View file

@ -9,7 +9,7 @@ namespace Server.Factions
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
public Town Town
{
get{ return m_Town; }
get => m_Town;
set
{
m_Town = value;

29
Scripts/Engines/Factions/Items/Traps/BaseFactionTrap.cs
View file

@ -24,39 +24,36 @@ namespace Server.Factions
[CommandProperty( AccessLevel.GameMaster )]
public Faction Faction
{
get{ return m_Faction; }
set{ m_Faction = value; }
get => m_Faction;
set => m_Faction = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Placer
{
get{ return m_Placer; }
set{ m_Placer = value; }
get => m_Placer;
set => m_Placer = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime TimeOfPlacement
{
get{ return m_TimeOfPlacement; }
set{ m_TimeOfPlacement = value; }
get => m_TimeOfPlacement;
set => m_TimeOfPlacement = value;
}
public virtual int EffectSound{ get{ return 0; } }
public virtual int EffectSound => 0;
public virtual int SilverFromDisarm{ get{ return 100; } }
public virtual int SilverFromDisarm => 100;
public virtual int MessageHue{ get{ return 0; } }
public virtual int MessageHue => 0;
public virtual int AttackMessage{ get{ return 0; } }
public virtual int DisarmMessage{ get{ return 0; } }
public virtual int AttackMessage => 0;
public virtual int DisarmMessage => 0;
public virtual AllowedPlacing AllowedPlacing{ get{ return AllowedPlacing.Everywhere; } }
public virtual AllowedPlacing AllowedPlacing => AllowedPlacing.Everywhere;
public virtual TimeSpan ConcealPeriod
{
get{ return TimeSpan.FromMinutes( 1.0 ); }
}
public virtual TimeSpan ConcealPeriod => TimeSpan.FromMinutes( 1.0 );
public virtual TimeSpan DecayPeriod
{

2
Scripts/Engines/Factions/Items/Traps/BaseFactionTrapDeed.cs
View file

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

4
Scripts/Engines/Factions/Items/Traps/FactionTrapRemovalKit.cs
View file

@ -7,8 +7,8 @@ namespace Server.Factions
[CommandProperty( AccessLevel.GameMaster )]
public int Charges
{
get{ return m_Charges; }
set{ m_Charges = value; }
get => m_Charges;
set => m_Charges = value;
}
public override int LabelNumber => 1041508; // a faction trap removal kit