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

28
Projects/Scripts/Items/Skill Items/Fishing/Misc/MessageInABottle.cs
View file

@ -27,7 +27,7 @@ namespace Server.Items
public override int LabelNumber => 1041080; // a message in a bottle
[CommandProperty(AccessLevel.GameMaster)]
public Map TargetMap{ get; set; }
public Map TargetMap { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int Level
@ -38,7 +38,7 @@ namespace Server.Items
public static int GetRandomLevel()
{
if (Core.AOS && 1 > Utility.Random(25))
if (Core.AOS && Utility.Random(25) < 1)
return 4; // ancient
return Utility.RandomMinMax(1, 3);
@ -65,20 +65,20 @@ namespace Server.Items
{
case 3:
case 2:
{
m_Level = reader.ReadInt();
goto case 1;
}
{
m_Level = reader.ReadInt();
goto case 1;
}
case 1:
{
TargetMap = reader.ReadMap();
break;
}
{
TargetMap = reader.ReadMap();
break;
}
case 0:
{
TargetMap = Map.Trammel;
break;
}
{
TargetMap = Map.Trammel;
break;
}
}
if (version < 2)

71
Projects/Scripts/Items/Skill Items/Fishing/Misc/SOS.cs
View file

@ -35,13 +35,13 @@ namespace Server.Items
}
[CommandProperty(AccessLevel.GameMaster)]
public Map TargetMap{ get; set; }
public Map TargetMap { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public Point3D TargetLocation{ get; set; }
public Point3D TargetLocation { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int MessageIndex{ get; set; }
public int MessageIndex { get; set; }
public void UpdateHue()
{
@ -97,30 +97,30 @@ namespace Server.Items
case 4:
case 3:
case 2:
{
m_Level = reader.ReadInt();
goto case 1;
}
{
m_Level = reader.ReadInt();
goto case 1;
}
case 1:
{
TargetMap = reader.ReadMap();
TargetLocation = reader.ReadPoint3D();
MessageIndex = reader.ReadInt();
{
TargetMap = reader.ReadMap();
TargetLocation = reader.ReadPoint3D();
MessageIndex = reader.ReadInt();
break;
}
break;
}
case 0:
{
TargetMap = Map;
{
TargetMap = Map;
if (TargetMap == null || TargetMap == Map.Internal)
TargetMap = Map.Trammel;
if (TargetMap == null || TargetMap == Map.Internal)
TargetMap = Map.Trammel;
TargetLocation = FindLocation(TargetMap);
MessageIndex = Utility.Random(MessageEntry.Entries.Length);
TargetLocation = FindLocation(TargetMap);
MessageIndex = Utility.Random(MessageEntry.Entries.Length);
break;
}
break;
}
}
if (version < 2)
@ -144,7 +144,7 @@ namespace Server.Items
else
entry = MessageEntry.Entries[MessageIndex = Utility.Random(MessageEntry.Entries.Length)];
//from.CloseGump( typeof( MessageGump ) );
// from.CloseGump( typeof( MessageGump ) );
from.SendGump(new MessageGump(entry, TargetMap, TargetLocation));
}
else
@ -153,18 +153,18 @@ namespace Server.Items
}
}
private static int[] m_WaterTiles =
private static readonly int[] m_WaterTiles =
{
0x00A8, 0x00AB,
0x0136, 0x0137
};
private static Rectangle2D[] m_BritRegions = { new Rectangle2D(0, 0, 5120, 4096) };
private static readonly Rectangle2D[] m_BritRegions = { new Rectangle2D(0, 0, 5120, 4096) };
private static Rectangle2D[] m_IlshRegions =
private static readonly Rectangle2D[] m_IlshRegions =
{ new Rectangle2D(1472, 272, 304, 240), new Rectangle2D(1240, 1000, 312, 160) };
private static Rectangle2D[] m_MalasRegions = { new Rectangle2D(1376, 1520, 464, 280) };
private static readonly Rectangle2D[] m_MalasRegions = { new Rectangle2D(1376, 1520, 464, 280) };
public static Point3D FindLocation(Map map)
{
@ -242,12 +242,13 @@ namespace Server.Items
AddBackground(0, 40, 350, 300, 2520);
/* This is a message hastily scribbled by a passenger aboard a sinking ship.
* While it is probably too late to save the passengers and crew,
* perhaps some treasure went down with the ship!
* The message gives the ship's last known sextant co-ordinates.
*/
AddHtmlLocalized(30, 80, 285, 160, 1018326, true,
true); /* This is a message hastily scribbled by a passenger aboard a sinking ship.
* While it is probably too late to save the passengers and crew,
* perhaps some treasure went down with the ship!
* The message gives the ship's last known sextant co-ordinates.
*/
true);
AddHtml(35, 240, 230, 20, fmt);
@ -265,13 +266,13 @@ namespace Server.Items
Message = message;
}
public int Width{ get; }
public int Width { get; }
public int Height{ get; }
public int Height { get; }
public string Message{ get; }
public string Message { get; }
public static MessageEntry[] Entries{ get; } =
public static MessageEntry[] Entries { get; } =
{
new MessageEntry(280, 180,
"...Ar! {0} and a fair wind! No chance... storms, though--ar! Is that a sea serp...<br><br>uh oh."),

6
Projects/Scripts/Items/Skill Items/Fishing/Misc/ShipwreckedItem.cs
View file

@ -2,7 +2,7 @@ namespace Server.Items
{
public interface IShipwreckedItem
{
bool IsShipwreckedItem{ get; set; }
bool IsShipwreckedItem { get; set; }
}
public class ShipwreckedItem : Item, IDyable, IShipwreckedItem
@ -36,16 +36,12 @@ namespace Server.Items
return false;
}
#region IShipwreckedItem Members
bool IShipwreckedItem.IsShipwreckedItem
{
get => true;
set { }
}
#endregion
public override void OnSingleClick(Mobile from)
{
LabelTo(from, 1050039, $"#{LabelNumber}\t#1041645");

26
Projects/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs
View file

@ -8,7 +8,7 @@ namespace Server.Items
{
public class SpecialFishingNet : Item
{
private static int[] m_Hues =
private static readonly int[] m_Hues =
{
0x09B,
0x0CD,
@ -26,13 +26,13 @@ namespace Server.Items
0x8AA
};
private static int[] m_WaterTiles =
private static readonly int[] m_WaterTiles =
{
0x00A8, 0x00AB,
0x0136, 0x0137
};
private static int[] m_UndeepWaterTiles =
private static readonly int[] m_UndeepWaterTiles =
{
0x1797, 0x179C
};
@ -42,7 +42,7 @@ namespace Server.Items
{
Weight = 1.0;
if (0.01 > Utility.RandomDouble())
if (Utility.RandomDouble() < 0.01)
Hue = Utility.RandomList(m_Hues);
else
Hue = 0x8A0;
@ -55,7 +55,7 @@ namespace Server.Items
public override int LabelNumber => 1041079; // a special fishing net
[CommandProperty(AccessLevel.GameMaster)]
public bool InUse{ get; set; }
public bool InUse { get; set; }
public virtual bool RequireDeepWater => true;
@ -90,14 +90,14 @@ namespace Server.Items
switch (version)
{
case 1:
{
InUse = reader.ReadBool();
{
InUse = reader.ReadBool();
if (InUse)
Delete();
if (InUse)
Delete();
break;
}
break;
}
}
Stackable = false;
@ -276,7 +276,7 @@ namespace Server.Items
LandTile t = map.Tiles.GetLandTile(tx, ty);
if (t.Z == p.Z && (t.ID >= 0xA8 && t.ID <= 0xAB || t.ID >= 0x136 && t.ID <= 0x137) &&
if (t.Z == p.Z && ((t.ID >= 0xA8 && t.ID <= 0xAB) || (t.ID >= 0x136 && t.ID <= 0x137)) &&
!SpellHelper.CheckMulti(new Point3D(tx, ty, p.Z), map))
{
x = tx;
@ -287,7 +287,7 @@ namespace Server.Items
spawn.MoveToWorld(new Point3D(x, y, p.Z), map);
if (spawn is Kraken && 0.2 > Utility.RandomDouble())
if (spawn is Kraken && Utility.RandomDouble() < 0.2)
spawn.PackItem(new MessageInABottle(map == Map.Felucca ? Map.Felucca : Map.Trammel));
}