diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 97dc0118f2f5a157cf78ad342c359f40e11e1283..8c06c38cd191fbe4b5c1c0ced5d556c3c0deff11 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -65,39 +65,39 @@ is
<<if $activeChild.slaveName != $activeChild.birthName && $activeChild.slaveSurname != $activeChild.birthSurname>>
<<= SlaveFullName($activeChild)>> is not $his original full name;
<<if $activeChild.birthName === "" || $activeChild.birthSurname === "">>
- whatever it was, however, has been lost forever.
+ whatever it was, however, has been lost forever. Regardless,
<</if>>
<<elseif $activeChild.slaveName != $activeChild.birthName>>
$activeChild.slaveName is not $his original given name;
<<if $activeChild.birthName === "">>
- whatever it was, however, has been lost forever.
+ whatever it was, however, has been lost forever. Regardless,
<</if>>
<<elseif $activeChild.slaveSurname != $activeChild.birthSurname>>
<<if $activeChild.slaveSurname === 0>>
$He once had a surname;
<<if $activeChild.birthSurname === "">>
- whatever it was, however, has been lost forever.
+ whatever it was, however, has been lost forever. Regardless,
<</if>>
<<else>>
$activeChild.slaveSurname is not $his original surname;
<<if $activeChild.birthSurname === "">>
- whatever it was, however, has been lost forever.
+ whatever it was, however, has been lost forever. Regardless,
<</if>>
<</if>>
<</if>>
<<if $activeChild.birthName !== "" || $activeChild.birthSurname !== "">>
<<if $activeChild.devotion > 95>>
- $He adores $his slave name and affects to have forgotten that $he was ever called
+ $he adores $his slave name and affects to have forgotten that $he was ever called
<<elseif $activeChild.devotion > 50>>
- $He uses $his slave name automatically and gives no sign that $he was ever called
+ $he uses $his slave name automatically and gives no sign that $he was ever called
<<elseif $activeChild.devotion > 20>>
- $He uses $his slave name despite once being known as
+ $he uses $his slave name despite once being known as
<<elseif $activeChild.devotion >= -20>>
- $He uses $his slave name hesitantly since $he was once called
+ $he uses $his slave name hesitantly since $he was once called
<<elseif $activeChild.devotion >= -50>>
- $He uses $his slave name with resentment since $he prefers $his original name,
+ $he uses $his slave name with resentment since $he prefers $his original name,
<<else>>
- $He uses $his slave name only when constantly punished, since $he feels $his real name is
+ $he uses $his slave name only when constantly punished, since $he feels $his real name is
<</if>>
<<if $activeChild.birthName === "">>
$activeChild.birthSurname.
@@ -118,7 +118,7 @@ is
<</if>>
<</if>>
<<else>>
- $activeChild.slaveName<<if $activeChild.slaveSurname>> $activeChild.slaveSurname<</if>> is not $his original name: $he was once called <<= SlaveFullBirthName($activeChild)>>.
+ <<= SlaveFullName($activeChild)>> is not $his original name: $he was once called <<= SlaveFullBirthName($activeChild)>>.
<</if>>
<</if>>
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 1a8eba315bd22ed424583a2b52699034cd4a49fb..ac2c352730b12b104fcba90b5a4fd599428b504f 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -399,7 +399,7 @@ window.newChild = /** @param {App.Entity.SlaveState} slave */ function newChild(
break;
case "milky white":
case "implant":
- child.origEye = jsEither(["blue", "green", "brown", "hazel", "light blue", "light green", "dark green", "dark blue"]);
+ child.origEye = jsEither(["blue", "brown", "dark blue", "dark green", "green", "hazel", "light blue", "light green"]);
break;
default:
child.origEye = child.eyeColor;
@@ -1962,10 +1962,10 @@ window.DegradingName = /** @param {App.Entity.SlaveState} slave */ function Degr
slave.slaveName = jsEither(["Bath", "Spa"]);
break;
case "be the Matron":
- slave.slaveName = jsEither(["Nursery", "Matron"]);
+ slave.slaveName = jsEither(["Matron", "Nursery"]);
break;
case "be the Stewardess":
- slave.slaveName = jsEither(["Servant", "Maid"]);
+ slave.slaveName = jsEither(["Maid", "Servant"]);
break;
case "be the Milkmaid":
if (V.cumSlaves > 3) {
@@ -1975,7 +1975,7 @@ window.DegradingName = /** @param {App.Entity.SlaveState} slave */ function Degr
}
break;
case "be the Farmer":
- slave.slaveName = jsEither(["Farmhand", "Farmer"]);
+ slave.slaveName = jsEither(["Farmer", "Farmhand"]);
break;
case "be the DJ":
slave.slaveName = jsEither(["Bass", "Booth"]);
@@ -2273,7 +2273,7 @@ window.Deadliness = /** @param {App.Entity.SlaveState} slave */ function Deadlin
if (!canSee(slave)) {
deadliness -= 8;
- } else if ((slave.eyes === -1 && !["corrective glasses", "corrective contacts"].includes(slave.eyewear)) || (slave.eyes === 1 && ["blurring glasses", "blurring contacts"].includes(slave.eyewear))) {
+ } else if ((slave.eyes === -1 && !["corrective contacts", "corrective glasses"].includes(slave.eyewear)) || (slave.eyes === 1 && ["blurring contacts", "blurring glasses"].includes(slave.eyewear))) {
deadliness -= 1;
}
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 95757eb36b3780e77dbccc71f62fa00a05c880e6..eb18add8052f98ad5a96fcb5d3d02afd97445026 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -72,10 +72,10 @@
<</if>>
<<if ndef $PC.name>>
-<<if def $PCName>>
- <<set $PC.name = $PCName>>
- <<unset $PCName>>
-<</if>>
+ <<if def $PCName>>
+ <<set $PC.name = $PCName>>
+ <<unset $PCName>>
+ <</if>>
<</if>>
<<if ndef $PC.surname>>
<<set $PC.surname = 0>>
@@ -3268,8 +3268,12 @@ Setting missing slave variables:
<<set _Slave.eyeColor = _Slave.origEye>>
<</if>>
-<<if ndef _Slave.birthSurname>><<set _Slave.birthSurname = 0>><</if>>
-<<if ndef _Slave.slaveSurname>><<set _Slave.slaveSurname = 0>><</if>>
+<<if ndef _Slave.birthSurname>>
+ <<set _Slave.birthSurname = 0>>
+<</if>>
+<<if ndef _Slave.slaveSurname>>
+ <<set _Slave.slaveSurname = 0>>
+<</if>>
<<if _Slave.faceImplant == 1>>
<<set _Slave.faceImplant = 15>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index d187d0e5687eadf23302a8c7e1165989acc8f897..3eba3043a131692f1ad09ab6115c3466402f0e7c 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -305,39 +305,39 @@ is
<<if $activeSlave.slaveName != $activeSlave.birthName && $activeSlave.slaveSurname != $activeSlave.birthSurname>>
<<= SlaveFullName($activeSlave)>> is not $his original full name;
<<if $activeSlave.birthName === "" || $activeSlave.birthSurname === "">>
- whatever it was, however, has been lost forever.
+ whatever it was, however, has been lost forever. Regardless,
<</if>>
<<elseif $activeSlave.slaveName != $activeSlave.birthName>>
$activeSlave.slaveName is not $his original given name;
<<if $activeSlave.birthName === "">>
- whatever it was, however, has been lost forever.
+ whatever it was, however, has been lost forever. Regardless,
<</if>>
<<elseif $activeSlave.slaveSurname != $activeSlave.birthSurname>>
<<if $activeSlave.slaveSurname === 0>>
$He once had a surname;
<<if $activeSlave.birthSurname === "">>
- whatever it was, however, has been lost forever.
+ whatever it was, however, has been lost forever. Regardless,
<</if>>
<<else>>
$activeSlave.slaveSurname is not $his original surname;
<<if $activeSlave.birthSurname === "">>
- whatever it was, however, has been lost forever.
+ whatever it was, however, has been lost forever. Regardless,
<</if>>
<</if>>
<</if>>
<<if $activeSlave.birthName !== "" || $activeSlave.birthSurname !== "">>
<<if $activeSlave.devotion > 95>>
- $He adores $his slave name and affects to have forgotten that $he was ever called
+ $he adores $his slave name and affects to have forgotten that $he was ever called
<<elseif $activeSlave.devotion > 50>>
- $He uses $his slave name automatically and gives no sign that $he was ever called
+ $he uses $his slave name automatically and gives no sign that $he was ever called
<<elseif $activeSlave.devotion > 20>>
- $He uses $his slave name despite once being known as
+ $he uses $his slave name despite once being known as
<<elseif $activeSlave.devotion >= -20>>
- $He uses $his slave name hesitantly since $he was once called
+ $he uses $his slave name hesitantly since $he was once called
<<elseif $activeSlave.devotion >= -50>>
- $He uses $his slave name with resentment since $he prefers $his original name,
+ $he uses $his slave name with resentment since $he prefers $his original name,
<<else>>
- $He uses $his slave name only when constantly punished, since $he feels $his real name is
+ $he uses $his slave name only when constantly punished, since $he feels $his real name is
<</if>>
<<if $activeSlave.birthName === "">>
$activeSlave.birthSurname.
@@ -358,7 +358,7 @@ is
<</if>>
<</if>>
<<else>>
- $activeSlave.slaveName<<if $activeSlave.slaveSurname>> $activeSlave.slaveSurname<</if>> is not $his original name: $he was once called <<= SlaveFullBirthName($activeSlave)>>.
+ <<= SlaveFullName($activeSlave)>> is not $his original name: $he was once called <<= SlaveFullBirthName($activeSlave)>>.
<</if>>
<</if>>