network work work workHEADmaster

1 files changed, 205 insertions, 2 deletions

diff --git a/godot/scenes/vehicles/Gunbrig.tscn b/godot/scenes/vehicles/Gunbrig.tscn
index 205b03c..ac7fb13 100644
--- a/godot/scenes/vehicles/Gunbrig.tscn
+++ b/godot/scenes/vehicles/Gunbrig.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=29 format=2]
+[gd_scene load_steps=69 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]
@@ -13,6 +13,11 @@
 [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]
+[ext_resource path="res://scenes/weapons/hands.gd" type="Script" id=14]
+[ext_resource path="res://scenes/weapons/pistol.gd" type="Script" id=15]
+[ext_resource path="res://scenes/weapons/rockets.gd" type="Script" id=16]
+[ext_resource path="res://scenes/characters/PlayerRigid.tscn" type="PackedScene" id=17]
+[ext_resource path="res://scenes/weapons/grapplinghook.gd" type="Script" id=18]
 
 [sub_resource type="PhysicsMaterial" id=28]
 resource_local_to_scene = true
@@ -67,6 +72,146 @@ extents = Vector3( 10.0294, 0.598376, 0.166381 )
 [sub_resource type="PhysicsMaterial" id=49]
 resource_local_to_scene = true
 
+[sub_resource type="PhysicsMaterial" id=52]
+resource_local_to_scene = true
+rough = true
+
+[sub_resource type="Resource" id=53]
+resource_local_to_scene = true
+script = ExtResource( 14 )
+
+[sub_resource type="Resource" id=54]
+resource_local_to_scene = true
+script = ExtResource( 15 )
+
+[sub_resource type="Resource" id=55]
+resource_local_to_scene = true
+script = ExtResource( 16 )
+
+[sub_resource type="Resource" id=56]
+resource_local_to_scene = true
+script = ExtResource( 18 )
+
+[sub_resource type="PhysicsMaterial" id=57]
+resource_local_to_scene = true
+rough = true
+
+[sub_resource type="Resource" id=58]
+resource_local_to_scene = true
+script = ExtResource( 14 )
+
+[sub_resource type="Resource" id=59]
+resource_local_to_scene = true
+script = ExtResource( 15 )
+
+[sub_resource type="Resource" id=60]
+resource_local_to_scene = true
+script = ExtResource( 16 )
+
+[sub_resource type="Resource" id=61]
+resource_local_to_scene = true
+script = ExtResource( 18 )
+
+[sub_resource type="PhysicsMaterial" id=62]
+resource_local_to_scene = true
+rough = true
+
+[sub_resource type="Resource" id=63]
+resource_local_to_scene = true
+script = ExtResource( 14 )
+
+[sub_resource type="Resource" id=64]
+resource_local_to_scene = true
+script = ExtResource( 15 )
+
+[sub_resource type="Resource" id=65]
+resource_local_to_scene = true
+script = ExtResource( 16 )
+
+[sub_resource type="Resource" id=66]
+resource_local_to_scene = true
+script = ExtResource( 18 )
+
+[sub_resource type="PhysicsMaterial" id=67]
+resource_local_to_scene = true
+rough = true
+
+[sub_resource type="Resource" id=68]
+resource_local_to_scene = true
+script = ExtResource( 14 )
+
+[sub_resource type="Resource" id=69]
+resource_local_to_scene = true
+script = ExtResource( 15 )
+
+[sub_resource type="Resource" id=70]
+resource_local_to_scene = true
+script = ExtResource( 16 )
+
+[sub_resource type="Resource" id=71]
+resource_local_to_scene = true
+script = ExtResource( 18 )
+
+[sub_resource type="PhysicsMaterial" id=72]
+resource_local_to_scene = true
+rough = true
+
+[sub_resource type="Resource" id=73]
+resource_local_to_scene = true
+script = ExtResource( 14 )
+
+[sub_resource type="Resource" id=74]
+resource_local_to_scene = true
+script = ExtResource( 15 )
+
+[sub_resource type="Resource" id=75]
+resource_local_to_scene = true
+script = ExtResource( 16 )
+
+[sub_resource type="Resource" id=76]
+resource_local_to_scene = true
+script = ExtResource( 18 )
+
+[sub_resource type="PhysicsMaterial" id=77]
+resource_local_to_scene = true
+rough = true
+
+[sub_resource type="Resource" id=78]
+resource_local_to_scene = true
+script = ExtResource( 14 )
+
+[sub_resource type="Resource" id=79]
+resource_local_to_scene = true
+script = ExtResource( 15 )
+
+[sub_resource type="Resource" id=80]
+resource_local_to_scene = true
+script = ExtResource( 16 )
+
+[sub_resource type="Resource" id=81]
+resource_local_to_scene = true
+script = ExtResource( 18 )
+
+[sub_resource type="PhysicsMaterial" id=82]
+resource_local_to_scene = true
+rough = true
+
+[sub_resource type="Resource" id=83]
+resource_local_to_scene = true
+script = ExtResource( 14 )
+
+[sub_resource type="Resource" id=84]
+resource_local_to_scene = true
+script = ExtResource( 15 )
+
+[sub_resource type="Resource" id=85]
+resource_local_to_scene = true
+script = ExtResource( 16 )
+
+[sub_resource type="Resource" id=86]
+resource_local_to_scene = true
+script = ExtResource( 18 )
+
 [node name="Gunbrig" type="RigidBody"]
 mass = 238000.0
 physics_material_override = SubResource( 28 )
@@ -399,9 +544,67 @@ transform = Transform( 0.999486, 0, 0.0320562, 0, 1, 0, -0.0320562, 0, 0.999486,
 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 )
+transform = Transform( 0.998321, 0, 0.0579299, 0, 1, 0, -0.0579299, 0, 0.998321, -2.08404, 0.672074, 0.05643 )
 mode = 1
 mass = 0.01
 physics_material_override = SubResource( 49 )
 
+[node name="CREW" type="Spatial" parent="."]
+
+[node name="Gunner" parent="CREW" instance=ExtResource( 17 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -7.73099, 0.0887609, 0.267168 )
+physics_material_override = SubResource( 52 )
+weapon_slot1 = SubResource( 53 )
+weapon_slot2 = SubResource( 54 )
+weapon_slot3 = SubResource( 55 )
+weapon_slot4 = SubResource( 56 )
+
+[node name="Marine" parent="CREW" instance=ExtResource( 17 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -11.9034, 2.42881, 0.487101 )
+physics_material_override = SubResource( 57 )
+weapon_slot1 = SubResource( 58 )
+weapon_slot2 = SubResource( 59 )
+weapon_slot3 = SubResource( 60 )
+weapon_slot4 = SubResource( 61 )
+
+[node name="Marine2" parent="CREW" instance=ExtResource( 17 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5.11721, 0.0885029, 0.317293 )
+physics_material_override = SubResource( 62 )
+weapon_slot1 = SubResource( 63 )
+weapon_slot2 = SubResource( 64 )
+weapon_slot3 = SubResource( 65 )
+weapon_slot4 = SubResource( 66 )
+
+[node name="Marine3" parent="CREW" instance=ExtResource( 17 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.497122, 0.0885086, -0.501039 )
+physics_material_override = SubResource( 67 )
+weapon_slot1 = SubResource( 68 )
+weapon_slot2 = SubResource( 69 )
+weapon_slot3 = SubResource( 70 )
+weapon_slot4 = SubResource( 71 )
+
+[node name="Marine4" parent="CREW" instance=ExtResource( 17 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.52864, 0.0885143, 1.41599 )
+physics_material_override = SubResource( 72 )
+weapon_slot1 = SubResource( 73 )
+weapon_slot2 = SubResource( 74 )
+weapon_slot3 = SubResource( 75 )
+weapon_slot4 = SubResource( 76 )
+
+[node name="Marine5" parent="CREW" instance=ExtResource( 17 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.31529, 0.0885148, 0.416997 )
+physics_material_override = SubResource( 77 )
+weapon_slot1 = SubResource( 78 )
+weapon_slot2 = SubResource( 79 )
+weapon_slot3 = SubResource( 80 )
+weapon_slot4 = SubResource( 81 )
+
+[node name="Marine6" parent="CREW" instance=ExtResource( 17 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 6.99667, 0.0885406, -0.204295 )
+physics_material_override = SubResource( 82 )
+weapon_slot1 = SubResource( 83 )
+weapon_slot2 = SubResource( 84 )
+weapon_slot3 = SubResource( 85 )
+weapon_slot4 = SubResource( 86 )
+
 [connection signal="navigation_mesh_changed" from="NavigationMeshInstance" to="NavigationMeshInstance" method="mesh_changed"]