Browse Source

Use CharacterMgr.Activate to load meidos

SetActive seems to do something that allows for the camera to get closer
to maids without clipping.

Manually calling DutPropAll and AllProcPropSeqStart is still done for
when there are more than 12 maids
habeebweeb 4 years ago
parent
commit
b2d45addf8

+ 1 - 1
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Managers/MeidoManager.cs

@@ -131,7 +131,7 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             for (int i = 0; i < ActiveMeidoList.Count; i++)
             {
                 Meido meido = ActiveMeidoList[i];
-                meido.Load(i);
+                meido.Load(i, selectedMaids[i]);
             }
 
             SelectedMeido = 0;

+ 12 - 4
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/Meido.cs

@@ -75,17 +75,25 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             dragPointManager.Update();
         }
 
-        public Maid Load(int activeSlot)
+        public Maid Load(int slot, int activeSlot)
         {
             isLoading = true;
-            this.ActiveSlot = activeSlot;
+            this.ActiveSlot = slot;
 
             Maid.Visible = true;
 
             if (!Maid.body0.isLoadedBody)
             {
-                Maid.DutPropAll();
-                Maid.AllProcPropSeqStart();
+                if (activeSlot >= 12)
+                {
+                    Maid.DutPropAll();
+                    Maid.AllProcPropSeqStart();
+                }
+                else
+                {
+                    GameMain.Instance.CharacterMgr.Activate(activeSlot, activeSlot, false, false);
+                    GameMain.Instance.CharacterMgr.CharaVisible(activeSlot, true, false);
+                }
             }
             else
             {