diff --git a/game/items/inventory/r5_empty_sheet.tscn b/game/items/inventory/r5_empty_sheet.tscn index fcab3dda..afb75b13 100644 --- a/game/items/inventory/r5_empty_sheet.tscn +++ b/game/items/inventory/r5_empty_sheet.tscn @@ -22,9 +22,9 @@ dialog_color = Color( 1, 1, 1, 1 ) animations = null [node name="Sprite" type="Sprite" parent="."] -position = Vector2( 1038.5, 424 ) +position = Vector2( 0.249146, -42.8763 ) texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 1039, 424 ) +position = Vector2( 0.498291, -44.6254 ) shape = SubResource( 4 ) diff --git a/game/items/inventory/r5_pen.tscn b/game/items/inventory/r5_pen.tscn index d465181c..5b00774c 100644 --- a/game/items/inventory/r5_pen.tscn +++ b/game/items/inventory/r5_pen.tscn @@ -4,11 +4,11 @@ [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=3] [sub_resource type="RectangleShape2D" id=4] -extents = Vector2( 34.5, 45 ) +extents = Vector2( 34.5, 37.6304 ) [node name="pen" type="Area2D"] pause_mode = 1 -position = Vector2( -103, 0 ) +position = Vector2( 0.266479, 2.24493 ) script = ExtResource( 3 ) global_id = "r5_pen" esc_script = "res://game/items/inventory/pen.esc" @@ -23,9 +23,9 @@ dialog_color = Color( 1, 1, 1, 1 ) animations = null [node name="Sprite" type="Sprite" parent="."] -position = Vector2( 1038.5, 424 ) +position = Vector2( 0.222656, -35.5324 ) texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 1039, 424 ) +position = Vector2( -0.0223389, -40.1869 ) shape = SubResource( 4 ) diff --git a/game/rooms/room05/room05.tscn b/game/rooms/room05/room05.tscn index 0ac99be9..8f7ab83b 100644 --- a/game/rooms/room05/room05.tscn +++ b/game/rooms/room05/room05.tscn @@ -154,6 +154,7 @@ global_id = "r5_l_exit" esc_script = "res://game/rooms/room05/esc/left_exit.esc" is_exit = true tooltip_name = "Left exit" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -173,6 +174,7 @@ global_id = "r5_r_exit" esc_script = "res://game/rooms/room05/esc/right_exit.esc" is_exit = true tooltip_name = "Right exit" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -191,6 +193,7 @@ global_id = "r5_pipe" esc_script = "res://game/rooms/room05/esc/pipe.esc" tooltip_name = "pipe" default_action = "look" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -216,8 +219,10 @@ script = ExtResource( 11 ) [node name="wrench" parent="Hotspots" instance=ExtResource( 8 )] [node name="paper" parent="Hotspots" instance=ExtResource( 2 )] +position = Vector2( 1005, 458 ) [node name="pen" parent="Hotspots" instance=ExtResource( 5 )] +position = Vector2( 916.266, 453.245 ) [node name="player_start" type="Position2D" parent="."] position = Vector2( 76.7617, 437.649 )