Merge branch 'main' of http://git.nanoyagi.com/NanoYagi/JumpRopeOldTech

OldComputer.tscn

@@ -7,6 +7,7 @@
 bg_color = Color(0.28627452, 0.25490198, 0.22745098, 1)
 
 [node name="OldComputer" type="CanvasLayer" unique_id=1944134941]
+visible = false
 script = ExtResource("1_6jyhx")
 
 [node name="BackgroundPanel" type="Panel" parent="." unique_id=1876350245]

disk.gd

@@ -7,5 +7,5 @@ func _ready() -> void:
 
 func _on_picked_up() -> void:
 	%Player2D.give_disk(disk_num)
-	%Player2D.give_objective("disk%d" % disk_num, "Install data disk %d" % disk_num)
+	%Player2D.give_objective("disk%d" % disk_num, disk_num, "Install data disk %d" % disk_num)
 	print("Picked up disk ", disk_num)

objectives_label.gd

@@ -3,6 +3,6 @@ extends RichTextLabel
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta: float) -> void:
 	var new_text = "OBJECTIVES:\n"
-	for objective in %Player2D.objectives:
-		new_text = new_text + %Player2D.objectives[objective] + "\n"
+	for objective in %Player2D.get_current_objectives():
+		new_text = new_text + objective + "\n"
 	text = new_text

old_computer.gd

@@ -2,7 +2,6 @@ extends CanvasLayer
 
 func _ready() -> void:
 	$ConsoleText.text = $ConsoleText.text % %Pharaoh.get_memory_integrity()
-	open()
 
 func open() -> void:
 	visible = true

pharaoh.gd

@@ -18,11 +18,19 @@ func get_memory_integrity():
 	return 100.0 / total_integrity * (starting_integrity + len(disks_loaded))
 
 func _on_interacted() -> void:
+	#%OldComputer.open()
+
 	var wanted_disk = disks_wanted.front()
 	
 	%Player2D.spawn_point = position
 	
 	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):
@@ -39,4 +47,4 @@ func _on_interacted() -> void:
 	if (not wanted_disk) or %Player2D.has_disk(wanted_disk):
 		return
 
-	%Player2D.give_objective("disk%d" % wanted_disk, "Locate data disk %d" % wanted_disk)
+	%Player2D.give_objective("disk%d" % wanted_disk, wanted_disk, "Locate data disk %d" % wanted_disk)

player_2d.gd

@@ -54,14 +54,26 @@ func take_disk(disk_num) -> bool:
 func has_disk(disk_num: int) ->  bool:
 	return disk_num in data_disks
 
-func give_objective(id: String, description: String) -> void:
-	objectives[id] = description
+func give_objective(id: String, priority: int, description: String) -> void:
+	objectives[id] = {
+		"priority": priority,
+		"description": description,
+		"completed": false
+	}
 
 func has_objective(id: String) ->  bool:
-	return objectives.has(id)
+	return objectives.has(id) and not objectives[id].completed
+
+func get_current_objectives() -> Array[String]:
+	var current_objectives = objectives.values()
+	current_objectives.sort_custom(func(a, b): return a.priority < b.priority)
+	return current_objectives.filter(func(objective): return not objective.completed).map(func(objective): return objective.description)
 
 func complete_objective(id: String) -> bool:
-	return objectives.erase(id)
+	if not has_objective(id):
+		return false
+	objectives[id].completed = true
+	return true
 
 func on_teleport():
 	refresh_jump(1)