tweak: dirt and character textures

2024-12-08 20:13:16 +01:00 · 2024-12-08 20:13:16 +01:00 · 835d7b43f1
parent 9341b09b63
commit 835d7b43f1
48 changed files with 75 additions and 138 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -9,3 +9,7 @@
 *.jpeg filter=lfs diff=lfs merge=lfs -text
 *.gif filter=lfs diff=lfs merge=lfs -text
 *.kra filter=lfs diff=lfs merge=lfs -text
+*.aup3 filter=lfs diff=lfs merge=lfs -text
+*.wav filter=lfs diff=lfs merge=lfs -text
+*.mp3 filter=lfs diff=lfs merge=lfs -text
+*.ogg filter=lfs diff=lfs merge=lfs -text
--- a/godot/lighting/section_2.exr
+++ b/godot/lighting/section_2.exr
--- a/godot/lighting/section_2.lmbake
+++ b/godot/lighting/section_2.lmbake
--- a/godot/models/character.glb
+++ b/godot/models/character.glb
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:01bc84124adbf72bb6e3a2ad9265d490802f000faa5066448db47f9f8c2f5d0e
-size 20452080
+oid sha256:dfc9bc9324457111ead036f113c607ad1922cc85a3c600ec03339226b4d9bbfd
+size 20411536
--- a/godot/models/character_british_uniform.png
+++ b/godot/models/character_british_uniform.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4402ae95af82888910804ebf9484fc0b509fba46b30bda4bba88aa9000aaa01
-size 13936319
+oid sha256:5cb677f406c1127738a1d549d74d44dd762965e4f6a4261ab1b18d3ffa545d1c
+size 13895776
--- a/godot/models/character_british_uniform.png.import
+++ b/godot/models/character_british_uniform.png.import
@ -9,7 +9,7 @@ metadata={
 "vram_texture": true
 }
 generator_parameters={
-"md5": "50c3c0b4b4b2e65fd3a1c88242b5fedf"
+"md5": "37358e54f17d9ddadc560278f363742f"
 }

 [deps]
--- a/godot/models/materials/Primary.tres
+++ b/godot/models/materials/Primary.tres
@ -11,6 +11,8 @@ specular_mode = 1
 albedo_texture = ExtResource("1_k4ift")
 normal_enabled = true
 normal_texture = ExtResource("2_efm68")
+rim = 0.0
+rim_tint = 0.85
 distance_fade_mode = 2
 distance_fade_min_distance = 0.2
 distance_fade_max_distance = 0.3
--- a/godot/models/props/dirt_ramp.glb
+++ b/godot/models/props/dirt_ramp.glb
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ebba44457a6c9fbee11108784428a800ca0bafc6f35d6fab231ea5d3b062a46
-size 8134912
+oid sha256:be9259e744860405883049a767d6c605ad237d46a4afebcaa55fe57c80d5d604
+size 5537708
--- a/godot/models/props/dirt_ramp_dirt.png
+++ b/godot/models/props/dirt_ramp_dirt.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb1473bb0bb4b8d0cd9d31be2bb03c8807ded553ecb3b1ed0bf9d40198432aa0
-size 5274146
+oid sha256:ed866593ed5863b0a2ac7fba81eb3db2700608e8c7a67e4bf5a55ec9e033bb67
+size 4131590
--- a/godot/models/props/dirt_ramp_dirt.png.import
+++ b/godot/models/props/dirt_ramp_dirt.png.import
@ -9,7 +9,7 @@ metadata={
 "vram_texture": true
 }
 generator_parameters={
-"md5": "25a870a740b8d870b5698fe1f7aed359"
+"md5": "cb033b407d40e4988cab009074a15d95"
 }

 [deps]
--- a/godot/models/props/dirt_ramp_dirt_normal.png
+++ b/godot/models/props/dirt_ramp_dirt_normal.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c48d36d9703876c58ff5d49523aaa93844fdac0c9ce964c88cdfaadd0effbee
-size 2854388
+oid sha256:8006793447d2d1a819283b977e219f6a28236304ac95b627c6b31a825b2e0824
+size 1399738
--- a/godot/models/props/dirt_ramp_dirt_normal.png.import
+++ b/godot/models/props/dirt_ramp_dirt_normal.png.import
@ -9,7 +9,7 @@ metadata={
 "vram_texture": true
 }
 generator_parameters={
-"md5": "98b9e5995408e21c952eaa2298babcfe"
+"md5": "03adf52d401af7af4eaa97364644e591"
 }

 [deps]
--- a/godot/models/props/materials/Mud.tres
+++ b/godot/models/props/materials/Mud.tres
@ -1,14 +1,14 @@
 [gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://fa87jbiwsplk"]

-[ext_resource type="Texture2D" uid="uid://2khh074pibhb" path="res://models/props/dirtpile_large_dirt.png" id="1_1d2ym"]
-[ext_resource type="Texture2D" uid="uid://kplwqn5m4twx" path="res://models/props/dirtpile_large_dirt_normal.png" id="2_4oxut"]
+[ext_resource type="Texture2D" uid="uid://cljwwvp3ce1nw" path="res://models/props/dirt_ramp_dirt.png" id="1_pip26"]
+[ext_resource type="Texture2D" uid="uid://0mmyo8pgoi2b" path="res://models/props/dirt_ramp_dirt_normal.png" id="2_dhnqk"]

 [resource]
 resource_name = "Mud"
 specular_mode = 1
-albedo_texture = ExtResource("1_1d2ym")
+albedo_texture = ExtResource("1_pip26")
 metallic_specular = 0.22
 roughness = 0.75
 normal_enabled = true
-normal_texture = ExtResource("2_4oxut")
+normal_texture = ExtResource("2_dhnqk")
 rim_tint = 1.0
--- a/godot/models/props/trenchfloor.glb
+++ b/godot/models/props/trenchfloor.glb
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9cd36b8939c5584f1e8188eb4c1bdbc3d9d9455441b8937517a2cc150bb9c815
-size 8134804
+oid sha256:d0d5c1026f3ebddb3570c1f7781f4182e883541dfeec820613ac0c408003b549
+size 5537600
--- a/godot/models/props/trenchfloor_dirt.png
+++ b/godot/models/props/trenchfloor_dirt.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb1473bb0bb4b8d0cd9d31be2bb03c8807ded553ecb3b1ed0bf9d40198432aa0
-size 5274146
+oid sha256:ed866593ed5863b0a2ac7fba81eb3db2700608e8c7a67e4bf5a55ec9e033bb67
+size 4131590
--- a/godot/models/props/trenchfloor_dirt.png.import
+++ b/godot/models/props/trenchfloor_dirt.png.import
@ -9,7 +9,7 @@ metadata={
 "vram_texture": true
 }
 generator_parameters={
-"md5": "25a870a740b8d870b5698fe1f7aed359"
+"md5": "cb033b407d40e4988cab009074a15d95"
 }

 [deps]
--- a/godot/models/props/trenchfloor_dirt_normal.png
+++ b/godot/models/props/trenchfloor_dirt_normal.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c48d36d9703876c58ff5d49523aaa93844fdac0c9ce964c88cdfaadd0effbee
-size 2854388
+oid sha256:8006793447d2d1a819283b977e219f6a28236304ac95b627c6b31a825b2e0824
+size 1399738
--- a/godot/models/props/trenchfloor_dirt_normal.png.import
+++ b/godot/models/props/trenchfloor_dirt_normal.png.import
@ -9,7 +9,7 @@ metadata={
 "vram_texture": true
 }
 generator_parameters={
-"md5": "98b9e5995408e21c952eaa2298babcfe"
+"md5": "03adf52d401af7af4eaa97364644e591"
 }

 [deps]
--- a/godot/models/props/trenchwall_2m_dirt.glb
+++ b/godot/models/props/trenchwall_2m_dirt.glb
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee5c56fe5eb7fe06ba29568373adde382c75d42aef1ab9f36540aa5b3f14ca9c
-size 8135572
+oid sha256:cf798eceae4c3f78a26e21899aba9ca52a79915bcdb350b9c3e60468cf8d9ab5
+size 5538368
--- a/godot/models/props/trenchwall_2m_dirt_dirt.png
+++ b/godot/models/props/trenchwall_2m_dirt_dirt.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb1473bb0bb4b8d0cd9d31be2bb03c8807ded553ecb3b1ed0bf9d40198432aa0
-size 5274146
+oid sha256:ed866593ed5863b0a2ac7fba81eb3db2700608e8c7a67e4bf5a55ec9e033bb67
+size 4131590
--- a/godot/models/props/trenchwall_2m_dirt_dirt.png.import
+++ b/godot/models/props/trenchwall_2m_dirt_dirt.png.import
@ -9,7 +9,7 @@ metadata={
 "vram_texture": true
 }
 generator_parameters={
-"md5": "25a870a740b8d870b5698fe1f7aed359"
+"md5": "cb033b407d40e4988cab009074a15d95"
 }

 [deps]
--- a/godot/models/props/trenchwall_2m_dirt_dirt_normal.png
+++ b/godot/models/props/trenchwall_2m_dirt_dirt_normal.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c48d36d9703876c58ff5d49523aaa93844fdac0c9ce964c88cdfaadd0effbee
-size 2854388
+oid sha256:8006793447d2d1a819283b977e219f6a28236304ac95b627c6b31a825b2e0824
+size 1399738
--- a/godot/models/props/trenchwall_2m_dirt_dirt_normal.png.import
+++ b/godot/models/props/trenchwall_2m_dirt_dirt_normal.png.import
@ -9,7 +9,7 @@ metadata={
 "vram_texture": true
 }
 generator_parameters={
-"md5": "98b9e5995408e21c952eaa2298babcfe"
+"md5": "03adf52d401af7af4eaa97364644e591"
 }

 [deps]
--- a/godot/models/props/trenchwall_5m_dirt.glb
+++ b/godot/models/props/trenchwall_5m_dirt.glb
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c75f8ee4812284f5d8b6349ae289bb81279208f848ca507ba662f2a63d1801f5
-size 8137388
+oid sha256:480c0501f2d7ac37e0272fbb661b23ac0a69aa26af0599de943c8552e1e64a0a
+size 5540184
--- a/godot/models/props/trenchwall_5m_dirt_dirt.png
+++ b/godot/models/props/trenchwall_5m_dirt_dirt.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb1473bb0bb4b8d0cd9d31be2bb03c8807ded553ecb3b1ed0bf9d40198432aa0
-size 5274146
+oid sha256:ed866593ed5863b0a2ac7fba81eb3db2700608e8c7a67e4bf5a55ec9e033bb67
+size 4131590
--- a/godot/models/props/trenchwall_5m_dirt_dirt.png.import
+++ b/godot/models/props/trenchwall_5m_dirt_dirt.png.import
@ -9,7 +9,7 @@ metadata={
 "vram_texture": true
 }
 generator_parameters={
-"md5": "25a870a740b8d870b5698fe1f7aed359"
+"md5": "cb033b407d40e4988cab009074a15d95"
 }

 [deps]
--- a/godot/models/props/trenchwall_5m_dirt_dirt_normal.png
+++ b/godot/models/props/trenchwall_5m_dirt_dirt_normal.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c48d36d9703876c58ff5d49523aaa93844fdac0c9ce964c88cdfaadd0effbee
-size 2854388
+oid sha256:8006793447d2d1a819283b977e219f6a28236304ac95b627c6b31a825b2e0824
+size 1399738
--- a/godot/models/props/trenchwall_5m_dirt_dirt_normal.png.import
+++ b/godot/models/props/trenchwall_5m_dirt_dirt_normal.png.import
@ -9,7 +9,7 @@ metadata={
 "vram_texture": true
 }
 generator_parameters={
-"md5": "98b9e5995408e21c952eaa2298babcfe"
+"md5": "03adf52d401af7af4eaa97364644e591"
 }

 [deps]
--- a/godot/objects/character_model_base.tscn
+++ b/godot/objects/character_model_base.tscn
@ -114,7 +114,15 @@ enabled = false
 target_position = Vector3(0, 15, 0)
 collision_mask = 3

-[node name="BayonetHitscan" type="HitscanMuzzle" parent="skeleton_character/Skeleton3D/BoneAttachment3D" index="1"]
+[node name="MuzzleAudio" type="AudioStreamPlayer3D" parent="skeleton_character/Skeleton3D/BoneAttachment3D" index="1"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.60423e-08, 0.922701, 0.0357741)
+volume_db = 20.0
+max_db = 6.0
+autoplay = true
+max_distance = 100.0
+max_polyphony = 3
+
+[node name="BayonetHitscan" type="HitscanMuzzle" parent="skeleton_character/Skeleton3D/BoneAttachment3D" index="2"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.91257e-05, -0.0191353, -0.00675189)
 enabled = false
 target_position = Vector3(0, 2.468, 0)
--- a/godot/objects/player.tscn
+++ b/godot/objects/player.tscn
@ -19,9 +19,6 @@ unique_name_in_owner = true
 [node name="mesh_helmet_a_001" parent="CharacterModel/skeleton_character/Skeleton3D" index="2"]
 visible = false

-[node name="BoneAttachment3D" parent="CharacterModel/skeleton_character/Skeleton3D" index="3"]
-transform = Transform3D(-0.937186, 0.347435, 0.0311762, 0.0973187, 0.17459, 0.97982, 0.33498, 0.921308, -0.197435, -0.16719, 1.02003, 0.0528419)
-
 [node name="HitscanMuzzle" parent="CharacterModel/skeleton_character/Skeleton3D/BoneAttachment3D" index="0"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.00234e-08, 0.0436091, 0.0479187)

--- a/godot/particles/explosion.tscn
+++ b/godot/particles/explosion.tscn
@ -60,6 +60,9 @@ script = SubResource("GDScript_vkhqp")

 [node name="CameraEffectSource" type="CameraEffectSource" parent="."]
 play_on_ready = true
+falloff = 100.0
+intensity = 3.5
+time = 0.4

 [node name="Timer" type="Timer" parent="."]
 wait_time = 4.0
--- a/godot/particles/floating_sparks.tres
+++ b/godot/particles/floating_sparks.tres
@ -1,23 +0,0 @@
-[gd_resource type="ParticleProcessMaterial" load_steps=3 format=3 uid="uid://d0b6hpvc2dm8i"]
-
-[sub_resource type="Curve" id="Curve_osjvd"]
-_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.490625, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
-point_count = 3
-
-[sub_resource type="CurveTexture" id="CurveTexture_2souk"]
-curve = SubResource("Curve_osjvd")
-
-[resource]
-lifetime_randomness = 0.5
-emission_shape = 3
-emission_box_extents = Vector3(2, 2, 2)
-spread = 180.0
-initial_velocity_min = 0.1
-initial_velocity_max = 0.1
-gravity = Vector3(0, 0, 0)
-scale_min = 0.0
-scale_curve = SubResource("CurveTexture_2souk")
-turbulence_noise_strength = 15.44
-turbulence_noise_speed = Vector3(1, 2, 3)
-turbulence_influence_min = 1.0
-turbulence_influence_max = 1.0
--- a/godot/particles/materials/sparks_material.tres
+++ b/godot/particles/materials/sparks_material.tres
@ -1,16 +0,0 @@
-[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://cjos8bwux43wt"]
-
-[ext_resource type="Texture2D" uid="uid://di4nfeqj3b1ra" path="res://particles/textures/spark.png" id="1_53a2u"]
-
-[resource]
-transparency = 1
-shading_mode = 0
-specular_mode = 1
-disable_fog = true
-albedo_texture = ExtResource("1_53a2u")
-billboard_mode = 3
-particles_anim_h_frames = 1
-particles_anim_v_frames = 1
-particles_anim_loop = false
-distance_fade_mode = 2
-distance_fade_min_distance = 40.0
--- a/godot/particles/textures/spark.png
+++ b/godot/particles/textures/spark.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e61af983b978dd88c8177923f69738891c9c836a35d04d0d47b949147e8273c0
-size 8909
--- a/godot/particles/textures/spark.png.import
+++ b/godot/particles/textures/spark.png.import
@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://di4nfeqj3b1ra"
-path.s3tc="res://.godot/imported/spark.png-342b407e70ae871963394158445c1b00.s3tc.ctex"
-metadata={
-"imported_formats": ["s3tc_bptc"],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://particles/textures/spark.png"
-dest_files=["res://.godot/imported/spark.png-342b407e70ae871963394158445c1b00.s3tc.ctex"]
-
-[params]
-
-compress/mode=2
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=true
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=0
--- a/models/character.blend
+++ b/models/character.blend
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10c0808b6b14067334591acb88a94dea5bb78493242a2636326675a7efd46ed2
-size 3279660
+oid sha256:855235acb748c32a4816fb40be67f05709bc96651bd5a1a956fb9f6cda49ea59
+size 3281052
--- a/models/character.blend1
+++ b/models/character.blend1
--- a/models/modules.blend
+++ b/models/modules.blend
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2838cd50bf878480cd9e54576bc72de41bd2fbe9c46c842c69f3d438f914831b
-size 1157512
+oid sha256:fc61fda3b2bb66b5cba6c1be13826e3ebc98d75ef11e22482a7a5a973e3902ad
+size 1158944
--- a/models/modules.blend1
+++ b/models/modules.blend1
--- a/models/textures/british_uniform.kra
+++ b/models/textures/british_uniform.kra
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22af35b1ff4326d63a4c8cd7cd8b97dda412fb98ae44d62d0ba2c8c889c38e29
-size 31547251
+oid sha256:952931cea107a29a9828b089cd308575442ffb904adf7edfa66567c20685b1e8
+size 33626567
--- a/models/textures/british_uniform.kra~
+++ b/models/textures/british_uniform.kra~
--- a/models/textures/british_uniform.png
+++ b/models/textures/british_uniform.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4402ae95af82888910804ebf9484fc0b509fba46b30bda4bba88aa9000aaa01
-size 13936319
+oid sha256:5cb677f406c1127738a1d549d74d44dd762965e4f6a4261ab1b18d3ffa545d1c
+size 13895776
--- a/models/textures/dirt.kra
+++ b/models/textures/dirt.kra
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:479ff8e121b24706915dc3f5916f053a34b45dcfa966a1f8ddb28b330a5549ed
-size 21514224
+oid sha256:1d26fcdd1533cec7606bf8076c6a3670156c074338a77140ce1a2b858fe8d623
+size 15011020
--- a/models/textures/dirt.kra~
+++ b/models/textures/dirt.kra~
--- a/models/textures/dirt.png
+++ b/models/textures/dirt.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb1473bb0bb4b8d0cd9d31be2bb03c8807ded553ecb3b1ed0bf9d40198432aa0
-size 5274146
+oid sha256:ed866593ed5863b0a2ac7fba81eb3db2700608e8c7a67e4bf5a55ec9e033bb67
+size 4131590
--- a/models/textures/dirt_height.png
+++ b/models/textures/dirt_height.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa70783b88712015782c456387c9194d02052bb7de05fd624ce8db6335b097a5
-size 2706020
+oid sha256:bf08e8db1a08e50d5da39637d4ff53614e2d8a922aca5935da98752764fc63c1
+size 2226022
--- a/models/textures/dirt_height.png~
+++ b/models/textures/dirt_height.png~
--- a/models/textures/dirt_normal.png
+++ b/models/textures/dirt_normal.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c48d36d9703876c58ff5d49523aaa93844fdac0c9ce964c88cdfaadd0effbee
-size 2854388
+oid sha256:8006793447d2d1a819283b977e219f6a28236304ac95b627c6b31a825b2e0824
+size 1399738