diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js index 6a88019752da31e9e66ac627390eabb4e96799a3..f333a3eb5c6c5b28ef13069ae865eecaee183c32 100644 --- a/js/003-data/gameVariableData.js +++ b/js/003-data/gameVariableData.js @@ -843,7 +843,6 @@ App.Data.resetOnNGPlus = { /** @type {Map<number, "oldAge"|"overdosed"|"lowHealth">} */ slaveDeath: new Map(), playerBred: 0, - playerBredTube: 0, propOutcome: 0, EliteSires: [], raped: -1, diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js index 64f8d2dd005891515096355d71300d65b74441e8..b4cf149a1bf198d68d6b525754d638288db47950 100644 --- a/src/002-config/fc-version.js +++ b/src/002-config/fc-version.js @@ -2,5 +2,5 @@ App.Version = { base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed. pmod: "4.0.0-alpha.12", commitHash: null, - release: 1156, // When getting close to 2000, please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js. + release: 1157, // When getting close to 2000, please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js. }; diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js index 3222c9940ca5eba01b2b5f06986b077c8494acf7..7786329f6c975fa9c4c9c54c303835cff9c7329d 100644 --- a/src/data/backwardsCompatibility/backwardsCompatibility.js +++ b/src/data/backwardsCompatibility/backwardsCompatibility.js @@ -451,6 +451,9 @@ App.Update.globalVariables = function(node) { V.arcologies[bci].FSHedonisticDecadenceResearch = 0; } } + if ( V.arcologies[0].FSRestart !== "unset" && V.playerBredTube) { + V.playerBred = 2; + } } // Arcologies diff --git a/src/events/nonRandom/eliteTakeOver.js b/src/events/Elites/eliteTakeOver.js similarity index 100% rename from src/events/nonRandom/eliteTakeOver.js rename to src/events/Elites/eliteTakeOver.js diff --git a/src/events/nonRandom/pInsemination.js b/src/events/Elites/pInsemination.js similarity index 99% rename from src/events/nonRandom/pInsemination.js rename to src/events/Elites/pInsemination.js index 47ebe7bf40bb51dd25e3cdde82a8ae9e12b97f5c..115726754551c88cdf474f51e0b52d9bfa904b26 100644 --- a/src/events/nonRandom/pInsemination.js +++ b/src/events/Elites/pInsemination.js @@ -1,7 +1,7 @@ App.Events.PInsemination = class PInsemination extends App.Events.BaseEvent { eventPrerequisites() { return [ - () => V.playerBred === 1, + () => V.playerBred > 0, () => (V.PC.preg === 0 || V.PC.preg === -1), () => V.PC.pregWeek === 0, () => V.PC.vagina >= 1 @@ -13,7 +13,7 @@ App.Events.PInsemination = class PInsemination extends App.Events.BaseEvent { V.nextButton = "Continue"; - if (V.playerBredTube !== 1) { + if (V.playerBred === 1) { if (V.EliteSires.length === 0) { V.EliteSires = ["crazy", "futa", "moves", "preggo", "quick", "virgin"].shuffle(); } diff --git a/src/futureSocieties/futureSociety.js b/src/futureSocieties/futureSociety.js index e917f481e61751c924f2d96d883a52eb5e14dd7c..9c80d91d562165cdf64c30bb8e6aafa07c303235 100644 --- a/src/futureSocieties/futureSociety.js +++ b/src/futureSocieties/futureSociety.js @@ -336,7 +336,6 @@ globalThis.FutureSocieties = (function() { V.propOutcome = 0; V.failedElite = 0; V.playerBred = 0; - V.playerBredTube = 0; break; case "FSIntellectualDependency": arcology.FSIntellectualDependencyLaw = 0; diff --git a/src/player/managePersonalAffairs.js b/src/player/managePersonalAffairs.js index 2bcb41b23febff933ee28ee93d285cba1c30ec3e..dc585419af9cae2ff501373090e18318a17fe6a3 100644 --- a/src/player/managePersonalAffairs.js +++ b/src/player/managePersonalAffairs.js @@ -807,14 +807,10 @@ App.UI.managePersonalAffairs = function() { App.UI.DOM.generateLinksStrip([ App.UI.DOM.link(`List your womb as available`, () => { V.playerBred = 1; - V.playerBredTube = 0; - App.UI.DOM.replace(breedingDiv, breeding); }), App.UI.DOM.link(`Sign up for artificial insemination`, () => { - V.playerBred = 1; - V.playerBredTube = 1; - + V.playerBred = 2; App.UI.DOM.replace(breedingDiv, breeding); }) ]),