diff --git a/src/endWeek/player/prHormones.js b/src/endWeek/player/prHormones.js index 10b6f7a1d96a930441fad414ff1426e7d8fcba5c..b6a88f8bc4e0099026d93b54d02fe5982939a198 100644 --- a/src/endWeek/player/prHormones.js +++ b/src/endWeek/player/prHormones.js @@ -197,7 +197,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) { PC.butt += 0.2; } } - if (PC.vagina > -1 && PC.ovaries !== 0 && PC.vaginaLube < 2) { + if (PC.vagina !== -1 && PC.ovaries !== 0 && PC.vaginaLube < 2) { effects.push(`<span class="change positive">pussy to produce more lubricant`); PC.vaginaLube++; } @@ -283,7 +283,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) { PC.butt += 0.2; } } - if (PC.vagina > -1 && PC.ovaries !== 0 && PC.vaginaLube < 2) { + if (PC.vagina !== -1 && PC.ovaries !== 0 && PC.vaginaLube < 2) { effects.push(`<span class="change positive">pussy to produce more lubricant`); PC.vaginaLube++; } @@ -369,7 +369,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) { PC.butt += 0.2; } } - if (PC.vagina > -1 && PC.ovaries !== 0 && PC.vaginaLube < 1) { + if (PC.vagina !== -1 && PC.ovaries !== 0 && PC.vaginaLube < 1) { effects.push(`<span class="change positive">pussy to produce more lubricant`); PC.vaginaLube++; } @@ -453,7 +453,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) { PC.butt += 0.2; } } - if (PC.vagina > -1 && PC.ovaries !== 0 && PC.vaginaLube < 1) { + if (PC.vagina !== -1 && PC.ovaries !== 0 && PC.vaginaLube < 1) { effects.push(`<span class="change positive">pussy to produce more lubricant`); PC.vaginaLube++; } @@ -578,7 +578,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) { PC.balls++; } - if (PC.clit < 5 && PC.dick === 0 && PC.vagina >= 0) { + if (PC.clit < 5 && PC.dick === 0 && PC.vagina !== -1) { effects.push(`<span class="change positive">clit to swell`); PC.clit++; } @@ -651,7 +651,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) { PC.balls++; } - if (PC.clit < 4 && PC.dick === 0 && PC.vagina >= 0) { + if (PC.clit < 4 && PC.dick === 0 && PC.vagina !== -1) { effects.push(`<span class="change positive">clit to swell`); PC.clit++; } @@ -720,7 +720,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) { PC.balls++; } - if (PC.clit < 3 && PC.dick === 0 && PC.vagina >= 0) { + if (PC.clit < 3 && PC.dick === 0 && PC.vagina !== -1) { effects.push(`<span class="change positive">clit to swell`); PC.clit++; } @@ -787,7 +787,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) { PC.balls++; } - if (PC.clit < 2 && PC.dick === 0 && PC.vagina >= 0) { + if (PC.clit < 2 && PC.dick === 0 && PC.vagina !== -1) { effects.push(`<span class="change positive">clit to swell`); PC.clit++; } diff --git a/src/endWeek/player/prLongTermPhysicalEffects.js b/src/endWeek/player/prLongTermPhysicalEffects.js index 85635ff42bf26a8caa5db0b3461c4b02563a1df7..0587c85cda2cdbc74ccc279b39fa909014c1fa70 100644 --- a/src/endWeek/player/prLongTermPhysicalEffects.js +++ b/src/endWeek/player/prLongTermPhysicalEffects.js @@ -308,7 +308,7 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) { PC.energy++; } PC.energy = Math.max(PC.energy, 0); - if (PC.pubertyXX === 1 && PC.vagina >= 0) { + if (PC.pubertyXX === 1 && PC.vagina !== -1) { if (PC.energy > 60 && PC.vaginaLube === 0 && (V.policies.sexualOpenness === 1 || averageDicking.length > 0) && random(1, 100) > 95) { r.push(`With all the excitement in your life, your formerly dry pussy <span class="change positive">starts moistening up.</span>`); PC.vaginaLube++; @@ -772,7 +772,7 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) { } if (PC.geneticQuirks.uterineHypersensitivity === 2) { - if (PC.vaginaLube < 2 && PC.preg >= PC.pregData.normalBirth * .75) { + if (PC.vaginaLube < 2 && PC.vagina !== -1 && PC.preg >= PC.pregData.normalBirth * .75) { r.push(`You're so pregnant and so horny${V.geneticMappingUpgrade >= 1 ? ", thanks to your hypersensitive uterus," : ""} that it comes as little surprise when your cunt <span class="change positive">starts producing more sexual fluids.</span>`); PC.vaginaLube += 1; } diff --git a/src/endWeek/saAgent.js b/src/endWeek/saAgent.js index 35e2ab91b3eeb24665971cd370bbb90b814c8477..01e9659abe2672f2ccca10d7df29fef18a45c1f5 100644 --- a/src/endWeek/saAgent.js +++ b/src/endWeek/saAgent.js @@ -590,7 +590,7 @@ App.SlaveAssignment.agent = function(slave) { } if (slave.geneticQuirks.uterineHypersensitivity === 2) { - if (slave.vaginaLube < 2 && slave.vagina > 0 && random(70 - slave.physicalAge, 200) < slave.hormoneBalance) { + if (slave.vaginaLube < 2 && slave.vagina !== -1 && random(70 - slave.physicalAge, 200) < slave.hormoneBalance) { slave.vaginaLube += 1; } if (slave.geneMods.NCS === 0) { diff --git a/src/endWeek/saHormonesEffects.js b/src/endWeek/saHormonesEffects.js index 5603bca02f92c57b858bb72694be982c683226a3..f53743e6c642a26a55a5e0b3b4663c5b5a85b0c1 100644 --- a/src/endWeek/saHormonesEffects.js +++ b/src/endWeek/saHormonesEffects.js @@ -171,7 +171,7 @@ App.SlaveAssignment.hormonesEffects = function saHormonesEffects(slave) { * @param {number} maxWetness */ function increaseWetness(slave, maxWetness) { - if (slave.vagina > -1 && slave.ovaries !== 0 && slave.vaginaLube < maxWetness) { + if (slave.vagina !== -1 && slave.ovaries !== 0 && slave.vaginaLube < maxWetness) { r.push(`Hormonal effects cause <span class="lime">${his} vagina to produce more copious natural lubricant.</span>`); slave.vaginaLube++; } diff --git a/src/endWeek/saLongTermEffects.js b/src/endWeek/saLongTermEffects.js index c1cd74bb10a7a5121f603eb69737ecfde5e849e0..e9225a4c1aecacf5a39b35f199dd2bd67124dc2b 100644 --- a/src/endWeek/saLongTermEffects.js +++ b/src/endWeek/saLongTermEffects.js @@ -565,7 +565,7 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) { if (slave.voice.isBetween(0, 3)) { Effects.push("VoiceHigher"); } - if (slave.vagina > -1 && slave.ovaries !== 0 && slave.vaginaLube < 2) { + if (slave.vagina !== -1 && slave.ovaries !== 0 && slave.vaginaLube < 2) { Effects.push("VaginaWetter"); } let rearQuirkDivider = rearQuirk === 0 ? 1 : rearQuirk; @@ -922,7 +922,7 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) { slave.boobs -= 50 / gigantomastiaMod; } if (slave.geneMods.NCS === 0) { - if (slave.clit < 2 && slave.vagina >= 0 && slave.dick === 0 && random(1, 100) < 10) { + if (slave.clit < 2 && slave.vagina !== -1 && slave.dick === 0 && random(1, 100) < 10) { r.push(`${He} feels <span class="change positive">unusual warmness</span> in ${his} clitoris.`); slave.clit += 1; } @@ -946,7 +946,7 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) { r.push(`${He} feels a <span class="change positive">strange weight</span> on ${his} rear.`); slave.butt += 1; } - if (slave.labia < 2 && slave.vagina >= 0 && random(1, 100) < 10) { + if (slave.labia < 2 && slave.vagina !== -1 && random(1, 100) < 10) { r.push(`${He} feels an <span class="change positive">unusual tenderness</span> in ${his} labia.`); slave.labia += 1; } diff --git a/src/endWeek/saLongTermPhysicalEffects.js b/src/endWeek/saLongTermPhysicalEffects.js index bd824d82c785374fdc45717e90432a00707fa61c..34e25c2bef9b65336ed716ffd4251dc6c66db3f1 100644 --- a/src/endWeek/saLongTermPhysicalEffects.js +++ b/src/endWeek/saLongTermPhysicalEffects.js @@ -1022,7 +1022,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects } if (slave.geneticQuirks.uterineHypersensitivity === 2) { - if (slave.vaginaLube < 2 && slave.preg >= slave.pregData.normalBirth * .75) { + if (slave.vaginaLube < 2 && slave.vagina !== -1 && slave.preg >= slave.pregData.normalBirth * .75) { if (V.geneticMappingUpgrade >= 1) { r.push(`${His} vagina begins to <span class="change positive">produce more sexual fluids</span> as the stimulation to ${his} hypersensitive uterus nears its climax.`); } else { diff --git a/src/endWeek/saPleaseYou.js b/src/endWeek/saPleaseYou.js index b1b494e55e1bc433ec362c3160a28c41c96e1beb..7b0b8bad73dbbc67aabe956b1ef7dd29e1b336d7 100644 --- a/src/endWeek/saPleaseYou.js +++ b/src/endWeek/saPleaseYou.js @@ -1477,7 +1477,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) { r.push(`fatigued,`); } if (!canFuck) { - r.push(`though the fact that ${his} job isn't very strenuous helps.`); + r.push(`</span> though the fact that ${his} job isn't very strenuous helps.`); } else { if (slave.health.illness !== 0) { r.push(`</span> making ${him} rather unappealing to use.`); diff --git a/src/endWeek/saPregnancy.js b/src/endWeek/saPregnancy.js index 02e08dc3c95cd56643ef2f2f5bd83636706f5b93..37030fa7d0c047540b3c398249854c8a56df0143 100644 --- a/src/endWeek/saPregnancy.js +++ b/src/endWeek/saPregnancy.js @@ -309,7 +309,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) { } if (slave.pregSource === slave.ID) { if (slave.sexualQuirk === "perverted") { - r.push(`${He}'s <span class="devotion inc">aroused</span> at the mere concept that the bab${slave.pregType > 1 ? "ies" : "y"} growing inside ${him} was conceived by ${his} own sperm.`); + r.push(`${He}'s <span class="devotion inc">aroused</span> at the mere concept that the bab${slave.pregType > 1 ? "ies" : "y"} growing inside ${him} ${slave.pregType > 1 ? "were" : "was"} conceived by ${his} own sperm.`); slave.devotion += 1; } else { r.push(`${He} often becomes preoccupied with <span class="trust dec">worry</span> that ${his} self-conceived ${child} will be born unhealthy.`); diff --git a/src/endWeek/shared/physicalDevelopment.js b/src/endWeek/shared/physicalDevelopment.js index 3765d58dfe0aa2c4b1a09ef33d9f7d7a69b97db0..b420ae3472301734157c2bdbefedd6865958155f 100644 --- a/src/endWeek/shared/physicalDevelopment.js +++ b/src/endWeek/shared/physicalDevelopment.js @@ -37,7 +37,7 @@ App.EndWeek.Shared.physicalDevelopment = function(actor, player = false) { if (actor.balls.isBetween(0, 3)) { increaseBalls(actor); } - if (actor.vagina > 0 && actor.ovaries > 0 && physicalAgeSwap > actor.pubertyAgeXX) { + if (actor.vagina !== -1 && actor.ovaries > 0 && physicalAgeSwap > actor.pubertyAgeXX) { increaseWetness(actor); } if (actor.waist < 10) { diff --git a/src/npc/interaction/slaveOnSlaveFeeding/fSlaveFeed.js b/src/npc/interaction/slaveOnSlaveFeeding/fSlaveFeed.js index c4a00309ea001e1a9d9c725596b6d90fbef62d06..24c88a5261cf1102b3eeb8d5db47d0fabe8b5476 100644 --- a/src/npc/interaction/slaveOnSlaveFeeding/fSlaveFeed.js +++ b/src/npc/interaction/slaveOnSlaveFeeding/fSlaveFeed.js @@ -18,7 +18,8 @@ globalThis.FSlaveFeed = function(slave, milkTap) { slave.bellyAccessory = "none"; } - App.Events.drawEventArt(el, [slave, milkTap]); + let artDiv = document.createElement("div"); // named container so we can replace it later + el.appendChild(artDiv); if (slave.inflationType === "milk") { slave.milkSource = milkTap.ID; @@ -2071,5 +2072,6 @@ globalThis.FSlaveFeed = function(slave, milkTap) { } App.Events.addNode(el, r, "p"); SetBellySize(slave); + App.Events.drawEventArt(artDiv, [slave, milkTap]); return el; };