Added portraits, added graphics for tiered unit selected.

9 months ago · ff298ee6ec
parent 056d24a908
commit ff298ee6ec
43 changed files with 112 additions and 51 deletions
--- a/Content/Blueprints/Abilities/BP_Ability.uasset
+++ b/Content/Blueprints/Abilities/BP_Ability.uasset
--- a/Content/Blueprints/Abilities/BP_StrafingRun.uasset
+++ b/Content/Blueprints/Abilities/BP_StrafingRun.uasset
--- a/Content/Blueprints/Abilities/C_AbilitySystem.uasset
+++ b/Content/Blueprints/Abilities/C_AbilitySystem.uasset
--- a/Content/Blueprints/BP_GameState.uasset
+++ b/Content/Blueprints/BP_GameState.uasset
--- a/Content/Blueprints/BP_PlayerController.uasset
+++ b/Content/Blueprints/BP_PlayerController.uasset
--- a/Content/Blueprints/UI/AbilityButtonBase.uasset
+++ b/Content/Blueprints/UI/AbilityButtonBase.uasset
--- a/Content/Blueprints/UI/BattleUI/SC_CrossHairs.uasset
+++ b/Content/Blueprints/UI/BattleUI/SC_CrossHairs.uasset
--- a/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset
+++ b/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset
--- a/Content/Blueprints/UI/PreBattle/WBP_LockedCard.uasset
+++ b/Content/Blueprints/UI/PreBattle/WBP_LockedCard.uasset
--- a/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset
+++ b/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset
--- a/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset
+++ b/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset
--- a/Content/Blueprints/UI/PreBattle/WBP_UnitCardHolder.uasset
+++ b/Content/Blueprints/UI/PreBattle/WBP_UnitCardHolder.uasset
--- a/Content/Blueprints/Units/Common/BP_Unit.uasset
+++ b/Content/Blueprints/Units/Common/BP_Unit.uasset
--- a/Content/Blueprints/Units/EM_Interceptor/BP_Interceptor.uasset
+++ b/Content/Blueprints/Units/EM_Interceptor/BP_Interceptor.uasset
--- a/Content/Blueprints/Units/M_Mite/BP_Mite.uasset
+++ b/Content/Blueprints/Units/M_Mite/BP_Mite.uasset
--- a/Content/Blueprints/Units/M_Wyrm/BP_Wyrm.uasset
+++ b/Content/Blueprints/Units/M_Wyrm/BP_Wyrm.uasset
--- a/Content/Blueprints/Upgrades/AU_CooldownReduction.uasset
+++ b/Content/Blueprints/Upgrades/AU_CooldownReduction.uasset
--- a/Content/Data/Abilities/DA_StrafingRun.uasset
+++ b/Content/Data/Abilities/DA_StrafingRun.uasset
--- a/Content/Data/EnemyUnits/DA_M_Mite.uasset
+++ b/Content/Data/EnemyUnits/DA_M_Mite.uasset
--- a/Content/Data/EnemyUnits/DA_Wyrm.uasset
+++ b/Content/Data/EnemyUnits/DA_Wyrm.uasset
--- a/Content/Data/PlayerUnits/DA_EM_CQB.uasset
+++ b/Content/Data/PlayerUnits/DA_EM_CQB.uasset
--- a/Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset
+++ b/Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset
--- a/Content/Data/PlayerUnits/DA_EM_Rifleman.uasset
+++ b/Content/Data/PlayerUnits/DA_EM_Rifleman.uasset
--- a/Content/Data/PlayerUnits/DA_LightMech.uasset
+++ b/Content/Data/PlayerUnits/DA_LightMech.uasset
--- a/Content/Data/PlayerUnits/DA_Scout.uasset
+++ b/Content/Data/PlayerUnits/DA_Scout.uasset
--- a/Content/Data/Upgrades/UnitUpgrades/DA_Ranged_Damage_Up.uasset
+++ b/Content/Data/Upgrades/UnitUpgrades/DA_Ranged_Damage_Up.uasset
--- a/Content/Data/portraits/exomarine_cqb.uasset
+++ b/Content/Data/portraits/exomarine_cqb.uasset
--- a/Content/Data/portraits/exomarine_rifleman.uasset
+++ b/Content/Data/portraits/exomarine_rifleman.uasset
--- a/Content/Data/portraits/interceptor.uasset
+++ b/Content/Data/portraits/interceptor.uasset
--- a/Content/Data/portraits/interceptor_transparent.uasset
+++ b/Content/Data/portraits/interceptor_transparent.uasset
--- a/Content/Data/portraits/lightmech.uasset
+++ b/Content/Data/portraits/lightmech.uasset
--- a/Content/Data/portraits/mite.uasset
+++ b/Content/Data/portraits/mite.uasset
--- a/Content/Data/portraits/mortar.uasset
+++ b/Content/Data/portraits/mortar.uasset
--- a/Content/Data/portraits/scout.uasset
+++ b/Content/Data/portraits/scout.uasset
--- a/Content/Data/portraits/wyrm.uasset
+++ b/Content/Data/portraits/wyrm.uasset
--- a/Content/Levels/MainMenu.umap
+++ b/Content/Levels/MainMenu.umap
--- a/Content/Levels/TestWorld.umap
+++ b/Content/Levels/TestWorld.umap
--- a/Content/NewLevelSequence.uasset
+++ b/Content/NewLevelSequence.uasset
--- a/Content/UI/Images/Icons/AbilityCursor.uasset
+++ b/Content/UI/Images/Icons/AbilityCursor.uasset
--- a/Content/UI/Images/Icons/AnimatedCursor.uasset
+++ b/Content/UI/Images/Icons/AnimatedCursor.uasset
--- a/Content/UI/Images/Icons/locked.uasset
+++ b/Content/UI/Images/Icons/locked.uasset
--- a/Source/SpaceBattler/Private/UpgradeSubsystem.cpp
+++ b/Source/SpaceBattler/Private/UpgradeSubsystem.cpp
@ -46,3 +46,16 @@ void UUpgradeSubsystem::ApplyGlobalUpgrades()
 {
 	
 }
+
+
+USelectedUpgrade* UUpgradeSubsystem::FindSelectedUpgrade(UUpgrade* UpgradeToFind)
+{
+	for(USelectedUpgrade* Upgrade : SelectedUpgrades)
+	{
+		if (Upgrade->GetUpgradeData() == UpgradeToFind)
+		{
+			return Upgrade;
+		}
+	}
+	return nullptr;
+}
--- a/Source/SpaceBattler/Public/UpgradeSubsystem.h
+++ b/Source/SpaceBattler/Public/UpgradeSubsystem.h
@ -26,9 +26,12 @@ public:
 	UFUNCTION(BlueprintCallable)
 	void AddUpgrade(UUpgrade* UpgradeToAdd);

+	UFUNCTION(BlueprintCallable)
+	USelectedUpgrade* FindSelectedUpgrade(UUpgrade* SystemToFind);
+	
 protected:
 	UPROPERTY(BlueprintReadWrite)
-	int32 BattleTier;
+	int32 BattleTier = 1;

 	UPROPERTY(BlueprintReadWrite)
 	TArray<USelectedUpgrade*> SelectedUpgrades;