v2.1.7

LozenChen · LozenChen · commit 9c4950ba4b0a · 2025-03-02T01:54:13.000+08:00
diff --git a/Dialog/English.txt b/Dialog/English.txt
@@ -212,6 +212,8 @@ TAS_HELPER_USE_KEY_FRAME_TIME=                             Show Index of Keyfram
 TAS_HELPER_KEY_FRAME_FLAGS=                                Flags
 TAS_HELPER_PREDICTOR_LINE_WIDTH=                           Polygonal Line Width
 TAS_HELPER_PREDICTOR_POINT_SIZE=                           Dot Size
+TAS_HELPER_PREDICTOR_FONT_SIZE=                            Font Size
+TAS_HELPER_PREDICTOR_FONT_STROKE=                          Font Stroke
 
 # ============================================= Other =====================================================
 TAS_HELPER_MORE_OPTIONS=                                   More Options
diff --git a/Dialog/Simplified Chinese.txt b/Dialog/Simplified Chinese.txt
@@ -199,6 +199,8 @@ TAS_HELPER_USE_KEY_FRAME_TIME=                             显示关键帧对应
 TAS_HELPER_KEY_FRAME_FLAGS=                                Flags
 TAS_HELPER_PREDICTOR_LINE_WIDTH=                           折线宽度
 TAS_HELPER_PREDICTOR_POINT_SIZE=                           点的大小
+TAS_HELPER_PREDICTOR_FONT_SIZE=                            字体大小
+TAS_HELPER_PREDICTOR_FONT_STROKE=                          字体描边
 
 
 # ============================================= Other =====================================================
diff --git a/Libs/MMHOOK_Celeste.dll b/Libs/MMHOOK_Celeste.dll
diff --git a/Source/Gameplay/FrameStepBack.cs b/Source/Gameplay/FrameStepBack.cs
@@ -14,7 +14,7 @@ public static void StepBackOneFrame() {
     }
     public static void SetupNextFastForward(int relativeMove) {
         // todo: fix the random camera issue
-        if (Manager.Running && !TAS.ModInterop.TASRecorderInterop.Recording) {
+        if (Manager.Running && !ModInterop.UnstableCelesteTasUsings.TasRecorderIsRecording) {
             int frame = Controller.CurrentFrameInTas + relativeMove;
             if (frame <= 0) {
                 return;
diff --git a/Source/ModInterop/UnstableCelesteTasUsings.cs b/Source/ModInterop/UnstableCelesteTasUsings.cs
@@ -0,0 +1,12 @@
+﻿// these may depend on publicizer / is not PublicAPI / should change later
+// only part of them
+
+namespace Celeste.Mod.TASHelper.ModInterop;
+internal class UnstableCelesteTasUsings {
+    public static bool TasRecorderIsRecording => TAS.ModInterop.TASRecorderInterop.IsRecording;
+
+    public static bool playerUpdated {
+        get => TAS.Gameplay.Hitboxes.ActualCollideHitbox.playerUpdated;
+        set => TAS.Gameplay.Hitboxes.ActualCollideHitbox.playerUpdated = value;
+    }
+}
diff --git a/Source/Module/Menu/PredictorMenu.cs b/Source/Module/Menu/PredictorMenu.cs
@@ -1,4 +1,5 @@
-﻿using Microsoft.Xna.Framework;
+﻿using Celeste.Mod.TASHelper.Predictor;
+using Microsoft.Xna.Framework;
 using static Celeste.Mod.TASHelper.Module.TASHelperSettings;
 using static Celeste.TextMenuExt;
 
@@ -102,7 +103,11 @@ private static HLine CreateHLine(string text) {
         page.Add(fadeoutItem = new TextMenu.OnOff("Timeline FadeOut".ToDialogText(), TasHelperSettings.TimelineFadeOut).Change(value => TasHelperSettings.TimelineFadeOut = value));
         page.AddDescriptionOnEnter(menu, fadeoutItem, "Only Apply To Hitbox".ToDialogText());
         page.Add(new IntSliderExt("Predictor Line Width".ToDialogText(), 0, 20, TasHelperSettings.PredictorLineWidth).Change(value => TasHelperSettings.PredictorLineWidth = value));
-        page.Add(new IntSliderExt("Predictor Point Size".ToDialogText(), 0, 20, TasHelperSettings.PredictorPointSize).Change(value => TasHelperSettings.PredictorPointSize = value));
+        page.Add(new IntSliderExt("Predictor Point Size".ToDialogText(), 0, 20, TasHelperSettings.PredictorPointSize).Change(value => TasHelperSettings.PredictorPointSize = value));
+
+        page.Add(new IntSliderExt("Predictor Font Size".ToDialogText(), 1, 20, TasHelperSettings.PredictorHiresFontSize).Change(value => { TasHelperSettings.PredictorHiresFontSize = value; PredictorTextRenderer.UpdateSettings(); }));
+        page.Add(new IntSliderExt("Predictor Font Stroke".ToDialogText(), 0, 20, TasHelperSettings.PredictorHiresFontStroke).Change(value => { TasHelperSettings.PredictorHiresFontStroke = value; PredictorTextRenderer.UpdateSettings(); }));
+
         page.Add(CreateHLine());
         return page;
     }
diff --git a/Source/Module/TASHelperSettings.cs b/Source/Module/TASHelperSettings.cs
@@ -4,6 +4,7 @@
 using Celeste.Mod.TASHelper.Gameplay.Spinner;
 using Celeste.Mod.TASHelper.Module.Menu;
 using Celeste.Mod.TASHelper.OrderOfOperation;
+using Celeste.Mod.TASHelper.Predictor;
 using Celeste.Mod.TASHelper.Utils;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
@@ -53,6 +54,7 @@ internal void OnLoadSettings() {
         keyOoO_Fastforward ??= new((Buttons)0, Keys.LeftControl, Keys.Y);
         keyAutoWatch ??= new((Buttons)0, Keys.LeftControl, Keys.Q);
         AutoWatchInitialize();
+        PredictorTextRenderer.UpdateSettings();
     }
 
     public bool Enabled = true;
@@ -434,6 +436,10 @@ public bool PredictFutureEnabled {
 
     public int PredictorLineWidth = 3;
 
+    public int PredictorHiresFontSize = 8;
+
+    public int PredictorHiresFontStroke = 5;
+
     public enum TimelineFinestStyle { NotApplied, HitboxPerFrame, PolygonLine, DottedPolygonLine };
 
     public enum TimelineScales { NotApplied, _2, _5, _10, _15, _20, _25, _30, _45, _60, _100 }
diff --git a/Source/Module/WhatsNew.cs b/Source/Module/WhatsNew.cs
@@ -92,6 +92,7 @@ public static void CreateUpdateLog() {
         AddLog("2.1.4", "Bugfix: Fastforward makes spinner colors change. (thanks @trans_alexa)");
         AddLog("2.1.5", "Bugfix: fix a bug caused by CelesteTAS refactor.");
         AddLog("2.1.6", "Bugfix: When predictor Update-on-Tas-File-Changed enabled, and edit a line above the current frame, it'll move selection to the current frame. (thanks @richconnergmn)");
+        AddLog("2.1.7", "Feature: Predictor now can set its own font size. (thanks @richconnergmn)");
         UpdateLogs.Sort((x, y) => new Version(y.Item1).CompareTo(new Version(x.Item1)));
     }
 
diff --git a/Source/OrderOfOperation/OoO_Core.cs b/Source/OrderOfOperation/OoO_Core.cs
@@ -395,7 +395,7 @@ public static void Unload() {
     }
     private static void OnLevelRender(On.Celeste.Level.orig_Render orig, Level self) {
         if (Applied) {
-            TAS.Gameplay.Hitboxes.ActualCollideHitbox.playerUpdated = playerUpdated; // may remove it if we change SpringBoard to IL.Monocle/Celeste hooks
+            ModInterop.UnstableCelesteTasUsings.playerUpdated = playerUpdated; // may remove it if we change SpringBoard to IL.Monocle/Celeste hooks
             if (prepareToUndoAll) {
                 UndoAll();
             }
diff --git a/Source/Predictor/PredictorRenderer.cs b/Source/Predictor/PredictorRenderer.cs
@@ -29,14 +29,12 @@ public class PredictorRenderer : Entity {
 
     public static bool UseDottedPolygonalLine => TasHelperSettings.TimelineFinestScale == TASHelperSettings.TimelineFinestStyle.DottedPolygonLine;
 
-    private const string textRendererLabel = "PredictorKeyframe";
-
     public PredictorRenderer() {
         Depth = 1;
     }
     public static void ClearCachedMessage() {
         if (contentCached) {
-            TempTextRenderer.Clear(textRendererLabel);
+            PredictorTextRenderer.Clear();
             PolygonalLineRenderer.Clear();
             processedKeyframeRenderData.Clear();
             processedNormalframeRenderData.Clear();
@@ -113,7 +111,7 @@ private static void RenderCore() {
             RenderData keyframeData = data.Item1;
             Draw.HollowRect(keyframeData.x, keyframeData.y, keyframeData.width, keyframeData.height, data.Item2);
             if (!contentCached && TasHelperSettings.UseKeyFrameTime && keyframeData.addTime) {
-                HiresLevelRenderer.Add(new TempTextRenderer(keyframeData.index.ToString(), new Vector2(keyframeData.x + keyframeData.width / 2, keyframeData.y - 1f) * 6f, textRendererLabel));
+                HiresLevelRenderer.Add(new PredictorTextRenderer(keyframeData.index.ToString(), new Vector2(keyframeData.x + keyframeData.width / 2, keyframeData.y - 1f) * 6f));
             }
         }
         // render keyframes above normal frames
@@ -210,28 +208,32 @@ private static void OnLoadLevel(Level self) {
 }
 
 
-public class TempTextRenderer : THRenderer {
+public class PredictorTextRenderer : THRenderer {
     // use for those texts that appear and die quickly
 
     public string text;
-    public Vector2 position;
-    public string label;
+    public Vector2 position;
+    public static Vector2 Scale;
+    public static float Stroke;
 
-    public TempTextRenderer(string text, Vector2 position, string label) {
+    public PredictorTextRenderer(string text, Vector2 position) {
         this.text = text;
         this.position = position;
-        this.label = label;
+    }
+
+    public static void UpdateSettings() {
+        Scale = new Vector2(TasHelperSettings.PredictorHiresFontSize / 10f);
+        Stroke = TasHelperSettings.PredictorHiresFontStroke * 0.4f;
+
     }
 
     public override void Render() {
-        TASHelper.Entities.Message.RenderMessage(text, position, new Vector2(0.5f, 0.2f), new Vector2(TasHelperSettings.HiresFontSize / 10f), TasHelperSettings.HiresFontStroke * 0.4f);
+        TASHelper.Entities.Message.RenderMessage(text, position, new Vector2(0.5f, 0.2f), Scale, Stroke);
     }
 
-    public static void Clear(string label) {
-        foreach (TempTextRenderer tmp in HiresLevelRenderer.GetRenderers<TempTextRenderer>()) {
-            if (tmp.label == label) {
-                HiresLevelRenderer.Remove(tmp);
-            }
+    public static void Clear() {
+        foreach (PredictorTextRenderer tmp in HiresLevelRenderer.GetRenderers<PredictorTextRenderer>()) {
+            HiresLevelRenderer.Remove(tmp);
         }
     }
 }
diff --git a/TASHelper.csproj b/TASHelper.csproj
@@ -77,8 +77,9 @@
 		<Publicize Include="CelesteTAS-EverestInterop:TAS.InfoHUD.InfoWatchEntity.WatchedEntities" />
 		<Publicize Include="CelesteTAS-EverestInterop:TAS.EverestInterop.DesyncFixer.AuraHelperSharedRandom" />
 		<Publicize Include="CelesteTAS-EverestInterop:TAS.Gameplay.BetterInvincible" />
-		<Publicize Include="CelesteTAS-EverestInterop:TAS.Gameplay.Hitboxes.ActualCollideHitbox.playerUpdated" />
 		<Publicize Include="CelesteTAS-EverestInterop:TAS.Savestates.SavedCurrentFrame" />
+		<Publicize Include="CelesteTAS-EverestInterop:TAS.Gameplay.Hitboxes.ActualCollideHitbox.playerUpdated" />
+		<Publicize Include="CelesteTAS-EverestInterop:TAS.ModInterop.TASRecorderInterop" />
 		<Publicize Include="FNA:Microsoft.Xna.Framework.Input.GamePadButtons.buttons" />
 		<Publicize Include="MonoMod.Utils" />
 		<Publicize Include="MonoMod.Utils:MonoMod.Utils.DynamicData._DataMap" />
diff --git a/everest.yaml b/everest.yaml
@@ -1,10 +1,10 @@
 - Name: TASHelper
-  Version: 2.1.6
+  Version: 2.1.7
   DLL: bin/Release/net7.0/TASHelper.dll
   Dependencies:
     - Name: EverestCore
       Version: 1.5034.0
     - Name: CelesteTAS
-      Version: 3.43.4
+      Version: 3.43.5
     - Name: SpeedrunTool
       Version: 3.24.0

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public static void StepBackOneFrame() {`
`14`	`14`	`}`
`15`	`15`	`public static void SetupNextFastForward(int relativeMove) {`
`16`	`16`	`// todo: fix the random camera issue`
`17`		`- if (Manager.Running && !TAS.ModInterop.TASRecorderInterop.Recording) {`
	`17`	`+ if (Manager.Running && !ModInterop.UnstableCelesteTasUsings.TasRecorderIsRecording) {`
`18`	`18`	`int frame = Controller.CurrentFrameInTas + relativeMove;`
`19`	`19`	`if (frame <= 0) {`
`20`	`20`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ public static void CreateUpdateLog() {`
`92`	`92`	`AddLog("2.1.4", "Bugfix: Fastforward makes spinner colors change. (thanks @trans_alexa)");`
`93`	`93`	`AddLog("2.1.5", "Bugfix: fix a bug caused by CelesteTAS refactor.");`
`94`	`94`	`AddLog("2.1.6", "Bugfix: When predictor Update-on-Tas-File-Changed enabled, and edit a line above the current frame, it'll move selection to the current frame. (thanks @richconnergmn)");`
	`95`	`+ AddLog("2.1.7", "Feature: Predictor now can set its own font size. (thanks @richconnergmn)");`
`95`	`96`	`UpdateLogs.Sort((x, y) => new Version(y.Item1).CompareTo(new Version(x.Item1)));`
`96`	`97`	`}`
`97`	`98`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ public static void Unload() {`
`395`	`395`	`}`
`396`	`396`	`private static void OnLevelRender(On.Celeste.Level.orig_Render orig, Level self) {`
`397`	`397`	`if (Applied) {`
`398`		`- TAS.Gameplay.Hitboxes.ActualCollideHitbox.playerUpdated = playerUpdated; // may remove it if we change SpringBoard to IL.Monocle/Celeste hooks`
	`398`	`+ ModInterop.UnstableCelesteTasUsings.playerUpdated = playerUpdated; // may remove it if we change SpringBoard to IL.Monocle/Celeste hooks`
`399`	`399`	`if (prepareToUndoAll) {`
`400`	`400`	`UndoAll();`
`401`	`401`	`}`