Ai main game day change fix (#25)

IllusionMods · Mar 3, 2021 · 424cbc3 · 424cbc3
1 parent 0979f73
commit 424cbc3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/src/AIAPI/MainGame/GameAPI.Hooks.cs b/src/AIAPI/MainGame/GameAPI.Hooks.cs
@@ -13,8 +13,8 @@ public static partial class GameAPI
     {
         private class Hooks
         {
-            public static int lastCurrentDay = 1;//Always starts at 1
             public static bool isNewGame = false;
+            public static int day = 0;
 
             public static void SetupHooks()
             {
@@ -66,21 +66,16 @@ public static void HScene_EndProc(HScene __instance)
             [HarmonyPostfix]
             [HarmonyPatch(typeof(EnvironmentSimulator), nameof(EnvironmentSimulator.SetTimeZone), typeof(AIProject.TimeZone))]
             public static void EnvironmentChangeTypeHook(AIProject.TimeZone zone)
-            {
+            {       
+                if (zone == AIProject.TimeZone.Morning)
+                {         
+                    OnDayChange(day);
+                    day++;
+                }
+
                 OnPeriodChange(zone);//morning, day, evening
             }
 
-            [HarmonyPostfix]
-            [HarmonyPatch(typeof(EnviroSky), "SetGameTime")]
-            public static void EnvironmentChangeDayHook(EnviroSky __instance)
-            {
-                var currentDay = (int)__instance.currentDay;
-                if (lastCurrentDay < currentDay)
-                {
-                    lastCurrentDay = currentDay;
-                    OnDayChange(currentDay);
-                }                
-            }
         }
     }
 }
diff --git a/src/AIAPI/MainGame/GameExtensions.cs b/src/AIAPI/MainGame/GameExtensions.cs
@@ -102,6 +102,21 @@ public static IEnumerable<ChaFileControl> GetRelatedChaFiles(this AgentData agen
             return results;
         }
 
+        /// <summary>
+        /// Get ChaFiles that are related to this AgentActor (heroine). Warning: It might not return some copies.
+        /// </summary>
+        public static IEnumerable<ChaFileControl> GetRelatedChaFiles(this AgentActor agentActor)
+        {
+            if (agentActor == null) throw new ArgumentNullException(nameof(agentActor));
+
+            var results = new HashSet<ChaFileControl>();
+
+            if (agentActor?.ChaControl?.chaFile != null)
+                results.Add(agentActor.ChaControl.chaFile);        
+
+            return results;
+        }
+
         /// <summary>
         /// Get the persisting player object that describes this character.
         /// Returns null if the player could not be found. Works only in the main game.