diff --git a/src/endWeek/nextWeek/nextWeek.js b/src/endWeek/nextWeek/nextWeek.js index e174276d9bf3f41c3f4df60bea48ea593eb72483..0c76d0c8a71e1d9e21b4f56df4a7ba446e5093ff 100644 --- a/src/endWeek/nextWeek/nextWeek.js +++ b/src/endWeek/nextWeek/nextWeek.js @@ -277,7 +277,7 @@ App.EndWeek.nextWeek = function() { } if (V.PC.refreshment.includes("fertility")) { - V.PC.forcedFertDrugs = 1; + V.PC.forcedFertDrugs = Math.max(+V.PC.forcedFertDrugs, 1); } else if (V.PC.forcedFertDrugs > 0) { V.PC.forcedFertDrugs--; } @@ -345,6 +345,7 @@ App.EndWeek.nextWeek = function() { } V.activeSlave = 0; + V.returnTo = ""; // delete endweek flag delete V.endweekFlag; diff --git a/src/endWeek/saDiet.js b/src/endWeek/saDiet.js index 36004ec460259b5e839477137f77fd62a236f84f..916a94235966c796b9b4f24b11c965c3c75fd028 100644 --- a/src/endWeek/saDiet.js +++ b/src/endWeek/saDiet.js @@ -1209,9 +1209,9 @@ App.SlaveAssignment.diet = (function() { } if (slave.fuckdoll === 0) { if (slave.fetish !== "mindbroken") { - if (slave.attrXY < 100) { + if (slave.attrXX < 100) { r.push(`${He} begins to find women <span class="change positive">a little more attractive</span> thanks to the male hormones.`); - slave.attrXY += 1; + slave.attrXX += 1; } } if (slave.energy < 70) { diff --git a/src/js/storyJS.js b/src/js/storyJS.js index 73df539ee1c52153181fbd5f1914bf3ed50107d6..5b8a851fbe50402fc29e6260e9f19aaf0a35008d 100644 --- a/src/js/storyJS.js +++ b/src/js/storyJS.js @@ -240,12 +240,12 @@ globalThis.cumAmount = function(slave) { cum = Math.clamp(cum, 1, 1000000000000000000); return cum; }; + /** * The amount of fem cum a slave produces in deciliters * @param {App.Entity.SlaveState} slave * @returns {number} */ - globalThis.girlCumAmount = function(slave) { let fluid = ((slave.prostate * (slave.energy / 5)) + 1); if (!slave) { @@ -271,6 +271,7 @@ globalThis.girlCumAmount = function(slave) { } return fluid; }; + /** * @param {string} text * @returns {string} diff --git a/src/markets/marketUI.js b/src/markets/marketUI.js index d292d940f632a56a15351c120f2a778532ae8088..f368ab9951c6c9a4499c69957180fdc43e0ad3af 100644 --- a/src/markets/marketUI.js +++ b/src/markets/marketUI.js @@ -91,6 +91,7 @@ App.Markets.purchaseFramework = function(slaveMarket, {sTitleSingular = "slave", jQuery("#slave-markets").empty().append(App.Markets[slaveMarket]); V.nextLink = "Bulk Slave Intro"; V.nextButton = "Continue"; + V.returnTo = "Main"; App.Utils.updateUserButton(); }, ) @@ -123,6 +124,7 @@ App.Markets.purchaseFramework = function(slaveMarket, {sTitleSingular = "slave", cashX(forceNeg(cost), "slaveTransfer", slave); V.market.totalCost += cost; V.market.newSlaves.push(slave); + V.returnTo = "Main"; }, [], "Bulk Slave Intro" diff --git a/src/markets/specificMarkets/householdLiquidator.js b/src/markets/specificMarkets/householdLiquidator.js index 60d371c28f4da553191d252bd693dd21ce3a522c..2416fe2641293d5c8976a85ba40b8c796d5be3e8 100644 --- a/src/markets/specificMarkets/householdLiquidator.js +++ b/src/markets/specificMarkets/householdLiquidator.js @@ -95,6 +95,7 @@ App.Markets["Household Liquidator"] = function() { () => { V.market.newSlaves = newSlaves; V.market.newSlaves.forEach((s) => cashX(forceNeg(totalCost / V.market.newSlaves.length), "slaveTransfer", s)); + V.returnTo = "Buy Slaves"; }, [], "Bulk Slave Intro" diff --git a/src/markets/theMarket/buySlaves.js b/src/markets/theMarket/buySlaves.js index d71c10c94e2ab22ba15482f408b706bffe3ee8d5..7a998235225ce1086144f106e8d94d2925cec222 100644 --- a/src/markets/theMarket/buySlaves.js +++ b/src/markets/theMarket/buySlaves.js @@ -86,6 +86,7 @@ App.UI.buySlaves = function() { V.market.introType = "bulk"; V.market.numSlaves = 5; V.market.numArcology = i; + V.returnTo = "Buy Slaves"; }, [], "Bulk Slave Intro" @@ -101,6 +102,7 @@ App.UI.buySlaves = function() { V.market.introType = "bulk"; V.market.numSlaves = 10; V.market.numArcology = i; + V.returnTo = "Buy Slaves"; }, [], "Bulk Slave Intro" @@ -153,6 +155,7 @@ App.UI.buySlaves = function() { V.market = new App.Markets.Global(store.marketType); V.market.introType = "bulk"; V.market.numSlaves = 5; + V.returnTo = "Buy Slaves"; }, [], `Bulk Slave Intro` @@ -167,6 +170,7 @@ App.UI.buySlaves = function() { V.market = new App.Markets.Global(store.marketType); V.market.introType = "bulk"; V.market.numSlaves = 10; + V.returnTo = "Buy Slaves"; }, [], `Bulk Slave Intro` diff --git a/src/player/managePersonalAffairs.js b/src/player/managePersonalAffairs.js index 8dd63c7cd3a4898863181b8fb9ac2176fab935de..eafd96b4ff7bbed42fd04e2db2ab1743bcba7489 100644 --- a/src/player/managePersonalAffairs.js +++ b/src/player/managePersonalAffairs.js @@ -1030,12 +1030,22 @@ App.UI.managePersonalAffairs = function() { text.push(`You feel a strange eagerness whenever you think of bareback sex.`); } - links.push( - App.UI.DOM.link(`Start taking fertility drugs`, () => { - V.PC.fertDrugs = 1; + if (PC.preg === 0) { + links.push( + App.UI.DOM.link(`Start taking fertility drugs`, () => { + V.PC.fertDrugs = 1; - App.UI.DOM.replace(fertilityDrugsDiv, fertilityDrugs); - }), + App.UI.DOM.replace(fertilityDrugsDiv, fertilityDrugs); + }) + ); + } else { + links.push( + App.UI.DOM.disabledLink(`Start taking fertility drugs`, [ + PC.preg > 0 ? `You are already pregnant.` : `You cannot get pregnant` + ]) + ); + } + links.push( App.UI.DOM.disabledLink(`Stop taking fertility drugs`, [ `You are not currently taking fertility drugs.` ]),