diff --git a/src/npc/descriptions/belly/belly.js b/src/npc/descriptions/belly/belly.js index f4761a08dae73ce1e348ee63462cc6d066a31163..e33859127c5f8a4d3ad4a5c8f87ea5268594896e 100644 --- a/src/npc/descriptions/belly/belly.js +++ b/src/npc/descriptions/belly/belly.js @@ -525,7 +525,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { r.push(`${He} uses a wheelchair when ${he} must go somewhere and requires considerable assistance to get in and out of it.`); } } else { - r.push(`Dragging the mass along is becoming a challange between its awkward size and sheer weight.`); + r.push(`Dragging the mass along is becoming a challenge between its awkward size and sheer weight.`); } } else { r.push(`A talent that is ultimately meaningless when it is so unwieldy it immobilizes you.`); @@ -565,7 +565,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { r.push(`${He} uses a wheelchair when ${he} must go somewhere and requires considerable assistance to get in and out of it.`); } } else { - r.push(`Dragging the mass along is becoming a challange between its awkward size and sheer weight.`); + r.push(`Dragging the mass along is becoming a challenge between its awkward size and sheer weight.`); } } else { r.push(`A talent that is ultimately meaningless when it is so unwieldy it immobilizes you.`); @@ -641,7 +641,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { r.push(`${He} uses a wheelchair when ${he} must go somewhere and requires considerable assistance to get in and out of it.`); } } else { - r.push(`Dragging the mass along is becoming a challange between its awkward size and sheer weight.`); + r.push(`Dragging the mass along is becoming a challenge between its awkward size and sheer weight.`); } } else { r.push(`A talent that is ultimately meaningless when it is so unwieldy it immobilizes you.`); @@ -681,7 +681,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { r.push(`${He} uses a wheelchair when ${he} must go somewhere and requires considerable assistance to get in and out of it.`); } } else { - r.push(`Dragging the mass along is becoming a challange between its awkward size and sheer weight.`); + r.push(`Dragging the mass along is becoming a challenge between its awkward size and sheer weight.`); } } else { r.push(`A talent that is ultimately meaningless when it is so unwieldy it immobilizes you.`); @@ -733,7 +733,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { r.push(`${He} uses a wheelchair when ${he} must go somewhere and requires considerable assistance to get in and out of it.`); } } else { - r.push(`Dragging the mass along is becoming a challange between its awkward size and sheer weight.`); + r.push(`Dragging the mass along is becoming a challenge between its awkward size and sheer weight.`); } } } else if (slave.height < 150) { @@ -750,7 +750,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { r.push(`${He} uses a wheelchair when ${he} must go somewhere and requires considerable assistance to get in and out of it.`); } } else { - r.push(`Dragging the mass along is becoming a challange between its awkward size and sheer weight.`); + r.push(`Dragging the mass along is becoming a challenge between its awkward size and sheer weight.`); } } } else if (slave.muscles > 30) { @@ -784,7 +784,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { r.push(`${He} uses a wheelchair when ${he} must go somewhere and requires considerable assistance to get in and out of it.`); } } else { - r.push(`Dragging the mass along is becoming a challange between its awkward size and sheer weight.`); + r.push(`Dragging the mass along is becoming a challenge between its awkward size and sheer weight.`); } } } @@ -829,7 +829,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { r.push(`${He} uses a wheelchair when ${he} must go somewhere and requires considerable assistance to get in and out of it.`); } } else { - r.push(`Dragging the mass along is becoming a challange between its awkward size and sheer weight.`); + r.push(`Dragging the mass along is becoming a challenge between its awkward size and sheer weight.`); } } } else if (slave.height < 150) { @@ -846,7 +846,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { r.push(`${He} uses a wheelchair when ${he} must go somewhere and requires considerable assistance to get in and out of it.`); } } else { - r.push(`Dragging the mass along is becoming a challange between its awkward size and sheer weight.`); + r.push(`Dragging the mass along is becoming a challenge between its awkward size and sheer weight.`); } } } else if (slave.muscles > 30) { @@ -880,7 +880,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { r.push(`${He} uses a wheelchair when ${he} must go somewhere and requires considerable assistance to get in and out of it.`); } } else { - r.push(`Dragging the mass along is becoming a challange between its awkward size and sheer weight.`); + r.push(`Dragging the mass along is becoming a challenge between its awkward size and sheer weight.`); } } } @@ -914,7 +914,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { } else if (slave.height >= 185) { r.push(`but ${his} tall frame keeps ${his} massive belly off the ground.`); if (canWalk(slave)) { - r.push(`${He} walks with an exagerated waddle in an attempt to keep balance with such an awkward bulge.`); + r.push(`${He} walks with an exaggerated waddle in an attempt to keep balance with such an awkward bulge.`); } else if (canStand(slave)) { r.push(`${He} stands with ${his} back heavily arched in an attempt to support ${his} stomach's substantial weight.`); } else if (canMove(slave)) { @@ -931,7 +931,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { } else if (slave.height < 150) { r.push(`and ${he} is more belly than ${girl}. ${He} can barely keep ${his} massive belly from touching the floor.`); if (canWalk(slave)) { - r.push(`${He} walks with an exagerated waddle in an attempt to keep balance with such an awkward bulge.`); + r.push(`${He} walks with an exaggerated waddle in an attempt to keep balance with such an awkward bulge.`); } else if (canStand(slave)) { r.push(`${He} stands with ${his} back heavily arched in an attempt to support ${his} stomach's substantial weight.`); } else if (canMove(slave)) { @@ -950,7 +950,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { } else { r.push(`and ${he} is more belly than ${girl}.While ${he} can keep ${his} massive belly from touching the floor, it takes a lot of effort to do so.`); if (canWalk(slave)) { - r.push(`${He} walks with an exagerated waddle in an attempt to keep balance with such an awkward bulge.`); + r.push(`${He} walks with an exaggerated waddle in an attempt to keep balance with such an awkward bulge.`); } else if (canStand(slave)) { r.push(`${He} stands with ${his} back heavily arched in an attempt to support ${his} stomach's substantial weight.`); } else if (canMove(slave)) { @@ -993,7 +993,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { } else if (slave.height >= 185) { r.push(`but ${his} tall frame keeps ${his} massive belly off the ground.`); if (canWalk(slave)) { - r.push(`${He} walks with an exagerated waddle in an attempt to keep balance with such an awkward bulge.`); + r.push(`${He} walks with an exaggerated waddle in an attempt to keep balance with such an awkward bulge.`); } else if (canStand(slave)) { r.push(`${He} stands with ${his} back heavily arched in an attempt to support ${his} stomach's substantial weight.`); } else if (canMove(slave)) { @@ -1010,7 +1010,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { } else if (slave.height < 150) { r.push(`and ${he} is more belly than ${girl}. ${He} can barely keep ${his} massive belly from touching the floor.`); if (canWalk(slave)) { - r.push(`${He} walks with an exagerated waddle in an attempt to keep balance with such an awkward bulge.`); + r.push(`${He} walks with an exaggerated waddle in an attempt to keep balance with such an awkward bulge.`); } else if (canStand(slave)) { r.push(`${He} stands with ${his} back heavily arched in an attempt to support ${his} stomach's substantial weight.`); } else if (canMove(slave)) { @@ -1029,7 +1029,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { } else { r.push(`and ${he} is more belly than ${girl}.While ${he} can keep ${his} massive belly from touching the floor, it takes a lot of effort to do so.`); if (canWalk(slave)) { - r.push(`${He} walks with an exagerated waddle in an attempt to keep balance with such an awkward bulge.`); + r.push(`${He} walks with an exaggerated waddle in an attempt to keep balance with such an awkward bulge.`); } else if (canStand(slave)) { r.push(`${He} stands with ${his} back heavily arched in an attempt to support ${his} stomach's substantial weight.`); } else if (canMove(slave)) { @@ -1095,7 +1095,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { } else if (slave.height >= 185) { r.push(`but ${his} tall frame barely bears ${his} oversized, drum-taut belly.`); if (canWalk(slave)) { - r.push(`${He} walks with an exagerated waddle in an attempt to keep balance with such an awkward bulge hanging from ${his} middle.`); + r.push(`${He} walks with an exaggerated waddle in an attempt to keep balance with such an awkward bulge hanging from ${his} middle.`); } else if (canStand(slave)) { r.push(`${He} stands with ${his} back heavily arched in an attempt to support ${his} stomach's substantial weight.`); } else if (canMove(slave)) { @@ -1112,7 +1112,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { } else if (slave.height < 150) { r.push(`and ${he} can barely function with ${his} oversized belly.`); if (canWalk(slave)) { - r.push(`${He} walks with an exagerated waddle in an attempt to keep balance with such an awkward bulge hanging from ${his} middle.`); + r.push(`${He} walks with an exaggerated waddle in an attempt to keep balance with such an awkward bulge hanging from ${his} middle.`); } else if (canStand(slave)) { r.push(`${He} stands with ${his} back heavily arched in an attempt to support ${his} stomach's substantial weight.`); } else if (canMove(slave)) { @@ -1131,7 +1131,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) { } else { r.push(`and ${he} can barely function with ${his} oversized belly.`); if (canWalk(slave)) { - r.push(`${He} walks with an exagerated waddle in an attempt to keep balance with such an awkward bulge hanging from ${his} middle.`); + r.push(`${He} walks with an exaggerated waddle in an attempt to keep balance with such an awkward bulge hanging from ${his} middle.`); } else if (canStand(slave)) { r.push(`${He} stands with ${his} back heavily arched in an attempt to support ${his} stomach's substantial weight.`); } else if (canMove(slave)) { diff --git a/src/npc/descriptions/boobs/boobs.js b/src/npc/descriptions/boobs/boobs.js index 06b34e386c34ee9e8d89b8cc4279a0cbf40ea551..63bab1973489cec437094ac516ed076d1dc32444 100644 --- a/src/npc/descriptions/boobs/boobs.js +++ b/src/npc/descriptions/boobs/boobs.js @@ -260,9 +260,7 @@ App.Desc.boobs = function() { const noun = App.Desc.boobBits.noun(slave.boobs, false, false); const adjNoun = App.Desc.boobBits.noun(slave.boobs, false, true); let r = ''; - const {he, his, him, - He, His, - girl} = getPronouns(slave); + const {he, his, him, His, girl} = getPronouns(slave); switch (slave.clothes) { case "a Fuckdoll suit": @@ -1424,7 +1422,7 @@ App.Desc.boobs = function() { */ App.Desc.boobsExtra = function(slave, {market, eventDescription} = {}) { const thisArcology = V.arcologies[0]; - const {he, his, him, He, His, girl} = getPronouns(slave); + const {he, his, him, He, His, girl, himself} = getPronouns(slave); function penthouseAccessibility() { let rt = ''; diff --git a/src/npc/interaction/fillUpButt.tw b/src/npc/interaction/fillUpButt.tw index a0e22bb3282f36b56d65a253a969efeb168bd0b8..ea27556981a0d9e9288973914e7f901091372dbb 100644 --- a/src/npc/interaction/fillUpButt.tw +++ b/src/npc/interaction/fillUpButt.tw @@ -198,7 +198,7 @@ before shoving the equipment into $his $His belly slowly swells with <<= getSlave($AS).inflationType>>. You slip a hand under $his stomach to feel it grow in your palm. Once the enema is complete and $he is plugged, you <<if canStand(getSlave($AS))>>push $him to $his <<if hasBothLegs(getSlave($AS))>>feet<<else>>foot<</if>><<else>>help $him onto your desk<</if>> and admire $his distended, <<= getSlave($AS).skin>> stomach. $He <<if canSee(getSlave($AS))>>looks in your eyes<<else>>faces you<</if>>, as though almost demanding answers. $He looks apprehensive about what you will do next. You order $him to keep $himself filled with two liters of <<= getSlave($AS).inflationType>> until you say otherwise.<</if>> <<elseif (getSlave($AS).devotion <= 20)>> <<if canMove(getSlave($AS))>> - You instruct $him to present $his anus for a <<= getSlave($AS).inflationType>> enema. $He complies without comment, <<if canStand(getSlave($AS))>>standing in front of you.<<else>>turning $his rear to you. + You instruct $him to present $his anus for a <<= getSlave($AS).inflationType>> enema. $He complies without comment, <<if canStand(getSlave($AS))>>standing in front of you.<<else>>turning $his rear to you.<</if>> <<elseif !isAmputee(getSlave($AS))>> You instruct $him to present $his anus for a <<= getSlave($AS).inflationType>> enema. $He complies without comment, readying $his ass for you. <<else>> diff --git a/src/npc/interaction/forceFeeding.tw b/src/npc/interaction/forceFeeding.tw index 159488721694cfca2348a385ee5830d400837c73..89a56c3a1a869d80a8219ff79528b1d988863cbe 100644 --- a/src/npc/interaction/forceFeeding.tw +++ b/src/npc/interaction/forceFeeding.tw @@ -41,7 +41,7 @@ buckets overflowing with slave food. $He is going to eat it all and you're going wide. <</if>> <<if getSlave($AS).devotion < -20>> - Opposed to the thought of being forced to eat all that food, $he tries to <<if canWalk(getSlave($AS))step back<<else>>crawl away<</if>>, but you catch $him and pull $him into your lap, wrapping an arm + Opposed to the thought of being forced to eat all that food, $he tries to <<if canWalk(getSlave($AS))>>step back<<else>>crawl away<</if>>, but you catch $him and pull $him into your lap, wrapping an arm <<elseif getSlave($AS).fetish == "submissive">> $He meekly settles into your lap and shudders as $he feels your dominant hand wrap <<elseif getSlave($AS).behavioralFlaw == "gluttonous">> diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw index 5b365daa246306f026575687ddd11c9cb3f83d64..17f817d179fa90ec35a62eac0bb05f81e68dfd89 100644 --- a/src/uncategorized/costsReport.tw +++ b/src/uncategorized/costsReport.tw @@ -7,7 +7,7 @@ <<capture $i>> <br style="clear:both"><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>> [[$slaves[$i].slaveName|Slave Interact][$activeSlave = $slaves[$i]]] will $slaves[$i].assignment. - <<includeDOM SlaveExpenses (V.slaves[V.i])>> + <<includeDOM slaveExpenses($slaves[$i])>> <</capture>> <</for>> diff --git a/src/uncategorized/costsReportSlaves.tw b/src/uncategorized/costsReportSlaves.tw index ae0467edc474f629deb9c74255662f840c8890c3..0bfb98f93d160dc90419775e5e848ad647063f67 100644 --- a/src/uncategorized/costsReportSlaves.tw +++ b/src/uncategorized/costsReportSlaves.tw @@ -8,6 +8,6 @@ <<capture $i>> <br style="clear:both"><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>> [[$slaves[$i].slaveName|Slave Interact][$activeSlave = $slaves[$i]]] will $slaves[$i].assignment. - <<includeDOM SlaveExpenses (V.slaves[V.i])>> + <<includeDOM slaveExpenses($slaves[$i])>> <</capture>> <</for>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 831f78f9f095e934a3a0040d97138ca90cc8e719..ef6befa207f6033b25e16362784657e726cc9734 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -7845,7 +7845,7 @@ <<elseif $slaves[$i].devotion > 20>> @@.mediumaquamarine;$He appreciates@@ being given the means to maintain some semblance of mobility. <<set $slaves[$i].trust += 2>> - <<elseif ($slaves[$i].devotion >= -20>> + <<elseif $slaves[$i].devotion >= -20>> @@.mediumaquamarine;$He takes full advantage@@ of the provided mobility aids to avoid being forced to crawl everywhere. <<set $slaves[$i].trust += 3>> <<else>>