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

8
Scripts/Items/Special/Holiday/Christmas/HolidayTree.cs
View file

@ -26,7 +26,7 @@ namespace Server.Items
private class Ornament : Item
{
public override int LabelNumber{ get{ return 1041118; } } // a tree ornament
public override int LabelNumber => 1041118; // a tree ornament
public Ornament( int itemID ) : base( itemID )
{
@ -56,7 +56,7 @@ namespace Server.Items
{
private HolidayTree m_Tree;
public override int LabelNumber{ get{ return 1041117; } } // a tree for the holidays
public override int LabelNumber => 1041117; // a tree for the holidays
public TreeTrunk( HolidayTree tree, int itemID ) : base( itemID )
{
@ -106,7 +106,7 @@ namespace Server.Items
}
}
public override int LabelNumber{ get{ return 1041117; } } // a tree for the holidays
public override int LabelNumber => 1041117; // a tree for the holidays
public HolidayTree( Mobile from, HolidayTreeType type, Point3D loc ) : base( 1 )
{
@ -311,4 +311,4 @@ namespace Server.Items
}
}
}
}
}

10
Scripts/Items/Special/Holiday/GingerBreadHouseDeed.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class GingerBreadHouseAddon : BaseAddon
{
public override BaseAddonDeed Deed{ get{ return new GingerBreadHouseDeed(); } }
public override BaseAddonDeed Deed => new GingerBreadHouseDeed();
public GingerBreadHouseAddon()
{
@ -13,7 +13,7 @@ namespace Server.Items
{
LocalizedAddonComponent laoc = new LocalizedAddonComponent( i, 1077395 ); // Gingerbread House
laoc.Light = LightType.SouthSmall;
AddComponent( laoc, (i==0x2be5) ? -1 : 0, (i==0x2be7) ? -1 : 0, 0 );
AddComponent( laoc, (i==0x2be5) ? -1 : 0, (i==0x2be7) ? -1 : 0, 0 );
}
}
@ -36,11 +36,11 @@ namespace Server.Items
public class GingerBreadHouseDeed : BaseAddonDeed
{
public override int LabelNumber{ get{ return 1077394; } } //a Gingerbread House Deed
public override BaseAddon Addon{ get{ return new GingerBreadHouseAddon(); } }
public override int LabelNumber => 1077394; //a Gingerbread House Deed
public override BaseAddon Addon => new GingerBreadHouseAddon();
[Constructible]
public GingerBreadHouseDeed()
public GingerBreadHouseDeed()
{
Weight = 1.0;
LootType = LootType.Blessed;

14
Scripts/Items/Special/Holiday/HolidayFoods.cs
View file

@ -25,7 +25,7 @@ namespace Server.Items
private int m_Eaten;
private Mobile m_Eater;
public Mobile Eater { get { return m_Eater; } }
public Mobile Eater => m_Eater;
public int Eaten { get { return m_Eaten; } set { m_Eaten = value; } }
public CandyCaneTimer( Mobile eater )
@ -71,9 +71,7 @@ namespace Server.Items
private static CandyCaneTimer EnsureTimer( Mobile from )
{
CandyCaneTimer timer;
if ( !m_ToothAches.TryGetValue( from, out timer ) )
if (!m_ToothAches.TryGetValue( from, out CandyCaneTimer timer ))
m_ToothAches[from] = timer = new CandyCaneTimer( from );
return timer;
@ -81,9 +79,7 @@ namespace Server.Items
public static int GetToothAche( Mobile from )
{
CandyCaneTimer timer;
if ( m_ToothAches.TryGetValue( from, out timer ) )
if (m_ToothAches.TryGetValue( from, out CandyCaneTimer timer ))
return timer.Eaten;
return 0;
@ -141,9 +137,9 @@ namespace Server.Items
1077396, // Noooo!
1077397, // Please don't eat me... *whimper*
1077405, // Not the face!
1077406, // Ahhhhhh! My foot’s gone!
1077406, // Ahhhhhh! My foot<EFBFBD>s gone!
1077407, // Please. No! I have gingerkids!
1077408, // No, no! I’m really made of poison. Really.
1077408, // No, no! I<EFBFBD>m really made of poison. Really.
1077409 // Run, run as fast as you can! You can't catch me! I'm the gingerbread man!
};

12
Scripts/Items/Special/Holiday/HolidayGiftBoxes.cs
View file

@ -46,7 +46,7 @@ namespace Server.Items
[FlippableAttribute(0x46A5, 0x46A6)]
public class GiftBoxRectangle : BaseContainer
{
public override int DefaultGumpID { get { return 0x11E; } }
public override int DefaultGumpID => 0x11E;
[Constructible]
public GiftBoxRectangle()
@ -75,7 +75,7 @@ namespace Server.Items
public class GiftBoxCube : BaseContainer
{
public override int DefaultGumpID { get { return 0x11B; } }
public override int DefaultGumpID => 0x11B;
[Constructible]
public GiftBoxCube()
@ -104,7 +104,7 @@ namespace Server.Items
public class GiftBoxCylinder : BaseContainer
{
public override int DefaultGumpID { get { return 0x11C; } }
public override int DefaultGumpID => 0x11C;
[Constructible]
public GiftBoxCylinder()
@ -133,7 +133,7 @@ namespace Server.Items
public class GiftBoxOctogon : BaseContainer
{
public override int DefaultGumpID { get { return 0x11D; } }
public override int DefaultGumpID => 0x11D;
[Constructible]
public GiftBoxOctogon()
@ -162,7 +162,7 @@ namespace Server.Items
public class GiftBoxAngel : BaseContainer
{
public override int DefaultGumpID { get { return 0x11F; } }
public override int DefaultGumpID => 0x11F;
[Constructible]
public GiftBoxAngel()
@ -218,4 +218,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Special/Holiday/HolidayPottedPlant.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
{
public class HolidayPottedPlant : Item
{
public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } }
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
[Constructible]
public HolidayPottedPlant()
@ -43,8 +43,8 @@ namespace Server.Items
public class PottedPlantDeed : Item
{
public override int LabelNumber { get { return 1041114; } } // A deed for a potted plant.
public override double DefaultWeight { get { return 1.0; } }
public override int LabelNumber => 1041114; // A deed for a potted plant.
public override double DefaultWeight => 1.0;
[Constructible]
public PottedPlantDeed()

4
Scripts/Items/Special/Holiday/HolidayTimepiece.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class HolidayTimepiece : Clock
{
public override int LabelNumber { get { return 1041113; } } // a holiday timepiece
public override double DefaultWeight { get { return 1.0; } }
public override int LabelNumber => 1041113; // a holiday timepiece
public override double DefaultWeight => 1.0;
[Constructible]
public HolidayTimepiece()

6
Scripts/Items/Special/Holiday/IcyPatch.cs
View file

@ -6,8 +6,8 @@ namespace Server.Items
{
public class IcyPatch : Item
{
public override int LabelNumber { get { return 1095159; } } //An Icy Patch
public override double DefaultWeight { get { return 5.0; } }
public override int LabelNumber => 1095159; //An Icy Patch
public override double DefaultWeight => 5.0;
/* On OSI, the iceypatch with itemid 0x122a is "rarer", so we will give it 1:10 chance of creating it that way */
@ -122,4 +122,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Special/Holiday/SnowGlobes.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class SnowGlobe : Item
{
public override double DefaultWeight { get { return 1.0; } }
public override double DefaultWeight => 1.0;
public SnowGlobe()
: base( 0xE2F )
@ -68,7 +68,7 @@ namespace Server.Items
set { m_Type = value; InvalidateProperties(); }
}
public override int LabelNumber { get { return 1041454 + (int) m_Type; } }
public override int LabelNumber => 1041454 + (int) m_Type;
[Constructible]
public SnowGlobeOne()

6
Scripts/Items/Special/Holiday/SnowPiles.cs
View file

@ -2,8 +2,8 @@
{
public class SnowPileDeco : Item
{
public override string DefaultName{ get { return "Snow Pile"; } }
public override double DefaultWeight{ get { return 2.0; } }
public override string DefaultName => "Snow Pile";
public override double DefaultWeight => 2.0;
private static readonly int[] m_Types = new int[] { 0x8E2, 0x8E0, 0x8E6, 0x8E5, 0x8E3 };
@ -39,4 +39,4 @@
int version = reader.ReadInt();
}
}
}
}

12
Scripts/Items/Special/Holiday/SnowStatue.cs
View file

@ -8,7 +8,7 @@ namespace Server.Items
[Flippable( 0x456E, 0x456F )]
public class SnowStatuePegasus : Item
{
public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } }
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
[Constructible]
public SnowStatuePegasus()
@ -39,7 +39,7 @@ namespace Server.Items
[Flippable( 0x4578, 0x4579 )]
public class SnowStatueSeahorse : Item
{
public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } }
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
[Constructible]
public SnowStatueSeahorse()
@ -70,7 +70,7 @@ namespace Server.Items
[Flippable( 0x457A, 0x457B )]
public class SnowStatueMermaid : Item
{
public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } }
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
[Constructible]
public SnowStatueMermaid()
@ -101,7 +101,7 @@ namespace Server.Items
[Flippable( 0x457C, 0x457D )]
public class SnowStatueGriffon : Item
{
public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } }
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
[Constructible]
public SnowStatueGriffon()
@ -131,8 +131,8 @@ namespace Server.Items
public class SnowStatueDeed : Item
{
public override int LabelNumber { get { return 1114296; } } // snow statue deed
public override double DefaultWeight { get { return 1.0; } }
public override int LabelNumber => 1114296; // snow statue deed
public override double DefaultWeight => 1.0;
[Constructible]
public SnowStatueDeed()

8
Scripts/Items/Special/Holiday/Stockings.cs
View file

@ -7,8 +7,8 @@ namespace Server.Items
[FlippableAttribute( 0x2bd9, 0x2bda )]
public class GreenStocking : BaseContainer
{
public override int DefaultGumpID{ get{ return 0x103; } }
public override int DefaultDropSound{ get{ return 0x42; } }
public override int DefaultGumpID => 0x103;
public override int DefaultDropSound => 0x42;
[Constructible]
public GreenStocking() : base ( Utility.Random( 0x2BD9, 2 ) )
@ -36,8 +36,8 @@ namespace Server.Items
[FlippableAttribute( 0x2bdb, 0x2bdc )]
public class RedStocking : BaseContainer
{
public override int DefaultGumpID{ get{ return 0x103; } }
public override int DefaultDropSound{ get{ return 0x42; } }
public override int DefaultGumpID => 0x103;
public override int DefaultDropSound => 0x42;
[Constructible]
public RedStocking() : base ( Utility.Random( 0x2BDB, 2 ) )

6
Scripts/Items/Special/Holiday/Wreath.cs
View file

@ -119,7 +119,7 @@ namespace Server.Items
return false;
}
}
else
else
{
return false;
}
@ -170,7 +170,7 @@ namespace Server.Items
[Flippable( 0x14F0, 0x14EF )]
public class WreathDeed : Item
{
public override int LabelNumber{ get{ return 1062837; } } // holiday wreath deed
public override int LabelNumber => 1062837; // holiday wreath deed
[Constructible]
public WreathDeed() : this( Utility.RandomDyedHue() )
@ -325,4 +325,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Special/Holiday/WristWatch.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class WristWatch : Clock
{
public override int LabelNumber { get { return 1041421; } } // a wrist watch
public override double DefaultWeight { get { return 1.0; } }
public override int LabelNumber => 1041421; // a wrist watch
public override double DefaultWeight => 1.0;
[Constructible]
public WristWatch()