From 8bdd62ac19c27267e744f7f05d2ded3aed291ba1 Mon Sep 17 00:00:00 2001 From: Kyle Austad Date: Fri, 20 Sep 2024 16:13:42 -0500 Subject: [PATCH] Got module UI working in shop --- Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset | 4 ++-- .../Blueprints/Interfaces/BPI_ShipCore.uasset | 4 ++-- .../ModularShipSystem/DataTables/DT_TestHardpoint_Shop.uasset | 3 +++ .../DT_WatchtowerStation_Hardpoints.uasset | 3 +++ .../ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset | 4 ++-- Content/ModularShipSystem/Demo/Icons/laser-pen.uasset | 3 +++ Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset | 4 ++-- Content/ModularShipSystem/Demo/Widgets/WBP_DamageTypes.uasset | 3 +++ .../ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset | 4 ++-- Content/ModularShipSystem/Demo/Widgets/WBP_ShopItem.uasset | 4 ++-- .../Demo/Widgets/WBP_ShopItem_Hardpoint.uasset | 3 +++ Content/ModularShipSystem/Enums/E_ModuleClasses.uasset | 4 ++-- Content/ModularShipSystem/Enums/E_ShopCategories.uasset | 3 +++ Content/ModularShipSystem/Structs/S_ShopItem.uasset | 3 +++ .../Structs/ShopStructs/S_HardpointShopInfo.uasset | 3 +++ .../Structs/ShopStructs/S_StationShopLists.uasset | 3 +++ .../Maps/ThirdPersonMap/3/OP/YLCCW4C4V38C1Q4RGRBAIM.uasset | 4 ++-- README.md | 4 ++++ 18 files changed, 47 insertions(+), 16 deletions(-) create mode 100644 Content/ModularShipSystem/DataTables/DT_TestHardpoint_Shop.uasset create mode 100644 Content/ModularShipSystem/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_Hardpoints.uasset create mode 100644 Content/ModularShipSystem/Demo/Icons/laser-pen.uasset create mode 100644 Content/ModularShipSystem/Demo/Widgets/WBP_DamageTypes.uasset create mode 100644 Content/ModularShipSystem/Demo/Widgets/WBP_ShopItem_Hardpoint.uasset create mode 100644 Content/ModularShipSystem/Enums/E_ShopCategories.uasset create mode 100644 Content/ModularShipSystem/Structs/S_ShopItem.uasset create mode 100644 Content/ModularShipSystem/Structs/ShopStructs/S_HardpointShopInfo.uasset create mode 100644 Content/ModularShipSystem/Structs/ShopStructs/S_StationShopLists.uasset diff --git a/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset b/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset index aa97d08..c795ccb 100644 --- a/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset +++ b/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29cac744ca64e9dcd1e13abec643bb8dee45c398a47b40edfdd8658de2ed8522 -size 132817 +oid sha256:d5bb8c5d5a858447f2610d1c9f43e187088abfd6036df697a6fb7c2a1bdaa434 +size 153069 diff --git a/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset b/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset index 397a2b3..e3f888d 100644 --- a/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset +++ b/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2715b236dcdbc5eab484f1a3597035ff016d36f3c02067897bfc43a7d1a5b7b7 -size 40437 +oid sha256:af09b27c1bb53c6982807ee18a6e61c4f2b51db0b7b5624098db26a3d73ffc26 +size 45216 diff --git a/Content/ModularShipSystem/DataTables/DT_TestHardpoint_Shop.uasset b/Content/ModularShipSystem/DataTables/DT_TestHardpoint_Shop.uasset new file mode 100644 index 0000000..caa500e --- /dev/null +++ b/Content/ModularShipSystem/DataTables/DT_TestHardpoint_Shop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d9a5100700c2a239d4045199f5b95f8ef5a80866fdcf73987f1139b1af6a357 +size 9373 diff --git a/Content/ModularShipSystem/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_Hardpoints.uasset b/Content/ModularShipSystem/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_Hardpoints.uasset new file mode 100644 index 0000000..f0dfdca --- /dev/null +++ b/Content/ModularShipSystem/DataTables/WatchtowerStation_Shop/DT_WatchtowerStation_Hardpoints.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7830fffa6967832d05761efcc5d735e0bc88daef55a5c4dd9d0b755f13857329 +size 6764 diff --git a/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset b/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset index 4a71d58..5741ec5 100644 --- a/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset +++ b/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53781897ffaa1dc9745b05a459aac6c0d6f3a597bbeb30b5e4a517f3cadf68dc -size 349238 +oid sha256:6e225e4aa7141d5267c1816c7642c0612289b0caef72cb6e365bfd6ee202b224 +size 355679 diff --git a/Content/ModularShipSystem/Demo/Icons/laser-pen.uasset b/Content/ModularShipSystem/Demo/Icons/laser-pen.uasset new file mode 100644 index 0000000..20e8167 --- /dev/null +++ b/Content/ModularShipSystem/Demo/Icons/laser-pen.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:523888a5b8d45ef6fc4c86472274f4644aaa343f87de4e42e5d5eb5fa5d0efdb +size 22077 diff --git a/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset b/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset index b5388df..5c59969 100644 --- a/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset +++ b/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df804be5f25bce07cf4d81fafaacb7d80ed5be16a50860bb9f844d6565185d0f -size 412602 +oid sha256:5e3a70b1a5f8fe8658b0574bad68e51d04ce4f199930969b27768186d3e45bdb +size 435659 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_DamageTypes.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_DamageTypes.uasset new file mode 100644 index 0000000..1adda93 --- /dev/null +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_DamageTypes.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fbee85946dbe01b91f7795afc14ca940a8f5db0662fe87a9ba1b44db9969c23 +size 86103 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset index 79b58bf..9ac9b13 100644 --- a/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dba03699a929f930b7d41e0fdbd3f87e7b1a346ebff54d5b79810ed0db30e7ae -size 47609 +oid sha256:39a8d99a36a4ca7d9a9f13dc3e1f0e941ee18e20c12a1153e956e1a56aa714d8 +size 174669 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_ShopItem.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_ShopItem.uasset index 571fba7..88d8001 100644 --- a/Content/ModularShipSystem/Demo/Widgets/WBP_ShopItem.uasset +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_ShopItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0f1f5f4caf7839466dcf5a5776a95b8e90e7f527c0590dd339c98d3c729dafa -size 37717 +oid sha256:b8e8328bbdf76476a1d68382f02d4fe87624e7000e49a976c0003dee2f050057 +size 91168 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_ShopItem_Hardpoint.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_ShopItem_Hardpoint.uasset new file mode 100644 index 0000000..a88499f --- /dev/null +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_ShopItem_Hardpoint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30113394381a81ac64538af7f73945a6e16cadd6cf3ad8b01bdbc9d0b0616b9e +size 121344 diff --git a/Content/ModularShipSystem/Enums/E_ModuleClasses.uasset b/Content/ModularShipSystem/Enums/E_ModuleClasses.uasset index d6b1cb2..e0e4130 100644 --- a/Content/ModularShipSystem/Enums/E_ModuleClasses.uasset +++ b/Content/ModularShipSystem/Enums/E_ModuleClasses.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a061622e297ba5fb0fdd4f90e55a6918b33c71474811474b9b60677d5dbc0a4 -size 7778 +oid sha256:59ac55766ec649fe540b0f01f16a1fab38b4caf5f95a975017040aaddeae2173 +size 7774 diff --git a/Content/ModularShipSystem/Enums/E_ShopCategories.uasset b/Content/ModularShipSystem/Enums/E_ShopCategories.uasset new file mode 100644 index 0000000..6a07b28 --- /dev/null +++ b/Content/ModularShipSystem/Enums/E_ShopCategories.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4db14acbd1d2d8814ffe0f9f573924bd7802f7cae6effd1bf8da8e71e7dff6c6 +size 3196 diff --git a/Content/ModularShipSystem/Structs/S_ShopItem.uasset b/Content/ModularShipSystem/Structs/S_ShopItem.uasset new file mode 100644 index 0000000..0b27cb4 --- /dev/null +++ b/Content/ModularShipSystem/Structs/S_ShopItem.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fef22307c14e5d837c819915eccf3917cea5316e6f8789c00536c1284279a84b +size 8046 diff --git a/Content/ModularShipSystem/Structs/ShopStructs/S_HardpointShopInfo.uasset b/Content/ModularShipSystem/Structs/ShopStructs/S_HardpointShopInfo.uasset new file mode 100644 index 0000000..b88f896 --- /dev/null +++ b/Content/ModularShipSystem/Structs/ShopStructs/S_HardpointShopInfo.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98d952b75161b6823e3896e009d245d3684b66036b5aae58fd7f9683bc7e0991 +size 6922 diff --git a/Content/ModularShipSystem/Structs/ShopStructs/S_StationShopLists.uasset b/Content/ModularShipSystem/Structs/ShopStructs/S_StationShopLists.uasset new file mode 100644 index 0000000..67cdf57 --- /dev/null +++ b/Content/ModularShipSystem/Structs/ShopStructs/S_StationShopLists.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:847e68cd6567527ace41d04d389b8de228559da9c7facea899546c1cb00d0019 +size 6922 diff --git a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/OP/YLCCW4C4V38C1Q4RGRBAIM.uasset b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/OP/YLCCW4C4V38C1Q4RGRBAIM.uasset index 12d921b..6ded49a 100644 --- a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/OP/YLCCW4C4V38C1Q4RGRBAIM.uasset +++ b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/OP/YLCCW4C4V38C1Q4RGRBAIM.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d9a109a1d928b9da46d7e05b79f7850bf0e8112350a760435610c3dc1defdfa -size 11125 +oid sha256:2402fa1f8a7cf3febbdfa827947ce812b1344d5601241fb65dc1b199ee9aa46d +size 11703 diff --git a/README.md b/README.md index 96c54c2..87dc654 100644 --- a/README.md +++ b/README.md @@ -36,3 +36,7 @@ All of the components below need stats defined such as power draw and hull reinf - [ ] Move UI handling for space station to a HUD class using the interfaces to toggle everything - [ ] docking should change pawn rotation as well + +### Attributions + +Miscellaneous icons created by Ali Syaifullah - Flaticon \ No newline at end of file