slightly simplify GTimer further

Valks-Games · Feb 1, 2023 · 3b2147d · 3b2147d
1 parent 30b0f9c
commit 3b2147d
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/Scripts/Entities/Enemy/Bird.cs b/Scripts/Entities/Enemy/Bird.cs
@@ -12,7 +12,7 @@ public partial class Bird : MovingEntity<Bird>
 	public override void Init()
 	{
 		TimerChangeDirection = new GTimer(this, 1000, false);
-		TimerFlap = new GTimer(this, nameof(OnTimerFlap), 1000, true) { Loop = true };
+		TimerFlap = new GTimer(this, OnTimerFlap, 1000, true) { Loop = true };
 		AnimatedSprite.Play("fly");
 		MoveDir = Vector2.Left;
 	}

diff --git a/Scripts/Entities/Enemy/Slime/Slime.cs b/Scripts/Entities/Enemy/Slime/Slime.cs
@@ -23,7 +23,7 @@ public override void Init()
 		CurrentAnimation = EntityAnimationType.Idle;
 
 		IdleTimer = new GTimer(this, 1000);
-		PreJumpTimer = new GTimer(this, nameof(OnPreJumpTimer), 400, false);
+		PreJumpTimer = new GTimer(this, OnPreJumpTimer, 400, false);
 
 		Label.Visible = true;
     }

diff --git a/Scripts/Entities/Enemy/Spawner.cs b/Scripts/Entities/Enemy/Spawner.cs
@@ -9,7 +9,7 @@ public partial class Spawner : Marker2D, IEntity
 
     public override void _Ready()
     {
-        Timer = new GTimer(this, nameof(OnTimer), RespawnInterval, false)
+        Timer = new GTimer(this, OnTimer, RespawnInterval, false)
 		{
 			Loop = true
 		};

diff --git a/Scripts/Entities/Enemy/Trapper.cs b/Scripts/Entities/Enemy/Trapper.cs
@@ -10,7 +10,7 @@ public partial class Trapper : Entity
 	public override void Init()
 	{
 		AreaDamage = GetNode<Area2D>("Damage");
-		TimerReveal = new GTimer(this, nameof(OnTimerReveal), 1500, false);
+		TimerReveal = new GTimer(this, OnTimerReveal, 1500, false);
 		TimerRevealCooldown = new GTimer(this, 2000, false);
 		AnimatedSprite.Play("idle");
 

diff --git a/Scripts/Entities/Level/APlatform.cs b/Scripts/Entities/Level/APlatform.cs
@@ -8,7 +8,7 @@ public abstract partial class APlatform : CharacterBody2D
 
 	public void Init()
 	{
-		Timer = new GTimer(this, nameof(OnTimerUp), 400, false);
+		Timer = new GTimer(this, OnTimerUp, 400, false);
 
 		Collision = GetNode<CollisionShape2D>("CollisionShape2D");
 	}

diff --git a/Scripts/Entities/Level/PlatformDisappear.cs b/Scripts/Entities/Level/PlatformDisappear.cs
@@ -22,9 +22,9 @@ public override void _Ready()
         Sprite = GetNode<Sprite2D>("Sprite2D");
         ShaderMaterial = (Sprite.Material as ShaderMaterial);
 
-        TimerFlash1 = new GTimer(this, nameof(OnTimerFlash1Up), DurationFlash1, false);
-        TimerFlash2 = new GTimer(this, nameof(OnTimerFlash2Up), DurationFlash2, false);
-        TimerReappear = new GTimer(this, nameof(OnTimerReappear), DurationReappear, false);
+        TimerFlash1 = new GTimer(this, OnTimerFlash1Up, DurationFlash1, false);
+        TimerFlash2 = new GTimer(this, OnTimerFlash2Up, DurationFlash2, false);
+        TimerReappear = new GTimer(this, OnTimerReappear, DurationReappear, false);
     }
 
     public override void _PhysicsProcess(double d)

diff --git a/Scripts/Entities/MovingEntity.cs b/Scripts/Entities/MovingEntity.cs
@@ -111,7 +111,7 @@ public sealed override void _Ready()
 		// Does not seem to have any effect if this is either true or false
 		SlideOnCeiling = true;
 
-		ImmunityTimer = new GTimer(this, nameof(OnImmunityTimerFinished), ImmunityMs, false);
+		ImmunityTimer = new GTimer(this, OnImmunityTimerFinished, ImmunityMs, false);
 
 		if (Label != null)
 		{

diff --git a/Scripts/Entities/Player/Commands/PlayerCommandDash.cs b/Scripts/Entities/Player/Commands/PlayerCommandDash.cs
@@ -20,8 +20,8 @@ public PlayerCommandDash(Player player) : base(player) { }
 
 	public override void Initialize()
 	{
-		TimerDashCooldown = Entity.Timers.CreateTimer(nameof(Entity.OnDashReady), DashCooldown, false);
-		TimerDashDuration = Entity.Timers.CreateTimer(nameof(Entity.OnDashDurationDone), DashDuration, false);
+		TimerDashCooldown = Entity.Timers.CreateTimer(Entity.OnDashReady, DashCooldown, false);
+		TimerDashDuration = Entity.Timers.CreateTimer(Entity.OnDashDurationDone, DashDuration, false);
 	}
 
 	public override void Start()

diff --git a/Scripts/Entities/Player/Player.cs b/Scripts/Entities/Player/Player.cs
@@ -71,7 +71,7 @@ public override void Init()
 		if (GameManager.PlayerManager.ActiveCheckpoint)
 			Position = GameManager.PlayerManager.RespawnPosition;
 
-		TimerNetSend = new GTimer(this, nameof(NetUpdate), NetIntervals.HEARTBEAT, Net.IsMultiplayer())
+		TimerNetSend = new GTimer(this, NetUpdate, NetIntervals.HEARTBEAT, Net.IsMultiplayer())
 		{
 			Loop = true
 		};
@@ -82,7 +82,7 @@ public override void Init()
 		GetCommandClass<PlayerCommandWallJump>(PlayerCommandType.WallJump).WallJump += OnWallJump;
 
 		DontCheckPlatformAfterDashDuration = new GTimer(this, 500, false);
-		PreventMovementTimer               = new GTimer(this, nameof(PreventMovementFinished), 50, false);
+		PreventMovementTimer               = new GTimer(this, PreventMovementFinished, 50, false);
 	}
 
 	public override void UpdatePhysics()

diff --git a/Scripts/Utils/Godot Helpers/GTimer.cs b/Scripts/Utils/Godot Helpers/GTimer.cs
@@ -21,10 +21,10 @@ public bool Loop
 	public GTimer(Node node, int delayMs = 1000, bool autoStart = true) =>
 		Init(node, delayMs, autoStart);
 
-	public GTimer(Node node, string methodName, int delayMs = 1000, bool autoStart = true)
+	public GTimer(Node node, Action action, int delayMs = 1000, bool autoStart = true)
 	{
 		Init(node, delayMs, autoStart);
-		Callable = new Callable(node, methodName);
+		Callable = Callable.From(action);
 		Timer.Connect("timeout", Callable);
 	}
 

diff --git a/Scripts/Utils/Godot Helpers/GTimers.cs b/Scripts/Utils/Godot Helpers/GTimers.cs
@@ -9,7 +9,7 @@ public class GTimers
 	public GTimer CreateTimer(int delayMS, bool autoStart = true) =>
 		new GTimer(Node, delayMS, autoStart);
 
-	public GTimer CreateTimer(string methodName, int delayMS, bool autoStart = true) =>
-		new GTimer(Node, methodName, delayMS, autoStart);
+	public GTimer CreateTimer(Action action, int delayMS, bool autoStart = true) =>
+		new GTimer(Node, action, delayMS, autoStart);
 }