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

87
Scripts/Items/Weapons/SpearsAndForks/BaseSpear.cs
View file

@ -1,58 +1,61 @@
using System;
using Server.Engines.ConPVP;
namespace Server.Items
{
public abstract class BaseSpear : BaseMeleeWeapon
{
public override int DefHitSound => 0x23C;
public override int DefMissSound => 0x238;
public abstract class BaseSpear : BaseMeleeWeapon
{
public BaseSpear(int itemID) : base(itemID)
{
}
public override SkillName DefSkill => SkillName.Fencing;
public override WeaponType DefType => WeaponType.Piercing;
public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce2H;
public BaseSpear(Serial serial) : base(serial)
{
}
public BaseSpear( int itemID ) : base( itemID )
{
}
public override int DefHitSound => 0x23C;
public override int DefMissSound => 0x238;
public BaseSpear( Serial serial ) : base( serial )
{
}
public override SkillName DefSkill => SkillName.Fencing;
public override WeaponType DefType => WeaponType.Piercing;
public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce2H;
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 OnHit( Mobile attacker, Mobile defender, double damageBonus = 1 )
{
base.OnHit( attacker, defender, damageBonus );
public override void OnHit(Mobile attacker, Mobile defender, double damageBonus = 1)
{
base.OnHit(attacker, defender, damageBonus);
if ( !Core.AOS && Layer == Layer.TwoHanded && (attacker.Skills[SkillName.Anatomy].Value / 400.0) >= Utility.RandomDouble() && Engines.ConPVP.DuelContext.AllowSpecialAbility( attacker, "Paralyzing Blow", false ) )
{
defender.SendMessage( "You receive a paralyzing blow!" ); // Is this not localized?
defender.Freeze( TimeSpan.FromSeconds( 2.0 ) );
if (!Core.AOS && Layer == Layer.TwoHanded &&
attacker.Skills[SkillName.Anatomy].Value / 400.0 >= Utility.RandomDouble() &&
DuelContext.AllowSpecialAbility(attacker, "Paralyzing Blow", false))
{
defender.SendMessage("You receive a paralyzing blow!"); // Is this not localized?
defender.Freeze(TimeSpan.FromSeconds(2.0));
attacker.SendMessage( "You deliver a paralyzing blow!" ); // Is this not localized?
attacker.PlaySound( 0x11C );
}
attacker.SendMessage("You deliver a paralyzing blow!"); // Is this not localized?
attacker.PlaySound(0x11C);
}
if ( !Core.AOS && Poison != null && PoisonCharges > 0 )
{
--PoisonCharges;
if (!Core.AOS && Poison != null && PoisonCharges > 0)
{
--PoisonCharges;
if ( Utility.RandomDouble() >= 0.5 ) // 50% chance to poison
defender.ApplyPoison( attacker, Poison );
}
}
}
}
if (Utility.RandomDouble() >= 0.5) // 50% chance to poison
defender.ApplyPoison(attacker, Poison);
}
}
}
}

74
Scripts/Items/Weapons/SpearsAndForks/BladedStaff.cs
View file

@ -1,49 +1,49 @@
namespace Server.Items
{
[FlippableAttribute( 0x26BD, 0x26C7 )]
public class BladedStaff : BaseSpear
{
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount;
[Flippable(0x26BD, 0x26C7)]
public class BladedStaff : BaseSpear
{
[Constructible]
public BladedStaff() : base(0x26BD)
{
Weight = 4.0;
}
public override int AosStrengthReq => 40;
public override int AosMinDamage => 14;
public override int AosMaxDamage => 16;
public override int AosSpeed => 37;
public override float MlSpeed => 3.00f;
public BladedStaff(Serial serial) : base(serial)
{
}
public override int OldStrengthReq => 40;
public override int OldMinDamage => 14;
public override int OldMaxDamage => 16;
public override int OldSpeed => 37;
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount;
public override int InitMinHits => 21;
public override int InitMaxHits => 110;
public override int AosStrengthReq => 40;
public override int AosMinDamage => 14;
public override int AosMaxDamage => 16;
public override int AosSpeed => 37;
public override float MlSpeed => 3.00f;
public override SkillName DefSkill => SkillName.Swords;
public override int OldStrengthReq => 40;
public override int OldMinDamage => 14;
public override int OldMaxDamage => 16;
public override int OldSpeed => 37;
[Constructible]
public BladedStaff() : base( 0x26BD )
{
Weight = 4.0;
}
public override int InitMinHits => 21;
public override int InitMaxHits => 110;
public BladedStaff( Serial serial ) : base( serial )
{
}
public override SkillName DefSkill => SkillName.Swords;
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();
}
}
}

72
Scripts/Items/Weapons/SpearsAndForks/DoubleBladedStaff.cs
View file

@ -1,47 +1,47 @@
namespace Server.Items
{
[FlippableAttribute( 0x26BF, 0x26C9 )]
public class DoubleBladedStaff : BaseSpear
{
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.InfectiousStrike;
[Flippable(0x26BF, 0x26C9)]
public class DoubleBladedStaff : BaseSpear
{
[Constructible]
public DoubleBladedStaff() : base(0x26BF)
{
Weight = 2.0;
}
public override int AosStrengthReq => 50;
public override int AosMinDamage => 12;
public override int AosMaxDamage => 13;
public override int AosSpeed => 49;
public override float MlSpeed => 2.25f;
public DoubleBladedStaff(Serial serial) : base(serial)
{
}
public override int OldStrengthReq => 50;
public override int OldMinDamage => 12;
public override int OldMaxDamage => 13;
public override int OldSpeed => 49;
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.InfectiousStrike;
public override int InitMinHits => 31;
public override int InitMaxHits => 80;
public override int AosStrengthReq => 50;
public override int AosMinDamage => 12;
public override int AosMaxDamage => 13;
public override int AosSpeed => 49;
public override float MlSpeed => 2.25f;
[Constructible]
public DoubleBladedStaff() : base( 0x26BF )
{
Weight = 2.0;
}
public override int OldStrengthReq => 50;
public override int OldMinDamage => 12;
public override int OldMaxDamage => 13;
public override int OldSpeed => 49;
public DoubleBladedStaff( Serial serial ) : base( serial )
{
}
public override int InitMinHits => 31;
public override int InitMaxHits => 80;
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();
}
}
}

72
Scripts/Items/Weapons/SpearsAndForks/Pike.cs
View file

@ -1,47 +1,47 @@
namespace Server.Items
{
[FlippableAttribute( 0x26BE, 0x26C8 )]
public class Pike : BaseSpear
{
public override WeaponAbility PrimaryAbility => WeaponAbility.ParalyzingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.InfectiousStrike;
[Flippable(0x26BE, 0x26C8)]
public class Pike : BaseSpear
{
[Constructible]
public Pike() : base(0x26BE)
{
Weight = 8.0;
}
public override int AosStrengthReq => 50;
public override int AosMinDamage => 14;
public override int AosMaxDamage => 16;
public override int AosSpeed => 37;
public override float MlSpeed => 3.00f;
public Pike(Serial serial) : base(serial)
{
}
public override int OldStrengthReq => 50;
public override int OldMinDamage => 14;
public override int OldMaxDamage => 16;
public override int OldSpeed => 37;
public override WeaponAbility PrimaryAbility => WeaponAbility.ParalyzingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.InfectiousStrike;
public override int InitMinHits => 31;
public override int InitMaxHits => 110;
public override int AosStrengthReq => 50;
public override int AosMinDamage => 14;
public override int AosMaxDamage => 16;
public override int AosSpeed => 37;
public override float MlSpeed => 3.00f;
[Constructible]
public Pike() : base( 0x26BE )
{
Weight = 8.0;
}
public override int OldStrengthReq => 50;
public override int OldMinDamage => 14;
public override int OldMaxDamage => 16;
public override int OldSpeed => 37;
public Pike( Serial serial ) : base( serial )
{
}
public override int InitMinHits => 31;
public override int InitMaxHits => 110;
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();
}
}
}

76
Scripts/Items/Weapons/SpearsAndForks/Pitchfork.cs
View file

@ -1,50 +1,50 @@
namespace Server.Items
{
[FlippableAttribute( 0xE87, 0xE88 )]
public class Pitchfork : BaseSpear
{
public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount;
[Flippable(0xE87, 0xE88)]
public class Pitchfork : BaseSpear
{
[Constructible]
public Pitchfork() : base(0xE87)
{
Weight = 11.0;
}
public override int AosStrengthReq => 55;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 14;
public override int AosSpeed => 43;
public override float MlSpeed => 2.50f;
public Pitchfork(Serial serial) : base(serial)
{
}
public override int OldStrengthReq => 15;
public override int OldMinDamage => 4;
public override int OldMaxDamage => 16;
public override int OldSpeed => 45;
public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount;
public override int InitMinHits => 31;
public override int InitMaxHits => 60;
public override int AosStrengthReq => 55;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 14;
public override int AosSpeed => 43;
public override float MlSpeed => 2.50f;
[Constructible]
public Pitchfork() : base( 0xE87 )
{
Weight = 11.0;
}
public override int OldStrengthReq => 15;
public override int OldMinDamage => 4;
public override int OldMaxDamage => 16;
public override int OldSpeed => 45;
public Pitchfork( Serial serial ) : base( serial )
{
}
public override int InitMinHits => 31;
public override int InitMaxHits => 60;
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();
if ( Weight == 10.0 )
Weight = 11.0;
}
}
}
if (Weight == 10.0)
Weight = 11.0;
}
}
}

74
Scripts/Items/Weapons/SpearsAndForks/ShortSpear.cs
View file

@ -1,49 +1,49 @@
namespace Server.Items
{
[FlippableAttribute( 0x1403, 0x1402 )]
public class ShortSpear : BaseSpear
{
public override WeaponAbility PrimaryAbility => WeaponAbility.ShadowStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;
[Flippable(0x1403, 0x1402)]
public class ShortSpear : BaseSpear
{
[Constructible]
public ShortSpear() : base(0x1403)
{
Weight = 4.0;
}
public override int AosStrengthReq => 40;
public override int AosMinDamage => 10;
public override int AosMaxDamage => 13;
public override int AosSpeed => 55;
public override float MlSpeed => 2.00f;
public ShortSpear(Serial serial) : base(serial)
{
}
public override int OldStrengthReq => 15;
public override int OldMinDamage => 4;
public override int OldMaxDamage => 32;
public override int OldSpeed => 50;
public override WeaponAbility PrimaryAbility => WeaponAbility.ShadowStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;
public override int InitMinHits => 31;
public override int InitMaxHits => 70;
public override int AosStrengthReq => 40;
public override int AosMinDamage => 10;
public override int AosMaxDamage => 13;
public override int AosSpeed => 55;
public override float MlSpeed => 2.00f;
public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H;
public override int OldStrengthReq => 15;
public override int OldMinDamage => 4;
public override int OldMaxDamage => 32;
public override int OldSpeed => 50;
[Constructible]
public ShortSpear() : base( 0x1403 )
{
Weight = 4.0;
}
public override int InitMinHits => 31;
public override int InitMaxHits => 70;
public ShortSpear( Serial serial ) : base( serial )
{
}
public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H;
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();
}
}
}

72
Scripts/Items/Weapons/SpearsAndForks/Spear.cs
View file

@ -1,47 +1,47 @@
namespace Server.Items
{
[FlippableAttribute( 0xF62, 0xF63 )]
public class Spear : BaseSpear
{
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
[Flippable(0xF62, 0xF63)]
public class Spear : BaseSpear
{
[Constructible]
public Spear() : base(0xF62)
{
Weight = 7.0;
}
public override int AosStrengthReq => 50;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 15;
public override int AosSpeed => 42;
public override float MlSpeed => 2.75f;
public Spear(Serial serial) : base(serial)
{
}
public override int OldStrengthReq => 30;
public override int OldMinDamage => 2;
public override int OldMaxDamage => 36;
public override int OldSpeed => 46;
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
public override int InitMinHits => 31;
public override int InitMaxHits => 80;
public override int AosStrengthReq => 50;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 15;
public override int AosSpeed => 42;
public override float MlSpeed => 2.75f;
[Constructible]
public Spear() : base( 0xF62 )
{
Weight = 7.0;
}
public override int OldStrengthReq => 30;
public override int OldMinDamage => 2;
public override int OldMaxDamage => 36;
public override int OldSpeed => 46;
public Spear( Serial serial ) : base( serial )
{
}
public override int InitMinHits => 31;
public override int InitMaxHits => 80;
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();
}
}
}

78
Scripts/Items/Weapons/SpearsAndForks/TribalSpear.cs
View file

@ -1,52 +1,52 @@
namespace Server.Items
{
[FlippableAttribute( 0xF62, 0xF63 )]
public class TribalSpear : BaseSpear
{
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
[Flippable(0xF62, 0xF63)]
public class TribalSpear : BaseSpear
{
[Constructible]
public TribalSpear() : base(0xF62)
{
Weight = 7.0;
Hue = 837;
}
public override int AosStrengthReq => 50;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 15;
public override int AosSpeed => 42;
public override float MlSpeed => 2.75f;
public TribalSpear(Serial serial) : base(serial)
{
}
public override int OldStrengthReq => 30;
public override int OldMinDamage => 2;
public override int OldMaxDamage => 36;
public override int OldSpeed => 46;
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
public override int InitMinHits => 31;
public override int InitMaxHits => 80;
public override int AosStrengthReq => 50;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 15;
public override int AosSpeed => 42;
public override float MlSpeed => 2.75f;
public override int VirtualDamageBonus => 25;
public override int OldStrengthReq => 30;
public override int OldMinDamage => 2;
public override int OldMaxDamage => 36;
public override int OldSpeed => 46;
public override string DefaultName => "a tribal spear";
public override int InitMinHits => 31;
public override int InitMaxHits => 80;
[Constructible]
public TribalSpear() : base( 0xF62 )
{
Weight = 7.0;
Hue = 837;
}
public override int VirtualDamageBonus => 25;
public TribalSpear( Serial serial ) : base( serial )
{
}
public override string DefaultName => "a tribal spear";
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();
}
}
}

78
Scripts/Items/Weapons/SpearsAndForks/WarFork.cs
View file

@ -1,52 +1,52 @@
namespace Server.Items
{
[FlippableAttribute( 0x1405, 0x1404 )]
public class WarFork : BaseSpear
{
public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
[Flippable(0x1405, 0x1404)]
public class WarFork : BaseSpear
{
[Constructible]
public WarFork() : base(0x1405)
{
Weight = 9.0;
}
public override int AosStrengthReq => 45;
public override int AosMinDamage => 12;
public override int AosMaxDamage => 13;
public override int AosSpeed => 43;
public override float MlSpeed => 2.50f;
public WarFork(Serial serial) : base(serial)
{
}
public override int OldStrengthReq => 35;
public override int OldMinDamage => 4;
public override int OldMaxDamage => 32;
public override int OldSpeed => 45;
public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
public override int DefHitSound => 0x236;
public override int DefMissSound => 0x238;
public override int AosStrengthReq => 45;
public override int AosMinDamage => 12;
public override int AosMaxDamage => 13;
public override int AosSpeed => 43;
public override float MlSpeed => 2.50f;
public override int InitMinHits => 31;
public override int InitMaxHits => 110;
public override int OldStrengthReq => 35;
public override int OldMinDamage => 4;
public override int OldMaxDamage => 32;
public override int OldSpeed => 45;
public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H;
public override int DefHitSound => 0x236;
public override int DefMissSound => 0x238;
[Constructible]
public WarFork() : base( 0x1405 )
{
Weight = 9.0;
}
public override int InitMinHits => 31;
public override int InitMaxHits => 110;
public WarFork( Serial serial ) : base( serial )
{
}
public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H;
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();
}
}
}