diff --git a/game/rooms/room07/room07.tscn b/game/rooms/room07/room07.tscn index d9787dc9..1b0384ff 100644 --- a/game/rooms/room07/room07.tscn +++ b/game/rooms/room07/room07.tscn @@ -684,6 +684,7 @@ pause_mode = 1 script = ExtResource( 7 ) global_id = "r7_lift" is_interactive = false +combine_when_selected_action_is_in = [ ] inventory_texture = ExtResource( 12 ) dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -819,6 +820,7 @@ global_id = "r7_l_exit" esc_script = "res://game/rooms/room07/esc/left_exit.esc" is_exit = true tooltip_name = "Exit" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -841,6 +843,7 @@ esc_script = "res://game/rooms/room07/esc/right_exit.esc" is_exit = true interaction_direction = 1 tooltip_name = "Exit" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -866,6 +869,7 @@ esc_script = "res://game/rooms/room07/esc/lower_stairs.esc" is_exit = true tooltip_name = "stairs" default_action = "walk" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -886,6 +890,7 @@ esc_script = "res://game/rooms/room07/esc/upper_stairs.esc" is_exit = true tooltip_name = "Stairs" default_action = "walk" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -904,6 +909,7 @@ global_id = "r7_button_push" esc_script = "res://game/rooms/room07/esc/button_push.esc" tooltip_name = "button" default_action = "use" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -933,6 +939,7 @@ global_id = "r7_button_shift" esc_script = "res://game/rooms/room07/esc/button_shift.esc" tooltip_name = "button" default_action = "use" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -962,6 +969,7 @@ global_id = "r7_button_zoom" esc_script = "res://game/rooms/room07/esc/button_zoom.esc" tooltip_name = "button" default_action = "use" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -991,6 +999,7 @@ global_id = "r7_button_set_pos" esc_script = "res://game/rooms/room07/esc/button_set_pos.esc" tooltip_name = "button" default_action = "use" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -1020,6 +1029,7 @@ esc_script = "res://game/rooms/room07/esc/alarm_cone_floor_1.esc" is_trigger = true is_interactive = false player_orients_on_arrival = false +combine_when_selected_action_is_in = [ ] inventory_texture = ExtResource( 10 ) dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -1057,6 +1067,7 @@ esc_script = "res://game/rooms/room07/esc/alarm_cone_floor_2.esc" is_trigger = true is_interactive = false player_orients_on_arrival = false +combine_when_selected_action_is_in = [ ] inventory_texture = ExtResource( 10 ) dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -1096,6 +1107,7 @@ global_id = "r7_lift_button_floor_1" esc_script = "res://game/rooms/room07/esc/lift_button_floor_1.esc" tooltip_name = "Lift Button" default_action = "use" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -1113,6 +1125,7 @@ global_id = "r7_lift_button_floor_2" esc_script = "res://game/rooms/room07/esc/lift_button_floor_2.esc" tooltip_name = "Lift Button" default_action = "use" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = null @@ -1130,6 +1143,7 @@ global_id = "r7_lift_door_floor_1" esc_script = "res://game/rooms/room07/esc/lift_door_floor_1.esc" tooltip_name = "lift" default_action = "use" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) camera_node = NodePath("camera_node") animations = null @@ -1142,7 +1156,7 @@ script = ExtResource( 8 ) polygon = PoolVector2Array( 1391, 815, 1551, 812, 1551, 1098, 1394, 1101 ) [node name="camera_node" type="Position2D" parent="lift_door_floor_1"] -position = Vector2( 1468, 1103 ) +position = Vector2( 1466, 1109 ) script = ExtResource( 8 ) [node name="lift_door_floor_2" type="Area2D" parent="."] @@ -1152,17 +1166,18 @@ global_id = "r7_lift_door_floor_2" esc_script = "res://game/rooms/room07/esc/lift_door_floor_2.esc" tooltip_name = "lift" default_action = "use" +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) camera_node = NodePath("camera_node") animations = null -[node name="ESCLocation" type="Position2D" parent="lift_door_floor_2"] -position = Vector2( 1472, 398 ) -script = ExtResource( 8 ) - [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="lift_door_floor_2"] polygon = PoolVector2Array( 1389, 100, 1551, 103, 1551, 390, 1392, 390 ) [node name="camera_node" type="Position2D" parent="lift_door_floor_2"] -position = Vector2( 1471, 398 ) +position = Vector2( 1472, 480 ) +script = ExtResource( 8 ) + +[node name="ESCLocation" type="Position2D" parent="lift_door_floor_2"] +position = Vector2( 1472, 398 ) script = ExtResource( 8 )