v2.0.8 release

LozenChen · LozenChen · commit dedff15cd6d6 · 2024-10-06T02:17:25.000+08:00
target celeste tas 3.41.0
diff --git a/Source/Gameplay/AutoWatchEntity/Trigger/TriggerInfoHelper.cs b/Source/Gameplay/AutoWatchEntity/Trigger/TriggerInfoHelper.cs
@@ -1,5 +1,4 @@
-﻿//#define ForMaintenance
-using System.Reflection;
+﻿using System.Reflection;
 
 namespace Celeste.Mod.TASHelper.Gameplay.AutoWatchEntity;
 
@@ -17,7 +16,7 @@ internal static class TriggerInfoHelper {
 
     public static Dictionary<Type, TriggerDynamicPlayerHandler> DynamicInfoPlayerGetters = new Dictionary<Type, TriggerDynamicPlayerHandler>();
 
-    private static HashSet<string> implementedMods = new HashSet<string>() { "Celeste" };
+    internal static HashSet<string> implementedMods = new HashSet<string>() { "Celeste", "SkinModHelper", "SkinModHelperPlus" };
 
     [Initialize]
     public static void Initialize() {
@@ -36,14 +35,6 @@ public static void Initialize() {
         }
         ModTriggerStaticInfo.AddToDictionary();
         ModTriggerDynamicInfo.AddToDictionary();
-#if ForMaintenance
-        Logger.Log(LogLevel.Debug, $"TASHelper/{nameof(TriggerInfoHelper)}:NotImplementedTriggers",
-            string.Join("\n", Utils.ModUtils.GetTypes().Where(x => 
-                x.IsSubclassOf(typeof(Trigger))
-                && !StaticInfoGetters.ContainsKey(x)
-                && !implementedMods.Contains(x.Assembly.GetName().Name)
-            ).Select(x => x.Assembly.GetName().Name + " @ " + x.FullName)));
-#endif        
     }
 
     public static bool TryCreateStaticHandler(MethodInfo method, out TriggerStaticHandler handler) {
diff --git a/Source/Maintenance/MaintenanceRoutine.cs b/Source/Maintenance/MaintenanceRoutine.cs
@@ -1,25 +1,44 @@
 ﻿//#define Maintenance
 
 #if Maintenance
+using Celeste.Mod.TASHelper.Gameplay.AutoWatchEntity;
 using Celeste.Mod.TASHelper.Utils;
 using Monocle;
 
 namespace Celeste.Mod.TASHelper.Maintenance;
-internal static class MaintenaceRoutine {
-
-    private static void CheckSpeedrunTool() {
-        // Tiny SRT needs "sync fork" from SpeedrunTool
-        // also, if a mod support SRT on its own, we need to create a corresponding support in TASHelper
+internal static class MaintenanceRoutine {
+
+    [Initialize]
+
+    private static void Initialize() {
+        Logger.Log(LogLevel.Debug, "TAS Helper Maintenance", "This should be commented out when release!");
+
+        CheckTriggerInfoHelper();
     }
 
-    [Initialize]
+
+    private static void CheckTriggerInfoHelper() {
+        int count = 0;
+        Logger.Log(LogLevel.Debug, $"TASHelper/{nameof(TriggerInfoHelper)}:NotImplementedTriggers",
+            "As follows:\n" + string.Join("\n", Utils.ModUtils.GetTypes().Where(x =>
+                x.IsSubclassOf(typeof(Trigger))
+                && !TriggerInfoHelper.StaticInfoGetters.ContainsKey(x)
+                && !TriggerInfoHelper.implementedMods.Contains(x.Assembly.GetName().Name)
+            ).Select(x => { count++; return $"{count}). {x.Assembly.GetName().Name} @ {x.FullName}"; })));
+    }
+
     private static void CheckSimplifiedTriggers() {
         // check if new triggers appear and need to be "simplified"
         List<Type> types = ModUtils.GetTypes().Where(x => x.IsSameOrSubclassOf(typeof(Trigger))).ToList();
         foreach (Type type in types) {
             Logger.Log("TAS Helper Maintenance", type.FullName);
         }
-    }
+    }
+
+    private static void CheckSpeedrunTool() {
+        // Tiny SRT needs "sync fork" from SpeedrunTool
+        // also, if a mod support SRT on its own, we need to create a corresponding support in TASHelper
+    }
 
     private static void CheckTasSync() {
         // run tases of the most popular maps
diff --git a/Source/Module/WhatsNew.cs b/Source/Module/WhatsNew.cs
@@ -77,7 +77,8 @@ public static void CreateUpdateLog() {
         AddLog("2.0.4", "Bugfix: If Cassette tempo = 0 and there's freeze frame, then game gets stuck (thanks @trans_alexa)");
         AddLog("2.0.5", "Bugfix: Cutscene is auto-watched even if Auto Watch is not enabled. (thanks @socksygen)");
         AddLog("2.0.6", "Feature: Auto-Watch now supports Triggers, and vanilla / Everest ones are handled well.");
-        AddLog("2.0.7", "Feature: Auto-Watch now supports CrumbleWallOnRumble.");
+        AddLog("2.0.7", "Feature: Auto-Watch now supports CrumbleWallOnRumble.");
+        AddLog("2.0.8", "Change: Target CelesteTAS v3.41.0", "Feature: Auto-Watch supports more triggers.");
         UpdateLogs.Sort((x, y) => new Version(y.Item1).CompareTo(new Version(x.Item1)));
     }
 
diff --git a/Source/Predictor/InputManager.cs b/Source/Predictor/InputManager.cs
@@ -19,10 +19,10 @@ public static void ReadInputs(int frames) {
     }
 
     public static void ExecuteCommands(int frame) {
-        if (Manager.Controller.Commands.GetValueOrDefault(Manager.Controller.CurrentFrameInTas + frame) is { } CurrentCommands) {
-            foreach (var command in CurrentCommands) {
+        if (Manager.Controller.Commands.GetValueOrDefault(Manager.Controller.CurrentFrameInTas + frame) is List<Command> CurrentCommands) {
+            foreach (Command command in CurrentCommands) {
                 if (SupportedRuntimeCommands.Contains(command.Attribute.Name) &&
-                    (!EnforceLegalCommand.EnabledWhenRunning || command.Attribute.LegalInMainGame)) {
+                    (!EnforceLegalCommand.EnabledWhenRunning || command.Attribute.LegalInFullGame)) {
                     command.Invoke();
                 }
             }
@@ -39,7 +39,7 @@ public static void Initialize() {
         EmptyInput = emptyInput;
         SupportedRuntimeCommands.Clear();
         foreach (string str in _supportedRuntimeCommands) {
-            if (TasCommandAttribute.MethodInfos.Keys.Where(x => x.Name == str) is { } commands && commands.IsNotNullOrEmpty() && commands.First().ExecuteTiming.Has(ExecuteTiming.Runtime)) {
+            if (Command.Commands.Where(x => x.Name == str) is { } commands && commands.IsNotNullOrEmpty() && commands.First().ExecuteTiming.Has(ExecuteTiming.Runtime)) {
                 SupportedRuntimeCommands.Add(str);
             }
         }
diff --git a/TASHelper.csproj b/TASHelper.csproj
@@ -83,7 +83,7 @@
 		<Publicize Include="CelesteTAS-EverestInterop:TAS.Input.InputController.Checksum" />
 		<Publicize Include="CelesteTAS-EverestInterop:TAS.Input.InputController.ParseFileEnd" />
 		<Publicize Include="CelesteTAS-EverestInterop:TAS.Input.InputController.CurrentFrameInTas" />
-		<Publicize Include="CelesteTAS-EverestInterop:TAS.Input.Commands.TasCommandAttribute.MethodInfos" />
+		<Publicize Include="CelesteTAS-EverestInterop:TAS.Input.Command.Commands" />
 		<Publicize Include="CelesteTAS-EverestInterop:TAS.EverestInterop.Hitboxes.ActualEntityCollideHitbox" />
 		<Publicize Include="CelesteTAS-EverestInterop:TAS.EverestInterop.Hitboxes.ActualEntityCollideHitbox.LoadActualCollidePosition" />
 		<Publicize Include="CelesteTAS-EverestInterop:TAS.EverestInterop.Hitboxes.ActualEntityCollideHitbox.SavePlayerPosition" />
diff --git a/everest.yaml b/everest.yaml
@@ -1,10 +1,10 @@
 - Name: TASHelper
-  Version: 2.0.7
+  Version: 2.0.8
   DLL: bin/Release/net7.0/TASHelper.dll
   Dependencies:
     - Name: EverestCore
-      Version: 1.4818.0
+      Version: 1.5034.0
     - Name: CelesteTAS
-      Version: 3.40.0
+      Version: 3.41.0
     - Name: SpeedrunTool
       Version: 3.20.0

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,8 @@ public static void CreateUpdateLog() {`
`77`	`77`	`AddLog("2.0.4", "Bugfix: If Cassette tempo = 0 and there's freeze frame, then game gets stuck (thanks @trans_alexa)");`
`78`	`78`	`AddLog("2.0.5", "Bugfix: Cutscene is auto-watched even if Auto Watch is not enabled. (thanks @socksygen)");`
`79`	`79`	`AddLog("2.0.6", "Feature: Auto-Watch now supports Triggers, and vanilla / Everest ones are handled well.");`
`80`		`- AddLog("2.0.7", "Feature: Auto-Watch now supports CrumbleWallOnRumble.");`
	`80`	`+ AddLog("2.0.7", "Feature: Auto-Watch now supports CrumbleWallOnRumble.");`
	`81`	`+ AddLog("2.0.8", "Change: Target CelesteTAS v3.41.0", "Feature: Auto-Watch supports more triggers.");`
`81`	`82`	`UpdateLogs.Sort((x, y) => new Version(y.Item1).CompareTo(new Version(x.Item1)));`
`82`	`83`	`}`
`83`	`84`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ public static void ReadInputs(int frames) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public static void ExecuteCommands(int frame) {`
`22`		`- if (Manager.Controller.Commands.GetValueOrDefault(Manager.Controller.CurrentFrameInTas + frame) is { } CurrentCommands) {`
`23`		`- foreach (var command in CurrentCommands) {`
	`22`	`+ if (Manager.Controller.Commands.GetValueOrDefault(Manager.Controller.CurrentFrameInTas + frame) is List<Command> CurrentCommands) {`
	`23`	`+ foreach (Command command in CurrentCommands) {`
`24`	`24`	`if (SupportedRuntimeCommands.Contains(command.Attribute.Name) &&`
`25`		`- (!EnforceLegalCommand.EnabledWhenRunning \|\| command.Attribute.LegalInMainGame)) {`
	`25`	`+ (!EnforceLegalCommand.EnabledWhenRunning \|\| command.Attribute.LegalInFullGame)) {`
`26`	`26`	`command.Invoke();`
`27`	`27`	`}`
`28`	`28`	`}`
`@@ -39,7 +39,7 @@ public static void Initialize() {`
`39`	`39`	`EmptyInput = emptyInput;`
`40`	`40`	`SupportedRuntimeCommands.Clear();`
`41`	`41`	`foreach (string str in _supportedRuntimeCommands) {`
`42`		`- if (TasCommandAttribute.MethodInfos.Keys.Where(x => x.Name == str) is { } commands && commands.IsNotNullOrEmpty() && commands.First().ExecuteTiming.Has(ExecuteTiming.Runtime)) {`
	`42`	`+ if (Command.Commands.Where(x => x.Name == str) is { } commands && commands.IsNotNullOrEmpty() && commands.First().ExecuteTiming.Has(ExecuteTiming.Runtime)) {`
`43`	`43`	`SupportedRuntimeCommands.Add(str);`
`44`	`44`	`}`
`45`	`45`	`}`