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/Clothing/Artifacts/DivineCountenance.cs
View file

@ -45,13 +45,13 @@ namespace Server.Items
switch (version)
{
case 0:
{
Resistances.Physical = 0;
Resistances.Fire = 0;
Resistances.Cold = 0;
Resistances.Energy = 0;
break;
}
{
Resistances.Physical = 0;
Resistances.Fire = 0;
Resistances.Cold = 0;
Resistances.Energy = 0;
break;
}
}
}
}

10
Projects/Scripts/Items/Clothing/Artifacts/HatOfTheMagi.cs
View file

@ -42,11 +42,11 @@ namespace Server.Items
switch (version)
{
case 0:
{
Resistances.Poison = 0;
Resistances.Energy = 0;
break;
}
{
Resistances.Poison = 0;
Resistances.Energy = 0;
break;
}
}
}
}

8
Projects/Scripts/Items/Clothing/Artifacts/HuntersHeaddress.cs
View file

@ -42,10 +42,10 @@ namespace Server.Items
switch (version)
{
case 0:
{
Resistances.Cold = 0;
break;
}
{
Resistances.Cold = 0;
break;
}
}
}
}

8
Projects/Scripts/Items/Clothing/Artifacts/SpiritOfTheTotem.cs
View file

@ -41,10 +41,10 @@ namespace Server.Items
switch (version)
{
case 0:
{
Resistances.Physical = 0;
break;
}
{
Resistances.Physical = 0;
break;
}
}
}
}

172
Projects/Scripts/Items/Clothing/BaseClothing.cs
View file

@ -17,9 +17,9 @@ namespace Server.Items
public interface IArcaneEquip
{
bool IsArcane{ get; }
int CurArcaneCharges{ get; set; }
int MaxArcaneCharges{ get; set; }
bool IsArcane { get; }
int CurArcaneCharges { get; set; }
int MaxArcaneCharges { get; set; }
}
public abstract class BaseClothing : Item, IDyable, IScissorable, IFactionItem, ICraftable, IWearableDurability
@ -86,7 +86,7 @@ namespace Server.Items
}
[CommandProperty(AccessLevel.GameMaster)]
public bool PlayerConstructed{ get; set; }
public bool PlayerConstructed { get; set; }
public virtual CraftResource DefaultResource => CraftResource.None;
@ -103,16 +103,16 @@ namespace Server.Items
}
[CommandProperty(AccessLevel.GameMaster)]
public AosAttributes Attributes{ get; private set; }
public AosAttributes Attributes { get; private set; }
[CommandProperty(AccessLevel.GameMaster)]
public AosArmorAttributes ClothingAttributes{ get; private set; }
public AosArmorAttributes ClothingAttributes { get; private set; }
[CommandProperty(AccessLevel.GameMaster)]
public AosSkillBonuses SkillBonuses{ get; private set; }
public AosSkillBonuses SkillBonuses { get; private set; }
[CommandProperty(AccessLevel.GameMaster)]
public AosElementAttributes Resistances{ get; private set; }
public AosElementAttributes Resistances { get; private set; }
public virtual int BasePhysicalResistance => 0;
public virtual int BaseFireResistance => 0;
@ -141,8 +141,6 @@ namespace Server.Items
public virtual bool AllowFemaleWearer => true;
public virtual bool CanBeBlessed => true;
#region ICraftable Members
public virtual int OnCraft(int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes,
BaseTool tool, CraftItem craftItem, int resHue)
{
@ -172,8 +170,6 @@ namespace Server.Items
return quality;
}
#endregion
public virtual bool Dye(Mobile from, DyeTub sender)
{
if (Deleted)
@ -273,7 +269,7 @@ namespace Server.Items
if (damageTaken < 0)
damageTaken = 0;
if (25 > Utility.Random(100)) // 25% chance to lower durability
if (Utility.Random(100) < 25) // 25% chance to lower durability
{
if (Core.AOS && ClothingAttributes.SelfRepair > Utility.Random(10))
{
@ -404,7 +400,7 @@ namespace Server.Items
{
int v;
//if ( type == StatType.Str )
// if (type == StatType.Str)
v = StrRequirement;
return AOS.Scale(v, 100 - GetLowerStatReq());
@ -600,13 +596,9 @@ namespace Server.Items
if (m_Crafter != null)
list.Add(1050043, m_Crafter.Name); // crafted by ~1_NAME~
#region Factions
if (m_FactionState != null)
list.Add(1041350); // faction item
#endregion
if (m_Quality == ClothingQuality.Exceptional)
list.Add(1060636); // exceptional
@ -701,7 +693,7 @@ namespace Server.Items
if (Core.ML && (prop = Attributes.IncreasedKarmaLoss) != 0)
list.Add(1075210, prop.ToString()); // Increased Karma Loss ~1val~%
base.AddResistanceProperties(list);
this.AddResistanceProperties(list);
if ((prop = ClothingAttributes.DurabilityBonus) > 0)
list.Add(1060410, prop.ToString()); // durability ~1_val~%
@ -749,13 +741,9 @@ namespace Server.Items
attrs.Add(new EquipInfoAttribute(1049643)); // cursed
}
#region Factions
if (m_FactionState != null)
attrs.Add(new EquipInfoAttribute(1041350)); // faction item
#endregion
if (m_Quality == ClothingQuality.Exceptional)
attrs.Add(new EquipInfoAttribute(1018305 - (int)m_Quality));
}
@ -785,8 +773,6 @@ namespace Server.Items
InvalidateProperties();
}
#region Factions
private FactionItem m_FactionState;
public FactionItem FactionItemState
@ -803,10 +789,6 @@ namespace Server.Items
}
}
#endregion
#region Serialization
private static void SetSaveFlag(ref SaveFlag flags, SaveFlag toSet, bool setIf)
{
if (setIf)
@ -894,90 +876,90 @@ namespace Server.Items
switch (version)
{
case 5:
{
SaveFlag flags = (SaveFlag)reader.ReadEncodedInt();
{
SaveFlag flags = (SaveFlag)reader.ReadEncodedInt();
if (GetSaveFlag(flags, SaveFlag.Resource))
m_Resource = (CraftResource)reader.ReadEncodedInt();
else
m_Resource = DefaultResource;
if (GetSaveFlag(flags, SaveFlag.Resource))
m_Resource = (CraftResource)reader.ReadEncodedInt();
else
m_Resource = DefaultResource;
if (GetSaveFlag(flags, SaveFlag.Attributes))
Attributes = new AosAttributes(this, reader);
else
Attributes = new AosAttributes(this);
if (GetSaveFlag(flags, SaveFlag.Attributes))
Attributes = new AosAttributes(this, reader);
else
Attributes = new AosAttributes(this);
if (GetSaveFlag(flags, SaveFlag.ClothingAttributes))
ClothingAttributes = new AosArmorAttributes(this, reader);
else
ClothingAttributes = new AosArmorAttributes(this);
if (GetSaveFlag(flags, SaveFlag.ClothingAttributes))
ClothingAttributes = new AosArmorAttributes(this, reader);
else
ClothingAttributes = new AosArmorAttributes(this);
if (GetSaveFlag(flags, SaveFlag.SkillBonuses))
SkillBonuses = new AosSkillBonuses(this, reader);
else
SkillBonuses = new AosSkillBonuses(this);
if (GetSaveFlag(flags, SaveFlag.SkillBonuses))
SkillBonuses = new AosSkillBonuses(this, reader);
else
SkillBonuses = new AosSkillBonuses(this);
if (GetSaveFlag(flags, SaveFlag.Resistances))
Resistances = new AosElementAttributes(this, reader);
else
Resistances = new AosElementAttributes(this);
if (GetSaveFlag(flags, SaveFlag.Resistances))
Resistances = new AosElementAttributes(this, reader);
else
Resistances = new AosElementAttributes(this);
if (GetSaveFlag(flags, SaveFlag.MaxHitPoints))
m_MaxHitPoints = reader.ReadEncodedInt();
if (GetSaveFlag(flags, SaveFlag.MaxHitPoints))
m_MaxHitPoints = reader.ReadEncodedInt();
if (GetSaveFlag(flags, SaveFlag.HitPoints))
m_HitPoints = reader.ReadEncodedInt();
if (GetSaveFlag(flags, SaveFlag.HitPoints))
m_HitPoints = reader.ReadEncodedInt();
if (GetSaveFlag(flags, SaveFlag.Crafter))
m_Crafter = reader.ReadMobile();
if (GetSaveFlag(flags, SaveFlag.Crafter))
m_Crafter = reader.ReadMobile();
if (GetSaveFlag(flags, SaveFlag.Quality))
m_Quality = (ClothingQuality)reader.ReadEncodedInt();
else
m_Quality = ClothingQuality.Regular;
if (GetSaveFlag(flags, SaveFlag.Quality))
m_Quality = (ClothingQuality)reader.ReadEncodedInt();
else
m_Quality = ClothingQuality.Regular;
if (GetSaveFlag(flags, SaveFlag.StrReq))
m_StrReq = reader.ReadEncodedInt();
else
m_StrReq = -1;
if (GetSaveFlag(flags, SaveFlag.StrReq))
m_StrReq = reader.ReadEncodedInt();
else
m_StrReq = -1;
if (GetSaveFlag(flags, SaveFlag.PlayerConstructed))
PlayerConstructed = true;
if (GetSaveFlag(flags, SaveFlag.PlayerConstructed))
PlayerConstructed = true;
break;
}
break;
}
case 4:
{
m_Resource = (CraftResource)reader.ReadInt();
{
m_Resource = (CraftResource)reader.ReadInt();
goto case 3;
}
goto case 3;
}
case 3:
{
Attributes = new AosAttributes(this, reader);
ClothingAttributes = new AosArmorAttributes(this, reader);
SkillBonuses = new AosSkillBonuses(this, reader);
Resistances = new AosElementAttributes(this, reader);
{
Attributes = new AosAttributes(this, reader);
ClothingAttributes = new AosArmorAttributes(this, reader);
SkillBonuses = new AosSkillBonuses(this, reader);
Resistances = new AosElementAttributes(this, reader);
goto case 2;
}
goto case 2;
}
case 2:
{
PlayerConstructed = reader.ReadBool();
goto case 1;
}
{
PlayerConstructed = reader.ReadBool();
goto case 1;
}
case 1:
{
m_Crafter = reader.ReadMobile();
m_Quality = (ClothingQuality)reader.ReadInt();
break;
}
{
m_Crafter = reader.ReadMobile();
m_Quality = (ClothingQuality)reader.ReadInt();
break;
}
case 0:
{
m_Crafter = null;
m_Quality = ClothingQuality.Regular;
break;
}
{
m_Crafter = null;
m_Quality = ClothingQuality.Regular;
break;
}
}
if (version < 2)
@ -1006,7 +988,5 @@ namespace Server.Items
parent.CheckStatTimers();
}
}
#endregion
}
}

34
Projects/Scripts/Items/Clothing/Cloaks.cs
View file

@ -64,26 +64,24 @@ namespace Server.Items
switch (version)
{
case 1:
{
if (reader.ReadBool())
{
m_CurArcaneCharges = reader.ReadInt();
m_MaxArcaneCharges = reader.ReadInt();
if (reader.ReadBool())
{
m_CurArcaneCharges = reader.ReadInt();
m_MaxArcaneCharges = reader.ReadInt();
if (Hue == 2118)
Hue = ArcaneGem.DefaultArcaneHue;
if (Hue == 2118)
Hue = ArcaneGem.DefaultArcaneHue;
}
break;
}
break;
}
}
if (Weight == 4.0)
Weight = 5.0;
}
#region Arcane Impl
private int m_MaxArcaneCharges, m_CurArcaneCharges;
[CommandProperty(AccessLevel.GameMaster)]
@ -147,8 +145,6 @@ namespace Server.Items
else if (ItemID == 0x1530)
ItemID = 0x1515;
}
#endregion
}
[Flippable]
@ -194,7 +190,7 @@ namespace Server.Items
public override int BasePhysicalResistance => 3;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem{ get; set; }
public bool IsRewardItem { get; set; }
public override void OnAdded(IEntity parent)
{
@ -254,11 +250,11 @@ namespace Server.Items
switch (version)
{
case 0:
{
m_LabelNumber = reader.ReadInt();
IsRewardItem = reader.ReadBool();
break;
}
{
m_LabelNumber = reader.ReadInt();
IsRewardItem = reader.ReadBool();
break;
}
}
if (Parent is Mobile mobile)

18
Projects/Scripts/Items/Clothing/Hats.cs
View file

@ -17,7 +17,7 @@ namespace Server.Items
}
[CommandProperty(AccessLevel.GameMaster)]
public bool IsShipwreckedItem{ get; set; }
public bool IsShipwreckedItem { get; set; }
public override void Serialize(IGenericWriter writer)
{
@ -37,10 +37,10 @@ namespace Server.Items
switch (version)
{
case 1:
{
IsShipwreckedItem = reader.ReadBool();
break;
}
{
IsShipwreckedItem = reader.ReadBool();
break;
}
}
}
@ -67,7 +67,7 @@ namespace Server.Items
if (Quality == ClothingQuality.Exceptional)
DistributeBonuses(tool is BaseRunicTool ? 6 :
Core.SE ? 15 : 14); //BLAME OSI. (We can't confirm it's an OSI bug yet.)
Core.SE ? 15 : 14); // BLAME OSI. (We can't confirm it's an OSI bug yet.)
return base.OnCraft(quality, makersMark, from, craftSystem, typeRes, tool, craftItem, resHue);
}
@ -623,7 +623,7 @@ namespace Server.Items
int version = reader.ReadInt();
/*if ( Hue != 0x8A4 )
/*if (Hue != 0x8A4)
Hue = 0x8A4;*/
}
}
@ -631,7 +631,7 @@ namespace Server.Items
public class SavageMask : BaseHat
{
[Constructible]
public SavageMask() : this(GetRandomHue()) {}
public SavageMask() : this(GetRandomHue()) { }
[Constructible]
public SavageMask(int hue) : base(0x154B, hue) => Weight = 2.0;
@ -678,7 +678,7 @@ namespace Server.Items
int version = reader.ReadInt();
/*if ( Hue != 0 && (Hue < 2101 || Hue > 2130) )
/*if (Hue != 0 && (Hue < 2101 || Hue > 2130))
Hue = GetRandomHue();*/
}
}

74
Projects/Scripts/Items/Clothing/OuterTorso.cs
View file

@ -80,7 +80,7 @@ namespace Server.Items
public class DeathRobe : Robe
{
private static TimeSpan m_DefaultDecayTime = TimeSpan.FromMinutes(1.0);
private static readonly TimeSpan m_DefaultDecayTime = TimeSpan.FromMinutes(1.0);
private DateTime m_DecayTime;
private Timer m_DecayTimer;
@ -165,22 +165,22 @@ namespace Server.Items
switch (version)
{
case 2:
{
if (reader.ReadBool())
{
m_DecayTime = reader.ReadDeltaTime();
BeginDecay(m_DecayTime - DateTime.UtcNow);
}
if (reader.ReadBool())
{
m_DecayTime = reader.ReadDeltaTime();
BeginDecay(m_DecayTime - DateTime.UtcNow);
}
break;
}
break;
}
case 1:
case 0:
{
if (Parent == null)
BeginDecay(m_DefaultDecayTime);
break;
}
{
if (Parent == null)
BeginDecay(m_DefaultDecayTime);
break;
}
}
if (version < 1 && Hue == 0)
@ -189,7 +189,7 @@ namespace Server.Items
private class InternalTimer : Timer
{
private DeathRobe m_Robe;
private readonly DeathRobe m_Robe;
public InternalTimer(DeathRobe c, TimeSpan delay) : base(delay)
{
@ -250,7 +250,7 @@ namespace Server.Items
public override int BasePhysicalResistance => 3;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem{ get; set; }
public bool IsRewardItem { get; set; }
public override void OnAdded(IEntity parent)
{
@ -310,11 +310,11 @@ namespace Server.Items
switch (version)
{
case 0:
{
m_LabelNumber = reader.ReadInt();
IsRewardItem = reader.ReadBool();
break;
}
{
m_LabelNumber = reader.ReadInt();
IsRewardItem = reader.ReadBool();
break;
}
}
if (Parent is Mobile mobile)
@ -365,7 +365,7 @@ namespace Server.Items
public override int BasePhysicalResistance => 3;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem{ get; set; }
public bool IsRewardItem { get; set; }
public override void OnAdded(IEntity parent)
{
@ -425,11 +425,11 @@ namespace Server.Items
switch (version)
{
case 0:
{
m_LabelNumber = reader.ReadInt();
IsRewardItem = reader.ReadBool();
break;
}
{
m_LabelNumber = reader.ReadInt();
IsRewardItem = reader.ReadBool();
break;
}
}
if (Parent is Mobile mobile)
@ -474,23 +474,21 @@ namespace Server.Items
switch (version)
{
case 1:
{
if (reader.ReadBool())
{
m_CurArcaneCharges = reader.ReadInt();
m_MaxArcaneCharges = reader.ReadInt();
if (reader.ReadBool())
{
m_CurArcaneCharges = reader.ReadInt();
m_MaxArcaneCharges = reader.ReadInt();
if (Hue == 2118)
Hue = ArcaneGem.DefaultArcaneHue;
if (Hue == 2118)
Hue = ArcaneGem.DefaultArcaneHue;
}
break;
}
break;
}
}
}
#region Arcane Impl
private int m_MaxArcaneCharges, m_CurArcaneCharges;
[CommandProperty(AccessLevel.GameMaster)]
@ -554,8 +552,6 @@ namespace Server.Items
else if (ItemID == 0x1F04)
ItemID = 0x1F03;
}
#endregion
}
public class MonkRobe : BaseOuterTorso

38
Projects/Scripts/Items/Clothing/Shoes.cs
View file

@ -36,15 +36,15 @@ namespace Server.Items
{
case 2: break; // empty, resource removed
case 1:
{
m_Resource = (CraftResource)reader.ReadInt();
break;
}
{
m_Resource = (CraftResource)reader.ReadInt();
break;
}
case 0:
{
m_Resource = DefaultResource;
break;
}
{
m_Resource = DefaultResource;
break;
}
}
}
}
@ -140,23 +140,21 @@ namespace Server.Items
switch (version)
{
case 1:
{
if (reader.ReadBool())
{
m_CurArcaneCharges = reader.ReadInt();
m_MaxArcaneCharges = reader.ReadInt();
if (reader.ReadBool())
{
m_CurArcaneCharges = reader.ReadInt();
m_MaxArcaneCharges = reader.ReadInt();
if (Hue == 2118)
Hue = ArcaneGem.DefaultArcaneHue;
if (Hue == 2118)
Hue = ArcaneGem.DefaultArcaneHue;
}
break;
}
break;
}
}
}
#region Arcane Impl
private int m_MaxArcaneCharges, m_CurArcaneCharges;
[CommandProperty(AccessLevel.GameMaster)]
@ -220,8 +218,6 @@ namespace Server.Items
else if (ItemID == 0x1712)
ItemID = 0x1711;
}
#endregion
}
[Flippable(0x170f, 0x1710)]