Bazaar new minigame which replaces old minigame

Content/GameData/CSV/PotionDatabase.csv

@@ -1,11 +1,11 @@
 Id,Name,Heal,Poison,Enhance,Conjure,Celestial,Element,Cost,Effectiveness
-P_Healing Tonic,Healing Tonic,4.00,,,,,Light,,4.00
+P_Healing Tonic,Healing Tonic,4,,,,,Light,35,4
-P_Potion of Purging,Potion of Purging,9.00,,2.00,,,Light,,11.00
+P_Potion of Purging,Potion of Purging,9,,2,,,Light,50,11
-P_Grand Potion of Cleansing,Grand Potion of Cleansing,15.00,,6.00,,,Light,,21.00
+P_Grand Potion of Cleansing,Grand Potion of Cleansing,15,,6,,,Light,150,21
-P_Potion of Bad Luck,Potion of Bad Luck,,5.00,,1.00,,Dark,,6.00
+P_Potion of Bad Luck,Potion of Bad Luck,,5,,1,,Dark,300,6
-P_Cast Fireball,Cast Fireball,,,2.00,8.00,1.00,Light,,11.00
+P_Cast Fireball,Cast Fireball,,,2,8,1,Light,450,11
-P_Starlight Spark,Starlight Spark,5.00,,5.00,2.00,10.00,Light,,22.00
+P_Starlight Spark,Starlight Spark,5,,5,2,10,Light,800,22
-P_Widow's Kiss,Widow's Kiss,,4.00,,1.00,,Dark,,5.00
+P_Widow's Kiss,Widow's Kiss,,4,,1,,Dark,250,5
-P_Withered Tree's Sap,Withered Tree's Sap,,8.00,,4.00,,Dark,,12.00
+P_Withered Tree's Sap,Withered Tree's Sap,,8,,4,,Dark,120,12
-P_Anti Gravity Field Potion,Anti Gravity Field Potion,,,,10.00,12.00,Dark,,22.00
+P_Anti Gravity Field Potion,Anti Gravity Field Potion,,,,10,12,Dark,650,22
-P_Serpent's Kiss,Serpent's Kiss,,6.00,,,,WInd,,6.00
+P_Serpent's Kiss,Serpent's Kiss,,6,,,,Dark,170,6

Source/ProjectEleri/Data/BazarSettingsDataAsset.cpp

@@ -3,23 +3,9 @@
 
 #include "BazarSettingsDataAsset.h"
 
-void UBazarSettingsDataAsset::GetModifiersFromEmotionData(const FBazarDialogueEmotionData& InData, int32& OutAnger,
+
-	int32& OutFear, int32& OutSadness)
+void UBazarSettingsDataAsset::PostLoad()
 {
-	for (const FBazarEmotionModifier& Mod : InData.EmotionModifiers)
+	Super::PostLoad();
-	{
+
-		switch (Mod.Emotion)
-		{
-		case EBazarNpcEmotion::Anger:
-			OutAnger = FMath::RandRange(Mod.ValueMin, Mod.ValueMax);
-			break;
-		case EBazarNpcEmotion::Fear:
-			OutFear = FMath::RandRange(Mod.ValueMin, Mod.ValueMax);
-			break;
-		case EBazarNpcEmotion::Sadness:
-			OutSadness = FMath::RandRange(Mod.ValueMin, Mod.ValueMax);
-			break;
-		default: ;
-		}
-	}
 }

Source/ProjectEleri/Data/BazarSettingsDataAsset.h

@@ -9,10 +9,11 @@
 UENUM(BlueprintType)
 enum class EBazarNpcEmotion: uint8 
 {
-	None,
+	Trust,
-	Anger,
+	Excitement,
-	Fear,
+	Comfort,
-	Sadness,
+	Pride,
+	Curiosity,
 	MAX			UMETA(Hidden)
 };
 
@@ -41,10 +42,38 @@ struct FBazarDialogueEmotionData
 	UPROPERTY(BlueprintReadWrite, EditAnywhere)
 	TArray<FBazarEmotionModifier> EmotionModifiers;
 	
+	UPROPERTY(BlueprintReadOnly, VisibleAnywhere)
+	FString EmotionsData;	
+	
 	UPROPERTY(BlueprintReadWrite, EditAnywhere)
 	FText DialogueText;
 };
 
+USTRUCT(BlueprintType)
+struct FBazaarHaggleCardData
+{
+	GENERATED_BODY()
+	
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	FText CardName;
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	FText CardDescription;
+	
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	int32 TrustModifier;
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	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;
+};
+
 /**
  * 
  */
@@ -53,9 +82,19 @@ class PROJECTELERI_API UBazarSettingsDataAsset : public UDataAsset
 {
 	GENERATED_BODY()
 public:
-	UPROPERTY(BlueprintReadWrite, EditAnywhere)
+	
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Eleri|Bazaar|Tresholds")
+	int32 HappyThreshold = 50;
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Eleri|Bazaar|Tresholds")
+	int32 EmotionLowerThreshold = 65;
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Eleri|Bazaar|Tresholds")
+	int32 EmotionUpperThreshold = 80;
+	
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Eleri|Bazaar")
 	TArray<FBazarDialogueEmotionData> AvailableDialogueEmotionData;
 
-	UFUNCTION(BlueprintPure, Category = "Eleri|Bazaar")
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Eleri|Bazaar")
-	static void GetModifiersFromEmotionData(const FBazarDialogueEmotionData& InData, int32& OutAnger, int32& OutFear, int32& OutSadness);
+	TArray<FBazaarHaggleCardData> HaggleCards;
+	
+	virtual void PostLoad() override;
 };

Source/ProjectEleri/DialogueSystem/DialogueComponent.cpp

@@ -99,11 +99,8 @@ void UDialogueComponent::TriggerDialogue(USpeechDataAsset* DialogueAssetPath, co
 		bDialogueSelectOpen = false;
 	}
 	
-	if (!DialogueWidget)
+	DialogueWidget = Cast<UDialogueWidget>(EleriPlayerController->ToggleDialogueWindow(true));
-	{
+	DialogueWidget->AssignDialogueComponent(this);
-		DialogueWidget = Cast<UDialogueWidget>(EleriPlayerController->ToggleDialogueWindow(true));
-		DialogueWidget->AssignDialogueComponent(this);
-	}
 	
 	CurrentLineIndex = 0;
 	CurrentActiveDialogue = DialogueAssetPath;

Source/ProjectEleri/Items/DataAssets/ItemDataAsset.h

@@ -127,8 +127,9 @@ public:
 	FSoftClassPath DecorationActorClassPath;
 
 
-	/** Base cost of the item that's used to form buying and selling prices */
+	// Base cost of the item that's used to form buying and selling prices
-	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Info", AssetRegistrySearchable, meta = (AssetBundles = "Inventory, Book"))
+	// EDIT IT THE CSV
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Info", AssetRegistrySearchable, meta = (AssetBundles = "Inventory, Book"))
 	int32 BaseCost;
 
 	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Info", AssetRegistrySearchable, meta = (AssetBundles = "Inventory, Book"))
@@ -188,8 +189,9 @@ public:
 	int32 ProfessionLevelNeeded;
 
 	/** The item element describes what type of crystal goes into creating
-	a potion of the same element type*/
+	a potion of the same element type
-	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Craftable", AssetRegistrySearchable, meta = (AssetBundles = "Book"))
+	EDIT IN CSV*/
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Craftable", AssetRegistrySearchable, meta = (AssetBundles = "Book"))
 	Element ItemElement;
 
 	/** The chemical alignment of item, coresponds to a clock */
@@ -199,8 +201,10 @@ public:
 	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Craftable")
 	EChemicalAlignment ChemicalAlignment;
 
-	/** What are the main properties of the ingredient/potion */
+	/** What are the main properties of the ingredient/potion 
-	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Craftable", AssetRegistrySearchable, meta = (AssetBundles = "Book"))
+	 * EDIT IN CSV
+	 */
+	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Craftable", AssetRegistrySearchable, meta = (AssetBundles = "Book"))
 	TArray<FPropertyStrength> Properties;
 
 	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Craftable", AssetRegistrySearchable, meta = (AssetBundles = "Book"))
@@ -210,8 +214,10 @@ public:
 	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Craftable", AssetRegistrySearchable, meta = (AssetBundles = "Book"))
 	TArray<FPropertyStrength> Defects;
 
-	/*Item effectiveness is it's ability to effect the body in various ways, 1 being least effective and 4 most effective*/
+	/*Item effectiveness is it's ability to effect the body in various ways, 1 being least effective and 4 most effective
-	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Craftable", AssetRegistrySearchable, meta = (AssetBundles = "Book"))
+	 * EDIT IN CSV
+	 */
+	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Craftable", AssetRegistrySearchable, meta = (AssetBundles = "Book"))
 	int32 Effectiveness;
 
 	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Craftable", meta = (ClampMin = 1.f, ClampMax = 2.f, UIMin = 1.f, UIMax = 2.f, Delta = 0.01f))