From 875df759fce8b684f7e18131213e7cf3e0c8492d Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Mon, 31 Aug 2020 01:07:38 -0400 Subject: [PATCH] fixes --- src/markets/theMarket/buySlaves.js | 2 +- src/markets/theMarket/marketData.js | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/markets/theMarket/buySlaves.js b/src/markets/theMarket/buySlaves.js index 3ae47336396..9436335d268 100644 --- a/src/markets/theMarket/buySlaves.js +++ b/src/markets/theMarket/buySlaves.js @@ -203,7 +203,7 @@ App.UI.buySlaves = function() { if (store.note) { App.UI.DOM.appendNewElement("span", el, ` ${store.note}`, "note"); } - if ([].includes(store.marketType)) { + if ([App.Data.misc.schools].includes(store.marketType)) { if (V[store.marketType].schoolSale === 1) { App.UI.DOM.appendNewElement("span", el, `Offering your first purchase at half price this week. `, "yellow"); } diff --git a/src/markets/theMarket/marketData.js b/src/markets/theMarket/marketData.js index bbc11d045db..79079176f42 100644 --- a/src/markets/theMarket/marketData.js +++ b/src/markets/theMarket/marketData.js @@ -66,7 +66,15 @@ App.Data.Markets = { title: "Raiders' Black Market", marketType: "underage raiders", note: "Very young slaves.", - get requirements() { return ((V.pedo_mode === 1 || (V.minimumSlaveAge <= 13 && V.minimumSlaveAge <= V.fertilityAge)) && V.rep > 3000) ? true : `You are not reputable enough to buy underaged slaves.`; } + get requirements() { + if (V.rep <= 3000) { + return `You are not reputable enough to buy underaged slaves.`; + } else if (V.pedo_mode === 1 || (V.minimumSlaveAge <= 13 && V.minimumSlaveAge <= V.fertilityAge)) { + return true; + } else { + return false; + } + } }, { title: "Trainers' Market", -- GitLab