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,30 +1,30 @@
|
|||
namespace Server.Items
|
||||
{
|
||||
[FlippableAttribute(0xec6, 0xec7)]
|
||||
public class Dressform : Item
|
||||
{
|
||||
[Constructible]
|
||||
public Dressform() : base(0xec6)
|
||||
{
|
||||
Weight = 10;
|
||||
}
|
||||
[Flippable(0xec6, 0xec7)]
|
||||
public class Dressform : Item
|
||||
{
|
||||
[Constructible]
|
||||
public Dressform() : base(0xec6)
|
||||
{
|
||||
Weight = 10;
|
||||
}
|
||||
|
||||
public Dressform(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
public Dressform(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);
|
||||
}
|
||||
writer.Write(0);
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,122 +1,111 @@
|
|||
using Server.Targeting;
|
||||
using Server.HuePickers;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Items
|
||||
{
|
||||
public class Dyes : Item /* , IUsesRemaining */ /* TODO complete usesremaing */
|
||||
{
|
||||
/*
|
||||
public bool ShowUsesRemaining { get { return false; } set { } }
|
||||
public class Dyes : Item /* , IUsesRemaining */ /* TODO complete usesremaing */
|
||||
{
|
||||
/*
|
||||
public bool ShowUsesRemaining { get { return false; } set { } }
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public virtual int UsesRemaining { get { return m_UsesRemaining; } set { m_UsesRemaining = value; } }
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public virtual int UsesRemaining { get { return m_UsesRemaining; } set { m_UsesRemaining = value; } }
|
||||
|
||||
private int m_UsesRemaining;
|
||||
*/
|
||||
private int m_UsesRemaining;
|
||||
*/
|
||||
|
||||
[Constructible]
|
||||
public Dyes() : base( 0xFA9 )
|
||||
{
|
||||
Weight = 3.0;
|
||||
[Constructible]
|
||||
public Dyes() : base(0xFA9)
|
||||
{
|
||||
Weight = 3.0;
|
||||
|
||||
/* m_UsesRemaining = 25; */
|
||||
}
|
||||
/* m_UsesRemaining = 25; */
|
||||
}
|
||||
|
||||
public Dyes( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public Dyes(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) 1 ); // version
|
||||
writer.Write(1); // version
|
||||
|
||||
/* writer.Write( ( int )m_UsesRemaining ); */
|
||||
}
|
||||
/* writer.Write( ( int )m_UsesRemaining ); */
|
||||
}
|
||||
|
||||
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 ( Weight == 0.0 )
|
||||
Weight = 3.0;
|
||||
if (Weight == 0.0)
|
||||
Weight = 3.0;
|
||||
|
||||
/* m_UsesRemaining = ( version == 0 ) ? 25 : reader.ReadInt(); */
|
||||
}
|
||||
/* m_UsesRemaining = ( version == 0 ) ? 25 : reader.ReadInt(); */
|
||||
}
|
||||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
from.SendLocalizedMessage( 500856 ); // Select the dye tub to use the dyes on.
|
||||
from.Target = new InternalTarget();
|
||||
}
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
from.SendLocalizedMessage(500856); // Select the dye tub to use the dyes on.
|
||||
from.Target = new InternalTarget();
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
public InternalTarget() : base( 1, false, TargetFlags.None )
|
||||
{
|
||||
}
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
public InternalTarget() : base(1, false, TargetFlags.None)
|
||||
{
|
||||
}
|
||||
|
||||
private class InternalPicker : HuePicker
|
||||
{
|
||||
private DyeTub m_Tub;
|
||||
public virtual void SetTubHue(Mobile from, object state, int hue)
|
||||
{
|
||||
if (state is DyeTub tub) tub.DyedHue = hue;
|
||||
}
|
||||
|
||||
public InternalPicker( DyeTub tub ) : base( tub.ItemID )
|
||||
{
|
||||
m_Tub = tub;
|
||||
}
|
||||
protected override void OnTarget(Mobile from, object targeted)
|
||||
{
|
||||
if (targeted is DyeTub tub)
|
||||
{
|
||||
if (tub.Redyable)
|
||||
{
|
||||
if (tub.MetallicHues) /* OSI has three metallic tubs now */
|
||||
from.SendGump(new MetallicHuePicker(from, SetTubHue, tub));
|
||||
else if (tub.CustomHuePicker != null)
|
||||
from.SendGump(new CustomHuePickerGump(from, tub.CustomHuePicker, SetTubHue, tub));
|
||||
else
|
||||
from.SendHuePicker(new InternalPicker(tub));
|
||||
}
|
||||
else if (tub is BlackDyeTub)
|
||||
{
|
||||
from.SendLocalizedMessage(1010092); // You can not use this on a black dye tub.
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendMessage("That dye tub may not be redyed.");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage(500857); // Use this on a dye tub.
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnResponse( int hue )
|
||||
{
|
||||
m_Tub.DyedHue = hue;
|
||||
}
|
||||
}
|
||||
private class InternalPicker : HuePicker
|
||||
{
|
||||
private DyeTub m_Tub;
|
||||
|
||||
public virtual void SetTubHue( Mobile from, object state, int hue )
|
||||
{
|
||||
if ( state is DyeTub tub )
|
||||
{
|
||||
tub.DyedHue = hue;
|
||||
public InternalPicker(DyeTub tub) : base(tub.ItemID)
|
||||
{
|
||||
m_Tub = tub;
|
||||
}
|
||||
|
||||
/* dyes.m_UsesRemaining--; let this change ride till the overhaul */
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnTarget( Mobile from, object targeted )
|
||||
{
|
||||
if ( targeted is DyeTub tub )
|
||||
{
|
||||
if ( tub.Redyable )
|
||||
{
|
||||
if ( tub.MetallicHues ) /* OSI has three metallic tubs now */
|
||||
{
|
||||
from.SendGump( new MetallicHuePicker( from, SetTubHue, tub ) );
|
||||
}
|
||||
else if ( tub.CustomHuePicker != null )
|
||||
{
|
||||
from.SendGump( new CustomHuePickerGump( from, tub.CustomHuePicker, SetTubHue, tub ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendHuePicker( new InternalPicker( tub ) );
|
||||
}
|
||||
}
|
||||
else if ( tub is BlackDyeTub )
|
||||
{
|
||||
from.SendLocalizedMessage( 1010092 ); // You can not use this on a black dye tub.
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendMessage( "That dye tub may not be redyed." );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage( 500857 ); // Use this on a dye tub.
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
public override void OnResponse(int hue)
|
||||
{
|
||||
m_Tub.DyedHue = hue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,114 +2,118 @@ using Server.Targeting;
|
|||
|
||||
namespace Server.Items
|
||||
{
|
||||
public interface IScissorable
|
||||
{
|
||||
bool Scissor( Mobile from, Scissors scissors );
|
||||
}
|
||||
public interface IScissorable
|
||||
{
|
||||
bool Scissor(Mobile from, Scissors scissors);
|
||||
}
|
||||
|
||||
[FlippableAttribute( 0xf9f, 0xf9e )]
|
||||
public class Scissors : Item
|
||||
{
|
||||
[Constructible]
|
||||
public Scissors() : base( 0xF9F )
|
||||
{
|
||||
Weight = 1.0;
|
||||
}
|
||||
[Flippable(0xf9f, 0xf9e)]
|
||||
public class Scissors : Item
|
||||
{
|
||||
[Constructible]
|
||||
public Scissors() : base(0xF9F)
|
||||
{
|
||||
Weight = 1.0;
|
||||
}
|
||||
|
||||
public Scissors( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public Scissors(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 override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
from.SendLocalizedMessage( 502434 ); // What should I use these scissors on?
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
from.SendLocalizedMessage(502434); // What should I use these scissors on?
|
||||
|
||||
from.Target = new InternalTarget( this );
|
||||
}
|
||||
from.Target = new InternalTarget(this);
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private Scissors m_Item;
|
||||
public static bool CanScissor(Mobile from, IScissorable obj)
|
||||
{
|
||||
if (obj is Item item && item.Nontransferable)
|
||||
{
|
||||
from.SendLocalizedMessage(502440); // Scissors can not be used on that to produce anything.
|
||||
return false;
|
||||
}
|
||||
|
||||
public InternalTarget( Scissors item ) : base( 2, false, TargetFlags.None )
|
||||
{
|
||||
m_Item = item;
|
||||
}
|
||||
// TODO: Move other general checks from the different implementations here
|
||||
|
||||
protected override void OnTarget( Mobile from, object targeted )
|
||||
{
|
||||
if ( m_Item.Deleted )
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
|
||||
/*if ( targeted is Item && !((Item)targeted).IsStandardLoot() )
|
||||
{
|
||||
from.SendLocalizedMessage( 502440 ); // Scissors can not be used on that to produce anything.
|
||||
}
|
||||
else */
|
||||
if ( Core.AOS && targeted == from )
|
||||
{
|
||||
from.SendLocalizedMessage( 1062845 + Utility.Random( 3 ) ); //"That doesn't seem like the smartest thing to do." / "That was an encounter you don't wish to repeat." / "Ha! You missed!"
|
||||
}
|
||||
else if (Core.SE && Utility.RandomDouble() > .20 && (from.Direction & Direction.Running) != 0 && (Core.TickCount - from.LastMoveTime) < from.ComputeMovementSpeed(from.Direction))
|
||||
{
|
||||
from.SendLocalizedMessage( 1063305 ); // Didn't your parents ever tell you not to run with scissors in your hand?!
|
||||
}
|
||||
else if ( targeted is Item item && !item.Movable )
|
||||
{
|
||||
if ( item is IScissorable obj && ( obj is PlagueBeastInnard || obj is PlagueBeastMutationCore ) )
|
||||
{
|
||||
if ( CanScissor( from, obj ) && obj.Scissor( from, m_Item ) )
|
||||
from.PlaySound( 0x248 );
|
||||
}
|
||||
}
|
||||
else if ( targeted is IScissorable obj )
|
||||
{
|
||||
if ( CanScissor( from, obj ) && obj.Scissor( from, m_Item ) )
|
||||
from.PlaySound( 0x248 );
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage( 502440 ); // Scissors can not be used on that to produce anything.
|
||||
}
|
||||
}
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private Scissors m_Item;
|
||||
|
||||
protected override void OnNonlocalTarget( Mobile from, object targeted )
|
||||
{
|
||||
if ( targeted is IScissorable obj && ( obj is PlagueBeastInnard || obj is PlagueBeastMutationCore ) )
|
||||
{
|
||||
if ( CanScissor( from, obj ) && obj.Scissor( from, m_Item ) )
|
||||
from.PlaySound( 0x248 );
|
||||
}
|
||||
else
|
||||
base.OnNonlocalTarget( from, targeted );
|
||||
}
|
||||
}
|
||||
public InternalTarget(Scissors item) : base(2, false, TargetFlags.None)
|
||||
{
|
||||
m_Item = item;
|
||||
}
|
||||
|
||||
public static bool CanScissor( Mobile from, IScissorable obj )
|
||||
{
|
||||
if ( obj is Item item && item.Nontransferable )
|
||||
{
|
||||
from.SendLocalizedMessage( 502440 ); // Scissors can not be used on that to produce anything.
|
||||
return false;
|
||||
}
|
||||
protected override void OnTarget(Mobile from, object targeted)
|
||||
{
|
||||
if (m_Item.Deleted)
|
||||
return;
|
||||
|
||||
// TODO: Move other general checks from the different implementations here
|
||||
/*if ( targeted is Item && !((Item)targeted).IsStandardLoot() )
|
||||
{
|
||||
from.SendLocalizedMessage( 502440 ); // Scissors can not be used on that to produce anything.
|
||||
}
|
||||
else */
|
||||
if (Core.AOS && targeted == from)
|
||||
{
|
||||
from.SendLocalizedMessage(
|
||||
1062845 + Utility
|
||||
.Random(3)); //"That doesn't seem like the smartest thing to do." / "That was an encounter you don't wish to repeat." / "Ha! You missed!"
|
||||
}
|
||||
else if (Core.SE && Utility.RandomDouble() > .20 && (from.Direction & Direction.Running) != 0 &&
|
||||
Core.TickCount - from.LastMoveTime < from.ComputeMovementSpeed(from.Direction))
|
||||
{
|
||||
from.SendLocalizedMessage(
|
||||
1063305); // Didn't your parents ever tell you not to run with scissors in your hand?!
|
||||
}
|
||||
else if (targeted is Item item && !item.Movable)
|
||||
{
|
||||
if (item is IScissorable obj && (obj is PlagueBeastInnard || obj is PlagueBeastMutationCore))
|
||||
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
|
||||
from.PlaySound(0x248);
|
||||
}
|
||||
else if (targeted is IScissorable obj)
|
||||
{
|
||||
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
|
||||
from.PlaySound(0x248);
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage(502440); // Scissors can not be used on that to produce anything.
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
protected override void OnNonlocalTarget(Mobile from, object targeted)
|
||||
{
|
||||
if (targeted is IScissorable obj && (obj is PlagueBeastInnard || obj is PlagueBeastMutationCore))
|
||||
{
|
||||
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
|
||||
from.PlaySound(0x248);
|
||||
}
|
||||
else
|
||||
{
|
||||
base.OnNonlocalTarget(from, targeted);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue