diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/ABP_SaninSemiFinal.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/ABP_SaninSemiFinal.uasset index 52a0ddd3..8ac87a48 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/ABP_SaninSemiFinal.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/ABP_SaninSemiFinal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a478cc9b557c4ef401cd3ac8c07fac1dd8dbfe4797b785fc9079d83bcb3f3d2a -size 636369 +oid sha256:01bead1b67ce89de69bfb17fff14232c091627284790d04071c31ea5ae337af2 +size 599090 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset index 3b135a10..c476a25d 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef8ec881798ab6b2b0e479d572b58d6a89a49e5aeecb4d96568997e06f133f89 -size 396650 +oid sha256:257c8288aa9b97c165e9af1777bd48b2172b045c79a7381413c548281977d5ce +size 421326 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset index 0d98e62b..0b0194b3 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5984a7469a083e34a47b425128ee6fdafa46b974e6212f5df7d2650dafdadbd -size 255688 +oid sha256:ab7dcb4a119318020238d7d41dd67c9ef0f9fdfe8db50144bb27d7df35802bd7 +size 250752 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset index c59bd764..81627c30 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:711fa813a8addb7c7acc48592143925c9e4aaa08a0e617748364dcb74903f9af -size 980022 +oid sha256:717a4b4dd1caef22e9f970b5029b93cc3aa6c1051d21cbee64b580da6b51615b +size 948852 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Weapons/BP_HaesolHwando.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Weapons/BP_HaesolHwando.uasset index 532ea26b..a3d132d2 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Weapons/BP_HaesolHwando.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Weapons/BP_HaesolHwando.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9524d2592c1ef84dee9c21da950348acf4975b7825d47e8cab9d63d53fc22ed6 -size 52601 +oid sha256:84ca18a79dde46a1211aab1d6d64d94336cb4ce76fb92f668e36f098908acd54 +size 30643 diff --git a/hwanyoung2/Source/hwanyoung2/HYManualPickUp.cpp b/hwanyoung2/Source/hwanyoung2/HYManualPickUp.cpp index 7f642631..7ec7c6dc 100644 --- a/hwanyoung2/Source/hwanyoung2/HYManualPickUp.cpp +++ b/hwanyoung2/Source/hwanyoung2/HYManualPickUp.cpp @@ -12,7 +12,7 @@ AHYManualPickUp::AHYManualPickUp() ItemID = FName("No ID"); Super::Name = "Item"; - Super::Action = "Pick up"; + Super::Action = "pick up"; } void AHYManualPickUp::Interact_Implementation(APlayerController* Controller) @@ -22,5 +22,6 @@ void AHYManualPickUp::Interact_Implementation(APlayerController* Controller) AHYPlayerCharacController* IController = Cast(Controller); if (IController->AddItemToInventoryByID(ItemID)) Destroy(); + else UE_LOG(LogTemp, Warning, TEXT("Item not found.")) } diff --git a/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.cpp b/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.cpp index 249858f1..7868c9c1 100644 --- a/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.cpp +++ b/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.cpp @@ -3,6 +3,7 @@ #include "HYPlayerCharacController.h" #include "HYGameStateBase.h" +#include "Engine/DataTable.h" #include "hwanyoung2Character.h" AHYPlayerCharacController::AHYPlayerCharacController() diff --git a/hwanyoung2/Source/hwanyoung2/InventoryItem.h b/hwanyoung2/Source/hwanyoung2/InventoryItem.h index 6201e1b0..261fbb1b 100644 --- a/hwanyoung2/Source/hwanyoung2/InventoryItem.h +++ b/hwanyoung2/Source/hwanyoung2/InventoryItem.h @@ -49,6 +49,18 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) bool CanBeUsed; + //can this item be bought at the store? + UPROPERTY(EditAnywhere, BlueprintReadWrite) + bool CanBeBought; + + //is this a crafting item? + UPROPERTY(EditAnywhere, BlueprintReadWrite) + bool IsCraftItem; + + //is this a cooking item? + UPROPERTY(EditAnywhere, BlueprintReadWrite) + bool IsCookingItem; + UPROPERTY(EditAnywhere, BlueprintReadWrite) UTexture2D* ItemIcon;