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

199
Scripts/Items/Weapons/Knives/ThrowingDagger.cs
View file

@ -3,118 +3,131 @@ using Server.Targeting;
namespace Server.Items
{
[FlippableAttribute( 0xF52, 0xF51 )]
public class ThrowingDagger : Item
{
public override string DefaultName => "a throwing dagger";
[Flippable(0xF52, 0xF51)]
public class ThrowingDagger : Item
{
[Constructible]
public ThrowingDagger() : base(0xF52)
{
Weight = 1.0;
Layer = Layer.OneHanded;
}
[Constructible]
public ThrowingDagger() : base( 0xF52 )
{
Weight = 1.0;
Layer = Layer.OneHanded;
}
public ThrowingDagger(Serial serial) : base(serial)
{
}
public ThrowingDagger( Serial serial ) : base( serial )
{
}
public override string DefaultName => "a throwing dagger";
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 )
{
if ( from.Items.Contains( this ) )
{
InternalTarget t = new InternalTarget( this );
from.Target = t;
}
else
{
from.SendMessage( "You must be holding that weapon to use it." );
}
}
public override void OnDoubleClick(Mobile from)
{
if (from.Items.Contains(this))
{
InternalTarget t = new InternalTarget(this);
from.Target = t;
}
else
{
from.SendMessage("You must be holding that weapon to use it.");
}
}
private class InternalTarget : Target
{
private ThrowingDagger m_Dagger;
private class InternalTarget : Target
{
private ThrowingDagger m_Dagger;
public InternalTarget( ThrowingDagger dagger ) : base( 10, false, TargetFlags.Harmful )
{
m_Dagger = dagger;
}
public InternalTarget(ThrowingDagger dagger) : base(10, false, TargetFlags.Harmful)
{
m_Dagger = dagger;
}
protected override void OnTarget( Mobile from, object targeted )
{
if ( m_Dagger.Deleted )
{
return;
}
protected override void OnTarget(Mobile from, object targeted)
{
if (m_Dagger.Deleted) return;
if ( !from.Items.Contains( m_Dagger ) )
{
from.SendMessage( "You must be holding that weapon to use it." );
}
else if ( targeted is Mobile m )
{
if ( m != from && from.HarmfulCheck( m ) )
{
Direction to = from.GetDirectionTo( m );
if (!from.Items.Contains(m_Dagger))
from.SendMessage("You must be holding that weapon to use it.");
else if (targeted is Mobile m)
if (m != from && from.HarmfulCheck(m))
{
Direction to = from.GetDirectionTo(m);
from.Direction = to;
from.Direction = to;
from.Animate( from.Mounted ? 26 : 9, 7, 1, true, false, 0 );
from.Animate(from.Mounted ? 26 : 9, 7, 1, true, false, 0);
if ( Utility.RandomDouble() >= (Math.Sqrt( m.Dex / 100.0 ) * 0.8) )
{
from.MovingEffect( m, 0x1BFE, 7, 1, false, false, 0x481, 0 );
if (Utility.RandomDouble() >= Math.Sqrt(m.Dex / 100.0) * 0.8)
{
from.MovingEffect(m, 0x1BFE, 7, 1, false, false, 0x481, 0);
AOS.Damage( m, from, Utility.Random( 5, from.Str / 10 ), 100, 0, 0, 0, 0 );
AOS.Damage(m, from, Utility.Random(5, from.Str / 10), 100, 0, 0, 0, 0);
m_Dagger.MoveToWorld( m.Location, m.Map );
}
else
{
int x = 0, y = 0;
m_Dagger.MoveToWorld(m.Location, m.Map);
}
else
{
int x = 0, y = 0;
switch ( to & Direction.Mask )
{
case Direction.North: --y; break;
case Direction.South: ++y; break;
case Direction.West: --x; break;
case Direction.East: ++x; break;
case Direction.Up: --x; --y; break;
case Direction.Down: ++x; ++y; break;
case Direction.Left: --x; ++y; break;
case Direction.Right: ++x; --y; break;
}
switch (to & Direction.Mask)
{
case Direction.North:
--y;
break;
case Direction.South:
++y;
break;
case Direction.West:
--x;
break;
case Direction.East:
++x;
break;
case Direction.Up:
--x;
--y;
break;
case Direction.Down:
++x;
++y;
break;
case Direction.Left:
--x;
++y;
break;
case Direction.Right:
++x;
--y;
break;
}
x += Utility.Random( -1, 3 );
y += Utility.Random( -1, 3 );
x += Utility.Random(-1, 3);
y += Utility.Random(-1, 3);
x += m.X;
y += m.Y;
x += m.X;
y += m.Y;
m_Dagger.MoveToWorld( new Point3D( x, y, m.Z ), m.Map );
m_Dagger.MoveToWorld(new Point3D(x, y, m.Z), m.Map);
from.MovingEffect( m_Dagger, 0x1BFE, 7, 1, false, false, 0x481, 0 );
from.MovingEffect(m_Dagger, 0x1BFE, 7, 1, false, false, 0x481, 0);
from.SendMessage( "You miss." );
}
}
}
}
}
}
}
from.SendMessage("You miss.");
}
}
}
}
}
}