Change outfit on replacing character in Studio if the new character h…

…as fewer additional outfits than the current selected outfit
IllusionMods · Jan 5, 2022 · 4e8f1e0 · 4e8f1e0
1 parent 3fcf8d1
commit 4e8f1e0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/MoreOutfits.Core/MoreOutfits.CharaController.cs b/src/MoreOutfits.Core/MoreOutfits.CharaController.cs
@@ -2,6 +2,7 @@
 using KKAPI;
 using KKAPI.Chara;
 using KKAPI.Maker;
+using KKAPI.Studio;
 using MessagePack;
 using System.Collections.Generic;
 
@@ -30,6 +31,12 @@ protected override void OnReload(GameMode currentGameMode, bool maintainState)
             if (maintainState)
                 return;
 
+            if (StudioAPI.InsideStudio && ChaControl.fileStatus.coordinateType >= ChaControl.chaFile.coordinate.Length)
+            {
+                var ociChar = ChaControl.GetOCIChar();
+                ociChar.SetCoordinateInfo(0);
+            }
+
             var loadFlags = MakerAPI.GetCharacterLoadFlags();
             if (loadFlags == null || loadFlags.Clothes)
             {

diff --git a/src/MoreOutfits.Core/MoreOutfits.UI.Studio.cs b/src/MoreOutfits.Core/MoreOutfits.UI.Studio.cs
@@ -17,7 +17,7 @@ public static class StudioUI
         private static bool StudioUIInitialized = false;
 
 #if KK
-        private static readonly List<string> CoordinateNames = new List<string> { "学生服（校内）", "学生服（下校）", "体操着", "水着", "部活", "私服", "お泊り" };      
+        private static readonly List<string> CoordinateNames = new List<string> { "学生服（校内）", "学生服（下校）", "体操着", "水着", "部活", "私服", "お泊り" };
 #elif KKS
         private static readonly List<string> CoordinateNames = new List<string> { "私服", "水着", "寝間着", "風呂場", "お風呂" };
 #endif
@@ -29,7 +29,7 @@ public static void RegisterStudioControls()
             StudioCoordinateCurrentStateCategoryDropdown = new CurrentStateCategoryDropdown("Coordinate", CoordinateNames.ToArray(), c => CoordinateIndex());
             StudioCoordinateCurrentStateCategoryDropdown.Value.Subscribe(value =>
             {
-                var mpCharCtrol = UnityEngine.Object.FindObjectOfType<MPCharCtrl>();
+                var mpCharCtrol = Object.FindObjectOfType<MPCharCtrl>();
                 if (StudioCoordinateDropdown != null)
                 {
                     var character = StudioAPI.GetSelectedCharacters().First();
@@ -45,7 +45,7 @@ public static void RegisterStudioControls()
                         {
                             StudioCoordinateDropdown.options.Add(new Dropdown.OptionData(GetCoodinateName(character.charInfo, OriginalCoordinateLength + i)));
                         }
-                        StudioCoordinateDropdown.captionText.text = StudioCoordinateDropdown.options[StudioCoordinateDropdown.value].text;
+                        StudioCoordinateDropdown.captionText.text = StudioCoordinateDropdown.options[value].text;
                     }
                 }