From a70f992ea315ae412b58d9bbc2cfbaadd85f13e8 Mon Sep 17 00:00:00 2001 From: karl Date: Tue, 28 Jan 2020 17:41:51 +0100 Subject: [PATCH] Move player back home if caught --- Characters/Player/Player.gd | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Characters/Player/Player.gd b/Characters/Player/Player.gd index f6718f7..ce67225 100644 --- a/Characters/Player/Player.gd +++ b/Characters/Player/Player.gd @@ -238,6 +238,7 @@ func _on_area_entered (area: Area): Logger.info("entering factory") IsInFactory = true IsOutside = false + get_tree().change_scene("res://Level/InFactory.tscn") elif area.is_in_group("TunnelEntry"): Logger.info("entering factory") IsInFactory = false @@ -250,16 +251,13 @@ func _on_area_entered (area: Area): IsInFactory = false IsOutside = true # TODO: move not change_scene! - get_tree().change_scene("res://Level/World.tscn") + get_tree().change_scene("res://Level/OutsideWorld.tscn") elif area.is_in_group("LabyrinthEntry"): Logger.info("entering labyrinth") IsInFactory = false IsInLabyrinth = true # TODO: move not change_scene! get_tree().change_scene("res://Level/Labyrinth.tscn") - - - func _on_area_exited (area: Area): @@ -288,9 +286,12 @@ func _on_respawn (): #Logger.info("save areas: " + String(_save_areas)) if _save_areas < 1 and not IsInLabyrinth: - Logger.info("reload scene") + Logger.info("move back to home") Pills._set_level(Pills.get_max()) - get_tree().reload_current_scene() + IsInFactory = false + IsOutside = true + # TODO: move not change_scene! + get_tree().change_scene("res://Level/OutsideWorld.tscn") _inventory.show() # enable hud again