diff --git a/src/js/futureSocietyJS.js b/src/js/futureSocietyJS.js index db9b215b112286b2da03160bdb42e532e8a46ad4..6ef58d3fbf185ce6ccefb667d087a1125a08e1c4 100644 --- a/src/js/futureSocietyJS.js +++ b/src/js/futureSocietyJS.js @@ -170,7 +170,7 @@ window.FutureSocieties = (function() { // nothing to do } else if (activeFS === undefined) { // eslint-disable-next-line no-console - console.log(`Error: $${decoration} is ${V[decoration]}`); + console.log(`Error: ${decoration} is ${V[decoration]}`); V[decoration] = "standard"; } else if (!Number.isFinite(V.arcologies[0][activeFS])) { if (V.arcologies[0][activeFS] !== "unset") { diff --git a/src/js/surgery.js b/src/js/surgery.js index e728e596dfa269b014f6e57b6d5b70e0a9f5d7e7..d8400c1661cf80e4e3f279c698054d4263fc6940 100644 --- a/src/js/surgery.js +++ b/src/js/surgery.js @@ -405,7 +405,7 @@ App.Medicine.Surgery.sizingProcedures = function() { } else if (slave.butt > 19) { r.push(App.Medicine.Surgery.makeImpossibleOption(types.fillUp, "Increase butt", `<em>${His} butt is as large as it can possibly get</em>`)); } else if (slave.butt > 7 && !largeImplantsAvailable && thisArcology.FSAssetExpansionist === "unset" && slave.buttImplantType !== 1) { - r.push(App.Medicine.Surgery.makeImpossibleOption(types.installImplant, "Increase butt", `<em>${His} butt is as large as $${he} can physically support</em>`)); + r.push(App.Medicine.Surgery.makeImpossibleOption(types.installImplant, "Increase butt", `<em>${His} butt is as large as ${he} can physically support</em>`)); } else if (slave.buttImplant > 7 && !largeImplantsAvailable && slave.buttImplantType !== 1) { r.push(App.Medicine.Surgery.makeImpossibleOption(types.installImplant, "Increase butt", `<em>${His} butt implants are filled to capacity</em>`)); } else if (slave.buttImplant === 0) { diff --git a/src/js/utilJS.js b/src/js/utilJS.js index 492fc657a95f35ee0caa61c545b91b95aaaaca6a..a38ff5f47e0f0d8e1cf57c973e26f64d6ea27d8c 100644 --- a/src/js/utilJS.js +++ b/src/js/utilJS.js @@ -2182,8 +2182,8 @@ window.pronounReplacer = function(slavetext) { slavetext = slavetext.replace(/\bShe\b/g, "$He"); slavetext = slavetext.replace(/\bher\b/g, "$his"); slavetext = slavetext.replace(/\bHer\b/g, "$His"); - slavetext = slavetext.replace(/\bgirl\b/g, "$girl"); - slavetext = slavetext.replace(/\bwoman\b/g, "$woman"); + slavetext = slavetext.replace(/\b girl\b/g, " $girl"); + slavetext = slavetext.replace(/\b woman\b/g, " $woman"); break; default: if ((slavetext.includes("was serving the public")) || (slavetext.includes("You bought her from"))) { @@ -2198,8 +2198,8 @@ window.pronounReplacer = function(slavetext) { slavetext = slavetext.replace(/\bShe\b/g, "$He"); slavetext = slavetext.replace(/\bher\b/g, "$his"); slavetext = slavetext.replace(/\bHer\b/g, "$His"); - slavetext = slavetext.replace(/\bgirl\b/g, "$girl"); - slavetext = slavetext.replace(/\bwoman\b/g, "$woman"); + slavetext = slavetext.replace(/\b girl\b/g, " $girl"); + slavetext = slavetext.replace(/\b woman\b/g, " $woman"); } break; } diff --git a/src/pregmod/forceFeeding.tw b/src/pregmod/forceFeeding.tw index 804efce856df2f16417cc662ed5f00e28e52c89a..7f215aae01d6e498a9b72123d3c394650f8d2d7b 100644 --- a/src/pregmod/forceFeeding.tw +++ b/src/pregmod/forceFeeding.tw @@ -99,7 +99,7 @@ $He is going to eat it all and you're going to enjoy $him as $he does it. <</if>> <</if>> <<if $activeSlave.fetish == "mindbroken">> - You reach out and wrap you arms + You reach out and wrap youe arms <</if>> around $his @@ -138,16 +138,11 @@ You hold $him tight as you pull $his meal closer, dip in a cup and bring it to $ <<if $activeSlave.fetish == "mindbroken">> It takes little effort to get $him to gulp down the contents <<elseif $activeSlave.devotion < -20>> - $He struggles in your lap and refuses to open $his mouth. - You drop the cup back into the bucket and lean in close. - You quickly clip $his nose shut, eliciting a panicked thrash from the $girl. + $He struggles in your lap and refuses to open $his mouth. You drop the cup back into the bucket and lean in close. You quickly clip $his nose shut, eliciting a panicked thrash from the $girl. <<if $activeSlave.amp != 1>> You warn $him that $his punishment will be severe if $he comes that close to kicking over the buckets again. <</if>> - With $his mouth forced open, you now have a clear avenue with which to pour the slave food into $his mouth. - $He sputters as $he struggles to swallow with $his nose shut. - After several cups, tears are streaming down $his face from the discomfort. - Weeping, $he implores you to remove the clamp so that $he may drink like a good $girl. + With $his mouth forced open, you now have a clear avenue with which to pour the slave food into $his mouth. $He sputters as $he struggles to swallow with $his nose shut. After several cups, tears are streaming down $his face from the discomfort. Weeping, $he implores you to remove the clamp so that $he may drink like a good $girl. <<elseif $activeSlave.fetish == "submissive">> $He submissively drinks the contents and readies $his lips for the next, <<elseif $activeSlave.behavioralFlaw == "gluttonous">> diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw index be86c8f0a3f05d866921a887a98b99165562a01b..0b1611149a0a7ad17e9d2536f0ce054883acf972 100644 --- a/src/pregmod/newChildIntro.tw +++ b/src/pregmod/newChildIntro.tw @@ -28,7 +28,7 @@ <</if>> <</if>> -You completed the legalities before heading to $incubatorName, knowing the tank will release $him on your approach, and instruct $assistantName to notify the new girl's parents to meet you in your office. As the tank exhumes the disoriented $girl, you help $him to $his feet<<if $incubatorReproductionSetting > 1>>, making sure to feel-up $his overdeveloped body,<</if>> and walk $him to your penthouse. Though first you must decide upon a name for the new $girl; it won't take long to reach your office, so you have only @@.orange;one chance to name $him@@ before you arrive. +You completed the legalities before heading to $incubatorName, knowing the tank will release $him on your approach, and instruct $assistantName to notify the new $girl's parents to meet you in your office. As the tank exhumes the disoriented $girl, you help $him to $his feet<<if $incubatorReproductionSetting > 1>>, making sure to feel-up $his overdeveloped body,<</if>> and walk $him to your penthouse. Though first you must decide upon a name for the new $girl; it won't take long to reach your office, so you have only @@.orange;one chance to name $him@@ before you arrive. <span id="naming"> <br>Choose a name for $him. <<textbox "$activeSlave.slaveName" $activeSlave.slaveName>> <<link "Commit name.">> diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw index 6a288d87b828328e7ae7c67c453c4b44a49be21e..9fa5fd46e93f9b8d9911db0510c19926c4b57470 100644 --- a/src/pregmod/widgets/bodyswapWidgets.tw +++ b/src/pregmod/widgets/bodyswapWidgets.tw @@ -124,7 +124,7 @@ <<set $args[0].chastityVagina = $args[1].chastityVagina>> <<set $args[0].chastityPenis = $args[1].chastityPenis>> <<set $args[0].chastityAnus = $args[1].chastityAnus>> -<<if def $args[0].custom && def $args[1].custom>> +<<if (def $args[0].custom) && (def $args[1].custom)>> <<set $args[0].custom.tattoo = $args[1].custom.tattoo>> <</if>> <<set $args[0].bellyTat = $args[1].bellyTat>> diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index d8b4299533839adc82e161b9378a12065613b3e1..fe2bd89bad2f932198862daeba53bf8b0de85006 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -1,7 +1,7 @@ :: pregmod widgets [nobr widget] <<widget "initPC">> - <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, genes: "XY", pronoun: "he", possessive: "him", object: "his", dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, fertKnown: 0, fertPeak: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, lactation: 0, lactationDuration: 0, career: "capitalist", rumor: "wealth", birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", pupil: "circular", sclerae: "white", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, birthLab: 0, birthFutaSis: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 100, face: 100, faceShape: "normal", actualAge: 35, physicalAge: 35, visualAge: 35, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, reservedChildrenNursery: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35, eggType: "human", ballType: "human", storedCum: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", fetish: "none", pubicHStyle: "hairless", underArmHStyle: "hairless", geneticQuirks: {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, mGain: 0, mLoss: 0, androgyny: 0, girlsOnly: 0}}>> + <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, genes: "XY", pronoun: "he", possessive: "him", object: "his", dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, fertKnown: 0, fertPeak: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, lactation: 0, lactationDuration: 0, career: "capitalist", rumor: "wealth", birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "light", origSkin: "light", markings: "none", eyeColor: "blue", origEye: "blue", pupil: "circular", sclerae: "white", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, birthLab: 0, birthFutaSis: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 100, face: 100, faceShape: "normal", actualAge: 35, physicalAge: 35, visualAge: 35, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, reservedChildrenNursery: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35, eggType: "human", ballType: "human", storedCum: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", fetish: "none", pubicHStyle: "hairless", underArmHStyle: "hairless", geneticQuirks: {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, mGain: 0, mLoss: 0, androgyny: 0, girlsOnly: 0}}>> <<set WombInit($PC)>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index b13dd6261b173491d1520ce8bd8ea131e842e1c2..619f7fbba025eb46da643b1ae39ba5f3f50a373b 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -66,11 +66,11 @@ <<unset $badNames>> <</if>> -<<if (def $origin) || def $origins>> +<<if (def $origin) || (def $origins)>> <<unset $origin, $origins>> <</if>> -<<if (def $hare1) || def $hareSpeed1>> +<<if (def $hare1) || (def $hareSpeed1)>> <<unset $hare1, $hare2, $hare3, $hareSpeed, $hareSpeed1, $hareSpeed2, $hareSpeed3, $origin1, $origin2, $origin3, $LurcherSpeed>> <</if>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 9438e10f10514336dd86f0cae0accbbbe0226e23..71d19f334cdbcc30d2a87f9a0b9ae9677fcae1a5 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -16500,7 +16500,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He <br><br> Once $he's in position, you <<if $activeSlave.butt > 12>> - struggle to wrap you arms around $his bountiful buttcheeks, + struggle to wrap your arms around $his bountiful buttcheeks, <<elseif $activeSlave.butt > 7>> heft $his ridiculous buttcheeks possessively, <<elseif $activeSlave.butt > 4>> @@ -19384,7 +19384,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He <<link "Gently acclimate $him to the age difference with some lovemaking">> <<EventNameDelink $activeSlave>> <<replace "#result">> - As you cross the breadth of your office to reach $activeSlave.slaveName, $he presents $himself for your sexual usage out of habit. However, you take $him by surprise by drawing $him into you arms, running the tips of your fingers through $his $activeSlave.hColor hair, and looking into $his <<= App.Desc.eyeColor($activeSlave)>> eyes. <<if canSee($activeSlave)>>$He meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years your senior $he is<<else>>$He seems to feel the intensity of your gaze despite $his sightless eyes and blushes girlishly, as if forgetting how many years your senior $he is<</if>>. In lieu of words, you lift $his chin with a single beckoning finger and steal $his breath from $his lips with a firm kiss. Once $he's recovered $his wits $he clings to you with almost animalistic attachment. After a few moments $he moves to get down on $his knees, clearly defaulting to $his role as a sex slave in response to your unexpected intimacy. Instead, you + As you cross the breadth of your office to reach $activeSlave.slaveName, $he presents $himself for your sexual usage out of habit. However, you take $him by surprise by drawing $him into your arms, running the tips of your fingers through $his $activeSlave.hColor hair, and looking into $his <<= App.Desc.eyeColor($activeSlave)>> eyes. <<if canSee($activeSlave)>>$He meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years your senior $he is<<else>>$He seems to feel the intensity of your gaze despite $his sightless eyes and blushes girlishly, as if forgetting how many years your senior $he is<</if>>. In lieu of words, you lift $his chin with a single beckoning finger and steal $his breath from $his lips with a firm kiss. Once $he's recovered $his wits $he clings to you with almost animalistic attachment. After a few moments $he moves to get down on $his knees, clearly defaulting to $his role as a sex slave in response to your unexpected intimacy. Instead, you <<if $activeSlave.belly >= 300000>> help $him to $his feet and guide $him to bed, aiding the <<if $activeSlave.bellyPreg >= 3000>>child-laden<<else>>tremendously swollen<</if>> older $woman onto the sheets before gently mounting $him. <<else>> @@ -19508,7 +19508,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He <<link "Gently acclimate $him to the age difference with some lovemaking">> <<EventNameDelink $activeSlave>> <<replace "#result">> - As you cross the breadth of your office to reach $activeSlave.slaveName, $he presents $himself for your sexual usage out of habit. However, you take $him by surprise by drawing $him into you arms, running the tips of your fingers through $his $activeSlave.hColor hair, and looking into $his <<= App.Desc.eyeColor($activeSlave)>> eyes. <<if canSee($activeSlave)>>$He meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years $his senior you are<<else>>$He seems to feel the intensity of your gaze despite $his sightless eyes and blushes girlishly, as if forgetting how many years $his senior you are<</if>>. In lieu of words, you lift $his chin with a single beckoning finger and steal $his breath from $his lips with a firm kiss. Once $he's recovered $his wits $he clings to you with almost animalistic attachment. After a few moments $he moves to get down on $his knees, clearly defaulting to $his role as a sex slave in response to your unexpected intimacy. + As you cross the breadth of your office to reach $activeSlave.slaveName, $he presents $himself for your sexual usage out of habit. However, you take $him by surprise by drawing $him into your arms, running the tips of your fingers through $his $activeSlave.hColor hair, and looking into $his <<= App.Desc.eyeColor($activeSlave)>> eyes. <<if canSee($activeSlave)>>$He meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years $his senior you are<<else>>$He seems to feel the intensity of your gaze despite $his sightless eyes and blushes girlishly, as if forgetting how many years $his senior you are<</if>>. In lieu of words, you lift $his chin with a single beckoning finger and steal $his breath from $his lips with a firm kiss. Once $he's recovered $his wits $he clings to you with almost animalistic attachment. After a few moments $he moves to get down on $his knees, clearly defaulting to $his role as a sex slave in response to your unexpected intimacy. Instead, you <<if $activeSlave.belly >= 300000>> help $him to $his feet and guide $him to bed, aiding the diff --git a/src/uncategorized/saGetMilked.tw b/src/uncategorized/saGetMilked.tw index 6afaeef6f81984bd4a087e8ffe72dbf3ba19af1a..c2a93bfa688f8a295e01d45c4ad59fcc1fd74aa0 100644 --- a/src/uncategorized/saGetMilked.tw +++ b/src/uncategorized/saGetMilked.tw @@ -318,7 +318,7 @@ gets milked this week. butt is machine-fucked <</if>> to extract the cum from $his - <<if !$slaves[$i].scrotum>> + <<if ($slaves[$i].scrotum == 0)>> invisible <<else>> <<switch $slaves[$i].balls>>