From 83da7265d598cbaf8f4fb68c83ea11278a897249 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 14 Nov 2022 19:22:50 +0000 Subject: [PATCH] Added HealingJelly Item, Added PlayerInventory Added healing jelly item blueprint and started working on the playerinventory UI --- Content/Blueprints/Items/BP_HealingJelly.uasset | 3 +++ Content/Blueprints/Items/BP_HealingSyringe.uasset | 3 --- Content/Blueprints/Items/BP_Jelly1.uasset | 3 --- Content/Blueprints/Items/BP_Jelly2.uasset | 3 --- Content/Blueprints/Items/BP_Jelly3.uasset | 3 --- Content/Blueprints/WBP_PlayerInventory.uasset | 3 +++ Source/the_twilight_abyss/BaseItems/Items/BaseItem.h | 2 +- 7 files changed, 7 insertions(+), 13 deletions(-) create mode 100644 Content/Blueprints/Items/BP_HealingJelly.uasset delete mode 100644 Content/Blueprints/Items/BP_HealingSyringe.uasset delete mode 100644 Content/Blueprints/Items/BP_Jelly1.uasset delete mode 100644 Content/Blueprints/Items/BP_Jelly2.uasset delete mode 100644 Content/Blueprints/Items/BP_Jelly3.uasset create mode 100644 Content/Blueprints/WBP_PlayerInventory.uasset diff --git a/Content/Blueprints/Items/BP_HealingJelly.uasset b/Content/Blueprints/Items/BP_HealingJelly.uasset new file mode 100644 index 0000000..65677e7 --- /dev/null +++ b/Content/Blueprints/Items/BP_HealingJelly.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79844600695e0e7790cb68584c0c58f21af18a8872904ccd645f1ec3108da22d +size 6681 diff --git a/Content/Blueprints/Items/BP_HealingSyringe.uasset b/Content/Blueprints/Items/BP_HealingSyringe.uasset deleted file mode 100644 index 95e16d9..0000000 --- a/Content/Blueprints/Items/BP_HealingSyringe.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e387511b72d482c0cef5dcaf48822ceba438b4bd0cc13ff7410220ca992f15c -size 6030 diff --git a/Content/Blueprints/Items/BP_Jelly1.uasset b/Content/Blueprints/Items/BP_Jelly1.uasset deleted file mode 100644 index e947689..0000000 --- a/Content/Blueprints/Items/BP_Jelly1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d8d52b9430b52830e8488a07bdc388bb5a602828a0b898e727c18aeb583fffb -size 5894 diff --git a/Content/Blueprints/Items/BP_Jelly2.uasset b/Content/Blueprints/Items/BP_Jelly2.uasset deleted file mode 100644 index bd7ba3a..0000000 --- a/Content/Blueprints/Items/BP_Jelly2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:302db81a27f3921406ca175911dd01315a52040b80af2d5515e150f169383463 -size 5894 diff --git a/Content/Blueprints/Items/BP_Jelly3.uasset b/Content/Blueprints/Items/BP_Jelly3.uasset deleted file mode 100644 index 9941cf8..0000000 --- a/Content/Blueprints/Items/BP_Jelly3.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b443f673bb208fa1d7dd5a10319aaf03d7173f4232adda4d9e692895c6c6ade -size 5894 diff --git a/Content/Blueprints/WBP_PlayerInventory.uasset b/Content/Blueprints/WBP_PlayerInventory.uasset new file mode 100644 index 0000000..d344783 --- /dev/null +++ b/Content/Blueprints/WBP_PlayerInventory.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78538ab814d72cd06a99884f5656b4a37cd55ddb9116484f8301be5038323a9e +size 18699 diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 639bc1b..2782c63 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -58,7 +58,7 @@ public: //The use Item class to use the item in the player Inventory virtual void Use(class ATempCharacter* Character) PURE_VIRTUAL(UBaseItem); - + //This is the same as the use item class but its in BP instead UFUNCTION(BlueprintImplementableEvent) void OnUse(class ATempCharacter* Character);