Changed the Alarm for Completion Count change to a Coroutine #patch

Paloys · Oct 1, 2022 · 1de0dd8 · 1de0dd8
1 parent faa3335
commit 1de0dd8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/GoldenTrainer/CompletionDisplay.cs b/GoldenTrainer/CompletionDisplay.cs
@@ -19,8 +19,6 @@ public class CompletionDisplay : Entity
 
         private float _width;
 
-
-
         public CompletionDisplay(Level level)
         {
             _level = level;
@@ -44,7 +42,7 @@ public void SetDisplayText(string text)
 
         public float GetYPosition()
         {
-            var posY = 10f * 16;
+            var posY = 10f * 16 + 10f;
 
             if (!_level.TimerHidden)
             {
@@ -98,7 +96,6 @@ public override void Render()
 
             _bg.Draw(new Vector2(_width - _bg.Width + basePos.X, Y));
 
-
             if (_width > _bg.Width + basePos.X)
             {
                 Draw.Rect(0, Y, _width - _bg.Width + basePos.X, 38f, Color.Black);

diff --git a/GoldenTrainer/GoldenTrainer.cs b/GoldenTrainer/GoldenTrainer.cs
@@ -7,6 +7,9 @@
 using MonoMod.Cil;
 using MonoMod.RuntimeDetour;
 using System;
+using System.Collections;
+using System.Net.Sockets;
+using NPC09_Granny_Inside = On.Celeste.NPC09_Granny_Inside;
 
 namespace GoldenTrainer
 {
@@ -34,15 +37,17 @@ public int CompletionCount
             set
             {
                 _completionCount = value;
-                if (value == 0)
-                {
-                    Display.SetDisplayText(_completionCount + "/" + Settings.NumberOfCompletions);
-                }
-                else
-                {
-                    Alarm.Set(Display, 1.5f, () => Display.SetDisplayText(_completionCount + "/" + Settings.NumberOfCompletions));
-                }
+                Display?.Add(new Coroutine(DelayCountChangeRoutine()));
+            }
+        }
+
+        private IEnumerator DelayCountChangeRoutine()
+        {
+            while (_level.Tracker.GetEntity<Player>() is null || _level.Tracker.GetEntity<Player>().Dead)
+            {
+                yield return Engine.DeltaTime;
             }
+            Display.SetDisplayText(_completionCount + "/" + Settings.NumberOfCompletions);
         }
 
 

diff --git a/everest.yaml b/everest.yaml
@@ -1,5 +1,5 @@
 - Name: GoldenTrainer
-  Version: 1.4.3
+  Version: 1.4.4
   DLL: GoldenTrainer/bin/x86/Debug/GoldenTrainer.dll
   Dependencies:
     - Name: Everest