diff --git a/assets/Audio/Enemy SFX/servo loop_mixdown.wav b/assets/Audio/Enemy SFX/servo loop_mixdown.wav new file mode 100644 index 0000000..a8d4862 Binary files /dev/null and b/assets/Audio/Enemy SFX/servo loop_mixdown.wav differ diff --git a/assets/Audio/Enemy SFX/servo loop_mixdown.wav.import b/assets/Audio/Enemy SFX/servo loop_mixdown.wav.import new file mode 100644 index 0000000..3b06a40 --- /dev/null +++ b/assets/Audio/Enemy SFX/servo loop_mixdown.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://baf2pywa43qeu" +path="res://.godot/imported/servo loop_mixdown.wav-b041ad0177f5fc89f0a6f0bc2694d0f5.sample" + +[deps] + +source_file="res://assets/Audio/Enemy SFX/servo loop_mixdown.wav" +dest_files=["res://.godot/imported/servo loop_mixdown.wav-b041ad0177f5fc89f0a6f0bc2694d0f5.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=2 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/Audio/Enemy SFX/servo-motor-SBA-300109173 - LOOP.mp3 b/assets/Audio/Enemy SFX/servo-motor-SBA-300109173 - LOOP.mp3 new file mode 100644 index 0000000..276a9c8 Binary files /dev/null and b/assets/Audio/Enemy SFX/servo-motor-SBA-300109173 - LOOP.mp3 differ diff --git a/assets/Audio/Enemy SFX/servo-motor-SBA-300109173 - LOOP.mp3.import b/assets/Audio/Enemy SFX/servo-motor-SBA-300109173 - LOOP.mp3.import new file mode 100644 index 0000000..4246379 --- /dev/null +++ b/assets/Audio/Enemy SFX/servo-motor-SBA-300109173 - LOOP.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://rfcd10vkegto" +path="res://.godot/imported/servo-motor-SBA-300109173 - LOOP.mp3-463fc87717770b39917f7522526876eb.mp3str" + +[deps] + +source_file="res://assets/Audio/Enemy SFX/servo-motor-SBA-300109173 - LOOP.mp3" +dest_files=["res://.godot/imported/servo-motor-SBA-300109173 - LOOP.mp3-463fc87717770b39917f7522526876eb.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/spider2.tscn b/assets/spider2.tscn index 6b71b8e..549bf10 100644 --- a/assets/spider2.tscn +++ b/assets/spider2.tscn @@ -816,7 +816,7 @@ random_volume_offset_db = 0.3 streams_count = 1 stream_0/stream = ExtResource("24_ekglj") -[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_4ecf4"] +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_fborx"] random_pitch = 1.1 streams_count = 1 stream_0/stream = ExtResource("25_lr3lm") @@ -1090,8 +1090,8 @@ pitch_scale = 0.7 [node name="Reload" type="AudioStreamPlayer3D" parent="AUIDO"] stream = SubResource("AudioStreamRandomizer_ekglj") -[node name="Servo" type="AudioStreamPlayer3D" parent="AUIDO"] -stream = SubResource("AudioStreamRandomizer_4ecf4") +[node name="ServoSingle" type="AudioStreamPlayer3D" parent="AUIDO"] +stream = SubResource("AudioStreamRandomizer_fborx") volume_db = -2.5 unit_size = 5.0 diff --git a/levels/railyard1.tscn b/levels/railyard1.tscn index cfe3e8b..44fa8cb 100644 --- a/levels/railyard1.tscn +++ b/levels/railyard1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=3 uid="uid://bk4pn4k7n51ux"] +[gd_scene load_steps=14 format=3 uid="uid://bk4pn4k7n51ux"] [ext_resource type="Script" uid="uid://bkii8jwf0k7tq" path="res://scripts/LevelManager.gd" id="1_ti4uf"] [ext_resource type="PackedScene" uid="uid://cuay53oecttal" path="res://assets/LevelBlockouts/RailYard1.blend" id="2_rn3dc"] @@ -11,6 +11,7 @@ [ext_resource type="PackedScene" uid="uid://cp7tsicuudd6v" path="res://assets/boxcar_1.tscn" id="10_w886c"] [ext_resource type="Material" uid="uid://b765yni4pd83c" path="res://assets/materials/prototype/prototype_light.tres" id="11_w886c"] [ext_resource type="PackedScene" uid="uid://c7dhavrt11u55" path="res://enemy_spawner.tscn" id="12_qbq7k"] +[ext_resource type="PackedScene" uid="uid://clu76sc4uoswn" path="res://assets/rocketlauncher_pickup.tscn" id="12_rvq5w"] [sub_resource type="NavigationMesh" id="NavigationMesh_11ri7"] vertices = PackedVector3Array(-69.1204, -5.951, -87.8283, -74.1204, -5.951, -85.3283, -79.6204, -5.951, -81.0783, -85.3704, -5.701, -74.0783, -89.3704, -5.701, -66.3283, -84.3079, -4.201, -71.7033, -76.2079, -3.951, -80.3033, -73.1704, -4.201, -83.5283, -72.1579, -4.951, -84.6033, -79.3754, -4.701, -79.3313, -76.3954, -4.951, -82.3533, -35.6204, -5.701, -93.8283, -47.6204, -5.701, -93.3283, -97.3704, -5.701, -40.3283, -35.6204, 0.048996, -40.0783, -35.6204, -0.201004, -59.1509, -35.6204, -1.201, -78.2235, -35.6204, -2.451, -86.8928, -35.6204, -3.451, -90.3606, -60.5204, -5.201, -90.0283, -93.3866, -3.451, -40.3122, -89.4027, -2.451, -40.2961, -77.4511, -0.951004, -40.2477, -49.564, 0.048996, -40.1348, -58.379, -2.201, -82.3458, -85.3776, -2.451, -56.8056, -43.3947, -2.451, -86.8441, -91.3768, -3.951, -53.8365, -55.3753, -3.951, -89.8215, -64.3849, -3.951, -86.8479, -65.8492, -0.951004, -62.8059, -77.846, -2.201, -68.821, -70.3478, -2.201, -76.3191, -86.8902, -3.951, -65.8289, -43.3853, -3.951, -91.3374, -71.8688, -2.951, -80.8201, -59.8501, -3.951, -88.3067, -47.8904, -4.201, -91.3203, -80.8918, -2.951, -71.8072, -88.3744, -4.201, -62.8207, -47.8569, -0.951004, -73.3061, -65.854, -2.701, -82.3508, -67.3549, -4.451, -86.8199, -89.8895, -2.701, -46.338, -92.8595, -3.701, -46.31, -58.3746, -2.701, -85.3122, -70.3494, -3.951, -83.8474, -73.3482, -2.701, -77.8487, -85.353, -1.701, -41.8086, -83.8702, -2.951, -65.8069, -58.1204, -5.701, -91.5783, -93.1204, -5.701, -55.8283, 37.1296, -5.451, -84.0783, 27.6296, -5.701, -86.8283, 7.12958, -5.701, -90.8283, 12.6296, 0.048996, -39.0783, 34.6296, -0.201004, -49.3283, 35.8796, -0.951004, -66.7033, 36.4004, -1.701, -73.9429, 36.8171, -2.951, -79.7346, 37.0254, -4.451, -82.6304, 7.30699, -4.451, -89.159, 7.66183, -2.951, -85.8202, 8.54893, -1.451, -77.4735, 9.96829, -0.451004, -64.1186, 22.6209, -1.701, -77.8057, 27.1401, -3.451, -83.8528, 18.1397, -3.951, -86.8325, 13.6052, -2.201, -82.304, 21.1302, -2.451, -82.349, 25.6149, -3.951, -85.3176, 31.6451, -3.951, -83.8199, 31.6405, -2.701, -80.8134, 36.3796, -0.451004, -49.3283, 36.6608, -0.701004, -62.3596, 36.9108, -1.701, -73.9429, 37.0358, -2.951, -79.7346, 37.0983, -4.451, -82.6304, -14.6204, -5.701, -93.3283, -34.3704, -5.701, -93.8283, -34.3704, 0.298996, -12.8283, -7.62042, 0.298996, -28.3283, -0.483322, -0.201004, -58.5702, 4.27473, -1.451, -78.7315, 5.70216, -2.451, -84.7799, 6.65378, -4.201, -88.8122, -34.3704, -3.701, -91.2154, -34.3704, -2.201, -85.9896, -34.3704, -0.951004, -75.538, -34.3704, 0.048996, -49.409, -11.8644, -2.451, -86.8364, -19.3753, -3.951, -91.3215, -1.38991, -3.951, -89.8309, -23.8945, -2.451, -86.8243, -29.8704, -3.701, -91.3484, -7.3719, -0.951004, -74.8451, -2.89398, -2.451, -85.3349, -13.3852, -4.201, -91.3275, -14.8632, -1.451, -80.8377, -17.8544, -2.451, -86.8304, 47.8796, -3.951, -78.3283, 39.8796, -5.451, -83.0783, 36.6296, -0.451004, -49.0783, 43.5939, -1.201, -67.1855, 45.7367, -1.951, -72.7569, 39.1096, -2.951, -79.3203, 39.1046, -4.451, -82.3533, 98.1296, -4.201, -43.8283, 88.8796, -4.201, -53.3283, 88.3796, -4.201, -53.3283, 81.6296, -4.201, -59.5783, 73.8796, -4.201, -65.3283, 66.1296, -4.201, -70.0783, 76.8604, -3.951, -62.8091, 56.6296, -3.951, -74.8283, 36.1296, -0.201004, -48.0783, 49.6296, -0.201004, -32.0783, 49.8796, -0.201004, -32.5783, 36.6296, -0.201004, -48.3283, 86.1296, -1.451, -32.5783, 73.0796, -0.701004, -32.5783, 82.8138, -2.451, -52.473, 82.1033, -3.201, -56.7362, 60.1318, -1.201, -58.3207, 63.1053, -2.451, -67.3441, 72.1113, -2.451, -61.3322, 58.6048, -2.951, -71.8336, 67.6103, -3.201, -67.3111, 76.6254, -1.201, -43.3405, 49.6096, -2.701, -74.8203, 64.616, -1.951, -62.8288, 48.1384, -0.451004, -50.8094, 57.1152, -1.951, -67.338, 93.7659, -2.451, -39.7374, 49.6296, 0.048996, 17.6717, 51.8796, 0.048996, 17.4217, 51.8796, 0.048996, 15.9217, 49.6296, 0.048996, 15.6717, -26.1204, 0.298996, -7.07831, -28.1204, 0.298996, -6.82831, -34.3704, 0.298996, 39.9217, 49.6296, -0.201004, -6.82831, 51.8796, -0.201004, -7.07831, 51.8796, -0.201004, -9.57831, 49.6296, -0.201004, -9.82831, 10.8796, 0.048996, -36.3283, -27.6204, 0.298996, -14.8283, -27.6204, 0.298996, -8.57831, -26.6204, 0.298996, -8.57831, -6.12042, 0.298996, -27.3283, 49.6296, 0.048996, 39.9217, -34.3704, 0.298996, -6.57831, 86.6296, -1.451, -32.0783, 103.88, -4.451, -37.3283, 97.245, -2.451, -35.3091, 101.226, -3.201, -36.5206, 84.3796, -0.701004, 15.9217, 84.3796, -0.701004, 17.4217, 86.3796, -0.701004, 17.4217, 86.6296, -0.701004, 15.6717, 122.88, -6.451, -16.5783, 108.13, -6.451, -36.0783, 86.6296, -0.951004, -6.82831, 100.662, -1.201, 3.18782, 113.525, -2.451, -8.25572, 120.541, -4.451, -14.4977, 115.071, -6.201, -26.9018, 107.27, -5.201, -34.9083, 105.55, -3.701, -32.5683, 101.25, -2.201, -26.7183, 96.0896, -1.451, -19.6983, 111.125, -3.201, -22.332, 111.13, -4.451, -28.3385, 114.125, -4.451, -23.8419, 108.105, -3.201, -26.8336, 115.611, -3.201, -14.842, 120.136, -4.951, -16.3068, 86.6296, -0.701004, 17.9217, 86.6296, -0.951004, -9.82831, 84.3796, -0.951004, -9.57831, 84.3796, -0.701004, -7.07831, 106.26, -4.201, -33.7957, 104.39, -3.201, -31.5131, 100.651, -2.201, -26.9479, 102.63, -5.951, -41.8283, 104.63, -5.201, -38.3283, 104.63, -4.701, -37.5783, 134.63, -6.701, 3.42169, 129.88, -6.701, -5.32831, 141.13, -6.701, 17.6717, 100.694, -0.951004, 17.8572, 125.307, -2.451, 17.7443, 135.855, -4.201, 17.6959, 137.613, -4.701, 17.6878, 129.128, -3.201, 12.1549, 124.615, -4.201, -5.80777, 132.147, -4.701, 6.16832, 118.607, -2.201, 7.69411, 127.642, -3.451, 6.18535, 129.106, -4.951, -1.32434, 123.126, -2.951, 3.14699, 126.15, -4.701, -5.84679, -111.37, -5.451, 4.67169, -120.12, -5.701, 22.9217, -104.87, -1.451, 27.9217, -109.076, -2.951, 12.8776, -115.961, -3.451, 24.2853, -112.35, -3.701, 13.6736, -109.39, -2.201, 22.6691, -116.86, -4.201, 21.1873, -110.875, -3.701, 10.6687, -82.6204, -0.451004, 16.1717, -106.12, -5.451, -9.07831, -96.9248, -1.701, 0.802124, -104.077, -3.701, -6.88266, -107.86, -3.701, 3.18729, -98.849, -1.451, 13.6822, -103.355, -2.201, 7.64987, -107.895, -3.451, 6.19604, -101.88, -2.451, 0.155441, -109.395, -3.701, 7.65591, -101.62, -5.451, -23.5783, -35.6204, 0.298996, -11.8283, -99.1413, -5.951, -33.3491, -99.7204, -3.701, -19.6033, -97.1871, -2.451, -14.3033, -92.7538, -1.451, -5.02831, -95.874, -3.701, -34.3129, -89.8694, -2.201, -35.8194, -70.395, -0.201004, -7.31046, -83.8728, -0.951004, -16.3424, -91.3659, -1.951, -25.3331, -97.3675, -3.701, -29.8115, -98.8854, -3.701, -23.8156, -97.359, -4.451, -34.3239, -95.8949, -3.951, -37.3138, -92.8829, -2.451, -31.34, -91.3899, -2.451, -37.3309, -103.365, -3.951, -10.3055, -98.8851, -2.451, -8.81764, -100.395, -2.451, -4.31383, 50.6296, 13.549, -31.5783, 50.6296, 13.549, -10.5783, 85.6296, 13.549, -10.5783, 85.6296, 13.549, -31.5783, 85.3796, -0.951004, -10.8283, 85.3796, -0.951004, -30.0783, 84.6296, -0.951004, -31.3283, 50.8796, -0.201004, -31.3283, 50.8796, -0.201004, -10.8283, 63.8171, -0.201004, -10.8283, -28.6204, 0.298996, -7.07831, -28.6204, 0.298996, -8.07831, -34.3704, 0.298996, -10.8283, -54.1204, -0.201004, 83.1717, -53.6204, -0.451004, 84.1717, -35.6204, -0.201004, 84.1717, -72.1204, -0.201004, 67.6717, -72.1204, -0.201004, 68.4217, -55.3704, -0.201004, 83.1717, -74.1204, -0.201004, 12.9217, -73.6204, -0.201004, 66.9217, -72.8704, -0.201004, 66.9217, -35.6204, 0.298996, -10.0783, -35.6204, 0.298996, 47.6878, 63.6978, -0.201004, -9.57831, 50.6296, 13.549, -6.07831, 50.6296, 13.549, 14.9217, 85.6296, 13.549, 14.9217, 85.6296, 13.549, -6.07831, 50.8796, -0.201004, -5.82831, 50.8796, 0.048996, 14.6717, 85.3796, -0.701004, 14.6717, 85.3796, -0.701004, -5.82831, 65.2546, -0.201004, -5.82831, -97.3704, -0.701004, 68.1717, -74.6204, -0.201004, 68.1717, -93.3704, -0.951004, 23.9217, -97.3704, -0.701004, 56.6717, -88.3738, -0.451004, 36.147, -105.12, -1.451, 29.6717, -105.12, -1.201, 56.4217, 86.6296, -0.451004, 31.9217, 145.88, -6.701, 31.6717, 111.476, -1.201, 31.8168, 130.589, -2.451, 31.7362, 136.323, -3.201, 31.712, 142.057, -4.701, 31.6878, 141.132, -4.701, 27.1589, 132.12, -3.201, 19.6653, 50.6296, 13.549, 18.4217, 50.6296, 13.549, 39.4217, 85.6296, 13.549, 39.4217, 85.6296, 13.549, 18.4217, 50.8796, 0.048996, 18.6717, 50.8796, 0.048996, 39.1717, 85.3796, -0.451004, 39.1717, 85.3796, -0.701004, 18.6717, -105.87, -1.701, 28.9217, -122.62, -5.701, 27.9217, -119.829, -4.201, 28.0884, -115.641, -2.951, 28.3384, -110.895, -2.201, 27.1566, -136.12, -5.701, 56.4217, -134.37, -4.951, 56.9217, -134.12, -4.701, 56.4217, -132.62, -5.701, 47.9217, -105.87, -1.701, 29.6717, -131.22, -3.701, 56.4217, -122.52, -2.201, 56.4217, -105.537, -1.201, 41.5606, -110.058, -1.951, 29.2342, -117.037, -3.201, 28.505, -122.893, -2.451, 49.6744, -122.89, -3.701, 36.1691, -128.883, -3.701, 49.6804, -118.375, -2.451, 39.1878, -119.86, -3.701, 30.1577, -112.388, -1.451, 52.6468, 86.6296, -0.451004, 40.1717, 84.6296, -0.451004, 40.4217, 84.6296, -0.451004, 42.1717, 86.6296, -0.451004, 42.4217, 105.742, -0.951004, 38.9539, 128.678, -2.201, 34.7927, 136.323, -3.201, 33.4056, 142.057, -4.451, 32.3652, 142.057, -4.451, 32.2201, 130.589, -2.451, 33.8652, 117.21, -1.451, 35.7846, 148.63, -6.451, 45.1717, 148.13, -6.701, 40.1717, 86.6296, -0.451004, 45.1717, 108.63, -0.951004, 45.1717, 130.63, -2.201, 45.1717, 140.63, -3.451, 45.1717, 144.63, -4.451, 45.1717, 144.14, -4.701, 37.6472, 51.6296, 0.048996, 42.1717, 51.6296, 0.048996, 40.4217, 49.8796, 0.048996, 40.4217, 49.6296, 0.048996, 42.4217, -34.3704, 0.298996, 44.4217, 49.6296, 0.048996, 44.4217, 50.6296, 25.799, 43.1717, 50.6296, 25.799, 64.1717, 85.6296, 25.799, 64.1717, 85.6296, 25.799, 43.1717, 50.8796, 0.048996, 43.4217, 50.8796, -0.201004, 63.9217, 85.3796, -0.451004, 63.9217, 85.3796, -0.451004, 43.4217, -34.3704, 0.048996, 62.9217, 49.6296, -0.201004, 62.9217, 149.13, -6.451, 64.9217, 149.63, -6.451, 62.6717, 149.63, -6.451, 50.6717, 86.8796, -0.451004, 64.6717, 114.992, -1.201, 64.7846, 135.073, -2.451, 64.8652, 141.097, -3.201, 64.8894, 145.113, -4.201, 64.9056, 145.636, -4.451, 49.6932, 141.138, -3.201, 55.6511, 147.149, -4.951, 58.696, 86.6296, -0.451004, 64.6717, -138.12, -5.951, 60.6717, -142.12, -5.951, 74.1717, -134.37, -3.451, 74.4217, -134.37, -3.951, 61.2967, -138.245, -4.201, 74.2967, -136.35, -4.201, 66.1736, -133.37, 9.549, 57.4217, -133.37, 9.549, 78.4217, -98.3704, 9.549, 78.4217, -98.3704, 9.549, 57.4217, -133.12, -4.201, 57.6717, -133.12, -3.201, 78.1717, -98.6204, -0.951004, 78.1717, -98.6204, -0.951004, 57.6717, -104.37, -0.951004, 57.6717, -123.058, -2.201, 57.6717, -133.12, -3.451, 64.9931, -123.058, -1.951, 78.1717, -128.873, -2.451, 73.6858, -127.39, -2.701, 58.6797, -34.3704, -5.701, 134.172, -29.3704, -5.701, 134.672, -4.62042, -5.701, 135.172, 16.8796, -5.701, 134.422, 41.6296, -5.701, 132.172, 52.1296, -5.701, 130.422, 51.8796, -0.201004, 65.1717, 49.6296, -0.201004, 64.9217, 35.8957, -0.451004, 94.0668, 26.3876, -1.451, 114.244, 21.1054, -2.701, 125.454, 18.9925, -3.701, 129.938, 52.1134, -3.701, 126.212, 52.0973, -2.701, 122.002, 52.057, -1.451, 111.478, 51.9763, -0.451004, 90.4297, 34.6538, -2.201, 121.659, 37.61, -3.951, 129.191, 30.1354, -5.451, 132.175, 31.6199, -3.701, 129.147, 27.1352, -4.201, 130.656, -34.3704, -0.451004, 95.0991, -34.3704, -1.451, 115.785, -34.3704, -2.951, 127.277, -34.3704, -4.451, 131.873, -11.8891, -1.951, 121.655, -26.8766, -3.701, 130.668, -7.37143, -3.701, 130.661, -29.8638, -2.201, 123.18, 10.6418, -0.951004, 108.18, 1.62604, -1.951, 121.654, 10.6487, -3.701, 130.693, -2.86639, -3.701, 130.694, -8.87032, -0.201004, 88.6649, 6.12941, -5.451, 133.68, 4.60866, -3.701, 130.649, 16.6152, -1.701, 118.679, 18.1125, -2.701, 126.183, -10.3949, -0.701004, 103.681, 86.1296, -0.451004, 65.1717, 86.8796, -5.701, 122.172, 92.3796, -5.701, 120.422, 91.8796, -0.701004, 69.9217, 86.3715, -0.701004, 83.5588, 86.6618, -1.701, 105.623, 86.7828, -2.951, 114.817, 86.8312, -3.951, 118.494, 92.3473, -3.951, 117.164, 92.2828, -2.451, 110.647, 92.1215, -1.201, 94.3572, 147.38, -6.201, 73.9217, 148.13, -6.451, 71.9217, 95.8796, -0.701004, 73.4217, 122.46, -1.701, 73.6798, 135.751, -2.701, 73.8088, 140.734, -3.451, 73.8572, 144.057, -4.451, 73.8894, 144.141, -4.201, 69.1663, 145.626, -4.701, 69.1772, 57.8796, -5.701, 129.422, 57.6296, -0.201004, 65.1717, 57.8634, -3.701, 125.277, 57.8473, -2.701, 121.131, 57.807, -1.451, 110.768, 57.7183, -0.451004, 87.9701, 65.6296, -5.701, 127.922, 65.3796, -0.201004, 65.1717, 65.6134, -3.701, 123.873, 65.5973, -2.701, 119.825, 65.5651, -1.701, 111.728, 65.4925, -0.701004, 93.5104, 71.8796, -5.701, 126.422, 71.6296, -0.201004, 65.1717, 71.8634, -3.701, 122.47, 71.8473, -2.701, 118.518, 71.8151, -1.701, 110.615, 71.7344, -0.701004, 90.8572, 78.3796, -5.701, 124.922, 78.1296, -0.451004, 65.1717, 78.3634, -3.701, 121.067, 78.3312, -2.201, 113.357, 78.2586, -0.951004, 96.0104, -97.3704, -0.951004, 79.1717, -99.1204, -0.951004, 79.4217, -98.8704, -1.451, 93.6717, -90.1204, -1.201, 93.6717, -73.8704, -0.201004, 69.4217, -55.8704, -0.451004, 83.4217, -72.8704, -0.201004, 69.4217, -89.6204, -1.201, 94.1717, -55.3704, -0.451004, 85.4217, -55.8704, -0.451004, 85.1717, -79.7767, -0.701004, 91.5467, -79.6308, -0.701004, 91.6196, 112.38, -5.701, 111.672, 122.13, -5.951, 106.422, 125.38, -5.951, 103.672, 123.016, -5.701, 105.126, 96.6296, -5.951, 119.172, 110.88, -5.951, 112.922, 123.345, -4.201, 101.585, 121.311, -3.201, 99.4993, 118.259, -2.451, 96.37, 106.052, -1.201, 83.8527, 99.1181, -2.701, 109.649, 111.148, -4.201, 109.687, 103.648, -3.951, 112.657, 97.6536, -4.201, 115.649, 118.653, -4.201, 105.17, 115.647, -2.951, 102.148, 106.642, -1.951, 99.1755, 108.123, -2.951, 106.652, 112.633, -4.951, 109.648, -92.8704, 8.049, 73.1717, -97.3704, 8.049, 73.1717, -97.6204, 8.049, 79.4217, -92.8704, 8.049, 83.9217, -93.1204, 8.049, 93.6717, -134.12, 8.049, 79.4217, -126.37, 8.049, 93.6717, -134.12, 8.049, 96.4217, -126.62, 8.049, 96.4217, 139.38, -6.201, 90.4217, 144.63, -6.201, 81.6717, 131.38, -5.951, 99.1717, 138.141, -3.451, 81.1959, 127.648, -3.201, 94.6868, 136.643, -4.201, 88.6544, 133.652, -2.951, 84.1513, 139.612, -4.701, 85.6869, 142.621, -4.451, 78.1745, 126.148, -2.451, 88.6775, 142.646, -4.951, 81.1788, 142.622, -5.701, 82.6535, 141.137, -4.701, 82.6925, 127.639, -4.451, 99.1505, 132.153, -4.451, 94.6697, 132.143, -3.701, 91.6841, 135.113, -4.451, 91.656, 135.153, -5.451, 93.1599, 133.618, -4.451, 93.1489, -145.12, -6.201, 80.6717, -144.87, -6.201, 84.6717, -143.37, -5.951, 84.4217, -142.87, -5.951, 79.6717, -143.37, -5.701, 85.4217, -151.62, -5.701, 89.9217, -129.87, -2.701, 80.9217, -139.32, -4.201, 84.0717, -143.464, -5.701, 86.5467, -138.027, -3.951, 84.2967, -129.87, -2.701, 79.4217, -134.37, -3.451, 79.1717, -138.62, -4.201, 79.4217, -152.12, -5.701, 87.6717, -139.12, -6.201, 82.1717, -139.12, -6.201, 84.6717, -134.37, -6.201, 82.6717, -136.62, -6.201, 77.1717, -138.62, -6.201, 77.9217, -169.62, 6.049, 90.9217, -168.87, 6.049, 92.6717, -166.12, 6.049, 91.4217, -136.62, 6.049, 77.1717, -157.87, 6.049, 109.172, -161.37, 6.049, 110.672, -160.62, 6.049, 112.422, -127.62, 6.049, 98.6717, -128.12, 6.049, 97.4217, -134.62, 6.049, 97.4217, -135.12, 6.049, 96.9217, -135.12, 6.049, 80.1717, -164.62, 6.049, 91.6717, -158.62, 6.049, 105.922, -129.12, -2.701, 81.1717, -115.37, -1.701, 82.6717, -114.37, -1.701, 82.4217, -114.37, -1.701, 79.4217, -122.825, -1.951, 79.4217, -128.87, -2.701, 93.1717, -126.62, -2.701, 94.1717, -126.37, -2.701, 93.6717, -128.87, -2.701, 82.9217, -131.37, -2.701, 84.1717, -129.37, -2.701, 91.4217, -130.87, -2.951, 91.6717, -115.37, -1.951, 93.6717, -124.385, -2.201, 88.6824, -113.37, -1.701, 82.6717, -113.37, -1.951, 93.6717, -112.365, -1.451, 85.6945, -154.62, -6.201, 84.6717, -153.37, -6.201, 87.1717, -153.12, -6.201, 86.6717, -133.37, 6.299, 83.9217, -132.87, 6.299, 83.4217, -133.87, 6.299, 83.4217, -133.37, 6.049, 85.1717, -133.87, 6.049, 96.1717, -128.62, 6.049, 96.1717, -149.87, -5.701, 91.6717, -150.87, -5.701, 92.1717, -150.87, -5.701, 93.4217, -149.12, -5.701, 99.4217, -137.978, -3.951, 86.8503, -141.942, -5.701, 88.4574, -141.299, -5.701, 96.1003, -137.388, -4.201, 94.4395, -89.6204, -2.701, 116.672, -92.8704, -2.701, 116.922, -93.1204, -5.951, 126.172, -73.8704, -5.951, 130.172, -80.6204, -3.701, 124.386, -93.0133, -3.951, 122.207, -91.3854, -3.701, 121.663, -89.8753, -3.951, 123.179, -54.1204, -0.451004, 85.4217, -35.6204, -5.701, 134.172, -66.9004, -0.451004, 88.5717, -89.6204, -1.701, 108.234, -50.332, -5.451, 132.633, -35.6204, -3.451, 129.333, -35.6204, -2.201, 122.881, -35.6204, -0.951004, 108.365, -55.3759, -2.451, 123.183, -76.3839, -1.701, 112.663, -74.8811, -3.201, 123.19, -65.8851, -3.951, 127.696, -49.3746, -3.701, 129.191, -55.3708, -0.951004, 105.194, -76.3904, -3.951, 126.183, -53.855, -3.451, 127.684, -73.3601, -4.451, 127.691, -71.8618, -2.451, 120.152, -80.8719, -2.701, 120.187, -71.8854, -3.701, 126.166, -52.8704, -5.701, 132.922, -169.62, -6.201, 90.9217, -169.37, -6.201, 91.9217, -168.62, -6.201, 92.6717, -166.12, -6.201, 91.4217, -168.12, -6.201, 90.1717, -164.87, -6.201, 91.4217, -163.87, -6.201, 94.1717, -163.12, -6.201, 94.9217, -152.62, -6.201, 90.4217, -138.87, -6.201, 87.1717, -137.37, -6.201, 94.4217, -130.62, -6.201, 91.6717, -133.37, -6.201, 84.9217, -161.62, 7.549, 109.172, -161.12, 7.549, 109.422, -159.12, 7.549, 108.422, -165.37, 7.549, 92.9217, -166.12, 7.549, 92.6717, -168.12, 7.549, 93.4217, -162.37, -6.201, 96.9217, -159.87, -6.201, 103.672, -150.37, -6.201, 99.9217, -151.87, -6.201, 92.9217, -162.87, -6.201, 105.172, -161.12, -6.201, 104.422, -165.62, -6.201, 93.1717, -167.62, -6.201, 93.6717, -147.62, -5.701, 101.172, -148.62, -5.701, 101.672, -148.62, -5.701, 102.422, -140.37, -5.701, 100.422, -130.12, -2.951, 94.1717, -135.505, -3.951, 96.3255, -139.544, -5.701, 97.9409, -139.232, -5.701, 99.7272, -135.815, -4.201, 97.6439, -138.87, -5.951, 101.172, -138.62, -6.201, 103.172, -137.62, -5.951, 103.172, -138.87, -5.701, 100.422, -135.589, -4.201, 98.0779, -135.62, -5.951, 106.172, -126.62, -5.951, 113.172, -126.62, -4.201, 108.787, -126.62, -2.951, 101.479, -133.38, -4.201, 102.155, -133.87, -6.201, 101.172, -127.62, -6.201, 98.6717, -129.37, -6.201, 93.9217, -136.37, -6.201, 96.6717, -125.62, 9.549, 94.6717, -125.62, 9.549, 115.922, -90.6204, 9.549, 115.922, -90.6204, 9.549, 94.6717, -115.37, -1.951, 95.6717, -115.62, -1.951, 94.9217, -125.37, -2.701, 94.9217, -125.37, -4.951, 111.672, -121.524, -2.951, 105.518, -125.37, -2.951, 101.901, -117.87, -4.951, 115.672, -113.87, -4.201, 115.672, -113.87, -1.951, 95.6717, -113.87, -2.451, 105.672, -118.395, -2.951, 108.166, -121.395, -3.951, 111.176, -113.37, -1.951, 94.9217, -90.8704, -2.451, 115.672, -90.8704, -1.201, 94.9217, -100.933, -2.951, 115.672, -90.8704, -1.451, 103.815, -112.395, -2.201, 103.666, -161.12, -6.201, 110.422, -161.37, -6.201, 110.922, -160.37, -6.201, 112.422, -157.87, -6.201, 109.172, -157.12, -6.201, 105.172, -158.62, -6.201, 105.922, -148.12, -6.201, 103.672, -149.12, -6.201, 103.672, -149.87, -6.201, 102.172, -161.87, -6.201, 107.172, -161.37, -6.201, 108.922, -159.37, -6.201, 108.172, -159.87, -6.201, 106.672, -118.87, -5.951, 116.922, -112.12, -5.951, 120.422, -111.648, -4.201, 116.922, -104.87, -3.951, 118.652) @@ -156,3 +157,6 @@ transform = Transform3D(-0.00373498, 0, 0.999993, 0, 1, 0, -0.999993, 0, -0.0037 [node name="boxcar2" parent="." instance=ExtResource("10_w886c")] transform = Transform3D(-0.00373498, 0, 0.999993, 0, 1, 0, -0.999993, 0, -0.00373498, -85.194, 1.17837, 95.797) + +[node name="rocketlauncher1_pickup" parent="." instance=ExtResource("12_rvq5w")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -118.203, -1.13762, 91.6554) diff --git a/scripts/EnemyAttack.gd b/scripts/EnemyAttack.gd index 348f51e..efdf4f2 100644 --- a/scripts/EnemyAttack.gd +++ b/scripts/EnemyAttack.gd @@ -3,7 +3,6 @@ class_name EnemyAttack var heartbeat : float = 3.0 -@export var mag_size = 5 @export var between_shot_time : Vector2 = Vector2(.5,2.0) @export var reload_time : float = 7.0 @@ -16,7 +15,7 @@ var shot_timer = 0.0 func Enter(): super() update_waypoint() - ammo = mag_size + ammo = enemy.max_ammo func update_waypoint(): enemy.nav_agent.set_target_position(player.global_position) @@ -33,7 +32,7 @@ func Update(delta): else: if enemy.turret_look_next.is_colliding() and enemy.turret_look_next.get_collider().is_in_group("player"): shot_timer = randf_range(between_shot_time.x,between_shot_time.y) - ammo -= 1 + ammo -= 2 enemy.turret_material.emission_enabled = true await get_tree().create_timer(.1).timeout attack() @@ -64,7 +63,7 @@ func attack(): func reload(): await get_tree().create_timer(reload_time).timeout - ammo = mag_size + ammo = enemy.max_ammo func fire(barrel): var instance_bullet = enemy.bullet.instantiate() diff --git a/scripts/EnemyIdle.gd b/scripts/EnemyIdle.gd index 0717ca4..e8cf446 100644 --- a/scripts/EnemyIdle.gd +++ b/scripts/EnemyIdle.gd @@ -40,6 +40,10 @@ func Update(delta: float): func Physics_Update(delta : float): if enemy: + #turret transform + enemy.turret_look_next.rotation = Vector3(0,scan_direction,0) + enemy.turret_look.rotation = lerp(enemy.turret_look.rotation,enemy.turret_look_next.rotation,delta * enemy.turret_look_speed) + var destination = enemy.nav_agent.get_next_path_position() var local_destination = destination - enemy.global_position var direction = local_destination.normalized() @@ -49,7 +53,6 @@ func Physics_Update(delta : float): var look_target = enemy.spider_look_next.global_rotation.y enemy.global_rotation.y = lerp(enemy.global_rotation.y,look_target,delta * 3) - enemy.turret_look.rotation.y = lerp(enemy.turret_look.rotation.y,enemy.spider_look_next.rotation.y + deg_to_rad(scan_direction),delta * enemy.turret_look_speed) if enemy.turret_look.is_colliding() and enemy.turret_look.get_collider() is Player: Transitioned.emit(self,"attack") diff --git a/scripts/EnemyReload.gd b/scripts/EnemyReload.gd index a1312c6..6997713 100644 --- a/scripts/EnemyReload.gd +++ b/scripts/EnemyReload.gd @@ -1,7 +1,6 @@ extends EnemyState class_name EnemyReload -@export var reload_time : float = 7.0 @export var reload_sound : AudioStreamPlayer3D @export var run_distance : float = 3 @@ -13,11 +12,11 @@ var remaining_bullets func Enter(): super() remaining_bullets = enemy.max_ammo - enemy.servo_audio.play() + enemy.servo_single.play() func Exit(): super() - enemy.servo_audio.play() + enemy.servo_single.play() func update_waypoint(): var direction = (player.global_position - enemy.global_position).normalized() @@ -30,7 +29,7 @@ func Update(delta): update_waypoint() if remaining_bullets > 0: - if !reload_sound.is_playing() and !enemy.servo_audio.is_playing(): + if !reload_sound.is_playing(): remaining_bullets -= 1 reload_sound.play() else: @@ -51,7 +50,10 @@ func Physics_Update(delta): enemy.global_rotation.y = lerp(enemy.global_rotation.y,look_target,delta * 3) func finished_reload(): - if enemy.turret_look_next.is_colliding() and enemy.turret_look_next.get_collider() is Player: - Transitioned.emit(self,"attack") + if enemy.turret_look_next.is_colliding(): + if enemy.turret_look_next.get_collider() is Player: + Transitioned.emit(self,"attack") + else: + Transitioned.emit(self,"idle") else: Transitioned.emit(self,"idle") diff --git a/scripts/spider.gd b/scripts/spider.gd index 93fc494..a12dcfc 100644 --- a/scripts/spider.gd +++ b/scripts/spider.gd @@ -8,7 +8,7 @@ var last_enemy : bool = false @export var start_health = 3 @export var SPEED = 3.0 @export var turret_look_speed = 6 -@export var max_ammo = 5 +@export var max_ammo = 10 @export var loot_amount = 2 @export var nav_agent : NavigationAgent3D @@ -55,7 +55,8 @@ $body/leg4/foot4/foot4outline, $body/leg4/leg4outline, $body/bodyoutline] @onready var health_bar_sprite: Sprite3D = $HealthBarSprite -@onready var servo_audio: AudioStreamPlayer3D = $AUIDO/Servo +@onready var servo_single: AudioStreamPlayer3D = $AUIDO/ServoSingle +@onready var servo_loop: AudioStreamPlayer3D = $AUIDO/ServoLoop var gravity = 9.8 @@ -73,6 +74,7 @@ var player_last_seen var knocked = false var stunned = false var health +var turret_current_moving_speed func _ready(): health = start_health @@ -87,6 +89,9 @@ func _ready(): func _process(delta): move_and_slide() + turret_current_moving_speed = (turret_look_next.rotation - turret_look.rotation).length() + #if turret_current_moving_speed > 1: + #servo_single.play() func stun(): @@ -106,9 +111,3 @@ func save(): "health" : health } return save_dict - -func _on_area_3d_body_entered(body: Node3D) -> void: - pass # Replace with function body. - -func _exit_tree() -> void: - get_parent().enemies.erase(self)