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

26
Scripts/Items/Food/Beverage.cs
View file

@ -549,8 +549,6 @@ namespace Server.Items
{
private BeverageType m_Content;
private int m_Quantity;
private Mobile m_Poisoner;
private Poison m_Poison;
public override int LabelNumber
{
@ -586,18 +584,10 @@ namespace Server.Items
public bool IsFull => ( m_Quantity >= MaxQuantity );
[CommandProperty( AccessLevel.GameMaster )]
public Poison Poison
{
get => m_Poison;
set => m_Poison = value;
}
public Poison Poison { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Poisoner
{
get => m_Poisoner;
set => m_Poisoner = value;
}
public Mobile Poisoner { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public BeverageType Content
@ -992,8 +982,8 @@ namespace Server.Items
from.PlaySound( Utility.RandomList( 0x30, 0x2D6 ) );
if ( m_Poison != null )
from.ApplyPoison( m_Poisoner, m_Poison );
if ( Poison != null )
from.ApplyPoison( Poisoner, Poison );
--Quantity;
}
@ -1151,9 +1141,9 @@ namespace Server.Items
writer.Write( (int)1 ); // version
writer.Write( (Mobile)m_Poisoner );
writer.Write( (Mobile)Poisoner );
Poison.Serialize( m_Poison, writer );
Poison.Serialize( Poison, writer );
writer.Write( (int)m_Content );
writer.Write( (int)m_Quantity );
}
@ -1181,12 +1171,12 @@ namespace Server.Items
{
case 1:
{
m_Poisoner = reader.ReadMobile();
Poisoner = reader.ReadMobile();
goto case 0;
}
case 0:
{
m_Poison = Poison.Deserialize( reader );
Poison = Poison.Deserialize( reader );
m_Content = (BeverageType)reader.ReadInt();
m_Quantity = reader.ReadInt();
break;

14
Scripts/Items/Food/CookableFood.cs
View file

@ -5,18 +5,12 @@ namespace Server.Items
{
public abstract class CookableFood : Item
{
private int m_CookingLevel;
[CommandProperty( AccessLevel.GameMaster )]
public int CookingLevel
{
get => m_CookingLevel;
set => m_CookingLevel = value;
}
public int CookingLevel { get; set; }
public CookableFood( int itemID, int cookingLevel ) : base( itemID )
{
m_CookingLevel = cookingLevel;
CookingLevel = cookingLevel;
}
public CookableFood( Serial serial ) : base( serial )
@ -31,7 +25,7 @@ namespace Server.Items
writer.Write( (int) 1 ); // version
// Version 1
writer.Write( (int) m_CookingLevel );
writer.Write( (int) CookingLevel );
}
@ -45,7 +39,7 @@ namespace Server.Items
{
case 1:
{
m_CookingLevel = reader.ReadInt();
CookingLevel = reader.ReadInt();
break;
}

56
Scripts/Items/Food/Food.cs
View file

@ -5,30 +5,14 @@ namespace Server.Items
{
public abstract class Food : Item
{
private Mobile m_Poisoner;
private Poison m_Poison;
private int m_FillFactor;
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Poisoner { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Poisoner
{
get => m_Poisoner;
set => m_Poisoner = value;
}
public Poison Poison { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public Poison Poison
{
get => m_Poison;
set => m_Poison = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int FillFactor
{
get => m_FillFactor;
set => m_FillFactor = value;
}
public int FillFactor { get; set; }
public Food( int itemID ) : this( 1, itemID )
{
@ -38,7 +22,7 @@ namespace Server.Items
{
Stackable = true;
Amount = amount;
m_FillFactor = 1;
FillFactor = 1;
}
public Food( Serial serial ) : base( serial )
@ -75,8 +59,8 @@ namespace Server.Items
if ( from.Body.IsHuman && !from.Mounted )
from.Animate( 34, 5, 1, true, false, 0 );
if ( m_Poison != null )
from.ApplyPoison( m_Poisoner, m_Poison );
if ( Poison != null )
from.ApplyPoison( Poisoner, Poison );
Consume();
@ -88,7 +72,7 @@ namespace Server.Items
public virtual bool CheckHunger( Mobile from )
{
return FillHunger( from, m_FillFactor );
return FillHunger( from, FillFactor );
}
public static bool FillHunger( Mobile from, int fillFactor )
@ -132,10 +116,10 @@ namespace Server.Items
writer.Write( (int) 4 ); // version
writer.Write( m_Poisoner );
writer.Write( Poisoner );
Poison.Serialize( m_Poison, writer );
writer.Write( m_FillFactor );
Poison.Serialize( Poison, writer );
writer.Write( FillFactor );
}
public override void Deserialize( GenericReader reader )
@ -150,29 +134,29 @@ namespace Server.Items
{
switch ( reader.ReadInt() )
{
case 0: m_Poison = null; break;
case 1: m_Poison = Poison.Lesser; break;
case 2: m_Poison = Poison.Regular; break;
case 3: m_Poison = Poison.Greater; break;
case 4: m_Poison = Poison.Deadly; break;
case 0: Poison = null; break;
case 1: Poison = Poison.Lesser; break;
case 2: Poison = Poison.Regular; break;
case 3: Poison = Poison.Greater; break;
case 4: Poison = Poison.Deadly; break;
}
break;
}
case 2:
{
m_Poison = Poison.Deserialize( reader );
Poison = Poison.Deserialize( reader );
break;
}
case 3:
{
m_Poison = Poison.Deserialize( reader );
m_FillFactor = reader.ReadInt();
Poison = Poison.Deserialize( reader );
FillFactor = reader.ReadInt();
break;
}
case 4:
{
m_Poisoner = reader.ReadMobile();
Poisoner = reader.ReadMobile();
goto case 3;
}
}