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

187
Scripts/Items/Skill Items/Tailor Items/Misc/Dyes.cs
View file

@ -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;
}
}
}
}
}