diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js index d366e2ad04ba636e2c7da0ac9a114527c2c11c31..01567d806b7000cc2829c817baf782bd09691811 100644 --- a/js/003-data/gameVariableData.js +++ b/js/003-data/gameVariableData.js @@ -985,39 +985,72 @@ App.Data.resetOnNGPlus = { organFarmUpgrade: 0, /** @type {FC.Medicine.OrganFarm.GrowingOrgan[]} */ completedOrgans: [], + /** @type {FC.Bool} */ ImplantProductionUpgrade: 0, + /** @type {FC.Bool} */ permaPregImplant: 0, + /** @type {0|1|2|3} */ injectionUpgrade: 0, + /** @type {FC.Bool} */ hormoneUpgradeMood: 0, + /** @type {FC.Bool} */ hormoneUpgradeShrinkage: 0, + /** @type {FC.Bool} */ hormoneUpgradePower: 0, + /** @type {FC.Bool} */ pubertyHormones: 0, + /** @type {FC.Bool} */ dietXXY: 0, + /** @type {FC.Bool} */ dietCleanse: 0, + /** @type {FC.Bool} */ cumProDiet: 0, + /** @type {FC.Bool} */ dietFertility: 0, + /** @type {FC.Bool} */ curativeUpgrade: 0, + /** @type {FC.Bool} */ growthStim: 0, + /** @type {FC.Bool} */ reproductionFormula: 0, + /** @type {FC.Bool} */ aphrodisiacUpgrade: 0, + /** @type {FC.Bool} */ aphrodisiacUpgradeRefine: 0, + /** @type {FC.Bool} */ healthyDrugsUpgrade: 0, + /** @type {FC.Bool} */ superFertilityDrugs: 0, + /** @type {FC.Bool} */ bellyImplants: 0, + /** @type {0|1|2} */ cervixImplants: 0, + /** @type {FC.Bool} */ meshImplants: 0, + /** @type {FC.Bool} */ prostateImplants: 0, + /** @type {FC.Bool} */ youngerOvaries: 0, + /** @type {FC.Bool} */ sympatheticOvaries: 0, + /** @type {FC.Bool} */ fertilityImplant: 0, + /** @type {FC.Bool} */ asexualReproduction: 0, + /** @type {FC.Bool} */ animalOvaries: 0, /* {pigOvaries: 0, canineOvaries: 0, horseOvaries: 0, cowOvaries: 0} currently unused*/ + /** @type {FC.Bool} */ animalTesticles: 0, /* {pigTestes: 0, dogTestes: 0, horseTestes: 0, cowTestes: 0} currently unused*/ + /** @type {FC.Bool} */ animalMpreg: 0, /* {pigMpreg: 0, dogMpreg: 0, horseMpreg: 0, cowMpreg: 0} currently unused*/ + /** @type {0|1|2} */ geneticMappingUpgrade: 0, toyShop: false, + /** @type {FC.Bool} */ pregnancyMonitoringUpgrade: 0, + /** @type {FC.Bool} */ cloningSystem: 0, + /** @type {FC.Bool} */ geneticFlawLibrary: 0, projectN: App.Data.projectN, diff --git a/src/js/pregJS.js b/src/js/pregJS.js index a9b3dbaa556e82281bba82fc04585a4040d3742b..a124fa7a0264521b51c825d81ac4c04d864b0948 100644 --- a/src/js/pregJS.js +++ b/src/js/pregJS.js @@ -421,7 +421,7 @@ globalThis.setPregType = function(actor) { * Penetrative ability, ability to become pregnant, and canBreed() must be checked outside of this. Designed to assume .eggType === "human". * @param {App.Entity.SlaveState | App.Entity.PlayerState} target is the slave to get pregnant. Also accepts the PC. * @param {number} chance is the % chance to conceive. - * @param {number} hole control's the hole involved (0 - vagina, 1 - ass, 2 - both). .mpreg did this. + * @param {0|1|2} hole control's the hole involved (0 - vagina, 1 - ass, 2 - both). .mpreg did this. * @param {number} [fatherID] is the ID of her sire or 0 if undefined. * @returns {string} */ diff --git a/src/player/managePersonalAffairs.js b/src/player/managePersonalAffairs.js index 2be7faf934b6ae7ccab053138fa54d31eeecfc28..02ac4d1655844fb11b0d79b706e9e668f2805acd 100644 --- a/src/player/managePersonalAffairs.js +++ b/src/player/managePersonalAffairs.js @@ -473,7 +473,7 @@ App.UI.managePersonalAffairs = function() { reputationDiv.append(breeding()); } - if (PC.preg === 0 && PC.pregWeek === 0) { + if (PC.preg === 0 && PC.pregWeek === 0 && PC.vagina > -1) { reputationDiv.append( cumTap(), impregnateSelf(),