Merge branch 'main' of https://git.main.qwsdcvghyu.com/riley/wrplat-godot

objects/l18n/english.tres

@@ -0,0 +1,3 @@
+[gd_resource type="Translation" format=3 uid="uid://vs4pl3jum6hp"]
+
+[resource]

src/components/combo_counter.gd

@@ -0,0 +1,18 @@
+extends Label
+
+var combo: int = 0;
+@onready var playerBody: CharacterBody2D = %Player/CharacterBody2D
+
+func _ready():
+	playerBody.connect("OnJump", onJump)
+	playerBody.connect("OnJumpFail", onJumpFail)
+	
+func onJump(kind: int, isOnGround: bool, isOnWall: bool):
+	combo += 1;
+	updateLabel()
+func onJumpFail():
+	combo = 0;
+	updateLabel()
+	
+func updateLabel():
+	text = "Combo: %d" % combo

src/components/combo_counter.gd.uid

@@ -0,0 +1 @@
+uid://dct1kelhyy04v

src/components/game/PlayerPhysicsController.cs

@@ -20,6 +20,9 @@ public partial class PlayerPhysicsController : CharacterBody2D {
     [Signal]
     public delegate void OnJumpEventHandler(JumpKind kind, bool isOnGround, bool isOnWall);
 
+    [Signal]
+    public delegate void OnJumpFailEventHandler();
+
 
     [ExportCategory("Accelerations and Impulses")]
     [Export]
@@ -139,6 +142,7 @@ public partial class PlayerPhysicsController : CharacterBody2D {
         float velx = (Velocity.X / UnitToPx);
         float vely = (Velocity.Y / UnitToPx) + Gravity * (float)delta;
 
+        var jumped = false;
         var grounded = this.IsOnFloor();
         var coyoteGrounded = _timeOffGround < CoyoteTiming;
         if (grounded || coyoteGrounded) {
@@ -147,6 +151,7 @@ public partial class PlayerPhysicsController : CharacterBody2D {
 
             if (Input.IsActionJustPressed("jump")) {
                 EmitSignal(SignalName.OnJump, (int)JumpKind.Ground, this.IsOnFloor(), this.IsOnWall());
+                jumped = true;
                 vely = -_lv;
             }
 
@@ -194,6 +199,7 @@ public partial class PlayerPhysicsController : CharacterBody2D {
                     GD.Print($"Theta: {theta * (180 / Mathf.Pi)}, turnjump: {turnjump}");
                     velx = turnjump.X;
                     vely = turnjump.Y;
+                    jumped = true;
                 } else {
                     // does not have jump point
                     // float theta = Mathf.Atan2(-yAxis, Mathf.Abs(xAxis));
@@ -209,6 +215,7 @@ public partial class PlayerPhysicsController : CharacterBody2D {
 
             if (Input.IsActionJustPressed("jump") && Mathf.Abs(vely) < MaxDoubleJumpFallSpeed) {
                 EmitSignal(SignalName.OnJump, (int)JumpKind.Midair, this.IsOnFloor(), this.IsOnWall());
+                jumped = true;
                 vely = -_lv;
             }
 
@@ -221,6 +228,9 @@ public partial class PlayerPhysicsController : CharacterBody2D {
             else velx += autostop;
         }
 
+        if (Input.IsActionJustPressed("jump") && !jumped)
+            EmitSignal(SignalName.OnJumpFail);
+
         var maxXSpeed = grounded ? Input.IsActionPressed("run") ? MaxRunSpeed : MaxWalkSpeed : MaxAirSpeed;
         var maxYSpeed = vely > 0 ? MaxFallSpeed : MaxRiseSpeed;
         var (absvelx, absvely) = (Mathf.Abs(velx), Mathf.Abs(vely));