Reorder GameApi.GetCurrentHeroine code to work with some edge cases (#58

)
IllusionMods · May 7, 2022 · 1dc6731 · 1dc6731
1 parent c8ea73a
commit 1dc6731
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/KKAPI/MainGame/GameApi.cs b/src/KKAPI/MainGame/GameApi.cs
@@ -526,19 +526,19 @@ public static TalkScene GetTalkScene()
         /// </summary>
         public static SaveData.Heroine GetCurrentHeroine()
         {
+            var hFlag = GameObject.FindObjectOfType<HFlag>();
+            if (hFlag != null)
+                return hFlag.GetLeadingHeroine();
+
             var advScene = GetADVScene();
             if (advScene != null)
             {
-                if (advScene.Scenario != null && advScene.Scenario.currentHeroine != null)
-                    return advScene.Scenario.currentHeroine;
                 if (advScene.nowScene is TalkScene s && s.targetHeroine != null)
                     return s.targetHeroine;
+                if (advScene.Scenario != null && advScene.Scenario.currentHeroine != null)
+                    return advScene.Scenario.currentHeroine;
             }
 
-            var hFlag = GameObject.FindObjectOfType<HFlag>();
-            if (hFlag != null)
-                return hFlag.GetLeadingHeroine();
-
             var talkScene = GetTalkScene();
             if (talkScene != null)
             {

diff --git a/src/KKSAPI/MainGame/GameApi.cs b/src/KKSAPI/MainGame/GameApi.cs
@@ -513,19 +513,19 @@ public static TalkScene GetTalkScene()
         /// </summary>
         public static SaveData.Heroine GetCurrentHeroine()
         {
+            var hFlag = GameObject.FindObjectOfType<HFlag>();
+            if (hFlag != null)
+                return hFlag.GetLeadingHeroine();
+
             var advScene = GetADVScene();
             if (advScene != null)
             {
-                if (advScene.Scenario != null && advScene.Scenario.currentHeroine != null)
-                    return advScene.Scenario.currentHeroine;
                 if (advScene.nowScene is TalkScene s && s.targetHeroine != null)
                     return s.targetHeroine;
+                if (advScene.Scenario != null && advScene.Scenario.currentHeroine != null)
+                    return advScene.Scenario.currentHeroine;
             }
 
-            var hFlag = GameObject.FindObjectOfType<HFlag>();
-            if (hFlag != null)
-                return hFlag.GetLeadingHeroine();
-
             var talkScene = GetTalkScene();
             if (talkScene != null)
             {