refactor: convert existing coroutines to Tasks

winstxnhdw · Oct 14, 2024 · bd64492 · bd64492
1 parent 77f9145
commit bd64492
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 32 deletions.
diff --git a/lc-hax/Scripts/Commands/Bomb/BombCommand.cs b/lc-hax/Scripts/Commands/Bomb/BombCommand.cs
@@ -1,15 +1,9 @@
 using System.Threading;
 using System.Threading.Tasks;
-using System;
 using GameNetcodeStuff;
 
 [Command("bomb")]
 class BombCommand : ICommand, IJetpack {
-    Action BlowUpLocation(PlayerControllerB localPlayer, PlayerControllerB targetPlayer, JetpackItem jetpack) => () => {
-        localPlayer.DiscardHeldObject(placeObject: true, parentObjectTo: targetPlayer.NetworkObject);
-        Helper.ShortDelay(jetpack.ExplodeJetpackServerRpc);
-    };
-
     public async Task Execute(string[] args, CancellationToken cancellationToken) {
         if (Helper.LocalPlayer is not PlayerControllerB localPlayer) return;
         if (args.Length is 0) {
@@ -32,8 +26,10 @@ public async Task Execute(string[] args, CancellationToken cancellationToken) {
             return;
         }
 
-        Helper.CreateComponent<WaitForBehaviour>("Throw Bomb")
-              .SetPredicate(() => localPlayer.ItemSlots[localPlayer.currentItemSlot] == jetpack)
-              .Init(this.BlowUpLocation(localPlayer, targetPlayer, jetpack));
+        GrabbableObject[] itemSlots = localPlayer.ItemSlots;
+        await Helper.WaitUntil(() => itemSlots[localPlayer.currentItemSlot] == jetpack, cancellationToken);
+        localPlayer.DiscardHeldObject(placeObject: true, parentObjectTo: targetPlayer.NetworkObject);
+        await Task.Delay(500, cancellationToken);
+        jetpack.ExplodeJetpackServerRpc();
     }
 }
diff --git a/lc-hax/Scripts/Commands/FakeDeathCommand.cs b/lc-hax/Scripts/Commands/FakeDeathCommand.cs
@@ -19,8 +19,7 @@ public async Task Execute(string[] args, CancellationToken cancellationToken) {
             0
         );
 
-        Helper.CreateComponent<WaitForBehaviour>("Respawn")
-              .SetPredicate(() => player.playersManager.shipIsLeaving)
-              .Init(player.KillPlayer);
+        await Helper.WaitUntil(() => player.playersManager.shipIsLeaving, cancellationToken);
+        player.KillPlayer();
     }
 }
diff --git a/lc-hax/Scripts/Commands/MaskCommand.cs b/lc-hax/Scripts/Commands/MaskCommand.cs
@@ -4,11 +4,6 @@
 
 [Command("mask")]
 class MaskCommand : ICommand {
-    void SpawnMimicOnPlayer(PlayerControllerB player, HauntedMaskItem mask, ulong amount = 1) =>
-        Helper.CreateComponent<TransientBehaviour>("Mask").Init(_ => {
-            mask.CreateMimicServerRpc(player.isInsideFactory, player.transform.position);
-        }, amount * 0.1f, 0.1f);
-
     public async Task Execute(string[] args, CancellationToken cancellationToken) {
         if (Helper.LocalPlayer is not PlayerControllerB localPlayer) return;
         if (Helper.Grabbables.First(grabbable => grabbable is HauntedMaskItem) is not HauntedMaskItem hauntedMaskItem) {
@@ -35,8 +30,12 @@ public async Task Execute(string[] args, CancellationToken cancellationToken) {
             return;
         }
 
-        Helper.CreateComponent<WaitForBehaviour>()
-              .SetPredicate(() => localPlayer.ItemSlots[localPlayer.currentItemSlot] is HauntedMaskItem)
-              .Init(() => this.SpawnMimicOnPlayer(targetPlayer, hauntedMaskItem, amount));
+        GrabbableObject[] itemSlots = localPlayer.ItemSlots;
+        await Helper.WaitUntil(() => localPlayer.ItemSlots[localPlayer.currentItemSlot] is HauntedMaskItem, cancellationToken);
+
+        for (ulong i = 0; i < amount; i++) {
+            hauntedMaskItem.CreateMimicServerRpc(targetPlayer.isInsideFactory, targetPlayer.transform.position);
+            await Task.Delay(100, cancellationToken);
+        }
     }
 }
diff --git a/lc-hax/Scripts/Commands/Unlockable/HornCommand.cs b/lc-hax/Scripts/Commands/Unlockable/HornCommand.cs
@@ -1,31 +1,38 @@
+using System;
 using System.Threading;
 using System.Threading.Tasks;
-using System;
 
 [Command("horn")]
 class HornCommand : ICommand {
-    Action PullHornLater(int hornDuration) => () => {
-        ShipAlarmCord? shipAlarmCord = Helper.FindObject<ShipAlarmCord>();
-        shipAlarmCord?.PullCordServerRpc(-1);
-
-        Helper.CreateComponent<WaitForBehaviour>("Stop Pulling Horn")
-              .SetPredicate(time => time >= hornDuration)
-              .Init(() => shipAlarmCord?.StopPullingCordServerRpc(-1));
-    };
-
     public async Task Execute(string[] args, CancellationToken cancellationToken) {
         if (args.Length is 0) {
             Chat.Print("Usage: horn <duration>");
             return;
         }
 
-        if (!int.TryParse(args[0], out int hornDuration)) {
+        if (!int.TryParse(args[0], out int hornDurationSeconds)) {
             Chat.Print("Invalid duration!");
             return;
         }
 
         Helper.BuyUnlockable(Unlockable.LOUD_HORN);
         Helper.ReturnUnlockable(Unlockable.LOUD_HORN);
-        Helper.ShortDelay(this.PullHornLater(hornDuration));
+
+        if (await Helper.FindObject<ShipAlarmCord>(cancellationToken) is not ShipAlarmCord shipAlarmCord) {
+            return;
+        }
+
+        try {
+            shipAlarmCord.PullCordServerRpc(-1);
+            await Task.Delay(hornDurationSeconds * 1000, cancellationToken);
+        }
+
+        catch (Exception exception) {
+            throw exception;
+        }
+
+        finally {
+            shipAlarmCord.StopPullingCordServerRpc(-1);
+        }
     }
 }
diff --git a/lc-hax/Scripts/Helpers/FindObjects.cs b/lc-hax/Scripts/Helpers/FindObjects.cs
@@ -1,8 +1,21 @@
+using System.Threading;
+using System.Threading.Tasks;
 using UnityEngine;
 
 static partial class Helper {
     internal static T? FindObject<T>() where T : Component => Object.FindAnyObjectByType<T>();
 
     internal static T[] FindObjects<T>(FindObjectsSortMode sortMode = FindObjectsSortMode.None) where T : Component =>
         Object.FindObjectsByType<T>(sortMode);
+
+    internal static async Task<T?> FindObject<T>(CancellationToken cancellationToken) where T : Component {
+        T? obj = Helper.FindObject<T>();
+
+        while (obj is null && !cancellationToken.IsCancellationRequested) {
+            await Task.Yield();
+            obj = Helper.FindObject<T>();
+        }
+
+        return obj;
+    }
 }
diff --git a/lc-hax/Scripts/Helpers/WaitUntil.cs b/lc-hax/Scripts/Helpers/WaitUntil.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+static partial class Helper {
+    internal static async Task WaitUntil(Func<bool> predicate, CancellationToken cancellationToken) {
+        while (!predicate() && !cancellationToken.IsCancellationRequested) {
+            await Task.Yield();
+        }
+    }
+}