From 1f092ed09451e424d5f71953e6e7e00705220e9b Mon Sep 17 00:00:00 2001 From: Kyle Austad Date: Fri, 27 Sep 2024 16:45:04 -0500 Subject: [PATCH] Got equipping and updating UI Need to now compare module slots to make sure equipping module is compatible with slot. I can do this using a function to switch on module class category and assign an integer/float to it then compare the output of the float/integer with the incoming one --- Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset | 4 ++-- Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset | 4 ++-- .../Blueprints/Interfaces/BPI_ShipCore.uasset | 4 ++-- .../ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset | 4 ++-- Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset | 4 ++-- Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset | 4 ++-- .../ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset | 4 ++-- .../ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset | 2 +- .../ModularShipSystem/Demo/Widgets/WBP_OutfittingMenu.uasset | 3 +++ .../ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset | 4 ++-- .../ModularShipSystem/Structs/S_AttachActorVariables.uasset | 3 +++ Content/ModularShipSystem/Structs/S_MasterShipInfo.uasset | 3 +++ 12 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingMenu.uasset create mode 100644 Content/ModularShipSystem/Structs/S_AttachActorVariables.uasset create mode 100644 Content/ModularShipSystem/Structs/S_MasterShipInfo.uasset diff --git a/Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset b/Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset index 4f76e0b..423d0c1 100644 --- a/Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset +++ b/Content/ModularShipSystem/Blueprints/BP_AttachActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b775e8fc48cd965bedcf727568ddbf44d4f4f3561f107bd6ed10bc91f97e80df -size 33849 +oid sha256:1c8e325a4c3524ff171e8e364f21bbedae9584d045450b112adebbcc040a02a9 +size 83335 diff --git a/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset b/Content/ModularShipSystem/Blueprints/BP_ShipHUD.uasset index fb884c0..9091a79 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:2dbc11370b4be75c8693f430af0d4d34b27ca7e95cd339038fa1a9641a7b92ac -size 158316 +oid sha256:4e180ccbe50658fae2c0678e10c8892352b49d784c37ed7c3c60de670e6c61b9 +size 166911 diff --git a/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset b/Content/ModularShipSystem/Blueprints/Interfaces/BPI_ShipCore.uasset index 75c29f9..6b76b5f 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:ca8e466b991723437dc048b7c5c3b727d749b45766a690eb49c5dc9b0e0f87aa -size 55560 +oid sha256:a78b523d5bb8329150bbceceb6a6249e92508cdd691fa1b86ec821825fe2b8bc +size 78146 diff --git a/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset b/Content/ModularShipSystem/Demo/Blueprints/BP_SpaceStation.uasset index a5c4a1b..c54adba 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:2153290a90d0c8e7357d727bc555fe8ee3c99a0089e4ea4fddc78f4448d4053c -size 300808 +oid sha256:bcea0de25b1caab16c09406fca1f8e7a6b7488228816db07ff3f344ac8409c91 +size 283469 diff --git a/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset b/Content/ModularShipSystem/Demo/Pawns/BP_BaseShip.uasset index 045189c..245f1d5 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:6776dcda31054e03a6354b25b5451143eacc15b8d33e962059b8f7906fb967dc -size 493318 +oid sha256:e8500cd6565da36ad078c08e4ea5cdfe4783b04ebb7ae22e0096214980f58bb9 +size 880927 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset index 0be1c26..5a7eb10 100644 --- a/Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipScreen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d74e67d3d0c1d8925ca8ebcf9d51bd0c38f134d75d8ec6e215892e16fe8ff0fa -size 75387 +oid sha256:7d805b637ba4488264741bb38db808d7c06374b2fca8f7f36e2bedcc314f993f +size 74930 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset index b7de439..0f5d09d 100644 --- a/Content/ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_EquipSlotSingle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:899bbf3cf71bccbf57d59afb0ca50b023332d96fe75722748df741db20b1145b -size 96938 +oid sha256:e6a49459ce3054d9886d36e3942c987f742dc929db3736b3e00f7970a706e3bb +size 628142 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset index b6fa5b3..5099531 100644 --- a/Content/ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_ModuleSubMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b5e773297aff58b5eb10fde56955fb55db11412888663c1d5dead96771a9d3b +oid sha256:b2fd39f0a3a1de51866c195d950254eb3ffba0dcb6741f2a50af96294604dd08 size 61290 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingMenu.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingMenu.uasset new file mode 100644 index 0000000..1db4264 --- /dev/null +++ b/Content/ModularShipSystem/Demo/Widgets/WBP_OutfittingMenu.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16d971d47b60868b9cf5eb61b5a71ed885b80d2514c01dbf1c0a24f95c31a3b7 +size 60820 diff --git a/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset b/Content/ModularShipSystem/Demo/Widgets/WBP_ShopInterface.uasset index 3554ce5..5c64b49 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:89939baea834f76836f1afeccb01559d8f73f5cfb03ee080341f397fa9f13393 -size 1016759 +oid sha256:736e45e442eb0541beae720149ddc47cdd28d8a149596cbd6d167c9963209b7d +size 1111805 diff --git a/Content/ModularShipSystem/Structs/S_AttachActorVariables.uasset b/Content/ModularShipSystem/Structs/S_AttachActorVariables.uasset new file mode 100644 index 0000000..5a9cf4d --- /dev/null +++ b/Content/ModularShipSystem/Structs/S_AttachActorVariables.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b84f06141db02bfd26f9f61d08f38a06975ec01d847c016c659339095deb404 +size 16652 diff --git a/Content/ModularShipSystem/Structs/S_MasterShipInfo.uasset b/Content/ModularShipSystem/Structs/S_MasterShipInfo.uasset new file mode 100644 index 0000000..44035cb --- /dev/null +++ b/Content/ModularShipSystem/Structs/S_MasterShipInfo.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e891d29091987dfdb6cb04798ffb541b7c92a3359d2d556b011a481d9f87ff85 +size 13944