Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,355 +1,374 @@
|
|||
namespace Server.Items
|
||||
{
|
||||
[FlippableAttribute( 0x1bdd, 0x1be0 )]
|
||||
public class Log : Item, ICommodity, IAxe
|
||||
{
|
||||
private CraftResource m_Resource;
|
||||
[Flippable(0x1bdd, 0x1be0)]
|
||||
public class Log : Item, ICommodity, IAxe
|
||||
{
|
||||
private CraftResource m_Resource;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public CraftResource Resource
|
||||
{
|
||||
get => m_Resource;
|
||||
set { m_Resource = value; InvalidateProperties(); }
|
||||
}
|
||||
[Constructible]
|
||||
public Log() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
int ICommodity.DescriptionNumber => CraftResources.IsStandard( m_Resource ) ? LabelNumber : 1075062 + ( (int)m_Resource - (int)CraftResource.RegularWood );
|
||||
bool ICommodity.IsDeedable => true;
|
||||
[Constructible]
|
||||
public Log(int amount) : this(CraftResource.RegularWood, amount)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Log() : this( 1 )
|
||||
{
|
||||
}
|
||||
[Constructible]
|
||||
public Log(CraftResource resource)
|
||||
: this(resource, 1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Log( int amount ) : this( CraftResource.RegularWood, amount )
|
||||
{
|
||||
}
|
||||
[Constructible]
|
||||
public Log(CraftResource resource, int amount)
|
||||
: base(0x1BDD)
|
||||
{
|
||||
Stackable = true;
|
||||
Weight = 2.0;
|
||||
Amount = amount;
|
||||
|
||||
[Constructible]
|
||||
public Log( CraftResource resource )
|
||||
: this( resource, 1 )
|
||||
{
|
||||
}
|
||||
[Constructible]
|
||||
public Log( CraftResource resource, int amount )
|
||||
: base( 0x1BDD )
|
||||
{
|
||||
Stackable = true;
|
||||
Weight = 2.0;
|
||||
Amount = amount;
|
||||
m_Resource = resource;
|
||||
Hue = CraftResources.GetHue(resource);
|
||||
}
|
||||
|
||||
m_Resource = resource;
|
||||
Hue = CraftResources.GetHue( resource );
|
||||
}
|
||||
public Log(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void GetProperties( ObjectPropertyList list )
|
||||
{
|
||||
base.GetProperties( list );
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public CraftResource Resource
|
||||
{
|
||||
get => m_Resource;
|
||||
set
|
||||
{
|
||||
m_Resource = value;
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
||||
if ( !CraftResources.IsStandard( m_Resource ) )
|
||||
{
|
||||
int num = CraftResources.GetLocalizationNumber( m_Resource );
|
||||
public virtual bool Axe(Mobile from, BaseAxe axe)
|
||||
{
|
||||
if (!TryCreateBoards(from, 0, new Board()))
|
||||
return false;
|
||||
|
||||
if ( num > 0 )
|
||||
list.Add( num );
|
||||
else
|
||||
list.Add( CraftResources.GetName( m_Resource ) );
|
||||
}
|
||||
}
|
||||
public Log( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
int ICommodity.DescriptionNumber => CraftResources.IsStandard(m_Resource)
|
||||
? LabelNumber
|
||||
: 1075062 + ((int)m_Resource - (int)CraftResource.RegularWood);
|
||||
|
||||
writer.Write( (int) 1 ); // version
|
||||
bool ICommodity.IsDeedable => true;
|
||||
|
||||
writer.Write( (int)m_Resource );
|
||||
}
|
||||
public override void GetProperties(ObjectPropertyList list)
|
||||
{
|
||||
base.GetProperties(list);
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
if (!CraftResources.IsStandard(m_Resource))
|
||||
{
|
||||
int num = CraftResources.GetLocalizationNumber(m_Resource);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
if (num > 0)
|
||||
list.Add(num);
|
||||
else
|
||||
list.Add(CraftResources.GetName(m_Resource));
|
||||
}
|
||||
}
|
||||
|
||||
switch ( version )
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
m_Resource = (CraftResource)reader.ReadInt();
|
||||
break;
|
||||
}
|
||||
}
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
if ( version == 0 )
|
||||
m_Resource = CraftResource.RegularWood;
|
||||
}
|
||||
writer.Write(1); // version
|
||||
|
||||
public virtual bool TryCreateBoards( Mobile from, double skill, Item item )
|
||||
{
|
||||
if ( Deleted || !from.CanSee( this ) )
|
||||
return false;
|
||||
if ( from.Skills.Carpentry.Value < skill &&
|
||||
from.Skills.Lumberjacking.Value < skill )
|
||||
{
|
||||
item.Delete();
|
||||
from.SendLocalizedMessage( 1072652 ); // You cannot work this strange and unusual wood.
|
||||
return false;
|
||||
}
|
||||
base.ScissorHelper( from, item, 1, false );
|
||||
return true;
|
||||
}
|
||||
writer.Write((int)m_Resource);
|
||||
}
|
||||
|
||||
public virtual bool Axe( Mobile from, BaseAxe axe )
|
||||
{
|
||||
if ( !TryCreateBoards( from , 0, new Board() ) )
|
||||
return false;
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
public class HeartwoodLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public HeartwoodLog() : this( 1 )
|
||||
{
|
||||
}
|
||||
[Constructible]
|
||||
public HeartwoodLog( int amount )
|
||||
: base( CraftResource.Heartwood, amount )
|
||||
{
|
||||
}
|
||||
public HeartwoodLog( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
int version = reader.ReadInt();
|
||||
|
||||
writer.Write( (int)0 ); // version
|
||||
}
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
switch (version)
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
m_Resource = (CraftResource)reader.ReadInt();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
if (version == 0)
|
||||
m_Resource = CraftResource.RegularWood;
|
||||
}
|
||||
|
||||
public override bool Axe( Mobile from, BaseAxe axe )
|
||||
{
|
||||
if ( !TryCreateBoards( from , 100, new HeartwoodBoard() ) )
|
||||
return false;
|
||||
public virtual bool TryCreateBoards(Mobile from, double skill, Item item)
|
||||
{
|
||||
if (Deleted || !from.CanSee(this))
|
||||
return false;
|
||||
if (from.Skills.Carpentry.Value < skill &&
|
||||
from.Skills.Lumberjacking.Value < skill)
|
||||
{
|
||||
item.Delete();
|
||||
from.SendLocalizedMessage(1072652); // You cannot work this strange and unusual wood.
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
base.ScissorHelper(from, item, 1, false);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
public class BloodwoodLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public BloodwoodLog()
|
||||
: this( 1 )
|
||||
{
|
||||
}
|
||||
[Constructible]
|
||||
public BloodwoodLog( int amount )
|
||||
: base( CraftResource.Bloodwood, amount )
|
||||
{
|
||||
}
|
||||
public BloodwoodLog( Serial serial )
|
||||
: base( serial )
|
||||
{
|
||||
}
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public class HeartwoodLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public HeartwoodLog() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
writer.Write( (int)0 ); // version
|
||||
}
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
[Constructible]
|
||||
public HeartwoodLog(int amount)
|
||||
: base(CraftResource.Heartwood, amount)
|
||||
{
|
||||
}
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
public HeartwoodLog(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override bool Axe( Mobile from, BaseAxe axe )
|
||||
{
|
||||
if ( !TryCreateBoards( from , 100, new BloodwoodBoard() ) )
|
||||
return false;
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public class FrostwoodLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public FrostwoodLog()
|
||||
: this( 1 )
|
||||
{
|
||||
}
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
[Constructible]
|
||||
public FrostwoodLog( int amount )
|
||||
: base( CraftResource.Frostwood, amount )
|
||||
{
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
|
||||
public FrostwoodLog( Serial serial )
|
||||
: base( serial )
|
||||
{
|
||||
}
|
||||
public override bool Axe(Mobile from, BaseAxe axe)
|
||||
{
|
||||
if (!TryCreateBoards(from, 100, new HeartwoodBoard()))
|
||||
return false;
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
writer.Write( (int)0 ); // version
|
||||
}
|
||||
public class BloodwoodLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public BloodwoodLog()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
[Constructible]
|
||||
public BloodwoodLog(int amount)
|
||||
: base(CraftResource.Bloodwood, amount)
|
||||
{
|
||||
}
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
public BloodwoodLog(Serial serial)
|
||||
: base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override bool Axe( Mobile from, BaseAxe axe )
|
||||
{
|
||||
if ( !TryCreateBoards( from , 100, new FrostwoodBoard() ) )
|
||||
return false;
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public class OakLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public OakLog()
|
||||
: this( 1 )
|
||||
{
|
||||
}
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
[Constructible]
|
||||
public OakLog( int amount )
|
||||
: base( CraftResource.OakWood, amount )
|
||||
{
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
|
||||
public OakLog( Serial serial )
|
||||
: base( serial )
|
||||
{
|
||||
}
|
||||
public override bool Axe(Mobile from, BaseAxe axe)
|
||||
{
|
||||
if (!TryCreateBoards(from, 100, new BloodwoodBoard()))
|
||||
return false;
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
writer.Write( (int)0 ); // version
|
||||
}
|
||||
public class FrostwoodLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public FrostwoodLog()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
[Constructible]
|
||||
public FrostwoodLog(int amount)
|
||||
: base(CraftResource.Frostwood, amount)
|
||||
{
|
||||
}
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
public FrostwoodLog(Serial serial)
|
||||
: base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override bool Axe( Mobile from, BaseAxe axe )
|
||||
{
|
||||
if ( !TryCreateBoards( from , 65, new OakBoard() ) )
|
||||
return false;
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public class AshLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public AshLog()
|
||||
: this( 1 )
|
||||
{
|
||||
}
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
[Constructible]
|
||||
public AshLog( int amount )
|
||||
: base( CraftResource.AshWood, amount )
|
||||
{
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
|
||||
public AshLog( Serial serial )
|
||||
: base( serial )
|
||||
{
|
||||
}
|
||||
public override bool Axe(Mobile from, BaseAxe axe)
|
||||
{
|
||||
if (!TryCreateBoards(from, 100, new FrostwoodBoard()))
|
||||
return false;
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
writer.Write( (int)0 ); // version
|
||||
}
|
||||
public class OakLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public OakLog()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
[Constructible]
|
||||
public OakLog(int amount)
|
||||
: base(CraftResource.OakWood, amount)
|
||||
{
|
||||
}
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
public OakLog(Serial serial)
|
||||
: base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override bool Axe( Mobile from, BaseAxe axe )
|
||||
{
|
||||
if ( !TryCreateBoards( from , 80, new AshBoard() ) )
|
||||
return false;
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public class YewLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public YewLog()
|
||||
: this( 1 )
|
||||
{
|
||||
}
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
[Constructible]
|
||||
public YewLog( int amount )
|
||||
: base( CraftResource.YewWood, amount )
|
||||
{
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
|
||||
public YewLog( Serial serial )
|
||||
: base( serial )
|
||||
{
|
||||
}
|
||||
public override bool Axe(Mobile from, BaseAxe axe)
|
||||
{
|
||||
if (!TryCreateBoards(from, 65, new OakBoard()))
|
||||
return false;
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
writer.Write( (int)0 ); // version
|
||||
}
|
||||
public class AshLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public AshLog()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
[Constructible]
|
||||
public AshLog(int amount)
|
||||
: base(CraftResource.AshWood, amount)
|
||||
{
|
||||
}
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
public AshLog(Serial serial)
|
||||
: base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override bool Axe( Mobile from, BaseAxe axe )
|
||||
{
|
||||
if ( !TryCreateBoards( from , 95, new YewBoard() ) )
|
||||
return false;
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
|
||||
public override bool Axe(Mobile from, BaseAxe axe)
|
||||
{
|
||||
if (!TryCreateBoards(from, 80, new AshBoard()))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
public class YewLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public YewLog()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public YewLog(int amount)
|
||||
: base(CraftResource.YewWood, amount)
|
||||
{
|
||||
}
|
||||
|
||||
public YewLog(Serial serial)
|
||||
: base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
|
||||
public override bool Axe(Mobile from, BaseAxe axe)
|
||||
{
|
||||
if (!TryCreateBoards(from, 95, new YewBoard()))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue