diff --git a/Content/GameData/DA_BazaarSettings.uasset b/Content/GameData/DA_BazaarSettings.uasset index 577644d0..41f9121f 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:786094ba9d00790a7ef2115d8f6cc07c8effa1327815b50fab23f7b6c391cd16 -size 21420 +oid sha256:5c97c8bb7c7ba5d7c9fd921697f2e8fe52e01aa6bdcfcd39257e66be59f00194 +size 21737 diff --git a/Content/Scripts/Bazar/BP_BazarSellingStand.uasset b/Content/Scripts/Bazar/BP_BazarSellingStand.uasset index 542acaaf..52a6f138 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:9ac0b1f53a6ef9b5c303437ec1e7b59a9abc4b224487cb3d5c0a1edaeaa8591e -size 1148899 +oid sha256:d007d2b3653b74ddedf7e60346a98fbd4f6a18eb9043baf2e61e1c4d1248e8bd +size 1246437 diff --git a/Content/Scripts/Bazar/WBP_BazaarHaggleCard.uasset b/Content/Scripts/Bazar/WBP_BazaarHaggleCard.uasset index 5a42e839..a10f4206 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:d32439ec788117f7c4feb323eb3d7cd66fe2cd1bc6d918be80e6b3d375d5fb50 -size 170840 +oid sha256:7cfc4b65dd34c5cbcf37ba383adc44951fbc94da51e741d1a627ac82a8211e81 +size 205007 diff --git a/Content/Scripts/Bazar/WBP_BazaarUpgradeCard.uasset b/Content/Scripts/Bazar/WBP_BazaarUpgradeCard.uasset new file mode 100644 index 00000000..d0505e10 --- /dev/null +++ b/Content/Scripts/Bazar/WBP_BazaarUpgradeCard.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8eb35c1052b202b0d7324bd2aa076f5c0525387b6ae4e8cfa3020ca2d9a73ee0 +size 163027 diff --git a/Content/Scripts/Bazar/WBP_BazarScreen.uasset b/Content/Scripts/Bazar/WBP_BazarScreen.uasset index 9b090a5e..61153555 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:3f142d7ddb1c5d97776c6d963ef95acb05f72a45ffc10860d2cc21da8033981d -size 506523 +oid sha256:020896ce000ec7bb6c0237813c47bfaf76d26433ac63d4ba8a837175e21e2747 +size 731226 diff --git a/Content/UI/Modules/Buttons/UIM_SquareDefaultPaper.uasset b/Content/UI/Modules/Buttons/UIM_SquareDefaultPaper.uasset index 1b007fb1..b5a4173a 100644 --- a/Content/UI/Modules/Buttons/UIM_SquareDefaultPaper.uasset +++ b/Content/UI/Modules/Buttons/UIM_SquareDefaultPaper.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6cdadbc36727a9fc3dd92cbebee1e188212bfda005579aca2a46bfdc513b24a -size 151066 +oid sha256:49e9839a6f571ebb74a96beec26998c5dfa83c44e19e7083cb0cbb9c8439ecef +size 174859 diff --git a/Content/UI/W_DialogueImportant.uasset b/Content/UI/W_DialogueImportant.uasset index 2bd9ee0e..905f80fd 100644 --- a/Content/UI/W_DialogueImportant.uasset +++ b/Content/UI/W_DialogueImportant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb36c43790c72c5498a29d60cb4dbf3050ed575bf4f8b7425f44e8ab3dea55d4 -size 191148 +oid sha256:06a6ba216f582555d238d0f2c2e9b8839ff74a351951cbc4ffa812b520f44f53 +size 199362 diff --git a/ProjectEleri.uproject b/ProjectEleri.uproject index 380d0706..47c870de 100644 --- a/ProjectEleri.uproject +++ b/ProjectEleri.uproject @@ -118,6 +118,14 @@ { "Name": "GameplayStateTree", "Enabled": true + }, + { + "Name": "ModelContextProtocol", + "Enabled": true + }, + { + "Name": "MCPClientToolset", + "Enabled": true } ], "TargetPlatforms": [ diff --git a/Source/ProjectEleri/Bazar/BazarSellingStand.cpp b/Source/ProjectEleri/Bazar/BazarSellingStand.cpp index 62d39f03..4508a726 100644 --- a/Source/ProjectEleri/Bazar/BazarSellingStand.cpp +++ b/Source/ProjectEleri/Bazar/BazarSellingStand.cpp @@ -3,6 +3,8 @@ #include "BazarSellingStand.h" +#include "ProjectEleri/Data/BazarSettingsDataAsset.h" + void ABazarSellingStand::BeginPlay() { Super::BeginPlay(); @@ -12,3 +14,19 @@ void ABazarSellingStand::BeginPlay() })); } + +bool ABazarSellingStand::FindBazaarUpgrade(const FGameplayTag& Tag, FBazaarUpgradeData& OutUpgrade) +{ + if (!BazarSettingsDataAsset.IsValid()) return false; + + for (const FBazaarUpgradeData& Upgrade : BazarSettingsDataAsset->UpgradeArray) + { + if (Tag == Upgrade.UpgradeTag) + { + OutUpgrade = Upgrade; + return true; + } + } + + return false; +} diff --git a/Source/ProjectEleri/Bazar/BazarSellingStand.h b/Source/ProjectEleri/Bazar/BazarSellingStand.h index c5687626..119c24c3 100644 --- a/Source/ProjectEleri/Bazar/BazarSellingStand.h +++ b/Source/ProjectEleri/Bazar/BazarSellingStand.h @@ -6,6 +6,7 @@ #include "ProjectEleri/GameObjects/EleriBaseActor.h" #include "BazarSellingStand.generated.h" +struct FBazaarUpgradeData; class UBazarSettingsDataAsset; /** @@ -22,5 +23,10 @@ public: protected: virtual void BeginPlay() override; + +public: + + UFUNCTION(BlueprintPure, Category = "Bazaar") + bool FindBazaarUpgrade(const FGameplayTag& Tag, FBazaarUpgradeData& OutUpgrade); }; diff --git a/Source/ProjectEleri/Data/BazarSettingsDataAsset.cpp b/Source/ProjectEleri/Data/BazarSettingsDataAsset.cpp index a2d81bce..b75b016d 100644 --- a/Source/ProjectEleri/Data/BazarSettingsDataAsset.cpp +++ b/Source/ProjectEleri/Data/BazarSettingsDataAsset.cpp @@ -29,7 +29,7 @@ float UBazarSettingsDataAsset::GetUpgradeBenefitAmount(const FGameplayTag& Tag, { if (!Tag.IsValid() || Level > 10 || Level < 0) return 0.f; - for (auto Upgrade : UpgradeArray) + for (const FBazaarUpgradeData& Upgrade : UpgradeArray) { if (Tag == Upgrade.UpgradeTag) {