diff --git a/src/npc/children/childSummary.js b/src/npc/children/childSummary.js index ba8fad3da9c97de5236c7d4d1e1b14a73ef438d3..c91ea74877b4b9d727eb0df66e226e3ba35fd58f 100644 --- a/src/npc/children/childSummary.js +++ b/src/npc/children/childSummary.js @@ -2306,7 +2306,7 @@ App.Facilities.Nursery.ChildSummary = function(child) { } r += `</span>`; - // If no NCS, then do the standard - however, due to the wrinkles of the Incubator, as long as visual age is greater + // If no NCS, then do the standard - however, due to the wrinkles of the Incubator, as long as visual age is greater // than or equal to physical age, we do the old physical body/Looks for fresh out of the can NCS slaves. if (((child.geneMods.NCS === 0) || (child.visualAge >= child.physicalAge))) { diff --git a/src/npc/generate/generateRelatedSlave.js b/src/npc/generate/generateRelatedSlave.js index 96c0c5aa34c14c4a4a2b3dc43bf8545fb1402472..58464cbc6dfe07527c68518d07a5a8100c3bd5c8 100644 --- a/src/npc/generate/generateRelatedSlave.js +++ b/src/npc/generate/generateRelatedSlave.js @@ -5,7 +5,7 @@ globalThis.generateRelatedSlave = (function() { * Generate a very similar relative for an existing slave (for use in Household Liquidators, for example). * @param {App.Entity.SlaveState} slave - the source relative. Note: this slave is NOT changed, calling code is responsible for setting up the source end of the relationship! * @param {string} relationship - the relationship that the new relative has with the source. Currently supports "parent", "child", "older sibling", "younger sibling", "twin", and applicable gender-specific variants of those (i.e. mother/father, daughter/son, older/younger brother/sister). - * @param {boolean} oppositeSex - set to true if the new relative should be the opposite sex of the old one (otherwise it will be the same sex). will be ignored if gender is implied by relationship. + * @param {boolean} oppositeSex - set to true if the new relative should be the opposite sex of the old one (otherwise it will be the same sex). will be ignored if gender is implied by relationship. * @returns {App.Entity.SlaveState} - new relative */ function generateRelative(slave, relationship, oppositeSex=false) { diff --git a/src/npc/generate/newSlaveIntro.js b/src/npc/generate/newSlaveIntro.js index 1a1f214ec93465566cc1cb7d9866749c98a3b261..97b259e59d1a967ecd5ef5e8bdc8a4607b82effd 100644 --- a/src/npc/generate/newSlaveIntro.js +++ b/src/npc/generate/newSlaveIntro.js @@ -2128,11 +2128,11 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest = } else { r.push(`your`); } - r.push(`view. It depicts the silhouette of a pregnant woman, with a red "X" over it. Abortifacients. After an`); + r.push(`view. It depicts the silhouette of a pregnant woman, with a red "X" over it. Abortifacients. After`); if (!canSee(slave)) { - r.push(`short period`); + r.push(`a short period`); } else { - r.push(`instant`); + r.push(`an instant`); } r.push(`of horrified comprehension, ${he} flings ${himself} at your feet, crying, begging, promising. ${He} pledges to <span class="hotpink">submit to you,</span>`); if (V.PC.dick !== 0) { @@ -3279,7 +3279,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest = } else if (slave.dick === 6) { r.push(`functional huge dick.`); } else { - r.push(`functional.`); // Old SC code only went to 6. I'm adding this to fix the period, but this needs writing assuming we can go beyond 6. + r.push(`functional.`); // Old SC code only went to 6. I'm adding this to fix the period, but this needs writing assuming we can go beyond 6. } if (tankBorn) { r.push(`You gently begin fondling ${his} penis, grinning at the look of confusion and lust growing on ${his} face.`); diff --git a/src/npc/interaction/fRival.tw b/src/npc/interaction/fRival.tw index 22090c6aac697ed83a4820a442e82fbd70d0b7ae..978c1e4a9f60cb4ba2d56faa74cd77d2999c2d53 100644 --- a/src/npc/interaction/fRival.tw +++ b/src/npc/interaction/fRival.tw @@ -68,7 +68,7 @@ You call <<= getSlave($AS).slaveName>> to your office and let $him know you'll b <<else>> suck your dick. <</if>> - _He2 does, and once _he2's working away, you tell <<= getSlave($AS).slaveName>> to use the bitch. <<= getSlave(_partnerID).slaveName>> begins to lift _his2 head as though to protest, so you shove _him2 back down onto your + _He2 does, and once _he2's working away, you tell <<= getSlave($AS).slaveName>> to use the bitch. <<= getSlave(_partnerID).slaveName>> begins to lift _his2 head as though to protest, so you shove _him2 back down onto your <<if ($PC.dick == 0)>> pussy, <<else>> diff --git a/src/npc/slaveStats.tw b/src/npc/slaveStats.tw index 082d8df8fff47546e86a357c8829a9afe67dcad1..919f6724fc2072b382710ce1ec7a63a6afca2972 100644 --- a/src/npc/slaveStats.tw +++ b/src/npc/slaveStats.tw @@ -7,7 +7,7 @@ background-color: grey; } </style> -<<set _slave = getSlave($AS)>> +<<set _slave = getSlave($AS)>> <<run App.Utils.setLocalPronouns(_slave)>> <br>Name: _slave.slaveName, diff --git a/src/npc/surgery/surgery.js b/src/npc/surgery/surgery.js index dad460bba00624d6dd3ec77696c74aac459d7c3e..1a51b33059b06747cda05db44392ad27d8614edd 100644 --- a/src/npc/surgery/surgery.js +++ b/src/npc/surgery/surgery.js @@ -1102,8 +1102,8 @@ globalThis.beginFuckdoll = function(slave) { slave.choosesOwnClothes = 0; slave.clothes = "a Fuckdoll suit"; slave.collar = "none"; - slave.faceAccessory = "none"; - slave.mouthAccessory = "none"; + slave.faceAccessory = "none"; + slave.mouthAccessory = "none"; if ((!hasAnyLegs(slave)) || (slave.shoes !== "none")) { slave.shoes = "heels"; } diff --git a/src/pregmod/FCTV/FCTV.css b/src/pregmod/FCTV/FCTV.css index 246efe55940bfb3bb14c119d5f46b315e420a59c..f7a3b69f149ad68fc4437c2355e9f3c0d18bc199 100644 --- a/src/pregmod/FCTV/FCTV.css +++ b/src/pregmod/FCTV/FCTV.css @@ -1,7 +1,6 @@ .FCTV { display: float; } - .fctv-remote { text-align: center; justify-items: center; diff --git a/src/pregmod/FCTV/FCTV.js b/src/pregmod/FCTV/FCTV.js index fdf32b32e601c4ac1cbdfafe5f6e781255357218..b9c32baea5bedba6e475fdb91400275c9f2bade7 100644 --- a/src/pregmod/FCTV/FCTV.js +++ b/src/pregmod/FCTV/FCTV.js @@ -37,7 +37,7 @@ globalThis.FCTV = (function() { } /** - * checks value of selected channel in relation to an arbitrary number. Have we watched it more/less/same than i. + * checks value of selected channel in relation to an arbitrary number. Have we watched it more/less/same than i. * @param {number} selectedChannel * @param {number} i * @param {string} operation eq/gt/lt: equals/greater than/less than. @@ -97,7 +97,7 @@ globalThis.FctvDisplay = function({usedRemote = 0, seeAll = 0, selectedChannel = if (!usedRemote) { p.append(`set FCTV to find a random show. Your larger-than-life screen flashes on, and is soon playing content from the popular streaming service. `); if (V.cheatMode > 0 || V.debugMode > 0 || V.FCTV.remote) { - // Create "Use remote" link. Hide once clicked. + // Create "Use remote" link. Hide once clicked. span = document.createElement("span"); span.id = "use-remote"; span.append( @@ -328,7 +328,7 @@ globalThis.FctvDisplay = function({usedRemote = 0, seeAll = 0, selectedChannel = // Increment the viewing record for this channel V.FCTV.channel[num(selectedChannel, true)]++; - // Slave, if needed. Hosts and market slaves. + // Slave, if needed. Hosts and market slaves. let slave; if (channel.episode[epToShow].slaves) { slave = channel.episode[epToShow].slaves[0]; @@ -381,12 +381,12 @@ globalThis.FctvDisplay = function({usedRemote = 0, seeAll = 0, selectedChannel = return -1; // Nothing to watch, fail. } - if (availableEp > viewedCount) { // If we watched ep 0 last time, our view count will be 1. Now we can use 1 as our new ep, etc. + if (availableEp > viewedCount) { // If we watched ep 0 last time, our view count will be 1. Now we can use 1 as our new ep, etc. epToShow = viewedCount; } else if (channel.loop === true) { - // How many times have we been through this series. Lets say we watched 10 episodes, but there are only 3 uniques [0,1,2]. + // How many times have we been through this series. Lets say we watched 10 episodes, but there are only 3 uniques [0,1,2]. const watchedEntireSeason = Math.trunc(viewedCount / availableEp); // we went through 3 times fully - epToShow = viewedCount - (watchedEntireSeason * availableEp); // 10 - 3 seasons (9) is 1. So our last episode was the first, 0 in the array. And 1 is the next ep! + epToShow = viewedCount - (watchedEntireSeason * availableEp); // 10 - 3 seasons (9) is 1. So our last episode was the first, 0 in the array. And 1 is the next ep! } else { // We have seen all the episodes, return a random one epToShow = jsRandom(0, availableEp-1); } diff --git a/src/pregmod/JobFulfillmentCenterDelivery.tw b/src/pregmod/JobFulfillmentCenterDelivery.tw index a9f6bb403ae326f1096610d7581635445f8b0a56..94e9a6542cabfad7de0d94e4de17b305c025b5b7 100644 --- a/src/pregmod/JobFulfillmentCenterDelivery.tw +++ b/src/pregmod/JobFulfillmentCenterDelivery.tw @@ -2,7 +2,7 @@ <<set $JFC.order = 0, $nextButton = "Continue", $nextLink = "Scheduled Event", $encyclopedia = "Enslaving People">> <<set _slave = generateLeadershipSlave($JFC.role, 'Job Fulfillment Center')>> -<<set _slaveCost = slaveCost(_slave) * 6>> +<<set _slaveCost = slaveCost(_slave) * 6>> <<setLocalPronouns _slave>> <<run App.Utils.setLocalPronouns(_slave)>> diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw index 54c9f0caa16a6ac6d0cd3571d7a3d0a9131260b4..bd5cd97a0e398f7caa1c0675d81c48b203c3fd86 100644 --- a/src/pregmod/widgets/bodyswapWidgets.tw +++ b/src/pregmod/widgets/bodyswapWidgets.tw @@ -195,8 +195,8 @@ <<set $args[0].dietMilk = $args[1].dietMilk>> <<set $args[0].clothes = $args[1].clothes>> <<set $args[0].collar = $args[1].collar>> - <<set $args[0].faceAccessory = $args[1].faceAccessory>> - <<set $args[0].mouthAccessory = $args[1].mouthAccessory>> + <<set $args[0].faceAccessory = $args[1].faceAccessory>> + <<set $args[0].mouthAccessory = $args[1].mouthAccessory>> <<set $args[0].shoes = $args[1].shoes>> <<set $args[0].makeup = $args[1].makeup>> <<set $args[0].nails = $args[1].nails>> diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw index 6b7528b473ba6af9c787aea23e057be0546b039c..cc2aa2e7d8ca175dd224566a353389c6c928b128 100644 --- a/src/uncategorized/REFS.tw +++ b/src/uncategorized/REFS.tw @@ -111,15 +111,15 @@ <<set $activeSlave.clothes = "conservative clothing">> <<case "knightly duel">> - <<set $activeSlaveOneTimeMinAge = 22>> - <<set $activeSlaveOneTimeMaxAge = 34>> + <<set $activeSlaveOneTimeMinAge = 22>> + <<set $activeSlaveOneTimeMaxAge = 34>> <<set $activeSlave = GenerateNewSlave("XY")>> <<set $activeSlave.origin = "$He is a knight. If you have acquired this slave, something has gone wrong.">> <<set $activeSlave.career = "spec ops">> - <<set $activeSlave.devotion = random(-80,-60)>> - <<set $activeSlave.muscles = random(50,75)>> - <<set $activeSlave.skill.combat = 1>> - <<set $activeSlave.behavioralFlaw = "malicious", $activeSlave.behavioralQuirk = "none">> + <<set $activeSlave.devotion = random(-80,-60)>> + <<set $activeSlave.muscles = random(50,75)>> + <<set $activeSlave.skill.combat = 1>> + <<set $activeSlave.behavioralFlaw = "malicious", $activeSlave.behavioralQuirk = "none">> <<set $activeSlave.trust = random(-30,-20)>> <<set $activeSlave.boobs = 150>> <<set $activeSlave.butt = random(0,1)>> @@ -172,14 +172,14 @@ <<set $activeSlave.career = "a child soldier">> <<set $activeSlave.devotion = 100>> <<set $activeSlave.trust = 100>> - <<set $activeSlave.muscles = random(50,75)>> + <<set $activeSlave.muscles = random(50,75)>> <<if $activeSlave.weight > 130>> <<set $activeSlave.weight -= 100>> <<set $activeSlave.waist = random(-10,50)>> <</if>> <<set $activeSlave.fetish = "mindbroken">> <<set $activeSlave.fetishKnown = 1>> - <<set $activeSlave.skill.combat = 1>> + <<set $activeSlave.skill.combat = 1>> <<run configureLimbs($activeSlave, "all", 6)>> <<set $activeSlave.teeth = "pointy">> <<set $activeSlave.earT = "inu">> diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw index c8f7fb34b21dab882b08c299c00c52a5eae39ca1..f01cb6e089b43c9fe7e529aa1c68ec4009bb1735 100644 --- a/src/uncategorized/main.tw +++ b/src/uncategorized/main.tw @@ -17,11 +17,11 @@ <<run SlaveSort.slaves($slaves)>> <<if $newModelUI == 1>> - <<includeDOM V.building.render()>> + <<includeDOM V.building.render()>> <</if>> <<if $seeArcology == 1>> - <<includeDOM App.Desc.playerArcology(App.UI.DOM.combineNodes("| ", App.UI.DOM.passageLink("Hide", "Main", () => {V.seeArcology = 0})))>> + <<includeDOM App.Desc.playerArcology(App.UI.DOM.combineNodes("| ", App.UI.DOM.passageLink("Hide", "Main", () => {V.seeArcology = 0})))>> <</if>> <<if $seeDesk == 1>> diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw index ac6e10d3c29e71e89e7018f723d8df9b95be39ed..8b8a9636a2a252d4db41189b8d33da08cb396b99 100644 --- a/src/uncategorized/newGamePlus.tw +++ b/src/uncategorized/newGamePlus.tw @@ -12,7 +12,7 @@ You have decided to start over and will be able to take a few things with you: a <br><br> <<if $cash >= _fee>> - You have allocated funds to bring up to $slavesToImportMax slaves with you (or your equivalent) to a new arcology. It will cost @@.yellowgreen;<<print cashFormat(_fee)>>@@ to insure another slave's safe transfer. You have @@.yellowgreen;<<print cashFormat($cash)>>@@ to spend. + You have allocated funds to bring up to $slavesToImportMax slaves with you (or your equivalent) to a new arcology. It will cost @@.yellowgreen;<<print cashFormat(_fee)>>@@ to insure another slave's safe transfer. You have @@.yellowgreen;<<print cashFormat($cash)>>@@ to spend. <br>[[Increase slave import capacity by 1.|New Game Plus][cashX(forceNeg(_fee), "capEx"), $slavesToImportMax++]] <<else>> You lack the @@.yellowgreen;<<= cashFormat(_fee)>>@@ needed to bring any more than $slavesToImportMax slaves with you (or your equivalent) to a new arcology. diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw index 460802de5eed474494d0b2c2b54af9b26b206b30..83e8c8043c37fca9aa121d31853b1a5ceea6733b 100644 --- a/src/uncategorized/personalAttentionSelect.tw +++ b/src/uncategorized/personalAttentionSelect.tw @@ -207,7 +207,7 @@ <<link "Break $his will">><<set $personalAttention[_i].trainingRegimen = "break her will">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>> | <<link "Use enhanced breaking techniques">><<set $personalAttention[_i].trainingRegimen = "harshly break her will">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>> <<else>> - Current devotion: <<includeDOM App.UI.personalAttentionDevotionText($activeSlave)>> + Current devotion: <<includeDOM App.UI.personalAttentionDevotionText($activeSlave)>> <<link "Build">><<set $personalAttention[_i].trainingRegimen = "build her devotion">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>> <</if>> diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw index 1a682c7d10f77d68ebcf31080eda6aaa1e753d8e..d26b4c7e3e194899ea7d3f3977efe8389a61610b 100644 --- a/src/uncategorized/randomNonindividualEvent.tw +++ b/src/uncategorized/randomNonindividualEvent.tw @@ -1384,7 +1384,7 @@ <<if $arcologies[0].FSNeoImperialist > (random(25,100) || $cheatMode+24) && $arcologies[0].FSNeoImperialistLaw2 == 1>> <<set $REFSevent.push("baron demand")>> <</if>> - <<if $arcologies[0].FSNeoImperialist > (random(25,100) || $cheatMode+24) && $arcologies[0].FSNeoImperialistLaw2 == 1 && $arcologies[0].FSNeoImperialistLaw1 == 1 && $policies.regularParties == 1>> + <<if $arcologies[0].FSNeoImperialist > (random(25,100) || $cheatMode+24) && $arcologies[0].FSNeoImperialistLaw2 == 1 && $arcologies[0].FSNeoImperialistLaw1 == 1 && $policies.regularParties == 1>> <<set $REFSevent.push("feast")>> <</if>> <<if $arcologies[0].FSNeoImperialist > (random(25,100) || $cheatMode+24)>> diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw index 1f9abef4f4737f4080951247f8eb507f48ec0d08..135cb9796ba0740b0561efdc9158467aeee5468f 100644 --- a/src/uncategorized/reFSAcquisition.tw +++ b/src/uncategorized/reFSAcquisition.tw @@ -1556,7 +1556,7 @@ The call comes in from an old world university. The caller is a young $woman who You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were. <br><br> -The call comes in from a private old world apartment. The caller is a $woman who speaks in a gruff and serious tone, explaining that $he was a soldier in an Old World military who served with distinction for years before being dishonorably discharged due to some incident that $he refuses to talk about when you ask. $He says that there's no room left for tired dogs in the crumbling economy of the old world for those without money, and $his only real options are to submit to menial servitude or open slavery. $He says that $he's heard that your Imperial society values warriors and honor, and that $he'd prefer living somewhere where $his skills are worth something - even as a slave. At your request, $he sends over a dossier containing $his personal data. +The call comes in from a private old world apartment. The caller is a $woman who speaks in a gruff and serious tone, explaining that $he was a soldier in an Old World military who served with distinction for years before being dishonorably discharged due to some incident that $he refuses to talk about when you ask. $He says that there's no room left for tired dogs in the crumbling economy of the old world for those without money, and $his only real options are to submit to menial servitude or open slavery. $He says that $he's heard that your Imperial society values warriors and honor, and that $he'd prefer living somewhere where $his skills are worth something - even as a slave. At your request, $he sends over a dossier containing $his personal data. <<case "Aztec Revivalist">> diff --git a/src/uncategorized/resEndowment.tw b/src/uncategorized/resEndowment.tw index 5618653f503cafe07811eca5d0ec36e0ca448322..4ee11846653f60e98589cd2e39651c86f5f25dba 100644 --- a/src/uncategorized/resEndowment.tw +++ b/src/uncategorized/resEndowment.tw @@ -45,7 +45,7 @@ <<default>> /* TSS */ provide good quality slaves at competitive prices." <</switch>> - + Getting down to the business advantages, he adds that "donors receive considerable price advantage on future _SCH.nickname," which seems to translate into a discount of around 20% once the sales language is stripped off it. You point out that's bordering on pointlessness to you, given your ability to purchase almost anything you wish; he hesitates, but then admits that "as our foremost supporter" you could use an endowment to guide school policy to an extent. <</if>> diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw index 0533a7397d14384d26d877f9ba9f3516b9436680..59f024937921d11149d4655d1d8595328a0f584b 100644 --- a/src/uncategorized/surgeryDegradation.tw +++ b/src/uncategorized/surgeryDegradation.tw @@ -882,11 +882,11 @@ As the remote surgery's long recovery cycle completes, $He notices almost immediately that $his breasts feel fuller, gasping as milk begins to leak from $his nipples. As with all surgery @@.health.dec;$his health has been slightly affected.@@ <<elseif (getSlave($AS).devotion > 50)>> <<if hasAnyArms(getSlave($AS))>> - $He hefts $his swollen breasts experimentally and turns to you with a smile to show them off. + $He hefts $his swollen breasts experimentally and turns to you with a smile to show them off. <<if getSlave($AS).lactation == 1>> $His milk begins to flow as $he does, but instead of a slight dribble, it keeps coming. <<else>> - As $he does, a drop of milk drips from a nipple and $he gasps in surprise. + As $he does, a drop of milk drips from a nipple and $he gasps in surprise. <</if>> $He's shocked, but after <<if canTaste(getSlave($AS))>>tasting<<else>>licking up<</if>> $his own milk experimentally $he <<if canSee(getSlave($AS))>>looks<<else>>smiles<</if>> at you shyly and gently teases some more milk out of $himself. The resulting stream of cream is bountiful and $he giggles happily. <<else>> @@ -909,7 +909,7 @@ As the remote surgery's long recovery cycle completes, <</if>> a few experimental pokes and rubs at $himself $he seems to understand that $he's a lactation slave now, and that's how it is. <<else>> - As you carry $him out of the surgery, droplets of milk begin to bud from $his + As you carry $him out of the surgery, droplets of milk begin to bud from $his <<if getSlave($AS).lactation == 1>> nipples; $he was already lactating, but it never just flowed freely like this. <<else>> @@ -922,7 +922,7 @@ As the remote surgery's long recovery cycle completes, <<else>> <<if canSee(getSlave($AS))>>$He eyes $his swollen breasts<<else>>As $he feels the fullness in $his breasts, $his face fills<</if>> with resentment. $He still thinks of $himself as a person, so $he isn't used to the idea of being surgically altered to suit your every whim. <<if getSlave($AS).lactation == 1>> - As milk begins to bead at $his nipples, $he breaks down in rage and unhappiness, dripping bitter tears as the flow steadily increases past what $he was used to. + As milk begins to bead at $his nipples, $he breaks down in rage and unhappiness, dripping bitter tears as the flow steadily increases past what $he was used to. <<else>> When $he finally figures out $he's lactating, $he breaks down in rage and unhappiness, dripping milk and bitter tears. <</if>>