From 1a7b62262b43c2bf4f9c11d74f2869b61f33cbce Mon Sep 17 00:00:00 2001 From: Jers Date: Thu, 8 Feb 2024 00:52:27 -0600 Subject: [PATCH] Added some fluffy UI stuff --- Content/Blueprints/Abilities/BP_StrafingRun.uasset | 4 ++-- Content/Blueprints/BP_PlayerController.uasset | 4 ++-- .../Blueprints/Editor/PartyManager/EW_PartyManager.uasset | 4 ++-- .../Niagra/shockwave_small/NS_ShockwaveSmall.uasset | 3 +++ Content/Blueprints/UI/BattleUI/SC_CrossHairs.uasset | 4 ++-- Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset | 4 ++-- Content/Blueprints/Units/Common/BP_Unit.uasset | 4 ++-- .../Units/Common/Projectiles/BP_Projectile_Base.uasset | 4 ++-- Content/Blueprints/Units/Common/WBP_DeathIcon.uasset | 3 +++ Content/Blueprints/Units/EM_MortarTeam/ABP_Mortar.uasset | 3 +++ .../Blueprints/Units/EM_MortarTeam/BP_MortarShell.uasset | 3 +++ Content/Blueprints/Units/EM_MortarTeam/BP_MortarTeam.uasset | 3 +++ Content/Data/PlayerUnits/DA_EM_CQB.uasset | 2 +- Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset | 4 ++-- Content/Data/PlayerUnits/DA_EM_Rifleman.uasset | 2 +- Content/Levels/BattleMap.umap | 4 ++-- Content/Levels/MainMenu.umap | 2 +- Content/Models/EnemyUnits/Mite/mite_PhysicsAsset.uasset | 4 ++-- Content/Models/EnemyUnits/Wyrm/wyrm_PhysicsAsset.uasset | 4 ++-- Content/Models/PlayerUnits/Mortar/M_Mortar_Fire.uasset | 3 +++ Content/Models/PlayerUnits/Mortar/mortar.uasset | 3 +++ .../Models/PlayerUnits/Mortar/mortar_PhysicsAsset.uasset | 3 +++ Content/Models/PlayerUnits/Mortar/mortar_Skeleton.uasset | 3 +++ Content/Models/PlayerUnits/Mortar/mortar_fire_Fire.uasset | 3 +++ Content/Models/PlayerUnits/Mortar/mortar_fire_Idle.uasset | 3 +++ Content/Models/PlayerUnits/Mortar/mortarshell.uasset | 3 +++ Content/UI/Images/Icons/AnimatedCursor.uasset | 3 +++ Content/UI/Images/Icons/SkullFlicker.uasset | 3 +++ Content/UI/Images/Icons/skull.uasset | 3 +++ Content/UI/Images/Icons/target.uasset | 3 +++ Source/SpaceBattler/Public/Unit.h | 6 ++++++ Source/SpaceBattler/Public/UnitInfo.h | 6 ++++++ 32 files changed, 85 insertions(+), 25 deletions(-) create mode 100644 Content/Blueprints/Niagra/shockwave_small/NS_ShockwaveSmall.uasset create mode 100644 Content/Blueprints/Units/Common/WBP_DeathIcon.uasset create mode 100644 Content/Blueprints/Units/EM_MortarTeam/ABP_Mortar.uasset create mode 100644 Content/Blueprints/Units/EM_MortarTeam/BP_MortarShell.uasset create mode 100644 Content/Blueprints/Units/EM_MortarTeam/BP_MortarTeam.uasset create mode 100644 Content/Models/PlayerUnits/Mortar/M_Mortar_Fire.uasset create mode 100644 Content/Models/PlayerUnits/Mortar/mortar.uasset create mode 100644 Content/Models/PlayerUnits/Mortar/mortar_PhysicsAsset.uasset create mode 100644 Content/Models/PlayerUnits/Mortar/mortar_Skeleton.uasset create mode 100644 Content/Models/PlayerUnits/Mortar/mortar_fire_Fire.uasset create mode 100644 Content/Models/PlayerUnits/Mortar/mortar_fire_Idle.uasset create mode 100644 Content/Models/PlayerUnits/Mortar/mortarshell.uasset create mode 100644 Content/UI/Images/Icons/AnimatedCursor.uasset create mode 100644 Content/UI/Images/Icons/SkullFlicker.uasset create mode 100644 Content/UI/Images/Icons/skull.uasset create mode 100644 Content/UI/Images/Icons/target.uasset diff --git a/Content/Blueprints/Abilities/BP_StrafingRun.uasset b/Content/Blueprints/Abilities/BP_StrafingRun.uasset index 6e034df..45c6a45 100644 --- a/Content/Blueprints/Abilities/BP_StrafingRun.uasset +++ b/Content/Blueprints/Abilities/BP_StrafingRun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfa4bc1e012689a256b31b9b01ee3b874b4b30d62ef36849990b6fae1ad43733 -size 68398 +oid sha256:772892f2bde6a630a46187f3855dc824c26e09ba4dde38b1a9930b464b47c698 +size 80005 diff --git a/Content/Blueprints/BP_PlayerController.uasset b/Content/Blueprints/BP_PlayerController.uasset index dc37a1c..53d53d3 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:9958042a5a23ddec02118f01ebce8f8c6814325d07fa66c07646a84baf2119e6 -size 498093 +oid sha256:74e94abb5c641dfeba8e18c2257d2c2c60d972e27acf90eb3833ad183d256fa1 +size 502287 diff --git a/Content/Blueprints/Editor/PartyManager/EW_PartyManager.uasset b/Content/Blueprints/Editor/PartyManager/EW_PartyManager.uasset index 09306c5..7d05b48 100644 --- a/Content/Blueprints/Editor/PartyManager/EW_PartyManager.uasset +++ b/Content/Blueprints/Editor/PartyManager/EW_PartyManager.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4e31cbc57642353bf45383c9533a50a28dd7cc07691c06fce6023834b5316ac -size 66410 +oid sha256:50363a0bb8ae6d95e7821269244963a4393e073f86605a18e93a2419499f0654 +size 82971 diff --git a/Content/Blueprints/Niagra/shockwave_small/NS_ShockwaveSmall.uasset b/Content/Blueprints/Niagra/shockwave_small/NS_ShockwaveSmall.uasset new file mode 100644 index 0000000..376cfe4 --- /dev/null +++ b/Content/Blueprints/Niagra/shockwave_small/NS_ShockwaveSmall.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:209e6b8c4d7f4ec3697821de872e6bb861cf2ea2c6e8cdc695784b23174199a0 +size 466656 diff --git a/Content/Blueprints/UI/BattleUI/SC_CrossHairs.uasset b/Content/Blueprints/UI/BattleUI/SC_CrossHairs.uasset index d9823f1..69d94ea 100644 --- a/Content/Blueprints/UI/BattleUI/SC_CrossHairs.uasset +++ b/Content/Blueprints/UI/BattleUI/SC_CrossHairs.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca5ff7c8c91a5294b0002b55c99f58ed485f80d44b2135d70b78d5a6384e3f24 -size 22161 +oid sha256:cd486e2410c232b46ac70351d3686976e709b12539295e3b9586399c9248d372 +size 24164 diff --git a/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset b/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset index c550b55..874c351 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:f6bb65d8cecfd6b9c6c81c5a514192638e2c3b61133208b3eb707dee9ed3e730 -size 95363 +oid sha256:8bba0e6ba4f49214d722134c5e793add1d530ea6aa7deb86c41720aeeb650e4c +size 114426 diff --git a/Content/Blueprints/Units/Common/BP_Unit.uasset b/Content/Blueprints/Units/Common/BP_Unit.uasset index e79bbdc..270fb19 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:4dd81044ed309e72fc88ab0d631ad41b0bec4afca48a780fd60d213faf0155e9 -size 530346 +oid sha256:7daeafc2583508ad5e033ed181c8b93b573f88822e362e9268f5c0e0f1cbb4fe +size 600682 diff --git a/Content/Blueprints/Units/Common/Projectiles/BP_Projectile_Base.uasset b/Content/Blueprints/Units/Common/Projectiles/BP_Projectile_Base.uasset index d497215..115f28f 100644 --- a/Content/Blueprints/Units/Common/Projectiles/BP_Projectile_Base.uasset +++ b/Content/Blueprints/Units/Common/Projectiles/BP_Projectile_Base.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e99cfa4c51ca9fe5b7567b10823b24eee42ebad9a3c1e63ef1802d834236209b -size 65146 +oid sha256:03eb169919dc5ac55a7455176f946ea9eb5640e70cba4662d5ffcf4003af8036 +size 112651 diff --git a/Content/Blueprints/Units/Common/WBP_DeathIcon.uasset b/Content/Blueprints/Units/Common/WBP_DeathIcon.uasset new file mode 100644 index 0000000..191dd21 --- /dev/null +++ b/Content/Blueprints/Units/Common/WBP_DeathIcon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24ae981898090723c41863f29373753820f46b37f621474f024510e405950d59 +size 25860 diff --git a/Content/Blueprints/Units/EM_MortarTeam/ABP_Mortar.uasset b/Content/Blueprints/Units/EM_MortarTeam/ABP_Mortar.uasset new file mode 100644 index 0000000..a67bf1c --- /dev/null +++ b/Content/Blueprints/Units/EM_MortarTeam/ABP_Mortar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f65bc15f379ac5991283aba2d240b0785b7fd0d6369416f5923ddf73fb2061b6 +size 57451 diff --git a/Content/Blueprints/Units/EM_MortarTeam/BP_MortarShell.uasset b/Content/Blueprints/Units/EM_MortarTeam/BP_MortarShell.uasset new file mode 100644 index 0000000..590bf9b --- /dev/null +++ b/Content/Blueprints/Units/EM_MortarTeam/BP_MortarShell.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1796a2d7e42afb00c07e14667e05a18f38205b63361c395d5884727c4f1013f +size 99966 diff --git a/Content/Blueprints/Units/EM_MortarTeam/BP_MortarTeam.uasset b/Content/Blueprints/Units/EM_MortarTeam/BP_MortarTeam.uasset new file mode 100644 index 0000000..a7bf2e2 --- /dev/null +++ b/Content/Blueprints/Units/EM_MortarTeam/BP_MortarTeam.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de793695c3fa8d5a29a4be2f78faaa0b1b94398aa0a1a5ab399e5ed3c27ee9b1 +size 60876 diff --git a/Content/Data/PlayerUnits/DA_EM_CQB.uasset b/Content/Data/PlayerUnits/DA_EM_CQB.uasset index 78c4a96..dfd2c12 100644 --- a/Content/Data/PlayerUnits/DA_EM_CQB.uasset +++ b/Content/Data/PlayerUnits/DA_EM_CQB.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba490cc17f8e817a45265ee8a34a85df7d0d1c33db363ab0e007fdf2d99baad1 +oid sha256:019da09b1224632b03a97e18bd84a4cdc274b2bfca8d37c32107d4e0b5909121 size 3269 diff --git a/Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset b/Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset index 0b0f246..39b4d29 100644 --- a/Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset +++ b/Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76dc7f420942ad0e2893f59cd4032696d2f52de3f6902425c7f707e04e6c405f -size 2623 +oid sha256:f0707bf442cad381e90a420ef5c9f9bb26954e901b9e7dba0450d0b7836704f7 +size 4516 diff --git a/Content/Data/PlayerUnits/DA_EM_Rifleman.uasset b/Content/Data/PlayerUnits/DA_EM_Rifleman.uasset index 41aa204..d9ab21c 100644 --- a/Content/Data/PlayerUnits/DA_EM_Rifleman.uasset +++ b/Content/Data/PlayerUnits/DA_EM_Rifleman.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d371a412e06f4fe0f1cc64274572fa957710d13460ba59eca5494f0cc93fc63 +oid sha256:0a30fe189a932a66b672977f1b13d854f52c065a39f91ee8f10ec584f5ad954c size 3822 diff --git a/Content/Levels/BattleMap.umap b/Content/Levels/BattleMap.umap index 8a55a57..5602de0 100644 --- a/Content/Levels/BattleMap.umap +++ b/Content/Levels/BattleMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a800e75892e5b046019d97876a3977e22694e30a5eb8f0250490b7552f6358c -size 267553 +oid sha256:a24b3f418aecdf8386eddda601a4f344b77f084ceaf93dd2931047639c8558ce +size 267766 diff --git a/Content/Levels/MainMenu.umap b/Content/Levels/MainMenu.umap index 8810656..976c193 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:685701c30adebf45941803aab31e2773bc7d7d8a31357bf067bd18907314a9aa +oid sha256:7ed1fb60d23d6de10fdbe5ef4e0d4403c31e0e57bb337533677c3cff722a13a4 size 41706 diff --git a/Content/Models/EnemyUnits/Mite/mite_PhysicsAsset.uasset b/Content/Models/EnemyUnits/Mite/mite_PhysicsAsset.uasset index d55d628..1db778a 100644 --- a/Content/Models/EnemyUnits/Mite/mite_PhysicsAsset.uasset +++ b/Content/Models/EnemyUnits/Mite/mite_PhysicsAsset.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af9f04e09735cb52fd4622934b04fa100f7901dbb0ee2362cd8f7b0fe98e7a87 -size 38235 +oid sha256:4da956350cfaecf1d37aab15b3a4ff6e39d68705eac7f67d504d05e476f825c6 +size 40549 diff --git a/Content/Models/EnemyUnits/Wyrm/wyrm_PhysicsAsset.uasset b/Content/Models/EnemyUnits/Wyrm/wyrm_PhysicsAsset.uasset index d4fe4bb..3935430 100644 --- a/Content/Models/EnemyUnits/Wyrm/wyrm_PhysicsAsset.uasset +++ b/Content/Models/EnemyUnits/Wyrm/wyrm_PhysicsAsset.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d27e7a681e92c7840b17b0b0d7aab35fb5c49f9eb4fa01513cda5d86d23eee03 -size 17779 +oid sha256:a3aa52c0898935edac83a4326fed50d9a025a13e247ea2835ca91e2d4b6cb47f +size 18155 diff --git a/Content/Models/PlayerUnits/Mortar/M_Mortar_Fire.uasset b/Content/Models/PlayerUnits/Mortar/M_Mortar_Fire.uasset new file mode 100644 index 0000000..ae3d0c8 --- /dev/null +++ b/Content/Models/PlayerUnits/Mortar/M_Mortar_Fire.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3aede60fea11f6d77b26988d4ea15995e17403a66bbbb1c94989e2a73683178 +size 10687 diff --git a/Content/Models/PlayerUnits/Mortar/mortar.uasset b/Content/Models/PlayerUnits/Mortar/mortar.uasset new file mode 100644 index 0000000..31ad7f5 --- /dev/null +++ b/Content/Models/PlayerUnits/Mortar/mortar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e1a3ca84ba142338acfb80c3ed6680a4d79c06fa60af5503d39ced55dd1e534 +size 189154 diff --git a/Content/Models/PlayerUnits/Mortar/mortar_PhysicsAsset.uasset b/Content/Models/PlayerUnits/Mortar/mortar_PhysicsAsset.uasset new file mode 100644 index 0000000..e0ce4e3 --- /dev/null +++ b/Content/Models/PlayerUnits/Mortar/mortar_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90c98592ef4314114319b829386246c5fa6aeb0ea2e069a6ec6a3678c22e3c90 +size 7386 diff --git a/Content/Models/PlayerUnits/Mortar/mortar_Skeleton.uasset b/Content/Models/PlayerUnits/Mortar/mortar_Skeleton.uasset new file mode 100644 index 0000000..d097900 --- /dev/null +++ b/Content/Models/PlayerUnits/Mortar/mortar_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebd2b39a5005be8af8defe116a093b58cd5dafab2695556e88c27c3998c36388 +size 7056 diff --git a/Content/Models/PlayerUnits/Mortar/mortar_fire_Fire.uasset b/Content/Models/PlayerUnits/Mortar/mortar_fire_Fire.uasset new file mode 100644 index 0000000..5bd25d8 --- /dev/null +++ b/Content/Models/PlayerUnits/Mortar/mortar_fire_Fire.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a41395795119af200d3257894fd3024503f45d73e47c2e0c781b8789b7926a21 +size 20169 diff --git a/Content/Models/PlayerUnits/Mortar/mortar_fire_Idle.uasset b/Content/Models/PlayerUnits/Mortar/mortar_fire_Idle.uasset new file mode 100644 index 0000000..d54a244 --- /dev/null +++ b/Content/Models/PlayerUnits/Mortar/mortar_fire_Idle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a02303bbddec7218dbec0870e67884c6cef12e8151c2a73461f342458db9f65 +size 16411 diff --git a/Content/Models/PlayerUnits/Mortar/mortarshell.uasset b/Content/Models/PlayerUnits/Mortar/mortarshell.uasset new file mode 100644 index 0000000..5b13537 --- /dev/null +++ b/Content/Models/PlayerUnits/Mortar/mortarshell.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1a822bd64ba93030f2d3ccb307d8bec55ae669e85a6855c96e167332ad40be6 +size 118623 diff --git a/Content/UI/Images/Icons/AnimatedCursor.uasset b/Content/UI/Images/Icons/AnimatedCursor.uasset new file mode 100644 index 0000000..e080a2e --- /dev/null +++ b/Content/UI/Images/Icons/AnimatedCursor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fe3e6d1aae02ccb872678106059bcd6d08e2e8e341713089a7f6f24685d0b91 +size 15602 diff --git a/Content/UI/Images/Icons/SkullFlicker.uasset b/Content/UI/Images/Icons/SkullFlicker.uasset new file mode 100644 index 0000000..ed209b8 --- /dev/null +++ b/Content/UI/Images/Icons/SkullFlicker.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ea818cc0e1fd2ed08446ea7fb1205a8a24c7c55337bed32671a43522efcbb38 +size 20828 diff --git a/Content/UI/Images/Icons/skull.uasset b/Content/UI/Images/Icons/skull.uasset new file mode 100644 index 0000000..f78b445 --- /dev/null +++ b/Content/UI/Images/Icons/skull.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2ee15adf40c3bce271a685b534590678ba943bf5eb804aab75a608dd9d1b392 +size 10048 diff --git a/Content/UI/Images/Icons/target.uasset b/Content/UI/Images/Icons/target.uasset new file mode 100644 index 0000000..3afe568 --- /dev/null +++ b/Content/UI/Images/Icons/target.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6c99ca66782921de4b051c8e430ca990ae9ee308e2ba79e3e1a0d03eb99675f +size 10265 diff --git a/Source/SpaceBattler/Public/Unit.h b/Source/SpaceBattler/Public/Unit.h index bb47b7f..1fa0afa 100644 --- a/Source/SpaceBattler/Public/Unit.h +++ b/Source/SpaceBattler/Public/Unit.h @@ -46,6 +46,12 @@ public: UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="Unit Info Copy") double Range; + UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="Unit Info Copy") + bool IsAOE; + + UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="Unit Info Copy") + float AOERange; + /** Please add a variable description */ UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="Unit Info Copy") double RangedProjectileSpeed; diff --git a/Source/SpaceBattler/Public/UnitInfo.h b/Source/SpaceBattler/Public/UnitInfo.h index 4efae58..ab2565f 100644 --- a/Source/SpaceBattler/Public/UnitInfo.h +++ b/Source/SpaceBattler/Public/UnitInfo.h @@ -39,6 +39,12 @@ protected: UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="Attributes") bool IsRanged; + UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="Attributes") + bool IsAOE; + + UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="Attributes") + float AOERange; + UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="Attributes") bool IsFlying;