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

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)