diff --git a/addons/escoria-core/game/core-scripts/esc/esc_object_manager.gd b/addons/escoria-core/game/core-scripts/esc/esc_object_manager.gd index ea11dc21..538033c8 100644 --- a/addons/escoria-core/game/core-scripts/esc/esc_object_manager.gd +++ b/addons/escoria-core/game/core-scripts/esc/esc_object_manager.gd @@ -56,7 +56,7 @@ func register_object(object: ESCObject, force: bool = false) -> void: object.node.esc_script ) object.events = script.events - + objects[object.global_id] = object @@ -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) diff --git a/game/characters/worker/worker.tscn b/game/characters/worker/worker.tscn index 0619b7dc..44334023 100644 --- a/game/characters/worker/worker.tscn +++ b/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 ) diff --git a/game/items/escitems/button.tscn b/game/items/escitems/button.tscn index 67afb1fb..c04c3ef4 100644 --- a/game/items/escitems/button.tscn +++ b/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 ) diff --git a/game/items/escitems/r5_empty_sheet.tscn b/game/items/escitems/r5_empty_sheet.tscn index 81128810..9308e8bc 100644 --- a/game/items/escitems/r5_empty_sheet.tscn +++ b/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 ) diff --git a/game/items/escitems/r5_pen.tscn b/game/items/escitems/r5_pen.tscn index 509cda52..26241fe7 100644 --- a/game/items/escitems/r5_pen.tscn +++ b/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] diff --git a/game/items/escitems/r5_wrench.tscn b/game/items/escitems/r5_wrench.tscn index a6d01a1e..fe42232a 100644 --- a/game/items/escitems/r5_wrench.tscn +++ b/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 ) diff --git a/game/items/inventory/filled_sheet.tscn b/game/items/inventory/filled_sheet.tscn index f29be970..f594e9dd 100644 --- a/game/items/inventory/filled_sheet.tscn +++ b/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 diff --git a/game/rooms/room1/background.tscn b/game/rooms/room01/background.tscn similarity index 100% rename from game/rooms/room1/background.tscn rename to game/rooms/room01/background.tscn diff --git a/game/rooms/room01/esc/right_exit.esc b/game/rooms/room01/esc/right_exit.esc new file mode 100755 index 00000000..348f08bd --- /dev/null +++ b/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" diff --git a/game/rooms/room1/esc/right_platform.esc b/game/rooms/room01/esc/right_platform.esc similarity index 100% rename from game/rooms/room1/esc/right_platform.esc rename to game/rooms/room01/esc/right_platform.esc diff --git a/game/rooms/room1/esc/room1.esc b/game/rooms/room01/esc/room01.esc similarity index 100% rename from game/rooms/room1/esc/room1.esc rename to game/rooms/room01/esc/room01.esc diff --git a/game/rooms/room1/esc/wall_item.esc b/game/rooms/room01/esc/wall_item.esc similarity index 100% rename from game/rooms/room1/esc/wall_item.esc rename to game/rooms/room01/esc/wall_item.esc diff --git a/game/rooms/room1/esc/wall_item_popupdialog.esc b/game/rooms/room01/esc/wall_item_popupdialog.esc similarity index 100% rename from game/rooms/room1/esc/wall_item_popupdialog.esc rename to game/rooms/room01/esc/wall_item_popupdialog.esc diff --git a/game/rooms/room1/room1.tscn b/game/rooms/room01/room01.tscn similarity index 90% rename from game/rooms/room1/room1.tscn rename to game/rooms/room01/room01.tscn index fe6cd124..06437eb7 100644 --- a/game/rooms/room1/room1.tscn +++ b/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/room1/background.tscn" type="PackedScene" id=2] +[ext_resource path="res://game/rooms/room01/walkable_area.tscn" type="PackedScene" id=1] +[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 ) diff --git a/game/rooms/room1/walkable_area.tscn b/game/rooms/room01/walkable_area.tscn similarity index 100% rename from game/rooms/room1/walkable_area.tscn rename to game/rooms/room01/walkable_area.tscn diff --git a/game/rooms/room2/background.tscn b/game/rooms/room02/background.tscn similarity index 93% rename from game/rooms/room2/background.tscn rename to game/rooms/room02/background.tscn index ff9042f6..4376999d 100644 --- a/game/rooms/room2/background.tscn +++ b/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 diff --git a/game/rooms/room2/bridge.tscn b/game/rooms/room02/bridge.tscn similarity index 100% rename from game/rooms/room2/bridge.tscn rename to game/rooms/room02/bridge.tscn diff --git a/game/rooms/room2/button/button.tscn b/game/rooms/room02/button/button.tscn similarity index 100% rename from game/rooms/room2/button/button.tscn rename to game/rooms/room02/button/button.tscn diff --git a/game/rooms/room2/esc/button.esc b/game/rooms/room02/esc/button.esc similarity index 100% rename from game/rooms/room2/esc/button.esc rename to game/rooms/room02/esc/button.esc diff --git a/game/rooms/room02/esc/left_exit.esc b/game/rooms/room02/esc/left_exit.esc new file mode 100755 index 00000000..c624a5f2 --- /dev/null +++ b/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" diff --git a/game/rooms/room02/esc/right_exit.esc b/game/rooms/room02/esc/right_exit.esc new file mode 100755 index 00000000..8c80d364 --- /dev/null +++ b/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" diff --git a/game/rooms/room2/esc/right_platform.esc b/game/rooms/room02/esc/right_platform.esc similarity index 100% rename from game/rooms/room2/esc/right_platform.esc rename to game/rooms/room02/esc/right_platform.esc diff --git a/game/rooms/room2/esc/room2_bridge.esc b/game/rooms/room02/esc/room02_bridge.esc similarity index 100% rename from game/rooms/room2/esc/room2_bridge.esc rename to game/rooms/room02/esc/room02_bridge.esc diff --git a/game/rooms/room2/room2.tscn b/game/rooms/room02/room02.tscn similarity index 84% rename from game/rooms/room2/room2.tscn rename to game/rooms/room02/room02.tscn index 8da596fa..9dac7bcc 100644 --- a/game/rooms/room2/room2.tscn +++ b/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/room2/background.tscn" type="PackedScene" id=2] +[ext_resource path="res://game/rooms/room02/walkable_area.tscn" type="PackedScene" id=1] +[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"] diff --git a/game/rooms/room2/walkable_area.tscn b/game/rooms/room02/walkable_area.tscn similarity index 100% rename from game/rooms/room2/walkable_area.tscn rename to game/rooms/room02/walkable_area.tscn diff --git a/game/rooms/room3/background.tscn b/game/rooms/room03/background.tscn similarity index 93% rename from game/rooms/room3/background.tscn rename to game/rooms/room03/background.tscn index f317b3a1..e1cbdb3a 100644 --- a/game/rooms/room3/background.tscn +++ b/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 diff --git a/game/rooms/room3/esc/button.esc b/game/rooms/room03/esc/button.esc similarity index 100% rename from game/rooms/room3/esc/button.esc rename to game/rooms/room03/esc/button.esc diff --git a/game/rooms/room03/esc/left_exit.esc b/game/rooms/room03/esc/left_exit.esc new file mode 100644 index 00000000..f5155e9a --- /dev/null +++ b/game/rooms/room03/esc/left_exit.esc @@ -0,0 +1,2 @@ +:exit_scene +change_scene "res://game/rooms/room02/room02.tscn" diff --git a/game/rooms/room03/esc/right_exit.esc b/game/rooms/room03/esc/right_exit.esc new file mode 100755 index 00000000..cfaa1ffd --- /dev/null +++ b/game/rooms/room03/esc/right_exit.esc @@ -0,0 +1,2 @@ +:exit_scene +change_scene "res://game/rooms/room04/room04.tscn" diff --git a/game/rooms/room3/esc/right_platform.esc b/game/rooms/room03/esc/right_platform.esc similarity index 100% rename from game/rooms/room3/esc/right_platform.esc rename to game/rooms/room03/esc/right_platform.esc diff --git a/game/rooms/room3/esc/room3_bridge.esc b/game/rooms/room03/esc/room03_bridge.esc similarity index 100% rename from game/rooms/room3/esc/room3_bridge.esc rename to game/rooms/room03/esc/room03_bridge.esc diff --git a/game/rooms/room3/room3.tscn b/game/rooms/room03/room03.tscn similarity index 87% rename from game/rooms/room3/room3.tscn rename to game/rooms/room03/room03.tscn index 7f925ab0..1bcdfbb1 100644 --- a/game/rooms/room3/room3.tscn +++ b/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/room3/background.tscn" type="PackedScene" id=2] +[ext_resource path="res://game/rooms/room03/walkable_area.tscn" type="PackedScene" id=1] +[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 ) diff --git a/game/rooms/room3/smoke.png b/game/rooms/room03/smoke.png similarity index 100% rename from game/rooms/room3/smoke.png rename to game/rooms/room03/smoke.png diff --git a/game/rooms/room3/walkable_area.tscn b/game/rooms/room03/walkable_area.tscn similarity index 100% rename from game/rooms/room3/walkable_area.tscn rename to game/rooms/room03/walkable_area.tscn diff --git a/game/rooms/room4/assets/background.png b/game/rooms/room04/assets/background.png similarity index 100% rename from game/rooms/room4/assets/background.png rename to game/rooms/room04/assets/background.png diff --git a/game/rooms/room4/assets/background_and_depth.xcf b/game/rooms/room04/assets/background_and_depth.xcf similarity index 100% rename from game/rooms/room4/assets/background_and_depth.xcf rename to game/rooms/room04/assets/background_and_depth.xcf diff --git a/game/rooms/room4/assets/background_reduced.png b/game/rooms/room04/assets/background_reduced.png similarity index 100% rename from game/rooms/room4/assets/background_reduced.png rename to game/rooms/room04/assets/background_reduced.png diff --git a/game/rooms/room4/assets/depth.png b/game/rooms/room04/assets/depth.png similarity index 100% rename from game/rooms/room4/assets/depth.png rename to game/rooms/room04/assets/depth.png diff --git a/game/rooms/room4/assets/depth_reduced.png b/game/rooms/room04/assets/depth_reduced.png similarity index 100% rename from game/rooms/room4/assets/depth_reduced.png rename to game/rooms/room04/assets/depth_reduced.png diff --git a/game/rooms/room04/esc/left_exit.esc b/game/rooms/room04/esc/left_exit.esc new file mode 100755 index 00000000..0f38d1c7 --- /dev/null +++ b/game/rooms/room04/esc/left_exit.esc @@ -0,0 +1,2 @@ +:exit_scene +change_scene "res://game/rooms/room03/room03.tscn" diff --git a/game/rooms/room04/esc/right_exit.esc b/game/rooms/room04/esc/right_exit.esc new file mode 100755 index 00000000..6d1c7ef8 --- /dev/null +++ b/game/rooms/room04/esc/right_exit.esc @@ -0,0 +1,2 @@ +:exit_scene +change_scene "res://game/rooms/room05/room05.tscn" diff --git a/game/rooms/room4/esc/right_platform.esc b/game/rooms/room04/esc/right_platform.esc similarity index 100% rename from game/rooms/room4/esc/right_platform.esc rename to game/rooms/room04/esc/right_platform.esc diff --git a/game/rooms/room4/esc/room4.esc b/game/rooms/room04/esc/room04.esc similarity index 100% rename from game/rooms/room4/esc/room4.esc rename to game/rooms/room04/esc/room04.esc diff --git a/game/rooms/room4/room4.tscn b/game/rooms/room04/room04.tscn similarity index 92% rename from game/rooms/room4/room4.tscn rename to game/rooms/room04/room04.tscn index 1e30b484..3b6c1a61 100644 --- a/game/rooms/room4/room4.tscn +++ b/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/room4/assets/depth_reduced.png" type="Texture" id=8] +[ext_resource path="res://game/rooms/room04/assets/background.png" type="Texture" id=7] +[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 ) diff --git a/game/rooms/room5/background.tscn b/game/rooms/room05/background.tscn similarity index 100% rename from game/rooms/room5/background.tscn rename to game/rooms/room05/background.tscn diff --git a/game/rooms/room05/esc/left_exit.esc b/game/rooms/room05/esc/left_exit.esc new file mode 100755 index 00000000..cfaa1ffd --- /dev/null +++ b/game/rooms/room05/esc/left_exit.esc @@ -0,0 +1,2 @@ +:exit_scene +change_scene "res://game/rooms/room04/room04.tscn" diff --git a/game/rooms/room05/esc/right_exit.esc b/game/rooms/room05/esc/right_exit.esc new file mode 100755 index 00000000..9967c77b --- /dev/null +++ b/game/rooms/room05/esc/right_exit.esc @@ -0,0 +1,2 @@ +:exit_scene +change_scene "res://game/rooms/room06/room06.tscn" diff --git a/game/rooms/room5/esc/room5.esc b/game/rooms/room05/esc/room05.esc similarity index 91% rename from game/rooms/room5/esc/room5.esc rename to game/rooms/room05/esc/room05.esc index b0ac1f28..ac16d1d0 100755 --- a/game/rooms/room5/esc/room5.esc +++ b/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 diff --git a/game/rooms/room5/esc/wall_item.esc b/game/rooms/room05/esc/wall_item.esc similarity index 100% rename from game/rooms/room5/esc/wall_item.esc rename to game/rooms/room05/esc/wall_item.esc diff --git a/game/rooms/room5/item_wall/item_wall.tscn b/game/rooms/room05/item_wall/item_wall.tscn similarity index 100% rename from game/rooms/room5/item_wall/item_wall.tscn rename to game/rooms/room05/item_wall/item_wall.tscn diff --git a/game/rooms/room5/items/empty_sheet.png b/game/rooms/room05/items/empty_sheet.png similarity index 100% rename from game/rooms/room5/items/empty_sheet.png rename to game/rooms/room05/items/empty_sheet.png diff --git a/game/rooms/room5/items/filled_sheet.png b/game/rooms/room05/items/filled_sheet.png similarity index 100% rename from game/rooms/room5/items/filled_sheet.png rename to game/rooms/room05/items/filled_sheet.png diff --git a/game/rooms/room5/items/pen.png b/game/rooms/room05/items/pen.png similarity index 100% rename from game/rooms/room5/items/pen.png rename to game/rooms/room05/items/pen.png diff --git a/game/rooms/room5/items/wrench.png b/game/rooms/room05/items/wrench.png similarity index 100% rename from game/rooms/room5/items/wrench.png rename to game/rooms/room05/items/wrench.png diff --git a/game/rooms/room5/room5.tscn b/game/rooms/room05/room05.tscn similarity index 92% rename from game/rooms/room5/room5.tscn rename to game/rooms/room05/room05.tscn index f3de5fea..cdd33d13 100644 --- a/game/rooms/room5/room5.tscn +++ b/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" diff --git a/game/rooms/room5/walkable_area.tscn b/game/rooms/room05/walkable_area.tscn similarity index 100% rename from game/rooms/room5/walkable_area.tscn rename to game/rooms/room05/walkable_area.tscn diff --git a/game/rooms/room6/background.tscn b/game/rooms/room06/background.tscn similarity index 100% rename from game/rooms/room6/background.tscn rename to game/rooms/room06/background.tscn diff --git a/game/rooms/room06/esc/left_exit.esc b/game/rooms/room06/esc/left_exit.esc new file mode 100755 index 00000000..6d1c7ef8 --- /dev/null +++ b/game/rooms/room06/esc/left_exit.esc @@ -0,0 +1,2 @@ +:exit_scene +change_scene "res://game/rooms/room05/room05.tscn" diff --git a/game/rooms/room6/esc/r6_door.esc b/game/rooms/room06/esc/r6_door.esc similarity index 87% rename from game/rooms/room6/esc/r6_door.esc rename to game/rooms/room06/esc/r6_door.esc index e80a1a57..3e6820cd 100755 --- a/game/rooms/room6/esc/r6_door.esc +++ b/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 diff --git a/game/rooms/room6/esc/room6.esc b/game/rooms/room06/esc/room06.esc similarity index 100% rename from game/rooms/room6/esc/room6.esc rename to game/rooms/room06/esc/room06.esc diff --git a/game/rooms/room6/esc/worker.esc b/game/rooms/room06/esc/worker.esc similarity index 100% rename from game/rooms/room6/esc/worker.esc rename to game/rooms/room06/esc/worker.esc diff --git a/game/rooms/room6/l_exit.tscn b/game/rooms/room06/l_exit.tscn similarity index 100% rename from game/rooms/room6/l_exit.tscn rename to game/rooms/room06/l_exit.tscn diff --git a/game/rooms/room6/r_door.tscn b/game/rooms/room06/r_door.tscn similarity index 100% rename from game/rooms/room6/r_door.tscn rename to game/rooms/room06/r_door.tscn diff --git a/game/rooms/room6/room6.tscn b/game/rooms/room06/room06.tscn similarity index 86% rename from game/rooms/room6/room6.tscn rename to game/rooms/room06/room06.tscn index d6381aa0..c862edfe 100644 --- a/game/rooms/room6/room6.tscn +++ b/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/room6/l_exit.tscn" type="PackedScene" id=3] +[ext_resource path="res://game/rooms/room06/background.tscn" type="PackedScene" id=2] +[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"] diff --git a/game/rooms/room6/walkable_area.tscn b/game/rooms/room06/walkable_area.tscn similarity index 100% rename from game/rooms/room6/walkable_area.tscn rename to game/rooms/room06/walkable_area.tscn diff --git a/game/rooms/room7/background.tscn b/game/rooms/room07/background.tscn similarity index 100% rename from game/rooms/room7/background.tscn rename to game/rooms/room07/background.tscn diff --git a/game/rooms/room7/esc/button_follow.esc b/game/rooms/room07/esc/button_follow.esc similarity index 100% rename from game/rooms/room7/esc/button_follow.esc rename to game/rooms/room07/esc/button_follow.esc diff --git a/game/rooms/room7/esc/button_push.esc b/game/rooms/room07/esc/button_push.esc similarity index 100% rename from game/rooms/room7/esc/button_push.esc rename to game/rooms/room07/esc/button_push.esc diff --git a/game/rooms/room7/esc/button_set_pos.esc b/game/rooms/room07/esc/button_set_pos.esc similarity index 100% rename from game/rooms/room7/esc/button_set_pos.esc rename to game/rooms/room07/esc/button_set_pos.esc diff --git a/game/rooms/room7/esc/button_shift.esc b/game/rooms/room07/esc/button_shift.esc similarity index 100% rename from game/rooms/room7/esc/button_shift.esc rename to game/rooms/room07/esc/button_shift.esc diff --git a/game/rooms/room7/esc/button_zoom.esc b/game/rooms/room07/esc/button_zoom.esc similarity index 100% rename from game/rooms/room7/esc/button_zoom.esc rename to game/rooms/room07/esc/button_zoom.esc diff --git a/game/rooms/room07/esc/left_exit.esc b/game/rooms/room07/esc/left_exit.esc new file mode 100755 index 00000000..9967c77b --- /dev/null +++ b/game/rooms/room07/esc/left_exit.esc @@ -0,0 +1,2 @@ +:exit_scene +change_scene "res://game/rooms/room06/room06.tscn" diff --git a/game/rooms/room7/esc/lower_stairs.esc b/game/rooms/room07/esc/lower_stairs.esc similarity index 100% rename from game/rooms/room7/esc/lower_stairs.esc rename to game/rooms/room07/esc/lower_stairs.esc diff --git a/game/rooms/room07/esc/right_exit.esc b/game/rooms/room07/esc/right_exit.esc new file mode 100755 index 00000000..4d20af63 --- /dev/null +++ b/game/rooms/room07/esc/right_exit.esc @@ -0,0 +1,2 @@ +:exit_scene +change_scene "res://game/rooms/room08/room08.tscn" diff --git a/game/rooms/room7/esc/room7.esc b/game/rooms/room07/esc/room07.esc similarity index 100% rename from game/rooms/room7/esc/room7.esc rename to game/rooms/room07/esc/room07.esc diff --git a/game/rooms/room7/esc/trigger_left.esc b/game/rooms/room07/esc/trigger_left.esc similarity index 100% rename from game/rooms/room7/esc/trigger_left.esc rename to game/rooms/room07/esc/trigger_left.esc diff --git a/game/rooms/room7/esc/trigger_right.esc b/game/rooms/room07/esc/trigger_right.esc similarity index 100% rename from game/rooms/room7/esc/trigger_right.esc rename to game/rooms/room07/esc/trigger_right.esc diff --git a/game/rooms/room7/esc/upper_stairs.esc b/game/rooms/room07/esc/upper_stairs.esc similarity index 100% rename from game/rooms/room7/esc/upper_stairs.esc rename to game/rooms/room07/esc/upper_stairs.esc diff --git a/game/rooms/room7/room7.tscn b/game/rooms/room07/room07.tscn similarity index 94% rename from game/rooms/room7/room7.tscn rename to game/rooms/room07/room07.tscn index 3a3f3a4b..1ea91422 100644 --- a/game/rooms/room7/room7.tscn +++ b/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 diff --git a/game/rooms/room7/walkable_area.tscn b/game/rooms/room07/walkable_area.tscn similarity index 100% rename from game/rooms/room7/walkable_area.tscn rename to game/rooms/room07/walkable_area.tscn diff --git a/game/rooms/room8/esc/button_puzzle.esc b/game/rooms/room08/esc/button_puzzle.esc similarity index 52% rename from game/rooms/room8/esc/button_puzzle.esc rename to game/rooms/room08/esc/button_puzzle.esc index eb0426b0..0f184123 100755 --- a/game/rooms/room8/esc/button_puzzle.esc +++ b/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" - spawn "res://game/rooms/room8/puzzle/10_buttons_puzzle.tscn" + #superpose_scene "res://game/rooms/room08/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." diff --git a/game/rooms/room8/esc/button_reset_puzzle.esc b/game/rooms/room08/esc/button_reset_puzzle.esc similarity index 100% rename from game/rooms/room8/esc/button_reset_puzzle.esc rename to game/rooms/room08/esc/button_reset_puzzle.esc diff --git a/game/rooms/room08/esc/left_exit.esc b/game/rooms/room08/esc/left_exit.esc new file mode 100755 index 00000000..37b49fae --- /dev/null +++ b/game/rooms/room08/esc/left_exit.esc @@ -0,0 +1,2 @@ +:exit_scene +change_scene "res://game/rooms/room07/room07.tscn" diff --git a/game/rooms/room08/esc/middle_exit.esc b/game/rooms/room08/esc/middle_exit.esc new file mode 100755 index 00000000..0ada7862 --- /dev/null +++ b/game/rooms/room08/esc/middle_exit.esc @@ -0,0 +1,2 @@ +:exit_scene +change_scene "res://game/rooms/room09/room09.tscn" diff --git a/game/rooms/room8/esc/room8.esc b/game/rooms/room08/esc/room08.esc similarity index 87% rename from game/rooms/room8/esc/room8.esc rename to game/rooms/room08/esc/room08.esc index 8e21e67a..cac39560 100755 --- a/game/rooms/room8/esc/room8.esc +++ b/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 diff --git a/game/rooms/room8/puzzle/10_buttons_puzzle.gd b/game/rooms/room08/puzzle/10_buttons_puzzle.gd similarity index 100% rename from game/rooms/room8/puzzle/10_buttons_puzzle.gd rename to game/rooms/room08/puzzle/10_buttons_puzzle.gd diff --git a/game/rooms/room8/puzzle/10_buttons_puzzle.tscn b/game/rooms/room08/puzzle/10_buttons_puzzle.tscn similarity index 97% rename from game/rooms/room8/puzzle/10_buttons_puzzle.tscn rename to game/rooms/room08/puzzle/10_buttons_puzzle.tscn index 1584f734..58aaa228 100644 --- a/game/rooms/room8/puzzle/10_buttons_puzzle.tscn +++ b/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] diff --git a/game/rooms/room8/room8.tscn b/game/rooms/room08/room08.tscn similarity index 93% rename from game/rooms/room8/room8.tscn rename to game/rooms/room08/room08.tscn index 9e530e47..3f7b5a66 100644 --- a/game/rooms/room8/room8.tscn +++ b/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 ) diff --git a/game/rooms/room9/background.tscn b/game/rooms/room09/background.tscn similarity index 100% rename from game/rooms/room9/background.tscn rename to game/rooms/room09/background.tscn diff --git a/game/rooms/room9/closet/magical_closet.tscn b/game/rooms/room09/closet/magical_closet.tscn similarity index 100% rename from game/rooms/room9/closet/magical_closet.tscn rename to game/rooms/room09/closet/magical_closet.tscn diff --git a/game/rooms/room9/esc/button_reset.esc b/game/rooms/room09/esc/button_reset.esc similarity index 100% rename from game/rooms/room9/esc/button_reset.esc rename to game/rooms/room09/esc/button_reset.esc diff --git a/game/rooms/room9/esc/closet_left.esc b/game/rooms/room09/esc/closet_left.esc similarity index 100% rename from game/rooms/room9/esc/closet_left.esc rename to game/rooms/room09/esc/closet_left.esc diff --git a/game/rooms/room9/esc/closet_middle.esc b/game/rooms/room09/esc/closet_middle.esc similarity index 100% rename from game/rooms/room9/esc/closet_middle.esc rename to game/rooms/room09/esc/closet_middle.esc diff --git a/game/rooms/room9/esc/closet_right.esc b/game/rooms/room09/esc/closet_right.esc similarity index 100% rename from game/rooms/room9/esc/closet_right.esc rename to game/rooms/room09/esc/closet_right.esc diff --git a/game/rooms/room09/esc/left_exit.esc b/game/rooms/room09/esc/left_exit.esc new file mode 100755 index 00000000..4d20af63 --- /dev/null +++ b/game/rooms/room09/esc/left_exit.esc @@ -0,0 +1,2 @@ +:exit_scene +change_scene "res://game/rooms/room08/room08.tscn" diff --git a/game/rooms/room9/esc/right_exit.esc b/game/rooms/room09/esc/right_exit.esc similarity index 100% rename from game/rooms/room9/esc/right_exit.esc rename to game/rooms/room09/esc/right_exit.esc diff --git a/game/rooms/room9/esc/room9.esc b/game/rooms/room09/esc/room09.esc similarity index 100% rename from game/rooms/room9/esc/room9.esc rename to game/rooms/room09/esc/room09.esc diff --git a/game/rooms/room9/esc/stand.esc b/game/rooms/room09/esc/stand.esc similarity index 100% rename from game/rooms/room9/esc/stand.esc rename to game/rooms/room09/esc/stand.esc diff --git a/game/rooms/room9/r_door.tscn b/game/rooms/room09/r_door.tscn similarity index 100% rename from game/rooms/room9/r_door.tscn rename to game/rooms/room09/r_door.tscn diff --git a/game/rooms/room9/room9.tscn b/game/rooms/room09/room09.tscn similarity index 89% rename from game/rooms/room9/room9.tscn rename to game/rooms/room09/room09.tscn index 7592993f..9e60aa63 100644 --- a/game/rooms/room9/room9.tscn +++ b/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/room9/r_door.tscn" type="PackedScene" id=9] +[ext_resource path="res://game/rooms/room02/button/button.tscn" type="PackedScene" id=8] +[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" diff --git a/game/rooms/room9/walkable_area.tscn b/game/rooms/room09/walkable_area.tscn similarity index 100% rename from game/rooms/room9/walkable_area.tscn rename to game/rooms/room09/walkable_area.tscn diff --git a/game/rooms/room1/esc/right_exit.esc b/game/rooms/room1/esc/right_exit.esc deleted file mode 100755 index 0d700099..00000000 --- a/game/rooms/room1/esc/right_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room2/room2.tscn" diff --git a/game/rooms/room10/esc/left_exit.esc b/game/rooms/room10/esc/left_exit.esc index 7e5443d5..29eea379 100755 --- a/game/rooms/room10/esc/left_exit.esc +++ b/game/rooms/room10/esc/left_exit.esc @@ -1,5 +1,5 @@ :exit_scene set_sound_state bg_sound res://game/sfx/sounds/doorOpen_2.ogg false -change_scene "res://game/rooms/room9/room9.tscn" +change_scene "res://game/rooms/room09/room09.tscn" diff --git a/game/rooms/room10/room10.tscn b/game/rooms/room10/room10.tscn index 42b1186b..4a7b3e8b 100644 --- a/game/rooms/room10/room10.tscn +++ b/game/rooms/room10/room10.tscn @@ -6,7 +6,7 @@ [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4] [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/room10/r_door.tscn" type="PackedScene" id=9] [sub_resource type="NavigationPolygon" id=1] diff --git a/game/rooms/room2/esc/left_exit.esc b/game/rooms/room2/esc/left_exit.esc deleted file mode 100755 index bb56fe6b..00000000 --- a/game/rooms/room2/esc/left_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room1/room1.tscn" diff --git a/game/rooms/room2/esc/right_exit.esc b/game/rooms/room2/esc/right_exit.esc deleted file mode 100755 index 540af404..00000000 --- a/game/rooms/room2/esc/right_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room3/room3.tscn" diff --git a/game/rooms/room3/esc/left_exit.esc b/game/rooms/room3/esc/left_exit.esc deleted file mode 100644 index 0d700099..00000000 --- a/game/rooms/room3/esc/left_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room2/room2.tscn" diff --git a/game/rooms/room3/esc/right_exit.esc b/game/rooms/room3/esc/right_exit.esc deleted file mode 100755 index 432669bc..00000000 --- a/game/rooms/room3/esc/right_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room4/room4.tscn" diff --git a/game/rooms/room3/smoke.png.import b/game/rooms/room3/smoke.png.import deleted file mode 100644 index 11d4828f..00000000 --- a/game/rooms/room3/smoke.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/smoke.png-965262514fb8ca3a9976c9f3fd836bb3.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://game/rooms/room3/smoke.png" -dest_files=[ "res://.import/smoke.png-965262514fb8ca3a9976c9f3fd836bb3.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/game/rooms/room4/assets/background.png.import b/game/rooms/room4/assets/background.png.import deleted file mode 100644 index e25ea866..00000000 --- a/game/rooms/room4/assets/background.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/background.png-e685c4c8afaea1f171a24d7c28e56420.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://game/rooms/room4/assets/background.png" -dest_files=[ "res://.import/background.png-e685c4c8afaea1f171a24d7c28e56420.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/game/rooms/room4/assets/background_reduced.png.import b/game/rooms/room4/assets/background_reduced.png.import deleted file mode 100644 index dcc78c68..00000000 --- a/game/rooms/room4/assets/background_reduced.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/background_reduced.png-d06bc07d5666bd3e56ce6d2577340fd7.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://game/rooms/room4/assets/background_reduced.png" -dest_files=[ "res://.import/background_reduced.png-d06bc07d5666bd3e56ce6d2577340fd7.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/game/rooms/room4/assets/depth.png.import b/game/rooms/room4/assets/depth.png.import deleted file mode 100644 index 1aa215e9..00000000 --- a/game/rooms/room4/assets/depth.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/depth.png-068a7958845f7df3ef06759b3e7c91f2.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://game/rooms/room4/assets/depth.png" -dest_files=[ "res://.import/depth.png-068a7958845f7df3ef06759b3e7c91f2.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/game/rooms/room4/assets/depth_reduced.png.import b/game/rooms/room4/assets/depth_reduced.png.import deleted file mode 100644 index f31ac93d..00000000 --- a/game/rooms/room4/assets/depth_reduced.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/depth_reduced.png-503513b9a025604d6025aa5f62eeb517.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://game/rooms/room4/assets/depth_reduced.png" -dest_files=[ "res://.import/depth_reduced.png-503513b9a025604d6025aa5f62eeb517.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/game/rooms/room4/esc/left_exit.esc b/game/rooms/room4/esc/left_exit.esc deleted file mode 100755 index 540af404..00000000 --- a/game/rooms/room4/esc/left_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room3/room3.tscn" diff --git a/game/rooms/room4/esc/right_exit.esc b/game/rooms/room4/esc/right_exit.esc deleted file mode 100755 index 1ebbc46c..00000000 --- a/game/rooms/room4/esc/right_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room5/room5.tscn" diff --git a/game/rooms/room5/esc/left_exit.esc b/game/rooms/room5/esc/left_exit.esc deleted file mode 100755 index 432669bc..00000000 --- a/game/rooms/room5/esc/left_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room4/room4.tscn" diff --git a/game/rooms/room5/esc/right_exit.esc b/game/rooms/room5/esc/right_exit.esc deleted file mode 100755 index 537f7fca..00000000 --- a/game/rooms/room5/esc/right_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room6/room6.tscn" diff --git a/game/rooms/room5/items/empty_sheet.png.import b/game/rooms/room5/items/empty_sheet.png.import deleted file mode 100644 index b7547b01..00000000 --- a/game/rooms/room5/items/empty_sheet.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/empty_sheet.png-813558ed5dff2311f54fddefecca858f.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://game/rooms/room5/items/empty_sheet.png" -dest_files=[ "res://.import/empty_sheet.png-813558ed5dff2311f54fddefecca858f.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/game/rooms/room5/items/filled_sheet.png.import b/game/rooms/room5/items/filled_sheet.png.import deleted file mode 100644 index a678ed46..00000000 --- a/game/rooms/room5/items/filled_sheet.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/filled_sheet.png-032e8e1e7d1157ad603f97190a08cc80.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://game/rooms/room5/items/filled_sheet.png" -dest_files=[ "res://.import/filled_sheet.png-032e8e1e7d1157ad603f97190a08cc80.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/game/rooms/room5/items/pen.png.import b/game/rooms/room5/items/pen.png.import deleted file mode 100644 index fad846ad..00000000 --- a/game/rooms/room5/items/pen.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/pen.png-d9e594f56a5c8cfe7922f0a481266caf.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://game/rooms/room5/items/pen.png" -dest_files=[ "res://.import/pen.png-d9e594f56a5c8cfe7922f0a481266caf.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/game/rooms/room5/items/wrench.png.import b/game/rooms/room5/items/wrench.png.import deleted file mode 100644 index c93bb7c4..00000000 --- a/game/rooms/room5/items/wrench.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/wrench.png-d9921fc62da243552d6e7f1f43bde55e.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://game/rooms/room5/items/wrench.png" -dest_files=[ "res://.import/wrench.png-d9921fc62da243552d6e7f1f43bde55e.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/game/rooms/room6/esc/left_exit.esc b/game/rooms/room6/esc/left_exit.esc deleted file mode 100755 index 1ebbc46c..00000000 --- a/game/rooms/room6/esc/left_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room5/room5.tscn" diff --git a/game/rooms/room7/esc/left_exit.esc b/game/rooms/room7/esc/left_exit.esc deleted file mode 100755 index 537f7fca..00000000 --- a/game/rooms/room7/esc/left_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room6/room6.tscn" diff --git a/game/rooms/room7/esc/right_exit.esc b/game/rooms/room7/esc/right_exit.esc deleted file mode 100755 index 1bdc8109..00000000 --- a/game/rooms/room7/esc/right_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room8/room8.tscn" diff --git a/game/rooms/room8/esc/left_exit.esc b/game/rooms/room8/esc/left_exit.esc deleted file mode 100755 index bafdbb36..00000000 --- a/game/rooms/room8/esc/left_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room7/room7.tscn" diff --git a/game/rooms/room8/esc/middle_exit.esc b/game/rooms/room8/esc/middle_exit.esc deleted file mode 100755 index 651eff16..00000000 --- a/game/rooms/room8/esc/middle_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room9/room9.tscn" diff --git a/game/rooms/room9/esc/left_exit.esc b/game/rooms/room9/esc/left_exit.esc deleted file mode 100755 index 1bdc8109..00000000 --- a/game/rooms/room9/esc/left_exit.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://game/rooms/room8/room8.tscn" diff --git a/game/start_game.esc b/game/start_game.esc index 20689fa4..102f2c70 100755 --- a/game/start_game.esc +++ b/game/start_game.esc @@ -1,29 +1,29 @@ :start # 1/ Simple scene -change_scene res://game/rooms/room1/room1.tscn +change_scene res://game/rooms/room01/room01.tscn # 2/ Button bridge -#change_scene res://game/rooms/room2/room2.tscn +#change_scene res://game/rooms/room02/room02.tscn # 3/ Broken button -#change_scene res://game/rooms/room3/room3.tscn +#change_scene res://game/rooms/room03/room03.tscn # 4/ wide room -#change_scene res://game/rooms/room4/room4.tscn +#change_scene res://game/rooms/room04/room04.tscn # 5/ items rooms -#change_scene res://game/rooms/room5/room5.tscn +#change_scene res://game/rooms/room05/room05.tscn # 6/ character room -#change_scene res://game/rooms/room6/room6.tscn +#change_scene res://game/rooms/room06/room06.tscn # 7/ long room with camera shift to object 2 if look on object 1 # and stairs with camera shift too -#change_scene res://game/rooms/room7/room7.tscn +#change_scene res://game/rooms/room07/room07.tscn # 8/ puzzle in superposed scene -#change_scene res://game/rooms/room8/room8.tscn +#change_scene res://game/rooms/room08/room08.tscn # 9/ Indy4 3 closets -#change_scene res://game/rooms/room9/room9.tscn +#change_scene res://game/rooms/room09/room09.tscn diff --git a/game/ui/commons/room_select.gd b/game/ui/commons/room_select.gd index f1edb31c..74441dc8 100644 --- a/game/ui/commons/room_select.gd +++ b/game/ui/commons/room_select.gd @@ -6,16 +6,21 @@ var options_paths = [] func _ready(): var rooms_folder = "res://game/rooms/" var dir = Directory.new() + var rooms_list: Array = [] if dir.open(rooms_folder) == OK: dir.list_dir_begin(true) var file_name = dir.get_next() while file_name != "": if dir.current_is_dir(): - add_item(file_name) - options_paths.push_back("res://game/rooms/" + file_name + "/" + - file_name + ".tscn") + rooms_list.push_back(file_name) file_name = dir.get_next() + + rooms_list.sort() + for room in rooms_list: + add_item(room) + options_paths.push_back("res://game/rooms/" + room + "/" + + room + ".tscn") else: escoria.logger.report_errors("room_select.gd:_ready()",