From cbb64df969438e401267d39552bd8f13c672b7b3 Mon Sep 17 00:00:00 2001 From: Julian Murgia Date: Sun, 8 Aug 2021 12:10:46 +0200 Subject: [PATCH] Removed hardcoded global_id "player" (#359) * Removed hardcoded global_id "player" Removed hardcoded node name "start_position" * docs: Automatic update of API docs Co-authored-by: StraToN --- .../escoria-core/game/core-scripts/esc_game.gd | 12 +++++++----- .../game/core-scripts/esc_location.gd | 4 ++++ .../escoria-core/game/core-scripts/esc_room.gd | 14 ++++++-------- addons/escoria-core/game/main.gd | 1 + addons/escoria-ui-9verbs/game.gd | 7 ++++--- addons/escoria-ui-simplemouse/game.gd | 7 ++++--- docs/api/ESCLocation.md | 8 ++++++++ docs/api/main.gd.md | 2 +- game/characters/worker/worker.tscn | 5 ++--- game/rooms/room01/room01.tscn | 1 + game/rooms/room02/room02.tscn | 6 ++++++ game/rooms/room03/room03.tscn | 6 ++++++ game/rooms/room04/room04.tscn | 4 ++++ game/rooms/room05/room05.tscn | 8 ++++++++ game/rooms/room06/room06.tscn | 4 ++++ game/rooms/room07/room07.tscn | 17 +++++++++++++++++ game/rooms/room08/room08.tscn | 6 ++++++ game/rooms/room09/room09.tscn | 12 ++++++++++++ game/rooms/room10/room10.tscn | 11 ++++++++++- 19 files changed, 111 insertions(+), 24 deletions(-) diff --git a/addons/escoria-core/game/core-scripts/esc_game.gd b/addons/escoria-core/game/core-scripts/esc_game.gd index daa6a2c6..e90d7260 100644 --- a/addons/escoria-core/game/core-scripts/esc_game.gd +++ b/addons/escoria-core/game/core-scripts/esc_game.gd @@ -36,7 +36,9 @@ func _draw(): return if editor_debug_mode == EDITOR_GAME_DEBUG_DISPLAY.MOUSE_TOOLTIP_LIMITS: - var mouse_limits: Rect2 = get_viewport_rect().grow(-mouse_tooltip_margin) + var mouse_limits: Rect2 = get_viewport_rect().grow( + -mouse_tooltip_margin + ) print(mouse_limits) # Draw lines for tooltip limits @@ -50,7 +52,7 @@ func _draw(): # # - position: Position clicked func left_click_on_bg(position: Vector2) -> void: - escoria.do("walk", ["player", position]) + escoria.do("walk", [escoria.main.current_scene.player.global_id, position]) # Called when the player right clicks on the background @@ -60,7 +62,7 @@ func left_click_on_bg(position: Vector2) -> void: # # - position: Position clicked func right_click_on_bg(position: Vector2) -> void: - escoria.do("walk", ["player", position]) + escoria.do("walk", [escoria.main.current_scene.player.global_id, position]) # Called when the player double clicks on the background @@ -70,8 +72,8 @@ func right_click_on_bg(position: Vector2) -> void: # # - position: Position clicked func left_double_click_on_bg(position: Vector2) -> void: - escoria.do("walk", ["player", position, true]) - + escoria.do("walk", [escoria.main.current_scene.player.global_id, position, \ + true]) # Called when an element in the scene was focused # (Needs to be overridden, if supported) diff --git a/addons/escoria-core/game/core-scripts/esc_location.gd b/addons/escoria-core/game/core-scripts/esc_location.gd index 27b3e4c9..8de89f48 100644 --- a/addons/escoria-core/game/core-scripts/esc_location.gd +++ b/addons/escoria-core/game/core-scripts/esc_location.gd @@ -3,9 +3,13 @@ extends Position2D class_name ESCLocation + # The global ID of this item export(String) var global_id +# If true, this ESCLocation is considered as a player start location +export(bool) var is_start_location = false + # If true, player orients towards 'interaction_direction' as # player character arrives. export(bool) var player_orients_on_arrival = true diff --git a/addons/escoria-core/game/core-scripts/esc_room.gd b/addons/escoria-core/game/core-scripts/esc_room.gd index b0494bff..6d912958 100644 --- a/addons/escoria-core/game/core-scripts/esc_room.gd +++ b/addons/escoria-core/game/core-scripts/esc_room.gd @@ -69,14 +69,12 @@ func _ready(): ) game.get_node("camera").set_target(player) - if has_node("player_start"): - escoria.object_manager.register_object( - ESCObject.new( - $player_start.name, - $player_start - ), - true - ) + for n in get_children(): + if n is ESCLocation and n.is_start_location: + escoria.object_manager.register_object( + ESCObject.new(n.name, n), + true + ) if global_id.empty(): global_id = name diff --git a/addons/escoria-core/game/main.gd b/addons/escoria-core/game/main.gd index a8dd9ba0..3dd897e3 100644 --- a/addons/escoria-core/game/main.gd +++ b/addons/escoria-core/game/main.gd @@ -4,6 +4,7 @@ extends Node # This script is basically the scene-switcher. +# Signal sent when the room is loaded and ready. signal room_ready diff --git a/addons/escoria-ui-9verbs/game.gd b/addons/escoria-ui-9verbs/game.gd index 06f724e3..28573708 100644 --- a/addons/escoria-ui-9verbs/game.gd +++ b/addons/escoria-ui-9verbs/game.gd @@ -48,19 +48,20 @@ func _input(event): ## BACKGROUND ## func left_click_on_bg(position: Vector2) -> void: - escoria.do("walk", ["player", position]) + escoria.do("walk", [escoria.main.current_scene.player.global_id, position]) escoria.action_manager.clear_current_action() verbs_menu.unselect_actions() func right_click_on_bg(position: Vector2) -> void: - escoria.do("walk", ["player", position]) + escoria.do("walk", [escoria.main.current_scene.player.global_id, position]) escoria.action_manager.clear_current_action() verbs_menu.unselect_actions() func left_double_click_on_bg(position: Vector2) -> void: - escoria.do("walk", ["player", position, true]) + escoria.do("walk", [escoria.main.current_scene.player.global_id, position, \ + true]) escoria.action_manager.clear_current_action() verbs_menu.unselect_actions() diff --git a/addons/escoria-ui-simplemouse/game.gd b/addons/escoria-ui-simplemouse/game.gd index 6bd31711..26bfaf35 100644 --- a/addons/escoria-ui-simplemouse/game.gd +++ b/addons/escoria-ui-simplemouse/game.gd @@ -38,17 +38,18 @@ func _ready(): ## BACKGROUND ## func left_click_on_bg(position: Vector2) -> void: - escoria.do("walk", ["player", position]) + escoria.do("walk", [escoria.main.current_scene.player.global_id, position]) $ui/verbs_layer/verbs_menu.set_by_name("walk") $ui/verbs_layer/verbs_menu.clear_tool_texture() func right_click_on_bg(position: Vector2) -> void: - escoria.do("walk", ["player", position]) + escoria.do("walk", [escoria.main.current_scene.player.global_id, position]) $ui/verbs_layer/verbs_menu.set_by_name("walk") $ui/verbs_layer/verbs_menu.clear_tool_texture() func left_double_click_on_bg(position: Vector2) -> void: - escoria.do("walk", ["player", position, true]) + escoria.do("walk", [escoria.main.current_scene.player.global_id, position, \ + true]) $ui/verbs_layer/verbs_menu.set_by_name("walk") $ui/verbs_layer/verbs_menu.clear_tool_texture() diff --git a/docs/api/ESCLocation.md b/docs/api/ESCLocation.md index 81c0fed6..db6f5748 100644 --- a/docs/api/ESCLocation.md +++ b/docs/api/ESCLocation.md @@ -19,6 +19,14 @@ export var global_id = "" The global ID of this item +### is\_start\_location + +```gdscript +export var is_start_location = false +``` + +If true, this ESCLocation is considered as a player start location + ### player\_orients\_on\_arrival ```gdscript diff --git a/docs/api/main.gd.md b/docs/api/main.gd.md index 8f62ea9e..422699fe 100644 --- a/docs/api/main.gd.md +++ b/docs/api/main.gd.md @@ -102,4 +102,4 @@ Implement them, even if empty ## Signals -- signal room_ready(): +- signal room_ready(): Signal sent when the room is loaded and ready. diff --git a/game/characters/worker/worker.tscn b/game/characters/worker/worker.tscn index 44334023..a33e3e4b 100644 --- a/game/characters/worker/worker.tscn +++ b/game/characters/worker/worker.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=1] -[ext_resource path="res://game/characters/worker/worker_anims.gd" type="Script" id=2] [ext_resource path="res://game/characters/worker/png/worker.png" type="Texture" id=4] [sub_resource type="AtlasTexture" id=1] @@ -27,7 +26,7 @@ is_movable = true tooltip_name = "Worker" default_action = "look" dialog_color = Color( 0.196078, 0, 1, 1 ) -animations = ExtResource( 2 ) +animations = null [node name="sprite" type="AnimatedSprite" parent="."] position = Vector2( 0.0280151, -16.7213 ) diff --git a/game/rooms/room01/room01.tscn b/game/rooms/room01/room01.tscn index 17fb883a..8804e5fa 100644 --- a/game/rooms/room01/room01.tscn +++ b/game/rooms/room01/room01.tscn @@ -143,6 +143,7 @@ __meta__ = { position = Vector2( 653.761, 443.306 ) script = ExtResource( 7 ) global_id = "r1_start" +is_start_location = true [node name="destination_point" type="Position2D" parent="."] position = Vector2( 476.984, 487.146 ) diff --git a/game/rooms/room02/room02.tscn b/game/rooms/room02/room02.tscn index 5137fe45..4c5b22e4 100644 --- a/game/rooms/room02/room02.tscn +++ b/game/rooms/room02/room02.tscn @@ -40,6 +40,7 @@ interaction_direction = 3 tooltip_name = "Right platform" default_action = "look" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_platform"] polygon = PoolVector2Array( 870.974, 538.342, 827.536, 353.995, 1181.4, 357.174, 1287.34, 413.325, 1289.46, 545.758 ) @@ -56,6 +57,7 @@ is_exit = true tooltip_name = "Right exit" default_action = "walk" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door"] polygon = PoolVector2Array( 1177.94, 348.61, 1175.95, 45.3759, 1276.06, 92.0953, 1277.95, 399.407 ) @@ -72,6 +74,7 @@ is_exit = true tooltip_name = "Left exit" default_action = "walk" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/l_door"] polygon = PoolVector2Array( -1.37926, 443.158, 7.96461, 122.796, 84.0504, 77.4118, 88.055, 377.751 ) @@ -85,6 +88,7 @@ position = Vector2( 958.107, 176.401 ) global_id = "r2_button_right" esc_script = "res://game/rooms/room02/esc/button.esc" dialog_color = Color( 0, 1, 0.109804, 1 ) +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/button_right"] position = Vector2( 29.4302, 195.411 ) @@ -98,6 +102,7 @@ position = Vector2( 288.82, 171.439 ) global_id = "r2_button" esc_script = "res://game/rooms/room02/esc/button.esc" dialog_color = Color( 0, 1, 0.109804, 1 ) +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/button_left"] position = Vector2( 24.6681, 196.998 ) @@ -110,3 +115,4 @@ __meta__ = { position = Vector2( 76.7617, 437.649 ) script = ExtResource( 8 ) global_id = "r2_player_start" +is_start_location = true diff --git a/game/rooms/room03/room03.tscn b/game/rooms/room03/room03.tscn index 587ad7ad..86d72a34 100644 --- a/game/rooms/room03/room03.tscn +++ b/game/rooms/room03/room03.tscn @@ -39,6 +39,7 @@ __meta__ = { global_id = "r3_right_platform" esc_script = "res://game/rooms/room03/esc/right_platform.esc" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_platform"] polygon = PoolVector2Array( 870.974, 538.342, 827.536, 353.995, 1181.4, 357.174, 1287.34, 413.325, 1289.46, 545.758 ) @@ -63,6 +64,7 @@ esc_script = "res://game/rooms/room03/esc/right_exit.esc" is_exit = true tooltip_name = "Exit" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door"] polygon = PoolVector2Array( 1177.94, 348.61, 1175.95, 45.3759, 1276.06, 92.0953, 1277.95, 399.407 ) @@ -81,6 +83,7 @@ esc_script = "res://game/rooms/room03/esc/left_exit.esc" is_exit = true tooltip_name = "Exit" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/l_door"] polygon = PoolVector2Array( -2.71457, 437.818, 6.6293, 121.462, 89.3893, 74.7422, 88.0545, 376.416 ) @@ -92,6 +95,7 @@ script = ExtResource( 8 ) [node name="button" parent="Hotspots" instance=ExtResource( 7 )] global_id = "r3_button" esc_script = "res://game/rooms/room03/esc/button.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/button"] position = Vector2( 347.767, 378.011 ) @@ -115,3 +119,5 @@ __meta__ = { [node name="player_start" type="Position2D" parent="."] position = Vector2( 63.3074, 444.653 ) script = ExtResource( 8 ) +global_id = "r3_player_start" +is_start_location = true diff --git a/game/rooms/room04/room04.tscn b/game/rooms/room04/room04.tscn index d7f87d93..1bd90a58 100644 --- a/game/rooms/room04/room04.tscn +++ b/game/rooms/room04/room04.tscn @@ -71,6 +71,8 @@ __meta__ = { [node name="player_start" type="Position2D" parent="."] position = Vector2( 82.9282, 347.615 ) script = ExtResource( 9 ) +global_id = "r4_player_start" +is_start_location = true [node name="Hotspots" type="Node2D" parent="."] @@ -80,6 +82,7 @@ global_id = "l_exit" esc_script = "res://game/rooms/room04/esc/left_exit.esc" is_exit = true dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/l_door"] polygon = PoolVector2Array( 29.1046, 292.156, 31.0151, 76.8949, 147.177, 74.4792, 151.415, 293.788 ) @@ -94,6 +97,7 @@ global_id = "r_exit" esc_script = "res://game/rooms/room04/esc/right_exit.esc" is_exit = true dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door"] polygon = PoolVector2Array( 1567.92, 294.848, 1573.21, 92.4902, 1657.34, 129.485, 1654.79, 343.583 ) diff --git a/game/rooms/room05/room05.tscn b/game/rooms/room05/room05.tscn index 6347badd..f4403f04 100644 --- a/game/rooms/room05/room05.tscn +++ b/game/rooms/room05/room05.tscn @@ -95,6 +95,7 @@ esc_script = "res://game/rooms/room05/esc/left_exit.esc" is_exit = true tooltip_name = "Left exit" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/l_door"] polygon = PoolVector2Array( 0.328762, 440.897, 1.85199, 119.926, 85.9517, 74.6212, 87.1409, 377.869 ) @@ -111,6 +112,7 @@ esc_script = "res://game/rooms/room05/esc/right_exit.esc" is_exit = true tooltip_name = "Right exit" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door"] polygon = PoolVector2Array( 1177.94, 348.61, 1175.95, 45.3759, 1276.06, 92.0953, 1277.95, 399.407 ) @@ -125,6 +127,7 @@ global_id = "r5_wall_item" esc_script = "res://game/rooms/room05/esc/wall_item.esc" tooltip_name = "Item on the wall" default_action = "look" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/item_wall"] position = Vector2( 620.135, 613.652 ) @@ -136,6 +139,7 @@ __meta__ = { [node name="wrench" parent="Hotspots" instance=ExtResource( 8 )] position = Vector2( 257.269, 435.892 ) interaction_direction = 2 +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/wrench"] position = Vector2( -77.4207, 0 ) @@ -143,10 +147,14 @@ script = ExtResource( 11 ) [node name="pen" parent="Hotspots" instance=ExtResource( 10 )] position = Vector2( 909.908, 443.451 ) +animations = null [node name="empty_sheet" parent="Hotspots" instance=ExtResource( 9 )] position = Vector2( 1059.84, 440.932 ) +animations = null [node name="player_start" type="Position2D" parent="."] position = Vector2( 76.7617, 437.649 ) script = ExtResource( 11 ) +global_id = "r5_player_start" +is_start_location = true diff --git a/game/rooms/room06/room06.tscn b/game/rooms/room06/room06.tscn index 85d08181..00021252 100644 --- a/game/rooms/room06/room06.tscn +++ b/game/rooms/room06/room06.tscn @@ -59,6 +59,7 @@ __meta__ = { [node name="l_exit" parent="Hotspots" instance=ExtResource( 3 )] esc_script = "res://game/rooms/room06/esc/left_exit.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/l_exit"] position = Vector2( 37.4521, 392.045 ) @@ -69,6 +70,7 @@ __meta__ = { [node name="r_door" parent="Hotspots" instance=ExtResource( 5 )] esc_script = "res://game/rooms/room06/esc/r6_door.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/r_door"] position = Vector2( 1180.52, 395.193 ) @@ -89,3 +91,5 @@ script = ExtResource( 9 ) [node name="player_start" type="Position2D" parent="."] position = Vector2( 76.7617, 437.649 ) script = ExtResource( 9 ) +global_id = "r6_player_start" +is_start_location = true diff --git a/game/rooms/room07/room07.tscn b/game/rooms/room07/room07.tscn index 2318558d..58f6cdeb 100644 --- a/game/rooms/room07/room07.tscn +++ b/game/rooms/room07/room07.tscn @@ -144,6 +144,7 @@ esc_script = "res://game/rooms/room07/esc/left_exit.esc" is_exit = true tooltip_name = "Exit" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/l_exit"] polygon = PoolVector2Array( 0.328762, 440.897, 1.85199, 119.926, 85.9517, 74.6212, 87.1409, 377.869 ) @@ -164,6 +165,7 @@ is_exit = true interaction_direction = 1 tooltip_name = "Exit" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_exit"] polygon = PoolVector2Array( 1982.34, 349.116, 1980.1, 46.0513, 2081.12, 86.4599, 2075, 394 ) @@ -180,6 +182,7 @@ position = Vector2( 358.099, -1195.07 ) script = ExtResource( 7 ) global_id = "r7_object_1" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="Line2D" type="Line2D" parent="Hotspots/object_1"] position = Vector2( 0, 1345.52 ) @@ -197,6 +200,7 @@ __meta__ = { } global_id = "r7_object2" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/object2"] polygon = PoolVector2Array( -112.101, 14.6226, -103.122, 288.503, 130.35, 286.258, 125.861, 16.8675 ) @@ -214,6 +218,7 @@ global_id = "r7_lower_stairs" esc_script = "res://game/rooms/room07/esc/lower_stairs.esc" is_exit = true dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/lower_stairs"] polygon = PoolVector2Array( 831.375, 344.577, 829.788, 19.1602, 1058.37, 19.1602, 1052.02, 347.752 ) @@ -230,6 +235,7 @@ esc_script = "res://game/rooms/room07/esc/upper_stairs.esc" is_exit = true tooltip_name = "Stairs" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/upper_stairs"] position = Vector2( -1334.92, 936.565 ) @@ -243,6 +249,7 @@ script = ExtResource( 8 ) position = Vector2( -167.43, 1463.23 ) global_id = "r7_button_push" esc_script = "res://game/rooms/room07/esc/button_push.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/button_camera_push"] position = Vector2( 343.048, 300.613 ) @@ -266,6 +273,7 @@ __meta__ = { position = Vector2( 9.393, 1464.03 ) global_id = "r7_button_shift" esc_script = "res://game/rooms/room07/esc/button_shift.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/button_camera_shift"] position = Vector2( 350.258, 301.616 ) @@ -286,6 +294,7 @@ __meta__ = { position = Vector2( 172.527, 1464.03 ) global_id = "r7_button_follow" esc_script = "res://game/rooms/room07/esc/button_follow.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/button_camera_follow"] position = Vector2( 350.258, 301.616 ) @@ -306,6 +315,7 @@ __meta__ = { position = Vector2( 332.527, 1464.03 ) global_id = "r7_button_zoom" esc_script = "res://game/rooms/room07/esc/button_zoom.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/button_camera_zoom"] position = Vector2( 350.258, 301.616 ) @@ -326,6 +336,7 @@ __meta__ = { position = Vector2( 910.482, 1464.03 ) global_id = "r7_button_set_pos" esc_script = "res://game/rooms/room07/esc/button_set_pos.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/button_camera_set_pos"] position = Vector2( 350.258, 301.616 ) @@ -351,6 +362,7 @@ is_trigger = true is_interactive = false player_orients_on_arrival = false dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/trigger_left"] polygon = PoolVector2Array( 724.356, 1944.36, 716.865, 1752.57, 800.77, 1752.57, 814.254, 1942.86 ) @@ -380,6 +392,7 @@ is_trigger = true is_interactive = false player_orients_on_arrival = false dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/trigger_right"] position = Vector2( 372.68, 4.12805 ) @@ -407,6 +420,7 @@ script = ExtResource( 7 ) global_id = "r7_light_left" is_interactive = false dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="Polygon2D" type="Polygon2D" parent="Hotspots/light_left"] color = Color( 0.0313726, 0.996078, 0, 1 ) @@ -426,6 +440,7 @@ script = ExtResource( 7 ) global_id = "r7_light_right" is_interactive = false dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="Polygon2D" type="Polygon2D" parent="Hotspots/light_right"] color = Color( 1, 0, 0, 1 ) @@ -442,3 +457,5 @@ anims/red = SubResource( 8 ) [node name="player_start" type="Position2D" parent="."] position = Vector2( 76.7617, 1847.24 ) script = ExtResource( 8 ) +global_id = "r7_player_start" +is_start_location = true diff --git a/game/rooms/room08/room08.tscn b/game/rooms/room08/room08.tscn index 4cc85ecd..7e0478d5 100644 --- a/game/rooms/room08/room08.tscn +++ b/game/rooms/room08/room08.tscn @@ -136,6 +136,7 @@ esc_script = "res://game/rooms/room08/esc/left_exit.esc" is_exit = true tooltip_name = "Exit" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [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 ) @@ -153,6 +154,7 @@ global_id = "r8_m_door" esc_script = "res://game/rooms/room08/esc/middle_exit.esc" tooltip_name = "Exit" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/m_door"] visible = false @@ -177,6 +179,7 @@ esc_script = "res://game/rooms/room08/esc/button_puzzle.esc" tooltip_name = "Button" default_action = "use" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="button" type="Line2D" parent="Hotspots/r8_mini_puzzle_button"] position = Vector2( -588.313, 5.65686 ) @@ -210,6 +213,7 @@ esc_script = "res://game/rooms/room08/esc/button_reset_puzzle.esc" tooltip_name = "Button" default_action = "use" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="button" type="Line2D" parent="Hotspots/r8_reset_puzzle_button"] position = Vector2( -588.313, 5.65686 ) @@ -238,3 +242,5 @@ __meta__ = { [node name="player_start" type="Position2D" parent="."] position = Vector2( 76.7617, 437.649 ) script = ExtResource( 7 ) +global_id = "r8_player_start" +is_start_location = true diff --git a/game/rooms/room09/room09.tscn b/game/rooms/room09/room09.tscn index 14b76805..50968aeb 100644 --- a/game/rooms/room09/room09.tscn +++ b/game/rooms/room09/room09.tscn @@ -74,6 +74,7 @@ is_exit = true tooltip_name = "Left exit" default_action = "walk" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/l_door"] polygon = PoolVector2Array( 0.328762, 440.897, 1.85199, 119.926, 85.9517, 74.6212, 87.1409, 377.869 ) @@ -85,6 +86,7 @@ script = ExtResource( 12 ) [node name="r_door" parent="Hotspots" instance=ExtResource( 9 )] global_id = "r9_r_exit" esc_script = "res://game/rooms/room09/esc/right_exit.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/r_door"] position = Vector2( 1198.65, 391.058 ) @@ -95,6 +97,7 @@ position = Vector2( 435.233, 64.1518 ) global_id = "r9_closet_left" esc_script = "res://game/rooms/room09/esc/closet_left.esc" tooltip_name = "Left closet" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/r9_closet_left"] position = Vector2( 69.9246, 318.898 ) @@ -106,6 +109,7 @@ position = Vector2( 46.4878, 47.8335 ) scale = Vector2( 0.5, 0.5 ) global_id = "r9_bottle_left" dont_apply_terrain_scaling = true +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/r9_closet_left/bottle_left"] position = Vector2( -26.727, 543.448 ) @@ -116,6 +120,7 @@ position = Vector2( 572.963, 65.2113 ) global_id = "r9_closet_middle" esc_script = "res://game/rooms/room09/esc/closet_middle.esc" tooltip_name = "Middle closet" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/r9_closet_middle"] position = Vector2( 65.6867, 317.839 ) @@ -127,6 +132,7 @@ position = Vector2( 45.9562, 46.774 ) scale = Vector2( 0.5, 0.5 ) global_id = "r9_bottle_middle" dont_apply_terrain_scaling = true +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/r9_closet_middle/bottle_middle"] position = Vector2( -26.727, 543.448 ) @@ -137,6 +143,7 @@ position = Vector2( 710.693, 66.2707 ) global_id = "r9_closet_right" esc_script = "res://game/rooms/room09/esc/closet_right.esc" tooltip_name = "Right closet" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/r9_closet_right"] position = Vector2( 64.6273, 316.779 ) @@ -148,6 +155,7 @@ position = Vector2( 47.2065, 45.7146 ) scale = Vector2( 0.5, 0.5 ) global_id = "r9_bottle_right" dont_apply_terrain_scaling = true +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/r9_closet_right/bottle_right"] position = Vector2( -26.727, 543.448 ) @@ -157,6 +165,7 @@ script = ExtResource( 12 ) position = Vector2( 240.688, 160.459 ) global_id = "r9_button_reset" esc_script = "res://game/rooms/room09/esc/button_reset.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/button"] position = Vector2( 30.204, 209.54 ) @@ -182,6 +191,7 @@ interaction_direction = 2 tooltip_name = "Stand" default_action = "look" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/stand"] polygon = PoolVector2Array( 1086.57, 357.819, 1087.46, 226.857, 1134.68, 228.639, 1133.79, 358.71 ) @@ -205,3 +215,5 @@ script = ExtResource( 12 ) [node name="player_start" type="Position2D" parent="."] position = Vector2( 76.7617, 437.649 ) script = ExtResource( 12 ) +global_id = "r9_player_start" +is_start_location = true diff --git a/game/rooms/room10/room10.tscn b/game/rooms/room10/room10.tscn index 5a0ebb6e..a6d21f88 100644 --- a/game/rooms/room10/room10.tscn +++ b/game/rooms/room10/room10.tscn @@ -56,6 +56,7 @@ is_exit = true tooltip_name = "Left exit" default_action = "walk" dialog_color = Color( 1, 1, 1, 1 ) +animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/l_door"] polygon = PoolVector2Array( 0.328762, 440.897, 1.85199, 119.926, 85.9517, 74.6212, 87.1409, 377.869 ) @@ -66,6 +67,7 @@ script = ExtResource( 5 ) [node name="r_door" parent="Hotspots" instance=ExtResource( 9 )] esc_script = "res://game/rooms/room10/esc/right_exit.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/r_door"] position = Vector2( 1198.65, 391.058 ) @@ -75,6 +77,7 @@ script = ExtResource( 5 ) position = Vector2( 243.165, 154.97 ) global_id = "r10_btn_stop_bg_music" esc_script = "res://game/rooms/room10/esc/button_stop_bg_music.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/button_stop_bg_music"] position = Vector2( 22.6786, 212.927 ) @@ -95,6 +98,7 @@ __meta__ = { position = Vector2( 377.976, 154.97 ) global_id = "r10_btn_play_bg_music" esc_script = "res://game/rooms/room10/esc/button_play_bg_music.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/button_play_bg_music"] position = Vector2( 22.6786, 212.927 ) @@ -115,6 +119,7 @@ __meta__ = { position = Vector2( 646.339, 154.97 ) global_id = "r10_btn_play_snd" esc_script = "res://game/rooms/room10/esc/button_play_snd.esc" +animations = null [node name="Position2D" type="Position2D" parent="Hotspots/button_play_sound"] position = Vector2( 22.6786, 212.927 ) @@ -136,6 +141,7 @@ position = Vector2( 823.113, 155.354 ) global_id = "test_accept_input" esc_script = "res://game/rooms/room10/esc/button_accept_input_test.esc" tooltip_name = "Test Accept Input" +animations = null [node name="Label" type="Label" parent="Hotspots/button_accept_input"] margin_left = -3.6864 @@ -158,6 +164,7 @@ position = Vector2( 939.497, 154.301 ) global_id = "button_slide" esc_script = "res://game/rooms/room10/esc/button_slide.esc" tooltip_name = "Test slide" +animations = null [node name="Label" type="Label" parent="Hotspots/button_slide"] margin_left = -3.6864 @@ -179,6 +186,7 @@ position = Vector2( 1041.66, 152.721 ) global_id = "button_turn_to" esc_script = "res://game/rooms/room10/esc/button_turn_to.esc" tooltip_name = "Test turn_to" +animations = null [node name="Label" type="Label" parent="Hotspots/button_turn_to"] margin_left = -3.6864 @@ -208,4 +216,5 @@ global_id = "slide_pos_2" [node name="player_start" type="Position2D" parent="."] position = Vector2( 542.824, 468.193 ) script = ExtResource( 5 ) -global_id = "player_start" +global_id = "r10_player_start" +is_start_location = true