From b07200b737b4eb3f2bb1d167835ae54a91682cc4 Mon Sep 17 00:00:00 2001 From: pluviolithic Date: Sun, 11 Feb 2024 09:16:51 -0500 Subject: [PATCH] Add Ghostly Manor area --- src/client/Areas/Barriers.lua | 2 +- src/client/Areas/TeleportUI.lua | 7 ++++++- src/client/UI/init.lua | 2 +- src/server/PlayerManager/ProfileTemplate.lua | 6 ++++++ src/shared/State/DefaultStates.lua | 6 ++++++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/client/Areas/Barriers.lua b/src/client/Areas/Barriers.lua index 44a50a0..a4a68eb 100644 --- a/src/client/Areas/Barriers.lua +++ b/src/client/Areas/Barriers.lua @@ -84,7 +84,7 @@ local function unlockAreas(oldWasLoaded) end end - if requirement.Name == "Howling Woods" and oldWasLoaded then + if (requirement.Name == "Howling Woods" or requirement.Name == "Ghostly Manor") and oldWasLoaded then AFKUnlockUIOnTween:Play() end end diff --git a/src/client/Areas/TeleportUI.lua b/src/client/Areas/TeleportUI.lua index c32d6cd..5310060 100644 --- a/src/client/Areas/TeleportUI.lua +++ b/src/client/Areas/TeleportUI.lua @@ -83,7 +83,12 @@ function TeleportUI:_initialize() local purchasedTeleporters = selectors.getPurchasedTeleporters(store:getState(), player.Name) local target, targetAreaName = nil, nil - if areaRequirements["Howling Woods"].Value <= selectors.getStat(store:getState(), player.Name, "Strength") then + if areaRequirements["Ghostly Manor"].Value <= selectors.getStat(store:getState(), player.Name, "Strength") then + targetAreaName = "Ghostly Manor" + target = workspace.Teleports.AFK3TP + elseif + areaRequirements["Howling Woods"].Value <= selectors.getStat(store:getState(), player.Name, "Strength") + then targetAreaName = "Howling Woods" target = workspace.Teleports.AFK2TP else diff --git a/src/client/UI/init.lua b/src/client/UI/init.lua index a67083f..9e1fb5c 100644 --- a/src/client/UI/init.lua +++ b/src/client/UI/init.lua @@ -11,7 +11,7 @@ require(script.FixRichText) require(script.Inventories) require(script.ChestTimerUI) require(script.BillboardShops) -require(script.NotificationUI) +--require(script.NotificationUI) require(script.GiftUI) require(script.RebirthUI) diff --git a/src/server/PlayerManager/ProfileTemplate.lua b/src/server/PlayerManager/ProfileTemplate.lua index 1fffbfb..07ff7fd 100644 --- a/src/server/PlayerManager/ProfileTemplate.lua +++ b/src/server/PlayerManager/ProfileTemplate.lua @@ -102,6 +102,12 @@ return { Active = false, ViewedRewardPopup = false, }, + ["Ghostly Manor"] = { + CurrentMissionNumber = 1, + CurrentMissionProgress = 0, + Active = false, + ViewedRewardPopup = false, + }, }, SavedSettings = { diff --git a/src/shared/State/DefaultStates.lua b/src/shared/State/DefaultStates.lua index 881edd6..4d2ca18 100644 --- a/src/shared/State/DefaultStates.lua +++ b/src/shared/State/DefaultStates.lua @@ -109,6 +109,12 @@ return { Active = false, ViewedRewardPopup = false, }, + ["Ghostly Manor"] = { + CurrentMissionNumber = 1, + CurrentMissionProgress = 0, + Active = false, + ViewedRewardPopup = false, + }, }, AudioData = {