diff --git a/godot/boot.tscn b/godot/boot.tscn index a85969d..c0030f9 100644 --- a/godot/boot.tscn +++ b/godot/boot.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=6 format=3 uid="uid://c2kiuk2yxdlfr"] +[gd_scene load_steps=7 format=3 uid="uid://c2kiuk2yxdlfr"] [ext_resource type="PackedScene" uid="uid://1kr3qqan3trk" path="res://objects/player.tscn" id="1_7kr4i"] [ext_resource type="PackedScene" uid="uid://dm3355tbkvx24" path="res://objects/section_2.tscn" id="2_og5hb"] [ext_resource type="PackedScene" uid="uid://0fykl1mw3c12" path="res://objects/enemy.tscn" id="3_ppe0x"] +[ext_resource type="PackedScene" uid="uid://c36u0cdxo4tqc" path="res://models/background/background.glb" id="4_gnobb"] [sub_resource type="GDScript" id="GDScript_peyat"] script/source = "extends Area3D @@ -39,4 +40,7 @@ transform = Transform3D(0.0816776, 0, 0.996659, 0, 1, 0, -0.996659, 0, 0.0816776 [node name="Environment" parent="." instance=ExtResource("2_og5hb")] +[node name="background" parent="." instance=ExtResource("4_gnobb")] +transform = Transform3D(0.172791, 0, 0.45103, 0, 0.482996, 0, -0.45103, 0, 0.172791, 5, 3.12833, -2) + [connection signal="body_entered" from="Area3D" to="Area3D" method="_on_body_entered"] diff --git a/godot/lighting/section_2.exr b/godot/lighting/section_2.exr index 38847d4..ab2cef0 100644 Binary files a/godot/lighting/section_2.exr and b/godot/lighting/section_2.exr differ diff --git a/godot/lighting/section_2.lmbake b/godot/lighting/section_2.lmbake index a2810ab..b837515 100644 Binary files a/godot/lighting/section_2.lmbake and b/godot/lighting/section_2.lmbake differ diff --git a/godot/models/background/Material.tres b/godot/models/background/Material.tres new file mode 100644 index 0000000..0fb010c --- /dev/null +++ b/godot/models/background/Material.tres @@ -0,0 +1,8 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://byg50pbra3l1l"] + +[resource] +resource_name = "Material" +cull_mode = 2 +depth_draw_mode = 1 +shading_mode = 0 +albedo_color = Color(0.102229, 0.0959745, 0.0900083, 1) diff --git a/godot/models/background/background.glb b/godot/models/background/background.glb new file mode 100644 index 0000000..5e8b45d --- /dev/null +++ b/godot/models/background/background.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f0212f485c28747e80b5e0d8b36d4feb074ba45497df6d4f8d854287036fd9e +size 18752 diff --git a/godot/models/background/background.glb.import b/godot/models/background/background.glb.import new file mode 100644 index 0000000..d906adf --- /dev/null +++ b/godot/models/background/background.glb.import @@ -0,0 +1,43 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://c36u0cdxo4tqc" +path="res://.godot/imported/background.glb-fa2b0c69f183d01123533251995525fd.scn" + +[deps] + +source_file="res://models/background/background.glb" +dest_files=["res://.godot/imported/background.glb-fa2b0c69f183d01123533251995525fd.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={ +"materials": { +"Material": { +"use_external/enabled": true, +"use_external/path": "res://models/background/Material.tres" +} +} +} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/godot/models/props/tree_remains.glb b/godot/models/props/tree_remains.glb new file mode 100644 index 0000000..5487fe2 --- /dev/null +++ b/godot/models/props/tree_remains.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e03422ed11b19a769149cc0b3d6f0f4ff98fec525b8e8a3fc95e7180a1f8495e +size 6732 diff --git a/godot/models/props/tree_remains.glb.import b/godot/models/props/tree_remains.glb.import new file mode 100644 index 0000000..98fc4ee --- /dev/null +++ b/godot/models/props/tree_remains.glb.import @@ -0,0 +1,36 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://daseb7sbi87l8" +path="res://.godot/imported/tree_remains.glb-3ea78dbc1855c26b82e543712ea2d7f5.scn" + +[deps] + +source_file="res://models/props/tree_remains.glb" +dest_files=["res://.godot/imported/tree_remains.glb-3ea78dbc1855c26b82e543712ea2d7f5.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/godot/objects/section_2.tscn b/godot/objects/section_2.tscn index 5308914..b3efcf0 100644 --- a/godot/objects/section_2.tscn +++ b/godot/objects/section_2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=3 uid="uid://dm3355tbkvx24"] +[gd_scene load_steps=17 format=3 uid="uid://dm3355tbkvx24"] [ext_resource type="Environment" uid="uid://c1vy5rxxddw78" path="res://lighting/foggy_morning.tres" id="1_5ixfb"] [ext_resource type="ArrayOccluder3D" uid="uid://br22mqb65v0hg" path="res://occlusion/boot.occ" id="2_07v50"] @@ -12,6 +12,7 @@ [ext_resource type="PackedScene" uid="uid://dhj8jxrjui8u0" path="res://models/props/trenchwall_5m_dirt.glb" id="12_t2jcw"] [ext_resource type="PackedScene" uid="uid://c24vfe6oekknf" path="res://models/props/walkover.glb" id="13_bq7v3"] [ext_resource type="PackedScene" uid="uid://6x5ka3l7b6b7" path="res://objects/artillery_target.tscn" id="13_rl1f8"] +[ext_resource type="PackedScene" uid="uid://daseb7sbi87l8" path="res://models/props/tree_remains.glb" id="14_72dbr"] [ext_resource type="PackedScene" uid="uid://c71yj2qpupn33" path="res://models/props/dirtpile_large.glb" id="14_c2meq"] [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_ikuna"] @@ -467,6 +468,39 @@ transform = Transform3D(-0.99452, -0.0848907, 0.0610269, -0.077975, 0.991095, 0. [node name="trenchfloor15" parent="NavigationRegion3D" instance=ExtResource("8_14rhs")] transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 9.16158, 0.598945, -18.6672) +[node name="tree_remains" parent="NavigationRegion3D" instance=ExtResource("14_72dbr")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 2, 11) + +[node name="tree_remains2" parent="NavigationRegion3D" instance=ExtResource("14_72dbr")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.04507, 2, -0.308927) + +[node name="tree_remains3" parent="NavigationRegion3D" instance=ExtResource("14_72dbr")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.88482, 2, -7.28037) + +[node name="tree_remains8" parent="NavigationRegion3D" instance=ExtResource("14_72dbr")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.93441, 2.4542, -9.97964) + +[node name="tree_remains9" parent="NavigationRegion3D" instance=ExtResource("14_72dbr")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.29667, 2, -6.7121) + +[node name="tree_remains10" parent="NavigationRegion3D" instance=ExtResource("14_72dbr")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.17672, 2, -18.3616) + +[node name="tree_remains11" parent="NavigationRegion3D" instance=ExtResource("14_72dbr")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.24931, 2, -19.1193) + +[node name="tree_remains4" parent="NavigationRegion3D" instance=ExtResource("14_72dbr")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.1162, 2, -11.2974) + +[node name="tree_remains5" parent="NavigationRegion3D" instance=ExtResource("14_72dbr")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.34673, 2, -12.1674) + +[node name="tree_remains6" parent="NavigationRegion3D" instance=ExtResource("14_72dbr")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.11456, 2, -20.2496) + +[node name="tree_remains7" parent="NavigationRegion3D" instance=ExtResource("14_72dbr")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.11456, 2, -20.2496) + [node name="ArtilleryTarget" parent="." instance=ExtResource("13_rl1f8")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.965554, 2.51555, 4.10178) diff --git a/godot/occlusion/boot.occ b/godot/occlusion/boot.occ index 021d7f3..d23fa7b 100644 Binary files a/godot/occlusion/boot.occ and b/godot/occlusion/boot.occ differ diff --git a/godot/particles/explosion.tscn b/godot/particles/explosion.tscn index 0823b53..03999bd 100644 --- a/godot/particles/explosion.tscn +++ b/godot/particles/explosion.tscn @@ -12,7 +12,7 @@ curve = SubResource("Curve_f77sp") [sub_resource type="Curve" id="Curve_58b4i"] max_value = 3.0 -_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.115242, 1.35758), 0.0, 0.0, 0, 0, Vector2(1, 2.58193), 1.60659, 0.0, 0, 0] +_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.468588, 1.33418), 1.15379, 1.15379, 0, 0, Vector2(1, 2.14614), 0.0, 0.0, 0, 0] point_count = 3 [sub_resource type="CurveTexture" id="CurveTexture_62j87"] @@ -23,7 +23,7 @@ particle_flag_align_y = true angle_min = 1.07288e-05 angle_max = 720.0 direction = Vector3(0, 0, 1) -spread = 2.905 +spread = 5.0 initial_velocity_min = 1.5 initial_velocity_max = 10.0 scale_min = 1.12 @@ -49,8 +49,8 @@ func _ready(): [node name="ExplosionParticles" type="GPUParticles3D"] transform = Transform3D(-1, 0, -8.74228e-08, -8.74228e-08, 4.37114e-08, 1, 0, 1, -4.37114e-08, 0, 0, 0) emitting = false -amount = 20 -lifetime = 1.5 +amount = 100 +lifetime = 5.0 one_shot = true explosiveness = 1.0 visibility_aabb = AABB(-3, -3, -1, 6, 6, 10) @@ -66,7 +66,7 @@ intensity = 3.5 time = 0.4 [node name="Timer" type="Timer" parent="."] -wait_time = 4.0 +wait_time = 5.0 one_shot = true autostart = true diff --git a/models/background.blend b/models/background.blend new file mode 100644 index 0000000..bc8cc04 --- /dev/null +++ b/models/background.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4fc9d990d78ec8065a1ae469076063e745ca846cf4e4141eb18791c4fc7332a +size 923136 diff --git a/models/background.blend1 b/models/background.blend1 new file mode 100644 index 0000000..c1613b1 Binary files /dev/null and b/models/background.blend1 differ diff --git a/models/modules.blend b/models/modules.blend index 16e971b..640b18d 100644 --- a/models/modules.blend +++ b/models/modules.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56d78b13b6c876d066e1effd096169fd928b4ae0849ee4256494acb03ca9c403 -size 1209080 +oid sha256:77e3b0e131f0539fa468690546df32b06c10ccc340419ea79c2462b1fc0900ff +size 1207572 diff --git a/models/modules.blend1 b/models/modules.blend1 index ed092b7..d0724db 100644 Binary files a/models/modules.blend1 and b/models/modules.blend1 differ