Renamed all room folders to use 2 digits.

addons/escoria-core/game/core-scripts/esc/esc_object_manager.gd

@@ -97,7 +97,6 @@ func get_object(global_id: String) -> ESCObject:
 func unregister_object(object: ESCObject) -> void:
 	if not escoria.inventory_manager.inventory_has(object.global_id) \
 			and not object.global_id in RESERVED_OBJECTS:
-		
 		objects.erase(object.global_id)
 
 

game/characters/worker/worker.tscn

@@ -23,6 +23,7 @@ extents = Vector2( 40.4907, 142.11 )
 script = ExtResource( 1 )
 global_id = "worker"
 esc_script = "res://game/rooms/room6/esc/worker.esc"
+is_movable = true
 tooltip_name = "Worker"
 default_action = "look"
 dialog_color = Color( 0.196078, 0, 1, 1 )

game/items/escitems/button.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=1]
-[ext_resource path="res://game/rooms/room3/smoke.png" type="Texture" id=2]
+[ext_resource path="res://game/rooms/room03/smoke.png" type="Texture" id=2]
 
 [sub_resource type="Gradient" id=1]
 offsets = PoolRealArray( 0, 0.830189 )

game/items/escitems/r5_empty_sheet.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://game/items/inventory/empty_sheet.tscn" type="PackedScene" id=1]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=2]
-[ext_resource path="res://game/rooms/room5/items/empty_sheet.png" type="Texture" id=3]
+[ext_resource path="res://game/rooms/room05/items/empty_sheet.png" type="Texture" id=3]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 86.9568, 115.211 )

game/items/escitems/r5_pen.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://game/rooms/room5/items/pen.png" type="Texture" id=1]
+[ext_resource path="res://game/rooms/room05/items/pen.png" type="Texture" id=1]
 [ext_resource path="res://game/items/inventory/pen.tscn" type="PackedScene" id=2]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=3]
 

game/items/escitems/r5_wrench.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://game/items/inventory/wrench.tscn" type="PackedScene" id=1]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=2]
-[ext_resource path="res://game/rooms/room5/items/wrench.png" type="Texture" id=3]
+[ext_resource path="res://game/rooms/room05/items/wrench.png" type="Texture" id=3]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 44.696, 49.0953 )

game/items/inventory/filled_sheet.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_inventory_item.gd" type="Script" id=1]
-[ext_resource path="res://game/rooms/room5/items/filled_sheet.png" type="Texture" id=2]
+[ext_resource path="res://game/rooms/room05/items/filled_sheet.png" type="Texture" id=2]
 
 [node name="filled_sheet" type="TextureButton"]
 margin_right = 88.0

game/rooms/room01/esc/right_exit.esc

@@ -0,0 +1,3 @@
+:exit_scene
+set_sound_state bg_sound res://game/sfx/sounds/doorOpen_2.ogg false
+change_scene "res://game/rooms/room02/room02.tscn"

game/rooms/room01/room01.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=7 format=2]
 
-[ext_resource path="res://game/rooms/room1/walkable_area.tscn" type="PackedScene" id=1]
+[ext_resource path="res://game/rooms/room01/walkable_area.tscn" type="PackedScene" id=1]
-[ext_resource path="res://game/rooms/room1/background.tscn" type="PackedScene" id=2]
+[ext_resource path="res://game/rooms/room01/background.tscn" type="PackedScene" id=2]
 [ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
 [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=5]
@@ -13,7 +13,7 @@ __meta__ = {
 "_edit_vertical_guides_": [  ]
 }
 global_id = "room1"
-esc_script = "res://game/rooms/room1/esc/room1.esc"
+esc_script = "res://game/rooms/room01/esc/room01.esc"
 player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 0, 1285, 550 ) ]
 editor_debug_mode = 1
@@ -52,7 +52,7 @@ __meta__ = {
 "_editor_description_": ""
 }
 global_id = "r1_r_exit"
-esc_script = "res://game/rooms/room1/esc/right_exit.esc"
+esc_script = "res://game/rooms/room01/esc/right_exit.esc"
 is_exit = true
 tooltip_name = "Exit"
 default_action = "walk"
@@ -68,7 +68,7 @@ position = Vector2( 1225.47, 353.99 )
 position = Vector2( -217.19, 0 )
 script = ExtResource( 5 )
 global_id = "r1_wall_item1"
-esc_script = "res://game/rooms/room1/esc/wall_item.esc"
+esc_script = "res://game/rooms/room01/esc/wall_item.esc"
 tooltip_name = "Item on the wall"
 default_action = "look"
 dialog_color = Color( 1, 1, 1, 1 )
@@ -101,7 +101,7 @@ __meta__ = {
 position = Vector2( 189.644, 0 )
 script = ExtResource( 5 )
 global_id = "r1_wall_item2"
-esc_script = "res://game/rooms/room1/esc/wall_item_popupdialog.esc"
+esc_script = "res://game/rooms/room01/esc/wall_item_popupdialog.esc"
 tooltip_name = "Item on the wall"
 default_action = "look"
 dialog_color = Color( 1, 1, 1, 1 )

game/rooms/room02/background.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=1]
-[ext_resource path="res://game/rooms/room2/bridge.tscn" type="PackedScene" id=2]
+[ext_resource path="res://game/rooms/room02/bridge.tscn" type="PackedScene" id=2]
 
 [node name="background" type="TextureRect"]
 margin_right = 1298.0

game/rooms/room02/esc/left_exit.esc

@@ -0,0 +1,3 @@
+:exit_scene
+set_sound_state bg_sound res://game/sfx/sounds/doorOpen_2.ogg false
+change_scene "res://game/rooms/room01/room01.tscn"

game/rooms/room02/esc/right_exit.esc

@@ -0,0 +1,3 @@
+:exit_scene
+set_sound_state bg_sound res://game/sfx/sounds/doorOpen_2.ogg false
+change_scene "res://game/rooms/room03/room03.tscn"

game/rooms/room02/room02.tscn

@@ -1,17 +1,17 @@
 [gd_scene load_steps=8 format=2]
 
-[ext_resource path="res://game/rooms/room2/walkable_area.tscn" type="PackedScene" id=1]
+[ext_resource path="res://game/rooms/room02/walkable_area.tscn" type="PackedScene" id=1]
-[ext_resource path="res://game/rooms/room2/background.tscn" type="PackedScene" id=2]
+[ext_resource path="res://game/rooms/room02/background.tscn" type="PackedScene" id=2]
 [ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
 [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
-[ext_resource path="res://game/rooms/room2/button/button.tscn" type="PackedScene" id=5]
+[ext_resource path="res://game/rooms/room02/button/button.tscn" type="PackedScene" id=5]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=7]
 
 [node name="room2" type="Node2D"]
 script = ExtResource( 6 )
 global_id = "room2"
-esc_script = "res://game/rooms/room2/esc/room2_bridge.esc"
+esc_script = "res://game/rooms/room02/esc/room02_bridge.esc"
 player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 0, 1289, 555 ) ]
 
@@ -34,7 +34,7 @@ __meta__ = {
 [node name="r_platform" type="Area2D" parent="Hotspots"]
 script = ExtResource( 7 )
 global_id = "r2_right_platform"
-esc_script = "res://game/rooms/room2/esc/right_platform.esc"
+esc_script = "res://game/rooms/room02/esc/right_platform.esc"
 interaction_direction = 3
 tooltip_name = "Right platform"
 default_action = "look"
@@ -49,7 +49,7 @@ position = Vector2( 430.893, 451.052 )
 [node name="r_door" type="Area2D" parent="Hotspots"]
 script = ExtResource( 7 )
 global_id = "r2_r_exit"
-esc_script = "res://game/rooms/room2/esc/right_exit.esc"
+esc_script = "res://game/rooms/room02/esc/right_exit.esc"
 is_exit = true
 tooltip_name = "Right exit"
 default_action = "walk"
@@ -64,7 +64,7 @@ position = Vector2( 1225.47, 353.99 )
 [node name="l_door" type="Area2D" parent="Hotspots"]
 script = ExtResource( 7 )
 global_id = "r2_l_exit"
-esc_script = "res://game/rooms/room2/esc/left_exit.esc"
+esc_script = "res://game/rooms/room02/esc/left_exit.esc"
 is_exit = true
 tooltip_name = "Left exit"
 default_action = "walk"
@@ -79,7 +79,7 @@ position = Vector2( 52.1462, 384.691 )
 [node name="button_right" parent="Hotspots" instance=ExtResource( 5 )]
 position = Vector2( 958.107, 176.401 )
 global_id = "r2_button_right"
-esc_script = "res://game/rooms/room2/esc/button.esc"
+esc_script = "res://game/rooms/room02/esc/button.esc"
 dialog_color = Color( 0, 1, 0.109804, 1 )
 
 [node name="Position2D" type="Position2D" parent="Hotspots/button_right"]
@@ -91,7 +91,7 @@ __meta__ = {
 [node name="button_left" parent="Hotspots" instance=ExtResource( 5 )]
 position = Vector2( 288.82, 171.439 )
 global_id = "r2_button"
-esc_script = "res://game/rooms/room2/esc/button.esc"
+esc_script = "res://game/rooms/room02/esc/button.esc"
 dialog_color = Color( 0, 1, 0.109804, 1 )
 
 [node name="Position2D" type="Position2D" parent="Hotspots/button_left"]

game/rooms/room03/background.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=1]
-[ext_resource path="res://game/rooms/room2/bridge.tscn" type="PackedScene" id=2]
+[ext_resource path="res://game/rooms/room02/bridge.tscn" type="PackedScene" id=2]
 
 [node name="background" type="TextureRect"]
 margin_right = 1300.0

game/rooms/room03/esc/left_exit.esc

@@ -0,0 +1,2 @@
+:exit_scene
+change_scene "res://game/rooms/room02/room02.tscn"

game/rooms/room03/esc/right_exit.esc

@@ -0,0 +1,2 @@
+:exit_scene
+change_scene "res://game/rooms/room04/room04.tscn"

game/rooms/room03/room03.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=8 format=2]
 
-[ext_resource path="res://game/rooms/room3/walkable_area.tscn" type="PackedScene" id=1]
+[ext_resource path="res://game/rooms/room03/walkable_area.tscn" type="PackedScene" id=1]
-[ext_resource path="res://game/rooms/room3/background.tscn" type="PackedScene" id=2]
+[ext_resource path="res://game/rooms/room03/background.tscn" type="PackedScene" id=2]
 [ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
 [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=5]
@@ -11,7 +11,7 @@
 [node name="room3" type="Node2D"]
 script = ExtResource( 6 )
 global_id = "room3"
-esc_script = "res://game/rooms/room3/esc/room3_bridge.esc"
+esc_script = "res://game/rooms/room03/esc/room03_bridge.esc"
 player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 0, 1289, 555 ) ]
 
@@ -36,7 +36,7 @@ __meta__ = {
 "_editor_description_": ""
 }
 global_id = "r3_right_platform"
-esc_script = "res://game/rooms/room3/esc/right_platform.esc"
+esc_script = "res://game/rooms/room03/esc/right_platform.esc"
 dialog_color = Color( 1, 1, 1, 1 )
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_platform"]
@@ -57,7 +57,7 @@ __meta__ = {
 "_editor_description_": ""
 }
 global_id = "r3_r_exit"
-esc_script = "res://game/rooms/room3/esc/right_exit.esc"
+esc_script = "res://game/rooms/room03/esc/right_exit.esc"
 is_exit = true
 tooltip_name = "Exit"
 dialog_color = Color( 1, 1, 1, 1 )
@@ -74,7 +74,7 @@ __meta__ = {
 "_editor_description_": ""
 }
 global_id = "r3_l_exit"
-esc_script = "res://game/rooms/room3/esc/left_exit.esc"
+esc_script = "res://game/rooms/room03/esc/left_exit.esc"
 is_exit = true
 tooltip_name = "Exit"
 dialog_color = Color( 1, 1, 1, 1 )
@@ -87,7 +87,7 @@ position = Vector2( 44.1375, 384.691 )
 
 [node name="button" parent="Hotspots" instance=ExtResource( 7 )]
 global_id = "r3_button"
-esc_script = "res://game/rooms/room3/esc/button.esc"
+esc_script = "res://game/rooms/room03/esc/button.esc"
 
 [node name="Position2D" type="Position2D" parent="Hotspots/button"]
 position = Vector2( 347.767, 378.011 )

game/rooms/room04/esc/left_exit.esc

@@ -0,0 +1,2 @@
+:exit_scene
+change_scene "res://game/rooms/room03/room03.tscn"

game/rooms/room04/esc/right_exit.esc

@@ -0,0 +1,2 @@
+:exit_scene
+change_scene "res://game/rooms/room05/room05.tscn"

game/rooms/room04/room04.tscn

@@ -6,8 +6,8 @@
 [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=5]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]
-[ext_resource path="res://game/rooms/room4/assets/background.png" type="Texture" id=7]
+[ext_resource path="res://game/rooms/room04/assets/background.png" type="Texture" id=7]
-[ext_resource path="res://game/rooms/room4/assets/depth_reduced.png" type="Texture" id=8]
+[ext_resource path="res://game/rooms/room04/assets/depth_reduced.png" type="Texture" id=8]
 
 [sub_resource type="NavigationPolygon" id=1]
 vertices = PoolVector2Array( 371.757, 688.152, 542.371, 788.052, 2.46706, 794.786, 11.4468, 698.255, 189.918, 682.54, 1564.36, 574.459, 1578.66, 529.011, 1635.23, 551.638, 1624.42, 800.399, 1536.87, 579.274, 1012.68, 786.929, 1197.79, 675.666, 908.294, 488.354, 996.968, 451.313, 600.739, 456.925, 673.699, 490.599, 127.06, 573.661, 23.7938, 614.07, 42.8757, 527.64, 125.717, 528.797 )
@@ -17,7 +17,7 @@ outlines = [ PoolVector2Array( 11.4468, 698.255, 23.7938, 614.07, 42.8757, 527.6
 [node name="room4" type="Node2D"]
 script = ExtResource( 6 )
 global_id = "room4"
-esc_script = "res://game/rooms/room4/esc/room4.esc"
+esc_script = "res://game/rooms/room04/esc/room04.esc"
 player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 0, 1666, 574 ) ]
 editor_debug_mode = 1
@@ -75,7 +75,7 @@ position = Vector2( 82.9282, 347.615 )
 [node name="l_door" type="Area2D" parent="Hotspots"]
 script = ExtResource( 5 )
 global_id = "l_exit"
-esc_script = "res://game/rooms/room4/esc/left_exit.esc"
+esc_script = "res://game/rooms/room04/esc/left_exit.esc"
 is_exit = true
 dialog_color = Color( 1, 1, 1, 1 )
 
@@ -88,7 +88,7 @@ position = Vector2( 83.6298, 279.703 )
 [node name="r_door" type="Area2D" parent="Hotspots"]
 script = ExtResource( 5 )
 global_id = "r_exit"
-esc_script = "res://game/rooms/room4/esc/right_exit.esc"
+esc_script = "res://game/rooms/room04/esc/right_exit.esc"
 is_exit = true
 dialog_color = Color( 1, 1, 1, 1 )
 

game/rooms/room05/esc/left_exit.esc

@@ -0,0 +1,2 @@
+:exit_scene
+change_scene "res://game/rooms/room04/room04.tscn"

game/rooms/room05/esc/right_exit.esc

@@ -0,0 +1,2 @@
+:exit_scene
+change_scene "res://game/rooms/room06/room06.tscn"

game/rooms/room05/esc/room05.esc

@@ -1,4 +1,8 @@
 :setup
+
+> [i/r5_wrench]
+	set_active r5_wrench false
+
 > [eq ESC_LAST_SCENE room4]
 	teleport player r5_l_exit
 	# Set player look right

game/rooms/room05/room05.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=12 format=2]
 
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
-[ext_resource path="res://game/rooms/room5/background.tscn" type="PackedScene" id=2]
+[ext_resource path="res://game/rooms/room05/background.tscn" type="PackedScene" id=2]
 [ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
 [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
-[ext_resource path="res://game/rooms/room5/item_wall/item_wall.tscn" type="PackedScene" id=5]
+[ext_resource path="res://game/rooms/room05/item_wall/item_wall.tscn" type="PackedScene" id=5]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=7]
 [ext_resource path="res://game/items/escitems/r5_wrench.tscn" type="PackedScene" id=8]
@@ -22,7 +22,7 @@ __meta__ = {
 "_edit_vertical_guides_": [  ]
 }
 global_id = "room5"
-esc_script = "res://game/rooms/room5/esc/room5.esc"
+esc_script = "res://game/rooms/room05/esc/room05.esc"
 player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 0, 1289, 555 ) ]
 
@@ -90,7 +90,7 @@ __meta__ = {
 [node name="l_door" type="Area2D" parent="Hotspots"]
 script = ExtResource( 7 )
 global_id = "r5_l_exit"
-esc_script = "res://game/rooms/room5/esc/left_exit.esc"
+esc_script = "res://game/rooms/room05/esc/left_exit.esc"
 is_exit = true
 tooltip_name = "Left exit"
 dialog_color = Color( 1, 1, 1, 1 )
@@ -105,7 +105,7 @@ position = Vector2( 37.4521, 392.045 )
 position = Vector2( -1, 0 )
 script = ExtResource( 7 )
 global_id = "r5_r_exit"
-esc_script = "res://game/rooms/room5/esc/right_exit.esc"
+esc_script = "res://game/rooms/room05/esc/right_exit.esc"
 is_exit = true
 tooltip_name = "Right exit"
 dialog_color = Color( 1, 1, 1, 1 )
@@ -119,7 +119,7 @@ position = Vector2( 1225.47, 353.99 )
 [node name="item_wall" parent="Hotspots" instance=ExtResource( 5 )]
 position = Vector2( 2.37842, -254.49 )
 global_id = "r5_wall_item"
-esc_script = "res://game/rooms/room5/esc/wall_item.esc"
+esc_script = "res://game/rooms/room05/esc/wall_item.esc"
 tooltip_name = "Item on the wall"
 default_action = "look"
 

game/rooms/room06/esc/left_exit.esc

@@ -0,0 +1,2 @@
+:exit_scene
+change_scene "res://game/rooms/room05/room05.tscn"

game/rooms/room06/esc/r6_door.esc

@@ -1,5 +1,5 @@
 :exit_scene
-change_scene "res://game/rooms/room7/room7.tscn" [r6_door_open]
+change_scene "res://game/rooms/room07/room07.tscn" [r6_door_open]
 
 :ready
 set_global r6_door_open false

game/rooms/room06/room06.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
-[ext_resource path="res://game/rooms/room6/background.tscn" type="PackedScene" id=2]
+[ext_resource path="res://game/rooms/room06/background.tscn" type="PackedScene" id=2]
-[ext_resource path="res://game/rooms/room6/l_exit.tscn" type="PackedScene" id=3]
+[ext_resource path="res://game/rooms/room06/l_exit.tscn" type="PackedScene" id=3]
 [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
-[ext_resource path="res://game/rooms/room6/r_door.tscn" type="PackedScene" id=5]
+[ext_resource path="res://game/rooms/room06/r_door.tscn" type="PackedScene" id=5]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]
 [ext_resource path="res://game/characters/worker/worker.tscn" type="PackedScene" id=7]
 [ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=8]
@@ -20,7 +20,7 @@ __meta__ = {
 "_edit_vertical_guides_": [  ]
 }
 global_id = "room6"
-esc_script = "res://game/rooms/room6/esc/room6.esc"
+esc_script = "res://game/rooms/room06/esc/room06.esc"
 player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 0, 1289, 555 ) ]
 
@@ -57,6 +57,7 @@ __meta__ = {
 [node name="Hotspots" type="Node2D" parent="."]
 
 [node name="l_exit" parent="Hotspots" instance=ExtResource( 3 )]
+esc_script = "res://game/rooms/room06/esc/left_exit.esc"
 
 [node name="Position2D" type="Position2D" parent="Hotspots/l_exit"]
 position = Vector2( 37.4521, 392.045 )
@@ -65,6 +66,7 @@ __meta__ = {
 }
 
 [node name="r_door" parent="Hotspots" instance=ExtResource( 5 )]
+esc_script = "res://game/rooms/room06/esc/r6_door.esc"
 
 [node name="Position2D" type="Position2D" parent="Hotspots/r_door"]
 position = Vector2( 1180.52, 395.193 )
@@ -74,6 +76,7 @@ __meta__ = {
 
 [node name="worker" parent="Hotspots" instance=ExtResource( 7 )]
 position = Vector2( 480, 430 )
+esc_script = "res://game/rooms/room06/esc/worker.esc"
 interaction_direction = 2
 
 [node name="Position2D2" type="Position2D" parent="Hotspots/worker"]

game/rooms/room07/esc/left_exit.esc

@@ -0,0 +1,2 @@
+:exit_scene
+change_scene "res://game/rooms/room06/room06.tscn"

game/rooms/room07/esc/right_exit.esc

@@ -0,0 +1,2 @@
+:exit_scene
+change_scene "res://game/rooms/room08/room08.tscn"

game/rooms/room07/room07.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=16 format=2]
 
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
-[ext_resource path="res://game/rooms/room7/background.tscn" type="PackedScene" id=2]
+[ext_resource path="res://game/rooms/room07/background.tscn" type="PackedScene" id=2]
 [ext_resource path="res://game/items/escitems/button.tscn" type="PackedScene" id=3]
 [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
 [ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=5]
@@ -90,7 +90,7 @@ __meta__ = {
 "_edit_vertical_guides_": [  ]
 }
 global_id = "room7"
-esc_script = "res://game/rooms/room7/esc/room7.esc"
+esc_script = "res://game/rooms/room07/esc/room07.esc"
 player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 1350, 2098, 800 ), Rect2( 0, 0, 2098, 1050 ), Rect2( 0, 0, 2098, 2150 ) ]
 editor_debug_mode = 1
@@ -139,7 +139,7 @@ __meta__ = {
 "_editor_description_": ""
 }
 global_id = "r7_l_exit"
-esc_script = "res://game/rooms/room7/esc/left_exit.esc"
+esc_script = "res://game/rooms/room07/esc/left_exit.esc"
 is_exit = true
 tooltip_name = "Exit"
 dialog_color = Color( 1, 1, 1, 1 )
@@ -157,7 +157,7 @@ __meta__ = {
 "_editor_description_": ""
 }
 global_id = "r7_r_exit"
-esc_script = "res://game/rooms/room7/esc/right_exit.esc"
+esc_script = "res://game/rooms/room07/esc/right_exit.esc"
 is_exit = true
 interaction_direction = 1
 tooltip_name = "Exit"
@@ -208,7 +208,7 @@ __meta__ = {
 "_editor_description_": ""
 }
 global_id = "r7_lower_stairs"
-esc_script = "res://game/rooms/room7/esc/lower_stairs.esc"
+esc_script = "res://game/rooms/room07/esc/lower_stairs.esc"
 is_exit = true
 dialog_color = Color( 1, 1, 1, 1 )
 
@@ -222,7 +222,7 @@ position = Vector2( 953.985, 315.526 )
 position = Vector2( 1347.64, 473.026 )
 script = ExtResource( 7 )
 global_id = "r7_upper_stairs"
-esc_script = "res://game/rooms/room7/esc/upper_stairs.esc"
+esc_script = "res://game/rooms/room07/esc/upper_stairs.esc"
 is_exit = true
 tooltip_name = "Stairs"
 dialog_color = Color( 1, 1, 1, 1 )
@@ -237,7 +237,7 @@ position = Vector2( 27.5337, 131.767 )
 [node name="button_camera_push" parent="Hotspots" instance=ExtResource( 3 )]
 position = Vector2( -167.43, 1463.23 )
 global_id = "r7_button_push"
-esc_script = "res://game/rooms/room7/esc/button_push.esc"
+esc_script = "res://game/rooms/room07/esc/button_push.esc"
 
 [node name="Position2D" type="Position2D" parent="Hotspots/button_camera_push"]
 position = Vector2( 343.048, 300.613 )
@@ -259,7 +259,7 @@ __meta__ = {
 [node name="button_camera_shift" parent="Hotspots" instance=ExtResource( 3 )]
 position = Vector2( 9.393, 1464.03 )
 global_id = "r7_button_shift"
-esc_script = "res://game/rooms/room7/esc/button_shift.esc"
+esc_script = "res://game/rooms/room07/esc/button_shift.esc"
 
 [node name="Position2D" type="Position2D" parent="Hotspots/button_camera_shift"]
 position = Vector2( 350.258, 301.616 )
@@ -278,7 +278,7 @@ __meta__ = {
 [node name="button_camera_follow" parent="Hotspots" instance=ExtResource( 3 )]
 position = Vector2( 172.527, 1464.03 )
 global_id = "r7_button_follow"
-esc_script = "res://game/rooms/room7/esc/button_follow.esc"
+esc_script = "res://game/rooms/room07/esc/button_follow.esc"
 
 [node name="Position2D" type="Position2D" parent="Hotspots/button_camera_follow"]
 position = Vector2( 350.258, 301.616 )
@@ -297,7 +297,7 @@ __meta__ = {
 [node name="button_camera_zoom" parent="Hotspots" instance=ExtResource( 3 )]
 position = Vector2( 332.527, 1464.03 )
 global_id = "r7_button_zoom"
-esc_script = "res://game/rooms/room7/esc/button_zoom.esc"
+esc_script = "res://game/rooms/room07/esc/button_zoom.esc"
 
 [node name="Position2D" type="Position2D" parent="Hotspots/button_camera_zoom"]
 position = Vector2( 350.258, 301.616 )
@@ -316,7 +316,7 @@ __meta__ = {
 [node name="button_camera_set_pos" parent="Hotspots" instance=ExtResource( 3 )]
 position = Vector2( 910.482, 1464.03 )
 global_id = "r7_button_set_pos"
-esc_script = "res://game/rooms/room7/esc/button_set_pos.esc"
+esc_script = "res://game/rooms/room07/esc/button_set_pos.esc"
 
 [node name="Position2D" type="Position2D" parent="Hotspots/button_camera_set_pos"]
 position = Vector2( 350.258, 301.616 )
@@ -336,7 +336,7 @@ __meta__ = {
 position = Vector2( 406, 0 )
 script = ExtResource( 7 )
 global_id = "trigger_left"
-esc_script = "res://game/rooms/room7/esc/trigger_left.esc"
+esc_script = "res://game/rooms/room07/esc/trigger_left.esc"
 is_trigger = true
 is_interactive = false
 player_orients_on_arrival = false
@@ -365,7 +365,7 @@ width = 2.0
 position = Vector2( 220, 0 )
 script = ExtResource( 7 )
 global_id = "trigger_right"
-esc_script = "res://game/rooms/room7/esc/trigger_right.esc"
+esc_script = "res://game/rooms/room07/esc/trigger_right.esc"
 is_trigger = true
 is_interactive = false
 player_orients_on_arrival = false

game/rooms/room08/esc/button_puzzle.esc

@@ -3,8 +3,8 @@ say player "That must be the command to open the door."
 
 :use
 > [!r8_m_door_open]
-	#superpose_scene "res://game/rooms/room8/puzzle/10_buttons_puzzle.tscn"
+	#superpose_scene "res://game/rooms/room08/puzzle/10_buttons_puzzle.tscn"
-	spawn "res://game/rooms/room8/puzzle/10_buttons_puzzle.tscn"
+	spawn "res://game/rooms/room08/puzzle/10_buttons_puzzle.tscn"
 	
 > [r8_m_door_open]
 	say player "The door is already open."

game/rooms/room08/esc/left_exit.esc

@@ -0,0 +1,2 @@
+:exit_scene
+change_scene "res://game/rooms/room07/room07.tscn"

game/rooms/room08/esc/middle_exit.esc

@@ -0,0 +1,2 @@
+:exit_scene
+change_scene "res://game/rooms/room09/room09.tscn"

game/rooms/room08/esc/room08.esc

@@ -3,6 +3,9 @@
 
 :setup
 
+> [r8_m_door_open]
+	set_state r8_m_door door_open true
+
 > [eq ESC_LAST_SCENE room7]
 	teleport player r8_l_exit
 	# Set player look right
@@ -18,5 +21,6 @@
 	stop
 
 
+
 :ready
 

game/rooms/room08/puzzle/10_buttons_puzzle.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=1]
-[ext_resource path="res://game/rooms/room8/puzzle/10_buttons_puzzle.gd" type="Script" id=2]
+[ext_resource path="res://game/rooms/room08/puzzle/10_buttons_puzzle.gd" type="Script" id=2]
 [ext_resource path="res://addons/escoria-core/game/assets/fonts/efmi/efmi.TTF" type="DynamicFontData" id=3]
 
 [sub_resource type="DynamicFont" id=1]

game/rooms/room08/room08.tscn

@@ -75,7 +75,7 @@ __meta__ = {
 "_edit_vertical_guides_": [  ]
 }
 global_id = "room8"
-esc_script = "res://game/rooms/room8/esc/room8.esc"
+esc_script = "res://game/rooms/room08/esc/room08.esc"
 player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 0, 1289, 555 ) ]
 
@@ -131,13 +131,10 @@ __meta__ = {
 "_editor_description_": ""
 }
 global_id = "r8_l_exit"
-esc_script = "res://game/rooms/room8/esc/left_exit.esc"
+esc_script = "res://game/rooms/room08/esc/left_exit.esc"
 is_exit = true
 tooltip_name = "Exit"
 dialog_color = Color( 1, 1, 1, 1 )
-interact_positions = {
-"default": Vector2( 45.47, 383.99 )
-}
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/l_door"]
 polygon = PoolVector2Array( 2.93237, 447.051, 2.93237, 127.051, 88.9324, 71.0505, 90.9324, 379.051 )
@@ -151,12 +148,9 @@ __meta__ = {
 "_editor_description_": ""
 }
 global_id = "r8_m_door"
-esc_script = "res://game/rooms/room8/esc/middle_exit.esc"
+esc_script = "res://game/rooms/room08/esc/middle_exit.esc"
 tooltip_name = "Exit"
 dialog_color = Color( 1, 1, 1, 1 )
-interact_positions = {
-"default": Vector2( 653.466, 366.589 )
-}
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/m_door"]
 visible = false
@@ -176,13 +170,10 @@ anims/door_open = SubResource( 3 )
 [node name="r8_mini_puzzle_button" type="Area2D" parent="Hotspots"]
 script = ExtResource( 5 )
 global_id = "r8_button_puzzle"
-esc_script = "res://game/rooms/room8/esc/button_puzzle.esc"
+esc_script = "res://game/rooms/room08/esc/button_puzzle.esc"
 tooltip_name = "Button"
 default_action = "use"
 dialog_color = Color( 1, 1, 1, 1 )
-interact_positions = {
-"default": Vector2( 474.801, 369.29 )
-}
 
 [node name="button" type="Line2D" parent="Hotspots/r8_mini_puzzle_button"]
 position = Vector2( -588.313, 5.65686 )
@@ -211,13 +202,10 @@ __meta__ = {
 position = Vector2( -139.185, 0 )
 script = ExtResource( 5 )
 global_id = "r8_button_reset_puzzle"
-esc_script = "res://game/rooms/room8/esc/button_reset_puzzle.esc"
+esc_script = "res://game/rooms/room08/esc/button_reset_puzzle.esc"
 tooltip_name = "Button"
 default_action = "use"
 dialog_color = Color( 1, 1, 1, 1 )
-interact_positions = {
-"default": Vector2( 335.616, 369.29 )
-}
 
 [node name="button" type="Line2D" parent="Hotspots/r8_reset_puzzle_button"]
 position = Vector2( -588.313, 5.65686 )

game/rooms/room09/esc/left_exit.esc

@@ -0,0 +1,2 @@
+:exit_scene
+change_scene "res://game/rooms/room08/room08.tscn"

game/rooms/room09/room09.tscn

@@ -1,14 +1,14 @@
 [gd_scene load_steps=14 format=2]
 
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
-[ext_resource path="res://game/rooms/room9/background.tscn" type="PackedScene" id=2]
+[ext_resource path="res://game/rooms/room09/background.tscn" type="PackedScene" id=2]
 [ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
 [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
-[ext_resource path="res://game/rooms/room9/closet/magical_closet.tscn" type="PackedScene" id=5]
+[ext_resource path="res://game/rooms/room09/closet/magical_closet.tscn" type="PackedScene" id=5]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=7]
-[ext_resource path="res://game/rooms/room2/button/button.tscn" type="PackedScene" id=8]
+[ext_resource path="res://game/rooms/room02/button/button.tscn" type="PackedScene" id=8]
-[ext_resource path="res://game/rooms/room9/r_door.tscn" type="PackedScene" id=9]
+[ext_resource path="res://game/rooms/room09/r_door.tscn" type="PackedScene" id=9]
 [ext_resource path="res://game/items/textures/genericItem_color_127.png" type="Texture" id=10]
 [ext_resource path="res://game/items/escitems/r9_bottle.tscn" type="PackedScene" id=11]
 
@@ -38,7 +38,7 @@ __meta__ = {
 "_edit_vertical_guides_": [  ]
 }
 global_id = "room9"
-esc_script = "res://game/rooms/room9/esc/room9.esc"
+esc_script = "res://game/rooms/room09/esc/room09.esc"
 player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 0, 1289, 555 ) ]
 
@@ -68,7 +68,7 @@ __meta__ = {
 [node name="l_door" type="Area2D" parent="Hotspots"]
 script = ExtResource( 7 )
 global_id = "r9_l_exit"
-esc_script = "res://game/rooms/room9/esc/left_exit.esc"
+esc_script = "res://game/rooms/room09/esc/left_exit.esc"
 is_exit = true
 tooltip_name = "Left exit"
 default_action = "walk"
@@ -82,7 +82,7 @@ position = Vector2( 37.4521, 392.045 )
 
 [node name="r_door" parent="Hotspots" instance=ExtResource( 9 )]
 global_id = "r9_r_exit"
-esc_script = "res://game/rooms/room9/esc/right_exit.esc"
+esc_script = "res://game/rooms/room09/esc/right_exit.esc"
 
 [node name="Position2D" type="Position2D" parent="Hotspots/r_door"]
 position = Vector2( 1198.65, 391.058 )
@@ -90,7 +90,7 @@ position = Vector2( 1198.65, 391.058 )
 [node name="r9_closet_left" parent="Hotspots" instance=ExtResource( 5 )]
 position = Vector2( 435.233, 64.1518 )
 global_id = "r9_closet_left"
-esc_script = "res://game/rooms/room9/esc/closet_left.esc"
+esc_script = "res://game/rooms/room09/esc/closet_left.esc"
 tooltip_name = "Left closet"
 
 [node name="Position2D" type="Position2D" parent="Hotspots/r9_closet_left"]
@@ -109,7 +109,7 @@ position = Vector2( -26.727, 543.448 )
 [node name="r9_closet_middle" parent="Hotspots" instance=ExtResource( 5 )]
 position = Vector2( 572.963, 65.2113 )
 global_id = "r9_closet_middle"
-esc_script = "res://game/rooms/room9/esc/closet_middle.esc"
+esc_script = "res://game/rooms/room09/esc/closet_middle.esc"
 tooltip_name = "Middle closet"
 
 [node name="Position2D" type="Position2D" parent="Hotspots/r9_closet_middle"]
@@ -128,7 +128,7 @@ position = Vector2( -26.727, 543.448 )
 [node name="r9_closet_right" parent="Hotspots" instance=ExtResource( 5 )]
 position = Vector2( 710.693, 66.2707 )
 global_id = "r9_closet_right"
-esc_script = "res://game/rooms/room9/esc/closet_right.esc"
+esc_script = "res://game/rooms/room09/esc/closet_right.esc"
 tooltip_name = "Right closet"
 
 [node name="Position2D" type="Position2D" parent="Hotspots/r9_closet_right"]
@@ -147,7 +147,7 @@ position = Vector2( -26.727, 543.448 )
 [node name="button" parent="Hotspots" instance=ExtResource( 8 )]
 position = Vector2( 240.688, 160.459 )
 global_id = "r9_button_reset"
-esc_script = "res://game/rooms/room9/esc/button_reset.esc"
+esc_script = "res://game/rooms/room09/esc/button_reset.esc"
 
 [node name="Position2D" type="Position2D" parent="Hotspots/button"]
 position = Vector2( 30.204, 209.54 )
@@ -167,7 +167,7 @@ __meta__ = {
 position = Vector2( -125.617, 0.8909 )
 script = ExtResource( 7 )
 global_id = "r9_stand"
-esc_script = "res://game/rooms/room9/esc/stand.esc"
+esc_script = "res://game/rooms/room09/esc/stand.esc"
 interaction_direction = 2
 tooltip_name = "Stand"
 default_action = "look"