Fixes code according to modern code style. Fixes a few expression bugs.

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

View file

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