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

Formatting #2 (#59)

Browse source
This commit is contained in:
Kamron Batman 2019-10-05 00:37:03 -07:00 • committed by GitHub
parent 096d39609e
commit 8e9221bb5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
400 changed files with 3688 additions and 5969 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Projects/Scripts/Items/Food/Beverage.cs
View file

@ -298,17 +298,16 @@ namespace Server.Items
if (IsEmpty)
return ItemID >= 0x1F81 && ItemID <= 0x1F84 ? ItemID : 0x1F81;
switch (Content)
return Content switch
{
case BeverageType.Ale: return ItemID == 0x9EF ? 0x9EF : 0x9EE;
case BeverageType.Cider: return ItemID >= 0x1F7D && ItemID <= 0x1F80 ? ItemID : 0x1F7D;
case BeverageType.Liquor: return ItemID >= 0x1F85 && ItemID <= 0x1F88 ? ItemID : 0x1F85;
case BeverageType.Milk: return ItemID >= 0x1F89 && ItemID <= 0x1F8C ? ItemID : 0x1F89;
case BeverageType.Wine: return ItemID >= 0x1F8D && ItemID <= 0x1F90 ? ItemID : 0x1F8D;
case BeverageType.Water: return ItemID >= 0x1F91 && ItemID <= 0x1F94 ? ItemID : 0x1F91;
}
return 0;
BeverageType.Ale => (ItemID == 0x9EF ? 0x9EF : 0x9EE),
BeverageType.Cider => (ItemID >= 0x1F7D && ItemID <= 0x1F80 ? ItemID : 0x1F7D),
BeverageType.Liquor => (ItemID >= 0x1F85 && ItemID <= 0x1F88 ? ItemID : 0x1F85),
BeverageType.Milk => (ItemID >= 0x1F89 && ItemID <= 0x1F8C ? ItemID : 0x1F89),
BeverageType.Wine => (ItemID >= 0x1F8D && ItemID <= 0x1F90 ? ItemID : 0x1F8D),
BeverageType.Water => (ItemID >= 0x1F91 && ItemID <= 0x1F94 ? ItemID : 0x1F91),
_ => 0
};
}
public override void Serialize(GenericWriter writer)
@ -665,7 +664,7 @@ namespace Server.Items
{
BaseHouse house = BaseHouse.FindHouseAt(this);
if (house == null || !house.HasLockedDownItem(this))
if (house?.HasLockedDownItem(this) != true)
{
if (message)
from.SendLocalizedMessage(502946, "", 0x59); // That belongs to someone else.
@ -846,23 +845,14 @@ namespace Server.Items
if (ContainsAlchohol)
{
int bac = 0;
switch (Content)
var bac = Content switch
{
case BeverageType.Ale:
bac = 1;
break;
case BeverageType.Wine:
bac = 2;
break;
case BeverageType.Cider:
bac = 3;
break;
case BeverageType.Liquor:
bac = 4;
break;
}
BeverageType.Ale => 1,
BeverageType.Wine => 2,
BeverageType.Cider => 3,
BeverageType.Liquor => 4,
_ => 0
};
from.BAC += bac;

15
Projects/Scripts/Items/Food/Cooking.cs
View file

@ -7,17 +7,12 @@ namespace Server.Items
{
public static int RandomChoice(int itemID1, int itemID2)
{
int iRet = 0;
switch (Utility.Random(2))
var iRet = Utility.Random(2) switch
{
default:
case 0:
iRet = itemID1;
break;
case 1:
iRet = itemID2;
break;
}
0 => itemID1,
1 => itemID2,
_ => itemID1
};
return iRet;
}

25
Projects/Scripts/Items/Food/Food.cs
View file

@ -122,24 +122,15 @@ namespace Server.Items
{
case 1:
{
switch (reader.ReadInt())
Poison = reader.ReadInt() switch
{
case 0:
Poison = null;
break;
case 1:
Poison = Poison.Lesser;
break;
case 2:
Poison = Poison.Regular;
break;
case 3:
Poison = Poison.Greater;
break;
case 4:
Poison = Poison.Deadly;
break;
}
0 => null,
1 => Poison.Lesser,
2 => Poison.Regular,
3 => Poison.Greater,
4 => Poison.Deadly,
_ => Poison
};
break;
}