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

Removes implicit this.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 12:56:58 -07:00
parent 04b4cfe75b
commit 83dcf536d8
533 changed files with 2804 additions and 2806 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Scripts/Items/Construction/Doors/BaseDoor.cs
View file

@ -405,7 +405,7 @@ namespace Server.Items
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 502502 ); // That is locked, but you open it with your godly powers.
//from.Send( new MessageLocalized( Serial, ItemID, MessageType.Regular, 0x3B2, 3, 502502, "", "" ) ); // That is locked, but you open it with your godly powers.
}
else if ( Key.ContainsKey( from.Backpack, this.KeyValue ) )
else if ( Key.ContainsKey( from.Backpack, KeyValue ) )
{
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 501282 ); // You quickly unlock, open, and relock the door
}
@ -416,7 +416,7 @@ namespace Server.Items
else
{
if ( Hue == 0x44E && Map == Map.Malas ) // doom door into healer room in doom
this.SendLocalizedMessageTo( from, 1060014 ); // Only the dead may pass.
SendLocalizedMessageTo( from, 1060014 ); // Only the dead may pass.
else
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 502503 ); // That is locked.
@ -445,7 +445,7 @@ namespace Server.Items
{
Open = !m_Open;
BaseDoor link = this.Link;
BaseDoor link = Link;
if ( m_Open && link != null && !link.Open )
link.Open = true;

26
Scripts/Items/Construction/Doors/Doors.cs
View file

@ -20,7 +20,7 @@ namespace Server.Items
public class IronGateShort : BaseDoor
{
[Constructible]
public IronGateShort( DoorFacing facing ) : base( 0x84c + (2 * (int)facing), 0x84d + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) )
public IronGateShort( DoorFacing facing ) : base( 0x84c + (2 * (int)facing), 0x84d + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) )
{
}
@ -46,7 +46,7 @@ namespace Server.Items
public class IronGate : BaseDoor
{
[Constructible]
public IronGate( DoorFacing facing ) : base( 0x824 + (2 * (int)facing), 0x825 + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) )
public IronGate( DoorFacing facing ) : base( 0x824 + (2 * (int)facing), 0x825 + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) )
{
}
@ -72,7 +72,7 @@ namespace Server.Items
public class LightWoodGate : BaseDoor
{
[Constructible]
public LightWoodGate( DoorFacing facing ) : base( 0x839 + (2 * (int)facing), 0x83A + (2 * (int)facing), 0xEB, 0xF2, BaseDoor.GetOffset( facing ) )
public LightWoodGate( DoorFacing facing ) : base( 0x839 + (2 * (int)facing), 0x83A + (2 * (int)facing), 0xEB, 0xF2, GetOffset( facing ) )
{
}
@ -98,7 +98,7 @@ namespace Server.Items
public class DarkWoodGate : BaseDoor
{
[Constructible]
public DarkWoodGate( DoorFacing facing ) : base( 0x866 + (2 * (int)facing), 0x867 + (2 * (int)facing), 0xEB, 0xF2, BaseDoor.GetOffset( facing ) )
public DarkWoodGate( DoorFacing facing ) : base( 0x866 + (2 * (int)facing), 0x867 + (2 * (int)facing), 0xEB, 0xF2, GetOffset( facing ) )
{
}
@ -124,7 +124,7 @@ namespace Server.Items
public class MetalDoor : BaseDoor
{
[Constructible]
public MetalDoor( DoorFacing facing ) : base( 0x675 + (2 * (int)facing), 0x676 + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) )
public MetalDoor( DoorFacing facing ) : base( 0x675 + (2 * (int)facing), 0x676 + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) )
{
}
@ -150,7 +150,7 @@ namespace Server.Items
public class BarredMetalDoor : BaseDoor
{
[Constructible]
public BarredMetalDoor( DoorFacing facing ) : base( 0x685 + (2 * (int)facing), 0x686 + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) )
public BarredMetalDoor( DoorFacing facing ) : base( 0x685 + (2 * (int)facing), 0x686 + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) )
{
}
@ -176,7 +176,7 @@ namespace Server.Items
public class BarredMetalDoor2 : BaseDoor
{
[Constructible]
public BarredMetalDoor2( DoorFacing facing ) : base( 0x1FED + (2 * (int)facing), 0x1FEE + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) )
public BarredMetalDoor2( DoorFacing facing ) : base( 0x1FED + (2 * (int)facing), 0x1FEE + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) )
{
}
@ -202,7 +202,7 @@ namespace Server.Items
public class RattanDoor : BaseDoor
{
[Constructible]
public RattanDoor( DoorFacing facing ) : base( 0x695 + (2 * (int)facing), 0x696 + (2 * (int)facing), 0xEB, 0xF2, BaseDoor.GetOffset( facing ) )
public RattanDoor( DoorFacing facing ) : base( 0x695 + (2 * (int)facing), 0x696 + (2 * (int)facing), 0xEB, 0xF2, GetOffset( facing ) )
{
}
@ -228,7 +228,7 @@ namespace Server.Items
public class DarkWoodDoor : BaseDoor
{
[Constructible]
public DarkWoodDoor( DoorFacing facing ) : base( 0x6A5 + (2 * (int)facing), 0x6A6 + (2 * (int)facing), 0xEA, 0xF1, BaseDoor.GetOffset( facing ) )
public DarkWoodDoor( DoorFacing facing ) : base( 0x6A5 + (2 * (int)facing), 0x6A6 + (2 * (int)facing), 0xEA, 0xF1, GetOffset( facing ) )
{
}
@ -254,7 +254,7 @@ namespace Server.Items
public class MediumWoodDoor : BaseDoor
{
[Constructible]
public MediumWoodDoor( DoorFacing facing ) : base( 0x6B5 + (2 * (int)facing), 0x6B6 + (2 * (int)facing), 0xEA, 0xF1, BaseDoor.GetOffset( facing ) )
public MediumWoodDoor( DoorFacing facing ) : base( 0x6B5 + (2 * (int)facing), 0x6B6 + (2 * (int)facing), 0xEA, 0xF1, GetOffset( facing ) )
{
}
@ -280,7 +280,7 @@ namespace Server.Items
public class MetalDoor2 : BaseDoor
{
[Constructible]
public MetalDoor2( DoorFacing facing ) : base( 0x6C5 + (2 * (int)facing), 0x6C6 + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) )
public MetalDoor2( DoorFacing facing ) : base( 0x6C5 + (2 * (int)facing), 0x6C6 + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) )
{
}
@ -306,7 +306,7 @@ namespace Server.Items
public class LightWoodDoor : BaseDoor
{
[Constructible]
public LightWoodDoor( DoorFacing facing ) : base( 0x6D5 + (2 * (int)facing), 0x6D6 + (2 * (int)facing), 0xEA, 0xF1, BaseDoor.GetOffset( facing ) )
public LightWoodDoor( DoorFacing facing ) : base( 0x6D5 + (2 * (int)facing), 0x6D6 + (2 * (int)facing), 0xEA, 0xF1, GetOffset( facing ) )
{
}
@ -332,7 +332,7 @@ namespace Server.Items
public class StrongWoodDoor : BaseDoor
{
[Constructible]
public StrongWoodDoor( DoorFacing facing ) : base( 0x6E5 + (2 * (int)facing), 0x6E6 + (2 * (int)facing), 0xEA, 0xF1, BaseDoor.GetOffset( facing ) )
public StrongWoodDoor( DoorFacing facing ) : base( 0x6E5 + (2 * (int)facing), 0x6E6 + (2 * (int)facing), 0xEA, 0xF1, GetOffset( facing ) )
{
}

8
Scripts/Items/Construction/Doors/HouseDoors.cs
View file

@ -9,7 +9,7 @@ namespace Server.Items
public class MetalHouseDoor : BaseHouseDoor
{
[Constructible]
public MetalHouseDoor( DoorFacing facing ) : base( facing, 0x675 + (2 * (int)facing), 0x676 + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) )
public MetalHouseDoor( DoorFacing facing ) : base( facing, 0x675 + (2 * (int)facing), 0x676 + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) )
{
}
@ -35,7 +35,7 @@ namespace Server.Items
public class DarkWoodHouseDoor : BaseHouseDoor
{
[Constructible]
public DarkWoodHouseDoor( DoorFacing facing ) : base( facing, 0x6A5 + (2 * (int)facing), 0x6A6 + (2 * (int)facing), 0xEA, 0xF1, BaseDoor.GetOffset( facing ) )
public DarkWoodHouseDoor( DoorFacing facing ) : base( facing, 0x6A5 + (2 * (int)facing), 0x6A6 + (2 * (int)facing), 0xEA, 0xF1, GetOffset( facing ) )
{
}
@ -67,7 +67,7 @@ namespace Server.Items
[Constructible]
public GenericHouseDoor( DoorFacing facing, int baseItemID, int openedSound, int closedSound, bool autoAdjust )
: base( facing, baseItemID + (autoAdjust ? (2 * (int)facing) : 0), baseItemID + 1 + (autoAdjust ? (2 * (int)facing) : 0), openedSound, closedSound, BaseDoor.GetOffset( facing ) )
: base( facing, baseItemID + (autoAdjust ? (2 * (int)facing) : 0), baseItemID + 1 + (autoAdjust ? (2 * (int)facing) : 0), openedSound, closedSound, GetOffset( facing ) )
{
}
@ -128,7 +128,7 @@ namespace Server.Items
if ( Open )
loc = new Point3D( X - Offset.X, Y - Offset.Y, Z - Offset.Z );
else
loc = this.Location;
loc = Location;
return BaseHouse.FindHouseAt( loc, Map, 20 );
}

12
Scripts/Items/Construction/Doors/SecretDoors.cs
View file

@ -3,7 +3,7 @@ namespace Server.Items
public class SecretStoneDoor1 : BaseDoor
{
[Constructible]
public SecretStoneDoor1( DoorFacing facing ) : base( 0xE8 + (2 * (int)facing), 0xE9 + (2 * (int)facing), 0xED, 0xF4, BaseDoor.GetOffset( facing ) )
public SecretStoneDoor1( DoorFacing facing ) : base( 0xE8 + (2 * (int)facing), 0xE9 + (2 * (int)facing), 0xED, 0xF4, GetOffset( facing ) )
{
}
@ -29,7 +29,7 @@ namespace Server.Items
public class SecretDungeonDoor : BaseDoor
{
[Constructible]
public SecretDungeonDoor( DoorFacing facing ) : base( 0x314 + (2 * (int)facing), 0x315 + (2 * (int)facing), 0xED, 0xF4, BaseDoor.GetOffset( facing ) )
public SecretDungeonDoor( DoorFacing facing ) : base( 0x314 + (2 * (int)facing), 0x315 + (2 * (int)facing), 0xED, 0xF4, GetOffset( facing ) )
{
}
@ -55,7 +55,7 @@ namespace Server.Items
public class SecretStoneDoor2 : BaseDoor
{
[Constructible]
public SecretStoneDoor2( DoorFacing facing ) : base( 0x324 + (2 * (int)facing), 0x325 + (2 * (int)facing), 0xED, 0xF4, BaseDoor.GetOffset( facing ) )
public SecretStoneDoor2( DoorFacing facing ) : base( 0x324 + (2 * (int)facing), 0x325 + (2 * (int)facing), 0xED, 0xF4, GetOffset( facing ) )
{
}
@ -81,7 +81,7 @@ namespace Server.Items
public class SecretWoodenDoor : BaseDoor
{
[Constructible]
public SecretWoodenDoor( DoorFacing facing ) : base( 0x334 + (2 * (int)facing), 0x335 + (2 * (int)facing), 0xED, 0xF4, BaseDoor.GetOffset( facing ) )
public SecretWoodenDoor( DoorFacing facing ) : base( 0x334 + (2 * (int)facing), 0x335 + (2 * (int)facing), 0xED, 0xF4, GetOffset( facing ) )
{
}
@ -107,7 +107,7 @@ namespace Server.Items
public class SecretLightWoodDoor : BaseDoor
{
[Constructible]
public SecretLightWoodDoor( DoorFacing facing ) : base( 0x344 + (2 * (int)facing), 0x345 + (2 * (int)facing), 0xED, 0xF4, BaseDoor.GetOffset( facing ) )
public SecretLightWoodDoor( DoorFacing facing ) : base( 0x344 + (2 * (int)facing), 0x345 + (2 * (int)facing), 0xED, 0xF4, GetOffset( facing ) )
{
}
@ -133,7 +133,7 @@ namespace Server.Items
public class SecretStoneDoor3 : BaseDoor
{
[Constructible]
public SecretStoneDoor3( DoorFacing facing ) : base( 0x354 + (2 * (int)facing), 0x355 + (2 * (int)facing), 0xED, 0xF4, BaseDoor.GetOffset( facing ) )
public SecretStoneDoor3( DoorFacing facing ) : base( 0x354 + (2 * (int)facing), 0x355 + (2 * (int)facing), 0xED, 0xF4, GetOffset( facing ) )
{
}