diff --git a/src/art/artJS.js b/src/art/artJS.js
index b8cdfde6ca7ad800679d1dfc9ecb7e7945a5db85..9bd4d160a1903d56ac0e5f58c1554dc8119f24fa 100644
--- a/src/art/artJS.js
+++ b/src/art/artJS.js
@@ -146,7 +146,7 @@ App.Art.renderedArtElement = function(slave, artSize) {
App.Art.customArtElement = function(slave, imageSize) {
const fileType = slave.custom.image.format || "png";
const fileName = `resources/${slave.custom.image.filename}.${fileType}`;
- let elementType = "img";
+ let elementType = "img";
let attributes = [];
if (fileType === "webm" || fileType === "mp4") {
elementType = "video";
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index f18f957a3cb83961b6c689adae3c362fb622bcc5..2e23bbbfdc319b650c7b5ab54fb4f4e7ec3c6fd6 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -2946,7 +2946,7 @@ window.DefaultRules = (function() {
(!hasLeftArm(slave) && ["left upper arm", "left lower arm", "left wrist", "left hand"].includes(rule.brandTarget)) ||
(!hasRightArm(slave) && ["right upper arm", "right lower arm", "right wrist", "right hand"].includes(rule.brandTarget)) ||
(!hasLeftLeg(slave) && ["left thigh", "left calf", "left ankle", "left foot"].includes(rule.brandTarget)) ||
- (!hasRightLeg(slave) && ["right thigh", "right calf", "right ankle", "rightfoot"].includes(rule.brandTarget))
+ (!hasRightLeg(slave) && ["right thigh", "right calf", "right ankle", "right foot"].includes(rule.brandTarget))
) {
brandPlace = "";
} else {
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index e87d76bed37f660fe2f69029faba2593dbf07f67..86b801425c8cd90ecf8507b0063dcc457ba5d66c 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -419,7 +419,7 @@ App.Utils.Pronouns = class {
get sister() { return this.noun === "girl" ? "sister" : "brother"; }
get Sister() { return capFirstChar(this.sister); }
-
+
get wife() { return this.noun === "girl" ? "wife" : "wife"; }
get Wife() { return capFirstChar(this.wife); }
get wives() { return this.noun === "girl" ? "wives" : "wives"; }
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 3055c39f93fe2e15c2e5cad9191100c892f66b29..d5140d994c3ea74b4a47f76f7bff55ffd5fcaa50 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -405,13 +405,13 @@ App.Desc.ageAndHealth = function(slave) {
} else if (slave.actualAge < 60) {
r += `in ${his} fifties. `;
} else if (slave.actualAge < 70) {
- r += `extremely old for a slave, in ${his} 60s. `;
+ r += `extremely old for a slave, in ${his} sixties. `;
} else if (slave.actualAge < 80) {
- r += `extremely old for a slave, in ${his} ${num(70)}s. `;
+ r += `extremely old for a slave, in ${his} seventies. `;
} else if (slave.actualAge < 90) {
- r += `extremely old for a slave, in ${his} r += ${num(80)}s. `;
+ r += `extremely old for a slave, in ${his} eighties. `;
} else if (slave.actualAge < 100) {
- r += `extremely old for a slave, in ${his} r += ${num(90)}s. `;
+ r += `extremely old for a slave, in ${his} nineties. `;
} else if (slave.actualAge >= 100) {
r += `ancient by any measure, over a century old. `;
}
@@ -585,7 +585,7 @@ App.Desc.mods = function(slave, surface) {
if (V.showBodyMods !== 1) {
return;
}
- if (slave.fuckdoll !== 0 && !["vagina", "anus", "lips"].includes(surface)) { /* Fuckdoll vulva and anus alone are visibile, plus enormus lips */
+ if (slave.fuckdoll !== 0 && !["anus", "lips", "vagina"].includes(surface)) { /* Fuckdoll vulva and anus alone are visible, plus enormous lips */
return App.Desc.piercing(slave, surface); // Most piercings are part of the suit and have appropriate descriptions
}
return (
@@ -960,7 +960,7 @@ App.Desc.expandScarString = function(slave, surface) { // scars can sometimes be
} else if (surface === "belly" ) {
r += "scars from ";
if (scar > 1) {
- r += "a crazy netork of scars, as though a hack had tried internal surgery";
+ r += "a crazy network of scars, as though a hack had tried internal surgery";
} else {
r += "some faint scarring as though from internal surgery";
}
@@ -997,7 +997,7 @@ App.Desc.expandScarString = function(slave, surface) { // scars can sometimes be
break;
}
}
- r = r.replace(/,(?=[^,]*$)/, ' and'); /* replace the last comma with the word "and" so we can use this in a sentance.*/
+ r = r.replace(/,(?=[^,]*$)/, ' and'); /* replace the last comma with the word "and" so we can use this in a sentence.*/
return r;
};
diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js
index 4a1dbad295f0fb02ccc5901159b74f8b37f5c788..792d45b6a866a212f3a05904a7021f2e323a0079 100644
--- a/src/js/walkPastJS.js
+++ b/src/js/walkPastJS.js
@@ -70,7 +70,7 @@ window.loverSlave = function(activeSlave) {
/* eslint-disable no-unused-vars */
const {
he2, him2, his2, hers2, himself2, boy2, wife2, He2, His2
- } = getPronouns(_partnerSlave).appendSuffix('2');
+ } = getPronouns(_partnerSlave).appendSuffix("2");
/* /* eslint-enable no-unused-vars */
let race2;
if (V.seeRace === 1) { race2 = _partnerSlave.race; } else { race2 = ""; }
@@ -131,7 +131,7 @@ window.loverSlave = function(activeSlave) {
} else if (_fuckSeed > 80 && hasBothLegs(activeSlave)) {
t += `${name} has ${partnerName} pushed against the wall and is fucking ${his2} pussy from behind.`;
} else if (_fuckSeed > 70) {
- t += `${partnerName} has ${name} on ${his2} back and is enthusiastically bouncing on ${his2} dick.`;
+ t += `${partnerName} has ${name} on ${his} back and is enthusiastically bouncing on ${his} dick.`;
} else if (_fuckSeed > 60) {
t += `${name} has ${partnerName} on ${his2} back and is enthusiastically fucking ${his2} pussy in the missionary position.`;
} else {
@@ -169,7 +169,7 @@ window.loverSlave = function(activeSlave) {
} else if (canDoAnal(activeSlave) && activeSlave.anus > 0 && _fuckSeed > 10) {
if (canPenetrate(_partnerSlave)) {
t += `${partnerName} is enthusiastically fucking ${name}'s ass.`;
- } else if (_partnerSlave.amp !== 1) {
+ } else if (hasAnyArms(_partnerSlave)) {
t += `${partnerName} is enthusiastically fisting ${name}'s ass.`;
} else {
t += `${partnerName} is enthusiastically pounding ${name}'s ass with a dildo.`;
@@ -1162,7 +1162,7 @@ window.loverSlave = function(activeSlave) {
break;
case "adores men":
if (canSee(activeSlave) && (canSee(_partnerSlave) || canHear(_partnerSlave))) {
- t += `sharing a meal together. ${name} is making catcalls at passing boys, and ${his} ${partnerSlaveRel} is nudging ${him} in the ribs every time {he2} catches it.`;
+ t += `sharing a meal together. ${name} is making catcalls at passing boys, and ${his} ${partnerSlaveRel} is nudging ${him} in the ribs every time ${he2} catches it.`;
} else {
t += `getting ready for bed. ${name} is demonstrating just how much ${he} adores men to ${his} ${partnerSlaveRel} while ${he2} nods `;
if (_partnerSlave.genes === "XX") {
@@ -1174,7 +1174,7 @@ window.loverSlave = function(activeSlave) {
break;
case "adores women":
if (canSee(activeSlave) && (canSee(_partnerSlave) || canHear(_partnerSlave))) {
- t += `sharing a meal together. ${name} is making catcalls at passing girls, and ${his} ${partnerSlaveRel} is nudging ${him} in the ribs every time {he2} catches it.`;
+ t += `sharing a meal together. ${name} is making catcalls at passing girls, and ${his} ${partnerSlaveRel} is nudging ${him} in the ribs every time ${he2} catches it.`;
} else {
t += `getting ready for bed. ${name} is demonstrating just how much ${he} adores ladies to ${his} ${partnerSlaveRel} while ${he2} nods `;
if (_partnerSlave.genes === "XY") {
diff --git a/src/npc/descriptions/boobs/boobs.js b/src/npc/descriptions/boobs/boobs.js
index 7f0519fa4f69ba4b3c52cf9d592dee0db5fc3ea2..2368ba5b0f18b927891d0f86b4c77749e1a9aed8 100644
--- a/src/npc/descriptions/boobs/boobs.js
+++ b/src/npc/descriptions/boobs/boobs.js
@@ -1249,13 +1249,13 @@ App.Desc.boobs = function() {
}
break;
case "a hijab and blouse":
- r += `${slave.slaveName}'s two shirts entirely conceals ${his} ${adjNoun}`;
+ r += `${slave.slaveName}'s two shirts entirely conceal ${his} ${adjNoun}`;
if (slave.boobs > 12000) {
r += ', although the fabric struggles to ensure they are entirely covered.';
} else if (slave.boobs > 8000) {
- r += `. It has been let out a great deal in order to cover the entirety of ${his} chest.`;
+ r += `. They have been let out a great deal in order to cover the entirety of ${his} chest.`;
} else if (slave.boobs > 4000) {
- r += `, though it cannot conceal their absurd size.`;
+ r += `, though they cannot conceal their absurd size.`;
} else {
r += '.';
}
diff --git a/src/uncategorized/descriptionOptions.tw b/src/uncategorized/descriptionOptions.tw
index fd2ea63df746db56e36749784d71f118ef3cf16e..c2e2da51925f9cd1ba13bd86ed4389019ffa7b88 100644
--- a/src/uncategorized/descriptionOptions.tw
+++ b/src/uncategorized/descriptionOptions.tw
@@ -13,7 +13,7 @@
<<set $storedLink = "Slave Interact">>
<<else>>
<<set $storedLink = "Options">>
- <</if>>
+ <</if>>
<</if>>
<<set $nextLink = $storedLink>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index b948a14ce18ec3fd8d41426a521b77a7af9f6041..02b7f6e7d933d697256538dc9f35b23f01e25d02 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -901,7 +901,7 @@ Dye or paint:
| [[Bushy in the front|Salon][$activeSlave.pubicHStyle = "bushy in the front and neat in the rear",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
| [[Bushy|Salon][$activeSlave.pubicHStyle = "bushy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
| [[Very Bushy|Salon][$activeSlave.pubicHStyle = "very bushy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
-
+
<<else>>
<br><br>$His groin is completely hairless.
<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index a1e18ed527629b11e232c5ad3d38f97b36b08db4..fff342fa75469dd490456d6bd182f364d35f577f 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -780,7 +780,7 @@
<<set Config.history.maxStates = 2>> /* makes sure we store the current state so we can return to it */
<<goto "Variable Difference">>
<</link>>
-
+
<br> <<link "Bug Report">><<bugreport>><</link>>
<<if $debugModeCustomFunction > 0>>
<br> <<textarea "_customEvalCode" "">>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index 1e42c577c641f507359ec155199c9ec8ccdb718a..faee6d9f8fae6e6f2cd156a761c2ba62e3fbef51 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -187,16 +187,16 @@ One 'welcome' for a new slave is to have them branded. Where would you like such
$brandTarget.secondary, or the
[[right|Universal Rules][$brandTarget.secondary = ("right " + $brandTarget.secondary)]]?
<<elseif [
- "left ankle", "right ankle",
+ "left ankle", "right ankle",
"left calve", "right calve",
"left ear", "right ear",
- "left foot", "right foot",
- "left hand", "right hand",
- "left lower arm", "right lower arm",
- "left penis", "right penis",
- "left testicle", "right testicle",
- "left thigh", "right thigh",
- "left upper arm", "right upper arm",
+ "left foot", "right foot",
+ "left hand", "right hand",
+ "left lower arm", "right lower arm",
+ "left penis", "right penis",
+ "left testicle", "right testicle",
+ "left thigh", "right thigh",
+ "left upper arm", "right upper arm",
"left wrist", "right wrist"
].includes($brandTarget.primary)>>
<br> It's possible that ''$brandTarget.primary'' may be missing from a slave. Choose a fallback in case it is not available: Current backup is ''$brandTarget.secondary'':
@@ -362,16 +362,16 @@ One 'welcome' for a new slave is to have them scarred. Where would you like such
$scarTarget.secondary, or the
[[right|Universal Rules][$scarTarget.secondary = ("right " + $scarTarget.secondary)]]?
<<elseif [
- "left ankle", "right ankle",
+ "left ankle", "right ankle",
"left calve", "right calve",
"left ear", "right ear",
- "left foot", "right foot",
- "left hand", "right hand",
- "left lower arm", "right lower arm",
- "left penis", "right penis",
- "left testicle", "right testicle",
- "left thigh", "right thigh",
- "left upper arm", "right upper arm",
+ "left foot", "right foot",
+ "left hand", "right hand",
+ "left lower arm", "right lower arm",
+ "left penis", "right penis",
+ "left testicle", "right testicle",
+ "left thigh", "right thigh",
+ "left upper arm", "right upper arm",
"left wrist", "right wrist"
].includes($scarTarget.primary)>>
<br> It's possible that ''$scarTarget.primary'' may be missing from a slave. Choose a fallback in case it is not available: Current backup is ''$scarTarget.secondary'':
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index c9bdcee44f92991b6b2853f2b72cc0977f7d945c..c01eaba772656f73727ce6658bb0a1b0ed1c2c93 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -26,7 +26,7 @@
<<set _flag = 110, $partner = "relation">>
<<elseif ($activeSlave.relationship > 0) && (random(1,100) > 70)>>
<<set _flag = 120, $partner = "relationship">>
-<<elseif ($activeSlave.rivalry !== 0) && ($activeSlave.amp != 1) && (random(1,100) > 70)>>
+<<elseif ($activeSlave.rivalry !== 0) && (!isAmputee($activeSlave)) && (random(1,100) > 70)>>
<<set _flag = 130, $partner = "rivalry">>
<<else>>
<<set _flag = random(1,100), $partner = "">>
diff --git a/src/utility/ptWidgets.tw b/src/utility/ptWidgets.tw
index cd4364ca0e3542f064d64e2d9877cebf981792cb..895fc54c3a04d13338ea9682e5b610abb5a44ae6 100644
--- a/src/utility/ptWidgets.tw
+++ b/src/utility/ptWidgets.tw
@@ -1,26 +1,26 @@
:: PT widgets [widget nobr]
<<widget "InduceFlawAbuseEffects">>
-<<if $activeSlave.devotion > 20>>
- $He's @@.mediumorchid;desperately confused@@ by this treatment, since the effect would be ruined if you explained it to $him, and $his @@.gold;trust in you is reduced.@@
-<<elseif $activeSlave.devotion >= -20>>
- $He's @@.mediumorchid;confused, depressed@@ and @@.gold;frightened@@ by this treatment, since the effect would be ruined if you explained it to $him.
-<<else>>
- $He's @@.mediumorchid;angry@@ and @@.gold;afraid@@ that you would treat $him like this.
-<</if>>
-<<if $activeSlave.energy > 10>>
- $His @@.red;appetite for sex is also reduced.@@
- <<set $activeSlave.energy -= 2>>
-<</if>>
-<<set $activeSlave.devotion -= 5>>
-<<set $activeSlave.trust -= 5>>
+ <<if $activeSlave.devotion > 20>>
+ $He's @@.mediumorchid;desperately confused@@ by this treatment, since the effect would be ruined if you explained it to $him, and $his @@.gold;trust in you is reduced.@@
+ <<elseif $activeSlave.devotion >= -20>>
+ $He's @@.mediumorchid;confused, depressed@@ and @@.gold;frightened@@ by this treatment, since the effect would be ruined if you explained it to $him.
+ <<else>>
+ $He's @@.mediumorchid;angry@@ and @@.gold;afraid@@ that you would treat $him like this.
+ <</if>>
+ <<if $activeSlave.energy > 10>>
+ $His @@.red;appetite for sex is also reduced.@@
+ <<set $activeSlave.energy -= 2>>
+ <</if>>
+ <<set $activeSlave.devotion -= 5>>
+ <<set $activeSlave.trust -= 5>>
<</widget>>
<<widget "InduceFlawLenityEffects">>
-<<if $activeSlave.devotion <= 20>>
- $He doesn't understand what you intend by this strange treatment, but it does make $him @@.mediumaquamarine;inappropriately trusting.@@
- <<set $activeSlave.trust += 5>>
-<</if>>
+ <<if $activeSlave.devotion <= 20>>
+ $He doesn't understand what you intend by this strange treatment, but it does make $him @@.mediumaquamarine;inappropriately trusting.@@
+ <<set $activeSlave.trust += 5>>
+ <</if>>
<</widget>>
<<widget "BasicTrainingDefaulter">>