diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset index 9bd6f449..b3080631 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c3767113ad9d19a41ed1caeee918b8689558d6021b0ed4fd40b158db4226a0b -size 1524220 +oid sha256:42138e7f4868ca62051edf49c90d2e2ba71b0a7173985a45d6f391a8e90c7349 +size 1524015 diff --git a/EndlessVendetta/EndlessVendetta.uproject b/EndlessVendetta/EndlessVendetta.uproject index 77153aad..2264d59a 100644 --- a/EndlessVendetta/EndlessVendetta.uproject +++ b/EndlessVendetta/EndlessVendetta.uproject @@ -63,6 +63,11 @@ "Name": "MixamoAnimationRetargeting", "Enabled": true, "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/c684998124da4e2583b314dc95403a80" + }, + { + "Name": "RecentBlueprintMenu", + "Enabled": true, + "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/484f72297c144cf9b5c35fea3359500c" } ] } \ No newline at end of file diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp index a833f47a..b736eccf 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueChoiceNode.cpp @@ -28,6 +28,7 @@ bool UDialogueChoiceNode::ChoiceRequirementsMet(const int ChoiceID, UWorld* Worl const UInventoryComponent* InventoryComponent = Cast(World->GetFirstPlayerController()->GetPawn()->GetComponentByClass(UInventoryComponent::StaticClass())); const ABountyHunterCharacter* PlayerCharacter = Cast(World->GetFirstPlayerController()->GetPawn()); UDialogueTextNode* TextNode = Cast(ChildrenNodes[ChoiceID]); + if (TextNode->RequiredFavours > PlayerCharacter->Favours) return false; for (const EDialogueFlag Flag : TextNode->RequiredFlags) { if (!GameInstance->HasDialogueFlag(Flag)) return false; @@ -40,7 +41,6 @@ bool UDialogueChoiceNode::ChoiceRequirementsMet(const int ChoiceID, UWorld* Worl { if (!InventoryComponent->HasItemByItemID(ItemID)) return false; } - if (TextNode->RequiredFavours > PlayerCharacter->Favours) return false; for (const EDialogueFlag Flag : TextNode->LacksFlags) { if (GameInstance->HasDialogueFlag(Flag)) return false;