From 38f840f19e5c9a04cd5e807bbd5c076d5c2f0a7c Mon Sep 17 00:00:00 2001 From: Jers Date: Thu, 4 Jan 2024 15:00:43 -0600 Subject: [PATCH] Added melee combat, added sound system --- Content/Audio/Common/bullet_hit.uasset | 3 +++ Content/Audio/Common/headshot.uasset | 3 +++ Content/Audio/Units/Mite/mitedeath.uasset | 3 +++ Content/Blueprints/BP_GameState.uasset | 4 ++-- Content/Blueprints/BP_PlayerController.uasset | 4 ++-- Content/Blueprints/Levels/WavesInvasion/Invasion_Wave1.uasset | 4 ++-- Content/Blueprints/Units/Common/BP_Base_Damage.uasset | 3 +++ Content/Blueprints/Units/Common/BP_Unit.uasset | 4 ++-- .../Units/Common/Projectiles/BP_Projectile_Basic.uasset | 4 ++-- .../Units/Common/Projectiles/DT_Projectile_Basic.uasset | 4 ++-- Content/Blueprints/Units/Common/WBP_HPBar.uasset | 3 +++ Content/Blueprints/Units/EM_Rifleman/BP_EM_Rifleman.uasset | 4 ++-- Content/Blueprints/Units/EM_Rifleman/DA_EM_Rifleman.uasset | 4 ++-- Content/Blueprints/Units/M_Mite/BP_Mite.uasset | 4 ++-- Content/Blueprints/Units/M_Mite/DA_M_Mite.uasset | 2 +- Content/Blueprints/Units/M_Mite/M_Attack.uasset | 4 ++-- Content/Blueprints/Units/M_Mite/SC_Impact.uasset | 3 +++ Content/Levels/MainMenu.umap | 2 +- 18 files changed, 40 insertions(+), 22 deletions(-) create mode 100644 Content/Audio/Common/bullet_hit.uasset create mode 100644 Content/Audio/Common/headshot.uasset create mode 100644 Content/Audio/Units/Mite/mitedeath.uasset create mode 100644 Content/Blueprints/Units/Common/BP_Base_Damage.uasset create mode 100644 Content/Blueprints/Units/Common/WBP_HPBar.uasset create mode 100644 Content/Blueprints/Units/M_Mite/SC_Impact.uasset diff --git a/Content/Audio/Common/bullet_hit.uasset b/Content/Audio/Common/bullet_hit.uasset new file mode 100644 index 0000000..d5af94e --- /dev/null +++ b/Content/Audio/Common/bullet_hit.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f524c181be3e996ba70fc27af2ba22fbb378d9e8f294df4cd794a285ee0db26 +size 21930 diff --git a/Content/Audio/Common/headshot.uasset b/Content/Audio/Common/headshot.uasset new file mode 100644 index 0000000..dff641a --- /dev/null +++ b/Content/Audio/Common/headshot.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05b877aab1337bb17344f782902c3b5714069b673ec17a7db26e71b063551d11 +size 44618 diff --git a/Content/Audio/Units/Mite/mitedeath.uasset b/Content/Audio/Units/Mite/mitedeath.uasset new file mode 100644 index 0000000..e8ca14a --- /dev/null +++ b/Content/Audio/Units/Mite/mitedeath.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84f5465152b6327f6360d72868013d13ff49f128f97ae6e6250e1ce97f914b7a +size 64406 diff --git a/Content/Blueprints/BP_GameState.uasset b/Content/Blueprints/BP_GameState.uasset index 14e2fbc..b90a63f 100644 --- a/Content/Blueprints/BP_GameState.uasset +++ b/Content/Blueprints/BP_GameState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e260a1f641a7e31a3657c70b0e1b59bcda45140249334e123eb48c2030787b3 -size 202092 +oid sha256:01ebaf81743c40b51084eb7cfb0970a2d5a6a3173449240473bbbdbb2ecb63e4 +size 206123 diff --git a/Content/Blueprints/BP_PlayerController.uasset b/Content/Blueprints/BP_PlayerController.uasset index 92c7eb9..66bab8e 100644 --- a/Content/Blueprints/BP_PlayerController.uasset +++ b/Content/Blueprints/BP_PlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14a5376c9be98114b546b6f453378e46c3d1032b98e77081d2e0837e9121f9fe -size 324535 +oid sha256:db6388f83a82ab781657472966ae51cbfc42f1f95e47f360dc851c3ba55a6a63 +size 335370 diff --git a/Content/Blueprints/Levels/WavesInvasion/Invasion_Wave1.uasset b/Content/Blueprints/Levels/WavesInvasion/Invasion_Wave1.uasset index b41f838..78fa334 100644 --- a/Content/Blueprints/Levels/WavesInvasion/Invasion_Wave1.uasset +++ b/Content/Blueprints/Levels/WavesInvasion/Invasion_Wave1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebe1f352e1f2f73cca8e567ec61c238ff846520666274e3de0b221ed3eef554e -size 1886 +oid sha256:7f1346a9d016e1adc2e80d030dfb303fd39d54a3e406a444cc3f7e0cec95b214 +size 1741 diff --git a/Content/Blueprints/Units/Common/BP_Base_Damage.uasset b/Content/Blueprints/Units/Common/BP_Base_Damage.uasset new file mode 100644 index 0000000..97a8866 --- /dev/null +++ b/Content/Blueprints/Units/Common/BP_Base_Damage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f2663712e71f15b5b78aba9f9b13cab1f0b45a5446018156c582baf41e04d26 +size 7366 diff --git a/Content/Blueprints/Units/Common/BP_Unit.uasset b/Content/Blueprints/Units/Common/BP_Unit.uasset index 532862a..cbac7c3 100644 --- a/Content/Blueprints/Units/Common/BP_Unit.uasset +++ b/Content/Blueprints/Units/Common/BP_Unit.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b1bd360eddd475a4f0bfdf6b3e1e7c3d7ce16317be1e6535ce700ce6a02c2b2 -size 214345 +oid sha256:35c28eaf6da9ea34ba8f4ebbd0f002dbcc72c5b7a81b293252b44f553fb06be4 +size 358361 diff --git a/Content/Blueprints/Units/Common/Projectiles/BP_Projectile_Basic.uasset b/Content/Blueprints/Units/Common/Projectiles/BP_Projectile_Basic.uasset index 303af1a..30ba36e 100644 --- a/Content/Blueprints/Units/Common/Projectiles/BP_Projectile_Basic.uasset +++ b/Content/Blueprints/Units/Common/Projectiles/BP_Projectile_Basic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f29e2ae23e3ab0f1f9839d1539b856d9edcbf63acc2bba2ade6fa95c0599e065 -size 71025 +oid sha256:84327a0ff04308e701dd22f8218e004cc2c7f997853bd2fd083aaf6eedd5061c +size 68787 diff --git a/Content/Blueprints/Units/Common/Projectiles/DT_Projectile_Basic.uasset b/Content/Blueprints/Units/Common/Projectiles/DT_Projectile_Basic.uasset index 5d6a8a4..01ebae5 100644 --- a/Content/Blueprints/Units/Common/Projectiles/DT_Projectile_Basic.uasset +++ b/Content/Blueprints/Units/Common/Projectiles/DT_Projectile_Basic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7769b71c9ddd9f51f33ef5cb6f6789eab2b4985035a6c9ed0a35fb06a7014915 -size 4153 +oid sha256:e72a781e5e35bcc4d1bd2a74477f3e4f1d93456a6f1a130ddea2c037f561fc76 +size 4380 diff --git a/Content/Blueprints/Units/Common/WBP_HPBar.uasset b/Content/Blueprints/Units/Common/WBP_HPBar.uasset new file mode 100644 index 0000000..e1e1618 --- /dev/null +++ b/Content/Blueprints/Units/Common/WBP_HPBar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0134cbb2e793d46f551fcc765e244240abc953aac520b0f9b3609d955642a8ac +size 29005 diff --git a/Content/Blueprints/Units/EM_Rifleman/BP_EM_Rifleman.uasset b/Content/Blueprints/Units/EM_Rifleman/BP_EM_Rifleman.uasset index 6b4b911..dea24fb 100644 --- a/Content/Blueprints/Units/EM_Rifleman/BP_EM_Rifleman.uasset +++ b/Content/Blueprints/Units/EM_Rifleman/BP_EM_Rifleman.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baa89f69e87060ffb1218edf220878fbff39fcc9bb3a962d17efbb811605e0f6 -size 146642 +oid sha256:d1cdba706e801e5d846f6ce1afa63e7375f823356e2a0fa2c7816d5539746b16 +size 138469 diff --git a/Content/Blueprints/Units/EM_Rifleman/DA_EM_Rifleman.uasset b/Content/Blueprints/Units/EM_Rifleman/DA_EM_Rifleman.uasset index 73e0db4..3f47d50 100644 --- a/Content/Blueprints/Units/EM_Rifleman/DA_EM_Rifleman.uasset +++ b/Content/Blueprints/Units/EM_Rifleman/DA_EM_Rifleman.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27b378249d603103dccc95be96c2386b3f8be32025a824bd599e2882ceb975bf -size 3135 +oid sha256:dba1cd8baa3934dc1620e9ff4b0bb763e6bb99ee03ff2f7c6cffc5ec830084f3 +size 3222 diff --git a/Content/Blueprints/Units/M_Mite/BP_Mite.uasset b/Content/Blueprints/Units/M_Mite/BP_Mite.uasset index fe1a5ab..89c6d85 100644 --- a/Content/Blueprints/Units/M_Mite/BP_Mite.uasset +++ b/Content/Blueprints/Units/M_Mite/BP_Mite.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e3d9f074e72331d16b62ccb1991fcf05704cffd2e7903a671af7ee57259e910 -size 59608 +oid sha256:d2d2cd2b35edf7bed39c96336ed64e2bee9c32f4e95dd69cbab761ef908baec6 +size 69707 diff --git a/Content/Blueprints/Units/M_Mite/DA_M_Mite.uasset b/Content/Blueprints/Units/M_Mite/DA_M_Mite.uasset index 696b67a..18c348a 100644 --- a/Content/Blueprints/Units/M_Mite/DA_M_Mite.uasset +++ b/Content/Blueprints/Units/M_Mite/DA_M_Mite.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be1d85f93e875bbcb503c49ca20143ca5e31d227419a33566a9c88b1f55ffce6 +oid sha256:41d6365e885a8bdbb29161c2848a4f23c1ce0d70727afe6f9c7a9322690eacee size 2675 diff --git a/Content/Blueprints/Units/M_Mite/M_Attack.uasset b/Content/Blueprints/Units/M_Mite/M_Attack.uasset index 1a23291..2052600 100644 --- a/Content/Blueprints/Units/M_Mite/M_Attack.uasset +++ b/Content/Blueprints/Units/M_Mite/M_Attack.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eebe2d8786b95384dca6dd588d7bee1c0e61dfb2992dfc9fade5643dd84d3886 -size 8408 +oid sha256:30a17f4473e9f01241c2b8ffea1c005c9845747cfa86c465bb6bc480585b8b81 +size 11856 diff --git a/Content/Blueprints/Units/M_Mite/SC_Impact.uasset b/Content/Blueprints/Units/M_Mite/SC_Impact.uasset new file mode 100644 index 0000000..1d4686d --- /dev/null +++ b/Content/Blueprints/Units/M_Mite/SC_Impact.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb3c48317b6e6e74cf076981dcce7500bd5f5388a2232b4a286c61a0f230eead +size 9140 diff --git a/Content/Levels/MainMenu.umap b/Content/Levels/MainMenu.umap index e04864e..87305ea 100644 --- a/Content/Levels/MainMenu.umap +++ b/Content/Levels/MainMenu.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f61cc09074fe56e09eb6a29adc326bc980cf55bd1d71c3a9c550c78416ffbe7e +oid sha256:1d300612b444a477b5f0782710dafa3bf12a12915b679e0dcf8ef7e00f37efc2 size 40530