From 53ecbbb472cfac7416378f211304e16ed28e70a3 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 23 Oct 2023 17:24:58 +0100 Subject: [PATCH 1/5] Bugfix Get Item At Index Returning Invaild Result --- .../Source/EndlessVendetta/Inventory/InventoryComponent.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index 5e8f39de..ad4d2687 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -107,7 +107,7 @@ bool UInventoryComponent::IsRoomAvailable(UBaseItem* Item, const int TopLeftInde TileToCheck.X = i; TileToCheck.Y = j; if (!IsTileValid(TileToCheck)) return false; - const TTuple ItemAtIndex = GetItemAtIndex(TileToIndex(TileToCheck)); + TTuple ItemAtIndex = GetItemAtIndex(TileToIndex(TileToCheck)); if (ItemAtIndex.Get<1>()) return false; if (IsValid(ItemAtIndex.Get<0>())) return true; } @@ -126,6 +126,7 @@ FInventoryTile UInventoryComponent::IndexToTile(const int Index) const TTuple UInventoryComponent::GetItemAtIndex(const int Index) { if (!InventoryItems.IsValidIndex(Index)) return MakeTuple(nullptr, false); + if (!IsValid(InventoryItems[Index])) return MakeTuple(nullptr, false); return MakeTuple(InventoryItems[Index], true); } From 58931ab222c6e2b3c5b5404a03d0b6908428c648 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Wed, 25 Oct 2023 16:58:38 +0100 Subject: [PATCH 2/5] Bugfix Inventory UI Not Refreshing on Dirty --- .../Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Sm_Desk01.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset | 4 ++-- .../BountySystem/BountyDirector/PC_Background.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF1.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF10.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF11.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF12.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF13.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF14.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF15.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF16.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF17.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF18.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF19.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF2.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF20.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF21.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF22.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF23.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF24.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF3.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF4.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF5.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF6.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF7.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF8.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF9.uasset | 2 +- .../IntroCutscene/PlayersHomeShipImage.uasset | 2 +- .../BountySystem/Waypoint/TempMainBountyIcon.uasset | 2 +- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- EndlessVendetta/Content/Inventory/MyBaseItem.uasset | 2 +- EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset | 4 ++-- .../Materials/Panel_Concrete_BaseColor.uasset | 4 ++-- .../Materials/Panel_Concrete_Normal.uasset | 4 ++-- .../Panel_Concrete_OcclusionRoughnessMetallic.uasset | 4 ++-- .../Source/EndlessVendetta/Inventory/BaseItem.h | 4 ++-- .../EndlessVendetta/Inventory/InventoryComponent.cpp | 8 ++++---- 39 files changed, 52 insertions(+), 52 deletions(-) diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset index 58f07fd5..8dfab0c1 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:510cdd364940ec3d074a4d801d97eb2399c478e7abaadbe4a391d1f5d5173d99 -size 17604 +oid sha256:78649458180a4491b40592e6a9a9e8447adea855c1cd85f81787ed7fe5969280 +size 17909 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset index 56d35587..2cf30861 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b5800271c81b65754f3f21cb67b4cd0deedcbfb0232f2ab22ce604646841f71 -size 17782 +oid sha256:4fa2682740cc099fe7bbb329a3948b067f131bfb383ab0549b8d3d9d1ef5ba31 +size 18087 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset index 3802fc1c..5122e1e2 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbaa2286c539702b51a5a6174c462bc5fd8e0cd5ee583793f643a49ac7b7e753 -size 17113 +oid sha256:65c189f60265e279660472e3aabd26eb5023432f3e5b3d96849f50b142dcd2f1 +size 17434 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset index cb8d4719..199f6a07 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc48983716b4a41ddac4cdc283559cd56c76280b226550f6278a8104a68edf2c -size 20003 +oid sha256:a0f5675deaee197aaf1285dc476c5e79bd1869f7ee0849730d6b60c082f5d4b6 +size 20300 diff --git a/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset b/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset index e1c19927..4299270e 100644 --- a/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset +++ b/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a9e3317f660c27f1e50f6d62dc7c41212247691362563f8ee0d1c0df4d419a3 +oid sha256:fc51145854d6759b4f32c669b1cbed0c62e07401e1ed6d309c5ab7d4e1b7f01f size 247653 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset index a77bd9c5..aaf6e2dd 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afb1af674f0886711bc46edd965062b1c70f843db5717f0805f93bec05d98ecb +oid sha256:f0a7a523b9dc5a9fd685258cfe8bc60991d2b239148d8c017972673ba0746022 size 520107 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset index 18b13d54..2d8edcfb 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfea54512bade08fea6d38d249df1471a97afa83883d0a197c87c0297704c432 +oid sha256:2b2eceefa723dc5a79b3448b1277eb03ad31fe713a73ae42884960402ea2429c size 190143 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset index cb198274..b4141b1a 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90ccbb7936984b7bb2a771875419d5e31d24a2c98f71f95a0b3c05f404ebf263 +oid sha256:071579af66b333f7354cdc3ee309285fe452adc58f847709ffd2dc1b01f41c81 size 199883 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset index 097e4bb0..10871996 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2199d1967ed03067cd6c682ca01ed36e440713be41562815461b59fb9ec4690f +oid sha256:c6659b1d9be99fffeb3adbbc370e72134d7171ec8fced2fd201cb05ca37879a1 size 278003 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset index b70cc5b2..a1bc0b4a 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b22afc9e55fb90cebd69c4193e2f151a4974bcda51d731ac233dd7548489e1f5 +oid sha256:e74bd8508b9be1aa54bbc732c981019da67048cc1ce66fb6ae73ed5291a89974 size 216041 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset index b31ae079..9d046e2d 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cd9b8e55e5e9f28262566d63785810e116b3ae17e6dbe9566ffaa77d6c4c830 +oid sha256:ca232afedbe4180964c5d88d58652e813ab13d21983d3180c8b3efe2db92ebd4 size 207080 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset index 6f41642b..c2e466ef 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cea03c89a2284e8ab2167515f5dc2202dca82b1ff42beb9cf99b0864194298b5 +oid sha256:27db0081fd42181a7b3029147cd9b60241ca34d5344895b42fb55b3c3736a7fc size 265249 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset index 60764b2b..0ad00735 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3597a1a414682dc1e0af20bb58411000fa9f53e5cc4bffa0cdef047f5bef5edb +oid sha256:5bb79f197937f86b99e5a6b78bb4d2a9ae213001c6bb5af8c4fae53aaf267b6f size 287298 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset index c4fc3ca9..ecc7f33b 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a1154ecb9ec4a484a0dbee1fe88ddfbd43d212be9b1741a2e5f242d26f07109 +oid sha256:56e3150d658610c8de5bb8ccf6d9c3ff6b36c0589e075a8ee7ad9d4bef669861 size 93869 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset index a092af28..2a91232e 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fad118773b61f2751df8d7fbfd5d2afdf7bb21363d613da169963e3eaff281a4 +oid sha256:4d349b3119d1681d78deddd0ee588beea88885d6f22cf243cd62a3fe5ecc17c9 size 222864 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset index eea44311..d5945eb4 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5591f94c1ceb0b5d4ca36f75d59eaaa15ad4e134679f1bbe762def817871b7ec +oid sha256:b95798ae92d9799996e45f036fc693a2677b1c109aa4ad47c9915c5468cc552e size 349128 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset index a58ba621..ff886d39 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f309675f2dc38d8c1bf81634b233f6ef0b67802515977b5cd2c4bb9e1d8b5bd0 +oid sha256:cdd7ef44fa54e4d6fc107c80a5a1b9fbf7eaa388d499c159301ed2104925dc4d size 514322 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset index 9497ff40..7fa3ddde 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0845004d52fda9772f4c34658217b73f74048eae13b3ff38ee9c6e23ec4b31f +oid sha256:daa532eeb32993dd1609b8c7dd4c1317a55e16041a8c7522202e79f3fa05b7c7 size 279708 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset index f7a2f316..b20f2df5 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea43f68bafd93d66443c5985be791c8a450e0a05a8fc6d9d38b94db48c2279b5 +oid sha256:214afb1bf6af99da3b9a6cd363d54ebbeaf9e60e72969ef6ce67dc4d4e5f6143 size 264982 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset index db16a3a9..2785d428 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50ceee3af884775b01cb2542007887326beaf0591e3c5b90c401bd90ac44bbe5 +oid sha256:9ecf3107ed78b41ad8a06501fc8822b97472e1bc17b51a3e38789e4abb212c30 size 201408 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset index 8422f8a7..665bc512 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c1a581bd6b07773550a66b223ddbf159b2b354c3d0be9c49fdcf704ce1b090c +oid sha256:d968ba779c0a08c5e29149afe3055046d287cc37dfe5946409ac83a062d0fc95 size 233871 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset index 83175dcc..e0e5fc91 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d50a5ffc3fbe9ddc0e671bc0aba633f21edf0ad70575b4b0ab61c7daa2c03e3f +oid sha256:c50495df45378664166ad5468b3b2f6f1229d1abfc385ea148c5ef8c3e129f5c size 243459 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset index cfdb0435..9cf119e2 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:784c85d3d80649ec757ee07cbe99d98f6488acd9e428524f67625928c76e3d59 +oid sha256:08b93cdc713cad71806aa5c7ea8bab313b47c15b92a24d9180ae0efc6e040648 size 223835 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset index 88ebab29..160a480e 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb29a34a7f3ce87cd020c3e96973787eae7e13aafa43cd67805fd52c8168772c +oid sha256:a9d69f271f131e122068d8e9e01c015d8bde01335387e8747da96f6a9524a56a size 154151 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset index b3315365..f50ed79a 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0cc947bdc905e4dbd729f6cad9f2439f02c5d2ec97feb7e81f11f204d5327d8 +oid sha256:de56af9d93500dd96005a6f362986c71431d04bb08cc95209d575302b059200c size 196683 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset index d9e2446e..1b6be2b3 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:124c83ecf291fe70581505746b6003214ee069b19d0bf3f15344d3725d5b35b3 +oid sha256:d795b0936261bd5a166c0e22670071610b45c08f4751017b6ddb2a89a66ab747 size 230592 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset index a6234e17..9fda58ed 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6946a1336673f93680fed45f0cf9ce3b674b6c761f819bae4fc3e698000502ef +oid sha256:7c06f98e8fe37c5fdda89a159aa06651d1f86291cfa291a4d69fdba21cb5a14e size 234019 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset index 1ca0c611..abad250e 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bf5b0fe472badda37b479f17431f96520f1255e527f96638b3e36ed24816a91 +oid sha256:75b42558116e853a22943f952546a557ff75e2cf8b4f8b0afa3c240187145618 size 224994 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset index cc9aa2e7..d4260014 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:368df35a657b9b190ad73d14d75e6eaab61187d37de7f2a94cb516e2d5fad769 +oid sha256:132738939e45cfe9982439bd1b391d363850cb7c803d405c9894683d7d591d75 size 251621 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset index efda48f0..037ee9ee 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8e6a8db373eb4fa31440f3ab4dc6b5e8f745540595237fd7b22fed4859aa8dc +oid sha256:2613e30fdd451c4c60be7acee8b6c0ca4ca11ac55b81c6a3649bc87e827b9e42 size 148252 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset index fd565c3c..272cca49 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f3368bb73bdc87d7c608943acc9ae6c8163e32ae29bfaba6701eb8e6270123f +oid sha256:d0aecd15ed5150cad733053745a0db554ffe01be74a9763eb0fb24f1a639b48f size 211777 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 14cd792b..bc3794e4 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae78f6c191dc883ac81ae0762000171837310d6ddd5ac62eb0bbd80b339a4d0e -size 43886 +oid sha256:f39b6a9b90b7aa2d74ad1276c7daf693ac57799f8a7ecb1abb31e7cdf93e0e52 +size 67690 diff --git a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset index 4c1d1f22..758ae3c4 100644 --- a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset +++ b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a60300e2d3a093d49cc47288fadddb35de6038282d0a4a9ede6d695cbd09b2e +oid sha256:fdeecfb1776cd87e96cf07286cefb2c0d19ab38bcdb878672972e227e8c50024 size 6303 diff --git a/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset b/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset index 3ee6aff2..6051adc6 100644 --- a/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset +++ b/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3cef6023803bb1cb16e24224bc11c30ba25dfd1aabb4067521f21f8c01cf3c8 -size 582279 +oid sha256:e272d7c78f6f03069c1262b5b64252c6992880d5135505b512715131aebc87bf +size 569790 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset index 49b8293c..76618f47 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c7959637d99242528a577c02b859fb548fa09c23d492edba47ee16bb993339c -size 1645357 +oid sha256:9b0dbb428642c1b0e58836ea2209e1582299c1f2e1da0862199dafa7dd308e3e +size 1645445 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset index 8785b31f..02659af3 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdb64cb291167601a4b386e10ecea4f3f9dfc775b6bd8ad229316fd4664eefd5 -size 2960186 +oid sha256:7f4f79671afa46c75ed303f899d08cc6ceeba8c196a609bf431987f6298e4492 +size 2960274 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset index 5182b904..bcefe216 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:645d5fe908bcd3c8b26ec3f63cb9a8e6a746190b0cfe073d130f85c6d720712d -size 352656 +oid sha256:f4a0db0198e019e1fe271f4c96b469b23505c66536b0f5db30d69abfb527c6d3 +size 352744 diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h index da7ed6d9..14645877 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h @@ -10,9 +10,9 @@ struct FItemSize { GENERATED_BODY() - UPROPERTY(BlueprintReadOnly, Category = "ItemSize") + UPROPERTY(BlueprintReadWrite, Category = "ItemSize") int X; - UPROPERTY(BlueprintReadOnly, Category = "ItemSize") + UPROPERTY(BlueprintReadWrite, Category = "ItemSize") int Y; FItemSize(const int _X, const int _Y) diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index ad4d2687..001e46f3 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -145,7 +145,7 @@ void UInventoryComponent::AddItemAt(UBaseItem* Item, const int TopLeftIndex) TileToCheck.X = i; TileToCheck.Y = j; if (!IsTileValid(TileToCheck)) return; - InventoryItems.Insert(Item, TileToIndex(TileToCheck)); + InventoryItems[TileToIndex(TileToCheck)] = Item; } } IsDirty = true; @@ -158,7 +158,7 @@ TMap UInventoryComponent::GetAllItems() { UBaseItem* Item = InventoryItems[i]; if (!IsValid(Item)) continue; - if (!Items.Contains(Item)) continue; + if (Items.Contains(Item)) continue; Items.Add(Item, IndexToTile(i)); } return Items; @@ -171,7 +171,7 @@ void UInventoryComponent::RemoveItem(UBaseItem* Item) { if (InventoryItems[i] == Item) { - InventoryItems.RemoveAt(i); + InventoryItems[i] = nullptr; IsDirty = true; } } @@ -183,7 +183,7 @@ void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location, FRotator bool UInventoryComponent::IsTileValid(const FInventoryTile InventoryTile) const { - if (InventoryTile.X >= 0 && InventoryTile.Y >= 0 && InventoryTile.Y < Columns && InventoryTile.Y < Rows) + if (InventoryTile.X >= 0 && InventoryTile.Y >= 0 && InventoryTile.Y < Columns && InventoryTile.Y <= Rows) { return true; } From 50791b67c3f38b708b4c70ed74d3856f0a45430f Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 26 Oct 2023 10:52:42 +0100 Subject: [PATCH 3/5] Bugfix Able to Place Items Outside of Grid --- EndlessVendetta/Content/Inventory/M_Base_Rev.uasset | 3 +++ EndlessVendetta/Content/Inventory/MyBaseItem.uasset | 4 ++-- .../Source/EndlessVendetta/Inventory/BaseItem.cpp | 7 +++++++ .../Source/EndlessVendetta/Inventory/BaseItem.h | 6 +++++- .../EndlessVendetta/Inventory/InventoryComponent.cpp | 4 ++-- 5 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 EndlessVendetta/Content/Inventory/M_Base_Rev.uasset diff --git a/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset b/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset new file mode 100644 index 00000000..01f423f1 --- /dev/null +++ b/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddc0bd83ded6fbd643a6e2f17d8733c45f6c257ab625118ba77d639104f004b9 +size 18207 diff --git a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset index 758ae3c4..f708989d 100644 --- a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset +++ b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdeecfb1776cd87e96cf07286cefb2c0d19ab38bcdb878672972e227e8c50024 -size 6303 +oid sha256:d2c73a557df51957bac0873e8c8144c354801a6f68e7882c23e403940ac9d7e1 +size 6587 diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.cpp index b79e1425..d2987dcf 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.cpp @@ -3,6 +3,13 @@ #include "BaseItem.h" + +void UBaseItem::PostInitProperties() +{ + Super::PostInitProperties(); + ItemSize = FItemSize(DefaultItemSize.X, DefaultItemSize.Y); +} + void UBaseItem::RotateItem() { if (CurrentItemRotation == Horizontal) diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h index 14645877..39d040bf 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h @@ -51,7 +51,9 @@ public: UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") FText Description; UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") - FItemSize ItemSize = FItemSize(); + FVector2D DefaultItemSize = FVector2D(1); + UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") + FItemSize ItemSize; UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") UMaterialInterface* ItemTexture; UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") @@ -63,6 +65,8 @@ public: UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") bool bIsRotated = false; + virtual void PostInitProperties() override; + UFUNCTION(BlueprintCallable, Category = "Item") void RotateItem(); UFUNCTION(BlueprintCallable, Category = "Item") diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index 001e46f3..b086643f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -109,7 +109,7 @@ bool UInventoryComponent::IsRoomAvailable(UBaseItem* Item, const int TopLeftInde if (!IsTileValid(TileToCheck)) return false; TTuple ItemAtIndex = GetItemAtIndex(TileToIndex(TileToCheck)); if (ItemAtIndex.Get<1>()) return false; - if (IsValid(ItemAtIndex.Get<0>())) return true; + if (IsValid(ItemAtIndex.Get<0>())) return false; } } return true; @@ -183,7 +183,7 @@ void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location, FRotator bool UInventoryComponent::IsTileValid(const FInventoryTile InventoryTile) const { - if (InventoryTile.X >= 0 && InventoryTile.Y >= 0 && InventoryTile.Y < Columns && InventoryTile.Y <= Rows) + if (InventoryTile.X >= 0 && InventoryTile.Y >= 0 && InventoryTile.X < Columns && InventoryTile.Y < Columns && InventoryTile.Y <= Rows) { return true; } From 2553f471e5eccaacc3e2cbe2a889bcf0a94c78d3 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 26 Oct 2023 11:27:03 +0100 Subject: [PATCH 4/5] Updated Inventory for Cleanup --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset | 4 ++-- EndlessVendetta/Content/Inventory/M_Base_Rev.uasset | 3 --- EndlessVendetta/Content/Inventory/M_Base_Rot.uasset | 3 +++ EndlessVendetta/Content/Inventory/MyBaseItem.uasset | 2 +- EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset | 3 +++ EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset | 3 +++ EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset | 3 +++ EndlessVendetta/Content/Inventory/UI_Inventory.uasset | 3 --- EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset | 3 --- EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset | 3 --- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Source/EndlessVendetta/Inventory/InventoryComponent.cpp | 2 +- .../Source/EndlessVendetta/Inventory/InventoryComponent.h | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 EndlessVendetta/Content/Inventory/M_Base_Rev.uasset create mode 100644 EndlessVendetta/Content/Inventory/M_Base_Rot.uasset create mode 100644 EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset create mode 100644 EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset create mode 100644 EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset delete mode 100644 EndlessVendetta/Content/Inventory/UI_Inventory.uasset delete mode 100644 EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset delete mode 100644 EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index bc3794e4..bd336f47 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f39b6a9b90b7aa2d74ad1276c7daf693ac57799f8a7ecb1abb31e7cdf93e0e52 -size 67690 +oid sha256:e682a957f3ebb1f435625e280cf61ebd7af0d8fb7d052e424d8c629c6b55c0f6 +size 44055 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset index 096f7b65..0422e8b5 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:652c5f873867461d6bff66634c30ab364f7f1ef3f45551c75b7c484e4af0d44d -size 108896 +oid sha256:64c5c7438cb4287bc4df51b9393981eb8155dc5f14525c600d6725960dce6bfd +size 108419 diff --git a/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset b/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset deleted file mode 100644 index 01f423f1..00000000 --- a/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ddc0bd83ded6fbd643a6e2f17d8733c45f6c257ab625118ba77d639104f004b9 -size 18207 diff --git a/EndlessVendetta/Content/Inventory/M_Base_Rot.uasset b/EndlessVendetta/Content/Inventory/M_Base_Rot.uasset new file mode 100644 index 00000000..ad45269b --- /dev/null +++ b/EndlessVendetta/Content/Inventory/M_Base_Rot.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dc387e928b76f39cdbad7961e09b77c848b2d6df0348a0f4052bdc98976a659 +size 18207 diff --git a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset index f708989d..024d162f 100644 --- a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset +++ b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2c73a557df51957bac0873e8c8144c354801a6f68e7882c23e403940ac9d7e1 +oid sha256:789627d1177e0ef93075f0ca5a5b27156b16dfce514a80c543108f133a70b7d2 size 6587 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset new file mode 100644 index 00000000..e0960292 --- /dev/null +++ b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc2d597e4dd0c95915c34a213b9a299bef8d337b839b2a8b9618a9a63d26732c +size 84945 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset b/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset new file mode 100644 index 00000000..fc14eb3f --- /dev/null +++ b/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cce77e4317282a52477d49365a307a4673915f14b6013ee32ed2ef26800fa37 +size 563097 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset b/EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset new file mode 100644 index 00000000..c6979830 --- /dev/null +++ b/EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffcc3dbb5d6cafefa035c2e86c1fe4579fee9ce62abced4d4d86216caaf620f2 +size 147282 diff --git a/EndlessVendetta/Content/Inventory/UI_Inventory.uasset b/EndlessVendetta/Content/Inventory/UI_Inventory.uasset deleted file mode 100644 index 29548ed8..00000000 --- a/EndlessVendetta/Content/Inventory/UI_Inventory.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:461387a0016e4548f6916377de335db4cc9b40fa795d6a25b7b8247279b3002f -size 87922 diff --git a/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset b/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset deleted file mode 100644 index 6051adc6..00000000 --- a/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e272d7c78f6f03069c1262b5b64252c6992880d5135505b512715131aebc87bf -size 569790 diff --git a/EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset b/EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset deleted file mode 100644 index 6773c468..00000000 --- a/EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d6849ec4eed10578619d45a3633b4d8540ce11c4b56ef00bfca43fe2429b480 -size 148756 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 205b9bf5..a88e02c4 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:974625bb42aeaaaec3c16d60fcf02f3a750f9bd6a87103075fcc1fc854eeadf0 -size 456337 +oid sha256:b745061f359dd7b8358b5673eda5a1d3dd75f1c17b6f70c73e177d10a0c3ebf0 +size 456284 diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index b086643f..df0b4bc6 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -177,7 +177,7 @@ void UInventoryComponent::RemoveItem(UBaseItem* Item) } } -void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location, FRotator Rotation) +void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location) { } diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h index 5ba7ba28..f8a4a44f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h @@ -60,7 +60,7 @@ public: UFUNCTION(BlueprintCallable, Category="Inventory") void RemoveItem(class UBaseItem* Item); UFUNCTION(BlueprintCallable, Category="Inventory") - void SpawnItem(class UBaseItem* Item, FVector Location, FRotator Rotation); + void SpawnItem(class UBaseItem* Item, FVector Location); private: bool IsTileValid(const FInventoryTile InventoryTile) const; From c794a905da45ffde2274adbf3a84bf2ca9ddd9e3 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 26 Oct 2023 11:59:50 +0100 Subject: [PATCH 5/5] Updated Inventory Component for Resising Functionality --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset | 4 ++-- .../EndlessVendetta/Inventory/InventoryComponent.cpp | 7 +++++++ .../Source/EndlessVendetta/Inventory/InventoryComponent.h | 4 +++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index bd336f47..2e7c893c 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e682a957f3ebb1f435625e280cf61ebd7af0d8fb7d052e424d8c629c6b55c0f6 -size 44055 +oid sha256:21f83334caec77bd5102f683752229d6f53c6e3f6b0b362f4a00171573bd502b +size 50118 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset index e0960292..3b397eac 100644 --- a/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset +++ b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc2d597e4dd0c95915c34a213b9a299bef8d337b839b2a8b9618a9a63d26732c -size 84945 +oid sha256:02676d43ab06d6fe84a89f2c8c147415615e84ab3474cb59e75888dae53f5711 +size 96823 diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index df0b4bc6..2d09885f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -181,6 +181,13 @@ void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location) { } +void UInventoryComponent::UpdateInventorySize_Implementation(const int _Columns, const int _Rows) +{ + Columns = _Columns; + Rows = _Rows; + InventoryItems.SetNum(Columns * Rows); +} + bool UInventoryComponent::IsTileValid(const FInventoryTile InventoryTile) const { if (InventoryTile.X >= 0 && InventoryTile.Y >= 0 && InventoryTile.X < Columns && InventoryTile.Y < Columns && InventoryTile.Y <= Rows) diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h index f8a4a44f..813a181b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h @@ -49,7 +49,6 @@ public: bool IsRoomAvailable(class UBaseItem* Item, const int TopLeftIndex); UFUNCTION(BlueprintCallable, Category="Inventory") FInventoryTile IndexToTile(const int Index) const; - //UFUNCTION(BlueprintCallable, Category="Inventory") TTuple GetItemAtIndex(const int Index); UFUNCTION(BlueprintCallable, Category="Inventory") int TileToIndex(const FInventoryTile InventoryTile) const; @@ -61,6 +60,9 @@ public: void RemoveItem(class UBaseItem* Item); UFUNCTION(BlueprintCallable, Category="Inventory") void SpawnItem(class UBaseItem* Item, FVector Location); + UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Exec, Category = "Inventory") + void UpdateInventorySize(const int _Columns, const int _Rows); + virtual void UpdateInventorySize_Implementation(const int _Columns, const int _Rows); private: bool IsTileValid(const FInventoryTile InventoryTile) const;