From a284d5adc59ff23eed46762e2b204b35059f5c64 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Wed, 24 Jan 2024 15:42:35 +0100
Subject: [PATCH] Improve StateIndex.

---
 Glamourer/State/StateIndex.cs | 162 +++++++++++++++++-----------------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/Glamourer/State/StateIndex.cs b/Glamourer/State/StateIndex.cs
index b877e9c..a55d6b1 100644
--- a/Glamourer/State/StateIndex.cs
+++ b/Glamourer/State/StateIndex.cs
@@ -112,93 +112,93 @@ public readonly record struct StateIndex(int Value) : IEqualityOperators<StateIn
         };
 
     public const int EquipHead     = 0;
-    public const int EquipBody     = 1;
-    public const int EquipHands    = 2;
-    public const int EquipLegs     = 3;
-    public const int EquipFeet     = 4;
-    public const int EquipEars     = 5;
-    public const int EquipNeck     = 6;
-    public const int EquipWrist    = 7;
-    public const int EquipRFinger  = 8;
-    public const int EquipLFinger  = 9;
-    public const int EquipMainhand = 10;
-    public const int EquipOffhand  = 11;
+    public const int EquipBody     = EquipHead + 1;
+    public const int EquipHands    = EquipBody + 1;
+    public const int EquipLegs     = EquipHands + 1;
+    public const int EquipFeet     = EquipLegs + 1;
+    public const int EquipEars     = EquipFeet + 1;
+    public const int EquipNeck     = EquipEars + 1;
+    public const int EquipWrist    = EquipNeck + 1;
+    public const int EquipRFinger  = EquipWrist + 1;
+    public const int EquipLFinger  = EquipRFinger + 1;
+    public const int EquipMainhand = EquipLFinger + 1;
+    public const int EquipOffhand  = EquipMainhand + 1;
 
-    public const int StainHead     = 12;
-    public const int StainBody     = 13;
-    public const int StainHands    = 14;
-    public const int StainLegs     = 15;
-    public const int StainFeet     = 16;
-    public const int StainEars     = 17;
-    public const int StainNeck     = 18;
-    public const int StainWrist    = 19;
-    public const int StainRFinger  = 20;
-    public const int StainLFinger  = 21;
-    public const int StainMainhand = 22;
-    public const int StainOffhand  = 23;
+    public const int StainHead     = EquipOffhand + 1;
+    public const int StainBody     = StainHead + 1;
+    public const int StainHands    = StainBody + 1;
+    public const int StainLegs     = StainHands + 1;
+    public const int StainFeet     = StainLegs + 1;
+    public const int StainEars     = StainFeet + 1;
+    public const int StainNeck     = StainEars + 1;
+    public const int StainWrist    = StainNeck + 1;
+    public const int StainRFinger  = StainWrist + 1;
+    public const int StainLFinger  = StainRFinger + 1;
+    public const int StainMainhand = StainLFinger + 1;
+    public const int StainOffhand  = StainMainhand + 1;
 
-    public const int CustomizeRace              = 24;
-    public const int CustomizeGender            = 25;
-    public const int CustomizeBodyType          = 26;
-    public const int CustomizeHeight            = 27;
-    public const int CustomizeClan              = 28;
-    public const int CustomizeFace              = 29;
-    public const int CustomizeHairstyle         = 30;
-    public const int CustomizeHighlights        = 31;
-    public const int CustomizeSkinColor         = 32;
-    public const int CustomizeEyeColorRight     = 33;
-    public const int CustomizeHairColor         = 34;
-    public const int CustomizeHighlightsColor   = 35;
-    public const int CustomizeFacialFeature1    = 36;
-    public const int CustomizeFacialFeature2    = 37;
-    public const int CustomizeFacialFeature3    = 38;
-    public const int CustomizeFacialFeature4    = 39;
-    public const int CustomizeFacialFeature5    = 40;
-    public const int CustomizeFacialFeature6    = 41;
-    public const int CustomizeFacialFeature7    = 42;
-    public const int CustomizeLegacyTattoo      = 43;
-    public const int CustomizeTattooColor       = 44;
-    public const int CustomizeEyebrows          = 45;
-    public const int CustomizeEyeColorLeft      = 46;
-    public const int CustomizeEyeShape          = 47;
-    public const int CustomizeSmallIris         = 48;
-    public const int CustomizeNose              = 49;
-    public const int CustomizeJaw               = 50;
-    public const int CustomizeMouth             = 51;
-    public const int CustomizeLipstick          = 52;
-    public const int CustomizeLipColor          = 53;
-    public const int CustomizeMuscleMass        = 54;
-    public const int CustomizeTailShape         = 55;
-    public const int CustomizeBustSize          = 56;
-    public const int CustomizeFacePaint         = 57;
-    public const int CustomizeFacePaintReversed = 58;
-    public const int CustomizeFacePaintColor    = 59;
+    public const int CustomizeRace              = StainOffhand + 1;
+    public const int CustomizeGender            = CustomizeRace + 1;
+    public const int CustomizeBodyType          = CustomizeGender + 1;
+    public const int CustomizeHeight            = CustomizeBodyType + 1;
+    public const int CustomizeClan              = CustomizeHeight + 1;
+    public const int CustomizeFace              = CustomizeClan + 1;
+    public const int CustomizeHairstyle         = CustomizeFace + 1;
+    public const int CustomizeHighlights        = CustomizeHairstyle + 1;
+    public const int CustomizeSkinColor         = CustomizeHighlights + 1;
+    public const int CustomizeEyeColorRight     = CustomizeSkinColor + 1;
+    public const int CustomizeHairColor         = CustomizeEyeColorRight + 1;
+    public const int CustomizeHighlightsColor   = CustomizeHairColor + 1;
+    public const int CustomizeFacialFeature1    = CustomizeHighlightsColor + 1;
+    public const int CustomizeFacialFeature2    = CustomizeFacialFeature1 + 1;
+    public const int CustomizeFacialFeature3    = CustomizeFacialFeature2 + 1;
+    public const int CustomizeFacialFeature4    = CustomizeFacialFeature3 + 1;
+    public const int CustomizeFacialFeature5    = CustomizeFacialFeature4 + 1;
+    public const int CustomizeFacialFeature6    = CustomizeFacialFeature5 + 1;
+    public const int CustomizeFacialFeature7    = CustomizeFacialFeature6 + 1;
+    public const int CustomizeLegacyTattoo      = CustomizeFacialFeature7 + 1;
+    public const int CustomizeTattooColor       = CustomizeLegacyTattoo + 1;
+    public const int CustomizeEyebrows          = CustomizeTattooColor + 1;
+    public const int CustomizeEyeColorLeft      = CustomizeEyebrows + 1;
+    public const int CustomizeEyeShape          = CustomizeEyeColorLeft + 1;
+    public const int CustomizeSmallIris         = CustomizeEyeShape + 1;
+    public const int CustomizeNose              = CustomizeSmallIris + 1;
+    public const int CustomizeJaw               = CustomizeNose + 1;
+    public const int CustomizeMouth             = CustomizeJaw + 1;
+    public const int CustomizeLipstick          = CustomizeMouth + 1;
+    public const int CustomizeLipColor          = CustomizeLipstick + 1;
+    public const int CustomizeMuscleMass        = CustomizeLipColor + 1;
+    public const int CustomizeTailShape         = CustomizeMuscleMass + 1;
+    public const int CustomizeBustSize          = CustomizeTailShape + 1;
+    public const int CustomizeFacePaint         = CustomizeBustSize + 1;
+    public const int CustomizeFacePaintReversed = CustomizeFacePaint + 1;
+    public const int CustomizeFacePaintColor    = CustomizeFacePaintReversed + 1;
 
-    public const int MetaWetness     = 60;
-    public const int MetaHatState    = 61;
-    public const int MetaVisorState  = 62;
-    public const int MetaWeaponState = 63;
-    public const int MetaModelId     = 64;
+    public const int MetaWetness     = CustomizeFacePaintColor + 1;
+    public const int MetaHatState    = MetaWetness + 1;
+    public const int MetaVisorState  = MetaHatState + 1;
+    public const int MetaWeaponState = MetaVisorState + 1;
+    public const int MetaModelId     = MetaWeaponState + 1;
 
-    public const int CrestHead    = 65;
-    public const int CrestBody    = 66;
-    public const int CrestOffhand = 67;
+    public const int CrestHead    = MetaModelId + 1;
+    public const int CrestBody    = CrestHead + 1;
+    public const int CrestOffhand = CrestBody + 1;
 
-    public const int ParamSkinDiffuse           = 68;
-    public const int ParamMuscleTone            = 69;
-    public const int ParamSkinSpecular          = 70;
-    public const int ParamLipDiffuse            = 71;
-    public const int ParamHairDiffuse           = 72;
-    public const int ParamHairSpecular          = 73;
-    public const int ParamHairHighlight         = 74;
-    public const int ParamLeftEye               = 75;
-    public const int ParamRightEye              = 76;
-    public const int ParamFeatureColor          = 77;
-    public const int ParamFacePaintUvMultiplier = 78;
-    public const int ParamFacePaintUvOffset     = 79;
-    public const int ParamDecalColor            = 80;
+    public const int ParamSkinDiffuse           = CrestOffhand + 1;
+    public const int ParamMuscleTone            = ParamSkinDiffuse + 1;
+    public const int ParamSkinSpecular          = ParamMuscleTone + 1;
+    public const int ParamLipDiffuse            = ParamSkinSpecular + 1;
+    public const int ParamHairDiffuse           = ParamLipDiffuse + 1;
+    public const int ParamHairSpecular          = ParamHairDiffuse + 1;
+    public const int ParamHairHighlight         = ParamHairSpecular + 1;
+    public const int ParamLeftEye               = ParamHairHighlight + 1;
+    public const int ParamRightEye              = ParamLeftEye + 1;
+    public const int ParamFeatureColor          = ParamRightEye + 1;
+    public const int ParamFacePaintUvMultiplier = ParamFeatureColor + 1;
+    public const int ParamFacePaintUvOffset     = ParamFacePaintUvMultiplier + 1;
+    public const int ParamDecalColor            = ParamFacePaintUvOffset + 1;
 
-    public const int Size = 81;
+    public const int Size = ParamDecalColor + 1;
 
     public IEnumerable<StateIndex> All
         => Enumerable.Range(0, Size - 1).Select(i => new StateIndex(i));