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

Code Cleanup & Fixes Warnings (#74)

Browse source
This commit is contained in:
Kamron Batman 2020-01-18 14:56:45 -08:00 • committed by GitHub
parent e11d1f3ad9
commit 57b14ad690
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
143 changed files with 2960 additions and 3427 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Projects/Scripts/Engines/BulkOrders/Rewards.cs
View file

@ -357,7 +357,13 @@ namespace Server.Engines.BulkOrders
int[][][] goldTable = m_GoldTable;
int typeIndex = ComputeType(type, itemCount);
int quanIndex = quantity == 20 ? 2 : quantity == 15 ? 1 : 0;
int quanIndex = quantity switch
{
20 => 2,
15 => 1,
_ => 0
};
int mtrlIndex = material >= BulkMaterialType.DullCopper && material <= BulkMaterialType.Valorite
? 1 + (material - BulkMaterialType.DullCopper)
: 0;
@ -599,11 +605,28 @@ namespace Server.Engines.BulkOrders
{
int[][][] goldTable = Core.AOS ? m_AosGoldTable : m_OldGoldTable;
int typeIndex = (itemCount == 6 ? 3 : itemCount == 5 ? 2 : itemCount == 4 ? 1 : 0) * 2 + (exceptional ? 1 : 0);
int quanIndex = quantity == 20 ? 2 : quantity == 15 ? 1 : 0;
int mtrlIndex = material == BulkMaterialType.Barbed ? 3 :
material == BulkMaterialType.Horned ? 2 :
material == BulkMaterialType.Spined ? 1 : 0;
int typeIndex = itemCount switch
{
6 => 3,
5 => 2,
4 => 1,
_ => 0
} * 2 + (exceptional ? 1 : 0);
int quanIndex = quantity switch
{
20 => 2,
15 => 1,
_ => 0
};
int mtrlIndex = material switch
{
BulkMaterialType.Barbed => 3,
BulkMaterialType.Horned => 2,
BulkMaterialType.Spined => 1,
_ => 0
};
int gold = goldTable[typeIndex][quanIndex][mtrlIndex];