From 84643b06f7998364efc14f4a903a58b09bc99d0e Mon Sep 17 00:00:00 2001
From: Jers <jeremysmitherman@gmail.com>
Date: Sun, 24 Dec 2023 16:14:58 -0600
Subject: [PATCH] Added the barebones pre-battle menu

---
 Content/Blueprints/BP_GameState.uasset                | 4 ++--
 Content/Blueprints/BP_PlayerController.uasset         | 4 ++--
 Content/Blueprints/BP_PlayerPawn.uasset               | 4 ++--
 Content/Blueprints/UI/Components/WBP_Window.uasset    | 4 ++--
 Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset    | 4 ++--
 Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset  | 4 ++--
 Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset   | 4 ++--
 Source/SpaceBattler/Private/PartySubsystem.cpp        | 2 +-
 Source/SpaceBattler/Private/StateMachineSubsystem.cpp | 3 +++
 9 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Content/Blueprints/BP_GameState.uasset b/Content/Blueprints/BP_GameState.uasset
index 0d93423..14e2fbc 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:5dbbeb319ea10df4eae18e869cc9a51405571afc8445c275c41ac443b9a0db48
-size 210515
+oid sha256:4e260a1f641a7e31a3657c70b0e1b59bcda45140249334e123eb48c2030787b3
+size 202092
diff --git a/Content/Blueprints/BP_PlayerController.uasset b/Content/Blueprints/BP_PlayerController.uasset
index 5198a8a..5090b7e 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:476da3e0048d0cd03173bf4c610e572f648adbdf1c56d3c8f4b61ff4d63eac19
-size 300318
+oid sha256:80c4f2ba5cb51befdb7b122e8c8681ef1c1f27240d3a80615e8134c0f1d8a5c4
+size 324532
diff --git a/Content/Blueprints/BP_PlayerPawn.uasset b/Content/Blueprints/BP_PlayerPawn.uasset
index f7334a3..90787b5 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:f9f6831838a9b9bfce9f8117644adf9ed6be62adc60d0eaaf0653cc0f920bd5d
-size 89685
+oid sha256:b5aff189863636bdf510e9fb0326a5433cb9fc2f0a9ce8bcd43362fd4b72b5fb
+size 81067
diff --git a/Content/Blueprints/UI/Components/WBP_Window.uasset b/Content/Blueprints/UI/Components/WBP_Window.uasset
index 430607d..9561e48 100644
--- a/Content/Blueprints/UI/Components/WBP_Window.uasset
+++ b/Content/Blueprints/UI/Components/WBP_Window.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9fc2537e3ecda6e48ea4b8bb83328a6f175d05b98252834e2d43aa880f571452
-size 55075
+oid sha256:c7394b82cf26af9a0f1714f01f58117ec855c47d081a96690ebf8a9cd623364b
+size 55191
diff --git a/Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset
index caa8596..d1880bf 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:99ec713a10c25a8335409c6c591b61896f3c808914fcde387d9605cc3fe9597c
-size 213451
+oid sha256:b115bc33cfdf48a8c9b10374201455572e0903bc83be66a2c2245aec3d03776d
+size 212656
diff --git a/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset b/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset
index 56c3b44..c892a98 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:d4fdd76f2234b27ba8e33931605c18d6d57c8bc3e924f551e5834902afbde802
-size 74403
+oid sha256:2835c026e8b6c66266a71b2cc6c4b8edde5c6f8247e0dbda754ad8a31722497a
+size 69549
diff --git a/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset b/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset
index 2bbcf85..2dedec3 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:0af2dfb434dd40b8a9d9ce31735195849fda4b1855eb8f116e62ce63091d58a2
-size 98699
+oid sha256:626e24cd00dbbd5e465d1461a80cf56eefed0b14f0c4f8bfac42a01036bf7557
+size 98671
diff --git a/Source/SpaceBattler/Private/PartySubsystem.cpp b/Source/SpaceBattler/Private/PartySubsystem.cpp
index 57313ea..951fada 100644
--- a/Source/SpaceBattler/Private/PartySubsystem.cpp
+++ b/Source/SpaceBattler/Private/PartySubsystem.cpp
@@ -7,7 +7,7 @@ void UPartySubsystem::AddToParty(UUnitInfo* UnitInfo)
 {
 	for (FPartyMember &Unit : Members)
 	{
-		if(GetMemberUnitInfo(Unit)->GetClass() == UnitInfo->GetClass())
+		if(Unit.UnitInfo == UnitInfo)
 		{
 			const bool UpdateAllocated = GetMemberAvailable(Unit) == GetMemberAllocated(Unit);
 			
diff --git a/Source/SpaceBattler/Private/StateMachineSubsystem.cpp b/Source/SpaceBattler/Private/StateMachineSubsystem.cpp
index 92929d8..3acc4bf 100644
--- a/Source/SpaceBattler/Private/StateMachineSubsystem.cpp
+++ b/Source/SpaceBattler/Private/StateMachineSubsystem.cpp
@@ -29,6 +29,9 @@ bool UStateMachineSubsystem::ChangeState(const EGameState NewState)
 	case EGameState::Battle:
 		switch(NewState)
 		{
+		case EGameState::Battle:
+			UE_LOG(LogTemp, Warning, TEXT("Entering BATTLE state from BATTLE.  Should only be possible when debugging"))
+			break;
 		case EGameState::BattleMenu:
 			UE_LOG(LogTemp, Display, TEXT("Entering BATTLEMENU state from BATTLE"))
 			break;