From 770fdde083c98ce93b6ae9ac32806a5ff832ac27 Mon Sep 17 00:00:00 2001 From: Gregory Marco Date: Sat, 17 Oct 2026 23:08:46 -0500 Subject: [PATCH] Add an explicit objective to talk to the sarc. Completing that objective gives the first data disk objective. --- pharaoh.gd | 16 +++++++++------- player_2d.gd | 1 + player_2d.tscn | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pharaoh.gd b/pharaoh.gd index d0a87fe..3e99961 100644 --- a/pharaoh.gd +++ b/pharaoh.gd @@ -20,17 +20,19 @@ func get_memory_integrity(): func _on_interacted() -> void: #%OldComputer.open() - var wanted_disk = disks_wanted.front() %Player2D.spawn_point = global_position + var wanted_disk = disks_wanted.front() + if %Player2D.complete_objective("sarc"): + %OldComputer.open() + %Player2D.give_objective( + "disk%d" % wanted_disk, + wanted_disk, "Locate data disk %d" % wanted_disk + ) + return + if not %Player2D.take_disk(wanted_disk): - if wanted_disk == 1 and not %Player2D.has_objective("disk%d" % wanted_disk): - %OldComputer.open() - %Player2D.give_objective( - "disk%d" % wanted_disk, - wanted_disk, "Locate data disk %d" % wanted_disk - ) return if not load_disk(wanted_disk): diff --git a/player_2d.gd b/player_2d.gd index 95a77f5..fc8c84c 100644 --- a/player_2d.gd +++ b/player_2d.gd @@ -24,6 +24,7 @@ var objectives = {} func _ready() -> void: spawn_point = position DisplayServer.window_set_title("JUMPS EQUALS JUMPS") + give_objective("sarc", 0, "Open the Sarcophagus") func refresh_dash(new_dashes): if new_dashes: diff --git a/player_2d.tscn b/player_2d.tscn index abcefe7..d2404b2 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/running/frame1.png" id="8_3prq1"] +[ext_resource type="Texture2D" uid="uid://lk0f1qyswyxv" path="res://art/player/idle/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/running/frame2.png" id="9_lu0ka"] +[ext_resource type="Texture2D" uid="uid://lmje8plw76e1" path="res://art/player/idle/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"]