diff --git a/Content/Blueprints/Game_UI/InventoryIcons/Beastiary_Symbol.uasset b/Content/Blueprints/Game_UI/InventoryIcons/Beastiary_Symbol.uasset new file mode 100644 index 0000000..add68fd --- /dev/null +++ b/Content/Blueprints/Game_UI/InventoryIcons/Beastiary_Symbol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c7044e7ca11d92f583d2e6efff80ac5fd94391da173a79d453b66296e500269 +size 372616 diff --git a/Content/Blueprints/Game_UI/InventoryIcons/Combos_Symbol.uasset b/Content/Blueprints/Game_UI/InventoryIcons/Combos_Symbol.uasset new file mode 100644 index 0000000..c97e9f9 --- /dev/null +++ b/Content/Blueprints/Game_UI/InventoryIcons/Combos_Symbol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a11777e65eb2ddfcec0a05c93dd37c4ac39677e56dea854c17775b3ab3880437 +size 140691 diff --git a/Content/Blueprints/Game_UI/InventoryIcons/Gear_Symbol.uasset b/Content/Blueprints/Game_UI/InventoryIcons/Gear_Symbol.uasset new file mode 100644 index 0000000..a6fa1bc --- /dev/null +++ b/Content/Blueprints/Game_UI/InventoryIcons/Gear_Symbol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:939cb4e44b7949f6a71a3384f2f6b621fb18fbe51c191a99b85988dcca01eca3 +size 74160 diff --git a/Content/Blueprints/Game_UI/InventoryIcons/Inventory_Symbol.uasset b/Content/Blueprints/Game_UI/InventoryIcons/Inventory_Symbol.uasset new file mode 100644 index 0000000..a3d0fb8 --- /dev/null +++ b/Content/Blueprints/Game_UI/InventoryIcons/Inventory_Symbol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:026d41e22a6bd68fab67d30dda05d51464704e848025d9f2991a60caf5e74aae +size 100599 diff --git a/Content/Blueprints/Game_UI/InventoryIcons/Map_Symbol.uasset b/Content/Blueprints/Game_UI/InventoryIcons/Map_Symbol.uasset new file mode 100644 index 0000000..b2b41e2 --- /dev/null +++ b/Content/Blueprints/Game_UI/InventoryIcons/Map_Symbol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1660b35afc5b7dec2e6f08200ebbcc36d0ef06ece1caf82d63b74aa33d48e201 +size 105765 diff --git a/Content/Blueprints/Game_UI/InventoryIcons/Settings_Symbol.uasset b/Content/Blueprints/Game_UI/InventoryIcons/Settings_Symbol.uasset new file mode 100644 index 0000000..30a197f --- /dev/null +++ b/Content/Blueprints/Game_UI/InventoryIcons/Settings_Symbol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a3bb8cb233611a0d0f68dd647356ef8f453d3685796629a0a1cae7bf59ef4d0 +size 113757 diff --git a/Content/Blueprints/Game_UI/WBP_Combos.uasset b/Content/Blueprints/Game_UI/WBP_Combos.uasset new file mode 100644 index 0000000..043d787 --- /dev/null +++ b/Content/Blueprints/Game_UI/WBP_Combos.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:416014c061366c2a0d666efc927427c7c9dbdf1b66b3e7148899e4e3fdb4a4c9 +size 29478 diff --git a/Content/Blueprints/Game_UI/WBP_Gear.uasset b/Content/Blueprints/Game_UI/WBP_Gear.uasset new file mode 100644 index 0000000..3a75d58 --- /dev/null +++ b/Content/Blueprints/Game_UI/WBP_Gear.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36dc82fc00e11f9c7ed4431a38306da999cd5e1a38022da55d69845bef3d882e +size 28880 diff --git a/Content/Blueprints/Game_UI/WBP_ItemDisplay.uasset b/Content/Blueprints/Game_UI/WBP_ItemDisplay.uasset new file mode 100644 index 0000000..c885e48 --- /dev/null +++ b/Content/Blueprints/Game_UI/WBP_ItemDisplay.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7028657fce8fc6b471ea49806f3514ed7586c10d7968452aa988edbce7271b0 +size 99181 diff --git a/Content/Blueprints/Game_UI/WBP_Lore.uasset b/Content/Blueprints/Game_UI/WBP_Lore.uasset new file mode 100644 index 0000000..3d15c19 --- /dev/null +++ b/Content/Blueprints/Game_UI/WBP_Lore.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a1cf8c74b3a2a2846ea7362484abd01f3ec2cb699d818cf126054ddf06ffc28 +size 28773 diff --git a/Content/Blueprints/Game_UI/WBP_MainWidg.uasset b/Content/Blueprints/Game_UI/WBP_MainWidg.uasset new file mode 100644 index 0000000..1c0ba9c --- /dev/null +++ b/Content/Blueprints/Game_UI/WBP_MainWidg.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a4a9fa8152ed315f1bb653705fdad6de064d358e1cd3668958f40aae254e1df +size 138836 diff --git a/Content/Blueprints/Game_UI/WBP_Maps.uasset b/Content/Blueprints/Game_UI/WBP_Maps.uasset new file mode 100644 index 0000000..e93b4ae --- /dev/null +++ b/Content/Blueprints/Game_UI/WBP_Maps.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c01afbb57aabc05e93776def7df8f98081d18587f2ed9241532922d6a5b80bd +size 28804 diff --git a/Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset b/Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset new file mode 100644 index 0000000..0f9243f --- /dev/null +++ b/Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0e8a0e29f2b50ff5a0e180750a2add562c0d84867adf2c784460ca58466c8d4 +size 119446 diff --git a/Content/Blueprints/Game_UI/WBP_Settings.uasset b/Content/Blueprints/Game_UI/WBP_Settings.uasset new file mode 100644 index 0000000..7306596 --- /dev/null +++ b/Content/Blueprints/Game_UI/WBP_Settings.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45398065f09fe6c0ae4efb8f8851ff4d1468cb8d8ac0fe1dc1b43d0e00bfb587 +size 42732 diff --git a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset b/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset deleted file mode 100644 index ccfcb16..0000000 --- a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d9a901fca1810f64a4b9a9db9287ad7a5bc3f1567e7d778c72d94d0cf2e45ff -size 100059 diff --git a/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset b/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset deleted file mode 100644 index 2a91515..0000000 --- a/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd6ffc07b98733694c91e0765050ee36312bbf61a6766e7561a2fcfd4cfafeef -size 134102 diff --git a/Content/Blueprints/Items/AmmoItem.uasset b/Content/Blueprints/Items/AmmoItem.uasset index 9991ade..e229918 100644 --- a/Content/Blueprints/Items/AmmoItem.uasset +++ b/Content/Blueprints/Items/AmmoItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d7e4e608a5183142630757d1496d08c76ac9cdcb16b039c3b2e51848ab89d9d -size 6552 +oid sha256:ae9de1eab287b804575b3929065215a0798cc3371c128b849c2b79e6bb8f0c88 +size 2435 diff --git a/Content/Blueprints/Items/BP_Azos.uasset b/Content/Blueprints/Items/BP_Azos.uasset new file mode 100644 index 0000000..d6b8604 --- /dev/null +++ b/Content/Blueprints/Items/BP_Azos.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:234c3634a776d904e4b0641b0f1252ae5fcf7cd7c427467793bf8aded7f28a28 +size 6089 diff --git a/Content/Blueprints/Items/BP_Eis.uasset b/Content/Blueprints/Items/BP_Eis.uasset new file mode 100644 index 0000000..d504056 --- /dev/null +++ b/Content/Blueprints/Items/BP_Eis.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e2bde130e60fb78f77bccd26a57a0bb6e4cba83b788cb331720b202dc6f9b54 +size 6083 diff --git a/Content/Blueprints/Items/BP_Iroquoid.uasset b/Content/Blueprints/Items/BP_Iroquoid.uasset new file mode 100644 index 0000000..422470d --- /dev/null +++ b/Content/Blueprints/Items/BP_Iroquoid.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:746d9a0978283b0776f92252768a7e50e883a80552c05265e3545778171826c2 +size 6148 diff --git a/Content/Blueprints/Items/BP_Probertium.uasset b/Content/Blueprints/Items/BP_Probertium.uasset new file mode 100644 index 0000000..9bacdf5 --- /dev/null +++ b/Content/Blueprints/Items/BP_Probertium.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f05fac1edb1f8eb1183644863c27eebf70582a7bcfa28f9d3db744dca17f8c12 +size 6193 diff --git a/Content/Blueprints/Items/ItemMaterials/Mat_Azos.uasset b/Content/Blueprints/Items/ItemMaterials/Mat_Azos.uasset new file mode 100644 index 0000000..78a2c43 --- /dev/null +++ b/Content/Blueprints/Items/ItemMaterials/Mat_Azos.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:566ff5af0b53291e07b75582fd505b28a6ff9d40324300c052bd132375f0a590 +size 8539 diff --git a/Content/Blueprints/Items/ItemMaterials/Mat_Eis.uasset b/Content/Blueprints/Items/ItemMaterials/Mat_Eis.uasset new file mode 100644 index 0000000..6d29e9c --- /dev/null +++ b/Content/Blueprints/Items/ItemMaterials/Mat_Eis.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5082614d2de6faba8413c5133f7ab0f0c33879f694c5964a1144990d57240d2e +size 8068 diff --git a/Content/Blueprints/Items/ItemMaterials/Mat_Iroquoid.uasset b/Content/Blueprints/Items/ItemMaterials/Mat_Iroquoid.uasset new file mode 100644 index 0000000..a3fcb0e --- /dev/null +++ b/Content/Blueprints/Items/ItemMaterials/Mat_Iroquoid.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ce220cd5bbfd15c45ef492e4224c77425ff5fdae2c871dcaeabb0faa7d83dbc +size 9049 diff --git a/Content/Blueprints/Items/ItemMaterials/Mat_Probertium.uasset b/Content/Blueprints/Items/ItemMaterials/Mat_Probertium.uasset new file mode 100644 index 0000000..33a9312 --- /dev/null +++ b/Content/Blueprints/Items/ItemMaterials/Mat_Probertium.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:269ed5dd67e1df195b85ed258666102e679e410bf87b5e3b390286784f0ffbf4 +size 8504 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset index fa2720b..acc425f 100644 --- a/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset +++ b/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:733e8e625dc0b5a4b8e64f50ccda5397cdeb71aa75470f42b44a4c2606730875 -size 31844 +oid sha256:3d4ed8e2f2bd04442adeb681bb66a9291643bb736ec18bbd24f817dc9bf150ee +size 2559 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_Azos.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_Azos.uasset new file mode 100644 index 0000000..b258efa --- /dev/null +++ b/Content/Blueprints/Items/ItemsInWorld/BP_Azos.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bbd54a7ea6d9bb800d06bf1534e9c2c34d573df79b09621984714de201fa9f7 +size 32219 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_Eis.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_Eis.uasset new file mode 100644 index 0000000..2c22049 --- /dev/null +++ b/Content/Blueprints/Items/ItemsInWorld/BP_Eis.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40b1b3aba3e44f2ae79359b14e31f68e79ca1dd18de2737374f36c4c6d9711b4 +size 31932 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_Iroquoid.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_Iroquoid.uasset new file mode 100644 index 0000000..38cdd02 --- /dev/null +++ b/Content/Blueprints/Items/ItemsInWorld/BP_Iroquoid.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8978cc1273cc732a6c994b47f40eec7facd06989723ee169bca4f3be98a9aeed +size 32668 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_Probertium.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_Probertium.uasset new file mode 100644 index 0000000..a83b723 --- /dev/null +++ b/Content/Blueprints/Items/ItemsInWorld/BP_Probertium.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0134465b90f3930c3f007072f3d6f10aec678577f2d00ed32858d0d3aa0b3f5e +size 32046 diff --git a/Content/Fonts/Adistro-8MePB.otf b/Content/Fonts/Adistro-8MePB.otf new file mode 100644 index 0000000..9c733f7 --- /dev/null +++ b/Content/Fonts/Adistro-8MePB.otf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14d8b2bcf313bd06d6045ce05f5b291932bd89bad91637ee91ad98bcf7d5cccb +size 28428 diff --git a/Content/Fonts/Adistro-Font.uasset b/Content/Fonts/Adistro-Font.uasset new file mode 100644 index 0000000..576aba8 --- /dev/null +++ b/Content/Fonts/Adistro-Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac1435f735481d29673ae35fa157cddbe4b697a9d7e0c624f9fe7fe653edbf43 +size 30020 diff --git a/Content/Fonts/Adistro_Font.uasset b/Content/Fonts/Adistro_Font.uasset new file mode 100644 index 0000000..76dfd03 --- /dev/null +++ b/Content/Fonts/Adistro_Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c526e63d570d48d7737fb38ebdbf08e83eddcd730e93a5e3733b9dcc3bf3a86a +size 4088 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index e1f4942..ebc46dd 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5cc473e60c24da835baacec54217c1f6c675c42c29643b889f07bff057a9c95 -size 34830 +oid sha256:2d21e5c1b55bc786f7f2acecf0140952e360e56c51adc58ce6ae442c38d9023e +size 41066 diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 613c763..5072b7b 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -54,7 +54,16 @@ public: bool isDamageBuffItem; UPROPERTY(EditAnywhere, Category = "Item") - bool isAmmoItemType; + bool isProbertiumType; + + UPROPERTY(EditAnywhere, Category = "Item") + bool isEisType; + + UPROPERTY(EditAnywhere, Category = "Item") + bool isAzosType; + + UPROPERTY(EditAnywhere, Category = "Item") + bool isIroquoidType; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") int32 StackCount = 1; diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp index 0d0098d..dab9f6d 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp @@ -39,18 +39,48 @@ void UEatableItems::Use(ATempCharacter* Character) Character->Inventory->RemoveItem(this); } - if (isAmmoItemType) + if (isProbertiumType) { TurnBaseCombat = GetWorld()->GetGameState(); - if (TurnBaseCombat->ProbertiumResource > 10) + if (TurnBaseCombat->ProbertiumResource < 10) { + UE_LOG(LogTemp, Warning, TEXT("Probertium eaten")); TurnBaseCombat->ProbertiumResource += 5; + Character->Inventory->RemoveItem(this); } - if (TurnBaseCombat->EisResource > 10) + } + + if (isEisType) + { + TurnBaseCombat = GetWorld()->GetGameState(); + if (TurnBaseCombat->EisResource < 10) { + UE_LOG(LogTemp, Warning, TEXT("Eis eaten")); TurnBaseCombat->EisResource += 5; + Character->Inventory->RemoveItem(this); + } + } + + if (isAzosType) + { + TurnBaseCombat = GetWorld()->GetGameState(); + if (TurnBaseCombat->AzosResource < 10) + { + UE_LOG(LogTemp, Warning, TEXT("Azos eaten")); + TurnBaseCombat->AzosResource += 5; + Character->Inventory->RemoveItem(this); + } + } + + if (isIroquoidType) + { + TurnBaseCombat = GetWorld()->GetGameState(); + if (TurnBaseCombat->IroquoidResource < 10) + { + UE_LOG(LogTemp, Warning, TEXT("Iroq eaten")); + TurnBaseCombat->IroquoidResource += 5; + Character->Inventory->RemoveItem(this); } - Character->Inventory->RemoveItem(this); } } } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index b27002d..69995e9 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -102,4 +102,6 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets") UUserWidget* ImportantStats; + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets") + UUserWidget* MainMenuWidget; };