nodes/npc/npc.gd

@@ -54,7 +54,6 @@ func grabbed(by):
 	$shape.disabled = true
 	$fsm.set_physics_process(false)
 	reparent(by)
-	position.y = 0
 
 func dropped():
 	$shape.disabled = false

nodes/npc_factory/npc_factory.gd

@@ -9,7 +9,6 @@ var current_spawn_duration = 0
 func _ready():
 	if !NPC_SCENE:
 		push_error("npc scene is null")
-	set_physics_process(false)
 
 func _physics_process(delta):
 	current_spawn_duration += delta

nodes/npc_factory/npc_factory.tscn

@@ -8,7 +8,7 @@
 [node name="npc_factory" type="Node2D"]
 script = ExtResource("1_p5cuf")
 NPC_SCENE = ExtResource("2_exj6u")
-SPAWN_DELAY = 8.0
+SPAWN_DELAY = 2.0
 
 [node name="factory_death" type="Area2D" parent="." groups=["factory_death"]]
 monitoring = false

nodes/obstacle/obstacle.gd

@@ -9,7 +9,6 @@ func grabbed(by):
 	sleeping = true
 	gravity_scale = 0
 	reparent(by)
-	position.y = 0
 
 func dropped():
 	$shape.disabled = false

nodes/obstacle/rock.tscn

@@ -7,6 +7,7 @@
 size = Vector2(32, 32)
 
 [node name="rock" type="RigidBody2D" groups=["obstacle"]]
+can_sleep = false
 script = ExtResource("1_pft6b")
 
 [node name="shape" type="CollisionShape2D" parent="."]

nodes/player/player.gd

@@ -2,14 +2,9 @@ extends CharacterBody2D
 
 class_name Player
 
-@export_file('*.tscn') var LOSE_SCREEN;
-
 const SPEED = 100.0
 const JUMP_VELOCITY = 200.0
 const APNEA_DURATION = 10
-const DURATION_BEFORE_LOSE_SCREEN = 2
-
-
 
 const STATES= [
 	"climb",
@@ -32,7 +27,7 @@ var use_gravity = {
 }
 
 var can_grab_obstacles = {
-	"climb": true,
+	"climb": false,
 	"die": false,
 	"idle": true,
 	"jump": false,
@@ -119,7 +114,7 @@ func climb_state(_delta):
 
 	if is_on_ceiling():
 		var direction = Input.get_axis("player_left", "player_right")
-		velocity = Vector2(direction * SPEED, -1)
+		velocity = Vector2(direction * SPEED, 0)
 
 	if Input.is_action_just_pressed("player_jump") and is_on_wall():
 		var wall_position = get_slide_collision(0).get_normal().x
@@ -137,8 +132,6 @@ func climb_state(_delta):
 
 func after_state(delta):
 	move_and_slide()
-	if is_dead():
-		return
 
 	if use_gravity[$fsm.current_state] == true:
 		handle_gravity(delta)
@@ -171,15 +164,9 @@ func handle_grab():
 			drop_obstacle()
 
 func do_grab(obstacle):
-	# BUGFIX : When grabbing a rock, allows other rocks to fall
-	for ob in get_tree().get_nodes_in_group("obstacle"):
-		if ob.has_method("set_sleeping"):
-			ob.sleeping = false
-
 	grabbed_obstacle = obstacle
 	obstacle.grabbed($oriented_container)
 
-
 func drop_obstacle():
 	grabbed_obstacle.dropped()
 	grabbed_obstacle = null
@@ -198,9 +185,8 @@ func handle_sprite_orientation():
 
 	elif is_on_ceiling_only():
 		if velocity.x != 0:
-			$oriented_container.rotation = 0 if (velocity.x > 0) else PI
+			$oriented_container.rotation = PI if (velocity.x > 0) else -PI
-			sprite.flip_v = velocity.x > 0
+			sprite.flip_h = velocity.x > 0
-			sprite.flip_h = false
 	else:
 		if velocity.x != 0:
 			$oriented_container.rotation = 0 if (velocity.x > 0) else PI
@@ -228,31 +214,15 @@ func on_exit_swim_state():
 	sprite.modulate = Color(1,1,1)
 
 func swim():
-	if is_dead():
-		return
-
 	$fsm.set_next_state("swim")
 
 func unswim():
-	if is_dead():
-		return
-
 	$fsm.set_next_state("idle")
 
 func die():
 	$fsm.set_next_state("die")
 
-func is_dead():
-	return $fsm.current_state == "die"
-
 func on_enter_die_state():
-	velocity = Vector2(0, 0)
+	velocity = Vector2(0, -500)
 	$shape.disabled = true
-	$oriented_container.rotation = 0
+	# $AnimationPlayer.play("die")
-	sprite.flip_v = true
-
-
-func die_state(_delta):
-	prints("die_state", $fsm.state_duration)
-	if $fsm.state_duration > DURATION_BEFORE_LOSE_SCREEN:
-		get_tree().change_scene_to_file(LOSE_SCREEN)

nodes/player/player.tscn

@@ -10,7 +10,6 @@ height = 24.0
 
 [node name="player" type="CharacterBody2D"]
 script = ExtResource("1_exx2i")
-LOSE_SCREEN = "res://scenes/lose_screen.tscn"
 
 [node name="fsm" type="Node2D" parent="." node_paths=PackedStringArray("root")]
 script = ExtResource("2_ix1o4")

nodes/triggers/level_trigger.gd

@@ -1,27 +0,0 @@
-extends Area2D
-
-@export var KILL_ALL_NPCS = false
-@export var LEVEL_MESSAGE : String = ''
-@export var ENABLED_NODES : Array[Node] = []
-@export var DISABLED_NODES : Array[Node] = []
-
-# Called when the node enters the scene tree for the first time.
-func _ready():
-	body_entered.connect(on_body_entered)
-
-
-func on_body_entered(body):
-	if !body.is_in_group('player'):
-		return
-
-	if KILL_ALL_NPCS:
-		if body.is_in_group("npc"):
-			body.queue_free()
-	if LEVEL_MESSAGE:
-		# TODO
-		print(LEVEL_MESSAGE)
-		pass
-	for node in ENABLED_NODES:
-		node.set_physics_process(true)
-	for node in DISABLED_NODES:
-		node.set_physics_process(false)

nodes/triggers/level_trigger.tscn

@@ -1,7 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://cdq58egi0j65h"]
-
-[ext_resource type="Script" path="res://nodes/triggers/level_trigger.gd" id="1_amwjw"]
-
-[node name="level_trigger" type="Area2D"]
-monitorable = false
-script = ExtResource("1_amwjw")

nodes/triggers/win_trigger.gd

@@ -1,11 +0,0 @@
-extends Area2D
-
-@export_file('*.tscn') var WIN_SCENE;
-
-# Called when the node enters the scene tree for the first time.
-func _ready():
-	body_entered.connect(on_body_entered)
-
-func on_body_entered(body):
-	if body.is_in_group('player'):
-		get_tree().change_scene_to_file(WIN_SCENE)

nodes/triggers/win_trigger.tscn

@@ -1,8 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://de7ehbowni47v"]
-
-[ext_resource type="Script" path="res://nodes/triggers/win_trigger.gd" id="1_jk7wd"]
-
-[node name="win_trigger" type="Area2D"]
-monitorable = false
-script = ExtResource("1_jk7wd")
-WIN_SCENE = "res://scenes/win_screen.tscn"

scenes/lose_screen.tscn

@@ -1,43 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://ckt2twwgcgwtt"]
-
-[ext_resource type="Script" path="res://scripts/ui/change_scene_button.gd" id="1_oyu1u"]
-[ext_resource type="Script" path="res://scripts/ui/quit_button.gd" id="2_7spq8"]
-
-[node name="lose_screen" type="Control"]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-
-[node name="Panel" type="Panel" parent="."]
-layout_mode = 0
-offset_right = 1920.0
-offset_bottom = 1080.0
-
-[node name="Label" type="Label" parent="Panel"]
-layout_mode = 0
-offset_right = 1912.0
-offset_bottom = 376.0
-text = "You lose"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Button" type="Button" parent="Panel"]
-layout_mode = 0
-offset_left = 800.0
-offset_top = 744.0
-offset_right = 1144.0
-offset_bottom = 840.0
-text = "Play Again"
-script = ExtResource("1_oyu1u")
-TARGET_SCENE = "res://scenes/main_menu.tscn"
-
-[node name="quit" type="Button" parent="Panel"]
-offset_left = 629.0
-offset_top = 875.0
-offset_right = 1284.0
-offset_bottom = 952.0
-text = "Quit"
-script = ExtResource("2_7spq8")

scenes/win_screen.tscn

@@ -1,43 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://tb03t1t5hcxs"]
-
-[ext_resource type="Script" path="res://scripts/ui/change_scene_button.gd" id="1_ajo3i"]
-[ext_resource type="Script" path="res://scripts/ui/quit_button.gd" id="2_6iycq"]
-
-[node name="win_screen" type="Control"]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-
-[node name="Panel" type="Panel" parent="."]
-layout_mode = 0
-offset_right = 1920.0
-offset_bottom = 1080.0
-
-[node name="Label" type="Label" parent="Panel"]
-layout_mode = 0
-offset_right = 1912.0
-offset_bottom = 376.0
-text = "You won"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Button" type="Button" parent="Panel"]
-layout_mode = 0
-offset_left = 800.0
-offset_top = 744.0
-offset_right = 1144.0
-offset_bottom = 840.0
-text = "Play Again"
-script = ExtResource("1_ajo3i")
-TARGET_SCENE = "res://scenes/main_menu.tscn"
-
-[node name="quit" type="Button" parent="Panel"]
-offset_left = 629.0
-offset_top = 875.0
-offset_right = 1284.0
-offset_bottom = 952.0
-text = "Quit"
-script = ExtResource("2_6iycq")

scripts/ia/fsm.gd

@@ -41,7 +41,7 @@ func _transition():
 		previous_state = current_state
 		current_state = next_state
 		next_state = null
-		print(get_parent().name + " transitioning to " + current_state)
+		print(self.name + " transitioning to " + current_state)
 
 		if previous_state:
 			var on_exit_state_method =  "on_exit_" + previous_state + "_state"