From 74695d131909520d2bdf14e3f00b0214c1c2535c Mon Sep 17 00:00:00 2001 From: Jers Date: Sun, 24 Dec 2023 11:43:42 -0600 Subject: [PATCH] Refactored menu generation and loot distribution and party setup to player controller. Added Loot logic --- Content/Blueprints/BP_GameState.uasset | 4 ++-- Content/Blueprints/BP_PlayerController.uasset | 4 ++-- Content/Blueprints/BP_PlayerPawn.uasset | 4 ++-- Content/Blueprints/Loot/BP_GoldLoot.uasset | 4 ++-- Content/Blueprints/Loot/BP_UnitLoot.uasset | 4 ++-- Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset | 4 ++-- Content/Blueprints/UI/ColumnSelect/WBP_ColumnSelect_v2.uasset | 4 ++-- Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset | 4 ++-- Content/Levels/BattleMap.umap | 4 ++-- Content/Levels/MainMenu.umap | 2 +- Content/Models/Levels/Level1/Base.uasset | 3 +++ Content/Models/Levels/Level1/Rock.uasset | 3 +++ Content/Models/Levels/Level1/Rockpiletex.uasset | 3 +++ Content/Models/Levels/Level1/TallRockTex.uasset | 3 +++ Content/Models/Levels/Level1/TallRockbase.uasset | 3 +++ Content/Models/Levels/Level1/level1.uasset | 3 +++ Content/Models/Levels/Level1/level1bump.uasset | 3 +++ Content/Models/Levels/Level1/rockPile.uasset | 3 +++ Content/Models/Levels/Level1/tallRock.uasset | 3 +++ Source/SpaceBattler/Private/PartySubsystem.cpp | 2 +- 20 files changed, 47 insertions(+), 20 deletions(-) create mode 100644 Content/Models/Levels/Level1/Base.uasset create mode 100644 Content/Models/Levels/Level1/Rock.uasset create mode 100644 Content/Models/Levels/Level1/Rockpiletex.uasset create mode 100644 Content/Models/Levels/Level1/TallRockTex.uasset create mode 100644 Content/Models/Levels/Level1/TallRockbase.uasset create mode 100644 Content/Models/Levels/Level1/level1.uasset create mode 100644 Content/Models/Levels/Level1/level1bump.uasset create mode 100644 Content/Models/Levels/Level1/rockPile.uasset create mode 100644 Content/Models/Levels/Level1/tallRock.uasset diff --git a/Content/Blueprints/BP_GameState.uasset b/Content/Blueprints/BP_GameState.uasset index 87b96a7..6609ee2 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:75f5ca81023fd6eea639576b7fd164549daf6ecb4880727a45c447f1741042f6 -size 340043 +oid sha256:ac7460057fb20db1e5bd17b2d2bff984457828858799afc7b9f59023e8455051 +size 228126 diff --git a/Content/Blueprints/BP_PlayerController.uasset b/Content/Blueprints/BP_PlayerController.uasset index fc6e071..9e15711 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:cc7b4cae079dd80126d489e7cd3f42f290c73c18c7b5913fa14df47d8b155f5b -size 74298 +oid sha256:75dbc10f37f6a9f09bbbddf8976157db4526e7d35d4f7bdcde97bf42c2f52e06 +size 301780 diff --git a/Content/Blueprints/BP_PlayerPawn.uasset b/Content/Blueprints/BP_PlayerPawn.uasset index 5e5cb48..f7334a3 100644 --- a/Content/Blueprints/BP_PlayerPawn.uasset +++ b/Content/Blueprints/BP_PlayerPawn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adb85ff11a3341c3c130f4d6c4ca4d11a5e535e8c5d18050d0b5e4394be34571 -size 54459 +oid sha256:f9f6831838a9b9bfce9f8117644adf9ed6be62adc60d0eaaf0653cc0f920bd5d +size 89685 diff --git a/Content/Blueprints/Loot/BP_GoldLoot.uasset b/Content/Blueprints/Loot/BP_GoldLoot.uasset index 85c6ec7..ffdddb9 100644 --- a/Content/Blueprints/Loot/BP_GoldLoot.uasset +++ b/Content/Blueprints/Loot/BP_GoldLoot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64e372e0bd93a8470b0d660631a018085d2b88246d1777aa14553fbaf916be0e -size 65191 +oid sha256:9d7b1899e9ac9e034a935fe590b003eee037e465ded06a2ac97805d29645a7c1 +size 69089 diff --git a/Content/Blueprints/Loot/BP_UnitLoot.uasset b/Content/Blueprints/Loot/BP_UnitLoot.uasset index 2b3e256..3c6fde3 100644 --- a/Content/Blueprints/Loot/BP_UnitLoot.uasset +++ b/Content/Blueprints/Loot/BP_UnitLoot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:331e8e19e21ded007ef9b3561b91bbaf7f1cbd2dd5ae18e6696f2a170993dead -size 42814 +oid sha256:1661be48ba76cf36e7614a8e8a95cecde1dea962a75b282e4197724d9443726c +size 42884 diff --git a/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset b/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset index a43506a..a709903 100644 --- a/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset +++ b/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c87e2b2557d40e3e02a830319385018a684ad6be7eda2c332ca1a98b19684678 -size 33559 +oid sha256:702fa607a88dd69350922bbf2bf31fdd6aa3e2257a371ffe7daaf43d64929d5f +size 53882 diff --git a/Content/Blueprints/UI/ColumnSelect/WBP_ColumnSelect_v2.uasset b/Content/Blueprints/UI/ColumnSelect/WBP_ColumnSelect_v2.uasset index d6e3381..73a7ce3 100644 --- a/Content/Blueprints/UI/ColumnSelect/WBP_ColumnSelect_v2.uasset +++ b/Content/Blueprints/UI/ColumnSelect/WBP_ColumnSelect_v2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28ac53392266eeb3bb73bbb5aa0bc0ed563f40fc74f1b9af296907c2cc6e6537 -size 188066 +oid sha256:1f67c9ed3474e1f5c9f108834ccd460df1229297d5f8238a28770889b16520f6 +size 195064 diff --git a/Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset index d9c6e27..caa8596 100644 --- a/Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset +++ b/Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73588acecbdbd3696c468b23363600cb5fbe7876542a6e4faca9f33d6ee6f4d8 -size 275750 +oid sha256:99ec713a10c25a8335409c6c591b61896f3c808914fcde387d9605cc3fe9597c +size 213451 diff --git a/Content/Levels/BattleMap.umap b/Content/Levels/BattleMap.umap index 3696d37..46697f6 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:dd89dbf0e04df55bc4aaad418297c3243d10a30df6a93a7e99004b10c7f64a2b -size 53311 +oid sha256:6f278e3f4ba451c4ebe57de0a37dcd6ec1548e66715eefcd762be4ca7dab50f9 +size 80306 diff --git a/Content/Levels/MainMenu.umap b/Content/Levels/MainMenu.umap index 199c754..69d4e37 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:db4c33c4409b45e31b97097c0b3a6a7f48d761e4d423690764f8e296eedc0dd3 +oid sha256:1360f38c4e6d217122ea2f5222d6892a79940a1f212c8efc8616132be3490bab size 41472 diff --git a/Content/Models/Levels/Level1/Base.uasset b/Content/Models/Levels/Level1/Base.uasset new file mode 100644 index 0000000..c11f696 --- /dev/null +++ b/Content/Models/Levels/Level1/Base.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddde67ba4ce13b4820f647080808fb43bf2a2f376a3923fff5625609f4f4b831 +size 13140 diff --git a/Content/Models/Levels/Level1/Rock.uasset b/Content/Models/Levels/Level1/Rock.uasset new file mode 100644 index 0000000..924f343 --- /dev/null +++ b/Content/Models/Levels/Level1/Rock.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42f8f9066a3d06708db9aab639c82d6cfd3f4a5b6678354f745e5089ca3daea4 +size 12534 diff --git a/Content/Models/Levels/Level1/Rockpiletex.uasset b/Content/Models/Levels/Level1/Rockpiletex.uasset new file mode 100644 index 0000000..89cb3b3 --- /dev/null +++ b/Content/Models/Levels/Level1/Rockpiletex.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:821732bb998f38349a1b2a3c5b8dcdc90eef6f0122ccee3ad40bec6e8ff749aa +size 250984 diff --git a/Content/Models/Levels/Level1/TallRockTex.uasset b/Content/Models/Levels/Level1/TallRockTex.uasset new file mode 100644 index 0000000..540329c --- /dev/null +++ b/Content/Models/Levels/Level1/TallRockTex.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:262ab1bd8c23384df8f002c55d833d73019ad041bd9bcae927bb46b8ca879e2e +size 291831 diff --git a/Content/Models/Levels/Level1/TallRockbase.uasset b/Content/Models/Levels/Level1/TallRockbase.uasset new file mode 100644 index 0000000..5db3202 --- /dev/null +++ b/Content/Models/Levels/Level1/TallRockbase.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1d565dc623526f7daf76241c514df5e865b14b08e4c8a1b6b50cfd606156545 +size 12732 diff --git a/Content/Models/Levels/Level1/level1.uasset b/Content/Models/Levels/Level1/level1.uasset new file mode 100644 index 0000000..04ae278 --- /dev/null +++ b/Content/Models/Levels/Level1/level1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9625d9144787271ff0a0e7c986f6f199b51c6b0b2407d3b7f51f817cfc51aee +size 612415 diff --git a/Content/Models/Levels/Level1/level1bump.uasset b/Content/Models/Levels/Level1/level1bump.uasset new file mode 100644 index 0000000..172d1ca --- /dev/null +++ b/Content/Models/Levels/Level1/level1bump.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdef20d875311a444aac6a27fa2e0c4f4598f9bfefa39fbf53d6d5247c4458d4 +size 481666 diff --git a/Content/Models/Levels/Level1/rockPile.uasset b/Content/Models/Levels/Level1/rockPile.uasset new file mode 100644 index 0000000..f91ad26 --- /dev/null +++ b/Content/Models/Levels/Level1/rockPile.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f7126968ecb9f71bc0d86971a2debe8d96e40eb282ee8c6ae1fc345749f950c +size 35820 diff --git a/Content/Models/Levels/Level1/tallRock.uasset b/Content/Models/Levels/Level1/tallRock.uasset new file mode 100644 index 0000000..248287c --- /dev/null +++ b/Content/Models/Levels/Level1/tallRock.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e24e150801d56cb71c2392f77a47b230538c60ac86e41cc2b8832b371c36fa2 +size 129995 diff --git a/Source/SpaceBattler/Private/PartySubsystem.cpp b/Source/SpaceBattler/Private/PartySubsystem.cpp index aa7de1d..2f038a7 100644 --- a/Source/SpaceBattler/Private/PartySubsystem.cpp +++ b/Source/SpaceBattler/Private/PartySubsystem.cpp @@ -67,7 +67,7 @@ void UPartySubsystem::SpawnUnits() FActorSpawnParameters SpawnActorParameters = {}; SpawnActorParameters.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButAlwaysSpawn; - FVector Location = FVector( VerticalSpacing * i - VerticalSpacing, -HorizontalOffset * CurrentColumn, 0); + FVector Location = FVector( VerticalSpacing * i - VerticalSpacing, -HorizontalOffset * CurrentColumn, 1000); GetWorld()->SpawnActor(SpawnQueue[i + LastSpawnIndex], &Location, nullptr, SpawnActorParameters); }