From 832fa1fc925bc330e65a547f11263c93d81a94bc Mon Sep 17 00:00:00 2001 From: Jers Date: Fri, 16 Feb 2024 21:39:34 -0600 Subject: [PATCH] Started to add upgrade buttons to prebattle --- Content/Blueprints/Abilities/C_AbilitySystem.uasset | 4 ++-- Content/Blueprints/BP_GameState.uasset | 4 ++-- Content/Blueprints/BP_PlayerController.uasset | 4 ++-- Content/Blueprints/UI/Common/UpgradeButtonStyle.uasset | 3 +++ Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset | 4 ++-- Content/Blueprints/UI/UpgradeButtonBase.uasset | 3 +++ Content/Blueprints/Units/EM_MortarTeam/BP_MortarShell.uasset | 4 ++-- Content/Blueprints/Upgrades/AU_CooldownReduction.uasset | 3 --- Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset | 2 +- .../Data/Upgrades/GlobalUpgrades/AU_CooldownReduction.uasset | 3 +++ Content/Data/Upgrades/GlobalUpgrades/U_Logistics.uasset | 3 +++ Source/SpaceBattler/Public/Upgrade.h | 2 +- 12 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 Content/Blueprints/UI/Common/UpgradeButtonStyle.uasset create mode 100644 Content/Blueprints/UI/UpgradeButtonBase.uasset delete mode 100644 Content/Blueprints/Upgrades/AU_CooldownReduction.uasset create mode 100644 Content/Data/Upgrades/GlobalUpgrades/AU_CooldownReduction.uasset create mode 100644 Content/Data/Upgrades/GlobalUpgrades/U_Logistics.uasset diff --git a/Content/Blueprints/Abilities/C_AbilitySystem.uasset b/Content/Blueprints/Abilities/C_AbilitySystem.uasset index 7bf8a66..249dff4 100644 --- a/Content/Blueprints/Abilities/C_AbilitySystem.uasset +++ b/Content/Blueprints/Abilities/C_AbilitySystem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29fc042b1e60c69c2b8dada92f22ddef7a8246db969e92e833948d612eba8600 -size 132940 +oid sha256:dbe8f2abcf60016ea04481e53862409834e6ae65e71e0f4eea78ed623bef99ae +size 133155 diff --git a/Content/Blueprints/BP_GameState.uasset b/Content/Blueprints/BP_GameState.uasset index e6e1e6b..0979527 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:e0bb5740c50469a738858ae190d0c34ba7e27eae7cce9c0e2db3da6207c9e1d4 -size 291212 +oid sha256:01ca98fac8c4f4fe8ea3e5d1de39acd581d2fbd44ca2ec5cf9c88f7748ff266d +size 294652 diff --git a/Content/Blueprints/BP_PlayerController.uasset b/Content/Blueprints/BP_PlayerController.uasset index df38af1..2de1e4c 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:6d6e69d0603ea332729d8c1f9f61f255302d12c5908939bdc6c058cf4a8d4ae4 -size 516395 +oid sha256:b9262e0aeae2f927ccd6cb39aeef1603abd6268bf72b7c2a2cf1022af6497aa7 +size 551040 diff --git a/Content/Blueprints/UI/Common/UpgradeButtonStyle.uasset b/Content/Blueprints/UI/Common/UpgradeButtonStyle.uasset new file mode 100644 index 0000000..85af933 --- /dev/null +++ b/Content/Blueprints/UI/Common/UpgradeButtonStyle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1239f128f8f97f7eea0fd89687fe064d55fbd31cb1951e6619b428b03a64f28f +size 6256 diff --git a/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset b/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset index 6b3d160..3dca74b 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:97e216cefd0ba8a598ebed0952e375d51c65a9e410eae4f65bd425ab0a2ae849 -size 167861 +oid sha256:13b60c2c2a14939f5fee2ee6f86a2de6616071b1f1a4cf2f4939fdd5fd8fce3f +size 223163 diff --git a/Content/Blueprints/UI/UpgradeButtonBase.uasset b/Content/Blueprints/UI/UpgradeButtonBase.uasset new file mode 100644 index 0000000..82e9255 --- /dev/null +++ b/Content/Blueprints/UI/UpgradeButtonBase.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e740c3c50d38a481eefe139cb0e9a7c6ba17cd4ef2778b08109da03116acb6e9 +size 74938 diff --git a/Content/Blueprints/Units/EM_MortarTeam/BP_MortarShell.uasset b/Content/Blueprints/Units/EM_MortarTeam/BP_MortarShell.uasset index 590bf9b..5aa56eb 100644 --- a/Content/Blueprints/Units/EM_MortarTeam/BP_MortarShell.uasset +++ b/Content/Blueprints/Units/EM_MortarTeam/BP_MortarShell.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1796a2d7e42afb00c07e14667e05a18f38205b63361c395d5884727c4f1013f -size 99966 +oid sha256:50435f302c32d75026beeb8b8be9319f073c2295d99349c019ea4c201034238a +size 95110 diff --git a/Content/Blueprints/Upgrades/AU_CooldownReduction.uasset b/Content/Blueprints/Upgrades/AU_CooldownReduction.uasset deleted file mode 100644 index fef8ea9..0000000 --- a/Content/Blueprints/Upgrades/AU_CooldownReduction.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4c8dffa7469e9843487de74184df1eef72a4e7436f0950ba37c74ef4d4babf2 -size 1644 diff --git a/Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset b/Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset index f82efe0..8a573f0 100644 --- a/Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset +++ b/Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72c2c04c9677c13cab8fafac76c11f5be3da90bb886c528813eb68f39862ba2a +oid sha256:2b86ffb120762fddc820de33af29277e6c503e459bc682a954a1229f732a4bd0 size 4694 diff --git a/Content/Data/Upgrades/GlobalUpgrades/AU_CooldownReduction.uasset b/Content/Data/Upgrades/GlobalUpgrades/AU_CooldownReduction.uasset new file mode 100644 index 0000000..a939c2d --- /dev/null +++ b/Content/Data/Upgrades/GlobalUpgrades/AU_CooldownReduction.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ef765e59843b8eb1adf4402f680795e6a013908a426226b8da9eb7802dc058c +size 1662 diff --git a/Content/Data/Upgrades/GlobalUpgrades/U_Logistics.uasset b/Content/Data/Upgrades/GlobalUpgrades/U_Logistics.uasset new file mode 100644 index 0000000..076352e --- /dev/null +++ b/Content/Data/Upgrades/GlobalUpgrades/U_Logistics.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff1e729c64a4885a3bc9074ddd5e6cc6ec7396e0ff03ecab58efe09ab259a143 +size 1429 diff --git a/Source/SpaceBattler/Public/Upgrade.h b/Source/SpaceBattler/Public/Upgrade.h index 785d844..9c1a5a5 100644 --- a/Source/SpaceBattler/Public/Upgrade.h +++ b/Source/SpaceBattler/Public/Upgrade.h @@ -24,7 +24,7 @@ protected: UPROPERTY(BlueprintReadWrite, meta=(MultiLine=true)) FText Description; - UPROPERTY(BlueprintReadWrite) + UPROPERTY(BlueprintReadWrite, EditAnywhere) bool Repeatable; UPROPERTY(BlueprintReadWrite, EditAnywhere)