Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,112 +1,109 @@
|
|||
using System.Collections.Generic;
|
||||
using Server.Items;
|
||||
using Server.Multis;
|
||||
|
||||
namespace Server.Mobiles
|
||||
{
|
||||
public class SBInnKeeper : SBInfo
|
||||
{
|
||||
public SBInnKeeper()
|
||||
{
|
||||
}
|
||||
public class SBInnKeeper : 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 BeverageBuyInfo(typeof(BeverageBottle), BeverageType.Ale, 7, 20, 0x99F, 0));
|
||||
Add(new BeverageBuyInfo(typeof(BeverageBottle), BeverageType.Wine, 7, 20, 0x9C7, 0));
|
||||
Add(new BeverageBuyInfo(typeof(BeverageBottle), BeverageType.Liquor, 7, 20, 0x99B, 0));
|
||||
Add(new BeverageBuyInfo(typeof(Jug), BeverageType.Cider, 13, 20, 0x9C8, 0));
|
||||
Add(new BeverageBuyInfo(typeof(Pitcher), BeverageType.Milk, 7, 20, 0x9F0, 0));
|
||||
Add(new BeverageBuyInfo(typeof(Pitcher), BeverageType.Ale, 11, 20, 0x1F95, 0));
|
||||
Add(new BeverageBuyInfo(typeof(Pitcher), BeverageType.Cider, 11, 20, 0x1F97, 0));
|
||||
Add(new BeverageBuyInfo(typeof(Pitcher), BeverageType.Liquor, 11, 20, 0x1F99, 0));
|
||||
Add(new BeverageBuyInfo(typeof(Pitcher), BeverageType.Wine, 11, 20, 0x1F9B, 0));
|
||||
Add(new BeverageBuyInfo(typeof(Pitcher), BeverageType.Water, 11, 20, 0x1F9D, 0));
|
||||
|
||||
public class InternalBuyInfo : List<GenericBuyInfo>
|
||||
{
|
||||
public InternalBuyInfo()
|
||||
{
|
||||
Add( new BeverageBuyInfo( typeof( BeverageBottle ), BeverageType.Ale, 7, 20, 0x99F, 0 ) );
|
||||
Add( new BeverageBuyInfo( typeof( BeverageBottle ), BeverageType.Wine, 7, 20, 0x9C7, 0 ) );
|
||||
Add( new BeverageBuyInfo( typeof( BeverageBottle ), BeverageType.Liquor, 7, 20, 0x99B, 0 ) );
|
||||
Add( new BeverageBuyInfo( typeof( Jug ), BeverageType.Cider, 13, 20, 0x9C8, 0 ) );
|
||||
Add( new BeverageBuyInfo( typeof( Pitcher ), BeverageType.Milk, 7, 20, 0x9F0, 0 ) );
|
||||
Add( new BeverageBuyInfo( typeof( Pitcher ), BeverageType.Ale, 11, 20, 0x1F95, 0 ) );
|
||||
Add( new BeverageBuyInfo( typeof( Pitcher ), BeverageType.Cider, 11, 20, 0x1F97, 0 ) );
|
||||
Add( new BeverageBuyInfo( typeof( Pitcher ), BeverageType.Liquor, 11, 20, 0x1F99, 0 ) );
|
||||
Add( new BeverageBuyInfo( typeof( Pitcher ), BeverageType.Wine, 11, 20, 0x1F9B, 0 ) );
|
||||
Add( new BeverageBuyInfo( typeof( Pitcher ), BeverageType.Water, 11, 20, 0x1F9D, 0 ) );
|
||||
Add(new GenericBuyInfo(typeof(BreadLoaf), 6, 10, 0x103B, 0));
|
||||
Add(new GenericBuyInfo(typeof(CheeseWheel), 21, 10, 0x97E, 0));
|
||||
Add(new GenericBuyInfo(typeof(CookedBird), 17, 20, 0x9B7, 0));
|
||||
Add(new GenericBuyInfo(typeof(LambLeg), 8, 20, 0x160A, 0));
|
||||
Add(new GenericBuyInfo(typeof(ChickenLeg), 5, 20, 0x1608, 0));
|
||||
Add(new GenericBuyInfo(typeof(Ribs), 7, 20, 0x9F2, 0));
|
||||
|
||||
Add( new GenericBuyInfo( typeof( BreadLoaf ), 6, 10, 0x103B, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( CheeseWheel ), 21, 10, 0x97E, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( CookedBird ), 17, 20, 0x9B7, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( LambLeg ), 8, 20, 0x160A, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( ChickenLeg ), 5, 20, 0x1608, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( Ribs ), 7, 20, 0x9F2, 0 ) );
|
||||
Add(new GenericBuyInfo(typeof(WoodenBowlOfCarrots), 3, 20, 0x15F9, 0));
|
||||
Add(new GenericBuyInfo(typeof(WoodenBowlOfCorn), 3, 20, 0x15FA, 0));
|
||||
Add(new GenericBuyInfo(typeof(WoodenBowlOfLettuce), 3, 20, 0x15FB, 0));
|
||||
Add(new GenericBuyInfo(typeof(WoodenBowlOfPeas), 3, 20, 0x15FC, 0));
|
||||
Add(new GenericBuyInfo(typeof(EmptyPewterBowl), 2, 20, 0x15FD, 0));
|
||||
Add(new GenericBuyInfo(typeof(PewterBowlOfCorn), 3, 20, 0x15FE, 0));
|
||||
Add(new GenericBuyInfo(typeof(PewterBowlOfLettuce), 3, 20, 0x15FF, 0));
|
||||
Add(new GenericBuyInfo(typeof(PewterBowlOfPeas), 3, 20, 0x1600, 0));
|
||||
Add(new GenericBuyInfo(typeof(PewterBowlOfPotatos), 3, 20, 0x1601, 0));
|
||||
Add(new GenericBuyInfo(typeof(WoodenBowlOfStew), 3, 20, 0x1604, 0));
|
||||
Add(new GenericBuyInfo(typeof(WoodenBowlOfTomatoSoup), 3, 20, 0x1606, 0));
|
||||
|
||||
Add( new GenericBuyInfo( typeof( WoodenBowlOfCarrots ), 3, 20, 0x15F9, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( WoodenBowlOfCorn ), 3, 20, 0x15FA, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( WoodenBowlOfLettuce ), 3, 20, 0x15FB, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( WoodenBowlOfPeas ), 3, 20, 0x15FC, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( EmptyPewterBowl ), 2, 20, 0x15FD, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( PewterBowlOfCorn ), 3, 20, 0x15FE, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( PewterBowlOfLettuce ), 3, 20, 0x15FF, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( PewterBowlOfPeas ), 3, 20, 0x1600, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( PewterBowlOfPotatos ), 3, 20, 0x1601, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( WoodenBowlOfStew ), 3, 20, 0x1604, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( WoodenBowlOfTomatoSoup ), 3, 20, 0x1606, 0 ) );
|
||||
Add(new GenericBuyInfo(typeof(ApplePie), 7, 20, 0x1041, 0)); //OSI just has Pie, not Apple/Fruit/Meat
|
||||
|
||||
Add( new GenericBuyInfo( typeof( ApplePie ), 7, 20, 0x1041, 0 ) ); //OSI just has Pie, not Apple/Fruit/Meat
|
||||
Add(new GenericBuyInfo(typeof(Peach), 3, 20, 0x9D2, 0));
|
||||
Add(new GenericBuyInfo(typeof(Pear), 3, 20, 0x994, 0));
|
||||
Add(new GenericBuyInfo(typeof(Grapes), 3, 20, 0x9D1, 0));
|
||||
Add(new GenericBuyInfo(typeof(Apple), 3, 20, 0x9D0, 0));
|
||||
Add(new GenericBuyInfo(typeof(Banana), 2, 20, 0x171F, 0));
|
||||
Add(new GenericBuyInfo(typeof(Torch), 7, 20, 0xF6B, 0));
|
||||
Add(new GenericBuyInfo(typeof(Candle), 6, 20, 0xA28, 0));
|
||||
Add(new GenericBuyInfo(typeof(Beeswax), 1, 20, 0x1422, 0));
|
||||
|
||||
Add( new GenericBuyInfo( typeof( Peach ), 3, 20, 0x9D2, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( Pear ), 3, 20, 0x994, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( Grapes ), 3, 20, 0x9D1, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( Apple ), 3, 20, 0x9D0, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( Banana ), 2, 20, 0x171F, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( Torch ), 7, 20, 0xF6B, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( Candle ), 6, 20, 0xA28, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( Beeswax ), 1, 20, 0x1422, 0 ) );
|
||||
Add(new GenericBuyInfo(typeof(Backpack), 15, 20, 0x9B2, 0));
|
||||
Add(new GenericBuyInfo("1016450", typeof(Chessboard), 2, 20, 0xFA6, 0));
|
||||
Add(new GenericBuyInfo("1016449", typeof(CheckerBoard), 2, 20, 0xFA6, 0));
|
||||
Add(new GenericBuyInfo(typeof(Backgammon), 2, 20, 0xE1C, 0));
|
||||
Add(new GenericBuyInfo(typeof(Dices), 2, 20, 0xFA7, 0));
|
||||
Add(new GenericBuyInfo("1041243", typeof(ContractOfEmployment), 1252, 20, 0x14F0, 0));
|
||||
Add(new GenericBuyInfo("a barkeep contract", typeof(BarkeepContract), 1252, 20, 0x14F0, 0));
|
||||
|
||||
Add( new GenericBuyInfo( typeof( Backpack ), 15, 20, 0x9B2, 0 ) );
|
||||
Add( new GenericBuyInfo( "1016450", typeof( Chessboard ), 2, 20, 0xFA6, 0 ) );
|
||||
Add( new GenericBuyInfo( "1016449", typeof( CheckerBoard ), 2, 20, 0xFA6, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( Backgammon ), 2, 20, 0xE1C, 0 ) );
|
||||
Add( new GenericBuyInfo( typeof( Dices ), 2, 20, 0xFA7, 0 ) );
|
||||
Add( new GenericBuyInfo( "1041243", typeof( ContractOfEmployment ), 1252, 20, 0x14F0, 0 ) );
|
||||
Add( new GenericBuyInfo( "a barkeep contract", typeof( BarkeepContract ), 1252, 20, 0x14F0, 0 ) );
|
||||
if (BaseHouse.NewVendorSystem)
|
||||
Add(new GenericBuyInfo("1062332", typeof(VendorRentalContract), 1252, 20, 0x14F0, 0x672));
|
||||
}
|
||||
}
|
||||
|
||||
if ( Multis.BaseHouse.NewVendorSystem )
|
||||
Add( new GenericBuyInfo( "1062332", typeof( VendorRentalContract ), 1252, 20, 0x14F0, 0x672 ) );
|
||||
}
|
||||
}
|
||||
|
||||
public class InternalSellInfo : GenericSellInfo
|
||||
{
|
||||
public InternalSellInfo()
|
||||
{
|
||||
Add( typeof( BeverageBottle ), 3 );
|
||||
Add( typeof( Jug ), 6 );
|
||||
Add( typeof( Pitcher ), 5 );
|
||||
Add( typeof( GlassMug ), 1 );
|
||||
Add( typeof( BreadLoaf ), 3 );
|
||||
Add( typeof( CheeseWheel ), 12 );
|
||||
Add( typeof( Ribs ), 6 );
|
||||
Add( typeof( Peach ), 1 );
|
||||
Add( typeof( Pear ), 1 );
|
||||
Add( typeof( Grapes ), 1 );
|
||||
Add( typeof( Apple ), 1 );
|
||||
Add( typeof( Banana ), 1 );
|
||||
Add( typeof( Torch ), 3 );
|
||||
Add( typeof( Candle ), 3 );
|
||||
Add( typeof( Chessboard ), 1 );
|
||||
Add( typeof( CheckerBoard ), 1 );
|
||||
Add( typeof( Backgammon ), 1 );
|
||||
Add( typeof( Dices ), 1 );
|
||||
Add( typeof( ContractOfEmployment ), 626 );
|
||||
Add( typeof( Beeswax ), 1 );
|
||||
Add( typeof( WoodenBowlOfCarrots ), 1 );
|
||||
Add( typeof( WoodenBowlOfCorn ), 1 );
|
||||
Add( typeof( WoodenBowlOfLettuce ), 1 );
|
||||
Add( typeof( WoodenBowlOfPeas ), 1 );
|
||||
Add( typeof( EmptyPewterBowl ), 1 );
|
||||
Add( typeof( PewterBowlOfCorn ), 1 );
|
||||
Add( typeof( PewterBowlOfLettuce ), 1 );
|
||||
Add( typeof( PewterBowlOfPeas ), 1 );
|
||||
Add( typeof( PewterBowlOfPotatos ), 1 );
|
||||
Add( typeof( WoodenBowlOfStew ), 1 );
|
||||
Add( typeof( WoodenBowlOfTomatoSoup ), 1 );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
public class InternalSellInfo : GenericSellInfo
|
||||
{
|
||||
public InternalSellInfo()
|
||||
{
|
||||
Add(typeof(BeverageBottle), 3);
|
||||
Add(typeof(Jug), 6);
|
||||
Add(typeof(Pitcher), 5);
|
||||
Add(typeof(GlassMug), 1);
|
||||
Add(typeof(BreadLoaf), 3);
|
||||
Add(typeof(CheeseWheel), 12);
|
||||
Add(typeof(Ribs), 6);
|
||||
Add(typeof(Peach), 1);
|
||||
Add(typeof(Pear), 1);
|
||||
Add(typeof(Grapes), 1);
|
||||
Add(typeof(Apple), 1);
|
||||
Add(typeof(Banana), 1);
|
||||
Add(typeof(Torch), 3);
|
||||
Add(typeof(Candle), 3);
|
||||
Add(typeof(Chessboard), 1);
|
||||
Add(typeof(CheckerBoard), 1);
|
||||
Add(typeof(Backgammon), 1);
|
||||
Add(typeof(Dices), 1);
|
||||
Add(typeof(ContractOfEmployment), 626);
|
||||
Add(typeof(Beeswax), 1);
|
||||
Add(typeof(WoodenBowlOfCarrots), 1);
|
||||
Add(typeof(WoodenBowlOfCorn), 1);
|
||||
Add(typeof(WoodenBowlOfLettuce), 1);
|
||||
Add(typeof(WoodenBowlOfPeas), 1);
|
||||
Add(typeof(EmptyPewterBowl), 1);
|
||||
Add(typeof(PewterBowlOfCorn), 1);
|
||||
Add(typeof(PewterBowlOfLettuce), 1);
|
||||
Add(typeof(PewterBowlOfPeas), 1);
|
||||
Add(typeof(PewterBowlOfPotatos), 1);
|
||||
Add(typeof(WoodenBowlOfStew), 1);
|
||||
Add(typeof(WoodenBowlOfTomatoSoup), 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue