Closes #44

src/client/Jumpscare.lua

@@ -56,13 +56,17 @@ local function jumpscarePlayer(enemyName)
 end
 
 playerStatePromise:andThen(function()
+	local lastEnemyFought = selectors.getCurrentTarget(store:getState(), player.Name)
 	store.changed:connect(function(newState, oldState)
+		if selectors.getCurrentTarget(newState, player.Name) then
+			lastEnemyFought = selectors.getCurrentTarget(newState, player.Name)
+		end
 		if
 			isScared(player.Name, newState)
 			and not isScared(player.Name, oldState)
 			and (os.time() - lastJumpscared) > jumpscareGap
 		then
-			jumpscarePlayer(selectors.getCurrentTarget(newState, player.Name).Name)
+			jumpscarePlayer(lastEnemyFought.Name)
 		end
 	end)
 end)

src/client/UI/BillboardShops/EggShop.lua

@@ -13,11 +13,11 @@ local store = require(StarterPlayer.StarterPlayerScripts.Client.State.Store)
 local selectors = require(ReplicatedStorage.Common.State.selectors)
 local playerStatePromise = require(StarterPlayer.StarterPlayerScripts.Client.State.PlayerStatePromise)
 
-local autoHatchGamepassID = ReplicatedStorage.Config.GamepassData.IDs["Auto"].Value
-local tripleHatchGamepassID = ReplicatedStorage.Config.GamepassData.IDs["3X"].Value
+local autoHatchGamepassID = ReplicatedStorage.Config.GamepassData.IDs["AutoHatch"].Value
+local tripleHatchGamepassID = ReplicatedStorage.Config.GamepassData.IDs["3xHatch"].Value
 local fasterHatchGamepassID = ReplicatedStorage.Config.GamepassData.IDs["FasterHatch"].Value
-local doubleLuckGamepassID = ReplicatedStorage.Config.GamepassData.IDs["2XLuck"].Value
-local tripleLuckGamepassID = ReplicatedStorage.Config.GamepassData.IDs["3XLuck"].Value
+local doubleLuckGamepassID = ReplicatedStorage.Config.GamepassData.IDs["2xLuck"].Value
+local tripleLuckGamepassID = ReplicatedStorage.Config.GamepassData.IDs["3xLuck"].Value
 
 local hatchingUI = player.PlayerGui:WaitForChild "Hatching"
 
@@ -320,6 +320,10 @@ CollectionService:GetInstanceAddedSignal("EggShop"):Connect(handleShop)
 
 local function updateFoundsDisplay(foundPets): ()
 	for petName in foundPets do
+		if petName:match "Evolved" then
+			continue
+		end
+
 		local petUI = player.PlayerGui:WaitForChild(petAreas[petName] .. "EggUI").Background.Pets[petName]
 		petUI.PetName.Text = petName
 		petUI.PetImage.ImageColor3 = Color3.fromRGB(255, 255, 255)

src/client/UI/CentralUI.lua

@@ -28,6 +28,9 @@ function CentralUI:setEnabled(enable: boolean?): ()
 	self._isOpen = enable
 
 	if not enable then
+		if self.OnClose then
+			self:OnClose()
+		end
 		return
 	end
 

src/client/UI/Displays.lua

@@ -71,9 +71,7 @@ end):andThen(function(interfaces)
 			first = interfaces.PetInventory.Background.Multiplier.Amount,
 			second = function()
 				return "X"
-					.. formatter.truncateMultiplier(
-						selectors.getStat(store:getState(), player.Name, "PetFearMultiplier")
-					)
+					.. formatter.truncateMultiplier(selectors.getStat(store:getState(), player.Name, "FearMultiplier"))
 			end,
 		},
 		{

src/client/UI/Inventories/PetInventory.lua

@@ -55,17 +55,17 @@ function PetInventory:_initialize(): ()
 	self._ui.Background.Storage.Buy.Activated:Connect(function()
 		local maxPetCount = selectors.getStat(store:getState(), player.Name, "MaxPetCount")
 		if maxPetCount == 30 or maxPetCount == 130 then
-			MarketplaceService:PromptGamePassPurchase(player, gamepassIDs["+50"].Value)
+			MarketplaceService:PromptGamePassPurchase(player, gamepassIDs["50PetStorage"].Value)
 		else
-			MarketplaceService:PromptGamePassPurchase(player, gamepassIDs["+100"].Value)
+			MarketplaceService:PromptGamePassPurchase(player, gamepassIDs["100PetStorage"].Value)
 		end
 	end)
 
 	self._ui.Background.Equipped.Buy.Activated:Connect(function()
 		if selectors.getStat(store:getState(), player.Name, "MaxPetEquipCount") == 3 then
-			MarketplaceService:PromptGamePassPurchase(player, gamepassIDs["+1PetEquipped"].Value)
+			MarketplaceService:PromptGamePassPurchase(player, gamepassIDs["1PetEquipped"].Value)
 		else
-			MarketplaceService:PromptGamePassPurchase(player, gamepassIDs["+2PetEquipped"].Value)
+			MarketplaceService:PromptGamePassPurchase(player, gamepassIDs["2PetEquipped"].Value)
 		end
 	end)
 

src/client/UI/Missions/MissionFearRewardUI.lua

@@ -0,0 +1,7 @@
+local Players = game:GetService "Players"
+local StarterPlayer = game:GetService "StarterPlayer"
+
+local CentralUI = require(StarterPlayer.StarterPlayerScripts.Client.UI.CentralUI)
+local player = Players.LocalPlayer
+
+return CentralUI.new(player.PlayerGui:WaitForChild "MissionFearReward")

src/client/UI/Missions/ProgressUI.lua

@@ -0,0 +1,92 @@
+local Players = game:GetService "Players"
+local StarterPlayer = game:GetService "StarterPlayer"
+local ReplicatedStorage = game:GetService "ReplicatedStorage"
+
+local player = Players.LocalPlayer
+local Client = StarterPlayer.StarterPlayerScripts.Client
+
+local store = require(Client.State.Store)
+local selectors = require(ReplicatedStorage.Common.State.selectors)
+local playerStatePromise = require(Client.State.PlayerStatePromise)
+local regionUtils = require(ReplicatedStorage.Common.Utils.Player.RegionUtils)
+
+local missionRequirements = ReplicatedStorage.Missions
+
+local progressTextFormats = {
+	Enemy = "Defeat {enemy} {progress}",
+	Weapon = "Buy a Weapon",
+	AnyPet = "Hatch Any Pet in {area} {progress}",
+	PetRarity = "Hatch a {rarity} Pet in {area} {progress}",
+}
+
+local function enteredRegion(regionName, progressUI)
+	local currentMissionData = selectors.getMissionData(store:getState(), player.Name)[regionName]
+	local currentMissionRequirements =
+		missionRequirements[regionName][tostring(currentMissionData.CurrentMissionNumber)]
+
+	if currentMissionData.Active then
+		local progressText
+		for missionType, text in progressTextFormats do
+			progressText = if currentMissionRequirements:FindFirstChild(missionType) then text else progressText
+		end
+
+		progressUI.Background.MissionName.Text = currentMissionRequirements.MissionName.Value
+
+		if currentMissionData.CurrentMissionProgress == currentMissionRequirements.Requirements.Value then
+			progressUI.Background.Progress.Visible = false
+			progressUI.Background.Complete.Visible = true
+			progressUI.Enabled = true
+			return
+		end
+
+		progressUI.Background.Complete.Visible = false
+		progressUI.Background.Progress.Visible = true
+
+		if progressText == progressTextFormats.Enemy then
+			progressText = progressText:gsub("{enemy}", currentMissionRequirements.Enemy.Value)
+		elseif progressText == progressTextFormats.PetRarity then
+			if currentMissionRequirements.PetRarity.Value:sub(1, 1):lower():match "[aeiou]" then
+				progressText = progressText:gsub(" {rarity}", "n " .. currentMissionRequirements.PetRarity.Value)
+			else
+				progressText = progressText:gsub("{rarity}", currentMissionRequirements.PetRarity.Value)
+			end
+		end
+
+		progressText = progressText:gsub("{area}", regionName)
+		progressText = progressText:gsub(
+			"{progress}",
+			"("
+				.. currentMissionData.CurrentMissionProgress
+				.. "/"
+				.. currentMissionRequirements.Requirements.Value
+				.. ")"
+		)
+
+		progressUI.Background.Progress.Text = progressText
+		progressUI.Enabled = true
+	else
+		progressUI.Enabled = false
+	end
+end
+
+playerStatePromise:andThen(function()
+	local progressUI = player.PlayerGui:WaitForChild "ProgressUI"
+	for regionName, zone in regionUtils.getRegions() do
+		if zone:findLocalPlayer() then
+			enteredRegion(regionName, progressUI)
+		end
+		zone.localPlayerEntered:Connect(function()
+			enteredRegion(regionName, progressUI)
+		end)
+	end
+	store.changed:connect(function(newState, oldState)
+		local newMissionData = selectors.getMissionData(newState, player.Name)
+		local oldMissionData = selectors.getMissionData(oldState, player.Name)
+		if newMissionData == oldMissionData then
+			return
+		end
+		enteredRegion(regionUtils.getPlayerLocationName(player.Name), progressUI)
+	end)
+end)
+
+return 0