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

Adds style cop (#109)

Browse source
This commit is contained in:
Kamron Batman 2020-04-26 00:16:02 -07:00 • committed by GitHub
parent 3e715bcb60
commit 556a17aba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1725 changed files with 33831 additions and 38046 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Projects/Scripts/Items/Skill Items/Ninjitsu/Fukiya.cs
View file

@ -24,11 +24,11 @@ namespace Server.Items
{
}
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
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
public virtual int WeaponMinRange => 0;
public virtual int WeaponMaxRange => 6;
@ -131,14 +131,14 @@ namespace Server.Items
switch (version)
{
case 0:
{
m_UsesRemaining = reader.ReadInt();
{
m_UsesRemaining = reader.ReadInt();
m_Poison = Poison.Deserialize(reader);
m_PoisonCharges = reader.ReadInt();
m_Poison = Poison.Deserialize(reader);
m_PoisonCharges = reader.ReadInt();
break;
}
break;
}
}
}
}

12
Projects/Scripts/Items/Skill Items/Ninjitsu/FukiyaDarts.cs
View file

@ -100,14 +100,14 @@ namespace Server.Items
switch (version)
{
case 0:
{
m_UsesRemaining = reader.ReadInt();
{
m_UsesRemaining = reader.ReadInt();
m_Poison = Poison.Deserialize(reader);
m_PoisonCharges = reader.ReadInt();
m_Poison = Poison.Deserialize(reader);
m_PoisonCharges = reader.ReadInt();
break;
}
break;
}
}
}
}

23
Projects/Scripts/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs
View file

@ -15,7 +15,6 @@ namespace Server.Items
[Constructible]
public LeatherNinjaBelt() : base(0x2790)
{
Weight = 1.0;
Layer = Layer.Waist;
@ -27,11 +26,11 @@ namespace Server.Items
public override CraftResource DefaultResource => CraftResource.RegularLeather;
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.
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.
public virtual int WeaponMinRange => 2;
public virtual int WeaponMaxRange => 10;
@ -145,14 +144,14 @@ namespace Server.Items
switch (version)
{
case 0:
{
m_UsesRemaining = reader.ReadInt();
{
m_UsesRemaining = reader.ReadInt();
m_Poison = Poison.Deserialize(reader);
m_PoisonCharges = reader.ReadInt();
m_Poison = Poison.Deserialize(reader);
m_PoisonCharges = reader.ReadInt();
break;
}
break;
}
}
}
}

34
Projects/Scripts/Items/Skill Items/Ninjitsu/NinjaWeapons.cs
View file

@ -18,23 +18,23 @@ namespace Server.Items
{
public interface INinjaAmmo : IUsesRemaining
{
int PoisonCharges{ get; set; }
Poison Poison{ get; set; }
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; }
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);
}
@ -114,8 +114,8 @@ namespace Server.Items
else
{
if (weapon.UsesRemaining > 0)
if (weapon.Poison == null && ammo.Poison != null
|| weapon.Poison != null && ammo.Poison != null && weapon.Poison.Level != ammo.Poison.Level)
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);
@ -276,7 +276,7 @@ namespace Server.Items
public class LoadEntry : ContextMenuEntry
{
private INinjaWeapon weapon;
private readonly INinjaWeapon weapon;
public LoadEntry(INinjaWeapon wep, int entry)
: base(entry, 0) =>
@ -291,7 +291,7 @@ namespace Server.Items
public class UnloadEntry : ContextMenuEntry
{
private INinjaWeapon weapon;
private readonly INinjaWeapon weapon;
public UnloadEntry(INinjaWeapon wep, int entry)
: base(entry, 0)

12
Projects/Scripts/Items/Skill Items/Ninjitsu/Shuriken.cs
View file

@ -101,14 +101,14 @@ namespace Server.Items
switch (version)
{
case 0:
{
m_UsesRemaining = reader.ReadInt();
{
m_UsesRemaining = reader.ReadInt();
m_Poison = Poison.Deserialize(reader);
m_PoisonCharges = reader.ReadInt();
m_Poison = Poison.Deserialize(reader);
m_PoisonCharges = reader.ReadInt();
break;
}
break;
}
}
}
}