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
|
|
@ -2,256 +2,257 @@ using System;
|
|||
|
||||
namespace Server.Items
|
||||
{
|
||||
[Flippable( 0x1EC0, 0x1EC3 )]
|
||||
public class PickpocketDip : AddonComponent
|
||||
{
|
||||
private Timer m_Timer;
|
||||
[Flippable(0x1EC0, 0x1EC3)]
|
||||
public class PickpocketDip : AddonComponent
|
||||
{
|
||||
private Timer m_Timer;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public double MinSkill { get; set; }
|
||||
public PickpocketDip(int itemID) : base(itemID)
|
||||
{
|
||||
MinSkill = -25.0;
|
||||
MaxSkill = +25.0;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public double MaxSkill { get; set; }
|
||||
public PickpocketDip(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Swinging => ( m_Timer != null );
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public double MinSkill{ get; set; }
|
||||
|
||||
public PickpocketDip( int itemID ) : base( itemID )
|
||||
{
|
||||
MinSkill = -25.0;
|
||||
MaxSkill = +25.0;
|
||||
}
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public double MaxSkill{ get; set; }
|
||||
|
||||
public void UpdateItemID()
|
||||
{
|
||||
int baseItemID = 0x1EC0 + (((ItemID - 0x1EC0) / 3) * 3);
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public bool Swinging => m_Timer != null;
|
||||
|
||||
ItemID = baseItemID + (Swinging ? 1 : 0);
|
||||
}
|
||||
public void UpdateItemID()
|
||||
{
|
||||
int baseItemID = 0x1EC0 + (ItemID - 0x1EC0) / 3 * 3;
|
||||
|
||||
public void BeginSwing()
|
||||
{
|
||||
m_Timer?.Stop();
|
||||
ItemID = baseItemID + (Swinging ? 1 : 0);
|
||||
}
|
||||
|
||||
m_Timer = new InternalTimer( this );
|
||||
m_Timer.Start();
|
||||
public void BeginSwing()
|
||||
{
|
||||
m_Timer?.Stop();
|
||||
|
||||
UpdateItemID();
|
||||
}
|
||||
m_Timer = new InternalTimer(this);
|
||||
m_Timer.Start();
|
||||
|
||||
public void EndSwing()
|
||||
{
|
||||
m_Timer?.Stop();
|
||||
UpdateItemID();
|
||||
}
|
||||
|
||||
m_Timer = null;
|
||||
public void EndSwing()
|
||||
{
|
||||
m_Timer?.Stop();
|
||||
|
||||
UpdateItemID();
|
||||
}
|
||||
m_Timer = null;
|
||||
|
||||
public void Use( Mobile from )
|
||||
{
|
||||
from.Direction = from.GetDirectionTo( GetWorldLocation() );
|
||||
UpdateItemID();
|
||||
}
|
||||
|
||||
Effects.PlaySound( GetWorldLocation(), Map, 0x4F );
|
||||
public void Use(Mobile from)
|
||||
{
|
||||
from.Direction = from.GetDirectionTo(GetWorldLocation());
|
||||
|
||||
if ( from.CheckSkill( SkillName.Stealing, MinSkill, MaxSkill ) )
|
||||
{
|
||||
SendLocalizedMessageTo( from, 501834 ); // You successfully avoid disturbing the dip while searching it.
|
||||
}
|
||||
else
|
||||
{
|
||||
Effects.PlaySound( GetWorldLocation(), Map, 0x390 );
|
||||
Effects.PlaySound(GetWorldLocation(), Map, 0x4F);
|
||||
|
||||
BeginSwing();
|
||||
ProcessDelta();
|
||||
SendLocalizedMessageTo( from, 501831 ); // You carelessly bump the dip and start it swinging.
|
||||
}
|
||||
}
|
||||
if (from.CheckSkill(SkillName.Stealing, MinSkill, MaxSkill))
|
||||
{
|
||||
SendLocalizedMessageTo(from, 501834); // You successfully avoid disturbing the dip while searching it.
|
||||
}
|
||||
else
|
||||
{
|
||||
Effects.PlaySound(GetWorldLocation(), Map, 0x390);
|
||||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
if ( !from.InRange( GetWorldLocation(), 1 ) )
|
||||
SendLocalizedMessageTo( from, 501816 ); // You are too far away to do that.
|
||||
else if ( Swinging )
|
||||
SendLocalizedMessageTo( from, 501815 ); // You have to wait until it stops swinging.
|
||||
else if ( from.Skills[SkillName.Stealing].Base >= MaxSkill )
|
||||
SendLocalizedMessageTo( from, 501830 ); // Your ability to steal cannot improve any further by simply practicing on a dummy.
|
||||
else if ( from.Mounted )
|
||||
SendLocalizedMessageTo( from, 501829 ); // You can't practice on this while on a mount.
|
||||
else
|
||||
Use( from );
|
||||
}
|
||||
BeginSwing();
|
||||
ProcessDelta();
|
||||
SendLocalizedMessageTo(from, 501831); // You carelessly bump the dip and start it swinging.
|
||||
}
|
||||
}
|
||||
|
||||
public PickpocketDip( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
if (!from.InRange(GetWorldLocation(), 1))
|
||||
SendLocalizedMessageTo(from, 501816); // You are too far away to do that.
|
||||
else if (Swinging)
|
||||
SendLocalizedMessageTo(from, 501815); // You have to wait until it stops swinging.
|
||||
else if (from.Skills[SkillName.Stealing].Base >= MaxSkill)
|
||||
SendLocalizedMessageTo(from,
|
||||
501830); // Your ability to steal cannot improve any further by simply practicing on a dummy.
|
||||
else if (from.Mounted)
|
||||
SendLocalizedMessageTo(from, 501829); // You can't practice on this while on a mount.
|
||||
else
|
||||
Use(from);
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
writer.Write( MinSkill );
|
||||
writer.Write( MaxSkill );
|
||||
}
|
||||
writer.Write(MinSkill);
|
||||
writer.Write(MaxSkill);
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
switch ( version )
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
MinSkill = reader.ReadDouble();
|
||||
MaxSkill = reader.ReadDouble();
|
||||
switch (version)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
MinSkill = reader.ReadDouble();
|
||||
MaxSkill = reader.ReadDouble();
|
||||
|
||||
if ( MinSkill == 0.0 && MaxSkill == 30.0 )
|
||||
{
|
||||
MinSkill = -25.0;
|
||||
MaxSkill = +25.0;
|
||||
}
|
||||
if (MinSkill == 0.0 && MaxSkill == 30.0)
|
||||
{
|
||||
MinSkill = -25.0;
|
||||
MaxSkill = +25.0;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
UpdateItemID();
|
||||
}
|
||||
UpdateItemID();
|
||||
}
|
||||
|
||||
private class InternalTimer : Timer
|
||||
{
|
||||
private PickpocketDip m_Dip;
|
||||
private class InternalTimer : Timer
|
||||
{
|
||||
private PickpocketDip m_Dip;
|
||||
|
||||
public InternalTimer( PickpocketDip dip ) : base( TimeSpan.FromSeconds( 3.0 ) )
|
||||
{
|
||||
m_Dip = dip;
|
||||
Priority = TimerPriority.FiftyMS;
|
||||
}
|
||||
public InternalTimer(PickpocketDip dip) : base(TimeSpan.FromSeconds(3.0))
|
||||
{
|
||||
m_Dip = dip;
|
||||
Priority = TimerPriority.FiftyMS;
|
||||
}
|
||||
|
||||
protected override void OnTick()
|
||||
{
|
||||
m_Dip.EndSwing();
|
||||
}
|
||||
}
|
||||
}
|
||||
protected override void OnTick()
|
||||
{
|
||||
m_Dip.EndSwing();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class PickpocketDipEastAddon : BaseAddon
|
||||
{
|
||||
public override BaseAddonDeed Deed => new PickpocketDipEastDeed();
|
||||
public class PickpocketDipEastAddon : BaseAddon
|
||||
{
|
||||
[Constructible]
|
||||
public PickpocketDipEastAddon()
|
||||
{
|
||||
AddComponent(new PickpocketDip(0x1EC3), 0, 0, 0);
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public PickpocketDipEastAddon()
|
||||
{
|
||||
AddComponent( new PickpocketDip( 0x1EC3 ), 0, 0, 0 );
|
||||
}
|
||||
public PickpocketDipEastAddon(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public PickpocketDipEastAddon( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public override BaseAddonDeed Deed => new PickpocketDipEastDeed();
|
||||
|
||||
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 PickpocketDipEastDeed : BaseAddonDeed
|
||||
{
|
||||
public override BaseAddon Addon => new PickpocketDipEastAddon();
|
||||
public override int LabelNumber => 1044337; // pickpocket dip (east)
|
||||
public class PickpocketDipEastDeed : BaseAddonDeed
|
||||
{
|
||||
[Constructible]
|
||||
public PickpocketDipEastDeed()
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public PickpocketDipEastDeed()
|
||||
{
|
||||
}
|
||||
public PickpocketDipEastDeed(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public PickpocketDipEastDeed( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public override BaseAddon Addon => new PickpocketDipEastAddon();
|
||||
public override int LabelNumber => 1044337; // pickpocket dip (east)
|
||||
|
||||
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 PickpocketDipSouthAddon : BaseAddon
|
||||
{
|
||||
public override BaseAddonDeed Deed => new PickpocketDipSouthDeed();
|
||||
public class PickpocketDipSouthAddon : BaseAddon
|
||||
{
|
||||
[Constructible]
|
||||
public PickpocketDipSouthAddon()
|
||||
{
|
||||
AddComponent(new PickpocketDip(0x1EC0), 0, 0, 0);
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public PickpocketDipSouthAddon()
|
||||
{
|
||||
AddComponent( new PickpocketDip( 0x1EC0 ), 0, 0, 0 );
|
||||
}
|
||||
public PickpocketDipSouthAddon(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public PickpocketDipSouthAddon( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public override BaseAddonDeed Deed => new PickpocketDipSouthDeed();
|
||||
|
||||
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 PickpocketDipSouthDeed : BaseAddonDeed
|
||||
{
|
||||
public override BaseAddon Addon => new PickpocketDipSouthAddon();
|
||||
public override int LabelNumber => 1044338; // pickpocket dip (south)
|
||||
public class PickpocketDipSouthDeed : BaseAddonDeed
|
||||
{
|
||||
[Constructible]
|
||||
public PickpocketDipSouthDeed()
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public PickpocketDipSouthDeed()
|
||||
{
|
||||
}
|
||||
public PickpocketDipSouthDeed(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public PickpocketDipSouthDeed( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public override BaseAddon Addon => new PickpocketDipSouthAddon();
|
||||
public override int LabelNumber => 1044338; // pickpocket dip (south)
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue