Fixes code according to modern code style. Fixes a few expression bugs.

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

View file

@ -3,45 +3,40 @@ using Server.Items;
namespace Server.Mobiles
{
public class SBAxeWeapon: SBInfo
{
public SBAxeWeapon()
{
}
public class SBAxeWeapon : SBInfo
{
public override IShopSellInfo SellInfo{ get; } = new InternalSellInfo();
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo{ get; } = new InternalBuyInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add(new GenericBuyInfo(typeof(ExecutionersAxe), 30, 20, 0xF45, 0));
Add(new GenericBuyInfo(typeof(BattleAxe), 26, 20, 0xF47, 0));
Add(new GenericBuyInfo(typeof(TwoHandedAxe), 32, 20, 0x1443, 0));
Add(new GenericBuyInfo(typeof(Axe), 40, 20, 0xF49, 0));
Add(new GenericBuyInfo(typeof(DoubleAxe), 52, 20, 0xF4B, 0));
Add(new GenericBuyInfo(typeof(Pickaxe), 22, 20, 0xE86, 0));
Add(new GenericBuyInfo(typeof(LargeBattleAxe), 33, 20, 0x13FB, 0));
Add(new GenericBuyInfo(typeof(WarAxe), 29, 20, 0x13B0, 0));
}
}
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add( new GenericBuyInfo( typeof( ExecutionersAxe ), 30, 20, 0xF45, 0 ) );
Add( new GenericBuyInfo( typeof( BattleAxe ), 26, 20, 0xF47, 0 ) );
Add( new GenericBuyInfo( typeof( TwoHandedAxe ), 32, 20, 0x1443, 0 ) );
Add( new GenericBuyInfo( typeof( Axe ), 40, 20, 0xF49, 0 ) );
Add( new GenericBuyInfo( typeof( DoubleAxe ), 52, 20, 0xF4B, 0 ) );
Add( new GenericBuyInfo( typeof( Pickaxe ), 22, 20, 0xE86, 0 ) );
Add( new GenericBuyInfo( typeof( LargeBattleAxe ), 33, 20, 0x13FB, 0 ) );
Add( new GenericBuyInfo( typeof( WarAxe ), 29, 20, 0x13B0, 0 ) );
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add( typeof( BattleAxe ), 13 );
Add( typeof( DoubleAxe ), 26 );
Add( typeof( ExecutionersAxe ), 15 );
Add( typeof( LargeBattleAxe ),16 );
Add( typeof( Pickaxe ), 11 );
Add( typeof( TwoHandedAxe ), 16 );
Add( typeof( WarAxe ), 14 );
Add( typeof( Axe ), 20 );
}
}
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add(typeof(BattleAxe), 13);
Add(typeof(DoubleAxe), 26);
Add(typeof(ExecutionersAxe), 15);
Add(typeof(LargeBattleAxe), 16);
Add(typeof(Pickaxe), 11);
Add(typeof(TwoHandedAxe), 16);
Add(typeof(WarAxe), 14);
Add(typeof(Axe), 20);
}
}
}
}

View file

@ -3,36 +3,32 @@ using Server.Items;
namespace Server.Mobiles
{
public class SBKnifeWeapon: SBInfo
{
public SBKnifeWeapon()
{
}
public class SBKnifeWeapon : SBInfo
{
public override IShopSellInfo SellInfo{ get; } = new InternalSellInfo();
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo{ get; } = new InternalBuyInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add(new GenericBuyInfo(typeof(ButcherKnife), 14, 20, 0x13F6, 0));
Add(new GenericBuyInfo(typeof(Dagger), 21, 20, 0xF52, 0));
Add(new GenericBuyInfo(typeof(Cleaver), 15, 20, 0xEC3, 0));
Add(new GenericBuyInfo(typeof(SkinningKnife), 14, 20, 0xEC4, 0));
}
}
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add( new GenericBuyInfo( typeof( ButcherKnife ), 14, 20, 0x13F6, 0 ) );
Add( new GenericBuyInfo( typeof( Dagger ), 21, 20, 0xF52, 0 ) );
Add( new GenericBuyInfo( typeof( Cleaver ), 15, 20, 0xEC3, 0 ) );
Add( new GenericBuyInfo( typeof( SkinningKnife ), 14, 20, 0xEC4, 0 ) );
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add( typeof( ButcherKnife ), 7 );
Add( typeof( Cleaver ), 7 );
Add( typeof( Dagger ), 10 );
Add( typeof( SkinningKnife ), 7 );
}
}
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add(typeof(ButcherKnife), 7);
Add(typeof(Cleaver), 7);
Add(typeof(Dagger), 10);
Add(typeof(SkinningKnife), 7);
}
}
}
}

View file

@ -3,40 +3,36 @@ using Server.Items;
namespace Server.Mobiles
{
public class SBMaceWeapon: SBInfo
{
public SBMaceWeapon()
{
}
public class SBMaceWeapon : SBInfo
{
public override IShopSellInfo SellInfo{ get; } = new InternalSellInfo();
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo{ get; } = new InternalBuyInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add(new GenericBuyInfo(typeof(HammerPick), 26, 20, 0x143D, 0));
Add(new GenericBuyInfo(typeof(Club), 16, 20, 0x13B4, 0));
Add(new GenericBuyInfo(typeof(Mace), 28, 20, 0xF5C, 0));
Add(new GenericBuyInfo(typeof(Maul), 21, 20, 0x143B, 0));
Add(new GenericBuyInfo(typeof(WarHammer), 25, 20, 0x1439, 0));
Add(new GenericBuyInfo(typeof(WarMace), 31, 20, 0x1407, 0));
}
}
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add( new GenericBuyInfo( typeof( HammerPick ), 26, 20, 0x143D, 0 ) );
Add( new GenericBuyInfo( typeof( Club ), 16, 20, 0x13B4, 0 ) );
Add( new GenericBuyInfo( typeof( Mace ), 28, 20, 0xF5C, 0 ) );
Add( new GenericBuyInfo( typeof( Maul ), 21, 20, 0x143B, 0 ) );
Add( new GenericBuyInfo( typeof( WarHammer ), 25, 20, 0x1439, 0 ) );
Add( new GenericBuyInfo( typeof( WarMace ), 31, 20, 0x1407, 0 ) );
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add( typeof( Club ), 8 );
Add( typeof( HammerPick ), 13 );
Add( typeof( Mace ), 14 );
Add( typeof( Maul ), 10 );
Add( typeof( WarHammer ), 12 );
Add( typeof( WarMace ), 15 );
}
}
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add(typeof(Club), 8);
Add(typeof(HammerPick), 13);
Add(typeof(Mace), 14);
Add(typeof(Maul), 10);
Add(typeof(WarHammer), 12);
Add(typeof(WarMace), 15);
}
}
}
}

View file

@ -3,32 +3,28 @@ using Server.Items;
namespace Server.Mobiles
{
public class SBPoleArmWeapon: SBInfo
{
public SBPoleArmWeapon()
{
}
public class SBPoleArmWeapon : SBInfo
{
public override IShopSellInfo SellInfo{ get; } = new InternalSellInfo();
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo{ get; } = new InternalBuyInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add(new GenericBuyInfo(typeof(Bardiche), 60, 20, 0xF4D, 0));
Add(new GenericBuyInfo(typeof(Halberd), 42, 20, 0x143E, 0));
}
}
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add( new GenericBuyInfo( typeof( Bardiche ), 60, 20, 0xF4D, 0 ) );
Add( new GenericBuyInfo( typeof( Halberd ), 42, 20, 0x143E, 0 ) );
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add( typeof( Bardiche ), 30 );
Add( typeof( Halberd ), 21 );
}
}
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add(typeof(Bardiche), 30);
Add(typeof(Halberd), 21);
}
}
}
}

View file

@ -3,54 +3,51 @@ using Server.Items;
namespace Server.Mobiles
{
public class SBRangedWeapon: SBInfo
{
public SBRangedWeapon()
{
}
public class SBRangedWeapon : SBInfo
{
public override IShopSellInfo SellInfo{ get; } = new InternalSellInfo();
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo{ get; } = new InternalBuyInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add(new GenericBuyInfo(typeof(Crossbow), 55, 20, 0xF50, 0));
Add(new GenericBuyInfo(typeof(HeavyCrossbow), 55, 20, 0x13FD, 0));
if (Core.AOS)
{
Add(new GenericBuyInfo(typeof(RepeatingCrossbow), 46, 20, 0x26C3, 0));
Add(new GenericBuyInfo(typeof(CompositeBow), 45, 20, 0x26C2, 0));
}
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add( new GenericBuyInfo( typeof( Crossbow ), 55, 20, 0xF50, 0 ) );
Add( new GenericBuyInfo( typeof( HeavyCrossbow ), 55, 20, 0x13FD, 0 ) );
if ( Core.AOS )
{
Add( new GenericBuyInfo( typeof( RepeatingCrossbow ), 46, 20, 0x26C3, 0 ) );
Add( new GenericBuyInfo( typeof( CompositeBow ), 45, 20, 0x26C2, 0 ) );
}
Add( new GenericBuyInfo( typeof( Bolt ), 2, Utility.Random( 30, 60 ), 0x1BFB, 0 ) );
Add( new GenericBuyInfo( typeof( Bow ), 40, 20, 0x13B2, 0 ) );
Add( new GenericBuyInfo( typeof( Arrow ), 2, Utility.Random( 30, 60 ), 0xF3F, 0 ) );
Add( new GenericBuyInfo( typeof( Feather ), 2, Utility.Random( 30, 60 ), 0x1BD1, 0 ) );
Add( new GenericBuyInfo( typeof( Shaft ), 3, Utility.Random( 30, 60 ), 0x1BD4, 0 ) );
}
}
Add(new GenericBuyInfo(typeof(Bolt), 2, Utility.Random(30, 60), 0x1BFB, 0));
Add(new GenericBuyInfo(typeof(Bow), 40, 20, 0x13B2, 0));
Add(new GenericBuyInfo(typeof(Arrow), 2, Utility.Random(30, 60), 0xF3F, 0));
Add(new GenericBuyInfo(typeof(Feather), 2, Utility.Random(30, 60), 0x1BD1, 0));
Add(new GenericBuyInfo(typeof(Shaft), 3, Utility.Random(30, 60), 0x1BD4, 0));
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add( typeof( Bolt ), 1 );
Add( typeof( Arrow ), 1 );
Add( typeof( Shaft ), 1 );
Add( typeof( Feather ), 1 );
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add(typeof(Bolt), 1);
Add(typeof(Arrow), 1);
Add(typeof(Shaft), 1);
Add(typeof(Feather), 1);
Add( typeof( HeavyCrossbow ), 27 );
Add( typeof( Bow ), 17 );
Add( typeof( Crossbow ), 25 );
Add(typeof(HeavyCrossbow), 27);
Add(typeof(Bow), 17);
Add(typeof(Crossbow), 25);
if ( Core.AOS )
{
Add( typeof( CompositeBow ), 23 );
Add( typeof( RepeatingCrossbow ), 22 );
}
}
}
}
}
if (Core.AOS)
{
Add(typeof(CompositeBow), 23);
Add(typeof(RepeatingCrossbow), 22);
}
}
}
}
}

View file

@ -3,34 +3,30 @@ using Server.Items;
namespace Server.Mobiles
{
public class SBSpearForkWeapon: SBInfo
{
public SBSpearForkWeapon()
{
}
public class SBSpearForkWeapon : SBInfo
{
public override IShopSellInfo SellInfo{ get; } = new InternalSellInfo();
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo{ get; } = new InternalBuyInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add(new GenericBuyInfo(typeof(Pitchfork), 19, 20, 0xE87, 0));
Add(new GenericBuyInfo(typeof(ShortSpear), 23, 20, 0x1403, 0));
Add(new GenericBuyInfo(typeof(Spear), 31, 20, 0xF62, 0));
}
}
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add( new GenericBuyInfo( typeof( Pitchfork ), 19, 20, 0xE87, 0 ) );
Add( new GenericBuyInfo( typeof( ShortSpear ), 23, 20, 0x1403, 0 ) );
Add( new GenericBuyInfo( typeof( Spear ), 31, 20, 0xF62, 0 ) );
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add( typeof( Spear ), 15 );
Add( typeof( Pitchfork ), 9 );
Add( typeof( ShortSpear ), 11 );
}
}
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add(typeof(Spear), 15);
Add(typeof(Pitchfork), 9);
Add(typeof(ShortSpear), 11);
}
}
}
}

View file

@ -3,36 +3,32 @@ using Server.Items;
namespace Server.Mobiles
{
public class SBStavesWeapon: SBInfo
{
public SBStavesWeapon()
{
}
public class SBStavesWeapon : SBInfo
{
public override IShopSellInfo SellInfo{ get; } = new InternalSellInfo();
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo{ get; } = new InternalBuyInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add(new GenericBuyInfo(typeof(BlackStaff), 22, 20, 0xDF1, 0));
Add(new GenericBuyInfo(typeof(GnarledStaff), 16, 20, 0x13F8, 0));
Add(new GenericBuyInfo(typeof(QuarterStaff), 19, 20, 0xE89, 0));
Add(new GenericBuyInfo(typeof(ShepherdsCrook), 20, 20, 0xE81, 0));
}
}
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add( new GenericBuyInfo( typeof( BlackStaff ), 22, 20, 0xDF1, 0 ) );
Add( new GenericBuyInfo( typeof( GnarledStaff ), 16, 20, 0x13F8, 0 ) );
Add( new GenericBuyInfo( typeof( QuarterStaff ), 19, 20, 0xE89, 0 ) );
Add( new GenericBuyInfo( typeof( ShepherdsCrook ), 20, 20, 0xE81, 0 ) );
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add( typeof( BlackStaff ), 11 );
Add( typeof( GnarledStaff ), 8 );
Add( typeof( QuarterStaff ), 9 );
Add( typeof( ShepherdsCrook ), 10 );
}
}
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add(typeof(BlackStaff), 11);
Add(typeof(GnarledStaff), 8);
Add(typeof(QuarterStaff), 9);
Add(typeof(ShepherdsCrook), 10);
}
}
}
}

View file

@ -3,68 +3,62 @@ using Server.Items;
namespace Server.Mobiles
{
public class SBSwordWeapon: SBInfo
{
public SBSwordWeapon()
{
}
public class SBSwordWeapon : SBInfo
{
public override IShopSellInfo SellInfo{ get; } = new InternalSellInfo();
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo{ get; } = new InternalBuyInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add(new GenericBuyInfo(typeof(Cutlass), 24, 20, 0x1441, 0));
Add(new GenericBuyInfo(typeof(Katana), 33, 20, 0x13FF, 0));
Add(new GenericBuyInfo(typeof(Kryss), 32, 20, 0x1401, 0));
Add(new GenericBuyInfo(typeof(Broadsword), 35, 20, 0xF5E, 0));
Add(new GenericBuyInfo(typeof(Longsword), 55, 20, 0xF61, 0));
Add(new GenericBuyInfo(typeof(ThinLongsword), 27, 20, 0x13B8, 0));
Add(new GenericBuyInfo(typeof(VikingSword), 55, 20, 0x13B9, 0));
Add(new GenericBuyInfo(typeof(Scimitar), 36, 20, 0x13B6, 0));
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
Add( new GenericBuyInfo( typeof( Cutlass ), 24, 20, 0x1441, 0 ) );
Add( new GenericBuyInfo( typeof( Katana ), 33, 20, 0x13FF, 0 ) );
Add( new GenericBuyInfo( typeof( Kryss ), 32, 20, 0x1401, 0 ) );
Add( new GenericBuyInfo( typeof( Broadsword ), 35, 20, 0xF5E, 0 ) );
Add( new GenericBuyInfo( typeof( Longsword ), 55, 20, 0xF61, 0 ) );
Add( new GenericBuyInfo( typeof( ThinLongsword ), 27, 20, 0x13B8, 0 ) );
Add( new GenericBuyInfo( typeof( VikingSword ), 55, 20, 0x13B9, 0 ) );
Add( new GenericBuyInfo( typeof( Scimitar ), 36, 20, 0x13B6, 0 ) );
if (Core.AOS)
{
Add(new GenericBuyInfo(typeof(BoneHarvester), 35, 20, 0x26BB, 0));
Add(new GenericBuyInfo(typeof(CrescentBlade), 37, 20, 0x26C1, 0));
Add(new GenericBuyInfo(typeof(DoubleBladedStaff), 35, 20, 0x26BF, 0));
Add(new GenericBuyInfo(typeof(Lance), 34, 20, 0x26C0, 0));
Add(new GenericBuyInfo(typeof(Pike), 39, 20, 0x26BE, 0));
Add(new GenericBuyInfo(typeof(Scythe), 39, 20, 0x26BA, 0));
}
}
}
if ( Core.AOS )
{
Add( new GenericBuyInfo( typeof( BoneHarvester ), 35, 20, 0x26BB, 0 ) );
Add( new GenericBuyInfo( typeof( CrescentBlade ), 37, 20, 0x26C1, 0 ) );
Add( new GenericBuyInfo( typeof( DoubleBladedStaff ), 35, 20, 0x26BF, 0 ) );
Add( new GenericBuyInfo( typeof( Lance ), 34, 20, 0x26C0, 0 ) );
Add( new GenericBuyInfo( typeof( Pike ), 39, 20, 0x26BE, 0 ) );
Add( new GenericBuyInfo( typeof( Scythe ), 39, 20, 0x26BA, 0 ) );
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add(typeof(Broadsword), 17);
Add(typeof(Cutlass), 12);
Add(typeof(Katana), 16);
Add(typeof(Kryss), 16);
Add(typeof(Longsword), 27);
Add(typeof(Scimitar), 18);
Add(typeof(ThinLongsword), 13);
Add(typeof(VikingSword), 27);
}
}
public class InternalSellInfo : GenericSellInfo
{
public InternalSellInfo()
{
Add( typeof( Broadsword ), 17 );
Add( typeof( Cutlass ), 12 );
Add( typeof( Katana ), 16 );
Add( typeof( Kryss ), 16 );
Add( typeof( Longsword ), 27 );
Add( typeof( Scimitar ), 18 );
Add( typeof( ThinLongsword ), 13 );
Add( typeof( VikingSword ), 27 );
if ( Core.AOS )
{
Add( typeof( Scythe ), 19 );
Add( typeof( BoneHarvester ), 17 );
Add( typeof( Scepter ), 18 );
Add( typeof( BladedStaff ), 16 );
Add( typeof( Pike ), 19 );
Add( typeof( DoubleBladedStaff ), 17 );
Add( typeof( Lance ), 17 );
Add( typeof( CrescentBlade ), 18 );
}
}
}
}
}
if (Core.AOS)
{
Add(typeof(Scythe), 19);
Add(typeof(BoneHarvester), 17);
Add(typeof(Scepter), 18);
Add(typeof(BladedStaff), 16);
Add(typeof(Pike), 19);
Add(typeof(DoubleBladedStaff), 17);
Add(typeof(Lance), 17);
Add(typeof(CrescentBlade), 18);
}
}
}
}
}