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

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions
Download patch file Download diff file Expand all files Collapse all files

137
Scripts/Engines/MyRunUO/LayerComparer.cs
View file

@ -2,89 +2,86 @@ using System.Collections;
namespace Server.Engines.MyRunUO
{
public class LayerComparer : IComparer
{
private static Layer PlateArms = (Layer)255;
private static Layer ChainTunic = (Layer)254;
private static Layer LeatherShorts = (Layer)253;
public class LayerComparer : IComparer
{
private static Layer PlateArms = (Layer)255;
private static Layer ChainTunic = (Layer)254;
private static Layer LeatherShorts = (Layer)253;
private static Layer[] m_DesiredLayerOrder = {
Layer.Cloak,
Layer.Bracelet,
Layer.Ring,
Layer.Shirt,
Layer.Pants,
Layer.InnerLegs,
Layer.Shoes,
LeatherShorts,
Layer.Arms,
Layer.InnerTorso,
LeatherShorts,
PlateArms,
Layer.MiddleTorso,
Layer.OuterLegs,
Layer.Neck,
Layer.Waist,
Layer.Gloves,
Layer.OuterTorso,
Layer.OneHanded,
Layer.TwoHanded,
Layer.FacialHair,
Layer.Hair,
Layer.Helm,
Layer.Talisman
};
private static Layer[] m_DesiredLayerOrder =
{
Layer.Cloak,
Layer.Bracelet,
Layer.Ring,
Layer.Shirt,
Layer.Pants,
Layer.InnerLegs,
Layer.Shoes,
LeatherShorts,
Layer.Arms,
Layer.InnerTorso,
LeatherShorts,
PlateArms,
Layer.MiddleTorso,
Layer.OuterLegs,
Layer.Neck,
Layer.Waist,
Layer.Gloves,
Layer.OuterTorso,
Layer.OneHanded,
Layer.TwoHanded,
Layer.FacialHair,
Layer.Hair,
Layer.Helm,
Layer.Talisman
};
public static int[] TranslationTable { get; }
public static readonly IComparer Instance = new LayerComparer();
static LayerComparer()
{
TranslationTable = new int[256];
static LayerComparer()
{
TranslationTable = new int[256];
for ( int i = 0; i < m_DesiredLayerOrder.Length; ++i )
TranslationTable[(int)m_DesiredLayerOrder[i]] = m_DesiredLayerOrder.Length - i;
}
for (int i = 0; i < m_DesiredLayerOrder.Length; ++i)
TranslationTable[(int)m_DesiredLayerOrder[i]] = m_DesiredLayerOrder.Length - i;
}
public static bool IsValid( Item item )
{
return ( TranslationTable[(int)item.Layer] > 0 );
}
public static int[] TranslationTable{ get; }
public static readonly IComparer Instance = new LayerComparer();
public int Compare(object x, object y)
{
Item a = (Item)x;
Item b = (Item)y;
public LayerComparer()
{
}
Layer aLayer = a.Layer;
Layer bLayer = b.Layer;
public Layer Fix( int itemID, Layer oldLayer )
{
if ( itemID == 0x1410 || itemID == 0x1417 ) // platemail arms
return PlateArms;
aLayer = Fix(a.ItemID, aLayer);
bLayer = Fix(b.ItemID, bLayer);
if ( itemID == 0x13BF || itemID == 0x13C4 ) // chainmail tunic
return ChainTunic;
return TranslationTable[(int)bLayer] - TranslationTable[(int)aLayer];
}
if ( itemID == 0x1C08 || itemID == 0x1C09 ) // leather skirt
return LeatherShorts;
public static bool IsValid(Item item)
{
return TranslationTable[(int)item.Layer] > 0;
}
if ( itemID == 0x1C00 || itemID == 0x1C01 ) // leather shorts
return LeatherShorts;
public Layer Fix(int itemID, Layer oldLayer)
{
if (itemID == 0x1410 || itemID == 0x1417) // platemail arms
return PlateArms;
return oldLayer;
}
if (itemID == 0x13BF || itemID == 0x13C4) // chainmail tunic
return ChainTunic;
public int Compare( object x, object y )
{
Item a = (Item)x;
Item b = (Item)y;
if (itemID == 0x1C08 || itemID == 0x1C09) // leather skirt
return LeatherShorts;
Layer aLayer = a.Layer;
Layer bLayer = b.Layer;
if (itemID == 0x1C00 || itemID == 0x1C01) // leather shorts
return LeatherShorts;
aLayer = Fix( a.ItemID, aLayer );
bLayer = Fix( b.ItemID, bLayer );
return TranslationTable[(int)bLayer] - TranslationTable[(int)aLayer];
}
}
return oldLayer;
}
}
}