From c5409fcaa7953cc797382263978f6f1aec908826 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Tue, 14 Mar 2023 03:26:14 +0000 Subject: [PATCH] Removed Merchant Soft Lock for Build Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED --- Content/Assets/Characters/Merchant/AMerchant.uasset | 4 ++-- Content/BlueprintAI/AI/AIControllerBruh.uasset | 4 ++-- Content/Blueprints/Display_UI/BP_ImportantStats.uasset | 4 ++-- .../Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp | 3 ++- Source/the_twilight_abyss/Quest/QuestSystem.cpp | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Content/Assets/Characters/Merchant/AMerchant.uasset b/Content/Assets/Characters/Merchant/AMerchant.uasset index f2d9d38..0013a4c 100644 --- a/Content/Assets/Characters/Merchant/AMerchant.uasset +++ b/Content/Assets/Characters/Merchant/AMerchant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1270d07a6c8315f01ecfdf43cbcab5049eee1fd0c00ddc4344ff2f2be017567d -size 31318 +oid sha256:e9188e10cfd8c3901e9e45e29a9befb663a72e564cbddd307ad4de963d9a0d77 +size 29149 diff --git a/Content/BlueprintAI/AI/AIControllerBruh.uasset b/Content/BlueprintAI/AI/AIControllerBruh.uasset index 47492a5..dddaaf0 100644 --- a/Content/BlueprintAI/AI/AIControllerBruh.uasset +++ b/Content/BlueprintAI/AI/AIControllerBruh.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f25277555471692ca5760f2ad50cd9fec965a01fbec12971b19ebf160da1ae27 -size 108841 +oid sha256:a3fb67c92784326b62e154b94fe7bda799751425372ccb21ffc4fa2f3b08263f +size 109726 diff --git a/Content/Blueprints/Display_UI/BP_ImportantStats.uasset b/Content/Blueprints/Display_UI/BP_ImportantStats.uasset index b0ef34c..7f84c8a 100644 --- a/Content/Blueprints/Display_UI/BP_ImportantStats.uasset +++ b/Content/Blueprints/Display_UI/BP_ImportantStats.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecadf653938c7e2137ad59b6476da03b5bf1046dbd16b88954a9cb4286ed16b4 -size 71800 +oid sha256:dcffcfe86357f3c893f343ea448e61f1fb2e5cf96f95da554fb52e072841d4b8 +size 71202 diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset index 66e45ff..386e056 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2ca75bf7097c26b9d40760320303c440a1559518901fd42ca6f384fbff6ea2a -size 52542 +oid sha256:619392a18bdff832f9a3f42eedf6c1a209236e31775d1bbcae6e7f50c7b2b560 +size 52765 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index bfac357..16aaa72 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8ba24d4e8d59d36eea6c4d6601aa35242b7d4651011f39147a1e120286682c5 -size 3378297 +oid sha256:bfe70ae7d759d4a3357292cef5eceabe42fac8e3596a48d20fb5c0522dd4ab03 +size 3377496 diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp index beaad39..55cb12a 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp @@ -41,7 +41,7 @@ void AInteraction::BeginPlay() //Item Selector refs ItemSelectorWidget = CreateWidget(GetWorld(), ItemSelector); ItemSelectorWidget->SetVisibility(ESlateVisibility::Hidden); - ItemSelectorWidget->AddToViewport(); + //ItemSelectorWidget->AddToViewport(); //We are getting the property of interaction since we need a reference for when we cast in BP and we need the reference to be self Property = ItemSelectorWidget->GetClass()->FindPropertyByName("publicActor"); @@ -102,6 +102,7 @@ void AInteraction::RemoveWidget() UE_LOG(LogTemp, Display, TEXT("You cant open this widget when this widget is open")); } UE_LOG(LogTemp, Display, TEXT("setting isDisabled to true")); + ExitScreen(); if (Property == nullptr) { diff --git a/Source/the_twilight_abyss/Quest/QuestSystem.cpp b/Source/the_twilight_abyss/Quest/QuestSystem.cpp index 10e06da..bd1ebd6 100644 --- a/Source/the_twilight_abyss/Quest/QuestSystem.cpp +++ b/Source/the_twilight_abyss/Quest/QuestSystem.cpp @@ -11,7 +11,7 @@ UQuestSystem::UQuestSystem() // off to improve performance if you don't need them. PrimaryComponentTick.bCanEverTick = true; - static ConstructorHelpers::FClassFinder QuestWidgetClass(TEXT("/Game/Quest_UI/Quest_UI")); + static ConstructorHelpers::FClassFinder QuestWidgetClass(TEXT("/Game/Blueprints/Quest_UI/Quest_UI")); QuestWidget = QuestWidgetClass.Class; }