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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

68
Scripts/Items/Farming/FarmableCabbage.cs
View file

@ -1,47 +1,47 @@
namespace Server.Items
{
public class FarmableCabbage : FarmableCrop
{
public static int GetCropID()
{
return 3254;
}
public class FarmableCabbage : FarmableCrop
{
[Constructible]
public FarmableCabbage() : base(GetCropID())
{
}
public override Item GetCropObject()
{
Cabbage cabbage = new Cabbage();
public FarmableCabbage(Serial serial) : base(serial)
{
}
cabbage.ItemID = Utility.Random( 3195, 2 );
public static int GetCropID()
{
return 3254;
}
return cabbage;
}
public override Item GetCropObject()
{
Cabbage cabbage = new Cabbage();
public override int GetPickedID()
{
return 3254;
}
cabbage.ItemID = Utility.Random(3195, 2);
[Constructible]
public FarmableCabbage() : base( GetCropID() )
{
}
return cabbage;
}
public FarmableCabbage( Serial serial ) : base( serial )
{
}
public override int GetPickedID()
{
return 3254;
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
}
writer.WriteEncodedInt(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
}
}
int version = reader.ReadEncodedInt();
}
}
}

68
Scripts/Items/Farming/FarmableCarrot.cs
View file

@ -1,47 +1,47 @@
namespace Server.Items
{
public class FarmableCarrot : FarmableCrop
{
public static int GetCropID()
{
return 3190;
}
public class FarmableCarrot : FarmableCrop
{
[Constructible]
public FarmableCarrot() : base(GetCropID())
{
}
public override Item GetCropObject()
{
Carrot carrot = new Carrot();
public FarmableCarrot(Serial serial) : base(serial)
{
}
carrot.ItemID = Utility.Random( 3191, 2 );
public static int GetCropID()
{
return 3190;
}
return carrot;
}
public override Item GetCropObject()
{
Carrot carrot = new Carrot();
public override int GetPickedID()
{
return 3254;
}
carrot.ItemID = Utility.Random(3191, 2);
[Constructible]
public FarmableCarrot() : base( GetCropID() )
{
}
return carrot;
}
public FarmableCarrot( Serial serial ) : base( serial )
{
}
public override int GetPickedID()
{
return 3254;
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
}
writer.WriteEncodedInt(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
}
}
int version = reader.ReadEncodedInt();
}
}
}

64
Scripts/Items/Farming/FarmableCotton.cs
View file

@ -1,43 +1,43 @@
namespace Server.Items
{
public class FarmableCotton : FarmableCrop
{
public static int GetCropID()
{
return Utility.Random( 3153, 4 );
}
public class FarmableCotton : FarmableCrop
{
[Constructible]
public FarmableCotton() : base(GetCropID())
{
}
public override Item GetCropObject()
{
return new Cotton();
}
public FarmableCotton(Serial serial) : base(serial)
{
}
public override int GetPickedID()
{
return 3254;
}
public static int GetCropID()
{
return Utility.Random(3153, 4);
}
[Constructible]
public FarmableCotton() : base( GetCropID() )
{
}
public override Item GetCropObject()
{
return new Cotton();
}
public FarmableCotton( Serial serial ) : base( serial )
{
}
public override int GetPickedID()
{
return 3254;
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
}
writer.WriteEncodedInt(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
}
}
int version = reader.ReadEncodedInt();
}
}
}

128
Scripts/Items/Farming/FarmableCrop.cs
View file

@ -3,89 +3,89 @@ using Server.Network;
namespace Server.Items
{
public abstract class FarmableCrop : Item
{
private bool m_Picked;
public abstract class FarmableCrop : Item
{
private bool m_Picked;
public abstract Item GetCropObject();
public abstract int GetPickedID();
public FarmableCrop(int itemID) : base(itemID)
{
Movable = false;
}
public FarmableCrop( int itemID ) : base( itemID )
{
Movable = false;
}
public FarmableCrop(Serial serial) : base(serial)
{
}
public override void OnDoubleClick( Mobile from )
{
Map map = Map;
Point3D loc = Location;
public abstract Item GetCropObject();
public abstract int GetPickedID();
if ( Parent != null || Movable || IsLockedDown || IsSecure || map == null || map == Map.Internal )
return;
public override void OnDoubleClick(Mobile from)
{
Map map = Map;
Point3D loc = Location;
if ( !from.InRange( loc, 2 ) || !from.InLOS( this ) )
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
else if ( !m_Picked )
OnPicked( from, loc, map );
}
if (Parent != null || Movable || IsLockedDown || IsSecure || map == null || map == Map.Internal)
return;
public virtual void OnPicked( Mobile from, Point3D loc, Map map )
{
ItemID = GetPickedID();
if (!from.InRange(loc, 2) || !from.InLOS(this))
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
else if (!m_Picked)
OnPicked(from, loc, map);
}
Item spawn = GetCropObject();
public virtual void OnPicked(Mobile from, Point3D loc, Map map)
{
ItemID = GetPickedID();
spawn?.MoveToWorld( loc, map );
Item spawn = GetCropObject();
m_Picked = true;
spawn?.MoveToWorld(loc, map);
Unlink();
m_Picked = true;
Timer.DelayCall( TimeSpan.FromMinutes( 5.0 ), Delete );
}
Unlink();
public void Unlink()
{
ISpawner se = Spawner;
Timer.DelayCall(TimeSpan.FromMinutes(5.0), Delete);
}
if ( se != null )
{
Spawner.Remove( this );
Spawner = null;
}
public void Unlink()
{
ISpawner se = Spawner;
}
if (se != null)
{
Spawner.Remove(this);
Spawner = null;
}
}
public FarmableCrop( Serial serial ) : base( serial )
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.WriteEncodedInt(0); // version
writer.WriteEncodedInt( 0 ); // version
writer.Write(m_Picked);
}
writer.Write( m_Picked );
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadEncodedInt();
int version = reader.ReadEncodedInt();
switch (version)
{
case 0:
m_Picked = reader.ReadBool();
break;
}
switch ( version )
{
case 0:
m_Picked = reader.ReadBool();
break;
}
if ( m_Picked )
{
Unlink();
Delete();
}
}
}
if (m_Picked)
{
Unlink();
Delete();
}
}
}
}

68
Scripts/Items/Farming/FarmableFlax.cs
View file

@ -1,47 +1,47 @@
namespace Server.Items
{
public class FarmableFlax : FarmableCrop
{
public static int GetCropID()
{
return Utility.Random( 6809, 3 );
}
public class FarmableFlax : FarmableCrop
{
[Constructible]
public FarmableFlax() : base(GetCropID())
{
}
public override Item GetCropObject()
{
Flax flax = new Flax();
public FarmableFlax(Serial serial) : base(serial)
{
}
flax.ItemID = Utility.Random( 6812, 2 );
public static int GetCropID()
{
return Utility.Random(6809, 3);
}
return flax;
}
public override Item GetCropObject()
{
Flax flax = new Flax();
public override int GetPickedID()
{
return 3254;
}
flax.ItemID = Utility.Random(6812, 2);
[Constructible]
public FarmableFlax() : base( GetCropID() )
{
}
return flax;
}
public FarmableFlax( Serial serial ) : base( serial )
{
}
public override int GetPickedID()
{
return 3254;
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
}
writer.WriteEncodedInt(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
}
}
int version = reader.ReadEncodedInt();
}
}
}

68
Scripts/Items/Farming/FarmableLettuce.cs
View file

@ -1,47 +1,47 @@
namespace Server.Items
{
public class FarmableLettuce : FarmableCrop
{
public static int GetCropID()
{
return 3254;
}
public class FarmableLettuce : FarmableCrop
{
[Constructible]
public FarmableLettuce() : base(GetCropID())
{
}
public override Item GetCropObject()
{
Lettuce lettuce = new Lettuce();
public FarmableLettuce(Serial serial) : base(serial)
{
}
lettuce.ItemID = Utility.Random( 3184, 2 );
public static int GetCropID()
{
return 3254;
}
return lettuce;
}
public override Item GetCropObject()
{
Lettuce lettuce = new Lettuce();
public override int GetPickedID()
{
return 3254;
}
lettuce.ItemID = Utility.Random(3184, 2);
[Constructible]
public FarmableLettuce() : base( GetCropID() )
{
}
return lettuce;
}
public FarmableLettuce( Serial serial ) : base( serial )
{
}
public override int GetPickedID()
{
return 3254;
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
}
writer.WriteEncodedInt(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
}
}
int version = reader.ReadEncodedInt();
}
}
}

68
Scripts/Items/Farming/FarmableOnion.cs
View file

@ -1,47 +1,47 @@
namespace Server.Items
{
public class FarmableOnion : FarmableCrop
{
public static int GetCropID()
{
return 3183;
}
public class FarmableOnion : FarmableCrop
{
[Constructible]
public FarmableOnion() : base(GetCropID())
{
}
public override Item GetCropObject()
{
Onion onion = new Onion();
public FarmableOnion(Serial serial) : base(serial)
{
}
onion.ItemID = Utility.Random( 3181, 2 );
public static int GetCropID()
{
return 3183;
}
return onion;
}
public override Item GetCropObject()
{
Onion onion = new Onion();
public override int GetPickedID()
{
return 3254;
}
onion.ItemID = Utility.Random(3181, 2);
[Constructible]
public FarmableOnion() : base( GetCropID() )
{
}
return onion;
}
public FarmableOnion( Serial serial ) : base( serial )
{
}
public override int GetPickedID()
{
return 3254;
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
}
writer.WriteEncodedInt(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
}
}
int version = reader.ReadEncodedInt();
}
}
}

72
Scripts/Items/Farming/FarmablePumpkin.cs
View file

@ -1,49 +1,49 @@
namespace Server.Items
{
public class FarmablePumpkin : FarmableCrop
{
public static int GetCropID()
{
return Utility.Random( 3166, 3 );
}
public class FarmablePumpkin : FarmableCrop
{
[Constructible]
public FarmablePumpkin()
: base(GetCropID())
{
}
public override Item GetCropObject()
{
Pumpkin pumpkin = new Pumpkin();
public FarmablePumpkin(Serial serial)
: base(serial)
{
}
pumpkin.ItemID = Utility.Random( 3178, 3 );
public static int GetCropID()
{
return Utility.Random(3166, 3);
}
return pumpkin;
}
public override Item GetCropObject()
{
Pumpkin pumpkin = new Pumpkin();
public override int GetPickedID()
{
return Utility.Random( 3166, 3 );
}
pumpkin.ItemID = Utility.Random(3178, 3);
[Constructible]
public FarmablePumpkin()
: base( GetCropID() )
{
}
return pumpkin;
}
public FarmablePumpkin( Serial serial )
: base( serial )
{
}
public override int GetPickedID()
{
return Utility.Random(3166, 3);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( (int) 0 ); // version
}
writer.WriteEncodedInt(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
}
}
int version = reader.ReadEncodedInt();
}
}
}

68
Scripts/Items/Farming/FarmableTurnip.cs
View file

@ -1,47 +1,47 @@
namespace Server.Items
{
public class FarmableTurnip : FarmableCrop
{
public static int GetCropID()
{
return Utility.Random( 3169, 3 );
}
public class FarmableTurnip : FarmableCrop
{
[Constructible]
public FarmableTurnip() : base(GetCropID())
{
}
public override Item GetCropObject()
{
Turnip turnip = new Turnip();
public FarmableTurnip(Serial serial) : base(serial)
{
}
turnip.ItemID = Utility.Random( 3385, 2 );
public static int GetCropID()
{
return Utility.Random(3169, 3);
}
return turnip;
}
public override Item GetCropObject()
{
Turnip turnip = new Turnip();
public override int GetPickedID()
{
return 3254;
}
turnip.ItemID = Utility.Random(3385, 2);
[Constructible]
public FarmableTurnip() : base( GetCropID() )
{
}
return turnip;
}
public FarmableTurnip( Serial serial ) : base( serial )
{
}
public override int GetPickedID()
{
return 3254;
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
}
writer.WriteEncodedInt(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
}
}
int version = reader.ReadEncodedInt();
}
}
}

64
Scripts/Items/Farming/FarmableWheat.cs
View file

@ -1,43 +1,43 @@
namespace Server.Items
{
public class FarmableWheat : FarmableCrop
{
public static int GetCropID()
{
return Utility.Random( 3157, 4 );
}
public class FarmableWheat : FarmableCrop
{
[Constructible]
public FarmableWheat() : base(GetCropID())
{
}
public override Item GetCropObject()
{
return new WheatSheaf();
}
public FarmableWheat(Serial serial) : base(serial)
{
}
public override int GetPickedID()
{
return Utility.Random( 3502, 2 );
}
public static int GetCropID()
{
return Utility.Random(3157, 4);
}
[Constructible]
public FarmableWheat() : base( GetCropID() )
{
}
public override Item GetCropObject()
{
return new WheatSheaf();
}
public FarmableWheat( Serial serial ) : base( serial )
{
}
public override int GetPickedID()
{
return Utility.Random(3502, 2);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
}
writer.WriteEncodedInt(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
}
}
int version = reader.ReadEncodedInt();
}
}
}