Adds more formatting

This commit is contained in:
Kamron Batman 2018-08-19 21:28:24 +08:00
parent e77d695684
commit f674ec2be0
68 changed files with 530 additions and 876 deletions

View file

@ -208,10 +208,8 @@ namespace Server.Items
bool takeItem = true;
if ( dropped is FishBowl )
if ( dropped is FishBowl bowl )
{
FishBowl bowl = (FishBowl) dropped;
if ( bowl.Empty || !AddFish( from, bowl.Fish ) )
return false;
@ -219,10 +217,8 @@ namespace Server.Items
takeItem = false;
}
else if ( dropped is BaseFish )
else if ( dropped is BaseFish fish )
{
BaseFish fish = (BaseFish) dropped;
if ( !AddFish( from, fish ) )
return false;
}
@ -240,10 +236,8 @@ namespace Server.Items
from.SendLocalizedMessage( 1074259, "1" ); // ~1_NUM~ unit(s) of food have been added to the aquarium.
}
else if ( dropped is BaseBeverage )
else if ( dropped is BaseBeverage beverage )
{
BaseBeverage beverage = (BaseBeverage) dropped;
if ( beverage.IsEmpty || !beverage.Pourable || beverage.Content != BeverageType.Water )
{
from.SendLocalizedMessage( 500840 ); // Can't pour that in there.
@ -283,13 +277,8 @@ namespace Server.Items
item.MoveToWorld( loc, Map );
if ( item is BaseFish )
{
BaseFish fish = (BaseFish) item;
if ( !fish.Dead )
fish.StartTimer();
}
if ( item is BaseFish fish && !fish.Dead )
fish.StartTimer();
}
}
@ -785,10 +774,8 @@ namespace Server.Items
return false;
}
if ( item is BaseFish )
if ( item is BaseFish fish )
{
BaseFish fish = (BaseFish) item;
FishBowl bowl;
if ( (bowl = GetEmptyBowl( from )) != null )
@ -820,10 +807,8 @@ namespace Server.Items
from.SendLocalizedMessage( 1074514 ); // You have no place to put it.
return false;
}
else
{
from.SendLocalizedMessage( 1074513 ); // You put the item into your pack.
}
from.SendLocalizedMessage( 1074513 ); // You put the item into your pack.
}
InvalidateProperties();

View file

@ -41,8 +41,8 @@ namespace Server.Items
AddHtmlLocalized( 20, 217, 250, 20, item.LabelNumber, 0xFFFFFF, false, false ); // Name
// item details
if ( item is BaseFish )
AddHtmlLocalized( 20, 239, 315, 20, ( (BaseFish) item ).GetDescription(), 0xFFFFFF, false, false );
if ( item is BaseFish fish )
AddHtmlLocalized( 20, 239, 315, 20, fish.GetDescription(), 0xFFFFFF, false, false );
else
AddHtmlLocalized( 20, 239, 315, 20, 1073634, 0xFFFFFF, false, false ); // An aquarium decoration

View file

@ -25,10 +25,7 @@ namespace Server.Items
if ( Empty )
return null;
if ( Items[ 0 ] is BaseFish )
return (BaseFish) Items[ 0 ];
return null;
return Items[0] as BaseFish;
}
}