fix: initialize escoria.main.last_room_id on loading

godot-escoria · Oct 7, 2024 · ba54f2b · ba54f2b
1 parent 6b066eb
commit ba54f2b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd b/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd
@@ -322,6 +322,11 @@ func _get_event_to_queue(
 										action,
 										target.global_id,
 										combine_with.global_id
+									],
+									"Check that action ':%s %s' exists in the script of item '%s'" % [
+										action, 
+										target.global_id,
+										combine_with.global_id
 									]
 								]
 

diff --git a/addons/escoria-core/game/core-scripts/esc_exit.gd b/addons/escoria-core/game/core-scripts/esc_exit.gd
@@ -27,7 +27,6 @@ var _change_scene: ChangeSceneCommand
 
 func _enter_tree():
 	is_exit = true
-	player_orients_on_arrival = false
 
 
 func _ready():

diff --git a/addons/escoria-core/game/core-scripts/save_data/esc_save_manager.gd b/addons/escoria-core/game/core-scripts/save_data/esc_save_manager.gd
@@ -495,6 +495,9 @@ func load_game(id: int):
 				camera_target_to_follow
 			])
 		)
+
+	## MAIN
+	escoria.main.last_scene_global_id = save_game.main.last_scene_global_id
 
 	load_event.statements = load_statements
 

diff --git a/game/rooms/room06/room06.tscn b/game/rooms/room06/room06.tscn
@@ -190,6 +190,7 @@ z_index = 400
 texture = ExtResource( 11 )
 
 [node name="Text" type="Node2D" parent="."]
+z_index = 10
 
 [node name="Polygon2D" type="Polygon2D" parent="Text"]
 position = Vector2( 37, 11 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -495,6 +495,9 @@ func load_game(id: int): @@
     				camera_target_to_follow
     			])
     		)
+    	## MAIN
+    	escoria.main.last_scene_global_id = save_game.main.last_scene_global_id
     	load_event.statements = load_statements
@@ Expand Down @@