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

60
Scripts/Items/Weapons/Staves/BaseStaff.cs
View file

@ -1,41 +1,41 @@
namespace Server.Items
{
public abstract class BaseStaff : BaseMeleeWeapon
{
public override int DefHitSound => 0x233;
public override int DefMissSound => 0x239;
public abstract class BaseStaff : BaseMeleeWeapon
{
public BaseStaff(int itemID) : base(itemID)
{
}
public override SkillName DefSkill => SkillName.Macing;
public override WeaponType DefType => WeaponType.Staff;
public override WeaponAnimation DefAnimation => WeaponAnimation.Bash2H;
public BaseStaff(Serial serial) : base(serial)
{
}
public BaseStaff( int itemID ) : base( itemID )
{
}
public override int DefHitSound => 0x233;
public override int DefMissSound => 0x239;
public BaseStaff( Serial serial ) : base( serial )
{
}
public override SkillName DefSkill => SkillName.Macing;
public override WeaponType DefType => WeaponType.Staff;
public override WeaponAnimation DefAnimation => WeaponAnimation.Bash2H;
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);
defender.Stam -= Utility.Random( 3, 3 ); // 3-5 points of stamina loss
}
}
}
defender.Stam -= Utility.Random(3, 3); // 3-5 points of stamina loss
}
}
}

72
Scripts/Items/Weapons/Staves/BlackStaff.cs
View file

@ -1,47 +1,47 @@
namespace Server.Items
{
[FlippableAttribute( 0xDF1, 0xDF0 )]
public class BlackStaff : BaseStaff
{
public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
[Flippable(0xDF1, 0xDF0)]
public class BlackStaff : BaseStaff
{
[Constructible]
public BlackStaff() : base(0xDF0)
{
Weight = 6.0;
}
public override int AosStrengthReq => 35;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 16;
public override int AosSpeed => 39;
public override float MlSpeed => 2.75f;
public BlackStaff(Serial serial) : base(serial)
{
}
public override int OldStrengthReq => 35;
public override int OldMinDamage => 8;
public override int OldMaxDamage => 33;
public override int OldSpeed => 35;
public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
public override int InitMinHits => 31;
public override int InitMaxHits => 70;
public override int AosStrengthReq => 35;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 16;
public override int AosSpeed => 39;
public override float MlSpeed => 2.75f;
[Constructible]
public BlackStaff() : base( 0xDF0 )
{
Weight = 6.0;
}
public override int OldStrengthReq => 35;
public override int OldMinDamage => 8;
public override int OldMaxDamage => 33;
public override int OldSpeed => 35;
public BlackStaff( Serial serial ) : base( serial )
{
}
public override int InitMinHits => 31;
public override int InitMaxHits => 70;
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();
}
}
}

55
Scripts/Items/Weapons/Staves/GlacialStaff.cs
View file

@ -1,37 +1,36 @@
namespace Server.Items
{
public class GlacialStaff : BlackStaff
{
//TODO: Pre-AoS stuff
public override int LabelNumber => 1017413; // Glacial Staff
public class GlacialStaff : BlackStaff
{
[Constructible]
public GlacialStaff()
{
Hue = 0x480;
WeaponAttributes.HitHarm = 5 * Utility.RandomMinMax(1, 5);
WeaponAttributes.MageWeapon = Utility.RandomMinMax(5, 10);
[Constructible]
public GlacialStaff()
{
Hue = 0x480;
WeaponAttributes.HitHarm = 5 * Utility.RandomMinMax( 1, 5 );
WeaponAttributes.MageWeapon = Utility.RandomMinMax( 5, 10 );
AosElementDamages[AosElementAttribute.Cold] = 20 + 5 * Utility.RandomMinMax(0, 6);
}
AosElementDamages[AosElementAttribute.Cold] = 20 + (5 * Utility.RandomMinMax( 0, 6 ));
public GlacialStaff(Serial serial) : base(serial)
{
}
}
//TODO: Pre-AoS stuff
public override int LabelNumber => 1017413; // Glacial Staff
public GlacialStaff( Serial serial ) : base( serial )
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write(0); // version
}
writer.Write( (int) 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/Staves/GnarledStaff.cs
View file

@ -1,47 +1,47 @@
namespace Server.Items
{
[FlippableAttribute( 0x13F8, 0x13F9 )]
public class GnarledStaff : BaseStaff
{
public override WeaponAbility PrimaryAbility => WeaponAbility.ConcussionBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
[Flippable(0x13F8, 0x13F9)]
public class GnarledStaff : BaseStaff
{
[Constructible]
public GnarledStaff() : base(0x13F8)
{
Weight = 3.0;
}
public override int AosStrengthReq => 20;
public override int AosMinDamage => 15;
public override int AosMaxDamage => 17;
public override int AosSpeed => 33;
public override float MlSpeed => 3.25f;
public GnarledStaff(Serial serial) : base(serial)
{
}
public override int OldStrengthReq => 20;
public override int OldMinDamage => 10;
public override int OldMaxDamage => 30;
public override int OldSpeed => 33;
public override WeaponAbility PrimaryAbility => WeaponAbility.ConcussionBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
public override int InitMinHits => 31;
public override int InitMaxHits => 50;
public override int AosStrengthReq => 20;
public override int AosMinDamage => 15;
public override int AosMaxDamage => 17;
public override int AosSpeed => 33;
public override float MlSpeed => 3.25f;
[Constructible]
public GnarledStaff() : base( 0x13F8 )
{
Weight = 3.0;
}
public override int OldStrengthReq => 20;
public override int OldMinDamage => 10;
public override int OldMaxDamage => 30;
public override int OldSpeed => 33;
public GnarledStaff( Serial serial ) : base( serial )
{
}
public override int InitMinHits => 31;
public override int InitMaxHits => 50;
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/Staves/QuarterStaff.cs
View file

@ -1,47 +1,47 @@
namespace Server.Items
{
[FlippableAttribute( 0xE89, 0xE8a )]
public class QuarterStaff : BaseStaff
{
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow;
[Flippable(0xE89, 0xE8a)]
public class QuarterStaff : BaseStaff
{
[Constructible]
public QuarterStaff() : base(0xE89)
{
Weight = 4.0;
}
public override int AosStrengthReq => 30;
public override int AosMinDamage => 11;
public override int AosMaxDamage => 14;
public override int AosSpeed => 48;
public override float MlSpeed => 2.25f;
public QuarterStaff(Serial serial) : base(serial)
{
}
public override int OldStrengthReq => 30;
public override int OldMinDamage => 8;
public override int OldMaxDamage => 28;
public override int OldSpeed => 48;
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow;
public override int InitMinHits => 31;
public override int InitMaxHits => 60;
public override int AosStrengthReq => 30;
public override int AosMinDamage => 11;
public override int AosMaxDamage => 14;
public override int AosSpeed => 48;
public override float MlSpeed => 2.25f;
[Constructible]
public QuarterStaff() : base( 0xE89 )
{
Weight = 4.0;
}
public override int OldStrengthReq => 30;
public override int OldMinDamage => 8;
public override int OldMaxDamage => 28;
public override int OldSpeed => 48;
public QuarterStaff( 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();
}
}
}

269
Scripts/Items/Weapons/Staves/ShepherdsCrook.cs
View file

@ -1,166 +1,169 @@
using System;
using Server.Engines.CannedEvil;
using Server.Mobiles;
using Server.Network;
using Server.Targeting;
using Server.Mobiles;
using Server.Engines.CannedEvil;
namespace Server.Items
{
[FlippableAttribute( 0xE81, 0xE82 )]
public class ShepherdsCrook : BaseStaff
{
public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
[Flippable(0xE81, 0xE82)]
public class ShepherdsCrook : BaseStaff
{
[Constructible]
public ShepherdsCrook() : base(0xE81)
{
Weight = 4.0;
}
public override int AosStrengthReq => 20;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 15;
public override int AosSpeed => 40;
public override float MlSpeed => 2.75f;
public ShepherdsCrook(Serial serial) : base(serial)
{
}
public override int OldStrengthReq => 10;
public override int OldMinDamage => 3;
public override int OldMaxDamage => 12;
public override int OldSpeed => 30;
public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
public override int InitMinHits => 31;
public override int InitMaxHits => 50;
public override int AosStrengthReq => 20;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 15;
public override int AosSpeed => 40;
public override float MlSpeed => 2.75f;
[Constructible]
public ShepherdsCrook() : base( 0xE81 )
{
Weight = 4.0;
}
public override int OldStrengthReq => 10;
public override int OldMinDamage => 3;
public override int OldMaxDamage => 12;
public override int OldSpeed => 30;
public ShepherdsCrook( Serial serial ) : base( serial )
{
}
public override int InitMinHits => 31;
public override int InitMaxHits => 50;
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 == 2.0 )
Weight = 4.0;
}
if (Weight == 2.0)
Weight = 4.0;
}
public override void OnDoubleClick( Mobile from )
{
from.SendLocalizedMessage( 502464 ); // Target the animal you wish to herd.
from.Target = new HerdingTarget();
}
public override void OnDoubleClick(Mobile from)
{
from.SendLocalizedMessage(502464); // Target the animal you wish to herd.
from.Target = new HerdingTarget();
}
private class HerdingTarget : Target
{
public HerdingTarget() : base( 10, false, TargetFlags.None )
{
}
private class HerdingTarget : Target
{
private static Type[] m_ChampTamables =
{
typeof(StrongMongbat), typeof(Imp), typeof(Scorpion), typeof(GiantSpider),
typeof(Snake), typeof(LavaLizard), typeof(Drake), typeof(Dragon),
typeof(Kirin), typeof(Unicorn), typeof(GiantRat), typeof(Slime),
typeof(DireWolf), typeof(HellHound), typeof(DeathwatchBeetle),
typeof(LesserHiryu), typeof(Hiryu)
};
protected override void OnTarget( Mobile from, object targ )
{
if ( targ is BaseCreature bc )
{
if ( IsHerdable( bc ) )
{
if ( bc.Controlled )
{
bc.PrivateOverheadMessage( MessageType.Regular, 0x3B2, 502467, from.NetState ); // That animal looks tame already.
}
else
{
from.SendLocalizedMessage( 502475 ); // Click where you wish the animal to go.
from.Target = new InternalTarget( bc );
}
}
else
{
from.SendLocalizedMessage( 502468 ); // That is not a herdable animal.
}
}
else
{
from.SendLocalizedMessage( 502472 ); // You don't seem to be able to persuade that to move.
}
}
public HerdingTarget() : base(10, false, TargetFlags.None)
{
}
private static Type[] m_ChampTamables = {
typeof( StrongMongbat ), typeof( Imp ), typeof( Scorpion ), typeof( GiantSpider ),
typeof( Snake ), typeof( LavaLizard ), typeof( Drake ), typeof( Dragon ),
typeof( Kirin ), typeof( Unicorn ), typeof( GiantRat ), typeof( Slime ),
typeof( DireWolf ), typeof( HellHound ), typeof( DeathwatchBeetle ),
typeof( LesserHiryu ), typeof( Hiryu )
};
protected override void OnTarget(Mobile from, object targ)
{
if (targ is BaseCreature bc)
{
if (IsHerdable(bc))
{
if (bc.Controlled)
{
bc.PrivateOverheadMessage(MessageType.Regular, 0x3B2, 502467,
from.NetState); // That animal looks tame already.
}
else
{
from.SendLocalizedMessage(502475); // Click where you wish the animal to go.
from.Target = new InternalTarget(bc);
}
}
else
{
from.SendLocalizedMessage(502468); // That is not a herdable animal.
}
}
else
{
from.SendLocalizedMessage(502472); // You don't seem to be able to persuade that to move.
}
}
private bool IsHerdable( BaseCreature bc )
{
if ( bc.IsParagon )
return false;
private bool IsHerdable(BaseCreature bc)
{
if (bc.IsParagon)
return false;
if ( bc.Tamable )
return true;
if (bc.Tamable)
return true;
Map map = bc.Map;
Map map = bc.Map;
if ( Region.Find( bc.Home, map ) is ChampionSpawnRegion region )
{
ChampionSpawn spawn = region.ChampionSpawn;
if (Region.Find(bc.Home, map) is ChampionSpawnRegion region)
{
ChampionSpawn spawn = region.ChampionSpawn;
if ( spawn != null && spawn.IsChampionSpawn( bc ) )
{
Type t = bc.GetType();
if (spawn != null && spawn.IsChampionSpawn(bc))
{
Type t = bc.GetType();
foreach ( Type type in m_ChampTamables )
if ( type == t )
return true;
}
}
foreach (Type type in m_ChampTamables)
if (type == t)
return true;
}
}
return false;
}
return false;
}
private class InternalTarget : Target
{
private BaseCreature m_Creature;
private class InternalTarget : Target
{
private BaseCreature m_Creature;
public InternalTarget( BaseCreature c ) : base( 10, true, TargetFlags.None )
{
m_Creature = c;
}
public InternalTarget(BaseCreature c) : base(10, true, TargetFlags.None)
{
m_Creature = c;
}
protected override void OnTarget( Mobile from, object targ )
{
if ( targ is IPoint2D p )
{
double min = m_Creature.MinTameSkill - 30;
double max = m_Creature.MinTameSkill + 30 + Utility.Random( 10 );
protected override void OnTarget(Mobile from, object targ)
{
if (targ is IPoint2D p)
{
double min = m_Creature.MinTameSkill - 30;
double max = m_Creature.MinTameSkill + 30 + Utility.Random(10);
if ( max <= from.Skills[ SkillName.Herding ].Value )
m_Creature.PrivateOverheadMessage( MessageType.Regular, 0x3B2, 502471, from.NetState ); // That wasn't even challenging.
if (max <= from.Skills[SkillName.Herding].Value)
m_Creature.PrivateOverheadMessage(MessageType.Regular, 0x3B2, 502471,
from.NetState); // That wasn't even challenging.
if ( from.CheckTargetSkill( SkillName.Herding, m_Creature, min, max ) )
{
if ( p != from )
p = new Point2D( p.X, p.Y );
if (from.CheckTargetSkill(SkillName.Herding, m_Creature, min, max))
{
if (p != from)
p = new Point2D(p.X, p.Y);
m_Creature.TargetLocation = p;
from.SendLocalizedMessage( 502479 ); // The animal walks where it was instructed to.
}
else
{
from.SendLocalizedMessage( 502472 ); // You don't seem to be able to persuade that to move.
}
}
}
}
}
}
}
m_Creature.TargetLocation = p;
from.SendLocalizedMessage(502479); // The animal walks where it was instructed to.
}
else
{
from.SendLocalizedMessage(502472); // You don't seem to be able to persuade that to move.
}
}
}
}
}
}
}