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

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();
}
}
}
}