Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -1,46 +1,45 @@
using Server.Mobiles;
using Server.Gumps;
using Server.Mobiles;
namespace Server.Items
{
public abstract class BaseImprisonedMobile : Item
{
public abstract BaseCreature Summon{ get; }
[Constructible]
public BaseImprisonedMobile( int itemID ) : base( itemID )
{
}
public abstract class BaseImprisonedMobile : Item
{
[Constructible]
public BaseImprisonedMobile(int itemID) : base(itemID)
{
}
public BaseImprisonedMobile( Serial serial ) : base( serial )
{
}
public override void OnDoubleClick( Mobile from )
{
if ( IsChildOf( from.Backpack ) )
from.SendGump( new ConfirmBreakCrystalGump( this ) );
else
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
}
public BaseImprisonedMobile(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 ); // version
}
public abstract BaseCreature Summon{ get; }
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
public virtual void Release( Mobile from, BaseCreature summon )
{
}
}
}
public override void OnDoubleClick(Mobile from)
{
if (IsChildOf(from.Backpack))
from.SendGump(new ConfirmBreakCrystalGump(this));
else
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
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 virtual void Release(Mobile from, BaseCreature summon)
{
}
}
}

View file

@ -3,79 +3,76 @@ using Server.Mobiles;
namespace Server.Items
{
public class GrizzledMareStatuette : BaseImprisonedMobile
{
public override int LabelNumber => 1074475; // Grizzled Mare Statuette
public override BaseCreature Summon => new GrizzledMare();
public class GrizzledMareStatuette : BaseImprisonedMobile
{
[Constructible]
public GrizzledMareStatuette() : base(0x2617)
{
Weight = 1.0;
}
[Constructible]
public GrizzledMareStatuette() : base( 0x2617 )
{
Weight = 1.0;
}
public GrizzledMareStatuette(Serial serial) : base(serial)
{
}
public GrizzledMareStatuette( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1074475; // Grizzled Mare Statuette
public override BaseCreature Summon => new GrizzledMare();
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
}
namespace Server.Mobiles
{
public class GrizzledMare : HellSteed
{
public override bool DeleteOnRelease => true;
public class GrizzledMare : HellSteed
{
private static readonly string m_Myname = "a grizzled mare";
private static readonly string m_Myname = "a grizzled mare";
[Constructible]
public GrizzledMare()
: base(m_Myname)
{
}
[Constructible]
public GrizzledMare()
: base( m_Myname )
{
}
public GrizzledMare(Serial serial) : base(serial)
{
}
public virtual void OnAfterDeserialize_Callback()
{
SetStats( this );
public override bool DeleteOnRelease => true;
Name = m_Myname;
}
public virtual void OnAfterDeserialize_Callback()
{
SetStats(this);
public GrizzledMare( Serial serial ) : base( serial )
{
}
Name = m_Myname;
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 1 ); // version
}
writer.Write(1); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
int version = reader.ReadInt();
if ( version < 1 )
{
Timer.DelayCall( TimeSpan.FromSeconds( 0 ), OnAfterDeserialize_Callback );
}
}
}
}
if (version < 1) Timer.DelayCall(TimeSpan.FromSeconds(0), OnAfterDeserialize_Callback);
}
}
}

View file

@ -1,32 +1,31 @@
namespace Server.Items
{
public class MinotaurHedge : Item
{
public override string DefaultName => "minotaur hedge";
public class MinotaurHedge : Item
{
[Constructible]
public MinotaurHedge() : base(Utility.Random(3215, 4))
{
Weight = 1.0;
}
[Constructible]
public MinotaurHedge() : base( Utility.Random( 3215, 4 ) )
{
Weight = 1.0;
}
public MinotaurHedge(Serial serial) : base(serial)
{
}
public MinotaurHedge( Serial serial ) : base( serial )
{
}
public override string DefaultName => "minotaur hedge";
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

View file

@ -1,32 +1,31 @@
namespace Server.Items
{
public class TormentedChains : Item
{
public override string DefaultName => "chains of the tormented";
public class TormentedChains : Item
{
[Constructible]
public TormentedChains() : base(Utility.Random(6663, 2))
{
Weight = 1.0;
}
[Constructible]
public TormentedChains() : base( Utility.Random( 6663, 2 ) )
{
Weight = 1.0;
}
public TormentedChains(Serial serial) : base(serial)
{
}
public TormentedChains( Serial serial ) : base( serial )
{
}
public override string DefaultName => "chains of the tormented";
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}