Browse Source

Fix regression when loading scenes

bgs pulled from cm3d2 have different casing from the hardcoded values MM
had so it couldn't find the bg when loading a scene
habeebweeb 4 years ago
parent
commit
e5a7abfdeb

+ 2 - 8
MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.Update.cs

@@ -3142,14 +3142,8 @@ namespace CM3D2.MultipleMaids.Plugin
                 if (!int.TryParse(strArray3[2], out bgIndex))
                 {
                     string str = strArray3[2].Replace(" ", "_");
-                    for (int index = 0; index < bgArray.Length; ++index)
-                    {
-                        if (str == bgArray[index])
-                        {
-                            bgIndex = index;
-                            break;
-                        }
-                    }
+                    bgIndex = Array.FindIndex(bgArray, bg => string.Equals(str, bg, StringComparison.InvariantCultureIgnoreCase));
+                    if (bgIndex < 0) bgIndex = 0;
                 }
 
                 if (bgArray[bgIndex].Length == 36)

+ 2 - 2
MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.cs

@@ -17,7 +17,7 @@ namespace CM3D2.MultipleMaids.Plugin
     public partial class MultipleMaids : PluginBase
     {
         private const string PluginName = "Multiple Maids";
-        private const string PluginVersion = "23.0.0";
+        private const string PluginVersion = "23.0.1";
         private bool allowUpdate;
         private readonly Vector3[] armL = new Vector3[maxMaidCnt];
         private bool atFlg;
@@ -526,7 +526,7 @@ namespace CM3D2.MultipleMaids.Plugin
             ["HeroineRoom_E"] = "Sadist Room",
             ["HeroineRoom_E_Night"] = "Sadist Room (Night)",
             ["HoneymoonRoom"] = "ハネムーンルーム",
-            ["karaokeroom"] = "カラオケルーム",
+            ["KaraokeRoom"] = "カラオケルーム",
             ["Kitchen"] = "Kitchen",
             ["Kitchen_Night"] = "Kitchen (Night)",
             ["LargeBathRoom"] = "Big Bath",