tilemap layer, state maschine, scenemanager, animations, accel

scripts/bullet.gd.uid

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

scripts/crate.gd.uid

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

scripts/gamecontroller.gd

@@ -1,6 +1,6 @@
 extends Node2D
 
-
+signal playerDamage
 # Called when the node enters the scene tree for the first time.
 func _ready():
 	pass # Replace with function body.
@@ -13,6 +13,11 @@ func _process(delta: float) -> void:
 
 func _on_trigger(effect: Variant, body:Variant) -> void:
 	print("GC sees trigger "+effect)
+	match effect:
+		"player_hurt":
+			if body is Player:
+				print("ouch")
+				playerDamage.emit()
 	if not body is Player:
 		body.queue_free()
 

scripts/player.gd

@@ -4,14 +4,20 @@ class_name Player extends CharacterBody2D
 @onready var left_cast: RayCast2D = $LeftCast
 @onready var right_spawn: Node2D = $RightSpawn
 @onready var left_spawn: Node2D = $LeftSpawn
+@onready var jump_buffer_timer: Timer = $jumpBufferTimer
+@onready var player_graphic: AnimatedSprite2D = $PlayerGraphic
 
-const SPEED = 300.0
+const SPEED = 300
 const JUMP_VELOCITY = -400.0
 
+@export var acceleration:int = 5
+var upJump:bool = false
+
 var direction 
 enum FaceDirection{LEFT, RIGHT}
 var facing:FaceDirection = FaceDirection.RIGHT
-
+enum State{IDLE,RUN,JUMP,FALLING}
+var current_state:State = State.IDLE
 var pushTarget
 var pushEnabled := false
 
@@ -22,26 +28,64 @@ func _physics_process(delta:float) -> void:
 	
 	handle_input()
 	handle_movement(delta)
+	handle_states()
+	handle_animation()
 	move_and_slide()
 	handle_collisions()
+func handle_states() -> void:
+	match current_state:
+		State.IDLE when velocity.x !=0:
+			current_state = State.RUN
+		State.RUN:
+			if velocity.x == 0:
+				current_state = State.IDLE
+			if not is_on_floor() && velocity.y > 0:
+				current_state =  State.FALLING
+		State.FALLING when is_on_floor():
+			if velocity.x == 0:
+				current_state = State.IDLE
+			else:
+				current_state = State.RUN
+		State.JUMP when velocity.y >0:
+			current_state = State.FALLING
+func handle_animation() -> void:
+	match current_state:
+		State.IDLE:
+			player_graphic.play("idle")
+		State.RUN:
+			player_graphic.play("run")
+		State.FALLING:
+			player_graphic.play("fall")
+		State.JUMP:
+			if upJump:
+				player_graphic.play("jump")
 			
 func handle_movement(delta:float) -> void: 
-	
-	if direction:
-		velocity.x = direction * SPEED
+	if direction == 0:
+		#not moving
+		velocity.x = move_toward(velocity.x,0, acceleration)
 	else:
-		velocity.x = move_toward(velocity.x, 0, SPEED)
+		velocity.x = move_toward(velocity.x,SPEED * direction, acceleration)
+	
 	if not is_on_floor():
 		velocity += get_gravity() * delta
+	if is_on_floor() && jump_buffer_timer.time_left >0:
+		velocity.y = JUMP_VELOCITY
+		jump_buffer_timer.stop()
+		current_state = State.JUMP
+		upJump = true
 
 func handle_input():
 	if Input.is_action_just_pressed("ui_accept") and is_on_floor():
-		velocity.y = JUMP_VELOCITY
+		#velocity.y = JUMP_VELOCITY
+		jump_buffer_timer.start()
 	direction = Input.get_axis("ui_left", "ui_right")
 	if direction <0:
 		facing =FaceDirection.LEFT
+		player_graphic.flip_h = true
 	if direction > 0:
 		facing = FaceDirection.RIGHT
+		player_graphic.flip_h = false
 	if Input.is_action_just_pressed("shove") && pushEnabled:
 		var shoveDirection:int
 		match facing:
@@ -80,3 +124,9 @@ func handle_collisions():
 			pushEnabled = true
 	if not right_cast.is_colliding() && not left_cast.is_colliding():
 		pushEnabled = false
+
+
+func _on_animation_finished() -> void:
+	match current_state:
+		State.JUMP:
+			upJump = false

scripts/scene_manager.gd

@@ -3,11 +3,15 @@ var bulletArray = []
 var totalAllowedBullets = 7
 var bullet = preload("res://scenes/bullet.tscn")
 @onready var game: Node2D = $".."
+@onready var triggers: Node2D = $"../triggers"
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	pass # Replace with function body.
-
+	if triggers:
+		for obj in triggers.get_children():
+			if obj is Trigger:
+				obj.areaTriggerSignal.connect(game._on_trigger)
+	
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta: float) -> void:

scripts/scene_manager.gd.uid

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

scripts/trigger.gd

@@ -1,4 +1,4 @@
-extends Area2D
+class_name Trigger extends Area2D
 
 @export var effect := "destroy"