1 files changed, 50 insertions, 5 deletions
diff --git a/godot/scenes/vehicles/Gunbrig.tscn b/godot/scenes/vehicles/Gunbrig.tscn
index 70a30ad..250eb69 100644
--- a/godot/scenes/vehicles/Gunbrig.tscn
+++ b/godot/scenes/vehicles/Gunbrig.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=25 format=2]
+[gd_scene load_steps=29 format=2]
 
 [ext_resource path="res://scripts/vehicles/Gunboat.gd" type="Script" id=1]
 [ext_resource path="res://scenes/machines/Cannon.tscn" type="PackedScene" id=2]
@@ -12,8 +12,10 @@
 [ext_resource path="res://scenes/environment/Cable.tscn" type="PackedScene" id=10]
 [ext_resource path="res://meshes/ship_components/rudder.tres" type="ArrayMesh" id=11]
 [ext_resource path="res://scenes/vehicles/ship_parts/SquareSail.tscn" type="PackedScene" id=12]
+[ext_resource path="res://scenes/environment/BallBarrel.tscn" type="PackedScene" id=13]
 
 [sub_resource type="PhysicsMaterial" id=28]
+resource_local_to_scene = true
 rough = true
 
 [sub_resource type="BoxShape" id=5]
@@ -22,6 +24,9 @@ extents = Vector3( 0.2, 0.2, 0.2 )
 [sub_resource type="CubeMesh" id=6]
 size = Vector3( 0.4, 0.4, 0.4 )
 
+[sub_resource type="PhysicsMaterial" id=50]
+resource_local_to_scene = true
+
 [sub_resource type="BoxShape" id=7]
 extents = Vector3( 0.1, 0.1, 0.1 )
 
@@ -45,17 +50,23 @@ extents = Vector3( 1.20173, 0.287114, 1.17431 )
 extents = Vector3( 0.294164, 0.287114, 7.50894 )
 
 [sub_resource type="NavigationMesh" id=26]
-vertices = PoolVector3Array( -11.5351, 2.7234, -0.635424, -10.5351, 2.7234, -1.13542, -10.5351, 2.7234, -3.13542, -13.5351, 2.7234, -3.13542, -13.5351, 2.7234, 2.86458, -10.5351, 2.7234, 2.86458, -11.5351, 2.7234, -0.635424, -13.5351, 2.7234, -3.13542, 9.46486, 1.9734, 2.86458, 10.9649, 1.7234, 2.86458, 13.4649, 1.9734, 0.864576, 12.4649, 1.9734, -1.63542, 9.46486, 1.9734, -3.13542, -4.03514, 0.473404, 2.36458, -3.53514, 0.473404, 1.36458, -4.53514, 0.473404, 0.864576, -9.53514, 0.473404, 2.36458, -4.53514, 0.473404, -0.635424, -3.03514, 0.473404, -1.13542, -3.03514, 0.473404, -2.63542, -9.53514, 0.473404, -2.13542, -4.53514, 0.473404, 0.864576, -4.53514, 0.473404, -0.635424, -9.53514, 0.473404, -2.13542, -9.53514, 0.473404, 2.36458, -2.03514, 0.473404, 0.364576, -3.53514, 0.473404, 1.36458, -4.03514, 0.473404, 2.36458, 1.46486, 0.473404, 2.86458, -3.03514, 0.473404, -2.63542, -3.03514, 0.473404, -1.13542, -2.03514, 0.473404, 0.364576, 1.46486, 0.473404, 2.86458, 7.96486, 0.473404, 2.86458, 7.96486, 0.473404, -2.63542 )
-polygons = [ PoolIntArray( 1, 0, 2 ), PoolIntArray( 2, 0, 3 ), PoolIntArray( 5, 4, 6 ), PoolIntArray( 6, 4, 7 ), PoolIntArray( 9, 8, 10 ), PoolIntArray( 10, 8, 11 ), PoolIntArray( 11, 8, 12 ), PoolIntArray( 14, 13, 15 ), PoolIntArray( 15, 13, 16 ), PoolIntArray( 18, 17, 19 ), PoolIntArray( 19, 17, 20 ), PoolIntArray( 21, 24, 22 ), PoolIntArray( 22, 24, 23 ), PoolIntArray( 26, 25, 27 ), PoolIntArray( 27, 25, 28 ), PoolIntArray( 30, 29, 31 ), PoolIntArray( 31, 29, 32 ), PoolIntArray( 32, 29, 33 ), PoolIntArray( 33, 29, 34 ) ]
+vertices = PoolVector3Array( -11.5351, 2.7234, -0.635424, -10.5351, 2.7234, -1.13542, -10.5351, 2.7234, -3.13542, -13.5351, 2.7234, -3.13542, -13.5351, 2.7234, 2.86458, -10.5351, 2.7234, 2.86458, -11.5351, 2.7234, -0.635424, -13.5351, 2.7234, -3.13542, 9.46486, 1.9734, 2.86458, 10.9649, 1.7234, 2.86458, 13.4649, 1.9734, 0.864576, 12.4649, 1.9734, -1.63542, 9.46486, 1.9734, -3.13542, -4.03514, 0.473404, 2.36458, -3.53514, 0.473404, 1.36458, -4.53514, 0.473404, 0.864576, -9.53514, 0.473404, 2.36458, -4.53514, 0.473404, -0.635424, -2.53514, 0.473404, -1.13542, -2.53514, 0.473404, -2.63542, -9.53514, 0.473404, -2.13542, -4.53514, 0.473404, 0.864576, -4.53514, 0.473404, -0.635424, -9.53514, 0.473404, -2.13542, -9.53514, 0.473404, 2.36458, -2.53514, 0.473404, -2.63542, -2.53514, 0.473404, -1.13542, -1.03514, 0.473404, -0.635424, 7.96486, 0.473404, -2.63542, -1.03514, 0.473404, 0.864576, -3.53514, 0.473404, 1.36458, -4.03514, 0.473404, 2.36458, 1.46486, 0.473404, 2.86458, -1.03514, 0.473404, -0.635424, -1.03514, 0.473404, 0.864576, 1.46486, 0.473404, 2.86458, 7.96486, 0.473404, 2.86458, 7.96486, 0.473404, -2.63542 )
+polygons = [ PoolIntArray( 1, 0, 2 ), PoolIntArray( 2, 0, 3 ), PoolIntArray( 5, 4, 6 ), PoolIntArray( 6, 4, 7 ), PoolIntArray( 9, 8, 10 ), PoolIntArray( 10, 8, 11 ), PoolIntArray( 11, 8, 12 ), PoolIntArray( 14, 13, 15 ), PoolIntArray( 15, 13, 16 ), PoolIntArray( 18, 17, 19 ), PoolIntArray( 19, 17, 20 ), PoolIntArray( 21, 24, 22 ), PoolIntArray( 22, 24, 23 ), PoolIntArray( 26, 25, 27 ), PoolIntArray( 27, 25, 28 ), PoolIntArray( 30, 29, 31 ), PoolIntArray( 31, 29, 32 ), PoolIntArray( 34, 33, 35 ), PoolIntArray( 35, 33, 36 ), PoolIntArray( 36, 33, 37 ) ]
 cell_size = 0.5
 agent_height = 1.8
 agent_radius = 0.18
 agent_max_slope = 46.0
 region_min_size = 3.0
 
+[sub_resource type="CubeMesh" id=51]
+size = Vector3( 2, 2, 1.1 )
+
 [sub_resource type="BoxShape" id=36]
 extents = Vector3( 10.0294, 0.598376, 0.166381 )
 
+[sub_resource type="PhysicsMaterial" id=49]
+resource_local_to_scene = true
+
 [node name="Gunbrig" type="RigidBody"]
 mass = 238000.0
 physics_material_override = SubResource( 28 )
@@ -77,39 +88,63 @@ mesh = SubResource( 6 )
 
 [node name="Cannon" parent="ARTILLERY" instance=ExtResource( 2 )]
 transform = Transform( 1.31134e-07, 0, -1, 0, 1, 0, 1, 0, 1.31134e-07, 6.33448, 0.107111, 3.3196 )
+mode = 3
+physics_material_override = SubResource( 50 )
 
 [node name="Cannon2" parent="ARTILLERY" instance=ExtResource( 2 )]
 transform = Transform( 1.31134e-07, 0, -1, 0, 1, 0, 1, 0, 1.31134e-07, 3.36645, 0.107111, 3.3196 )
+mode = 3
+physics_material_override = SubResource( 50 )
 
 [node name="Cannon3" parent="ARTILLERY" instance=ExtResource( 2 )]
 transform = Transform( 1.31134e-07, 0, -1, 0, 1, 0, 1, 0, 1.31134e-07, 0.322236, 0.107111, 3.3196 )
+mode = 3
+physics_material_override = SubResource( 50 )
 
 [node name="Cannon4" parent="ARTILLERY" instance=ExtResource( 2 )]
 transform = Transform( 1.31134e-07, 0, -1, 0, 1, 0, 1, 0, 1.31134e-07, -2.66973, 0.107111, 3.21655 )
+mode = 3
+physics_material_override = SubResource( 50 )
 
 [node name="Cannon5" parent="ARTILLERY" instance=ExtResource( 2 )]
 transform = Transform( 1.31134e-07, 0, -1, 0, 1, 0, 1, 0, 1.31134e-07, -5.62184, 0.107111, 3.19748 )
+mode = 3
+physics_material_override = SubResource( 50 )
 
 [node name="Cannon6" parent="ARTILLERY" instance=ExtResource( 2 )]
 transform = Transform( 1.31134e-07, 0, -1, 0, 1, 0, 1, 0, 1.31134e-07, -8.72409, 0.107111, 2.8206 )
+mode = 3
+physics_material_override = SubResource( 50 )
 
 [node name="Cannon7" parent="ARTILLERY" instance=ExtResource( 2 )]
 transform = Transform( -0.0811907, 0, 0.996699, 0, 1, 0, -0.996699, 0, -0.0811907, -8.6751, 0.107111, -2.89481 )
+mode = 3
+physics_material_override = SubResource( 50 )
 
 [node name="Cannon8" parent="ARTILLERY" instance=ExtResource( 2 )]
 transform = Transform( -2.18557e-07, 0, 1, 0, 1, 0, -1, 0, -2.18557e-07, -5.70608, 0.107111, -3.29825 )
+mode = 3
+physics_material_override = SubResource( 50 )
 
 [node name="Cannon9" parent="ARTILLERY" instance=ExtResource( 2 )]
 transform = Transform( -2.18557e-07, 0, 1, 0, 1, 0, -1, 0, -2.18557e-07, -2.67884, 0.107111, -3.31267 )
+mode = 3
+physics_material_override = SubResource( 50 )
 
 [node name="Cannon10" parent="ARTILLERY" instance=ExtResource( 2 )]
 transform = Transform( -2.18557e-07, 0, 1, 0, 1, 0, -1, 0, -2.18557e-07, 0.421378, 0.107111, -3.35383 )
+mode = 3
+physics_material_override = SubResource( 50 )
 
 [node name="Cannon11" parent="ARTILLERY" instance=ExtResource( 2 )]
 transform = Transform( 0.0172777, 0, 0.999851, 0, 1, 0, -0.999851, 0, 0.0172777, 3.36481, 0.107111, -3.38258 )
+mode = 3
+physics_material_override = SubResource( 50 )
 
 [node name="Cannon12" parent="ARTILLERY" instance=ExtResource( 2 )]
 transform = Transform( -2.18557e-07, 0, 1, 0, 1, 0, -1, 0, -2.18557e-07, 6.37315, 0.107111, -3.35613 )
+mode = 3
+physics_material_override = SubResource( 50 )
 
 [node name="FloatPoints" type="Spatial" parent="."]
 
@@ -285,7 +320,7 @@ transform = Transform( 0.949512, -0.0304534, 0, 0.0304534, 0.949512, 0, 0, 0, 0.
 transform = Transform( 0.797373, -0.0647854, 0, 0.0647854, 0.797373, 0, 0, 0, 0.8, -3.33794, 24.7801, 0 )
 
 [node name="CollisionShape" type="CollisionShape" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3.3912, 5.52662, 0.0706616 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3.29681, 5.52662, 0.0706616 )
 shape = SubResource( 33 )
 
 [node name="CollisionShape2" type="CollisionShape" parent="."]
@@ -298,7 +333,6 @@ shape = SubResource( 35 )
 
 [node name="NavigationMeshInstance" type="NavigationMeshInstance" parent="."]
 navmesh = SubResource( 26 )
-enabled = false
 
 [node name="Hull" type="MeshInstance" parent="NavigationMeshInstance"]
 visible = false
@@ -350,6 +384,11 @@ transform = Transform( 0.926234, 1.7263e-09, 0.0323448, 0.0323448, -1.10483e-07,
 visible = false
 mesh = ExtResource( 7 )
 
+[node name="MeshInstance" type="MeshInstance" parent="NavigationMeshInstance"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.60567, 0.683043, 0 )
+visible = false
+mesh = SubResource( 51 )
+
 [node name="GunwhaleR" type="CollisionShape" parent="."]
 transform = Transform( 0.999486, 0, -0.0320562, 0, 1, 0, 0.0320562, 0, 0.999486, -0.646409, 0.658986, 3.50438 )
 shape = SubResource( 36 )
@@ -358,4 +397,10 @@ shape = SubResource( 36 )
 transform = Transform( 0.999486, 0, 0.0320562, 0, 1, 0, -0.0320562, 0, 0.999486, -0.646409, 0.658986, -3.46571 )
 shape = SubResource( 36 )
 
+[node name="BallBarrel" parent="." instance=ExtResource( 13 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.93881, 0.836955, 0.05643 )
+mode = 1
+mass = 0.01
+physics_material_override = SubResource( 49 )
+
 [connection signal="navigation_mesh_changed" from="NavigationMeshInstance" to="NavigationMeshInstance" method="mesh_changed"]