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

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

18
Projects/Scripts/Items/Traps/BaseTrap.cs
View file

@ -6,10 +6,7 @@ namespace Server.Items
{
private DateTime m_NextPassiveTrigger, m_NextActiveTrigger;
public BaseTrap(int itemID) : base(itemID)
{
Movable = false;
}
public BaseTrap(int itemID) : base(itemID) => Movable = false;
public BaseTrap(Serial serial) : base(serial)
{
@ -36,16 +33,11 @@ namespace Server.Items
return hue - 1;
}
public bool CheckRange(Point3D loc, Point3D oldLoc, int range)
{
return CheckRange(loc, range) && !CheckRange(oldLoc, range);
}
public bool CheckRange(Point3D loc, Point3D oldLoc, int range) => CheckRange(loc, range) && !CheckRange(oldLoc, range);
public bool CheckRange(Point3D loc, int range)
{
return Z + 8 >= loc.Z && loc.Z + 16 > Z
&& Utility.InRange(GetWorldLocation(), loc, range);
}
public bool CheckRange(Point3D loc, int range) =>
Z + 8 >= loc.Z && loc.Z + 16 > Z
&& Utility.InRange(GetWorldLocation(), loc, range);
public override void OnMovement(Mobile m, Point3D oldLocation)
{

5
Projects/Scripts/Items/Traps/FlameSpurtTrap.cs
View file

@ -10,10 +10,7 @@ namespace Server.Items
private Timer m_Timer;
[Constructible]
public FlameSpurtTrap() : base(0x1B71)
{
Visible = false;
}
public FlameSpurtTrap() : base(0x1B71) => Visible = false;
public FlameSpurtTrap(Serial serial) : base(serial)
{

5
Projects/Scripts/Items/Traps/GasTrap.cs
View file

@ -23,10 +23,7 @@ namespace Server.Items
}
[Constructible]
public GasTrap(GasTrapType type, Poison poison = null) : base(GetBaseID(type))
{
Poison = poison;
}
public GasTrap(GasTrapType type, Poison poison = null) : base(GetBaseID(type)) => Poison = poison;
public GasTrap(Serial serial) : base(serial)
{

5
Projects/Scripts/Items/Traps/SpikeTrap.cs
View file

@ -84,10 +84,7 @@ namespace Server.Items
return 0;
}
public static int GetExtendedID(SpikeTrapType type)
{
return GetBaseID(type) + GetExtendedOffset(type);
}
public static int GetExtendedID(SpikeTrapType type) => GetBaseID(type) + GetExtendedOffset(type);
public static int GetExtendedOffset(SpikeTrapType type)
{

5
Projects/Scripts/Items/Traps/StoneFaceTrap.cs
View file

@ -13,10 +13,7 @@ namespace Server.Items
public class StoneFaceTrap : BaseTrap
{
[Constructible]
public StoneFaceTrap() : base(0x10FC)
{
Light = LightType.Circle225;
}
public StoneFaceTrap() : base(0x10FC) => Light = LightType.Circle225;
public StoneFaceTrap(Serial serial) : base(serial)
{