warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

126
Scripts/Items/Skill Items/Ninjitsu/EggBomb.cs
View file

@ -1,76 +1,78 @@
using Server.SkillHandlers;
namespace Server.Items
{
public class EggBomb : Item
{
public override int LabelNumber => 1030249;
public class EggBomb : Item
{
[Constructible]
public EggBomb() : base(0x2808)
{
// Item ID should be 0x2809 - Temporary solution for clients 7.0.0.0 and up
Stackable = Core.ML;
Weight = 1.0;
}
[Constructible]
public EggBomb() : base( 0x2808 )
{
// Item ID should be 0x2809 - Temporary solution for clients 7.0.0.0 and up
Stackable = Core.ML;
Weight = 1.0;
}
public EggBomb(Serial serial) : base(serial)
{
}
public EggBomb( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1030249;
public override void OnDoubleClick( Mobile from )
{
if ( !IsChildOf( from.Backpack ) )
{
// The item must be in your backpack to use it.
from.SendLocalizedMessage( 1060640 );
}
else if ( from.Skills.Ninjitsu.Value < 50.0 )
{
// You need at least ~1_SKILL_REQUIREMENT~ ~2_SKILL_NAME~ skill to use that ability.
from.SendLocalizedMessage( 1063013, "50\tNinjitsu" );
}
else if (Core.TickCount - from.NextSkillTime < 0)
{
// You must wait a few seconds before you can use that item.
from.SendLocalizedMessage( 1070772 );
}
else if ( from.Mana < 10 )
{
// You don't have enough mana to do that.
from.SendLocalizedMessage( 1049456 );
}
else
{
SkillHandlers.Hiding.CombatOverride = true;
public override void OnDoubleClick(Mobile from)
{
if (!IsChildOf(from.Backpack))
{
// The item must be in your backpack to use it.
from.SendLocalizedMessage(1060640);
}
else if (from.Skills.Ninjitsu.Value < 50.0)
{
// You need at least ~1_SKILL_REQUIREMENT~ ~2_SKILL_NAME~ skill to use that ability.
from.SendLocalizedMessage(1063013, "50\tNinjitsu");
}
else if (Core.TickCount - from.NextSkillTime < 0)
{
// You must wait a few seconds before you can use that item.
from.SendLocalizedMessage(1070772);
}
else if (from.Mana < 10)
{
// You don't have enough mana to do that.
from.SendLocalizedMessage(1049456);
}
else
{
Hiding.CombatOverride = true;
if ( from.UseSkill( SkillName.Hiding ) )
{
from.Mana -= 10;
if (from.UseSkill(SkillName.Hiding))
{
from.Mana -= 10;
from.FixedParticles( 0x3709, 1, 30, 9904, 1108, 6, EffectLayer.RightFoot );
from.PlaySound( 0x22F );
from.FixedParticles(0x3709, 1, 30, 9904, 1108, 6, EffectLayer.RightFoot);
from.PlaySound(0x22F);
Consume();
}
Consume();
}
SkillHandlers.Hiding.CombatOverride = false;
}
}
Hiding.CombatOverride = false;
}
}
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();
if ( ItemID == 0x2809 ) // Temporary solution for clients 7.0.0.0 and up
ItemID = 0x2808;
}
}
int version = reader.ReadInt();
if (ItemID == 0x2809) // Temporary solution for clients 7.0.0.0 and up
ItemID = 0x2808;
}
}
}

209
Scripts/Items/Skill Items/Ninjitsu/Fukiya.cs
View file

@ -5,128 +5,141 @@ using Server.Mobiles;
namespace Server.Items
{
[FlippableAttribute( 0x27AA, 0x27F5 )]
public class Fukiya : Item, INinjaWeapon
{
public virtual int WrongAmmoMessage => 1063329; //You can only load fukiya darts
public virtual int NoFreeHandMessage => 1063327; //You must have a free hand to use a fukiya.
public virtual int EmptyWeaponMessage => 1063325; //You have no fukiya darts!
public virtual int RecentlyUsedMessage => 1063326; //You are already using that fukiya.
public virtual int FullWeaponMessage => 1063330; //You can only load fukiya darts
[Flippable(0x27AA, 0x27F5)]
public class Fukiya : Item, INinjaWeapon
{
private Poison m_Poison;
private int m_PoisonCharges;
public virtual int WeaponMinRange => 0;
public virtual int WeaponMaxRange => 6;
private int m_UsesRemaining;
public virtual int WeaponDamage => Utility.RandomMinMax(4, 6);
[Constructible]
public Fukiya() : base(0x27AA)
{
Weight = 4.0;
Layer = Layer.OneHanded;
}
public Type AmmoType => typeof(FukiyaDarts);
public Fukiya(Serial serial) : base(serial)
{
}
private int m_UsesRemaining;
private Poison m_Poison;
private int m_PoisonCharges;
public virtual int WrongAmmoMessage => 1063329; //You can only load fukiya darts
public virtual int NoFreeHandMessage => 1063327; //You must have a free hand to use a fukiya.
public virtual int EmptyWeaponMessage => 1063325; //You have no fukiya darts!
public virtual int RecentlyUsedMessage => 1063326; //You are already using that fukiya.
public virtual int FullWeaponMessage => 1063330; //You can only load fukiya darts
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
{
get => m_UsesRemaining;
set { m_UsesRemaining = value; InvalidateProperties(); }
}
public virtual int WeaponMinRange => 0;
public virtual int WeaponMaxRange => 6;
[CommandProperty( AccessLevel.GameMaster )]
public Poison Poison
{
get => m_Poison;
set{ m_Poison = value; InvalidateProperties(); }
}
public virtual int WeaponDamage => Utility.RandomMinMax(4, 6);
[CommandProperty( AccessLevel.GameMaster )]
public int PoisonCharges
{
get => m_PoisonCharges;
set { m_PoisonCharges = value; InvalidateProperties(); }
}
public Type AmmoType => typeof(FukiyaDarts);
public bool ShowUsesRemaining{ get => true;
set{} }
[CommandProperty(AccessLevel.GameMaster)]
public int UsesRemaining
{
get => m_UsesRemaining;
set
{
m_UsesRemaining = value;
InvalidateProperties();
}
}
[Constructible]
public Fukiya() : base( 0x27AA )
{
Weight = 4.0;
Layer = Layer.OneHanded;
}
[CommandProperty(AccessLevel.GameMaster)]
public Poison Poison
{
get => m_Poison;
set
{
m_Poison = value;
InvalidateProperties();
}
}
public Fukiya( Serial serial ) : base( serial )
{
}
[CommandProperty(AccessLevel.GameMaster)]
public int PoisonCharges
{
get => m_PoisonCharges;
set
{
m_PoisonCharges = value;
InvalidateProperties();
}
}
public void AttackAnimation(Mobile from, Mobile to)
{
if (from.Body.IsHuman && !from.Mounted)
{
from.Animate(33, 2, 1, true, true, 0);
}
public bool ShowUsesRemaining
{
get => true;
set { }
}
from.PlaySound(0x223);
from.MovingEffect(to, 0x2804, 5, 0, false, false);
}
public void AttackAnimation(Mobile from, Mobile to)
{
if (from.Body.IsHuman && !from.Mounted) from.Animate(33, 2, 1, true, true, 0);
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
from.PlaySound(0x223);
from.MovingEffect(to, 0x2804, 5, 0, false, false);
}
list.Add( 1060584, m_UsesRemaining.ToString() ); // uses remaining: ~1_val~
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
if ( m_Poison != null && m_PoisonCharges > 0 )
list.Add( 1062412 + m_Poison.Level, m_PoisonCharges.ToString() );
}
list.Add(1060584, m_UsesRemaining.ToString()); // uses remaining: ~1_val~
public override void OnDoubleClick( Mobile from )
{
NinjaWeapon.AttemptShoot((PlayerMobile)from, this);
}
if (m_Poison != null && m_PoisonCharges > 0)
list.Add(1062412 + m_Poison.Level, m_PoisonCharges.ToString());
}
public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry> list )
{
base.GetContextMenuEntries( from, list );
public override void OnDoubleClick(Mobile from)
{
NinjaWeapon.AttemptShoot((PlayerMobile)from, this);
}
if ( IsChildOf( from ) )
{
list.Add(new NinjaWeapon.LoadEntry(this, 6224));
list.Add(new NinjaWeapon.UnloadEntry(this, 6225));
}
}
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
{
base.GetContextMenuEntries(from, list);
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
if (IsChildOf(from))
{
list.Add(new NinjaWeapon.LoadEntry(this, 6224));
list.Add(new NinjaWeapon.UnloadEntry(this, 6225));
}
}
writer.Write( (int) 0 );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) m_UsesRemaining );
writer.Write(0);
Poison.Serialize( m_Poison, writer );
writer.Write( (int) m_PoisonCharges );
}
writer.Write(m_UsesRemaining);
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
Poison.Serialize(m_Poison, writer);
writer.Write(m_PoisonCharges);
}
int version = reader.ReadInt();
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
switch ( version )
{
case 0:
{
m_UsesRemaining = reader.ReadInt();
int version = reader.ReadInt();
m_Poison = Poison.Deserialize( reader );
m_PoisonCharges = reader.ReadInt();
switch (version)
{
case 0:
{
m_UsesRemaining = reader.ReadInt();
break;
}
}
}
}
}
m_Poison = Poison.Deserialize(reader);
m_PoisonCharges = reader.ReadInt();
break;
}
}
}
}
}

167
Scripts/Items/Skill Items/Ninjitsu/FukiyaDarts.cs
View file

@ -3,102 +3,117 @@ using Server.Engines.Craft;
namespace Server.Items
{
public class FukiyaDarts : Item, ICraftable, INinjaAmmo
{
private int m_UsesRemaining;
public class FukiyaDarts : Item, ICraftable, INinjaAmmo
{
private Poison m_Poison;
private int m_PoisonCharges;
private int m_UsesRemaining;
private Poison m_Poison;
private int m_PoisonCharges;
[Constructible]
public FukiyaDarts() : this(1)
{
}
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
{
get => m_UsesRemaining;
set { m_UsesRemaining = value; InvalidateProperties(); }
}
[Constructible]
public FukiyaDarts(int amount) : base(0x2806)
{
Weight = 1.0;
[CommandProperty( AccessLevel.GameMaster )]
public Poison Poison
{
get => m_Poison;
set{ m_Poison = value; InvalidateProperties(); }
}
m_UsesRemaining = amount;
}
[CommandProperty( AccessLevel.GameMaster )]
public int PoisonCharges
{
get => m_PoisonCharges;
set { m_PoisonCharges = value; InvalidateProperties(); }
}
public FukiyaDarts(Serial serial) : base(serial)
{
}
public bool ShowUsesRemaining{ get => true;
set{} }
public int OnCraft(int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool,
CraftItem craftItem, int resHue)
{
if (quality == 2)
UsesRemaining *= 2;
[Constructible]
public FukiyaDarts() : this( 1 )
{
}
return quality;
}
[Constructible]
public FukiyaDarts( int amount ) : base( 0x2806 )
{
Weight = 1.0;
[CommandProperty(AccessLevel.GameMaster)]
public int UsesRemaining
{
get => m_UsesRemaining;
set
{
m_UsesRemaining = value;
InvalidateProperties();
}
}
m_UsesRemaining = amount;
}
[CommandProperty(AccessLevel.GameMaster)]
public Poison Poison
{
get => m_Poison;
set
{
m_Poison = value;
InvalidateProperties();
}
}
public FukiyaDarts( Serial serial ) : base( serial )
{
}
[CommandProperty(AccessLevel.GameMaster)]
public int PoisonCharges
{
get => m_PoisonCharges;
set
{
m_PoisonCharges = value;
InvalidateProperties();
}
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
public bool ShowUsesRemaining
{
get => true;
set { }
}
list.Add( 1060584, m_UsesRemaining.ToString() ); // uses remaining: ~1_val~
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
if ( m_Poison != null && m_PoisonCharges > 0 )
list.Add( 1062412 + m_Poison.Level, m_PoisonCharges.ToString() );
}
list.Add(1060584, m_UsesRemaining.ToString()); // uses remaining: ~1_val~
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
if (m_Poison != null && m_PoisonCharges > 0)
list.Add(1062412 + m_Poison.Level, m_PoisonCharges.ToString());
}
writer.Write( (int) 0 ); // version
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) m_UsesRemaining );
writer.Write(0); // version
Poison.Serialize( m_Poison, writer );
writer.Write( (int) m_PoisonCharges );
}
writer.Write(m_UsesRemaining);
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
Poison.Serialize(m_Poison, writer);
writer.Write(m_PoisonCharges);
}
int version = reader.ReadInt();
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
switch ( version )
{
case 0:
{
m_UsesRemaining = reader.ReadInt();
int version = reader.ReadInt();
m_Poison = Poison.Deserialize( reader );
m_PoisonCharges = reader.ReadInt();
switch (version)
{
case 0:
{
m_UsesRemaining = reader.ReadInt();
break;
}
}
}
m_Poison = Poison.Deserialize(reader);
m_PoisonCharges = reader.ReadInt();
public int OnCraft( int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool, CraftItem craftItem, int resHue )
{
if ( quality == 2 )
UsesRemaining *= 2;
return quality;
}
}
break;
}
}
}
}
}

230
Scripts/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs
View file

@ -5,141 +5,155 @@ using Server.Mobiles;
namespace Server.Items
{
[FlippableAttribute( 0x2790, 0x27DB )]
public class LeatherNinjaBelt : BaseWaist, IDyable, INinjaWeapon
{
public override CraftResource DefaultResource => CraftResource.RegularLeather;
[Flippable(0x2790, 0x27DB)]
public class LeatherNinjaBelt : BaseWaist, IDyable, INinjaWeapon
{
private Poison m_Poison;
private int m_PoisonCharges;
public virtual int WrongAmmoMessage => 1063301; //You can only place shuriken in a ninja belt.
public virtual int NoFreeHandMessage => 1063299; //You must have a free hand to throw shuriken.
public virtual int EmptyWeaponMessage => 1063297; //You have no shuriken in your ninja belt!
public virtual int RecentlyUsedMessage => 1063298; //You cannot throw another shuriken yet.
public virtual int FullWeaponMessage => 1063302; //You cannot add any more shuriken.
private int m_UsesRemaining;
public virtual int WeaponMinRange => 2;
public virtual int WeaponMaxRange => 10;
[Constructible]
public LeatherNinjaBelt() : base(0x2790)
public virtual int WeaponDamage => Utility.RandomMinMax(3, 5);
{
Weight = 1.0;
Layer = Layer.Waist;
}
public virtual Type AmmoType => typeof(Shuriken);
public LeatherNinjaBelt(Serial serial) : base(serial)
{
}
private int m_UsesRemaining;
private Poison m_Poison;
private int m_PoisonCharges;
public override CraftResource DefaultResource => CraftResource.RegularLeather;
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
{
get => m_UsesRemaining;
set { m_UsesRemaining = value; InvalidateProperties(); }
}
public virtual int WrongAmmoMessage => 1063301; //You can only place shuriken in a ninja belt.
public virtual int NoFreeHandMessage => 1063299; //You must have a free hand to throw shuriken.
public virtual int EmptyWeaponMessage => 1063297; //You have no shuriken in your ninja belt!
public virtual int RecentlyUsedMessage => 1063298; //You cannot throw another shuriken yet.
public virtual int FullWeaponMessage => 1063302; //You cannot add any more shuriken.
[CommandProperty( AccessLevel.GameMaster )]
public Poison Poison
{
get => m_Poison;
set{ m_Poison = value; InvalidateProperties(); }
}
public virtual int WeaponMinRange => 2;
public virtual int WeaponMaxRange => 10;
[CommandProperty( AccessLevel.GameMaster )]
public int PoisonCharges
{
get => m_PoisonCharges;
set { m_PoisonCharges = value; InvalidateProperties(); }
}
public virtual int WeaponDamage => Utility.RandomMinMax(3, 5);
public bool ShowUsesRemaining{ get => true;
set{} }
public virtual Type AmmoType => typeof(Shuriken);
[Constructible]
public LeatherNinjaBelt() : base( 0x2790 )
[CommandProperty(AccessLevel.GameMaster)]
public int UsesRemaining
{
get => m_UsesRemaining;
set
{
m_UsesRemaining = value;
InvalidateProperties();
}
}
{
Weight = 1.0;
Layer = Layer.Waist;
}
[CommandProperty(AccessLevel.GameMaster)]
public Poison Poison
{
get => m_Poison;
set
{
m_Poison = value;
InvalidateProperties();
}
}
public LeatherNinjaBelt( Serial serial ) : base( serial )
{
}
[CommandProperty(AccessLevel.GameMaster)]
public int PoisonCharges
{
get => m_PoisonCharges;
set
{
m_PoisonCharges = value;
InvalidateProperties();
}
}
public void AttackAnimation(Mobile from, Mobile to)
{
if (from.Body.IsHuman)
{
from.Animate(from.Mounted ? 26 : 9, 7, 1, true, false, 0);
}
public bool ShowUsesRemaining
{
get => true;
set { }
}
from.PlaySound(0x23A);
from.MovingEffect(to, 0x27AC, 1, 0, false, false);
}
public void AttackAnimation(Mobile from, Mobile to)
{
if (from.Body.IsHuman) from.Animate(from.Mounted ? 26 : 9, 7, 1, true, false, 0);
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
from.PlaySound(0x23A);
from.MovingEffect(to, 0x27AC, 1, 0, false, false);
}
list.Add( 1060584, m_UsesRemaining.ToString() ); // uses remaining: ~1_val~
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
if ( m_Poison != null && m_PoisonCharges > 0 )
list.Add( 1062412 + m_Poison.Level, m_PoisonCharges.ToString() );
}
list.Add(1060584, m_UsesRemaining.ToString()); // uses remaining: ~1_val~
public override bool OnEquip( Mobile from )
{
if (base.OnEquip(from))
{
from.SendLocalizedMessage(1070785); // Double click this item each time you wish to throw a shuriken.
return true;
}
return false;
}
if (m_Poison != null && m_PoisonCharges > 0)
list.Add(1062412 + m_Poison.Level, m_PoisonCharges.ToString());
}
public override void OnDoubleClick(Mobile from)
{
NinjaWeapon.AttemptShoot((PlayerMobile)from, this);
}
public override bool OnEquip(Mobile from)
{
if (base.OnEquip(from))
{
from.SendLocalizedMessage(1070785); // Double click this item each time you wish to throw a shuriken.
return true;
}
public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry> list )
{
base.GetContextMenuEntries( from, list );
return false;
}
if ( IsChildOf( from ) )
{
list.Add(new NinjaWeapon.LoadEntry(this, 6222));
list.Add(new NinjaWeapon.UnloadEntry(this, 6223));
}
}
public override void OnDoubleClick(Mobile from)
{
NinjaWeapon.AttemptShoot((PlayerMobile)from, this);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
{
base.GetContextMenuEntries(from, list);
writer.Write( (int) 0 );
if (IsChildOf(from))
{
list.Add(new NinjaWeapon.LoadEntry(this, 6222));
list.Add(new NinjaWeapon.UnloadEntry(this, 6223));
}
}
writer.Write( (int) m_UsesRemaining );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
Poison.Serialize( m_Poison, writer );
writer.Write( (int) m_PoisonCharges );
}
writer.Write(0);
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
writer.Write(m_UsesRemaining);
int version = reader.ReadInt();
Poison.Serialize(m_Poison, writer);
writer.Write(m_PoisonCharges);
}
switch ( version )
{
case 0:
{
m_UsesRemaining = reader.ReadInt();
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
m_Poison = Poison.Deserialize( reader );
m_PoisonCharges = reader.ReadInt();
int version = reader.ReadInt();
break;
}
}
}
}
}
switch (version)
{
case 0:
{
m_UsesRemaining = reader.ReadInt();
m_Poison = Poison.Deserialize(reader);
m_PoisonCharges = reader.ReadInt();
break;
}
}
}
}
}

542
Scripts/Items/Skill Items/Ninjitsu/NinjaWeapons.cs
View file

@ -1,6 +1,8 @@
using System;
using Server.ContextMenus;
using Server.Mobiles;
using Server.SkillHandlers;
using Server.Spells.Chivalry;
using Server.Spells.Necromancy;
using Server.Spells.Ninjitsu;
using Server.Targeting;
@ -13,371 +15,303 @@ using Server.Targeting;
namespace Server.Items
{
public interface INinjaAmmo : IUsesRemaining
{
int PoisonCharges { get; set; }
Poison Poison { get; set; }
}
public interface INinjaAmmo : IUsesRemaining
{
int PoisonCharges{ get; set; }
Poison Poison{ get; set; }
}
public interface INinjaWeapon : IUsesRemaining
{
int NoFreeHandMessage { get; }
int EmptyWeaponMessage { get; }
int RecentlyUsedMessage { get; }
int FullWeaponMessage { get; }
int WrongAmmoMessage { get; }
Type AmmoType { get; }
int PoisonCharges { get; set; }
Poison Poison { get; set; }
int WeaponDamage { get; }
int WeaponMinRange { get; }
int WeaponMaxRange { get; }
public interface INinjaWeapon : IUsesRemaining
{
int NoFreeHandMessage{ get; }
int EmptyWeaponMessage{ get; }
int RecentlyUsedMessage{ get; }
int FullWeaponMessage{ get; }
int WrongAmmoMessage{ get; }
Type AmmoType{ get; }
int PoisonCharges{ get; set; }
Poison Poison{ get; set; }
int WeaponDamage{ get; }
int WeaponMinRange{ get; }
int WeaponMaxRange{ get; }
void AttackAnimation(Mobile from, Mobile to);
}
void AttackAnimation(Mobile from, Mobile to);
}
public class NinjaWeapon
{
private const int MaxUses = 10;
public class NinjaWeapon
{
private const int MaxUses = 10;
public static void AttemptShoot(PlayerMobile from, INinjaWeapon weapon)
{
if (CanUseWeapon(from, weapon))
{
from.BeginTarget(weapon.WeaponMaxRange, false, TargetFlags.Harmful, OnTarget, weapon);
}
}
public static void AttemptShoot(PlayerMobile from, INinjaWeapon weapon)
{
if (CanUseWeapon(from, weapon))
from.BeginTarget(weapon.WeaponMaxRange, false, TargetFlags.Harmful, OnTarget, weapon);
}
private static void Shoot(PlayerMobile from, Mobile target, INinjaWeapon weapon)
{
if (from != target && CanUseWeapon(from, weapon) && from.CanBeHarmful(target))
{
if (weapon.WeaponMinRange == 0 || !from.InRange(target, weapon.WeaponMinRange))
{
from.NinjaWepCooldown = true;
private static void Shoot(PlayerMobile from, Mobile target, INinjaWeapon weapon)
{
if (from != target && CanUseWeapon(from, weapon) && from.CanBeHarmful(target))
{
if (weapon.WeaponMinRange == 0 || !from.InRange(target, weapon.WeaponMinRange))
{
from.NinjaWepCooldown = true;
from.Direction = from.GetDirectionTo(target);
from.Direction = from.GetDirectionTo(target);
from.RevealingAction();
from.RevealingAction();
weapon.AttackAnimation(from, target);
weapon.AttackAnimation(from, target);
ConsumeUse(weapon);
ConsumeUse(weapon);
if (CombatCheck(from, target))
{
Timer.DelayCall(TimeSpan.FromSeconds(1.0), OnHit, new object[] { from, target, weapon });
}
if (CombatCheck(from, target))
Timer.DelayCall(TimeSpan.FromSeconds(1.0), OnHit, new object[] { from, target, weapon });
Timer.DelayCall(TimeSpan.FromSeconds(2.5), ResetUsing, from);
}
else
{
from.SendLocalizedMessage(1063303); // Your target is too close!
}
}
}
Timer.DelayCall(TimeSpan.FromSeconds(2.5), ResetUsing, from);
}
else
{
from.SendLocalizedMessage(1063303); // Your target is too close!
}
}
}
private static void ResetUsing(PlayerMobile from)
{
from.NinjaWepCooldown = false;
}
private static void ResetUsing(PlayerMobile from)
{
from.NinjaWepCooldown = false;
}
private static void Unload(Mobile from, INinjaWeapon weapon)
{
if (weapon.UsesRemaining > 0)
{
INinjaAmmo ammo = Activator.CreateInstance(weapon.AmmoType, new object[] { weapon.UsesRemaining }) as INinjaAmmo;
private static void Unload(Mobile from, INinjaWeapon weapon)
{
if (weapon.UsesRemaining > 0)
{
INinjaAmmo ammo = Activator.CreateInstance(weapon.AmmoType, weapon.UsesRemaining) as INinjaAmmo;
ammo.Poison = weapon.Poison;
ammo.PoisonCharges = weapon.PoisonCharges;
ammo.Poison = weapon.Poison;
ammo.PoisonCharges = weapon.PoisonCharges;
from.AddToBackpack((Item)ammo);
from.AddToBackpack((Item)ammo);
weapon.UsesRemaining = 0;
weapon.PoisonCharges = 0;
weapon.Poison = null;
}
}
weapon.UsesRemaining = 0;
weapon.PoisonCharges = 0;
weapon.Poison = null;
}
}
private static void Reload(PlayerMobile from, INinjaWeapon weapon, INinjaAmmo ammo)
{
if (weapon.UsesRemaining < MaxUses)
{
int need = Math.Min((MaxUses - weapon.UsesRemaining), ammo.UsesRemaining);
private static void Reload(PlayerMobile from, INinjaWeapon weapon, INinjaAmmo ammo)
{
if (weapon.UsesRemaining < MaxUses)
{
int need = Math.Min(MaxUses - weapon.UsesRemaining, ammo.UsesRemaining);
if (need > 0)
{
if (weapon.Poison != null && (ammo.Poison == null || weapon.Poison.Level > ammo.Poison.Level))
{
from.SendLocalizedMessage(1070767); // Loaded projectile is stronger, unload it first
}
else
{
if (weapon.UsesRemaining > 0)
{
if ((weapon.Poison == null && ammo.Poison != null)
|| ((weapon.Poison != null && ammo.Poison != null) && weapon.Poison.Level != ammo.Poison.Level))
{
Unload(from, weapon);
need = Math.Min(MaxUses, ammo.UsesRemaining);
}
}
int poisonneeded = Math.Min((MaxUses - weapon.PoisonCharges), ammo.PoisonCharges);
if (need > 0)
{
if (weapon.Poison != null && (ammo.Poison == null || weapon.Poison.Level > ammo.Poison.Level))
{
from.SendLocalizedMessage(1070767); // Loaded projectile is stronger, unload it first
}
else
{
if (weapon.UsesRemaining > 0)
if (weapon.Poison == null && ammo.Poison != null
|| weapon.Poison != null && ammo.Poison != null && weapon.Poison.Level != ammo.Poison.Level)
{
Unload(from, weapon);
need = Math.Min(MaxUses, ammo.UsesRemaining);
}
weapon.UsesRemaining += need;
weapon.PoisonCharges += poisonneeded;
int poisonneeded = Math.Min(MaxUses - weapon.PoisonCharges, ammo.PoisonCharges);
if (weapon.PoisonCharges > 0)
{
weapon.Poison = ammo.Poison;
}
weapon.UsesRemaining += need;
weapon.PoisonCharges += poisonneeded;
ammo.PoisonCharges -= poisonneeded;
ammo.UsesRemaining -= need;
if (weapon.PoisonCharges > 0) weapon.Poison = ammo.Poison;
if (ammo.UsesRemaining < 1)
{
((Item)ammo).Delete();
}
else if (ammo.PoisonCharges < 1)
{
ammo.Poison = null;
}
}
} // "else" here would mean they targeted "ammo" with 0 uses. undefined behavior.
}
else
{
from.SendLocalizedMessage(weapon.FullWeaponMessage);
}
}
ammo.PoisonCharges -= poisonneeded;
ammo.UsesRemaining -= need;
private static void ConsumeUse(INinjaWeapon weapon)
{
if (weapon.UsesRemaining > 0)
{
weapon.UsesRemaining--;
if (ammo.UsesRemaining < 1)
((Item)ammo).Delete();
else if (ammo.PoisonCharges < 1) ammo.Poison = null;
}
} // "else" here would mean they targeted "ammo" with 0 uses. undefined behavior.
}
else
{
from.SendLocalizedMessage(weapon.FullWeaponMessage);
}
}
if (weapon.UsesRemaining < 1)
{
weapon.PoisonCharges = 0;
weapon.Poison = null;
}
}
}
private static void ConsumeUse(INinjaWeapon weapon)
{
if (weapon.UsesRemaining > 0)
{
weapon.UsesRemaining--;
private static bool CanUseWeapon(PlayerMobile from, INinjaWeapon weapon)
{
if (WeaponIsValid(weapon, from))
{
if (weapon.UsesRemaining > 0)
{
if (!from.NinjaWepCooldown)
{
if (BasePotion.HasFreeHand(from))
{
return true;
}
if (weapon.UsesRemaining < 1)
{
weapon.PoisonCharges = 0;
weapon.Poison = null;
}
}
}
from.SendLocalizedMessage(weapon.NoFreeHandMessage);
}
else
{
from.SendLocalizedMessage(weapon.RecentlyUsedMessage);
}
}
else
{
from.SendLocalizedMessage(weapon.EmptyWeaponMessage);
}
}
return false;
}
private static bool CanUseWeapon(PlayerMobile from, INinjaWeapon weapon)
{
if (WeaponIsValid(weapon, from))
{
if (weapon.UsesRemaining > 0)
{
if (!from.NinjaWepCooldown)
{
if (BasePotion.HasFreeHand(from)) return true;
private static bool CombatCheck(Mobile attacker, Mobile defender) /* mod'd from baseweapon */
{
BaseWeapon defWeapon = defender.Weapon as BaseWeapon;
from.SendLocalizedMessage(weapon.NoFreeHandMessage);
}
else
{
from.SendLocalizedMessage(weapon.RecentlyUsedMessage);
}
}
else
{
from.SendLocalizedMessage(weapon.EmptyWeaponMessage);
}
}
Skill atkSkill = defender.Skills.Ninjitsu;
Skill defSkill = defender.Skills[defWeapon.Skill];
return false;
}
double atSkillValue = attacker.Skills.Ninjitsu.Value;
double defSkillValue = defWeapon.GetDefendSkillValue(attacker, defender);
private static bool CombatCheck(Mobile attacker, Mobile defender) /* mod'd from baseweapon */
{
BaseWeapon defWeapon = defender.Weapon as BaseWeapon;
double attackValue = AosAttributes.GetValue(attacker, AosAttribute.AttackChance);
Skill atkSkill = defender.Skills.Ninjitsu;
Skill defSkill = defender.Skills[defWeapon.Skill];
if (defSkillValue <= -20.0)
{
defSkillValue = -19.9;
}
double atSkillValue = attacker.Skills.Ninjitsu.Value;
double defSkillValue = defWeapon.GetDefendSkillValue(attacker, defender);
if (Spells.Chivalry.DivineFurySpell.UnderEffect(attacker))
{
attackValue += 10;
}
double attackValue = AosAttributes.GetValue(attacker, AosAttribute.AttackChance);
if (AnimalForm.UnderTransformation(attacker, typeof(GreyWolf)) || AnimalForm.UnderTransformation(attacker, typeof(BakeKitsune)))
{
attackValue += 20;
}
if (defSkillValue <= -20.0) defSkillValue = -19.9;
if (HitLower.IsUnderAttackEffect(attacker))
{
attackValue -= 25;
}
if (DivineFurySpell.UnderEffect(attacker)) attackValue += 10;
if (attackValue > 45)
{
attackValue = 45;
}
if (AnimalForm.UnderTransformation(attacker, typeof(GreyWolf)) ||
AnimalForm.UnderTransformation(attacker, typeof(BakeKitsune))) attackValue += 20;
attackValue = (atSkillValue + 20.0) * (100 + attackValue);
if (HitLower.IsUnderAttackEffect(attacker)) attackValue -= 25;
double defenseValue = AosAttributes.GetValue(defender, AosAttribute.DefendChance);
if (attackValue > 45) attackValue = 45;
if (Spells.Chivalry.DivineFurySpell.UnderEffect(defender))
{
defenseValue -= 20;
}
attackValue = (atSkillValue + 20.0) * (100 + attackValue);
if (HitLower.IsUnderDefenseEffect(defender))
{
defenseValue -= 25;
}
double defenseValue = AosAttributes.GetValue(defender, AosAttribute.DefendChance);
int refBonus = 0;
if (DivineFurySpell.UnderEffect(defender)) defenseValue -= 20;
if (Block.GetBonus(defender, ref refBonus))
{
defenseValue += refBonus;
}
if (HitLower.IsUnderDefenseEffect(defender)) defenseValue -= 25;
if (SkillHandlers.Discordance.GetEffect(attacker, ref refBonus))
{
defenseValue -= refBonus;
}
int refBonus = 0;
if (defenseValue > 45)
{
defenseValue = 45;
}
if (Block.GetBonus(defender, ref refBonus)) defenseValue += refBonus;
defenseValue = (defSkillValue + 20.0) * (100 + defenseValue);
if (Discordance.GetEffect(attacker, ref refBonus)) defenseValue -= refBonus;
double chance = attackValue / (defenseValue * 2.0);
if (defenseValue > 45) defenseValue = 45;
if (chance < 0.02)
{
chance = 0.02;
}
defenseValue = (defSkillValue + 20.0) * (100 + defenseValue);
return attacker.CheckSkill(atkSkill.SkillName, chance);
}
double chance = attackValue / (defenseValue * 2.0);
private static void OnHit(object[] states)
{
Mobile from = states[0] as Mobile;
Mobile target = states[1] as Mobile;
INinjaWeapon weapon = states[2] as INinjaWeapon;
if (chance < 0.02) chance = 0.02;
if (from.CanBeHarmful(target))
{
from.DoHarmful(target);
return attacker.CheckSkill(atkSkill.SkillName, chance);
}
AOS.Damage(target, from, weapon.WeaponDamage, 100, 0, 0, 0, 0);
private static void OnHit(object[] states)
{
Mobile from = states[0] as Mobile;
Mobile target = states[1] as Mobile;
INinjaWeapon weapon = states[2] as INinjaWeapon;
if (weapon.Poison != null && weapon.PoisonCharges > 0)
{
if (EvilOmenSpell.TryEndEffect(target))
{
target.ApplyPoison(from, Poison.GetPoison(weapon.Poison.Level + 1));
}
else
{
target.ApplyPoison(from, weapon.Poison);
}
if (from.CanBeHarmful(target))
{
from.DoHarmful(target);
weapon.PoisonCharges--;
AOS.Damage(target, from, weapon.WeaponDamage, 100, 0, 0, 0, 0);
if (weapon.PoisonCharges < 1)
{
weapon.Poison = null;
}
}
}
}
if (weapon.Poison != null && weapon.PoisonCharges > 0)
{
if (EvilOmenSpell.TryEndEffect(target))
target.ApplyPoison(from, Poison.GetPoison(weapon.Poison.Level + 1));
else
target.ApplyPoison(from, weapon.Poison);
private static void OnTarget(Mobile from, object targeted, INinjaWeapon weapon)
{
PlayerMobile player = from as PlayerMobile;
weapon.PoisonCharges--;
if (WeaponIsValid(weapon, from))
{
if (targeted is Mobile mobile)
{
Shoot(player, mobile, weapon);
}
else if (targeted.GetType() == weapon.AmmoType)
{
Reload(player, weapon, (INinjaAmmo)targeted);
}
else
{
player.SendLocalizedMessage(weapon.WrongAmmoMessage);
}
}
}
if (weapon.PoisonCharges < 1) weapon.Poison = null;
}
}
}
private static bool WeaponIsValid(INinjaWeapon weapon, Mobile from)
{
Item item = weapon as Item;
private static void OnTarget(Mobile from, object targeted, INinjaWeapon weapon)
{
PlayerMobile player = from as PlayerMobile;
if (!item.Deleted && item.RootParent == from)
{
return true;
}
return false;
}
if (WeaponIsValid(weapon, from))
{
if (targeted is Mobile mobile)
Shoot(player, mobile, weapon);
else if (targeted.GetType() == weapon.AmmoType)
Reload(player, weapon, (INinjaAmmo)targeted);
else
player.SendLocalizedMessage(weapon.WrongAmmoMessage);
}
}
public class LoadEntry : ContextMenuEntry
{
private INinjaWeapon weapon;
private static bool WeaponIsValid(INinjaWeapon weapon, Mobile from)
{
Item item = weapon as Item;
public LoadEntry(INinjaWeapon wep, int entry)
: base(entry, 0)
{
weapon = wep;
}
if (!item.Deleted && item.RootParent == from) return true;
return false;
}
public override void OnClick()
{
if (WeaponIsValid(weapon, Owner.From))
{
Owner.From.BeginTarget(10, false, TargetFlags.Harmful, OnTarget, weapon);
}
}
}
public class LoadEntry : ContextMenuEntry
{
private INinjaWeapon weapon;
public class UnloadEntry : ContextMenuEntry
{
private INinjaWeapon weapon;
public LoadEntry(INinjaWeapon wep, int entry)
: base(entry, 0)
{
weapon = wep;
}
public UnloadEntry(INinjaWeapon wep, int entry)
: base(entry, 0)
{
weapon = wep;
public override void OnClick()
{
if (WeaponIsValid(weapon, Owner.From))
Owner.From.BeginTarget(10, false, TargetFlags.Harmful, OnTarget, weapon);
}
}
Enabled = (weapon.UsesRemaining > 0);
}
public class UnloadEntry : ContextMenuEntry
{
private INinjaWeapon weapon;
public override void OnClick()
{
if (WeaponIsValid(weapon, Owner.From))
{
Unload(Owner.From, weapon);
}
}
}
}
}
public UnloadEntry(INinjaWeapon wep, int entry)
: base(entry, 0)
{
weapon = wep;
Enabled = weapon.UsesRemaining > 0;
}
public override void OnClick()
{
if (WeaponIsValid(weapon, Owner.From)) Unload(Owner.From, weapon);
}
}
}
}

169
Scripts/Items/Skill Items/Ninjitsu/Shuriken.cs
View file

@ -3,103 +3,118 @@ using Server.Engines.Craft;
namespace Server.Items
{
[Flippable( 0x27AC, 0x27F7 )]
public class Shuriken : Item, ICraftable, INinjaAmmo
{
private int m_UsesRemaining;
[Flippable(0x27AC, 0x27F7)]
public class Shuriken : Item, ICraftable, INinjaAmmo
{
private Poison m_Poison;
private int m_PoisonCharges;
private int m_UsesRemaining;
private Poison m_Poison;
private int m_PoisonCharges;
[Constructible]
public Shuriken() : this(1)
{
}
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
{
get => m_UsesRemaining;
set { m_UsesRemaining = value; InvalidateProperties(); }
}
[Constructible]
public Shuriken(int amount) : base(0x27AC)
{
Weight = 1.0;
[CommandProperty( AccessLevel.GameMaster )]
public Poison Poison
{
get => m_Poison;
set{ m_Poison = value; InvalidateProperties(); }
}
m_UsesRemaining = amount;
}
[CommandProperty( AccessLevel.GameMaster )]
public int PoisonCharges
{
get => m_PoisonCharges;
set { m_PoisonCharges = value; InvalidateProperties(); }
}
public Shuriken(Serial serial) : base(serial)
{
}
public bool ShowUsesRemaining{ get => true;
set{} }
public int OnCraft(int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool,
CraftItem craftItem, int resHue)
{
if (quality == 2)
UsesRemaining *= 2;
[Constructible]
public Shuriken() : this( 1 )
{
}
return quality;
}
[Constructible]
public Shuriken( int amount ) : base( 0x27AC )
{
Weight = 1.0;
[CommandProperty(AccessLevel.GameMaster)]
public int UsesRemaining
{
get => m_UsesRemaining;
set
{
m_UsesRemaining = value;
InvalidateProperties();
}
}
m_UsesRemaining = amount;
}
[CommandProperty(AccessLevel.GameMaster)]
public Poison Poison
{
get => m_Poison;
set
{
m_Poison = value;
InvalidateProperties();
}
}
public Shuriken( Serial serial ) : base( serial )
{
}
[CommandProperty(AccessLevel.GameMaster)]
public int PoisonCharges
{
get => m_PoisonCharges;
set
{
m_PoisonCharges = value;
InvalidateProperties();
}
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
public bool ShowUsesRemaining
{
get => true;
set { }
}
list.Add( 1060584, m_UsesRemaining.ToString() ); // uses remaining: ~1_val~
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
if ( m_Poison != null && m_PoisonCharges > 0 )
list.Add( 1062412 + m_Poison.Level, m_PoisonCharges.ToString() );
}
list.Add(1060584, m_UsesRemaining.ToString()); // uses remaining: ~1_val~
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
if (m_Poison != null && m_PoisonCharges > 0)
list.Add(1062412 + m_Poison.Level, m_PoisonCharges.ToString());
}
writer.Write( (int) 0 ); // version
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) m_UsesRemaining );
writer.Write(0); // version
Poison.Serialize( m_Poison, writer );
writer.Write( (int) m_PoisonCharges );
}
writer.Write(m_UsesRemaining);
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
Poison.Serialize(m_Poison, writer);
writer.Write(m_PoisonCharges);
}
int version = reader.ReadInt();
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
switch ( version )
{
case 0:
{
m_UsesRemaining = reader.ReadInt();
int version = reader.ReadInt();
m_Poison = Poison.Deserialize( reader );
m_PoisonCharges = reader.ReadInt();
switch (version)
{
case 0:
{
m_UsesRemaining = reader.ReadInt();
break;
}
}
}
m_Poison = Poison.Deserialize(reader);
m_PoisonCharges = reader.ReadInt();
public int OnCraft( int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool, CraftItem craftItem, int resHue )
{
if ( quality == 2 )
UsesRemaining *= 2;
return quality;
}
}
break;
}
}
}
}
}

116
Scripts/Items/Skill Items/Ninjitsu/SmokeBomb.cs
View file

@ -1,70 +1,72 @@
using Server.SkillHandlers;
namespace Server.Items
{
public class SmokeBomb : Item
{
[Constructible]
public SmokeBomb() : base( 0x2808 )
{
Stackable = Core.ML;
Weight = 1.0;
}
public class SmokeBomb : Item
{
[Constructible]
public SmokeBomb() : base(0x2808)
{
Stackable = Core.ML;
Weight = 1.0;
}
public SmokeBomb( Serial serial ) : base( serial )
{
}
public SmokeBomb(Serial serial) : base(serial)
{
}
public override void OnDoubleClick( Mobile from )
{
if ( !IsChildOf( from.Backpack ) )
{
// The item must be in your backpack to use it.
from.SendLocalizedMessage( 1060640 );
}
else if ( from.Skills.Ninjitsu.Value < 50.0 )
{
// You need at least ~1_SKILL_REQUIREMENT~ ~2_SKILL_NAME~ skill to use that ability.
from.SendLocalizedMessage( 1063013, "50\tNinjitsu" );
}
else if (Core.TickCount - from.NextSkillTime < 0)
{
// You must wait a few seconds before you can use that item.
from.SendLocalizedMessage( 1070772 );
}
else if ( from.Mana < 10 )
{
// You don't have enough mana to do that.
from.SendLocalizedMessage( 1049456 );
}
else
{
SkillHandlers.Hiding.CombatOverride = true;
public override void OnDoubleClick(Mobile from)
{
if (!IsChildOf(from.Backpack))
{
// The item must be in your backpack to use it.
from.SendLocalizedMessage(1060640);
}
else if (from.Skills.Ninjitsu.Value < 50.0)
{
// You need at least ~1_SKILL_REQUIREMENT~ ~2_SKILL_NAME~ skill to use that ability.
from.SendLocalizedMessage(1063013, "50\tNinjitsu");
}
else if (Core.TickCount - from.NextSkillTime < 0)
{
// You must wait a few seconds before you can use that item.
from.SendLocalizedMessage(1070772);
}
else if (from.Mana < 10)
{
// You don't have enough mana to do that.
from.SendLocalizedMessage(1049456);
}
else
{
Hiding.CombatOverride = true;
if ( from.UseSkill( SkillName.Hiding ) )
{
from.Mana -= 10;
if (from.UseSkill(SkillName.Hiding))
{
from.Mana -= 10;
from.FixedParticles( 0x3709, 1, 30, 9904, 1108, 6, EffectLayer.RightFoot );
from.PlaySound( 0x22F );
from.FixedParticles(0x3709, 1, 30, 9904, 1108, 6, EffectLayer.RightFoot);
from.PlaySound(0x22F);
Consume();
}
Consume();
}
SkillHandlers.Hiding.CombatOverride = false;
}
}
Hiding.CombatOverride = false;
}
}
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();
}
}
}