From 7a1d857de96174dfa5a0fa40f8c14acbd2f651c2 Mon Sep 17 00:00:00 2001 From: Anson Bridges Date: Sun, 25 Sep 2022 06:39:12 -0400 Subject: weapons, viewmodels, some performance fixes --- godot/maps/Main.tscn | 195 ++++++++++++++------------------------------------- 1 file changed, 52 insertions(+), 143 deletions(-) (limited to 'godot/maps') diff --git a/godot/maps/Main.tscn b/godot/maps/Main.tscn index ce69f18..9e7ea06 100644 --- a/godot/maps/Main.tscn +++ b/godot/maps/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=23 format=2] +[gd_scene load_steps=32 format=2] [ext_resource path="res://scripts/World.gd" type="Script" id=1] [ext_resource path="res://scenes/machines/Cannon.tscn" type="PackedScene" id=2] @@ -9,26 +9,53 @@ [ext_resource path="res://scenes/environment/Water.tscn" type="PackedScene" id=7] [ext_resource path="res://scenes/worldprops/dockscene.tscn" type="PackedScene" id=8] [ext_resource path="res://scenes/worldprops/housescene.tscn" type="PackedScene" id=9] +[ext_resource path="res://scenes/vehicles/Gunbrig.tscn" type="PackedScene" id=10] [ext_resource path="res://scenes/environment/CaptureFlag.tscn" type="PackedScene" id=11] [ext_resource path="res://scenes/environment/Ladder.tscn" type="PackedScene" id=12] [ext_resource path="res://scenes/worldprops/Runway.tscn" type="PackedScene" id=13] [ext_resource path="res://scenes/vehicles/Airplane.tscn" type="PackedScene" id=14] +[ext_resource path="res://scenes/weapons/hands.gd" type="Script" id=15] +[ext_resource path="res://scenes/ballistics/Cannonball.tscn" type="PackedScene" id=16] [sub_resource type="PhysicsMaterial" id=17] resource_local_to_scene = true rough = true +[sub_resource type="Resource" id=20] +resource_local_to_scene = true +script = ExtResource( 15 ) + [sub_resource type="PhysicsMaterial" id=18] resource_local_to_scene = true rough = true +[sub_resource type="Resource" id=21] +resource_local_to_scene = true +script = ExtResource( 15 ) + [sub_resource type="PhysicsMaterial" id=19] resource_local_to_scene = true rough = true -[sub_resource type="PhysicsMaterial" id=20] +[sub_resource type="Resource" id=22] resource_local_to_scene = true -rough = true +script = ExtResource( 15 ) + +[sub_resource type="Resource" id=23] +resource_local_to_scene = true +script = ExtResource( 15 ) + +[sub_resource type="Resource" id=24] +resource_local_to_scene = true +script = ExtResource( 15 ) + +[sub_resource type="Resource" id=25] +resource_local_to_scene = true +script = ExtResource( 15 ) + +[sub_resource type="Resource" id=26] +resource_local_to_scene = true +script = ExtResource( 15 ) [sub_resource type="NavigationMesh" id=14] vertices = PoolVector3Array( 7.53034, -0.161953, -20.3654, 6.53034, -0.411953, -23.3654, 2.53034, 0.338047, -21.3654, -3.46966, 0.588047, -19.3654, 7.53034, -0.161953, -20.3654, 2.53034, 0.338047, -21.3654, -3.46966, -0.161953, -22.3654, 1.53034, 1.83805, -16.3654, 5.53034, 2.08805, -15.3654, 4.53034, 1.58805, -17.3654, 6.53034, 2.58805, -11.3654, 13.5303, 1.83805, -10.3654, 12.5303, 1.33805, -14.3654, 5.53034, 2.08805, -15.3654, -16.4697, -1.41195, -12.3654, -16.4697, -0.911953, -10.3654, -12.4697, -0.411953, -11.3654, -16.4697, -1.41195, -12.3654, -12.4697, -0.411953, -11.3654, -16.4697, -1.91195, -14.3654, -18.4697, -2.16195, -12.3654, -16.4697, -1.41195, -12.3654, -16.4697, -1.91195, -14.3654, -23.4697, -1.91195, -14.3654, -19.9697, -2.41195, -14.3654, -23.4697, -1.91195, -14.3654, -23.4697, -0.411953, -5.36539, -17.4697, -1.16195, -8.36539, -18.4697, -2.16195, -12.3654, -9.46966, 3.83805, -3.36539, -9.46966, 3.83805, -2.36539, -8.46966, 3.83805, -2.36539, -7.46966, 3.83805, -4.36539, -9.46966, 3.83805, -4.36539, -9.46966, 3.83805, -3.36539, -8.46966, 3.83805, -2.36539, 17.5303, 1.58805, 0.634615, 12.5303, 2.58805, -0.365385, 10.5303, 3.08805, 0.634615, 9.53034, 3.08805, 2.63461, 12.5303, 2.08805, 9.63461, 16.5303, 1.33805, 8.63461, 17.0303, 1.58805, 4.63461, -7.46966, 3.83805, -4.36539, -8.46966, 3.83805, -2.36539, -7.46966, 3.83805, -1.36539, -5.46966, 3.33805, -7.36539, 0.530344, 3.83805, -9.36539, 2.53034, 3.83805, -9.36539, 1.53034, 3.83805, -13.3654, -10.4697, 2.58805, -9.36539, -9.46966, 3.08805, -6.36539, -7.46966, 3.33805, -6.36539, -5.46966, 3.33805, -7.36539, -7.46966, 2.08805, -14.3654, -6.46966, 3.08805, -10.8654, 1.53034, 3.58805, -4.36539, 2.53034, 3.83805, -6.36539, 0.530344, 3.83805, -9.36539, -5.46966, 3.33805, -7.36539, -0.469656, 3.33805, 4.63461, -2.46966, 3.33805, 3.63461, -1.46966, 2.83805, 6.63461, 0.530344, 2.83805, 10.6346, 1.53034, 3.58805, -4.36539, -5.46966, 3.33805, -7.36539, -7.46966, 3.83805, -1.36539, -2.46966, 3.33805, 3.63461, -0.469656, 3.33805, 4.63461, 4.53034, 3.33805, 0.634615, -5.46966, 3.33805, -7.36539, -7.46966, 3.33805, -6.36539, -7.46966, 3.83805, -4.36539, 4.53034, 3.33805, 0.634615, 2.53034, 3.83805, -3.36539, 1.53034, 3.58805, -4.36539, 16.5303, 1.58805, -7.36539, 14.5303, 2.08805, -7.36539, 12.5303, 2.58805, -0.365385, 17.5303, 1.58805, 0.634615, 0.530344, 3.83805, -9.36539, 1.53034, 3.83805, -13.3654, -4.46966, 3.83805, -13.3654, -5.46966, 3.33805, -7.36539, -1.46966, 2.83805, 6.63461, -3.46966, 3.33805, 4.63461, -8.46966, 2.83805, 6.63461, -3.46966, 2.08805, 15.6346, 0.530344, 2.83805, 10.6346, -2.46966, 1.83805, 16.6346, 4.53034, 1.83805, 16.6346, 0.530344, 2.83805, 10.6346, -3.46966, 2.08805, 15.6346, 4.53034, 3.33805, 0.634615, -0.469656, 3.33805, 4.63461, 1.53034, 3.08805, 6.63461, 9.53034, 3.08805, 2.63461, 10.5303, 3.08805, 0.634615, 5.53034, 3.33805, 4.63461, -8.46966, 3.33805, -0.365385, -8.46966, 3.83805, -2.36539, -9.46966, 3.83805, -2.36539, -11.4697, 3.33805, -3.36539, -9.46966, 3.83805, -3.36539, -9.46966, 3.83805, -4.36539, -5.46966, 1.33805, 17.6346, -2.46966, 1.83805, 16.6346, -3.46966, 2.08805, 15.6346, -6.46966, 1.58805, 15.6346, -8.46966, 2.83805, 6.63461, -3.46966, 3.33805, 4.63461, -2.46966, 3.33805, 3.63461, -7.46966, 3.83805, -1.36539, -8.46966, 3.33805, -0.365385, -11.4697, 2.58805, 5.63461, -6.46966, 1.58805, 15.6346, -3.46966, 2.08805, 15.6346, -7.46966, 1.58805, 13.6346, -11.4697, 3.33805, -3.36539, -9.46966, 3.83805, -4.36539, -9.46966, 3.08805, -6.36539, -10.4697, 2.58805, -9.36539, -14.4697, 1.83805, -8.36539, -13.4697, 2.58805, -5.36539, -8.46966, 3.33805, -0.365385, -9.46966, 3.83805, -2.36539, -11.4697, 3.33805, -3.36539, -20.4697, 1.58805, -1.36539, -20.4697, 1.08805, 3.63461, -17.4697, 2.08805, 1.63461, -18.4697, 2.08805, -3.36539, -11.4697, 1.08805, 15.6346, -6.46966, 1.58805, 15.6346, -7.46966, 1.58805, 13.6346, -11.4697, 1.83805, 12.6346, -24.4697, 1.58805, -3.36539, -25.4697, 1.58805, -13.3654, -27.4697, 1.58805, -13.3654, -28.4697, 1.58805, -2.36539, -14.4697, 2.33805, 4.63461, -14.4697, 1.33805, 11.6346, -11.4697, 2.08805, 7.63461, -11.4697, 2.58805, 5.63461, -17.4697, 2.08805, 1.63461, -14.4697, 2.33805, 4.63461, -11.4697, 2.58805, 5.63461, -8.46966, 3.33805, -0.365385, -11.4697, 3.33805, -3.36539, -18.4697, 2.08805, -3.36539, -13.4697, 2.58805, -5.36539, -16.4697, 1.58805, -6.36539, -18.4697, 2.08805, -3.36539, -11.4697, 3.33805, -3.36539, -11.4697, 1.83805, 12.6346, -7.46966, 1.58805, 13.6346, -8.46966, 2.58805, 8.63461, -11.4697, 2.08805, 7.63461, -14.4697, 1.33805, 11.6346, -24.4697, 1.58805, -3.36539, -28.4697, 1.58805, -2.36539, -20.4697, 1.58805, -1.36539, -18.4697, 2.08805, -3.36539, 4.53034, 4.33805, -5.36539, 1.53034, 3.58805, -4.36539, 2.53034, 3.83805, -3.36539, 4.53034, 4.33805, -3.36539, 6.53034, 4.08805, -7.36539, 4.53034, 4.33805, -5.36539, 4.53034, 4.33805, -3.36539, 6.53034, 4.08805, -7.36539, 4.53034, 3.83805, -13.3654, 1.53034, 3.83805, -13.3654, 2.53034, 3.83805, -9.36539, 4.53034, 4.33805, -5.36539, 4.53034, 4.33805, -3.36539, 4.53034, 4.08805, -1.36539, 9.53034, 4.08805, -2.36539, 10.5303, 3.58805, -8.36539, 6.53034, 4.08805, -7.36539, 3.53034, 2.83805, 8.63461, 5.53034, 2.33805, 12.6346, 9.53034, 2.33805, 10.6346, 8.53034, 2.83805, 6.63461, -19.4697, -0.661953, 7.63461, -19.4697, -1.41195, 10.6346, -17.4697, -0.911953, 10.6346, -16.4697, 0.088047, 13.6346, -12.4697, 0.338047, 16.6346, -13.4697, 0.838047, 13.6346 ) @@ -92,178 +119,60 @@ transform = Transform( -0.854422, 0, 0.519579, 0, 1, 0, -0.519579, 0, -0.854422, [node name="Airplane" parent="MACHINES" instance=ExtResource( 14 )] transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 30.8999, 5.13129, -8.23008 ) +[node name="Gunbrig" parent="MACHINES" instance=ExtResource( 10 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -49.9367, 0.0469036, -4.88982 ) + +[node name="Gunbrig2" parent="MACHINES" instance=ExtResource( 10 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -49.9367, 0.0469036, 5.81905 ) + +[node name="Gunbrig3" parent="MACHINES" instance=ExtResource( 10 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -49.9367, 0.0469036, -18.4704 ) + +[node name="Gunbrig4" parent="MACHINES" instance=ExtResource( 10 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -49.9367, 0.0469036, -33.3132 ) + [node name="BALLISTICS" type="Spatial" parent="."] +[node name="Cannonball" parent="BALLISTICS" instance=ExtResource( 16 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.1422, 4.06477, -6.08684 ) + [node name="PLAYERS" type="Spatial" parent="."] [node name="Player" parent="PLAYERS" instance=ExtResource( 5 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 28.8794, 2.55194, 2.65124 ) physics_material_override = SubResource( 17 ) +weapon = SubResource( 20 ) [node name="Player2" parent="PLAYERS" instance=ExtResource( 5 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -10.1844, 3.62129, 0.930942 ) physics_material_override = SubResource( 18 ) team = "BLUE" +weapon = SubResource( 21 ) [node name="Player3" parent="PLAYERS" instance=ExtResource( 5 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.426252, 5.22026, -3.48068 ) physics_material_override = SubResource( 19 ) +weapon = SubResource( 22 ) [node name="Player5" parent="PLAYERS" instance=ExtResource( 5 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.86776, 6.37388, -1.22525 ) physics_material_override = SubResource( 19 ) +weapon = SubResource( 23 ) [node name="Player7" parent="PLAYERS" instance=ExtResource( 5 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.11742, 6.37388, 0.816121 ) physics_material_override = SubResource( 19 ) +weapon = SubResource( 24 ) [node name="Player8" parent="PLAYERS" instance=ExtResource( 5 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.888317, 6.37388, 1.86328 ) physics_material_override = SubResource( 19 ) +weapon = SubResource( 25 ) [node name="Player9" parent="PLAYERS" instance=ExtResource( 5 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.819816, 6.37388, 2.89708 ) physics_material_override = SubResource( 19 ) - -[node name="Player10" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.32924, 6.37388, 3.36926 ) -physics_material_override = SubResource( 19 ) - -[node name="Player11" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.1816, 6.37388, 1.54801 ) -physics_material_override = SubResource( 19 ) - -[node name="Player12" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.9985, 6.37388, 2.34811 ) -physics_material_override = SubResource( 19 ) - -[node name="Player13" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5.30355, 7.43823, -0.851583 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player14" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.95018, 7.43823, -0.851583 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player15" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.95018, 7.43823, -3.20183 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player16" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.87781, 7.43823, -3.20183 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player17" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.87781, 7.43823, 3.13773 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player18" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -7.0239, 7.43823, 3.13773 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player19" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -7.0239, 7.43823, -0.817495 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player20" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5.12393, 7.43823, -0.224145 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player21" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5.12393, 7.43823, 2.2347 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player22" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3.38949, 7.43823, 0.619112 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player23" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3.38949, 7.43823, 5.61911 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player24" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.42406, 7.43823, 4.66007 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player25" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8.20856, 7.43823, 7.0694 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player26" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -9.76747, 7.43823, 4.50223 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player27" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -11.5136, 7.43823, 6.91273 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player28" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.33851, 7.43823, 11.0765 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player29" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5.96565, 7.43823, 8.55268 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player30" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8.96565, 7.43823, 9.55268 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player31" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -12.9657, 7.43823, 2.55268 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player32" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5.41254, 7.43823, -1.05999 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player33" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.376633, 7.43823, 6.84529 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player34" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.14765, 7.43823, 12.3432 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player35" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5.14397, 7.43823, 13.8279 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player36" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.4609, 7.43823, 15.8727 ) -physics_material_override = SubResource( 19 ) -can_sleep = false - -[node name="Player6" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.47871, 6.03278, -0.287899 ) -physics_material_override = SubResource( 19 ) - -[node name="Player4" parent="PLAYERS" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.71668, 5.22026, -2.44181 ) -physics_material_override = SubResource( 20 ) +weapon = SubResource( 26 ) [node name="worldnavmesh" type="NavigationMeshInstance" parent="."] navmesh = SubResource( 14 ) -- cgit v1.2.3