Added portraits, added graphics for tiered unit selected.

feature/upgrades
Jers 10 months ago
parent 056d24a908
commit ff298ee6ec

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Blueprints/BP_GameState.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Data/EnemyUnits/DA_Wyrm.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Data/portraits/lightmech.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Data/portraits/mite.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Data/portraits/mortar.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Data/portraits/scout.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Data/portraits/wyrm.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Levels/MainMenu.umap (Stored with Git LFS)

Binary file not shown.

BIN
Content/Levels/TestWorld.umap (Stored with Git LFS)

Binary file not shown.

BIN
Content/NewLevelSequence.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/UI/Images/Icons/locked.uasset (Stored with Git LFS)

Binary file not shown.

@ -46,3 +46,16 @@ void UUpgradeSubsystem::ApplyGlobalUpgrades()
{ {
} }
USelectedUpgrade* UUpgradeSubsystem::FindSelectedUpgrade(UUpgrade* UpgradeToFind)
{
for(USelectedUpgrade* Upgrade : SelectedUpgrades)
{
if (Upgrade->GetUpgradeData() == UpgradeToFind)
{
return Upgrade;
}
}
return nullptr;
}

@ -26,9 +26,12 @@ public:
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
void AddUpgrade(UUpgrade* UpgradeToAdd); void AddUpgrade(UUpgrade* UpgradeToAdd);
UFUNCTION(BlueprintCallable)
USelectedUpgrade* FindSelectedUpgrade(UUpgrade* SystemToFind);
protected: protected:
UPROPERTY(BlueprintReadWrite) UPROPERTY(BlueprintReadWrite)
int32 BattleTier; int32 BattleTier = 1;
UPROPERTY(BlueprintReadWrite) UPROPERTY(BlueprintReadWrite)
TArray<USelectedUpgrade*> SelectedUpgrades; TArray<USelectedUpgrade*> SelectedUpgrades;

Loading…
Cancel
Save