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

12
Projects/Server/Items/BaseMulti.cs
View file

@ -38,7 +38,7 @@ namespace Server.Items
{
if (base.ItemID != value)
{
Map facet = Parent == null ? Map : null;
var facet = Parent == null ? Map : null;
facet?.OnLeave(this);
@ -53,11 +53,11 @@ namespace Server.Items
{
get
{
MultiComponentList mcl = Components;
var mcl = Components;
if (mcl.List.Length > 0)
{
int id = mcl.List[0].m_ItemID;
int id = mcl.List[0].ItemId;
if (id < 0x4000)
return 1020000 + id;
@ -77,7 +77,7 @@ namespace Server.Items
{
if (Parent == null)
{
Map facet = Map;
var facet = Map;
if (facet != null)
{
@ -99,7 +99,7 @@ namespace Server.Items
public virtual bool Contains(int x, int y)
{
MultiComponentList mcl = Components;
var mcl = Components;
x -= X + mcl.Min.m_X;
y -= Y + mcl.Min.m_Y;
@ -126,7 +126,7 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = reader.ReadInt();
var version = reader.ReadInt();
if (version == 0)
if (ItemID >= 0x4000)

612
Projects/Server/Items/Container.cs
View file

File diff suppressed because it is too large Load diff

30
Projects/Server/Items/Containers.cs
View file

@ -40,11 +40,11 @@ namespace Server.Items
public override bool IsVirtualItem => true;
public Mobile Owner{ get; private set; }
public Mobile Owner { get; private set; }
public bool Opened{ get; private set; }
public bool Opened { get; private set; }
public static bool SendDeleteOnClose{ get; set; }
public static bool SendDeleteOnClose { get; set; }
public void Open()
{
@ -73,20 +73,20 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = reader.ReadInt();
var version = reader.ReadInt();
switch (version)
{
case 0:
{
Owner = reader.ReadMobile();
Opened = reader.ReadBool();
{
Owner = reader.ReadMobile();
Opened = reader.ReadBool();
if (Owner == null)
Delete();
if (Owner == null)
Delete();
break;
}
break;
}
}
if (ItemID == 0xE41)
@ -111,12 +111,14 @@ namespace Server.Items
public override DeathMoveResult OnParentDeath(Mobile parent) => DeathMoveResult.RemainEquipped;
public override bool IsAccessibleTo(Mobile check) => (check == Owner && Opened || check.AccessLevel >= AccessLevel.GameMaster) && base.IsAccessibleTo(check);
public override bool IsAccessibleTo(Mobile check) =>
((check == Owner && Opened) || check.AccessLevel >= AccessLevel.GameMaster) && base.IsAccessibleTo(check);
public override bool OnDragDrop(Mobile from, Item dropped) => (from == Owner && Opened || from.AccessLevel >= AccessLevel.GameMaster) && base.OnDragDrop(from, dropped);
public override bool OnDragDrop(Mobile from, Item dropped) =>
((from == Owner && Opened) || from.AccessLevel >= AccessLevel.GameMaster) && base.OnDragDrop(from, dropped);
public override bool OnDragDropInto(Mobile from, Item item, Point3D p) =>
(from == Owner && Opened || from.AccessLevel >= AccessLevel.GameMaster) &&
((from == Owner && Opened) || from.AccessLevel >= AccessLevel.GameMaster) &&
base.OnDragDropInto(from, item, p);
public override int GetTotal(TotalType type)

9
Projects/Server/Items/SecureTradeContainer.cs
View file

@ -36,13 +36,13 @@ namespace Server.Items
{
}
public SecureTrade Trade{ get; }
public SecureTrade Trade { get; }
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight)
{
if (item == Trade.From.VirtualCheck || item == Trade.To.VirtualCheck) return true;
Mobile to = Trade.From.Container != this ? Trade.From.Mobile : Trade.To.Mobile;
var to = Trade.From.Container != this ? Trade.From.Mobile : Trade.To.Mobile;
return m.CheckTrade(to, item, this, message, checkItems, plusItems, plusWeight);
}
@ -53,7 +53,8 @@ namespace Server.Items
return false;
}
public override bool IsAccessibleTo(Mobile check) => IsChildOf(check) && Trade?.Valid == true && base.IsAccessibleTo(check);
public override bool IsAccessibleTo(Mobile check) =>
IsChildOf(check) && Trade?.Valid == true && base.IsAccessibleTo(check);
public override void OnItemAdded(Item item)
{
@ -109,7 +110,7 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = reader.ReadInt();
var version = reader.ReadInt();
}
}
}

114
Projects/Server/Items/VirtualCheck.cs
View file

@ -1,16 +1,16 @@
using Server.Gumps;
using Server.Items;
using Server.Network;
namespace Server
namespace Server.Items
{
public sealed class VirtualCheck : Item
{
// TODO: Move to configuration
public static bool UseEditGump = false;
private int _Gold;
private int m_Gold;
private int _Plat;
private int m_Plat;
public VirtualCheck(int plat = 0, int gold = 0)
: base(0x14F0)
@ -35,15 +35,15 @@ namespace Server
public override string DefaultName => "Offer Of Currency";
public EditGump Editor{ get; private set; }
public EditGump Editor { get; private set; }
[CommandProperty(AccessLevel.Administrator)]
public int Plat
{
get => _Plat;
get => m_Plat;
set
{
_Plat = value;
m_Plat = value;
InvalidateProperties();
}
}
@ -51,17 +51,17 @@ namespace Server
[CommandProperty(AccessLevel.Administrator)]
public int Gold
{
get => _Gold;
get => m_Gold;
set
{
_Gold = value;
m_Gold = value;
InvalidateProperties();
}
}
public override bool IsAccessibleTo(Mobile check)
{
SecureTradeContainer c = GetSecureTradeCont();
var c = GetSecureTradeCont();
if (check == null || c == null) return base.IsAccessibleTo(check);
@ -108,7 +108,7 @@ namespace Server
public void UpdateTrade(Mobile user)
{
SecureTradeContainer c = GetSecureTradeCont();
var c = GetSecureTradeCont();
if (c?.Trade == null) return;
@ -150,7 +150,7 @@ namespace Server
AllGold
}
private int _Plat, _Gold;
private int m_Plat, m_Gold;
public EditGump(Mobile user, VirtualCheck check)
: base(50, 50)
@ -158,8 +158,8 @@ namespace Server
User = user;
Check = check;
_Plat = Check.Plat;
_Gold = Check.Gold;
m_Plat = Check.Plat;
m_Gold = Check.Gold;
Closable = true;
Disposable = true;
@ -171,8 +171,8 @@ namespace Server
CompileLayout();
}
public Mobile User{ get; }
public VirtualCheck Check{ get; private set; }
public Mobile User { get; }
public VirtualCheck Check { get; private set; }
public override void OnServerClose(NetState owner)
{
@ -232,7 +232,7 @@ namespace Server
AddImage(10, 8, 113);
AddImage(360, 8, 113);
string title =
var title =
$"<BASEFONT COLOR=#FF2F4F4F><CENTER>BANK OF {User.RawName.ToUpper()}</CENTER>";
AddHtml(40, 15, 320, 20, title);
@ -247,7 +247,7 @@ namespace Server
AddBackground(210, 60, 175, 20, 9300);
AddBackground(215, 45, 165, 30, 9350);
AddTextEntry(225, 50, 145, 20, 0, 0, _Plat.ToString(), User.Account.TotalPlat.ToString().Length);
AddTextEntry(225, 50, 145, 20, 0, 0, m_Plat.ToString(), User.Account.TotalPlat.ToString().Length);
// Gold Row
AddBackground(15, 100, 175, 20, 9300);
@ -259,7 +259,7 @@ namespace Server
AddBackground(210, 100, 175, 20, 9300);
AddBackground(215, 85, 165, 30, 9350);
AddTextEntry(225, 90, 145, 20, 0, 1, _Gold.ToString(), User.Account.TotalGold.ToString().Length);
AddTextEntry(225, 90, 145, 20, 0, 1, m_Gold.ToString(), User.Account.TotalGold.ToString().Length);
// Buttons
AddButton(20, 128, 12006, 12007, (int)Buttons.Close);
@ -282,58 +282,58 @@ namespace Server
case Buttons.Close:
break;
case Buttons.Clear:
{
_Plat = _Gold = 0;
refresh = true;
}
{
m_Plat = m_Gold = 0;
refresh = true;
}
break;
case Buttons.Accept:
{
string platText = info.GetTextEntry(0).Text;
string goldText = info.GetTextEntry(1).Text;
{
var platText = info.GetTextEntry(0).Text;
var goldText = info.GetTextEntry(1).Text;
if (!int.TryParse(platText, out _Plat))
{
User.SendMessage("That is not a valid amount of platinum.");
refresh = true;
}
else if (!int.TryParse(goldText, out _Gold))
{
User.SendMessage("That is not a valid amount of gold.");
refresh = true;
}
else
{
int totalPlat = User.Account.TotalPlat;
int totalGold = User.Account.TotalGold;
if (totalPlat < _Plat || totalGold < _Gold)
if (!int.TryParse(platText, out m_Plat))
{
_Plat = User.Account.TotalPlat;
_Gold = User.Account.TotalGold;
User.SendMessage("You do not have that much currency.");
User.SendMessage("That is not a valid amount of platinum.");
refresh = true;
}
else if (!int.TryParse(goldText, out m_Gold))
{
User.SendMessage("That is not a valid amount of gold.");
refresh = true;
}
else
{
Check.Plat = _Plat;
Check.Gold = _Gold;
updated = true;
var totalPlat = User.Account.TotalPlat;
var totalGold = User.Account.TotalGold;
if (totalPlat < m_Plat || totalGold < m_Gold)
{
m_Plat = User.Account.TotalPlat;
m_Gold = User.Account.TotalGold;
User.SendMessage("You do not have that much currency.");
refresh = true;
}
else
{
Check.Plat = m_Plat;
Check.Gold = m_Gold;
updated = true;
}
}
}
}
break;
case Buttons.AllPlat:
{
_Plat = User.Account.TotalPlat;
refresh = true;
}
{
m_Plat = User.Account.TotalPlat;
refresh = true;
}
break;
case Buttons.AllGold:
{
_Gold = User.Account.TotalGold;
refresh = true;
}
{
m_Gold = User.Account.TotalGold;
refresh = true;
}
break;
}

50
Projects/Server/Items/VirtualHair.cs
View file

@ -32,28 +32,28 @@ namespace Server
protected BaseHairInfo(IGenericReader reader)
{
int version = reader.ReadInt();
var version = reader.ReadInt();
switch (version)
{
case 0:
{
ItemID = reader.ReadInt();
Hue = reader.ReadInt();
break;
}
{
ItemID = reader.ReadInt();
Hue = reader.ReadInt();
break;
}
}
}
[CommandProperty(AccessLevel.GameMaster)]
public int ItemID{ get; set; }
public int ItemID { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int Hue{ get; set; }
public int Hue { get; set; }
public virtual void Serialize(IGenericWriter writer)
{
writer.Write(0); //version
writer.Write(0); // version
writer.Write(ItemID);
writer.Write(Hue);
}
@ -106,14 +106,14 @@ namespace Server
public HairEquipUpdate(Mobile parent)
: base(0x2E, 15)
{
int hue = parent.SolidHueOverride >= 0 ? parent.SolidHueOverride : parent.HairHue;
var hue = parent.SolidHueOverride >= 0 ? parent.SolidHueOverride : parent.HairHue;
m_Stream.Write(HairInfo.FakeSerial(parent));
m_Stream.Write((short)parent.HairItemID);
m_Stream.Write((byte)0);
m_Stream.Write((byte)Layer.Hair);
m_Stream.Write(parent.Serial);
m_Stream.Write((short)hue);
Stream.Write(HairInfo.FakeSerial(parent));
Stream.Write((short)parent.HairItemID);
Stream.Write((byte)0);
Stream.Write((byte)Layer.Hair);
Stream.Write(parent.Serial);
Stream.Write((short)hue);
}
}
@ -122,14 +122,14 @@ namespace Server
public FacialHairEquipUpdate(Mobile parent)
: base(0x2E, 15)
{
int hue = parent.SolidHueOverride >= 0 ? parent.SolidHueOverride : parent.FacialHairHue;
var hue = parent.SolidHueOverride >= 0 ? parent.SolidHueOverride : parent.FacialHairHue;
m_Stream.Write(FacialHairInfo.FakeSerial(parent));
m_Stream.Write((short)parent.FacialHairItemID);
m_Stream.Write((byte)0);
m_Stream.Write((byte)Layer.FacialHair);
m_Stream.Write(parent.Serial);
m_Stream.Write((short)hue);
Stream.Write(FacialHairInfo.FakeSerial(parent));
Stream.Write((short)parent.FacialHairItemID);
Stream.Write((byte)0);
Stream.Write((byte)Layer.FacialHair);
Stream.Write(parent.Serial);
Stream.Write((short)hue);
}
}
@ -138,7 +138,7 @@ namespace Server
public RemoveHair(Mobile parent)
: base(0x1D, 5)
{
m_Stream.Write(HairInfo.FakeSerial(parent));
Stream.Write(HairInfo.FakeSerial(parent));
}
}
@ -147,7 +147,7 @@ namespace Server
public RemoveFacialHair(Mobile parent)
: base(0x1D, 5)
{
m_Stream.Write(FacialHairInfo.FakeSerial(parent));
Stream.Write(FacialHairInfo.FakeSerial(parent));
}
}
}