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

Adds style cop (#109)

Browse source
This commit is contained in:
Kamron Batman 2020-04-26 00:16:02 -07:00 • committed by GitHub
parent 3e715bcb60
commit 556a17aba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1725 changed files with 33831 additions and 38046 deletions
Download patch file Download diff file Expand all files Collapse all files

167
Projects/Scripts/Items/Special/Holiday/Christmas/HolidayTree.cs
View file

@ -25,71 +25,71 @@ namespace Server.Items
switch (type)
{
case HolidayTreeType.Classic:
{
ItemID = 0xCD7;
{
ItemID = 0xCD7;
AddItem(0, 0, 0, new TreeTrunk(this, 0xCD6));
AddItem(0, 0, 0, new TreeTrunk(this, 0xCD6));
AddOrnament(0, 0, 2, 0xF22);
AddOrnament(0, 0, 9, 0xF18);
AddOrnament(0, 0, 15, 0xF20);
AddOrnament(0, 0, 19, 0xF17);
AddOrnament(0, 0, 20, 0xF24);
AddOrnament(0, 0, 20, 0xF1F);
AddOrnament(0, 0, 20, 0xF19);
AddOrnament(0, 0, 21, 0xF1B);
AddOrnament(0, 0, 28, 0xF2F);
AddOrnament(0, 0, 30, 0xF23);
AddOrnament(0, 0, 32, 0xF2A);
AddOrnament(0, 0, 33, 0xF30);
AddOrnament(0, 0, 34, 0xF29);
AddOrnament(0, 1, 7, 0xF16);
AddOrnament(0, 1, 7, 0xF1E);
AddOrnament(0, 1, 12, 0xF0F);
AddOrnament(0, 1, 13, 0xF13);
AddOrnament(0, 1, 18, 0xF12);
AddOrnament(0, 1, 19, 0xF15);
AddOrnament(0, 1, 25, 0xF28);
AddOrnament(0, 1, 29, 0xF1A);
AddOrnament(0, 1, 37, 0xF2B);
AddOrnament(1, 0, 13, 0xF10);
AddOrnament(1, 0, 14, 0xF1C);
AddOrnament(1, 0, 16, 0xF14);
AddOrnament(1, 0, 17, 0xF26);
AddOrnament(1, 0, 22, 0xF27);
AddOrnament(0, 0, 2, 0xF22);
AddOrnament(0, 0, 9, 0xF18);
AddOrnament(0, 0, 15, 0xF20);
AddOrnament(0, 0, 19, 0xF17);
AddOrnament(0, 0, 20, 0xF24);
AddOrnament(0, 0, 20, 0xF1F);
AddOrnament(0, 0, 20, 0xF19);
AddOrnament(0, 0, 21, 0xF1B);
AddOrnament(0, 0, 28, 0xF2F);
AddOrnament(0, 0, 30, 0xF23);
AddOrnament(0, 0, 32, 0xF2A);
AddOrnament(0, 0, 33, 0xF30);
AddOrnament(0, 0, 34, 0xF29);
AddOrnament(0, 1, 7, 0xF16);
AddOrnament(0, 1, 7, 0xF1E);
AddOrnament(0, 1, 12, 0xF0F);
AddOrnament(0, 1, 13, 0xF13);
AddOrnament(0, 1, 18, 0xF12);
AddOrnament(0, 1, 19, 0xF15);
AddOrnament(0, 1, 25, 0xF28);
AddOrnament(0, 1, 29, 0xF1A);
AddOrnament(0, 1, 37, 0xF2B);
AddOrnament(1, 0, 13, 0xF10);
AddOrnament(1, 0, 14, 0xF1C);
AddOrnament(1, 0, 16, 0xF14);
AddOrnament(1, 0, 17, 0xF26);
AddOrnament(1, 0, 22, 0xF27);
break;
}
break;
}
case HolidayTreeType.Modern:
{
ItemID = 0x1B7E;
{
ItemID = 0x1B7E;
AddOrnament(0, 0, 2, 0xF2F);
AddOrnament(0, 0, 2, 0xF20);
AddOrnament(0, 0, 2, 0xF22);
AddOrnament(0, 0, 5, 0xF30);
AddOrnament(0, 0, 5, 0xF15);
AddOrnament(0, 0, 5, 0xF1F);
AddOrnament(0, 0, 5, 0xF2B);
AddOrnament(0, 0, 6, 0xF0F);
AddOrnament(0, 0, 7, 0xF1E);
AddOrnament(0, 0, 7, 0xF24);
AddOrnament(0, 0, 8, 0xF29);
AddOrnament(0, 0, 9, 0xF18);
AddOrnament(0, 0, 14, 0xF1C);
AddOrnament(0, 0, 15, 0xF13);
AddOrnament(0, 0, 15, 0xF20);
AddOrnament(0, 0, 16, 0xF26);
AddOrnament(0, 0, 17, 0xF12);
AddOrnament(0, 0, 18, 0xF17);
AddOrnament(0, 0, 20, 0xF1B);
AddOrnament(0, 0, 23, 0xF28);
AddOrnament(0, 0, 25, 0xF18);
AddOrnament(0, 0, 25, 0xF2A);
AddOrnament(0, 1, 7, 0xF16);
AddOrnament(0, 0, 2, 0xF2F);
AddOrnament(0, 0, 2, 0xF20);
AddOrnament(0, 0, 2, 0xF22);
AddOrnament(0, 0, 5, 0xF30);
AddOrnament(0, 0, 5, 0xF15);
AddOrnament(0, 0, 5, 0xF1F);
AddOrnament(0, 0, 5, 0xF2B);
AddOrnament(0, 0, 6, 0xF0F);
AddOrnament(0, 0, 7, 0xF1E);
AddOrnament(0, 0, 7, 0xF24);
AddOrnament(0, 0, 8, 0xF29);
AddOrnament(0, 0, 9, 0xF18);
AddOrnament(0, 0, 14, 0xF1C);
AddOrnament(0, 0, 15, 0xF13);
AddOrnament(0, 0, 15, 0xF20);
AddOrnament(0, 0, 16, 0xF26);
AddOrnament(0, 0, 17, 0xF12);
AddOrnament(0, 0, 18, 0xF17);
AddOrnament(0, 0, 20, 0xF1B);
AddOrnament(0, 0, 23, 0xF28);
AddOrnament(0, 0, 25, 0xF18);
AddOrnament(0, 0, 25, 0xF2A);
AddOrnament(0, 1, 7, 0xF16);
break;
}
break;
}
}
}
@ -98,7 +98,7 @@ namespace Server.Items
}
[CommandProperty(AccessLevel.GameMaster)]
public Mobile Placer{ get; set; }
public Mobile Placer { get; set; }
public override int LabelNumber => 1041117; // a tree for the holidays
@ -147,27 +147,27 @@ namespace Server.Items
switch (version)
{
case 1:
{
Placer = reader.ReadMobile();
goto case 0;
}
case 0:
{
int count = reader.ReadInt();
m_Components = new List<Item>(count);
for (int i = 0; i < count; ++i)
{
Item item = reader.ReadItem();
Placer = reader.ReadMobile();
if (item != null)
m_Components.Add(item);
goto case 0;
}
case 0:
{
int count = reader.ReadInt();
break;
}
m_Components = new List<Item>(count);
for (int i = 0; i < count; ++i)
{
Item item = reader.ReadItem();
if (item != null)
m_Components.Add(item);
}
break;
}
}
Timer.DelayCall(TimeSpan.Zero, ValidatePlacement);
@ -183,7 +183,6 @@ namespace Server.Items
}
}
public override void OnDoubleClick(Mobile from)
{
if (from.InRange(GetWorldLocation(), 1))
@ -279,14 +278,14 @@ namespace Server.Items
switch (version)
{
case 0:
{
m_Tree = reader.ReadItem() as HolidayTree;
{
m_Tree = reader.ReadItem() as HolidayTree;
if (m_Tree == null)
Delete();
if (m_Tree == null)
Delete();
break;
}
break;
}
}
}
}

2
Projects/Scripts/Items/Special/Holiday/GingerBreadHouseDeed.cs
View file

@ -44,7 +44,7 @@ namespace Server.Items
{
}
public override int LabelNumber => 1077394; //a Gingerbread House Deed
public override int LabelNumber => 1077394; // a Gingerbread House Deed
public override BaseAddon Addon => new GingerBreadHouseAddon();
public override void Serialize(IGenericWriter writer)

4
Projects/Scripts/Items/Special/Holiday/HolidayBell.cs
View file

@ -2,7 +2,7 @@
{
public class HolidayBell : Item
{
private static string[] m_StaffNames =
private static readonly string[] m_StaffNames =
{
"Adrick",
"Alai",
@ -28,7 +28,7 @@
"Vex"
};
private static int[] m_Hues =
private static readonly int[] m_Hues =
{
0xA, 0x24, 0x42, 0x56, 0x1A, 0x4C, 0x3C, 0x60, 0x2E, 0x55, 0x23, 0x38, 0x482, 0x6, 0x10
};

6
Projects/Scripts/Items/Special/Holiday/HolidayFoods.cs
View file

@ -22,7 +22,7 @@ namespace Server.Items
{
}
private static Dictionary<Mobile, CandyCaneTimer> m_ToothAches = new Dictionary<Mobile, CandyCaneTimer>();
private static readonly Dictionary<Mobile, CandyCaneTimer> m_ToothAches = new Dictionary<Mobile, CandyCaneTimer>();
private static CandyCaneTimer EnsureTimer(Mobile from)
{
@ -69,9 +69,9 @@ namespace Server.Items
Start();
}
public Mobile Eater{ get; }
public Mobile Eater { get; }
public int Eaten{ get; set; }
public int Eaten { get; set; }
protected override void OnTick()
{

2
Projects/Scripts/Items/Special/Holiday/HolidayPottedPlant.cs
View file

@ -83,7 +83,7 @@ namespace Server.Items
private class InternalGump : Gump
{
private PottedPlantDeed m_Deed;
private readonly PottedPlantDeed m_Deed;
public InternalGump(PottedPlantDeed deed) : base(100, 200)
{

12
Projects/Scripts/Items/Special/Holiday/IcyPatch.cs
View file

@ -23,7 +23,7 @@ namespace Server.Items
{
}
public override int LabelNumber => 1095159; //An Icy Patch
public override int LabelNumber => 1095159; // An Icy Patch
public override double DefaultWeight => 5.0;
public override bool OnMoveOver(Mobile m)
@ -33,13 +33,13 @@ namespace Server.Items
{
case 0:
RunSequence(m, 1095160, false);
break; //You steadily walk over the slippery surface.
break; // You steadily walk over the slippery surface.
case 1:
RunSequence(m, 1095161, true);
break; //You skillfully manage to maintain your balance.
break; // You skillfully manage to maintain your balance.
default:
RunSequence(m, 1095162, true);
break; //You lose your footing and ungracefully splatter on the ground.
break; // You lose your footing and ungracefully splatter on the ground.
}
return base.OnMoveOver(m);
}
@ -53,7 +53,7 @@ namespace Server.Items
}
m.SendLocalizedMessage(message);
int action = 0;
int sound = 0;
@ -84,7 +84,7 @@ namespace Server.Items
{
if (!m.Mounted)
m.Animate(action, 1, 1, false, true, 0);
m.PlaySound(sound);
}

24
Projects/Scripts/Items/Special/Holiday/SnowGlobes.cs
View file

@ -102,10 +102,10 @@ namespace Server.Items
switch (version)
{
case 0:
{
m_Type = (SnowGlobeTypeOne)reader.ReadEncodedInt();
break;
}
{
m_Type = (SnowGlobeTypeOne)reader.ReadEncodedInt();
break;
}
}
}
}
@ -216,10 +216,10 @@ namespace Server.Items
switch (version)
{
case 0:
{
m_Type = (SnowGlobeTypeTwo)reader.ReadEncodedInt();
break;
}
{
m_Type = (SnowGlobeTypeTwo)reader.ReadEncodedInt();
break;
}
}
}
}
@ -301,10 +301,10 @@ namespace Server.Items
switch (version)
{
case 0:
{
m_Type = (SnowGlobeTypeThree)reader.ReadEncodedInt();
break;
}
{
m_Type = (SnowGlobeTypeThree)reader.ReadEncodedInt();
break;
}
}
}
}

2
Projects/Scripts/Items/Special/Holiday/SnowStatue.cs
View file

@ -171,7 +171,7 @@ namespace Server.Items
private class InternalGump : Gump
{
private SnowStatueDeed m_Deed;
private readonly SnowStatueDeed m_Deed;
public InternalGump(SnowStatueDeed deed) : base(100, 200)
{

8
Projects/Scripts/Items/Special/Holiday/Snowman.cs
View file

@ -147,10 +147,10 @@ namespace Server.Items
switch (version)
{
case 1:
{
m_Title = reader.ReadString();
break;
}
{
m_Title = reader.ReadString();
break;
}
}
Utility.Intern(ref m_Title);

10
Projects/Scripts/Items/Special/Holiday/Wreath.cs
View file

@ -117,8 +117,8 @@ namespace Server.Items
private class WreathAddonGump : Gump
{
private WreathAddon m_Addon;
private Mobile m_From;
private readonly WreathAddon m_Addon;
private readonly Mobile m_From;
public WreathAddonGump(Mobile from, WreathAddon addon) : base(150, 50)
{
@ -276,9 +276,9 @@ namespace Server.Items
private class WreathDeedGump : Gump
{
private WreathDeed m_Deed;
private Mobile m_From;
private Point3D m_Loc;
private readonly WreathDeed m_Deed;
private readonly Mobile m_From;
private readonly Point3D m_Loc;
public WreathDeedGump(Mobile from, Point3D loc, WreathDeed deed) : base(150, 50)
{