diff --git a/Content/Assets/Characters/Merchant/AMerchant.uasset b/Content/Assets/Characters/Merchant/AMerchant.uasset index 644b10e..e7bc7d6 100644 --- a/Content/Assets/Characters/Merchant/AMerchant.uasset +++ b/Content/Assets/Characters/Merchant/AMerchant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dbe6bcb0cc18389a3f0c8dea2e57b06f6b221a43a5414eaf6d2abf00fd1cfc9 -size 153697 +oid sha256:3a24304aaa446692e9c99114edceda2403c1ab4a294545ea333261b40b593fa1 +size 155770 diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index ffa6c4b..e6cb22b 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b0ca94d255f0f236a72b3f38504c4ab7a98817d96d24b06872202b2c73c08f5 -size 193238 +oid sha256:f4544c85da12f20897d4aac27da47a2b66c3dca2bda08fdc113281bba8dcec72 +size 193441 diff --git a/Content/Blueprints/Game_UI/WBP_ItemDisplay.uasset b/Content/Blueprints/Game_UI/WBP_ItemDisplay.uasset index dfab296..6c4f8b6 100644 --- a/Content/Blueprints/Game_UI/WBP_ItemDisplay.uasset +++ b/Content/Blueprints/Game_UI/WBP_ItemDisplay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18211375d0c5c5cd79835743d247696e6419dc50029fa9d7598a2a7d7c83078c -size 99025 +oid sha256:eb362d425c7d70fe582c70770546db10ae06edf17897cebb44519235c22324d8 +size 92315 diff --git a/Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset b/Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset index 905fcdf..8813046 100644 --- a/Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset +++ b/Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f7a4ea65675928aa75606844f09556e3525a66bb92ee8617eff3771f4afb602 -size 128282 +oid sha256:4f5abbdb76b47f2f03f673a2d9b3356518196a19d2d95c689917179799291ea5 +size 122856 diff --git a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset b/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset index 2499942..6e0581f 100644 --- a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset +++ b/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b3ba56106695d23c55f63e138c2fec8309ed62ef8327920192fd1b54f081f48 -size 98068 +oid sha256:037cf94bfad007a231997881349b31fe002219d0c98eae0285022ddee2de6e0f +size 75824 diff --git a/Content/Blueprints/Items/BP_BuffJelly.uasset b/Content/Blueprints/Items/BP_BuffJelly.uasset index 08fc46a..8d5e5db 100644 --- a/Content/Blueprints/Items/BP_BuffJelly.uasset +++ b/Content/Blueprints/Items/BP_BuffJelly.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf779fd11851aede9412c4cbe029800e93bc86c3bafc8bf13d4087b15c347e27 -size 6849 +oid sha256:ea7a376d69e02b748cc8cb72b7a6f391edf3965600908d86a559a2ad5002a116 +size 6725 diff --git a/Content/Blueprints/Items/BP_HealingJelly.uasset b/Content/Blueprints/Items/BP_HealingJelly.uasset index 5059a3f..f8625b8 100644 --- a/Content/Blueprints/Items/BP_HealingJelly.uasset +++ b/Content/Blueprints/Items/BP_HealingJelly.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d9452c1c36587b60ffe4875ad2da7a0c2fceec03a64f2e3dce62b76d60cc3b5 -size 6908 +oid sha256:f33542c1ed8daea7a7e432282af75b0f79bd24b78276b3d4613305d56974c280 +size 6741 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset index 9881178..ea6a8fd 100644 --- a/Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset +++ b/Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51add38e9398919780af8af75e5f944017c10e88f09ee464f060a28c6e3d5144 -size 29519 +oid sha256:3bee976efa9bc3f6872377af2525b9fb61595df96790c4635e9e9730e9478dd2 +size 31399 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset index 753997f..d9ba76b 100644 --- a/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset +++ b/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1479896b829191181ea1baeecac20d5b4501fcb670aabd2f2f6ba09fd78af4e7 -size 29730 +oid sha256:4decfec50fbfdafc0bb86cca8e5854a1339d7c38e5defedec96bd8b029fae71a +size 32560 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index d732232..550cb13 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b82b99b1f8e60eac8e199cc7adecff46cf1ea4dc1134aa03e25a98793133bb9e -size 138212 +oid sha256:daf074d26576c0c59567ebbc044edc0475e2e92c636ec8efcf86ad12f7b57839 +size 98874 diff --git a/Content/Blueprints/Quests/Quest_SistersPendant.uasset b/Content/Blueprints/Quests/Quest_SistersPendant.uasset index 35a3c03..dad18de 100644 --- a/Content/Blueprints/Quests/Quest_SistersPendant.uasset +++ b/Content/Blueprints/Quests/Quest_SistersPendant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d617efabb691daf8a5007996bed1bb226db5bfb1cf50695ff73422604c52194 +oid sha256:e44fd991be35e86dc731008c9af1f554897085e62856303ab87488b9b1a45711 size 7366 diff --git a/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset b/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset index a500bdc..0e22426 100644 --- a/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset +++ b/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61961e5d9cbbc13e36bbe3db62d9b26626bf71c0a28bb008e17c2380afbdfde0 +oid sha256:269dfc79171369a42f5ecb2985027713bf65b305eab11b4024c5eb61105ac9b5 size 7395 diff --git a/Content/Dialogue/SM_Merchant_Blueprint.uasset b/Content/Dialogue/SM_Merchant_Blueprint.uasset index c0026c0..c399fdc 100644 --- a/Content/Dialogue/SM_Merchant_Blueprint.uasset +++ b/Content/Dialogue/SM_Merchant_Blueprint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a7bec9951b82b618fbc983c556342f661ded8d07ce021f63458865b343c236e -size 144185 +oid sha256:ba233bc3fec093588e41e77e8da6ec10b6bc69153f753d0eaed077f6f3c5add5 +size 144390 diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp index 40ea61b..889b172 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp @@ -7,7 +7,7 @@ UBaseItem::UBaseItem() { ItemDisplayName = FText::FromString("ItemName"); - ItemUseAction = FText::FromString("UseAction"); + // ItemUseAction = FText::FromString("UseAction"); } void UBaseItem::Use(ATempCharacter* Character) diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 2cdcf5c..260b113 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -42,9 +42,9 @@ public: UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") FText ItemDisplayName; - //The description of the item - UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") - FText ItemDescription; + // //The description of the item + // UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") + // FText ItemDescription; //The cost of the item UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")