From 15367da9b48422e015da6488dc244ee41881f62b Mon Sep 17 00:00:00 2001 From: debugman18 Date: Sat, 17 Oct 2026 22:47:39 -0500 Subject: [PATCH] New checkpoint system --- pharaoh.gd | 3 +++ player_2d.gd | 5 ++++- player_2d.tscn | 4 ++-- world.tscn | 29 +++++++++++++++++++++++------ 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/pharaoh.gd b/pharaoh.gd index 274967a..bd4a6a4 100644 --- a/pharaoh.gd +++ b/pharaoh.gd @@ -19,6 +19,9 @@ func get_memory_integrity(): func _on_interacted() -> void: var wanted_disk = disks_wanted.front() + + %Player2D.spawn_point = position + if not %Player2D.take_disk(wanted_disk): return diff --git a/player_2d.gd b/player_2d.gd index 66a4438..36c1bf5 100644 --- a/player_2d.gd +++ b/player_2d.gd @@ -16,11 +16,13 @@ var dashes = 1 var dashing = false var death_threshold = 1000 var coins = 0 +var spawn_point var data_disks = [] var objectives = {} func _ready() -> void: + spawn_point = position DisplayServer.window_set_title("JUMPS EQUALS JUMPS") func refresh_dash(new_dashes): @@ -92,7 +94,8 @@ func on_death(instant = false, player_position = position): spawn_ghost(player_position) get_tree().paused = false - position = %LevelStart.position + #position = %LevelStart.position + position = spawn_point func _process(delta: float) -> void: if Input.is_action_just_released("restart") or (Input.is_action_pressed("controller_restart_left") and Input.is_action_pressed("controller_restart_right")): diff --git a/player_2d.tscn b/player_2d.tscn index d2404b2..abcefe7 100644 --- a/player_2d.tscn +++ b/player_2d.tscn @@ -11,10 +11,10 @@ [ext_resource type="Texture2D" uid="uid://dyxbitw8hbd3s" path="res://art/player/crouch/frame2.png" id="7_lu0ka"] [ext_resource type="Texture2D" uid="uid://bfyd1tro3s0gl" path="res://art/player/crystal2.png" id="7_oy4pt"] [ext_resource type="Texture2D" uid="uid://dh7a1knyqn5nd" path="res://art/player/running/frame3.png" id="7_pmt5n"] -[ext_resource type="Texture2D" uid="uid://lk0f1qyswyxv" path="res://art/player/idle/frame1.png" id="8_3prq1"] +[ext_resource type="Texture2D" uid="uid://lk0f1qyswyxv" path="res://art/player/running/frame1.png" id="8_3prq1"] [ext_resource type="Texture2D" uid="uid://yf13nw31k8ua" path="res://art/player/running/frame4.png" id="8_nj6as"] [ext_resource type="Texture2D" uid="uid://du5i0tg6u1lal" path="res://art/player/crystal3.png" id="8_ukfft"] -[ext_resource type="Texture2D" uid="uid://lmje8plw76e1" path="res://art/player/idle/frame2.png" id="9_lu0ka"] +[ext_resource type="Texture2D" uid="uid://lmje8plw76e1" path="res://art/player/running/frame2.png" id="9_lu0ka"] [ext_resource type="Texture2D" uid="uid://bko8dvawpul3c" path="res://art/player/crystal4.png" id="9_ur4nw"] [ext_resource type="Texture2D" uid="uid://m5djssna67e1" path="res://art/player/crouch/frame3.png" id="9_w0gjo"] [ext_resource type="Texture2D" uid="uid://ba4kjeulthw1g" path="res://art/hats/dunce1.png" id="10_5s8kx"] diff --git a/world.tscn b/world.tscn index 4ebe157..34dd62f 100644 --- a/world.tscn +++ b/world.tscn @@ -26,11 +26,30 @@ scale = Vector2(1, 1.0155824) [node name="Player2D" parent="." unique_id=889851478 instance=ExtResource("1_aqk2v")] unique_name_in_owner = true -position = Vector2(55, 102.324905) +position = Vector2(-1004, -1335.1945) + +[node name="StartingArea" type="Node2D" parent="." unique_id=130240736] +position = Vector2(-842, -1300.7314) + +[node name="LevelStart" parent="StartingArea" unique_id=2121809777 instance=ExtResource("4_ic0uy")] +position = Vector2(-45, -31.508991) + +[node name="LongerBlock" parent="StartingArea" unique_id=426800863 instance=ExtResource("6_dwbse")] +position = Vector2(-17, -17.72377) + +[node name="LongerBlock3" parent="StartingArea" unique_id=1122236775 instance=ExtResource("6_dwbse")] +position = Vector2(-193, -179.20744) +rotation = 1.5707964 + +[node name="LongerBlock2" parent="StartingArea" unique_id=75325542 instance=ExtResource("6_dwbse")] +position = Vector2(-17, -65.97195) + +[node name="Pharaoh" parent="StartingArea" unique_id=1201409437 instance=ExtResource("15_hiqwa")] +position = Vector2(-62, -39.38623) [node name="Tutorial" type="Node2D" parent="." unique_id=1391494772] -[node name="LongBlock7" parent="Tutorial" unique_id=426800863 instance=ExtResource("6_dwbse")] +[node name="LongBlock7" parent="Tutorial" unique_id=1405051006 instance=ExtResource("6_dwbse")] position = Vector2(1946, 401.7399) [node name="LongBlock8" parent="Tutorial" unique_id=1886381744 instance=ExtResource("6_dwbse")] @@ -104,7 +123,7 @@ position = Vector2(1256, 612.4564) [node name="Spike13" parent="Tutorial" unique_id=2050689217 instance=ExtResource("12_k3n1d")] position = Vector2(1271, 612.4564) -[node name="Teleporter1" parent="Tutorial" unique_id=1201409437 instance=ExtResource("4_gbfbk")] +[node name="Teleporter1" parent="Tutorial" unique_id=686866202 instance=ExtResource("4_gbfbk")] position = Vector2(149, 91.57307) paired_teleporter = "A" @@ -231,6 +250,7 @@ position = Vector2(1679, 181.17683) rotation = 4.712389 [node name="ZoeLevel" type="Node2D" parent="." unique_id=980267417] +visible = false [node name="LongBlock4" parent="ZoeLevel" unique_id=469408536 instance=ExtResource("6_dwbse")] position = Vector2(544, 399) @@ -400,9 +420,6 @@ position = Vector2(7607, -277.12885) [node name="LongBlock" parent="." unique_id=1836871184 instance=ExtResource("3_dwbse")] position = Vector2(7963, -271.12885) -[node name="VerticalLongBlock" parent="." unique_id=1990277242 instance=ExtResource("4_pkg7o")] -position = Vector2(7864, -322.12885) - [node name="VerticalLongBlock2" parent="." unique_id=10220440 instance=ExtResource("4_pkg7o")] position = Vector2(7864, -212.12886)