Added light mech, drop troopers, ability cooldowns

10 months ago · 056d24a908
parent 041ebcadc1
commit 056d24a908
39 changed files with 101 additions and 26 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/Abilities/PDA_Ability.uasset
+++ b/Content/Blueprints/Abilities/PDA_Ability.uasset
--- a/Content/Blueprints/BP_PlayerController.uasset
+++ b/Content/Blueprints/BP_PlayerController.uasset
--- a/Content/Blueprints/BP_PlayerPawn.uasset
+++ b/Content/Blueprints/BP_PlayerPawn.uasset
--- a/Content/Blueprints/Niagra/Jetengine/N_JetBlast.uasset
+++ b/Content/Blueprints/Niagra/Jetengine/N_JetBlast.uasset
--- a/Content/Blueprints/UI/AbilityButtonBase.uasset
+++ b/Content/Blueprints/UI/AbilityButtonBase.uasset
--- a/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset
+++ b/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset
--- a/Content/Blueprints/Units/Common/BP_Unit.uasset
+++ b/Content/Blueprints/Units/Common/BP_Unit.uasset
--- a/Content/Blueprints/Units/EM_LightMech/ABP_LightMech.uasset
+++ b/Content/Blueprints/Units/EM_LightMech/ABP_LightMech.uasset
--- a/Content/Blueprints/Units/EM_LightMech/BP_LightMech.uasset
+++ b/Content/Blueprints/Units/EM_LightMech/BP_LightMech.uasset
--- a/Content/Blueprints/Units/EM_LightMech/M_LightMechAttack.uasset
+++ b/Content/Blueprints/Units/EM_LightMech/M_LightMechAttack.uasset
--- a/Content/Blueprints/Units/EM_LightMech/N_Autocannon.uasset
+++ b/Content/Blueprints/Units/EM_LightMech/N_Autocannon.uasset
--- a/Content/Blueprints/Units/EM_Scout/BP_Scout.uasset
+++ b/Content/Blueprints/Units/EM_Scout/BP_Scout.uasset
--- a/Content/Data/Abilities/DA_StrafingRun.uasset
+++ b/Content/Data/Abilities/DA_StrafingRun.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/Levels/BattleMap.umap
+++ b/Content/Levels/BattleMap.umap
--- a/Content/Levels/MainMenu.umap
+++ b/Content/Levels/MainMenu.umap
--- a/Content/Models/PlayerUnits/LightMech/Base.uasset
+++ b/Content/Models/PlayerUnits/LightMech/Base.uasset
--- a/Content/Models/PlayerUnits/LightMech/Glass.uasset
+++ b/Content/Models/PlayerUnits/LightMech/Glass.uasset
--- a/Content/Models/PlayerUnits/LightMech/lightmech.uasset
+++ b/Content/Models/PlayerUnits/LightMech/lightmech.uasset
--- a/Content/Models/PlayerUnits/LightMech/lightmech_Anim_Idle.uasset
+++ b/Content/Models/PlayerUnits/LightMech/lightmech_Anim_Idle.uasset
--- a/Content/Models/PlayerUnits/LightMech/lightmech_Anim_Run.uasset
+++ b/Content/Models/PlayerUnits/LightMech/lightmech_Anim_Run.uasset
--- a/Content/Models/PlayerUnits/LightMech/lightmech_Base_BaseColor.uasset
+++ b/Content/Models/PlayerUnits/LightMech/lightmech_Base_BaseColor.uasset
--- a/Content/Models/PlayerUnits/LightMech/lightmech_Base_Normal.uasset
+++ b/Content/Models/PlayerUnits/LightMech/lightmech_Base_Normal.uasset
--- a/Content/Models/PlayerUnits/LightMech/lightmech_Base_OcclusionRoughnessMetallic.uasset
+++ b/Content/Models/PlayerUnits/LightMech/lightmech_Base_OcclusionRoughnessMetallic.uasset
--- a/Content/Models/PlayerUnits/LightMech/lightmech_Glass_BaseColor.uasset
+++ b/Content/Models/PlayerUnits/LightMech/lightmech_Glass_BaseColor.uasset
--- a/Content/Models/PlayerUnits/LightMech/lightmech_Glass_Normal.uasset
+++ b/Content/Models/PlayerUnits/LightMech/lightmech_Glass_Normal.uasset
--- a/Content/Models/PlayerUnits/LightMech/lightmech_Glass_OcclusionRoughnessMetallic.uasset
+++ b/Content/Models/PlayerUnits/LightMech/lightmech_Glass_OcclusionRoughnessMetallic.uasset
--- a/Content/Models/PlayerUnits/LightMech/lightmech_PhysicsAsset.uasset
+++ b/Content/Models/PlayerUnits/LightMech/lightmech_PhysicsAsset.uasset
--- a/Content/Models/PlayerUnits/LightMech/lightmech_Skeleton.uasset
+++ b/Content/Models/PlayerUnits/LightMech/lightmech_Skeleton.uasset
--- a/Content/Textures/ExplosionMedium/ExplosionMedium.uasset
+++ b/Content/Textures/ExplosionMedium/ExplosionMedium.uasset
--- a/Content/Textures/ExplosionMedium/N_ExplosionMedium.uasset
+++ b/Content/Textures/ExplosionMedium/N_ExplosionMedium.uasset
--- a/Content/Textures/ExplosionMedium/Untitled_render_all.uasset
+++ b/Content/Textures/ExplosionMedium/Untitled_render_all.uasset
--- a/Content/Textures/FireSmall/FireSmall.uasset
+++ b/Content/Textures/FireSmall/FireSmall.uasset
--- a/Content/Textures/FireSmall/Fire_render_all.uasset
+++ b/Content/Textures/FireSmall/Fire_render_all.uasset
--- a/Source/SpaceBattler/Public/UpgradeSubsystem.h
+++ b/Source/SpaceBattler/Public/UpgradeSubsystem.h
@ -32,4 +32,7 @@ protected:

 	UPROPERTY(BlueprintReadWrite)
 	TArray<USelectedUpgrade*> SelectedUpgrades;
+
+	UPROPERTY(BlueprintReadWrite)
+	int32 MaxUnits;
 };