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

14
Projects/Scripts/Items/Skill Items/Carpenter Items/Board.cs
View file

@ -49,7 +49,7 @@ namespace Server.Items
{
CraftResource.Bloodwood => 1075055,
CraftResource.Frostwood => 1075056,
CraftResource.Heartwood => 1075062, //WHY Osi. Why?
CraftResource.Heartwood => 1075062, // WHY Osi. Why?
_ => LabelNumber
};
}
@ -72,7 +72,6 @@ namespace Server.Items
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
@ -92,13 +91,13 @@ namespace Server.Items
{
case 3:
case 2:
{
m_Resource = (CraftResource)reader.ReadInt();
break;
}
{
m_Resource = (CraftResource)reader.ReadInt();
break;
}
}
if (version == 0 && Weight == 0.1 || version <= 2 && Weight == 2)
if ((version == 0 && Weight == 0.1) || (version <= 2 && Weight == 2))
Weight = -1;
if (version <= 1)
@ -106,7 +105,6 @@ namespace Server.Items
}
}
public class HeartwoodBoard : Board
{
[Constructible]

74
Projects/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs
View file

@ -8,7 +8,7 @@ namespace Server.Items
[Flippable(0x1EBA, 0x1EBB)]
public class TaxidermyKit : Item
{
private static TrophyInfo[] m_Table =
private static readonly TrophyInfo[] m_Table =
{
new TrophyInfo(typeof(BrownBear), 0x1E60, 1041093, 1041107),
new TrophyInfo(typeof(GreatHart), 0x1E61, 1041095, 1041109),
@ -69,19 +69,18 @@ namespace Server.Items
AddonNumber = addonNum;
}
public Type CreatureType{ get; }
public Type CreatureType { get; }
public int NorthID{ get; }
public int NorthID { get; }
public int DeedNumber{ get; }
public int DeedNumber { get; }
public int AddonNumber{ get; }
public int AddonNumber { get; }
}
private class CorpseTarget : Target
{
private TaxidermyKit m_Kit;
private readonly TaxidermyKit m_Kit;
public CorpseTarget(TaxidermyKit kit) : base(3, false, TargetFlags.None) => m_Kit = kit;
@ -136,7 +135,6 @@ namespace Server.Items
fish.Consume();
}
from.AddToBackpack(new TrophyDeed(t, hunter, weight));
if (corpse != null)
@ -186,13 +184,13 @@ namespace Server.Items
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
[CommandProperty(AccessLevel.GameMaster)]
public int WestID{ get; set; }
public int WestID { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int NorthID{ get; set; }
public int NorthID { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int DeedNumber{ get; set; }
public int DeedNumber { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int AddonNumber
@ -278,19 +276,19 @@ namespace Server.Items
switch (version)
{
case 1:
{
m_Hunter = reader.ReadMobile();
m_AnimalWeight = reader.ReadInt();
goto case 0;
}
{
m_Hunter = reader.ReadMobile();
m_AnimalWeight = reader.ReadInt();
goto case 0;
}
case 0:
{
WestID = reader.ReadInt();
NorthID = reader.ReadInt();
DeedNumber = reader.ReadInt();
m_AddonNumber = reader.ReadInt();
break;
}
{
WestID = reader.ReadInt();
NorthID = reader.ReadInt();
DeedNumber = reader.ReadInt();
m_AddonNumber = reader.ReadInt();
break;
}
}
Timer.DelayCall(TimeSpan.Zero, FixMovingCrate);
@ -367,10 +365,10 @@ namespace Server.Items
}
[CommandProperty(AccessLevel.GameMaster)]
public int WestID{ get; set; }
public int WestID { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int NorthID{ get; set; }
public int NorthID { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int DeedNumber
@ -384,7 +382,7 @@ namespace Server.Items
}
[CommandProperty(AccessLevel.GameMaster)]
public int AddonNumber{ get; set; }
public int AddonNumber { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public Mobile Hunter
@ -447,19 +445,19 @@ namespace Server.Items
switch (version)
{
case 1:
{
m_Hunter = reader.ReadMobile();
m_AnimalWeight = reader.ReadInt();
goto case 0;
}
{
m_Hunter = reader.ReadMobile();
m_AnimalWeight = reader.ReadInt();
goto case 0;
}
case 0:
{
WestID = reader.ReadInt();
NorthID = reader.ReadInt();
m_DeedNumber = reader.ReadInt();
AddonNumber = reader.ReadInt();
break;
}
{
WestID = reader.ReadInt();
NorthID = reader.ReadInt();
m_DeedNumber = reader.ReadInt();
AddonNumber = reader.ReadInt();
break;
}
}
}