summaryrefslogtreecommitdiff
path: root/game
diff options
context:
space:
mode:
Diffstat (limited to 'game')
-rw-r--r--game/rooms/test/test.tscn6
-rw-r--r--game/rooms/test_kitchen/test_kitchen.tscn11
2 files changed, 7 insertions, 10 deletions
diff --git a/game/rooms/test/test.tscn b/game/rooms/test/test.tscn
index 7258c1b..06775d9 100644
--- a/game/rooms/test/test.tscn
+++ b/game/rooms/test/test.tscn
@@ -52,7 +52,7 @@ script = ExtResource("7_agkbc")
global_id = "phone"
esc_script = "res://game/rooms/test/phone.esc"
tooltip_name = "Phone"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
metadata/_custom_type_script = "uid://dshelmw7y44qg"
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Phone" unique_id=750375557]
@@ -78,7 +78,6 @@ polygon = PackedVector2Array(33, -544, -151, -472, -151, 48, -106, 6, -10, -63,
[node name="ESCInteractionLocation" type="Marker2D" parent="ToKitchen" unique_id=242339506]
position = Vector2(73, 222)
script = ExtResource("8_54mxh")
-global_id = "test_exit"
metadata/_custom_type_script = "uid://chu4bvqgwxuts"
[node name="ToCorridor" type="Area2D" parent="." unique_id=2025536935]
@@ -89,7 +88,7 @@ global_id = "exit_to_corridor"
esc_script = "res://game/rooms/test/exit_to_corridor.esc"
tooltip_name = "To corridor"
default_action = "use"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
metadata/_custom_type_script = "uid://dshelmw7y44qg"
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="ToCorridor" unique_id=992774431]
@@ -102,6 +101,7 @@ metadata/_custom_type_script = "uid://chu4bvqgwxuts"
[node name="TestPaper" parent="." unique_id=1483834240 instance=ExtResource("10_vcumm")]
position = Vector2(1749, 612)
+actions_requiring_target_object = PackedStringArray()
[node name="ESCInteractionLocation" type="Marker2D" parent="TestPaper" unique_id=1246233789]
position = Vector2(-73, 262)
diff --git a/game/rooms/test_kitchen/test_kitchen.tscn b/game/rooms/test_kitchen/test_kitchen.tscn
index 6dfccac..482bf68 100644
--- a/game/rooms/test_kitchen/test_kitchen.tscn
+++ b/game/rooms/test_kitchen/test_kitchen.tscn
@@ -34,7 +34,7 @@ animations = [{
"duration": 1.0,
"texture": null
}],
-"loop": true,
+"loop": 1,
"name": &"closed",
"speed": 5.0
}, {
@@ -42,7 +42,7 @@ animations = [{
"duration": 1.0,
"texture": ExtResource("12_amw8i")
}],
-"loop": true,
+"loop": 1,
"name": &"open",
"speed": 5.0
}]
@@ -53,7 +53,7 @@ animations = [{
"duration": 1.0,
"texture": ExtResource("14_fcxgd")
}],
-"loop": true,
+"loop": 1,
"name": &"cut",
"speed": 5.0
}, {
@@ -61,7 +61,7 @@ animations = [{
"duration": 1.0,
"texture": ExtResource("12_fe81x")
}],
-"loop": true,
+"loop": 1,
"name": &"default",
"speed": 5.0
}]
@@ -95,8 +95,6 @@ navigation_polygon = SubResource("NavigationPolygon_kamrl")
position = Vector2(1837, 822)
script = ExtResource("6_u6s3a")
target_scene = "uid://cbtqk144uipsv"
-global_id = "exit_to_test"
-tooltip_name = "To test"
metadata/_custom_type_script = "uid://btt4cprco53ec"
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="ESCExit" unique_id=585897778]
@@ -105,7 +103,6 @@ polygon = PackedVector2Array(-71, -112, 83, -81, 83, 117, -107, 88)
[node name="ESCInteractionLocation" type="Marker2D" parent="ESCExit" unique_id=137473435]
position = Vector2(-92, -12)
script = ExtResource("7_t26dx")
-global_id = "kitchen_exit"
metadata/_custom_type_script = "uid://chu4bvqgwxuts"
[node name="Fridge" type="Area2D" parent="." unique_id=116880532]