Fix issue with glare slider

MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.Gui.cs

@@ -6310,6 +6310,7 @@ namespace CM3D2.MultipleMaids.Plugin
                 {
                     float[] fieldValue1 = GetFieldValue<TMorph, float[]>(morph, "BlendValues");
                     float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
+                    float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
                     if (!isVR)
                     {
                         maidArray[selectMaidIndex].boMabataki = false;
@@ -6319,7 +6320,7 @@ namespace CM3D2.MultipleMaids.Plugin
 
                     fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]] = float.Parse(strArray[0]);
                     fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]] = float.Parse(strArray[1]);
-                    fieldValue2[(int)morph.hash["eyeclose3"]] = float.Parse(strArray[2]);
+                    eyeclose3Arr[(int)morph.hash["eyeclose3"]] = float.Parse(strArray[2]);
                     fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]] = float.Parse(strArray[3]);
                     fieldValue1[(int)morph.hash["hitomih"]] = float.Parse(strArray[4]);
                     fieldValue1[(int)morph.hash["hitomis"]] = float.Parse(strArray[5]);
@@ -6477,6 +6478,7 @@ namespace CM3D2.MultipleMaids.Plugin
                 {
                     float[] fieldValue1 = GetFieldValue<TMorph, float[]>(morph, "BlendValues");
                     float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
+                    float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
                     if (!isVR)
                     {
                         maidArray[selectMaidIndex].boMabataki = false;
@@ -6486,7 +6488,7 @@ namespace CM3D2.MultipleMaids.Plugin
 
                     fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]] = float.Parse(strArray[0]);
                     fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]] = float.Parse(strArray[1]);
-                    fieldValue2[(int)morph.hash["eyeclose3"]] = float.Parse(strArray[2]);
+                    eyeclose3Arr[(int)morph.hash["eyeclose3"]] = float.Parse(strArray[2]);
                     fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]] = float.Parse(strArray[3]);
                     fieldValue1[(int)morph.hash["hitomih"]] = float.Parse(strArray[4]);
                     fieldValue1[(int)morph.hash["hitomis"]] = float.Parse(strArray[5]);
@@ -7005,11 +7007,12 @@ namespace CM3D2.MultipleMaids.Plugin
                     TMorph morph = maidArray[selectMaidIndex].body0.Face.morph;
                     float[] fieldValue1 = GetFieldValue<TMorph, float[]>(morph, "BlendValues");
                     float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
+                    float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
 
                     string str1 = inName4 + ":"
                         + fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]] + ","
                         + fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]] + ","
-                        + fieldValue2[(int)morph.hash["eyeclose3"]] + ","
+                        + eyeclose3Arr[(int)morph.hash["eyeclose3"]] + ","
                         + fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]] + ","
                         + fieldValue1[(int)morph.hash["hitomih"]] + ","
                         + fieldValue1[(int)morph.hash["hitomis"]] + ","
@@ -7210,6 +7213,7 @@ namespace CM3D2.MultipleMaids.Plugin
                 else
                 {
                     float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
+                    float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
                     if (!isVR)
                     {
                         maidArray[selectMaidIndex].boMabataki = false;
@@ -7218,7 +7222,7 @@ namespace CM3D2.MultipleMaids.Plugin
                     string[] strArray = faceComboList[faceIndex[selectMaidIndex]].text.Split(':')[2].Split(',');
                     fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]] = float.Parse(strArray[0]);
                     fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]] = float.Parse(strArray[1]);
-                    fieldValue2[(int)morph.hash["eyeclose3"]] = float.Parse(strArray[2]);
+                    eyeclose3Arr[(int)morph.hash["eyeclose3"]] = float.Parse(strArray[2]);
                     fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]] = float.Parse(strArray[3]);
                     fieldValue1[(int)morph.hash["hitomih"]] = float.Parse(strArray[4]);
                     fieldValue1[(int)morph.hash["hitomis"]] = float.Parse(strArray[5]);

MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.Update.cs

@@ -2272,10 +2272,11 @@ namespace CM3D2.MultipleMaids.Plugin
                     TMorph morph = maid.body0.Face.morph;
                     float[] fieldValue1 = GetFieldValue<TMorph, float[]>(morph, "BlendValues");
                     float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
+                    float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
                     string str118 = str117
                         + fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]] + ","
                         + fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]] + ","
-                        + fieldValue2[(int)morph.hash["eyeclose3"]] + ","
+                        + eyeclose3Arr[(int)morph.hash["eyeclose3"]] + ","
                         + fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]] + ","
                         + fieldValue1[(int)morph.hash["hitomih"]] + ","
                         + fieldValue1[(int)morph.hash["hitomis"]] + ","
@@ -4071,6 +4072,7 @@ namespace CM3D2.MultipleMaids.Plugin
                                                 TMorph morph = maid.body0.Face.morph;
                                                 float[] fieldValue1 = GetFieldValue<TMorph, float[]>(morph, "BlendValues");
                                                 float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
+                                                float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
                                                 if (!isVR)
                                                 {
                                                     maid.boMabataki = false;
@@ -4078,7 +4080,7 @@ namespace CM3D2.MultipleMaids.Plugin
 
                                                 fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]] = float.Parse(strArray9[0]);
                                                 fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]] = float.Parse(strArray9[1]);
-                                                fieldValue2[(int)morph.hash["eyeclose3"]] = float.Parse(strArray9[2]);
+                                                eyeclose3Arr[(int)morph.hash["eyeclose3"]] = float.Parse(strArray9[2]);
                                                 fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]] = float.Parse(strArray9[3]);
                                                 fieldValue1[(int)morph.hash["hitomih"]] = float.Parse(strArray9[4]);
                                                 fieldValue1[(int)morph.hash["hitomis"]] = float.Parse(strArray9[5]);
@@ -6353,10 +6355,11 @@ namespace CM3D2.MultipleMaids.Plugin
                             TMorph morph = maidArray[selectMaidIndex].body0.Face.morph;
                             float[] fieldValue1 = GetFieldValue<TMorph, float[]>(morph, "BlendValues");
                             float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
+                            float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
 
                             eyeclose = fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]];
                             eyeclose2 = fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]];
-                            eyeclose3 = fieldValue2[(int)morph.hash["eyeclose3"]];
+                            eyeclose3 = eyeclose3Arr[(int)morph.hash["eyeclose3"]];
                             eyeclose6 = fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]];
                             hitomih = fieldValue1[(int)morph.hash["hitomih"]];
                             hitomis = fieldValue1[(int)morph.hash["hitomis"]];
@@ -6703,6 +6706,7 @@ namespace CM3D2.MultipleMaids.Plugin
                             TMorph morph = maidArray[selectMaidIndex].body0.Face.morph;
                             float[] fieldValue1 = GetFieldValue<TMorph, float[]>(morph, "BlendValues");
                             float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
+                            float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
                             Maid maid = maidArray[selectMaidIndex];
                             maidArray[selectMaidIndex].boMabataki = false;
                             morph.EyeMabataki = 0.0f;
@@ -6710,7 +6714,7 @@ namespace CM3D2.MultipleMaids.Plugin
                             maidArray[selectMaidIndex].body0.Face.morph.FixBlendValues_Face();
                             eyeclose = fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]];
                             eyeclose2 = fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]];
-                            eyeclose3 = fieldValue2[(int)morph.hash["eyeclose3"]];
+                            eyeclose3 = eyeclose3Arr[(int)morph.hash["eyeclose3"]];
                             eyeclose6 = fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]];
                             hitomih = fieldValue1[(int)morph.hash["hitomih"]];
                             hitomis = fieldValue1[(int)morph.hash["hitomis"]];
@@ -6935,10 +6939,11 @@ namespace CM3D2.MultipleMaids.Plugin
                             TMorph morph = maidArray[selectMaidIndex].body0.Face.morph;
                             float[] fieldValue1 = GetFieldValue<TMorph, float[]>(morph, "BlendValues");
                             float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
+                            float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
 
                             fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]] = eyeclose;
                             fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]] = eyeclose2;
-                            fieldValue2[(int)morph.hash["eyeclose3"]] = eyeclose3;
+                            eyeclose3Arr[(int)morph.hash["eyeclose3"]] = eyeclose3;
                             fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]] = eyeclose6;
                             fieldValue1[(int)morph.hash["hitomih"]] = hitomih;
                             fieldValue1[(int)morph.hash["hitomis"]] = hitomis;

MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.cs

@@ -5760,7 +5760,6 @@ namespace CM3D2.MultipleMaids.Plugin
         {
             if (face.PartsVersion >= 120 && faceKey.IndexOf("eyeclose") == 0)
             {
-                if (faceKey == "eyeclose3") return faceKey;
                 if (faceKey == "eyeclose")
                 {
                     faceKey += '1';
@@ -5936,7 +5935,7 @@ namespace CM3D2.MultipleMaids.Plugin
                 }
                 catch
                 {
-                    Util.Logger.Log(Util.LogLevel.Error, $"Could not parse menu file '{menuFile}'");
+                    Util.Logger.Log(Util.LogLevel.Warning, $"Could not parse menu file '{menuFile}'");
                     return false;
                 }
             }
@@ -6018,7 +6017,7 @@ namespace CM3D2.MultipleMaids.Plugin
                 }
                 catch
                 {
-                    Util.Logger.Log(Util.LogLevel.Error, $"Could not parse mod menu file '{modMenuFile}'");
+                    Util.Logger.Log(Util.LogLevel.Warning, $"Could not parse mod menu file '{modMenuFile}'");
                     return false;
                 }
             }