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

player_2d.gd

@@ -17,6 +17,9 @@ var dashing = false
 var death_threshold = 1000
 var coins = 0
 
+var data_disks = []
+var objectives = {}
+
 func _ready() -> void:
 	DisplayServer.window_set_title("JUMPS EQUALS JUMPS")
 	
@@ -35,7 +38,29 @@ func refresh_jump(new_jumps):
 		jumps = 1
 	if jumps > 0:
 		$Jetpack/JumpIndicator.show()
-	
+
+func give_disk(disk_num: int) -> void:
+	data_disks.push_back(disk_num)
+
+func take_disk(disk_num) -> bool:
+	if not has_disk(disk_num):
+		return false
+
+	data_disks.remove_at(data_disks.find(disk_num))
+	return true
+
+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 has_objective(id: String) ->  bool:
+	return objectives.has(id)
+
+func complete_objective(id: String) -> bool:
+	return objectives.erase(id)
+
 func on_teleport():
 	refresh_jump(1)
 	teleport_cooldown = 1
@@ -73,7 +98,12 @@ 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")):
 		get_tree().reload_current_scene()
 	
+	if Input.is_action_just_released("interact"):
+		%OldComputer.close()
+	
 	if Input.is_action_just_pressed("jump"):
+		%OldComputer.close()
+
 		if is_on_floor():
 			velocity.y = JUMP_VELOCITY
 		elif !is_on_floor() and jumps >= 1:
@@ -88,7 +118,10 @@ func _process(delta: float) -> void:
 			print("WALL HANGING")
 			#velocity.y = 0
 			#velocity.x = 0
-			
+
+	if %OldComputer.visible:
+		return
+
 	var direction = Input.get_axis("move_left","move_right")
 
 	if direction < 0: