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

Formatting FIxes (#58)

Browse source
This commit is contained in:
Kamron Batman 2019-10-04 23:08:13 -07:00 • committed by GitHub
parent 57fb9fb525
commit 096d39609e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1318 changed files with 11633 additions and 22129 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Projects/Scripts/Multis/Boats/BaseBoat.cs
View file

@ -453,10 +453,7 @@ namespace Server.Multis
SPlank.Map = Map;
}
public bool CanCommand(Mobile m)
{
return true;
}
public bool CanCommand(Mobile m) => true;
public Point3D GetMarkedLocation()
{
@ -465,10 +462,7 @@ namespace Server.Multis
return Rotate(p, (int)m_Facing / 2);
}
public bool CheckKey(uint keyValue)
{
return SPlank?.KeyValue == keyValue || PPlank?.KeyValue == keyValue;
}
public bool CheckKey(uint keyValue) => SPlank?.KeyValue == keyValue || PPlank?.KeyValue == keyValue;
public void Refresh()
{
@ -1265,14 +1259,12 @@ namespace Server.Multis
return new Point3D(Location.X + rx, Location.Y + ry, p.Z);
}
public override bool Contains(int x, int y)
{
return base.Contains(x, y) ||
TillerMan?.X == x && y == TillerMan.Y ||
Hold?.X == x && Hold.Y == y ||
PPlank?.X == x && PPlank.Y == y ||
SPlank?.X == x && SPlank.Y == y;
}
public override bool Contains(int x, int y) =>
base.Contains(x, y) ||
TillerMan?.X == x && y == TillerMan.Y ||
Hold?.X == x && Hold.Y == y ||
PPlank?.X == x && PPlank.Y == y ||
SPlank?.X == x && SPlank.Y == y;
public static bool IsValidLocation(Point3D p, Map map)
{
@ -1285,10 +1277,7 @@ namespace Server.Multis
return false;
}
public static Rectangle2D[] GetWrapFor(Map m)
{
return m == Map.Ilshenar ? m_IlshWrap : m == Map.Tokuno ? m_TokunoWrap : m_BritWrap;
}
public static Rectangle2D[] GetWrapFor(Map m) => m == Map.Ilshenar ? m_IlshWrap : m == Map.Tokuno ? m_TokunoWrap : m_BritWrap;
public Direction GetMovementFor(int x, int y, out int maxSpeed)
{

5
Projects/Scripts/Multis/Boats/BaseBoatDeed.cs
View file

@ -146,10 +146,7 @@ namespace Server.Multis
{
private BaseBoatDeed m_Deed;
public InternalTarget(BaseBoatDeed deed) : base(deed.MultiID, deed.Offset)
{
m_Deed = deed;
}
public InternalTarget(BaseBoatDeed deed) : base(deed.MultiID, deed.Offset) => m_Deed = deed;
protected override void OnTarget(Mobile from, object o)
{

5
Projects/Scripts/Multis/Boats/BaseDockedBoat.cs
View file

@ -165,10 +165,7 @@ namespace Server.Multis
{
private BaseDockedBoat m_Model;
public InternalTarget(BaseDockedBoat model) : base(model.MultiID, model.Offset)
{
m_Model = model;
}
public InternalTarget(BaseDockedBoat model) : base(model.MultiID, model.Offset) => m_Model = model;
protected override void OnTarget(Mobile from, object o)
{

5
Projects/Scripts/Multis/Boats/RenameBoatPrompt.cs
View file

@ -6,10 +6,7 @@ namespace Server.Multis
{
private BaseBoat m_Boat;
public RenameBoatPrompt(BaseBoat boat)
{
m_Boat = boat;
}
public RenameBoatPrompt(BaseBoat boat) => m_Boat = boat;
public override void OnResponse(Mobile from, string text)
{