From 959723df6afe9bbc56fb7c1730bf469d6a686d78 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Thu, 13 Jun 2024 14:19:47 +0900 Subject: [PATCH 1/4] added buff/debuff related components and structs for future use --- .../Character/PlayerCharacter/BP_PlayerCharacterBase.uasset | 4 ++-- .../Illusions/GeneralizedBlueprints/AC_AttributeSystem.uasset | 3 +++ .../Illusions/GeneralizedBlueprints/I_Buffable.uasset | 3 +++ .../Illusions/GeneralizedBlueprints/S_AttributeSetInfo.uasset | 3 +++ hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap | 4 ++-- 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_AttributeSystem.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Buffable.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_AttributeSetInfo.uasset diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index 85850f97..5a1f8a6f 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d1d2c65b043905db5ae33468d9a33741460e101ed125cbdbe237eef575996a2 -size 289999 +oid sha256:8f26234e13545424677ca1c6916691f519f4aa47817dfacca4a5999c5b6e6bf9 +size 319364 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_AttributeSystem.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_AttributeSystem.uasset new file mode 100644 index 00000000..4ca9495c --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_AttributeSystem.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83ddb22a2848848b30595c2da3b79c14ff6287803dffbbbea51316f7d0fa2b6b +size 140244 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Buffable.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Buffable.uasset new file mode 100644 index 00000000..ca8a72ff --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Buffable.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:222e9e30a022f378e73d12feda9275862939abf669d2d57ff73c74243434f9ee +size 19729 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_AttributeSetInfo.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_AttributeSetInfo.uasset new file mode 100644 index 00000000..01888425 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_AttributeSetInfo.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70fa65b2a7d61d88da1f9c0b4e76b1661cdce39f7aba52b00f398f1df57d4106 +size 5805 diff --git a/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap b/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap index b8a16ce6..5c95a29d 100644 --- a/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap +++ b/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35757c2dabc9f8261c35b2e78c351f9ece732f6947dac5987195960cbe852dfc -size 52397 +oid sha256:9644a29a18fe16193b60eecccfcb1ee15c799012bcf1f9b288f2bb11240e647f +size 50728 From 7c5833f0337d1cf7560c70ba583cf4891cdec004 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Mon, 17 Jun 2024 23:38:43 +0900 Subject: [PATCH 2/4] implemented pick up item --- .../BP_HYPlayerCharacController.uasset | 4 +-- .../BP_PlayerCharacterBase.uasset | 4 +-- .../Playables/Haesol/NewAnimMontage.uasset | 4 +-- .../Illusions/Assets/Icons/M_FoxMarble.uasset | 3 +++ .../Assets/Meshes/medicine_bowl.uasset | 4 +-- .../AC_AttributeSystem.uasset | 4 +-- .../GeneralizedBlueprints/AC_HPSystem.uasset | 4 +-- .../GeneralizedBlueprints/AC_MPSystem.uasset | 4 +-- .../BP_ManualPickUpItemBase.uasset | 4 +-- .../GeneralizedBlueprints/I_Buffable.uasset | 4 +-- .../GeneralizedBlueprints/I_Damagable.uasset | 4 +-- .../GeneralizedBlueprints/I_ManaUser.uasset | 4 +-- .../ItemBP/BP_FoxMarble.uasset | 4 +-- .../ItemBP/BP_Gochugaru.uasset | 4 +-- .../S_AttributeSetInfo.uasset | 4 +-- .../GeneralizedBlueprints/S_DamageInfo.uasset | 4 +-- .../Interactables/ItemDataTable.uasset | Bin 2929 -> 129 bytes .../Hwanyoung/UI/BP_InventoryHUDWidget.uasset | 4 +-- .../Hwanyoung/UI/BP_InventoryWidget.uasset | 4 +-- .../Characters/Meshs/SKEL_Soldier_1.uasset | 4 +-- .../ThirdPerson/Maps/ThirdPersonMap.umap | 4 +-- .../0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset | 4 +-- .../5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset | 4 +-- .../Source/hwanyoung2/HYInteractableActor.cpp | 2 +- .../Source/hwanyoung2/HYInteractableActor.h | 2 +- .../Source/hwanyoung2/HYManualPickUp.cpp | 2 +- .../hwanyoung2/HYPlayerCharacController.h | 9 ++++--- hwanyoung2/Source/hwanyoung2/InventoryItem.h | 4 +++ hwanyoung2/Source/hwanyoung2/hwanyoung2.h | 19 ++++--------- .../Source/hwanyoung2/hwanyoung2Character.cpp | 25 +++++++++--------- 30 files changed, 74 insertions(+), 76 deletions(-) create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Icons/M_FoxMarble.uasset diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset index 2983e8c4..4ff684e6 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:763233cafddc81163e6c32aafaf3b45832d4f3554c79d341a9046d1a8ee3e616 -size 70959 +oid sha256:3691d5238eae21a7d273ae1e582d707c0c7e85b0a51a30cb0487a960234d6c4b +size 71725 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index 5a1f8a6f..166edb72 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f26234e13545424677ca1c6916691f519f4aa47817dfacca4a5999c5b6e6bf9 -size 319364 +oid sha256:297c7a5aa6d0b7d7fe9be41fd769021baf56d416a4933d93a3bd252c79c2eda1 +size 330823 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset index cd5c0166..3c836f6a 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0421463ddbc5386e144a096a637947215efa67c6c1a914a4565f5951397781a5 -size 11087 +oid sha256:8a3e9063efe72119070a02df993830232247be3b3481e3a0eb676adcde536151 +size 11082 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Icons/M_FoxMarble.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Icons/M_FoxMarble.uasset new file mode 100644 index 00000000..0675b53a --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Icons/M_FoxMarble.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da60b6fe0f21b62d2dfa58f12c424a9c3a7adf9d65c0005b53d5b2d7a21ccf31 +size 893399 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_bowl.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_bowl.uasset index f994d4d1..a18188bf 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_bowl.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_bowl.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e35412f7bb7259f718bb87504b2a4aabd5635529ffb5ad25c7df74121ff544f -size 24188 +oid sha256:85213fe2487e364464af22354508c8eb79c212731ac97485a709954226dfd800 +size 24677 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_AttributeSystem.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_AttributeSystem.uasset index 4ca9495c..9bb38c3e 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_AttributeSystem.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_AttributeSystem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83ddb22a2848848b30595c2da3b79c14ff6287803dffbbbea51316f7d0fa2b6b -size 140244 +oid sha256:72d7b0b71b8f4595d1e8078d78c96a5caff1c8fe2b78483be2573712c1642233 +size 176418 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset index bec79b6a..25bc8992 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55dfb2113eb15bb74796845f1a1bdd756780210854f951e857dbe6e89fa2b73c -size 138084 +oid sha256:b6c8a4421814852216593494af60638b97941d9d2709ce5535a33d9cdcd4509e +size 141244 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_MPSystem.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_MPSystem.uasset index 7d96ff5c..96953b55 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_MPSystem.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_MPSystem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12d9deda63ac5add31792bb4f5b6e03facf11df9a11ecfc5f31d9edbaf907202 -size 72027 +oid sha256:e810e67a0f1c013888e6dcf890519006c5c832c5009b0ad3619e70bf4f0b76c4 +size 58612 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/BP_ManualPickUpItemBase.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/BP_ManualPickUpItemBase.uasset index f57cc660..758b3806 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/BP_ManualPickUpItemBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/BP_ManualPickUpItemBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3a67bed4b6d9ccdfcf8967804b4762eb3c8c7f857c2d5a085fbd5a45e08f6de -size 23197 +oid sha256:f23b42c6963a66462b4386668a553725e46e408821c80df1cdbdf45b0b2ab3d0 +size 39059 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Buffable.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Buffable.uasset index ca8a72ff..9e48fe6a 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Buffable.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Buffable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:222e9e30a022f378e73d12feda9275862939abf669d2d57ff73c74243434f9ee -size 19729 +oid sha256:f7acabdd545c82c57d080aad3cf7741c40c9b43a84f861de235b9f84a752c656 +size 19689 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Damagable.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Damagable.uasset index 455cebb5..90ad5f22 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Damagable.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_Damagable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5aa0089d4cc16310210c19734cf7bc972943f4dff09ecee0eb2c229bb83ed2c8 -size 25786 +oid sha256:6a7122f51fe3fdccfe40440d92205de882fc12d88afd966772c87e9e30b7e268 +size 25236 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_ManaUser.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_ManaUser.uasset index 4f41a126..30dcaefd 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_ManaUser.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_ManaUser.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c2386cd9fd842c7752d6e49545987519837ed80c713b84556dd501bc8e2390b -size 23522 +oid sha256:1cc4af385c56be65ee405ee23f33e10aeb7cc5c9034855521c97fd1f977641f3 +size 22858 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset index a368f36c..4c0e3673 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:380b98ce24f9a1acaed18375351f913798a42b9d391fed4efbbec91e2da7cb14 -size 36049 +oid sha256:335eb111d05b601594f328d690fa800a06bd364d19d5d50a0cf8ed8589524ed7 +size 34920 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset index 83cf903b..badbd059 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82f4eb93480e92a3535969665b879b22a7380d74d8d0d4e927e7ae9a627f0de0 -size 35023 +oid sha256:9b483026a4f3baa982fa8a9ebdb5b0cdee55d7efe044f78a856ba259f0b44d64 +size 35121 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_AttributeSetInfo.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_AttributeSetInfo.uasset index 01888425..bb6b5233 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_AttributeSetInfo.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_AttributeSetInfo.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70fa65b2a7d61d88da1f9c0b4e76b1661cdce39f7aba52b00f398f1df57d4106 -size 5805 +oid sha256:11958b1b4660f1330c2403b6579dbf87ebd287320e8553b761ca0fe20e74d1e4 +size 6694 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_DamageInfo.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_DamageInfo.uasset index e01e6aa1..55280438 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_DamageInfo.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/S_DamageInfo.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:259e88cd813663e1cdf54018b4080d428adc0c73fa03860e89a5fb442b766d41 -size 12205 +oid sha256:a2bdacc50361cc25fc79920ef94890621192b3f2cce161c56f48a8eb6b6fb29c +size 10312 diff --git a/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset b/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset index 8733536ce981dbd871c27f2e6421ef8420d60f31..e46acb60c3e3a0e8109e7c9859c9b99fd2d18be3 100644 GIT binary patch literal 129 zcmWN@OA^8$3;@tQr{DsXUr404kr0F#m5#JsczU~f@09QC+rvj(3;Gl?BVYoqj>sizA&{%q5enr(nI(xAh_M0%z&rbRCHkBy Ls@Z>{AqKDhlS?Ko literal 2929 zcmb_eYitx%6uz}vEsttJ>jSK|lBlI+AKl&VZdGt+ccyNIK4{S&q=8|3)2?oJHoMc7 zH6cL-QXhYKBqn10f#MHCA_)XyYGNQIQ4@cFiKzAUqb5qC(Nay-mU_OKx!djTVkPn0 z?3{bgJ#+4P-E-&Mi|gNb^vc%_>sAr( z=l+wEKS@WXSA69<793OT4-@aBa>g2nI$G2L?s#HYO=PseM4uy)(0NLY>gujIPdg$y z9|)_u+Knkm+t>s2e7=Mp1l7h^Em7GQ4tV^s+v5$$vfJrZ6rV>5`-5J|t$1axY#0V% z*g1YPW491JQO4LL283y%_}j>+1DmcoUmcSphaDw#&4=7qTbIr4RDQ1s?`yua=i{eN zy^Fn}2Zoff68e35CSJ0dX7%;kWN-ae9_MPBZ}8e(#yVrE%R8>KPA?f)YrpV01`V|T zV=GLacv76_5v;q35wzBBr?I0enu;ZLN52SNBOBjTQ%&A6C&9%cU31@6;-z$&>yd$^ zmeLVQ_T!1p?&X5tM$u>SS2nJ!AdaMI@s5<1Qt4c-t> z=vpd+{IKBbL+i1Tku07z%!+9Vw(9+NzF21QBT-^JIMp6S#32|7v!3&3ro_5o$F-I( z_rpW1Kh0x({W=@Hc-{lku%0#Jg{ksZ=xO7_TeV?UT5)=UlF8b%1ZUHw7b{w7e1}kmYo!dcPs-udARiEYqCQQ$(pC2arH=0pX8iPOYcmbuCSn?94?vyNI!%LNk=& s8yA4?rQ*fT(Z};^e;nUye`Ne33Q9CjC;*1O^>^An`LNDuP7V2g0RPT2H2?qr diff --git a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset index e943e568..13e6775e 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa45baf2eab15863620f632bae2f58eb615a36a398d8a11d10de07e7120dabba -size 92789 +oid sha256:8bcf4ee07bfa31052bda30d6020acd715850b4fb0b2c1ea321c6981543f939de +size 92836 diff --git a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryWidget.uasset b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryWidget.uasset index b7d6b862..e7998970 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryWidget.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d55293cebaf1aadb318baa3ce74cd7a75e1ae78fcb3353378e106af92131c407 -size 45242 +oid sha256:867386b569cc5c010f99a35cc8c5044dcc8f87314b7e6ed4d418e6d278f46954 +size 62457 diff --git a/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKEL_Soldier_1.uasset b/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKEL_Soldier_1.uasset index ec1790ff..4629fb4a 100644 --- a/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKEL_Soldier_1.uasset +++ b/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKEL_Soldier_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b918ef0b810667f5764cf52324d1631439ba09ab546554528cbf9ffa0c13cc51 -size 49779 +oid sha256:5dcc891c1718e2b9267a90440c0bbf2b6c0014e058edfac2a89c1b0cd46df94b +size 50725 diff --git a/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap b/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap index 5c95a29d..e78b43b5 100644 --- a/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap +++ b/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9644a29a18fe16193b60eecccfcb1ee15c799012bcf1f9b288f2bb11240e647f -size 50728 +oid sha256:b6f09e356abb9b01ee918be7038d3ab6d768c0b06c8156dd19b9635958459ac1 +size 52372 diff --git a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset index 02c6a530..5b40ec2e 100644 --- a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset +++ b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e1db54012a08dd1b0059b82d1176f377788854ac39c63dd777e300cb8e6887b -size 3557 +oid sha256:b592ee98547c7e865ea81839f389248bfca79a99cfe259202b6f4f2f5cbc7e8f +size 3632 diff --git a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset index 35bd94c0..ba62773a 100644 --- a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset +++ b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2908d106f3228cbd523202857924714ae27d4c8a32dab57244ca73bedcefe282 -size 3557 +oid sha256:85400bb0ed8c0750598b074f41855266217c2adabe06b4dd267809223bd473c7 +size 3632 diff --git a/hwanyoung2/Source/hwanyoung2/HYInteractableActor.cpp b/hwanyoung2/Source/hwanyoung2/HYInteractableActor.cpp index c9f7ebe0..2eeea24c 100644 --- a/hwanyoung2/Source/hwanyoung2/HYInteractableActor.cpp +++ b/hwanyoung2/Source/hwanyoung2/HYInteractableActor.cpp @@ -18,7 +18,7 @@ void AHYInteractableActor::Interact_Implementation(APlayerController* Controller FString AHYInteractableActor::GetInteractText() const { - return FString::Printf(TEXT("s%: Press F to %s"), *Name, *Action); + return FString::Printf(TEXT("%s: Press F to %s"), *Name, *Action); } // Called when the game starts or when spawned diff --git a/hwanyoung2/Source/hwanyoung2/HYInteractableActor.h b/hwanyoung2/Source/hwanyoung2/HYInteractableActor.h index cc2f9ee4..295b7d7b 100644 --- a/hwanyoung2/Source/hwanyoung2/HYInteractableActor.h +++ b/hwanyoung2/Source/hwanyoung2/HYInteractableActor.h @@ -30,7 +30,7 @@ public: UPROPERTY(EditDefaultsOnly) FString Action; - UFUNCTION(Blueprintcallable, Category = "Pickup") + UFUNCTION(BlueprintCallable, Category = "Pickup") FString GetInteractText() const; protected: diff --git a/hwanyoung2/Source/hwanyoung2/HYManualPickUp.cpp b/hwanyoung2/Source/hwanyoung2/HYManualPickUp.cpp index f8627114..7f642631 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 = "pickup"; + Super::Action = "Pick up"; } void AHYManualPickUp::Interact_Implementation(APlayerController* Controller) diff --git a/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.h b/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.h index 42df68d5..4aa47006 100644 --- a/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.h +++ b/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.h @@ -31,7 +31,7 @@ public: UFUNCTION(BlueprintCallable, Category = "Utils") bool AddItemToInventoryByID(FName ID); - UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + UPROPERTY(BlueprintReadWrite, VisibleAnywhere) class AHYInteractableActor* CurrentInteractable; UPROPERTY(VisibleAnywhere, BlueprintReadWrite) @@ -43,14 +43,15 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) int32 InventoryWeightLimit; + //interacts with the Interactable objects + UFUNCTION(BlueprintCallable, Category = "Utils") + void Interact(); + #pragma endregion protected: - //interacts with the Interactable objects - void Interact(); - //abstract function to override in order to //bind actions or axis to different input components virtual void SetupInputComponent() override; diff --git a/hwanyoung2/Source/hwanyoung2/InventoryItem.h b/hwanyoung2/Source/hwanyoung2/InventoryItem.h index a3c6ea90..1a61a4a6 100644 --- a/hwanyoung2/Source/hwanyoung2/InventoryItem.h +++ b/hwanyoung2/Source/hwanyoung2/InventoryItem.h @@ -5,6 +5,7 @@ #include "CoreMinimal.h" #include "GameFramework/Actor.h" #include "Engine/DataTable.h" +#include "HYManualPickUp.h" #include "InventoryItem.generated.h" /** @@ -22,6 +23,9 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) FName ItemID; + UPROPERTY(EditAnywhere, BlueprintReadWrite) + TSubclassOf ItemPickup; + //name of the item UPROPERTY(EditAnywhere, BlueprintReadWrite) FText ItemName; diff --git a/hwanyoung2/Source/hwanyoung2/hwanyoung2.h b/hwanyoung2/Source/hwanyoung2/hwanyoung2.h index 20b6aa71..18f185a0 100644 --- a/hwanyoung2/Source/hwanyoung2/hwanyoung2.h +++ b/hwanyoung2/Source/hwanyoung2/hwanyoung2.h @@ -2,19 +2,10 @@ #pragma once +#ifndef _HWANYOUNG2_H__ +#define _HWANYOUNG2_H__ #include "CoreMinimal.h" -UENUM(BlueprintType) -enum class EAbilityInputID : uint8 -{ - None UMETA(DisplayName = "None"), //no input given - Confirm UMETA(DisplayName = "Confirm"), - Cancel UMETA(DisplayName = "Cancel"), - UseWeapon UMETA(DisplayName = "Use Weapon"), //using melee weapon to attack - SwitchWeapon UMETA(DisplayName = "Switch Weapons"), //switching weapons - UseActive1 UMETA(DisplayName = "Use Active Skill 1"), //active 1 - UseActive2 UMETA(DisplayName = "Use Active Skill 2"), //active 2 - UseActive3 UMETA(DisplayName = "Use Active Skill 3"), //active 3 - UseUlt UMETA(DisplayName = "Use Ultimate Skill"), //ult - PassiveDash UMETA(DisplayName = "Dash") //dash (passive) -}; \ No newline at end of file +#define COLLISION_INTERACTABLE ECC_GameTraceChannel1; + +#endif diff --git a/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.cpp b/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.cpp index 01d9018e..77720d47 100644 --- a/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.cpp +++ b/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.cpp @@ -63,7 +63,7 @@ void Ahwanyoung2Character::CheckForInteractables() FHitResult HitResult; // The range of area the system should check for interactables - int32 Range = 500; //this can be changed + int32 Range = 800; //this can be changed //The start of the trace is the transform of the follow camera FVector StartTrace = FollowCamera->GetComponentLocation(); @@ -80,22 +80,21 @@ void Ahwanyoung2Character::CheckForInteractables() //object attached to the character and cast it as player character controller class AHYPlayerCharacController* IController = Cast(GetController()); - if (IController) { - //Checking if something is hit by the line cast within the range - if (GetWorld()->LineTraceSingleByChannel(HitResult, StartTrace, EndTrace, - ECC_Visibility, QueryParams)) { + + //Checking if something is hit by the line cast within the range + if (GetWorld()->LineTraceSingleByChannel(HitResult, StartTrace, EndTrace, + ECC_Visibility, QueryParams)) { - //Cast the actor to AInteractable - AHYInteractableActor* Interactable = Cast(HitResult.GetActor()); - - if (Interactable) { - IController->CurrentInteractable = Interactable; - return; - } + //Cast the actor to AInteractable + if (AHYInteractableActor* Interactable = Cast(HitResult.GetActor())) { + IController->CurrentInteractable = Interactable; + return; } - + } else { IController->CurrentInteractable = nullptr; } + + } From 037d5442a526ff3e5cc3e39c01c286ca18df1f1a Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Sat, 22 Jun 2024 09:55:29 +0900 Subject: [PATCH 3/4] inventory shows collected items, new anim BPs are created and modified for combat system --- .../Content/Characters/Mannequins/Animations/ABP_Manny.uasset | 4 ++-- hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset | 4 ++-- .../Character/PlayerCharacter/BP_PlayerCharacterBase.uasset | 4 ++-- .../Input/InputMappingContexts/BP_DefaultInputContext.uasset | 2 +- .../Playables/Haesol/Animations/BP_AnimHaesolMelee.uasset | 3 +++ .../Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset | 3 +++ .../Playables/Haesol/Animations/NewBlendSpace.uasset | 3 +++ .../Playables/Haesol/BP_AnimHaesolMelee.uasset | 3 --- .../PlayerCharacter/Playables/Haesol/BP_Haesol.uasset | 3 +++ .../PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset | 3 --- .../Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset | 4 ++-- .../Illusions/GeneralizedBlueprints/AC_HPSystem.uasset | 4 ++-- .../GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset | 4 ++-- .../GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset | 4 ++-- .../Content/Hwanyoung/Interactables/ItemDataTable.uasset | 4 ++-- hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset | 4 ++-- hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset | 4 ++-- .../Content/Hwanyoung/UI/BP_InventoryItemToolTip.uasset | 4 ++-- .../Animations/Hwando/Anim_Hwando_Walk_Soldier.uasset | 4 ++-- .../Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset | 2 +- .../Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset | 2 +- 21 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_AnimHaesolMelee.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/NewBlendSpace.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset diff --git a/hwanyoung2/Content/Characters/Mannequins/Animations/ABP_Manny.uasset b/hwanyoung2/Content/Characters/Mannequins/Animations/ABP_Manny.uasset index a0f1c835..ffa3ea89 100644 --- a/hwanyoung2/Content/Characters/Mannequins/Animations/ABP_Manny.uasset +++ b/hwanyoung2/Content/Characters/Mannequins/Animations/ABP_Manny.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d024d66f3a543739fffc97adc1727f1ba8693886151d965aad25d2a1bf59f2c6 -size 372033 +oid sha256:0731ab856928284ce2d86453a611e33c33455128d9ae7ddcf6b122b1122d3bea +size 372181 diff --git a/hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset b/hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset index 65636b93..6f9bbc3d 100644 --- a/hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset +++ b/hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:977f1644c589b81d8aa33f325287ce73332ff257349757fafd6122dadfee17b5 -size 20055 +oid sha256:27a0fd8b8d875aa40b1caff420aee7d7c8e418302bdf6fa13b8da2952b1e8b3c +size 20046 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index 166edb72..8c8f02fb 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:297c7a5aa6d0b7d7fe9be41fd769021baf56d416a4933d93a3bd252c79c2eda1 -size 330823 +oid sha256:a1929b57461021cd7ae943c18f98d87f30e3846c5350bd24899b6c038d50b76a +size 342751 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_DefaultInputContext.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_DefaultInputContext.uasset index 7cfd43dc..003d98cf 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_DefaultInputContext.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_DefaultInputContext.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cf4ec31ced0d0d23d7aa0fe9070fcdcb5f11b75b487c15f1382237b5a97891f +oid sha256:ff46d646bbf7947f78730024b81568280f0d38b401212dacb6b858e24f72d9b9 size 17570 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_AnimHaesolMelee.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_AnimHaesolMelee.uasset new file mode 100644 index 00000000..2a74475e --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_AnimHaesolMelee.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f289a1fdbd2cbfcb3692d1d83e09ca4a0155d655ad708622caac5dfafc1c19ac +size 216981 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset new file mode 100644 index 00000000..176e9ff7 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5aece608b017514f471563d6292834b24298853ae5bec5cd04621e0f48ebba2a +size 24317 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/NewBlendSpace.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/NewBlendSpace.uasset new file mode 100644 index 00000000..4fca4053 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/NewBlendSpace.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2aa24d31df581ff45fe83b7f15d6b6f4d7c97645950c1e5ea4c53c51ce7700a +size 8219 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset deleted file mode 100644 index 0431c19c..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cb6a9ee136709c4b6b7994e7563ecb648012f52d4bbc723fc3b266b1bd4004a -size 217081 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset new file mode 100644 index 00000000..12d0f897 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a164c31ff6382f968292eefd4e4455d14b406fb29968eed2d8878924fdda5df8 +size 87987 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset deleted file mode 100644 index 3c836f6a..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a3e9063efe72119070a02df993830232247be3b3481e3a0eb676adcde536151 -size 11082 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset index a8ae7f56..fbb3add8 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d3bc57bc25ec33c44faf985bc815b3a058f143c67ab88e3242c5527aee9cfc6 -size 56376 +oid sha256:e1aa68b0b213d7e83397b753958a3efda3824a9cc8458b07dc992279e0af69a0 +size 151807 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset index 25bc8992..7d3cd101 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6c8a4421814852216593494af60638b97941d9d2709ce5535a33d9cdcd4509e -size 141244 +oid sha256:d2cbe95c0f92c718b1e591064be46b919b6111f3f8c77562b8a2535a781e1fb9 +size 140590 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset index 4c0e3673..bc7e85d2 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:335eb111d05b601594f328d690fa800a06bd364d19d5d50a0cf8ed8589524ed7 -size 34920 +oid sha256:75523ec3eb21701ce85a151bbc334c957e67451ef058cd7686c4ef47943ed8b4 +size 34910 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset index badbd059..e2052160 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b483026a4f3baa982fa8a9ebdb5b0cdee55d7efe044f78a856ba259f0b44d64 -size 35121 +oid sha256:455047dce51e6b4e5f4ff1e7d1e96db860b0fa8523e0a500926f9828db8661bc +size 35112 diff --git a/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset b/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset index e46acb60..be750cce 100644 --- a/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset +++ b/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6293bc64694cf17719004371f0176e7bd7bce9e2e455f473468c2547352b9f6 -size 4532 +oid sha256:616b0b02b3e10bef9065a45dd4826cc01a81bddc11856ad88ab80d01095ba6e1 +size 4640 diff --git a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset index 13e6775e..1923919b 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bcf4ee07bfa31052bda30d6020acd715850b4fb0b2c1ea321c6981543f939de -size 92836 +oid sha256:4c15c8408ac6c3be70b358ce57d54a5181333517a89b1b771e25870405ee7bee +size 96447 diff --git a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset index ff257674..beff28bb 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9ec5b4048607c20918809ff6682a377dc6ed4deec20b86bc55e6e47f4c0a3f9 -size 98690 +oid sha256:6d697f13446bf0de3f79a721d04fcc80300f257ddab956864befba0d41b5ced0 +size 100244 diff --git a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemToolTip.uasset b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemToolTip.uasset index b62600b9..dca1ffa9 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemToolTip.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemToolTip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ff9feaa28f7c42a1e942806b246c970e509520a33d9a0ed9bab6be01839577d -size 60331 +oid sha256:cef16da4eb26b899540e4dc7f09e5d450623d3acda952771a2c4132b8f8128c9 +size 63735 diff --git a/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Walk_Soldier.uasset b/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Walk_Soldier.uasset index e47f8ab0..1e1920d9 100644 --- a/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Walk_Soldier.uasset +++ b/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Walk_Soldier.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:faf67968765893e3d2e54bc0823779a40834d0345773112fcc3bb9a6db2926bc -size 297722 +oid sha256:cb47edcfc8b275ff8460d550586eabcc95db348b34ba09424ce578878e641384 +size 276529 diff --git a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset index 5b40ec2e..6ba0e871 100644 --- a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset +++ b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b592ee98547c7e865ea81839f389248bfca79a99cfe259202b6f4f2f5cbc7e8f +oid sha256:b76d00779b1014dfb0f0a548c4adf4655b0c5a2cae0e1825bec7561dd466d4d8 size 3632 diff --git a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset index ba62773a..ebd68fea 100644 --- a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset +++ b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85400bb0ed8c0750598b074f41855266217c2adabe06b4dd267809223bd473c7 +oid sha256:477883f3086e73df2cf6da982367610a5e6bcb41aec6712f0a0ac1e5ac2335a9 size 3632 From 6846c027f1aaad466af8bcc54b01ee6debb8b6cb Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Sat, 22 Jun 2024 09:55:52 +0900 Subject: [PATCH 4/4] ^ --- hwanyoung2/Source/hwanyoung2/CraftingInfo.cpp | 5 +++ hwanyoung2/Source/hwanyoung2/CraftingInfo.h | 40 +++++++++++++++++++ hwanyoung2/Source/hwanyoung2/InventoryItem.h | 14 ++++++- 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 hwanyoung2/Source/hwanyoung2/CraftingInfo.cpp create mode 100644 hwanyoung2/Source/hwanyoung2/CraftingInfo.h diff --git a/hwanyoung2/Source/hwanyoung2/CraftingInfo.cpp b/hwanyoung2/Source/hwanyoung2/CraftingInfo.cpp new file mode 100644 index 00000000..4e8a23e9 --- /dev/null +++ b/hwanyoung2/Source/hwanyoung2/CraftingInfo.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "CraftingInfo.h" + diff --git a/hwanyoung2/Source/hwanyoung2/CraftingInfo.h b/hwanyoung2/Source/hwanyoung2/CraftingInfo.h new file mode 100644 index 00000000..0acae582 --- /dev/null +++ b/hwanyoung2/Source/hwanyoung2/CraftingInfo.h @@ -0,0 +1,40 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Engine/DataTable.h" +#include "CraftingInfo.generated.h" + +/** + * + */ +USTRUCT(BlueprintType) +struct FCraftingInfo : public FTableRowBase +{ + GENERATED_BODY(); + +public: + + //unique ID of item that is being used to create the item + UPROPERTY(EditAnywhere, BlueprintReadWrite) + FName ComponentID; + + //unique ID of the item that gets created + UPROPERTY(EditAnywhere, BlueprintReadWrite) + FName ProductID; + + //do we want to destroy the component? + UPROPERTY(EditAnywhere, BlueprintReadWrite) + bool bDestroyItemA; + + // + UPROPERTY(EditAnywhere, BlueprintReadWrite) + bool bDestroyItemB; + + bool operator==(const FCraftingInfo& OtherItem) const { + return ComponentID == OtherItem.ComponentID; + } + + +}; \ No newline at end of file diff --git a/hwanyoung2/Source/hwanyoung2/InventoryItem.h b/hwanyoung2/Source/hwanyoung2/InventoryItem.h index 1a61a4a6..f81e44f2 100644 --- a/hwanyoung2/Source/hwanyoung2/InventoryItem.h +++ b/hwanyoung2/Source/hwanyoung2/InventoryItem.h @@ -6,10 +6,11 @@ #include "GameFramework/Actor.h" #include "Engine/DataTable.h" #include "HYManualPickUp.h" +#include "CraftingInfo.h" #include "InventoryItem.generated.h" /** - * + * Represents an item that can be added to player's inventory */ USTRUCT(BlueprintType) struct FInventoryItem : public FTableRowBase @@ -23,6 +24,7 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) FName ItemID; + //queue of items that are dropped and spawned back into the world UPROPERTY(EditAnywhere, BlueprintReadWrite) TSubclassOf ItemPickup; @@ -39,13 +41,21 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) bool OnlyDropped; + //can this item be consumed/used? + UPROPERTY(EditAnywhere, BlueprintReadWrite) + bool CanBeUsed; + UPROPERTY(EditAnywhere, BlueprintReadWrite) UTexture2D* ItemIcon; UPROPERTY(EditAnywhere, BlueprintReadWrite) FText ItemDescription; + ////all the possible crafting combinations for this particular item + UPROPERTY(EditAnywhere, BlueprintReadWrite) + TArray CraftCombinations; + bool operator==(const FInventoryItem& OtherItem) const { return ItemID == OtherItem.ItemID; } -}; +}; \ No newline at end of file