Merged changes

scripts/game_manager.gd

@@ -24,7 +24,8 @@ func _process(delta: float) -> void:
 			toggle_player_profile()
 		if Input.is_action_just_pressed("switch modes"):
 			confirm_end_shift()
-		
+		if Input.is_action_just_pressed("test"):
+			test_save()
 		
 func add_quest_progress_bar(quest : Quest) -> void:
 	panel.add_quest_progress_bar(quest)

scripts/quest_sprite.gd

@@ -9,6 +9,8 @@ var energy : int = 1
 var max_energy : int = 1
 var level : int = 1
 var exp : int = 0
+var reset_position : Vector2
+var melee_range : float = 100
 
 @export var stats : StatBlock
 var gold : int = 0
@@ -18,7 +20,33 @@ var gold : int = 0
 signal died(killer :QuestSprite)
 signal action_complete(requeue : bool)
 signal busy()
+signal arrived()
 
+func position_reset() -> void:
+	var tween = create_tween()
+	#TODO: Vary movement animations?
+	tween.tween_callback(anim_player.play.bind("running"))
+	tween.tween_property(self, "position", reset_position,.75)
+	if reset_position.x < position.x:
+		$Sprite.flip_h = true
+		tween.tween_property($Sprite, "flip_h", false, 0)
+	tween.tween_callback(anim_player.play.bind("idle"))
+	tween.tween_callback(arrived.emit)
+
+func approach(target, offset) -> void:
+	var tween = create_tween()
+	if target.position.x > position.x:
+		#TODO: Switch facing direction
+		offset = -offset
+	#TODO: Vary movement animations?
+	tween.tween_callback(anim_player.play.bind("running"))
+	var target_position = target.position + Vector2(offset, 0)
+	tween.tween_property(self, "position", target_position,.75)
+	if target_position.x < position.x:
+		$Sprite.flip_h = true
+		tween.tween_property($Sprite, "flip_h", false, 0)
+	tween.tween_callback(anim_player.play.bind("idle"))
+	tween.tween_callback(arrived.emit)
 
 func attack(target : QuestSprite) -> void:
 	print("Attack by %s to %s" % [name, target.name])

scripts/quest_view.gd

@@ -14,6 +14,7 @@ func setup(qst : Quest) -> void:
 	questorSprite.setup(quest.questor)
 	add_child(questorSprite)
 	questorSprite.global_position = $QuestorPosition.global_position
+	questorSprite.reset_position = questorSprite.position
 	for child in %Layers.get_children():
 		if child is Parallax2D:
 			child.autoscroll.x = -base_speed * child.scroll_scale.x
@@ -25,9 +26,10 @@ func set_questor_animation(anim_name : String) -> void:
 func set_enemy_animation(enemy : Enemy, anim_name : String) -> void:
 	enemy.set_animation(anim_name)
 
-func place_enemy(enemy : Enemy) -> void:
+func place_enemy(enemy : Enemy, reset : bool = false) -> void:
 	add_child(enemy)
 	enemy.global_position = $EnemyPosition.global_position
+	enemy.reset_position = enemy.position
 
 func pause_setting() -> void:
 	setting.process_mode = Node.PROCESS_MODE_DISABLED