From ff298ee6ec0535b6ef667c6c4974c5952a9d0b10 Mon Sep 17 00:00:00 2001 From: Jers Date: Tue, 13 Feb 2024 23:41:47 -0600 Subject: [PATCH] Added portraits, added graphics for tiered unit selected. --- Content/Blueprints/Abilities/BP_Ability.uasset | 2 +- Content/Blueprints/Abilities/BP_StrafingRun.uasset | 4 ++-- Content/Blueprints/Abilities/C_AbilitySystem.uasset | 4 ++-- Content/Blueprints/BP_GameState.uasset | 4 ++-- Content/Blueprints/BP_PlayerController.uasset | 4 ++-- Content/Blueprints/UI/AbilityButtonBase.uasset | 4 ++-- Content/Blueprints/UI/BattleUI/SC_CrossHairs.uasset | 4 ++-- Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset | 4 ++-- .../Blueprints/UI/PreBattle/WBP_LockedCard.uasset | 3 +++ .../Blueprints/UI/PreBattle/WBP_Prebattle.uasset | 4 ++-- Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset | 4 ++-- .../UI/PreBattle/WBP_UnitCardHolder.uasset | 3 +++ Content/Blueprints/Units/Common/BP_Unit.uasset | 4 ++-- .../Units/EM_Interceptor/BP_Interceptor.uasset | 4 ++-- Content/Blueprints/Units/M_Mite/BP_Mite.uasset | 4 ++-- Content/Blueprints/Units/M_Wyrm/BP_Wyrm.uasset | 4 ++-- .../Blueprints/Upgrades/AU_CooldownReduction.uasset | 3 +++ Content/Data/Abilities/DA_StrafingRun.uasset | 4 ++-- Content/Data/EnemyUnits/DA_M_Mite.uasset | 4 ++-- Content/Data/EnemyUnits/DA_Wyrm.uasset | 4 ++-- Content/Data/PlayerUnits/DA_EM_CQB.uasset | 4 ++-- Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset | 4 ++-- Content/Data/PlayerUnits/DA_EM_Rifleman.uasset | 4 ++-- Content/Data/PlayerUnits/DA_LightMech.uasset | 4 ++-- Content/Data/PlayerUnits/DA_Scout.uasset | 4 ++-- .../UnitUpgrades/DA_Ranged_Damage_Up.uasset | 4 ++-- Content/Data/portraits/exomarine_cqb.uasset | 3 +++ Content/Data/portraits/exomarine_rifleman.uasset | 3 +++ Content/Data/portraits/interceptor.uasset | 3 +++ .../Data/portraits/interceptor_transparent.uasset | 3 +++ Content/Data/portraits/lightmech.uasset | 3 +++ Content/Data/portraits/mite.uasset | 3 +++ Content/Data/portraits/mortar.uasset | 3 +++ Content/Data/portraits/scout.uasset | 3 +++ Content/Data/portraits/wyrm.uasset | 3 +++ Content/Levels/MainMenu.umap | 2 +- Content/Levels/TestWorld.umap | 3 +++ Content/NewLevelSequence.uasset | 3 +++ Content/UI/Images/Icons/AbilityCursor.uasset | 4 ++-- Content/UI/Images/Icons/AnimatedCursor.uasset | 4 ++-- Content/UI/Images/Icons/locked.uasset | 3 +++ Source/SpaceBattler/Private/UpgradeSubsystem.cpp | 13 +++++++++++++ Source/SpaceBattler/Public/UpgradeSubsystem.h | 5 ++++- 43 files changed, 112 insertions(+), 51 deletions(-) create mode 100644 Content/Blueprints/UI/PreBattle/WBP_LockedCard.uasset create mode 100644 Content/Blueprints/UI/PreBattle/WBP_UnitCardHolder.uasset create mode 100644 Content/Blueprints/Upgrades/AU_CooldownReduction.uasset create mode 100644 Content/Data/portraits/exomarine_cqb.uasset create mode 100644 Content/Data/portraits/exomarine_rifleman.uasset create mode 100644 Content/Data/portraits/interceptor.uasset create mode 100644 Content/Data/portraits/interceptor_transparent.uasset create mode 100644 Content/Data/portraits/lightmech.uasset create mode 100644 Content/Data/portraits/mite.uasset create mode 100644 Content/Data/portraits/mortar.uasset create mode 100644 Content/Data/portraits/scout.uasset create mode 100644 Content/Data/portraits/wyrm.uasset create mode 100644 Content/Levels/TestWorld.umap create mode 100644 Content/NewLevelSequence.uasset create mode 100644 Content/UI/Images/Icons/locked.uasset diff --git a/Content/Blueprints/Abilities/BP_Ability.uasset b/Content/Blueprints/Abilities/BP_Ability.uasset index 2bcde27..d6d6fdc 100644 --- a/Content/Blueprints/Abilities/BP_Ability.uasset +++ b/Content/Blueprints/Abilities/BP_Ability.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f71682f4f9ea08985b4bec3fced675897eb38003f519fe28087608555af6e37a +oid sha256:9522e12fbbd2940aa10a3f190e4c5901144844e3adc84ee9607776dfb0fa39e6 size 51435 diff --git a/Content/Blueprints/Abilities/BP_StrafingRun.uasset b/Content/Blueprints/Abilities/BP_StrafingRun.uasset index 59064f3..c54ef2c 100644 --- a/Content/Blueprints/Abilities/BP_StrafingRun.uasset +++ b/Content/Blueprints/Abilities/BP_StrafingRun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:658d4f2693497e1b7b6cd0d47191d9307b0d1f9ac8724b0686dbcb938392929e -size 84992 +oid sha256:3188bfe0082d63fd7d773a665e53b805a1083923a682d3cdd5d49d104927096f +size 85866 diff --git a/Content/Blueprints/Abilities/C_AbilitySystem.uasset b/Content/Blueprints/Abilities/C_AbilitySystem.uasset index 94290bf..7bf8a66 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:6f3ce98dd20cf56a370811dbadf3d38c363d1dfe64ff3d7bcda892782a568aaf -size 108205 +oid sha256:29fc042b1e60c69c2b8dada92f22ddef7a8246db969e92e833948d612eba8600 +size 132940 diff --git a/Content/Blueprints/BP_GameState.uasset b/Content/Blueprints/BP_GameState.uasset index 1619fcd..e6e1e6b 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:fc90aa73daf1b91ec5b7d6dfc2099d6e5378d2eecc6194b1b344070bcd1498e0 -size 291194 +oid sha256:e0bb5740c50469a738858ae190d0c34ba7e27eae7cce9c0e2db3da6207c9e1d4 +size 291212 diff --git a/Content/Blueprints/BP_PlayerController.uasset b/Content/Blueprints/BP_PlayerController.uasset index 6409b1a..df38af1 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:0de3f101d0b207a0328b03c8d87d4998fe2b7b6d37fd593c253164dee87a1855 -size 508776 +oid sha256:6d6e69d0603ea332729d8c1f9f61f255302d12c5908939bdc6c058cf4a8d4ae4 +size 516395 diff --git a/Content/Blueprints/UI/AbilityButtonBase.uasset b/Content/Blueprints/UI/AbilityButtonBase.uasset index 2be1402..9b3d8a0 100644 --- a/Content/Blueprints/UI/AbilityButtonBase.uasset +++ b/Content/Blueprints/UI/AbilityButtonBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58d669bf0deed2822f77f0c6e720f2f27c6ca42cc4becd260ec8bbe0f538f4e1 -size 101207 +oid sha256:c9559dd789c240470bf5c74be8066c80dbaa85804079e58f081c276bba6bd40a +size 100180 diff --git a/Content/Blueprints/UI/BattleUI/SC_CrossHairs.uasset b/Content/Blueprints/UI/BattleUI/SC_CrossHairs.uasset index 69d94ea..89ef255 100644 --- a/Content/Blueprints/UI/BattleUI/SC_CrossHairs.uasset +++ b/Content/Blueprints/UI/BattleUI/SC_CrossHairs.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd486e2410c232b46ac70351d3686976e709b12539295e3b9586399c9248d372 -size 24164 +oid sha256:0bae69e48861419799eb2c34de74e99f6141e695fd667eb65b53fcbab48d7f58 +size 26059 diff --git a/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset b/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset index 17325c6..3b3fbe6 100644 --- a/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset +++ b/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de30cf23ed9ecdbd8878385b721c76b5b9f28c030b71bef164660cd06d9a5380 -size 339505 +oid sha256:2f91f9234105dd2a89d41c83e4703b4730afe1c90c35b5fc1f5271fe4920dad7 +size 336058 diff --git a/Content/Blueprints/UI/PreBattle/WBP_LockedCard.uasset b/Content/Blueprints/UI/PreBattle/WBP_LockedCard.uasset new file mode 100644 index 0000000..8e8bf10 --- /dev/null +++ b/Content/Blueprints/UI/PreBattle/WBP_LockedCard.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a13ecb8ceb6bfd94118eb6a135d0b30eecba34d6abaaa4e4f913f0c1b1bcf38c +size 31024 diff --git a/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset b/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset index 628e0ec..6b3d160 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:be0180f957febead45012a67e544e9505ddfc79cdcc3aa6b531368417bcc0eb6 -size 75219 +oid sha256:97e216cefd0ba8a598ebed0952e375d51c65a9e410eae4f65bd425ab0a2ae849 +size 167861 diff --git a/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset b/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset index 874c351..c345e8e 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:8bba0e6ba4f49214d722134c5e793add1d530ea6aa7deb86c41720aeeb650e4c -size 114426 +oid sha256:708f2693936e11e1d33d0d0fc749bd8d6c5b4e4c9e525afd594b23e330f6ff50 +size 114483 diff --git a/Content/Blueprints/UI/PreBattle/WBP_UnitCardHolder.uasset b/Content/Blueprints/UI/PreBattle/WBP_UnitCardHolder.uasset new file mode 100644 index 0000000..333749b --- /dev/null +++ b/Content/Blueprints/UI/PreBattle/WBP_UnitCardHolder.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08699e975984dd32de0dba63a38a47ace7b7845018de4782a1ab6e769d9d1d23 +size 30841 diff --git a/Content/Blueprints/Units/Common/BP_Unit.uasset b/Content/Blueprints/Units/Common/BP_Unit.uasset index 908b5f1..2c7845f 100644 --- a/Content/Blueprints/Units/Common/BP_Unit.uasset +++ b/Content/Blueprints/Units/Common/BP_Unit.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad754169eae945bc63b5e42723e5646eae911e32250d4ea097c83211c6e8fb02 -size 604578 +oid sha256:60e69a2d249ab73335a03ee832c7e8753bfb6138fdbf0a3145d0637e46005124 +size 603109 diff --git a/Content/Blueprints/Units/EM_Interceptor/BP_Interceptor.uasset b/Content/Blueprints/Units/EM_Interceptor/BP_Interceptor.uasset index 0d39df7..689591e 100644 --- a/Content/Blueprints/Units/EM_Interceptor/BP_Interceptor.uasset +++ b/Content/Blueprints/Units/EM_Interceptor/BP_Interceptor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c04e53b991581f8a29d07ea60095ea9918ef128a4860dc70cce10bc4b633546e -size 51608 +oid sha256:893ed313916ff34a4bbb156e6fcd1f662928036f353c5c5e3497e6b2d5bcf49f +size 50406 diff --git a/Content/Blueprints/Units/M_Mite/BP_Mite.uasset b/Content/Blueprints/Units/M_Mite/BP_Mite.uasset index 26b6c54..1a5c2ac 100644 --- a/Content/Blueprints/Units/M_Mite/BP_Mite.uasset +++ b/Content/Blueprints/Units/M_Mite/BP_Mite.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6775b98625a74c555e74fac8f3b65ae8bfe268d44770a0c9e81b587cced66447 -size 35081 +oid sha256:0d11f30ad80761e953fdb227cde6fa65c846b97d0fca30894e3b5beb602c9ca6 +size 35218 diff --git a/Content/Blueprints/Units/M_Wyrm/BP_Wyrm.uasset b/Content/Blueprints/Units/M_Wyrm/BP_Wyrm.uasset index e14008b..97aa5e6 100644 --- a/Content/Blueprints/Units/M_Wyrm/BP_Wyrm.uasset +++ b/Content/Blueprints/Units/M_Wyrm/BP_Wyrm.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba092e67c52fcd14267815d26479b126695ace1865d354b13a09ce0bf2bc63c8 -size 47618 +oid sha256:6bf585b34127b11087288aca5092b26d2e4c0ea8131c15a01a0607def12212cd +size 47722 diff --git a/Content/Blueprints/Upgrades/AU_CooldownReduction.uasset b/Content/Blueprints/Upgrades/AU_CooldownReduction.uasset new file mode 100644 index 0000000..fef8ea9 --- /dev/null +++ b/Content/Blueprints/Upgrades/AU_CooldownReduction.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4c8dffa7469e9843487de74184df1eef72a4e7436f0950ba37c74ef4d4babf2 +size 1644 diff --git a/Content/Data/Abilities/DA_StrafingRun.uasset b/Content/Data/Abilities/DA_StrafingRun.uasset index 7c1e403..54bfea9 100644 --- a/Content/Data/Abilities/DA_StrafingRun.uasset +++ b/Content/Data/Abilities/DA_StrafingRun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27115e09d5e303d79faf4b9fd5b089e605d5b9eb278a5e2bc567292d8f76c4a9 -size 3103 +oid sha256:1d48c4d0a6e7dc24d2f1b666be8a03ec0750ed24323bdffe9612bd7568f2aa48 +size 3128 diff --git a/Content/Data/EnemyUnits/DA_M_Mite.uasset b/Content/Data/EnemyUnits/DA_M_Mite.uasset index bb0e750..54b9f61 100644 --- a/Content/Data/EnemyUnits/DA_M_Mite.uasset +++ b/Content/Data/EnemyUnits/DA_M_Mite.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89f47357ae71944b1cff033e6b6038247082769337e9363f1e94e6624afd098c -size 3068 +oid sha256:baa6bb58056efb3cafb19f08f3d9116768de1671897e6126909a750c8f3ce345 +size 3242 diff --git a/Content/Data/EnemyUnits/DA_Wyrm.uasset b/Content/Data/EnemyUnits/DA_Wyrm.uasset index 9f7cb51..97b8374 100644 --- a/Content/Data/EnemyUnits/DA_Wyrm.uasset +++ b/Content/Data/EnemyUnits/DA_Wyrm.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7186bbc89815701fc390b3270ae17fb2d8a908b535651ccf9d434a24e35bb71 -size 3396 +oid sha256:1ec5011afa2a36785ebecb7420b781dabaf9f46a9fcea05853e163387ee3c1af +size 3570 diff --git a/Content/Data/PlayerUnits/DA_EM_CQB.uasset b/Content/Data/PlayerUnits/DA_EM_CQB.uasset index dfd2c12..ebf651d 100644 --- a/Content/Data/PlayerUnits/DA_EM_CQB.uasset +++ b/Content/Data/PlayerUnits/DA_EM_CQB.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:019da09b1224632b03a97e18bd84a4cdc274b2bfca8d37c32107d4e0b5909121 -size 3269 +oid sha256:769cbe3b0b1345c0429528368c1379fbce8f5d74bc13b545b3f9cc755c8bb71b +size 3465 diff --git a/Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset b/Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset index 39b4d29..f82efe0 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:f0707bf442cad381e90a420ef5c9f9bb26954e901b9e7dba0450d0b7836704f7 -size 4516 +oid sha256:72c2c04c9677c13cab8fafac76c11f5be3da90bb886c528813eb68f39862ba2a +size 4694 diff --git a/Content/Data/PlayerUnits/DA_EM_Rifleman.uasset b/Content/Data/PlayerUnits/DA_EM_Rifleman.uasset index d9ab21c..5e6c341 100644 --- a/Content/Data/PlayerUnits/DA_EM_Rifleman.uasset +++ b/Content/Data/PlayerUnits/DA_EM_Rifleman.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a30fe189a932a66b672977f1b13d854f52c065a39f91ee8f10ec584f5ad954c -size 3822 +oid sha256:902761ee653d66dedc923582decf22b2304a1d1d1e5295294d78d09848f820d1 +size 4024 diff --git a/Content/Data/PlayerUnits/DA_LightMech.uasset b/Content/Data/PlayerUnits/DA_LightMech.uasset index 032a64a..9cb8f7a 100644 --- a/Content/Data/PlayerUnits/DA_LightMech.uasset +++ b/Content/Data/PlayerUnits/DA_LightMech.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d6f37a0c10f19cfc314813d622288613c818ec9248fc0c709c116ae8522e400 -size 4004 +oid sha256:d7bee9071ace76203a1c94211a8e3474eb0e33120fecd826d614b72d759d33fe +size 4188 diff --git a/Content/Data/PlayerUnits/DA_Scout.uasset b/Content/Data/PlayerUnits/DA_Scout.uasset index 6f548a0..a0fc8dd 100644 --- a/Content/Data/PlayerUnits/DA_Scout.uasset +++ b/Content/Data/PlayerUnits/DA_Scout.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0b08a3400959698c226ad0de57cdb2c4c05546468b180cc2ad0d85f0627122d -size 3819 +oid sha256:787f27525d591c0e59f2010f89a4403591d49dd6cd8ae30547e8823853300300 +size 3995 diff --git a/Content/Data/Upgrades/UnitUpgrades/DA_Ranged_Damage_Up.uasset b/Content/Data/Upgrades/UnitUpgrades/DA_Ranged_Damage_Up.uasset index 5cc92a0..bc16712 100644 --- a/Content/Data/Upgrades/UnitUpgrades/DA_Ranged_Damage_Up.uasset +++ b/Content/Data/Upgrades/UnitUpgrades/DA_Ranged_Damage_Up.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4b571220a43c10500b57a179c83923f1f55e7e151b1ec351432362d2c95c61d -size 1742 +oid sha256:4afe22026b647725ec34922d7091a7dd90eb1f7f6f59729089a3202ad2deb052 +size 1917 diff --git a/Content/Data/portraits/exomarine_cqb.uasset b/Content/Data/portraits/exomarine_cqb.uasset new file mode 100644 index 0000000..4bc6e45 --- /dev/null +++ b/Content/Data/portraits/exomarine_cqb.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd9e064f2ad6f7a3aad2834946ed66f3d9aae70cdef669a1042c17a59300970d +size 103468 diff --git a/Content/Data/portraits/exomarine_rifleman.uasset b/Content/Data/portraits/exomarine_rifleman.uasset new file mode 100644 index 0000000..0113448 --- /dev/null +++ b/Content/Data/portraits/exomarine_rifleman.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11f9811679e56a6fe78f415da2f44820b4c47e340da03f85dcccbafc38b098fe +size 107756 diff --git a/Content/Data/portraits/interceptor.uasset b/Content/Data/portraits/interceptor.uasset new file mode 100644 index 0000000..f5ab918 --- /dev/null +++ b/Content/Data/portraits/interceptor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b36a8f85da463ff8f6f98d66b2aa5e536f6a774a546fcaf2411414215f70c7b +size 125343 diff --git a/Content/Data/portraits/interceptor_transparent.uasset b/Content/Data/portraits/interceptor_transparent.uasset new file mode 100644 index 0000000..c3fb1cd --- /dev/null +++ b/Content/Data/portraits/interceptor_transparent.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50dc00aa239ba2c18c60065d623ba9d5707f6c67e4c22d3112321568323930f5 +size 82813 diff --git a/Content/Data/portraits/lightmech.uasset b/Content/Data/portraits/lightmech.uasset new file mode 100644 index 0000000..928be65 --- /dev/null +++ b/Content/Data/portraits/lightmech.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f436370801db87c378303896b2c3c12a538b9c40b865fd31267c4bf86543266d +size 110883 diff --git a/Content/Data/portraits/mite.uasset b/Content/Data/portraits/mite.uasset new file mode 100644 index 0000000..90e6887 --- /dev/null +++ b/Content/Data/portraits/mite.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36573c2427f806f129d9db2072ff924bd4787646e5324296c4f00ba714f1fbef +size 118638 diff --git a/Content/Data/portraits/mortar.uasset b/Content/Data/portraits/mortar.uasset new file mode 100644 index 0000000..0dfc204 --- /dev/null +++ b/Content/Data/portraits/mortar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a60a619744bb74f0f4198767abffb699a6126fc57e68b1e3cc98872a392449c1 +size 106926 diff --git a/Content/Data/portraits/scout.uasset b/Content/Data/portraits/scout.uasset new file mode 100644 index 0000000..eae396b --- /dev/null +++ b/Content/Data/portraits/scout.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:658225d0b3e4a939ffaf0591b9b4e8a023934555cbfb0d8c5b37bc443908e665 +size 101673 diff --git a/Content/Data/portraits/wyrm.uasset b/Content/Data/portraits/wyrm.uasset new file mode 100644 index 0000000..8a8d9c3 --- /dev/null +++ b/Content/Data/portraits/wyrm.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09f2cf99ea594a0f356db2af2c260f0742cbf8619a780107a7842461059b5cf4 +size 111794 diff --git a/Content/Levels/MainMenu.umap b/Content/Levels/MainMenu.umap index a46c876..25bdab2 100644 --- a/Content/Levels/MainMenu.umap +++ b/Content/Levels/MainMenu.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66da3681e1ca9639e033bceb8b1f5602de722b028ce1e5a41a0fc331c478edc8 +oid sha256:d181cb17a41d04f326529ed14e295ca65fd7a8cc58bd41edb194b9c90379bcaf size 41706 diff --git a/Content/Levels/TestWorld.umap b/Content/Levels/TestWorld.umap new file mode 100644 index 0000000..f41915f --- /dev/null +++ b/Content/Levels/TestWorld.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:443a6dcda318312ed9ffbbd846b2e731e1ac51018dffa2f4c6b92495bbe59395 +size 42980 diff --git a/Content/NewLevelSequence.uasset b/Content/NewLevelSequence.uasset new file mode 100644 index 0000000..923b1f2 --- /dev/null +++ b/Content/NewLevelSequence.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccdc8f353343f24b2ecde61c18cc5bc55465255dd0bb0ac7aa35636fb7d8cf71 +size 25049 diff --git a/Content/UI/Images/Icons/AbilityCursor.uasset b/Content/UI/Images/Icons/AbilityCursor.uasset index e4a610b..52a09a4 100644 --- a/Content/UI/Images/Icons/AbilityCursor.uasset +++ b/Content/UI/Images/Icons/AbilityCursor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51287e5b5946be3fcdfd628c367ba65fa0f438180fee8157bb4787e2b7d0b788 -size 8882 +oid sha256:3c06912daa2968dedfba7fcec00bdccd2580ec64d96068b52dac1071d00f5d20 +size 23950 diff --git a/Content/UI/Images/Icons/AnimatedCursor.uasset b/Content/UI/Images/Icons/AnimatedCursor.uasset index e080a2e..2ecfd60 100644 --- a/Content/UI/Images/Icons/AnimatedCursor.uasset +++ b/Content/UI/Images/Icons/AnimatedCursor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fe3e6d1aae02ccb872678106059bcd6d08e2e8e341713089a7f6f24685d0b91 -size 15602 +oid sha256:7137da6aa7108abb21beb8f784ea2156d25e5cdc8fc131b2e0029181c56a7c19 +size 19208 diff --git a/Content/UI/Images/Icons/locked.uasset b/Content/UI/Images/Icons/locked.uasset new file mode 100644 index 0000000..143f3a6 --- /dev/null +++ b/Content/UI/Images/Icons/locked.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:909fae4e7d00cbefc2496e6f377d1c3cead6d0004e7fad60ad53ac65f6bb0c26 +size 17932 diff --git a/Source/SpaceBattler/Private/UpgradeSubsystem.cpp b/Source/SpaceBattler/Private/UpgradeSubsystem.cpp index 566faf5..dcf5a55 100644 --- 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; +} diff --git a/Source/SpaceBattler/Public/UpgradeSubsystem.h b/Source/SpaceBattler/Public/UpgradeSubsystem.h index 7d83c68..af0051b 100644 --- a/Source/SpaceBattler/Public/UpgradeSubsystem.h +++ b/Source/SpaceBattler/Public/UpgradeSubsystem.h @@ -25,10 +25,13 @@ public: UFUNCTION(BlueprintCallable) void AddUpgrade(UUpgrade* UpgradeToAdd); + + UFUNCTION(BlueprintCallable) + USelectedUpgrade* FindSelectedUpgrade(UUpgrade* SystemToFind); protected: UPROPERTY(BlueprintReadWrite) - int32 BattleTier; + int32 BattleTier = 1; UPROPERTY(BlueprintReadWrite) TArray SelectedUpgrades;