summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormikatomik <mikec_2007@hotmail.com>2022-09-21 06:38:04 -0400
committermikatomik <mikec_2007@hotmail.com>2022-09-21 06:38:04 -0400
commit39e0ad8fc5f7badaacd89ca1a59a41a6e23432f1 (patch)
treee55bf7cdc31e537f601480bd94481e55befb9f4d
parent582dec62fbd7018d3ee903dbd10d15ad224fe868 (diff)
downloadgodot_wildjam_49-39e0ad8fc5f7badaacd89ca1a59a41a6e23432f1.tar.gz
godot_wildjam_49-39e0ad8fc5f7badaacd89ca1a59a41a6e23432f1.zip
Fix id conflicts in ship.tscn
-rw-r--r--ship/ship/ship.tscn37
1 files changed, 18 insertions, 19 deletions
diff --git a/ship/ship/ship.tscn b/ship/ship/ship.tscn
index 0ead95c..de16dc8 100644
--- a/ship/ship/ship.tscn
+++ b/ship/ship/ship.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=90 format=2]
+[gd_scene load_steps=87 format=2]
[ext_resource path="res://ship/ship/rear_deck.material" type="Material" id=1]
[ext_resource path="res://ship/staircase_1/staircase_1.tscn" type="PackedScene" id=2]
@@ -364,29 +364,29 @@ normal_texture = ExtResource( 6 )
[sub_resource type="BoxShape" id=21]
extents = Vector3( 10.6563, 0.518438, 37.8106 )
-[sub_resource type="OccluderShapePolygon" id=52]
+[sub_resource type="OccluderShapePolygon" id=71]
polygon_points = PoolVector2Array( 10.9471, -29.7118, 10.9621, 44.4481, -10.977, 43.7491, -10.9879, -29.6988 )
-[sub_resource type="OccluderShapePolygon" id=53]
+[sub_resource type="OccluderShapePolygon" id=72]
polygon_points = PoolVector2Array( 7.05242, -7.11288, 11.2226, 4.5878, -11.0649, 4.72619, -7.67165, -6.46684 )
-[sub_resource type="OccluderShapePolygon" id=58]
+[sub_resource type="OccluderShapePolygon" id=77]
polygon_points = PoolVector2Array( 7.05242, -7.11288, 11.1587, 4.20079, -11.1162, 4.16759, -7.67165, -6.46684 )
-[sub_resource type="OccluderShapePolygon" id=54]
+[sub_resource type="OccluderShapePolygon" id=73]
polygon_points = PoolVector2Array( -0.15602, -2.12469, -0.0867991, 8.95647, -11.0801, 9.11318, -10.9508, -2.01116 )
hole_points = PoolVector2Array( -10.1555, -1.9192, -10.0663, 3.58159, -7.91011, 3.5584, -7.87924, -1.93465 )
-[sub_resource type="OccluderShapePolygon" id=55]
+[sub_resource type="OccluderShapePolygon" id=74]
polygon_points = PoolVector2Array( 39.9773, -3.14143, 40.0116, 3.12414, -30.1435, 3.10472, -29.9435, -3.1454 )
-[sub_resource type="OccluderShapePolygon" id=56]
+[sub_resource type="OccluderShapePolygon" id=75]
polygon_points = PoolVector2Array( 39.9773, -3.14143, 40.0616, 3.13735, -29.6697, 3.24634, -29.9435, -3.1454 )
-[sub_resource type="OccluderShapePolygon" id=57]
+[sub_resource type="OccluderShapePolygon" id=76]
polygon_points = PoolVector2Array( 39.9773, -3.14143, 40.331, 8.66629, -30.1681, 8.65979, -29.9435, -3.1454 )
-[sub_resource type="OccluderShapePolygon" id=59]
+[sub_resource type="OccluderShapePolygon" id=78]
polygon_points = PoolVector2Array( 7.06445, -1.98651, 7.05848, 1.65883, -7.03831, 1.65729, -7.05896, -1.96744 )
hole_points = PoolVector2Array( 4.44982, 1.52626, 2.42201, 1.52109, 2.40386, -1.93848, 4.47489, -2.02354 )
@@ -725,44 +725,43 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 15.4283, -51.0714 )
[node name="water_pump" parent="." instance=ExtResource( 22 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.65267, -3.96773, 18.2793 )
-
[node name="occluders" type="Spatial" parent="."]
[node name="Occluder" type="Occluder" parent="occluders"]
transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0.130149, 0 )
-shape = SubResource( 52 )
+shape = SubResource( 71 )
[node name="Occluder2" type="Occluder" parent="occluders"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -40.7461 )
-shape = SubResource( 53 )
+shape = SubResource( 72 )
[node name="Occluder7" type="Occluder" parent="occluders"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 38.8723 )
-shape = SubResource( 58 )
+shape = SubResource( 77 )
[node name="Occluder3" type="Occluder" parent="occluders"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.10202, 33.4622 )
-shape = SubResource( 54 )
+shape = SubResource( 73 )
[node name="Occluder8" type="Occluder" parent="occluders"]
transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 6.10202, 33.4622 )
-shape = SubResource( 54 )
+shape = SubResource( 73 )
[node name="Occluder4" type="Occluder" parent="occluders"]
transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5.27256, -2.67273, 0 )
-shape = SubResource( 55 )
+shape = SubResource( 74 )
[node name="Occluder5" type="Occluder" parent="occluders"]
transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -6.4678, -2.67273, 0 )
-shape = SubResource( 56 )
+shape = SubResource( 75 )
[node name="Occluder6" type="Occluder" parent="occluders"]
transform = Transform( 1.91069e-15, 1, -4.37114e-08, 4.37114e-08, -4.37114e-08, -1, -1, 0, -4.37114e-08, -3.16583, -5.57274, 0 )
-shape = SubResource( 57 )
+shape = SubResource( 76 )
[node name="Occluder9" type="Occluder" parent="occluders"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.43056, 29.8543 )
-shape = SubResource( 59 )
+shape = SubResource( 78 )
[node name="Occluder10" type="Occluder" parent="occluders"]
transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 2.94428, 48.0679 )