From 94eeccde07cf776a23c83b472ea55dc146214ea5 Mon Sep 17 00:00:00 2001 From: Jers Date: Thu, 4 Jan 2024 01:39:23 -0600 Subject: [PATCH] Added the mite enemy and started working on AI for melee --- Content/Blueprints/BP_PlayerController.uasset | 4 ++-- .../Blueprints/Levels/WavesInvasion/Invasion_Wave1.uasset | 4 ++-- Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset | 4 ++-- Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset | 4 ++-- .../Units/Common/AI/BTTask_MoveToClosestEnemy.uasset | 4 ++-- Content/Blueprints/Units/Common/BP_Unit.uasset | 4 ++-- Content/Blueprints/Units/Common/Projectiles/DT_Melee.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/ABP_Mite.uasset | 3 +++ Content/Blueprints/Units/M_Mite/BP_Mite.uasset | 3 +++ Content/Blueprints/Units/M_Mite/DA_M_Mite.uasset | 4 ++-- Content/Blueprints/Units/M_Mite/M_Attack.uasset | 3 +++ Content/Levels/MainMenu.umap | 2 +- Content/Models/EnemyUnits/Mite/Materials/MiteBase.uasset | 3 +++ Content/Models/EnemyUnits/Mite/Materials/MiteBlades.uasset | 3 +++ .../Models/EnemyUnits/Mite/Materials/MiteCarapace.uasset | 3 +++ Content/Models/EnemyUnits/Mite/Materials/MiteStalks.uasset | 3 +++ .../EnemyUnits/Mite/Textures/mite_Base_BaseColor.uasset | 3 +++ .../Models/EnemyUnits/Mite/Textures/mite_Base_Normal.uasset | 3 +++ .../Textures/mite_Base_OcclusionRoughnessMetallic.uasset | 3 +++ .../EnemyUnits/Mite/Textures/mite_Blades_BaseColor.uasset | 3 +++ .../EnemyUnits/Mite/Textures/mite_Blades_Normal.uasset | 3 +++ .../Textures/mite_Blades_OcclusionRoughnessMetallic.uasset | 3 +++ .../EnemyUnits/Mite/Textures/mite_Carapace_BaseColor.uasset | 3 +++ .../EnemyUnits/Mite/Textures/mite_Carapace_Normal.uasset | 3 +++ .../mite_Carapace_OcclusionRoughnessMetallic.uasset | 3 +++ .../EnemyUnits/Mite/Textures/mite_Stalks_BaseColor.uasset | 3 +++ .../EnemyUnits/Mite/Textures/mite_Stalks_Normal.uasset | 3 +++ .../Textures/mite_Stalks_OcclusionRoughnessMetallic.uasset | 3 +++ Content/Models/EnemyUnits/Mite/mite.uasset | 3 +++ Content/Models/EnemyUnits/Mite/mite_PhysicsAsset.uasset | 3 +++ Content/Models/EnemyUnits/Mite/mite_Skeleton.uasset | 3 +++ .../Models/EnemyUnits/Mite/mite_animations_Attack.uasset | 3 +++ Content/Models/EnemyUnits/Mite/mite_animations_Run.uasset | 3 +++ Content/Models/EnemyUnits/Mite/mite_animations_TPose.uasset | 3 +++ Content/Models/Levels/Level1/Base.uasset | 4 ++-- Source/SpaceBattler/Private/PartySubsystem.cpp | 6 ++++-- Source/SpaceBattler/Private/WaveSubsystem.cpp | 2 ++ Source/SpaceBattler/Public/PartySubsystem.h | 2 +- Source/SpaceBattler/Public/UnitInfo.h | 6 ++++++ 41 files changed, 112 insertions(+), 24 deletions(-) create mode 100644 Content/Blueprints/Units/Common/Projectiles/DT_Melee.uasset create mode 100644 Content/Blueprints/Units/M_Mite/ABP_Mite.uasset create mode 100644 Content/Blueprints/Units/M_Mite/BP_Mite.uasset create mode 100644 Content/Blueprints/Units/M_Mite/M_Attack.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Materials/MiteBase.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Materials/MiteBlades.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Materials/MiteCarapace.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Materials/MiteStalks.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Textures/mite_Base_BaseColor.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Textures/mite_Base_Normal.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Textures/mite_Base_OcclusionRoughnessMetallic.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Textures/mite_Blades_BaseColor.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Textures/mite_Blades_Normal.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Textures/mite_Blades_OcclusionRoughnessMetallic.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Textures/mite_Carapace_BaseColor.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Textures/mite_Carapace_Normal.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Textures/mite_Carapace_OcclusionRoughnessMetallic.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Textures/mite_Stalks_BaseColor.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Textures/mite_Stalks_Normal.uasset create mode 100644 Content/Models/EnemyUnits/Mite/Textures/mite_Stalks_OcclusionRoughnessMetallic.uasset create mode 100644 Content/Models/EnemyUnits/Mite/mite.uasset create mode 100644 Content/Models/EnemyUnits/Mite/mite_PhysicsAsset.uasset create mode 100644 Content/Models/EnemyUnits/Mite/mite_Skeleton.uasset create mode 100644 Content/Models/EnemyUnits/Mite/mite_animations_Attack.uasset create mode 100644 Content/Models/EnemyUnits/Mite/mite_animations_Run.uasset create mode 100644 Content/Models/EnemyUnits/Mite/mite_animations_TPose.uasset diff --git a/Content/Blueprints/BP_PlayerController.uasset b/Content/Blueprints/BP_PlayerController.uasset index 2c9d99e..92c7eb9 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:b5b2fb911fd69e95ab6f627812d9540c914506642b8ad596fe18d7b5a5a1ff95 -size 323859 +oid sha256:14a5376c9be98114b546b6f453378e46c3d1032b98e77081d2e0837e9121f9fe +size 324535 diff --git a/Content/Blueprints/Levels/WavesInvasion/Invasion_Wave1.uasset b/Content/Blueprints/Levels/WavesInvasion/Invasion_Wave1.uasset index 45c6687..b41f838 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:93235c534dee9d74ff2d6961d13adafd6abaf5f8b0b2941237b3be8057161f90 -size 1725 +oid sha256:ebe1f352e1f2f73cca8e567ec61c238ff846520666274e3de0b221ed3eef554e +size 1886 diff --git a/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset b/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset index c892a98..7304cdb 100644 --- a/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset +++ b/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2835c026e8b6c66266a71b2cc6c4b8edde5c6f8247e0dbda754ad8a31722497a -size 69549 +oid sha256:f1eadf852e781038436d11bc525c0a06fc0e2142d54df2383e035dd2871b00b3 +size 95972 diff --git a/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset b/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset index 2dedec3..5e21afc 100644 --- a/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset +++ b/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:626e24cd00dbbd5e465d1461a80cf56eefed0b14f0c4f8bfac42a01036bf7557 -size 98671 +oid sha256:c051b4a0a71490d2bd88af13c6e588798bbba8fb230d9d663f69596155fbb766 +size 98939 diff --git a/Content/Blueprints/Units/Common/AI/BTTask_MoveToClosestEnemy.uasset b/Content/Blueprints/Units/Common/AI/BTTask_MoveToClosestEnemy.uasset index 2445545..42b4ceb 100644 --- a/Content/Blueprints/Units/Common/AI/BTTask_MoveToClosestEnemy.uasset +++ b/Content/Blueprints/Units/Common/AI/BTTask_MoveToClosestEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d258b67184e6b8bc6f3c333a8d26c662d8fa2fd90ccabc35a7eedfb2ca1143b2 -size 254294 +oid sha256:9d9f95942988eb449d8271abd3baee90481fcf91e33c3e5e5214d6381c0950d5 +size 253541 diff --git a/Content/Blueprints/Units/Common/BP_Unit.uasset b/Content/Blueprints/Units/Common/BP_Unit.uasset index c85f35c..532862a 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:6193e2c07f8bbf020f48d7f17831b5aabd671697881b774e5cefc19518437b19 -size 173903 +oid sha256:9b1bd360eddd475a4f0bfdf6b3e1e7c3d7ce16317be1e6535ce700ce6a02c2b2 +size 214345 diff --git a/Content/Blueprints/Units/Common/Projectiles/DT_Melee.uasset b/Content/Blueprints/Units/Common/Projectiles/DT_Melee.uasset new file mode 100644 index 0000000..29cf480 --- /dev/null +++ b/Content/Blueprints/Units/Common/Projectiles/DT_Melee.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b17b71a5bddba05fc9420dfa0524df99067c02994b9a9fe2816335791a77b34e +size 3750 diff --git a/Content/Blueprints/Units/EM_Rifleman/BP_EM_Rifleman.uasset b/Content/Blueprints/Units/EM_Rifleman/BP_EM_Rifleman.uasset index 831bd4c..6b4b911 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:08d95794f60335e640872d009a4fb94d078643384d85b884485dc6f5c455b875 -size 145494 +oid sha256:baa89f69e87060ffb1218edf220878fbff39fcc9bb3a962d17efbb811605e0f6 +size 146642 diff --git a/Content/Blueprints/Units/EM_Rifleman/DA_EM_Rifleman.uasset b/Content/Blueprints/Units/EM_Rifleman/DA_EM_Rifleman.uasset index c881f2e..73e0db4 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:45a3a1e7e5e0e455928c257bd63a0bbe7161da14be72ad3066a5b4229f484435 -size 3179 +oid sha256:27b378249d603103dccc95be96c2386b3f8be32025a824bd599e2882ceb975bf +size 3135 diff --git a/Content/Blueprints/Units/M_Mite/ABP_Mite.uasset b/Content/Blueprints/Units/M_Mite/ABP_Mite.uasset new file mode 100644 index 0000000..d54994f --- /dev/null +++ b/Content/Blueprints/Units/M_Mite/ABP_Mite.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27881ca69d066a5dc8a7576bacd58d87959f7cc9134965d40deb547835d0d72d +size 136676 diff --git a/Content/Blueprints/Units/M_Mite/BP_Mite.uasset b/Content/Blueprints/Units/M_Mite/BP_Mite.uasset new file mode 100644 index 0000000..fe1a5ab --- /dev/null +++ b/Content/Blueprints/Units/M_Mite/BP_Mite.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e3d9f074e72331d16b62ccb1991fcf05704cffd2e7903a671af7ee57259e910 +size 59608 diff --git a/Content/Blueprints/Units/M_Mite/DA_M_Mite.uasset b/Content/Blueprints/Units/M_Mite/DA_M_Mite.uasset index 6996765..696b67a 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:2be20249d0b66a4211823d6033702ca07b348a98b26727c5ab1cd28869c477b7 -size 2589 +oid sha256:be1d85f93e875bbcb503c49ca20143ca5e31d227419a33566a9c88b1f55ffce6 +size 2675 diff --git a/Content/Blueprints/Units/M_Mite/M_Attack.uasset b/Content/Blueprints/Units/M_Mite/M_Attack.uasset new file mode 100644 index 0000000..1a23291 --- /dev/null +++ b/Content/Blueprints/Units/M_Mite/M_Attack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eebe2d8786b95384dca6dd588d7bee1c0e61dfb2992dfc9fade5643dd84d3886 +size 8408 diff --git a/Content/Levels/MainMenu.umap b/Content/Levels/MainMenu.umap index 970cd32..e04864e 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:a6223f70c88427103b846dc7a682a210175229424711edcd593739ba2e8b498a +oid sha256:f61cc09074fe56e09eb6a29adc326bc980cf55bd1d71c3a9c550c78416ffbe7e size 40530 diff --git a/Content/Models/EnemyUnits/Mite/Materials/MiteBase.uasset b/Content/Models/EnemyUnits/Mite/Materials/MiteBase.uasset new file mode 100644 index 0000000..b82d416 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Materials/MiteBase.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c611dbfe1d90bda2049979262658c96d1375cb84b90afed7e7b07433598f92d +size 17168 diff --git a/Content/Models/EnemyUnits/Mite/Materials/MiteBlades.uasset b/Content/Models/EnemyUnits/Mite/Materials/MiteBlades.uasset new file mode 100644 index 0000000..ca8a5e8 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Materials/MiteBlades.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90c0e191162964e14f73a429b85d49f9d62c913d83d5ce8f172225f267bfee8d +size 12994 diff --git a/Content/Models/EnemyUnits/Mite/Materials/MiteCarapace.uasset b/Content/Models/EnemyUnits/Mite/Materials/MiteCarapace.uasset new file mode 100644 index 0000000..6783be4 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Materials/MiteCarapace.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a81084a648edc9cd1ed32e67f2587936ae128da66d8c5f610ba13a01d4f172d +size 13871 diff --git a/Content/Models/EnemyUnits/Mite/Materials/MiteStalks.uasset b/Content/Models/EnemyUnits/Mite/Materials/MiteStalks.uasset new file mode 100644 index 0000000..5aa7b9a --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Materials/MiteStalks.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa60c8402ad8930d987fcd380202aa90165cc044ecd1e5727471f994f9145a18 +size 13552 diff --git a/Content/Models/EnemyUnits/Mite/Textures/mite_Base_BaseColor.uasset b/Content/Models/EnemyUnits/Mite/Textures/mite_Base_BaseColor.uasset new file mode 100644 index 0000000..cf394b6 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Textures/mite_Base_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:887b45dcea58dd03d5f15026ff582b4dac8c9a17ff3284ee9da0033197f8ab00 +size 317746 diff --git a/Content/Models/EnemyUnits/Mite/Textures/mite_Base_Normal.uasset b/Content/Models/EnemyUnits/Mite/Textures/mite_Base_Normal.uasset new file mode 100644 index 0000000..313f424 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Textures/mite_Base_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbc58d9a53e586aaab706e76c81dd97cf9152f4ebe978be0c0df7afd7005d40c +size 298987 diff --git a/Content/Models/EnemyUnits/Mite/Textures/mite_Base_OcclusionRoughnessMetallic.uasset b/Content/Models/EnemyUnits/Mite/Textures/mite_Base_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..11ba599 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Textures/mite_Base_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e08c3bb5933f0c28ed52b5710a9ddd596d9563ef18944bf2fde7ca0e0d6af095 +size 281734 diff --git a/Content/Models/EnemyUnits/Mite/Textures/mite_Blades_BaseColor.uasset b/Content/Models/EnemyUnits/Mite/Textures/mite_Blades_BaseColor.uasset new file mode 100644 index 0000000..4c18890 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Textures/mite_Blades_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:401b1858243e5e11faf269aea87ba12cd3af41aabe1067aad78d5c6b9b31cca0 +size 43126 diff --git a/Content/Models/EnemyUnits/Mite/Textures/mite_Blades_Normal.uasset b/Content/Models/EnemyUnits/Mite/Textures/mite_Blades_Normal.uasset new file mode 100644 index 0000000..7d5705a --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Textures/mite_Blades_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1601d64c3ec31fcc747d071becac852f6aa42e8f087ff868e0a02eba89f6773a +size 11369 diff --git a/Content/Models/EnemyUnits/Mite/Textures/mite_Blades_OcclusionRoughnessMetallic.uasset b/Content/Models/EnemyUnits/Mite/Textures/mite_Blades_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..8777b1b --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Textures/mite_Blades_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e187833c2b9ac80b3a478f7e6ce206aca9a95412c427a4f5d14d95c5b558dcc +size 40848 diff --git a/Content/Models/EnemyUnits/Mite/Textures/mite_Carapace_BaseColor.uasset b/Content/Models/EnemyUnits/Mite/Textures/mite_Carapace_BaseColor.uasset new file mode 100644 index 0000000..71ca386 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Textures/mite_Carapace_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c04415ef2cfb6d6474c04d9a5563df0118654b78502f1fa398796c01fa51695 +size 145082 diff --git a/Content/Models/EnemyUnits/Mite/Textures/mite_Carapace_Normal.uasset b/Content/Models/EnemyUnits/Mite/Textures/mite_Carapace_Normal.uasset new file mode 100644 index 0000000..79a2581 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Textures/mite_Carapace_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d424a5114a15dc68890e7753b716873b99ca5aa52e0788eac2f6e93f5e75ac2c +size 178397 diff --git a/Content/Models/EnemyUnits/Mite/Textures/mite_Carapace_OcclusionRoughnessMetallic.uasset b/Content/Models/EnemyUnits/Mite/Textures/mite_Carapace_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..05c9c37 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Textures/mite_Carapace_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7cff0bb30066eca29d0403bbeeb98baef590d615fb0feb1336d37f6a7a7328d +size 122996 diff --git a/Content/Models/EnemyUnits/Mite/Textures/mite_Stalks_BaseColor.uasset b/Content/Models/EnemyUnits/Mite/Textures/mite_Stalks_BaseColor.uasset new file mode 100644 index 0000000..95352c7 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Textures/mite_Stalks_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38c859c75659da72ffb827e0f6ad7e7ef1dbb75c05c41e32d403e615283246ad +size 105057 diff --git a/Content/Models/EnemyUnits/Mite/Textures/mite_Stalks_Normal.uasset b/Content/Models/EnemyUnits/Mite/Textures/mite_Stalks_Normal.uasset new file mode 100644 index 0000000..0ddc0a9 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Textures/mite_Stalks_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a89698faef13bafa3f5778ee90eb802687ea06771003d71faf177da68185977c +size 83505 diff --git a/Content/Models/EnemyUnits/Mite/Textures/mite_Stalks_OcclusionRoughnessMetallic.uasset b/Content/Models/EnemyUnits/Mite/Textures/mite_Stalks_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..3ee4ed0 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/Textures/mite_Stalks_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9e4b62475270e9ab45a43754d02b867f26e3d24ef4332e89c3b45dc04f6ee43 +size 103257 diff --git a/Content/Models/EnemyUnits/Mite/mite.uasset b/Content/Models/EnemyUnits/Mite/mite.uasset new file mode 100644 index 0000000..beb1ba2 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/mite.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fc576d482c450832dd7f040ab6a192c15d31a593e7e5515aa2fe626b2934157 +size 8493195 diff --git a/Content/Models/EnemyUnits/Mite/mite_PhysicsAsset.uasset b/Content/Models/EnemyUnits/Mite/mite_PhysicsAsset.uasset new file mode 100644 index 0000000..d55d628 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/mite_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af9f04e09735cb52fd4622934b04fa100f7901dbb0ee2362cd8f7b0fe98e7a87 +size 38235 diff --git a/Content/Models/EnemyUnits/Mite/mite_Skeleton.uasset b/Content/Models/EnemyUnits/Mite/mite_Skeleton.uasset new file mode 100644 index 0000000..8c9fef6 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/mite_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8856154e9afbe4841cf9fafdda619033383fb75c96dd5e22d83473384db6a820 +size 15200 diff --git a/Content/Models/EnemyUnits/Mite/mite_animations_Attack.uasset b/Content/Models/EnemyUnits/Mite/mite_animations_Attack.uasset new file mode 100644 index 0000000..22c7249 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/mite_animations_Attack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45c04fa0ddcf3cd1eb1597d60ff6e281bfce017b6f72df5eef2d439abe6c0f4c +size 98130 diff --git a/Content/Models/EnemyUnits/Mite/mite_animations_Run.uasset b/Content/Models/EnemyUnits/Mite/mite_animations_Run.uasset new file mode 100644 index 0000000..b5b7ec1 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/mite_animations_Run.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aba145ebda8f10658e6ebc7383fc82c0e8dd54d164f6f0e0754db97b92a614d0 +size 86453 diff --git a/Content/Models/EnemyUnits/Mite/mite_animations_TPose.uasset b/Content/Models/EnemyUnits/Mite/mite_animations_TPose.uasset new file mode 100644 index 0000000..db2af71 --- /dev/null +++ b/Content/Models/EnemyUnits/Mite/mite_animations_TPose.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d901bbb6535d0bcfa606fa7057b9244e14989f43129bca03c42218fad1df172 +size 56989 diff --git a/Content/Models/Levels/Level1/Base.uasset b/Content/Models/Levels/Level1/Base.uasset index c11f696..21712bd 100644 --- a/Content/Models/Levels/Level1/Base.uasset +++ b/Content/Models/Levels/Level1/Base.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddde67ba4ce13b4820f647080808fb43bf2a2f376a3923fff5625609f4f4b831 -size 13140 +oid sha256:7110110036eb6345fda5e55185c457543cbf72bb569e72ac948d5466826ac008 +size 13255 diff --git a/Source/SpaceBattler/Private/PartySubsystem.cpp b/Source/SpaceBattler/Private/PartySubsystem.cpp index b2cf866..b87cade 100644 --- a/Source/SpaceBattler/Private/PartySubsystem.cpp +++ b/Source/SpaceBattler/Private/PartySubsystem.cpp @@ -35,6 +35,7 @@ int32 UPartySubsystem::SpawnParty(const float InVerticalSpacing, const float InH this->NumRows = InNumRows; this->HorizontalSpacing = InHorizontalSpacing; CurrentColumn = 0; + LastSpawnIndex = 0; SpawnQueue.Empty(); TArray SpawnPoints; @@ -43,7 +44,8 @@ int32 UPartySubsystem::SpawnParty(const float InVerticalSpacing, const float InH for (FPartyMember &Unit : GetMembers()) { - for(auto i = 0; i < GetMemberAllocated(Unit); i++) + const int32 Allocated = GetMemberAllocated(Unit); + for(auto i = 0; i < Allocated; i++) { SpawnQueue.Add(GetMemberUnitInfo(Unit)->GetCharacterClass()); } @@ -135,7 +137,7 @@ bool UPartySubsystem::AllocateMember(FPartyMember& Member) return true; } -bool UPartySubsystem::DeallocateMember(FPartyMember& Member) +bool UPartySubsystem::DeallocateMember(FPartyMember &Member) { Member.Allocated--; diff --git a/Source/SpaceBattler/Private/WaveSubsystem.cpp b/Source/SpaceBattler/Private/WaveSubsystem.cpp index 08b156b..8d18ed1 100644 --- a/Source/SpaceBattler/Private/WaveSubsystem.cpp +++ b/Source/SpaceBattler/Private/WaveSubsystem.cpp @@ -19,6 +19,7 @@ int32 UWaveSubsystem::SpawnWave(const float InVerticalSpacing, const float InHor SpawnQueue = Waves[CurrentWave]->GetUnits(); const auto NumUnits = SpawnQueue.Num(); CurrentColumn = 0; + LastSpawnIndex = 0; TArray SpawnPoints; UGameplayStatics::GetAllActorsWithTag(GetWorld(), "EnemySpawn", SpawnPoints); @@ -75,4 +76,5 @@ void UWaveSubsystem::SpawnUnits() } LastSpawnIndex += NumRows; + CurrentColumn++; } diff --git a/Source/SpaceBattler/Public/PartySubsystem.h b/Source/SpaceBattler/Public/PartySubsystem.h index 94913fc..bceab88 100644 --- a/Source/SpaceBattler/Public/PartySubsystem.h +++ b/Source/SpaceBattler/Public/PartySubsystem.h @@ -38,7 +38,7 @@ public: bool AllocateMember(UPARAM(ref) FPartyMember& Member); UFUNCTION(BlueprintCallable) - bool DeallocateMember(UPARAM(ref) FPartyMember& Member); + bool DeallocateMember(UPARAM(ref) FPartyMember &Member); UFUNCTION(BlueprintCallable) void SetMemberMax(UPARAM(ref) FPartyMember& Member); diff --git a/Source/SpaceBattler/Public/UnitInfo.h b/Source/SpaceBattler/Public/UnitInfo.h index cc1d4ea..372588c 100644 --- a/Source/SpaceBattler/Public/UnitInfo.h +++ b/Source/SpaceBattler/Public/UnitInfo.h @@ -39,9 +39,15 @@ protected: UPROPERTY(BlueprintReadWrite, EditAnywhere) bool IsRanged; + UPROPERTY(BlueprintReadWrite, EditAnywhere) + float IsFlying; + UPROPERTY(BlueprintReadWrite, EditAnywhere) float Range; + UPROPERTY(BlueprintReadWrite, EditAnywhere) + float Speed; + UPROPERTY(BlueprintReadWrite, EditAnywhere) int32 Tier;