From ff326379fb41e82fbb183ea1b0cee61906b503b7 Mon Sep 17 00:00:00 2001
From: incredibleLeitman <michael.leithner@gmail.com>
Date: Sat, 25 Jan 2020 17:21:50 +0100
Subject: [PATCH] only reset time if player is in save area, not loosing
 collected items

---
 Characters/Player/Player.gd | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Characters/Player/Player.gd b/Characters/Player/Player.gd
index 66f0ad9..d915398 100644
--- a/Characters/Player/Player.gd
+++ b/Characters/Player/Player.gd
@@ -31,6 +31,7 @@ var _dir = Vector3()
 var _vel = Vector3()
 var _is_sprinting : bool
 var _illegal_areas : int
+var _save_areas : int
 var _prev_look
 
 # TODO: move to global
@@ -198,29 +199,38 @@ func _on_area_entered (area: Area):
 	elif area.is_in_group("Forbidden"):
 		Logger.info("entering forbidden area!")
 		_illegal_areas += 1
+	elif area.is_in_group("Savehouse"):
+		Logger.info("entering save area!")
+		_save_areas += 1
 
 
 func _on_area_exited (area: Area):
 	if area.is_in_group("Forbidden"):
 		Logger.info("leaving forbidden area!")
 		_illegal_areas -= 1
+	elif area.is_in_group("Savehouse"):
+		Logger.info("leaving save area!")
+		_save_areas -= 1
 
 
 func _on_respawn ():
 	Logger.info("respawning")
-	
 	# fade to black and restart scene
 	_inventory.hide()
 	_animationFadeOut.play("FadeOut")
 	yield(_animationFadeOut, "animation_finished")
+	_animationFadeOut.seek(0, true)
 
 	# reset values
-	_animationFadeOut.seek(0, true)
-	
 	Pills._set_level(Pills.get_max())
 	Daytime._set_time(0)
 	
-	get_tree().reload_current_scene()
+	Logger.info("save areas: " + String(_save_areas))
+	if _save_areas < 1:
+		Logger.info("reload scene")
+		get_tree().reload_current_scene()
+
+	_inventory.show()
 
 
 func Is_in_Illegal_Area ():