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

Fixes several more expression issues and cast type check merges.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 23:31:51 -07:00
parent f93c3b992e
commit 9542c79ea4
24 changed files with 106 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Scripts/Mobiles/Vendors/GenericSell.cs
View file

@ -23,9 +23,7 @@ namespace Server.Mobiles
{
m_Table.TryGetValue( item.GetType(), out int price );
if ( item is BaseArmor ) {
BaseArmor armor = (BaseArmor)item;
if ( item is BaseArmor armor ) {
if ( armor.Quality == ArmorQuality.Low )
price = (int)( price * 0.60 );
else if ( armor.Quality == ArmorQuality.Exceptional )
@ -38,9 +36,7 @@ namespace Server.Mobiles
if ( price < 1 )
price = 1;
}
else if ( item is BaseWeapon ) {
BaseWeapon weapon = (BaseWeapon)item;
else if ( item is BaseWeapon weapon ) {
if ( weapon.Quality == WeaponQuality.Low )
price = (int)( price * 0.60 );
else if ( weapon.Quality == WeaponQuality.Exceptional )
@ -53,18 +49,16 @@ namespace Server.Mobiles
if ( price < 1 )
price = 1;
}
else if ( item is BaseBeverage ) {
else if ( item is BaseBeverage bev ) {
int price1 = price, price2 = price;
if ( item is Pitcher )
if ( bev is Pitcher )
{ price1 = 3; price2 = 5; }
else if ( item is BeverageBottle )
else if ( bev is BeverageBottle )
{ price1 = 3; price2 = 3; }
else if ( item is Jug )
else if ( bev is Jug )
{ price1 = 6; price2 = 6; }
BaseBeverage bev = (BaseBeverage)item;
if ( bev.IsEmpty || bev.Content == BeverageType.Milk )
price = price1;
else