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

Changes properties to use automatic property initializers

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 15:23:29 -07:00
parent f0a48ad431
commit 06fa31a7bf
623 changed files with 13072 additions and 19304 deletions
Download patch file Download diff file Expand all files Collapse all files

98
Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs
View file

@ -65,21 +65,19 @@ namespace Server.Items
{
public TrophyInfo( Type type, int id, int deedNum, int addonNum )
{
m_CreatureType = type;
m_NorthID = id;
m_DeedNumber = deedNum;
m_AddonNumber = addonNum;
CreatureType = type;
NorthID = id;
DeedNumber = deedNum;
AddonNumber = addonNum;
}
private Type m_CreatureType;
private int m_NorthID;
private int m_DeedNumber;
private int m_AddonNumber;
public Type CreatureType { get; }
public Type CreatureType => m_CreatureType;
public int NorthID => m_NorthID;
public int DeedNumber => m_DeedNumber;
public int AddonNumber => m_AddonNumber;
public int NorthID { get; }
public int DeedNumber { get; }
public int AddonNumber { get; }
}
@ -170,28 +168,19 @@ namespace Server.Items
{
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
private int m_WestID;
private int m_NorthID;
private int m_DeedNumber;
private int m_AddonNumber;
private Mobile m_Hunter;
private int m_AnimalWeight;
[CommandProperty( AccessLevel.GameMaster )]
public int WestID{ get => m_WestID;
set => m_WestID = value;
}
public int WestID { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int NorthID{ get => m_NorthID;
set => m_NorthID = value;
}
public int NorthID { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int DeedNumber{ get => m_DeedNumber;
set => m_DeedNumber = value;
}
public int DeedNumber { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int AddonNumber{ get => m_AddonNumber;
@ -214,9 +203,9 @@ namespace Server.Items
public TrophyAddon( Mobile from, int itemID, int westID, int northID, int deedNumber, int addonNumber, Mobile hunter, int animalWeight ) : base( itemID )
{
m_WestID = westID;
m_NorthID = northID;
m_DeedNumber = deedNumber;
WestID = westID;
NorthID = northID;
DeedNumber = deedNumber;
m_AddonNumber = addonNumber;
m_Hunter = hunter;
@ -249,7 +238,7 @@ namespace Server.Items
if ( !map.CanFit( p.X, p.Y, p.Z, ItemData.Height ) )
return false;
if ( ItemID == m_NorthID )
if ( ItemID == NorthID )
return BaseAddon.IsWall( p.X, p.Y - 1, p.Z, map ); // North wall
return BaseAddon.IsWall( p.X - 1, p.Y, p.Z, map ); // West wall
}
@ -263,9 +252,9 @@ namespace Server.Items
writer.Write( (Mobile) m_Hunter );
writer.Write( (int) m_AnimalWeight );
writer.Write( (int) m_WestID );
writer.Write( (int) m_NorthID );
writer.Write( (int) m_DeedNumber );
writer.Write( (int) WestID );
writer.Write( (int) NorthID );
writer.Write( (int) DeedNumber );
writer.Write( (int) m_AddonNumber );
}
@ -285,9 +274,9 @@ namespace Server.Items
}
case 0:
{
m_WestID = reader.ReadInt();
m_NorthID = reader.ReadInt();
m_DeedNumber = reader.ReadInt();
WestID = reader.ReadInt();
NorthID = reader.ReadInt();
DeedNumber = reader.ReadInt();
m_AddonNumber = reader.ReadInt();
break;
}
@ -319,7 +308,7 @@ namespace Server.Items
}
}
public Item Deed => new TrophyDeed( m_WestID, m_NorthID, m_DeedNumber, m_AddonNumber, m_Hunter, m_AnimalWeight );
public Item Deed => new TrophyDeed( WestID, NorthID, DeedNumber, m_AddonNumber, m_Hunter, m_AnimalWeight );
public override void OnDoubleClick( Mobile from )
{
@ -343,32 +332,23 @@ namespace Server.Items
[Flippable( 0x14F0, 0x14EF )]
public class TrophyDeed : Item
{
private int m_WestID;
private int m_NorthID;
private int m_DeedNumber;
private int m_AddonNumber;
private Mobile m_Hunter;
private int m_AnimalWeight;
[CommandProperty( AccessLevel.GameMaster )]
public int WestID{ get => m_WestID;
set => m_WestID = value;
}
public int WestID { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int NorthID{ get => m_NorthID;
set => m_NorthID = value;
}
public int NorthID { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int DeedNumber{ get => m_DeedNumber;
set{ m_DeedNumber = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public int AddonNumber{ get => m_AddonNumber;
set => m_AddonNumber = value;
}
public int AddonNumber { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Hunter{ get => m_Hunter;
@ -387,10 +367,10 @@ namespace Server.Items
public TrophyDeed( int westID, int northID, int deedNumber, int addonNumber, Mobile hunter, int animalWeight ) : base( 0x14F0 )
{
m_WestID = westID;
m_NorthID = northID;
WestID = westID;
NorthID = northID;
m_DeedNumber = deedNumber;
m_AddonNumber = addonNumber;
AddonNumber = addonNumber;
m_Hunter = hunter;
m_AnimalWeight = animalWeight;
}
@ -425,10 +405,10 @@ namespace Server.Items
writer.Write( (Mobile) m_Hunter );
writer.Write( (int) m_AnimalWeight );
writer.Write( (int) m_WestID );
writer.Write( (int) m_NorthID );
writer.Write( (int) WestID );
writer.Write( (int) NorthID );
writer.Write( (int) m_DeedNumber );
writer.Write( (int) m_AddonNumber );
writer.Write( (int) AddonNumber );
}
public override void Deserialize( GenericReader reader )
@ -447,10 +427,10 @@ namespace Server.Items
}
case 0:
{
m_WestID = reader.ReadInt();
m_NorthID = reader.ReadInt();
WestID = reader.ReadInt();
NorthID = reader.ReadInt();
m_DeedNumber = reader.ReadInt();
m_AddonNumber = reader.ReadInt();
AddonNumber = reader.ReadInt();
break;
}
}
@ -484,15 +464,15 @@ namespace Server.Items
int itemID = 0;
if ( northWall )
itemID = m_NorthID;
itemID = NorthID;
else if ( westWall )
itemID = m_WestID;
itemID = WestID;
else
from.SendLocalizedMessage( 1042626 ); // The trophy must be placed next to a wall.
if ( itemID > 0 )
{
house.Addons.Add( new TrophyAddon( from, itemID, m_WestID, m_NorthID, m_DeedNumber, m_AddonNumber, m_Hunter, m_AnimalWeight ) );
house.Addons.Add( new TrophyAddon( from, itemID, WestID, NorthID, m_DeedNumber, AddonNumber, m_Hunter, m_AnimalWeight ) );
Delete();
}
}