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

366
Scripts/Items/Resources/Tailor/YarnsAndThreads.cs
View file

@ -2,232 +2,232 @@ using Server.Targeting;
namespace Server.Items
{
public abstract class BaseClothMaterial : Item, IDyable
{
public BaseClothMaterial( int itemID ) : this( itemID, 1 )
{
}
public abstract class BaseClothMaterial : Item, IDyable
{
public BaseClothMaterial(int itemID) : this(itemID, 1)
{
}
public BaseClothMaterial( int itemID, int amount ) : base( itemID )
{
Stackable = true;
Weight = 1.0;
Amount = amount;
}
public BaseClothMaterial(int itemID, int amount) : base(itemID)
{
Stackable = true;
Weight = 1.0;
Amount = amount;
}
public BaseClothMaterial( Serial serial ) : base( serial )
{
}
public BaseClothMaterial(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public bool Dye(Mobile from, DyeTub sender)
{
if (Deleted)
return false;
writer.Write( (int) 0 ); // version
}
Hue = sender.DyedHue;
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
return true;
}
int version = reader.ReadInt();
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public bool Dye( Mobile from, DyeTub sender )
{
if ( Deleted )
return false;
writer.Write(0); // version
}
Hue = sender.DyedHue;
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
return true;
}
int version = reader.ReadInt();
}
public override void OnDoubleClick( Mobile from )
{
if ( IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 500366 ); // Select a loom to use that on.
from.Target = new PickLoomTarget( this );
}
else
{
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
}
}
public override void OnDoubleClick(Mobile from)
{
if (IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(500366); // Select a loom to use that on.
from.Target = new PickLoomTarget(this);
}
else
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
}
private class PickLoomTarget : Target
{
private BaseClothMaterial m_Material;
private class PickLoomTarget : Target
{
private BaseClothMaterial m_Material;
public PickLoomTarget( BaseClothMaterial material ) : base( 3, false, TargetFlags.None )
{
m_Material = material;
}
public PickLoomTarget(BaseClothMaterial material) : base(3, false, TargetFlags.None)
{
m_Material = material;
}
protected override void OnTarget( Mobile from, object targeted )
{
if ( m_Material.Deleted )
return;
protected override void OnTarget(Mobile from, object targeted)
{
if (m_Material.Deleted)
return;
ILoom loom = targeted as ILoom;
ILoom loom = targeted as ILoom;
if ( loom == null && targeted is AddonComponent component )
loom = component.Addon as ILoom;
if (loom == null && targeted is AddonComponent component)
loom = component.Addon as ILoom;
if ( loom != null )
{
if ( !m_Material.IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
}
else if ( loom.Phase < 4 )
{
m_Material.Consume();
if (loom != null)
{
if (!m_Material.IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
else if (loom.Phase < 4)
{
m_Material.Consume();
if ( targeted is Item item )
item.SendLocalizedMessageTo( from, 1010001 + loom.Phase++ );
}
else
{
Item create = new BoltOfCloth();
create.Hue = m_Material.Hue;
if (targeted is Item item)
item.SendLocalizedMessageTo(from, 1010001 + loom.Phase++);
}
else
{
Item create = new BoltOfCloth();
create.Hue = m_Material.Hue;
m_Material.Consume();
loom.Phase = 0;
from.SendLocalizedMessage( 500368 ); // You create some cloth and put it in your backpack.
from.AddToBackpack( create );
}
}
else
{
from.SendLocalizedMessage( 500367 ); // Try using that on a loom.
}
}
}
}
m_Material.Consume();
loom.Phase = 0;
from.SendLocalizedMessage(500368); // You create some cloth and put it in your backpack.
from.AddToBackpack(create);
}
}
else
{
from.SendLocalizedMessage(500367); // Try using that on a loom.
}
}
}
}
public class DarkYarn : BaseClothMaterial
{
[Constructible]
public DarkYarn() : this( 1 )
{
}
public class DarkYarn : BaseClothMaterial
{
[Constructible]
public DarkYarn() : this(1)
{
}
[Constructible]
public DarkYarn( int amount ) : base( 0xE1D, amount )
{
}
[Constructible]
public DarkYarn(int amount) : base(0xE1D, amount)
{
}
public DarkYarn( Serial serial ) : base( serial )
{
}
public DarkYarn(Serial serial) : base(serial)
{
}
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();
}
}
public class LightYarn : BaseClothMaterial
{
[Constructible]
public LightYarn() : this( 1 )
{
}
public class LightYarn : BaseClothMaterial
{
[Constructible]
public LightYarn() : this(1)
{
}
[Constructible]
public LightYarn( int amount ) : base( 0xE1E, amount )
{
}
[Constructible]
public LightYarn(int amount) : base(0xE1E, amount)
{
}
public LightYarn( Serial serial ) : base( serial )
{
}
public LightYarn(Serial serial) : base(serial)
{
}
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();
}
}
public class LightYarnUnraveled : BaseClothMaterial
{
[Constructible]
public LightYarnUnraveled() : this( 1 )
{
}
public class LightYarnUnraveled : BaseClothMaterial
{
[Constructible]
public LightYarnUnraveled() : this(1)
{
}
[Constructible]
public LightYarnUnraveled( int amount ) : base( 0xE1F, amount )
{
}
[Constructible]
public LightYarnUnraveled(int amount) : base(0xE1F, amount)
{
}
public LightYarnUnraveled( Serial serial ) : base( serial )
{
}
public LightYarnUnraveled(Serial serial) : base(serial)
{
}
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();
}
}
public class SpoolOfThread : BaseClothMaterial
{
[Constructible]
public SpoolOfThread() : this( 1 )
{
}
public class SpoolOfThread : BaseClothMaterial
{
[Constructible]
public SpoolOfThread() : this(1)
{
}
[Constructible]
public SpoolOfThread( int amount ) : base( 0xFA0, amount )
{
}
[Constructible]
public SpoolOfThread(int amount) : base(0xFA0, amount)
{
}
public SpoolOfThread( Serial serial ) : base( serial )
{
}
public SpoolOfThread(Serial serial) : base(serial)
{
}
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();
}
}
}