From 6fc9c24d125354cf27208f8d0fa42969817d5447 Mon Sep 17 00:00:00 2001 From: "adnan.mujkic" Date: Mon, 24 Aug 2026 22:15:05 +0200 Subject: [PATCH] Fixes for bazaar, make it 3 emotions, add some cards --- Content/Character/BP_BazarStaticCustomer.uasset | 4 ++-- Content/GameData/DA_BazaarSettings.uasset | 4 ++-- Content/Scripts/Bazar/BP_BazarSellingStand.uasset | 4 ++-- Content/Scripts/Bazar/WBP_BazaarHaggleCard.uasset | 4 ++-- Content/Scripts/Bazar/WBP_BazarScreen.uasset | 4 ++-- Source/ProjectEleri/Data/BazarSettingsDataAsset.h | 6 ------ 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Content/Character/BP_BazarStaticCustomer.uasset b/Content/Character/BP_BazarStaticCustomer.uasset index 463fcd24..a6701e9e 100644 --- a/Content/Character/BP_BazarStaticCustomer.uasset +++ b/Content/Character/BP_BazarStaticCustomer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8960cad6eaea75798f40ad452256424f469146e125079f4e8eaf33d5603a8794 -size 225619 +oid sha256:9e03a5890877aa7a18962cb16e0378acf850764650f4c9854fe14d5e2dab2967 +size 214067 diff --git a/Content/GameData/DA_BazaarSettings.uasset b/Content/GameData/DA_BazaarSettings.uasset index 34bf2016..12105e17 100644 --- a/Content/GameData/DA_BazaarSettings.uasset +++ b/Content/GameData/DA_BazaarSettings.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44af01a4af3af107d80e405054e9f4df846f30ff571cbc8de2c805b9331a1a8c -size 6179 +oid sha256:6f5cc420900a69d731edc0fc7baff82dfeba2592c400a8497c1826454195a99d +size 12663 diff --git a/Content/Scripts/Bazar/BP_BazarSellingStand.uasset b/Content/Scripts/Bazar/BP_BazarSellingStand.uasset index a6e95acb..f13f7389 100644 --- a/Content/Scripts/Bazar/BP_BazarSellingStand.uasset +++ b/Content/Scripts/Bazar/BP_BazarSellingStand.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:384ec178610dbbac692307b95b3351affe9fa98b7e3ddd7328a4490ffa44736d -size 1110244 +oid sha256:571ac58f11f347ab0e85595387a5c51b09b23d8ef9d4acfaf273a8031bf40606 +size 1117360 diff --git a/Content/Scripts/Bazar/WBP_BazaarHaggleCard.uasset b/Content/Scripts/Bazar/WBP_BazaarHaggleCard.uasset index 3081b8ec..5a42e839 100644 --- a/Content/Scripts/Bazar/WBP_BazaarHaggleCard.uasset +++ b/Content/Scripts/Bazar/WBP_BazaarHaggleCard.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0aa191131eb01ecbfaab6ac87ee5ed769647af44e17236b193162503a8322152 -size 223458 +oid sha256:d32439ec788117f7c4feb323eb3d7cd66fe2cd1bc6d918be80e6b3d375d5fb50 +size 170840 diff --git a/Content/Scripts/Bazar/WBP_BazarScreen.uasset b/Content/Scripts/Bazar/WBP_BazarScreen.uasset index ecee2f9b..9b090a5e 100644 --- a/Content/Scripts/Bazar/WBP_BazarScreen.uasset +++ b/Content/Scripts/Bazar/WBP_BazarScreen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c58d2d8df3b8f65545edc077f778ca104e2528ab31787d9f2710581290182fd -size 546509 +oid sha256:3f142d7ddb1c5d97776c6d963ef95acb05f72a45ffc10860d2cc21da8033981d +size 506523 diff --git a/Source/ProjectEleri/Data/BazarSettingsDataAsset.h b/Source/ProjectEleri/Data/BazarSettingsDataAsset.h index 5aa0991f..086ac59d 100644 --- a/Source/ProjectEleri/Data/BazarSettingsDataAsset.h +++ b/Source/ProjectEleri/Data/BazarSettingsDataAsset.h @@ -12,8 +12,6 @@ enum class EBazarNpcEmotion: uint8 Trust, Excitement, Comfort, - Pride, - Curiosity, MAX UMETA(Hidden) }; @@ -65,10 +63,6 @@ struct FBazaarHaggleCardData int32 ExcitementModifier; UPROPERTY(EditAnywhere, BlueprintReadWrite) int32 ComfortModifier; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 PrideModifier; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 CuriosityModifier; UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (UIMin = "0", ClampMin = "0", UIMax = "20", ClampMax = "20")) int32 CardDifficulty;