diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 3ece6b32dae265ec7fbb3d01c04316340cab7bc0..0b39e745e74003940fcdae98070a18c0ff4e0a59 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -2,7 +2,6 @@
<<set $nextButton = "Continue">>
<<set $nextLink = "MOD_Edit Slave Cheat Datatype Cleanup">>
-<<set $oldName = $activeSlave.slaveName, $oldSurname = $activeSlave.slaveSurname>>
<<set $tempSlave = clone($activeSlave)>>
<<setLocalPronouns $tempSlave>>
diff --git a/src/interaction/rename.js b/src/interaction/rename.js
index 75f9fd0836af44eb7b9c8f752840af7396b1fcef..a61cabe7cc0c31573d662821cd6b69bafd35b674 100644
--- a/src/interaction/rename.js
+++ b/src/interaction/rename.js
@@ -1,16 +1,17 @@
-App.UI.SlaveInteract.rename = function(slave, {oldName, oldSurname} = {}) {
+App.UI.SlaveInteract.rename = function(slave, {oldName = "", oldSurname = ""} = {}) {
const r = [];
- if (slave.slaveName === V.oldName && slave.slaveSurname === V.oldSurname) {
+ const {He, he, His, his, him, girl} = getPronouns(slave);
+ if (slave.slaveName === oldName && slave.slaveSurname === oldSurname) {
Engine.play("Slave Interact");
} else {
/* First time renaming reaction */
if (slave.slaveName === "" || !(slave.hasOwnProperty("slaveName"))) {
- r.push(`${V.oldName} needs to be called something on the records, so V.oldName ${he} stays.`);
- slave.slaveName = V.oldName;
+ r.push(`${oldName} needs to be called something on the records, so oldName ${he} stays.`);
+ slave.slaveName = oldName;
} else if (slave.fetish === "mindbroken") {
r.push(`${slave.slaveName} doesn't even recognize that ${he}'s been renamed.It simply does not register.`);
- } else if ((V.oldName !== slave.birthName && slave.slaveName === slave.birthName) || (V.oldSurname !== slave.birthSurname && slave.slaveSurname === slave.birthSurname)) {
+ } else if ((oldName !== slave.birthName && slave.slaveName === slave.birthName) || (oldSurname !== slave.birthSurname && slave.slaveSurname === slave.birthSurname)) {
r.push(`${slave.slaveName}`);
if (slave.devotion > 50) {
r.push(`cheerfully accepts ${his} old name back.`);
@@ -24,7 +25,7 @@ App.UI.SlaveInteract.rename = function(slave, {oldName, oldSurname} = {}) {
} else {
r.push(`cautiously accepts the return of ${his} name.`);
}
- } else if ((V.oldName === slave.birthName && slave.slaveName !== slave.birthName) || (V.oldSurname === slave.birthSurname && slave.slaveSurname !== slave.birthSurname)) {
+ } else if ((oldName === slave.birthName && slave.slaveName !== slave.birthName) || (oldSurname === slave.birthSurname && slave.slaveSurname !== slave.birthSurname)) {
r.push(`${slave.slaveName}`);
if (slave.devotion > 50) {
r.push(`accepts ${his} new name cheerfully. This attachment to you <span class="hotpink"> increases ${his} devotion.</span>`);
@@ -49,7 +50,7 @@ App.UI.SlaveInteract.rename = function(slave, {oldName, oldSurname} = {}) {
}
let _insultingName = 0;
- if (V.oldName !== slave.slaveName && typeof slave.slaveName === "string") {
+ if (oldName !== slave.slaveName && typeof slave.slaveName === "string") {
let _toSearch = slave.slaveName.toLowerCase();
for (let i = 0; i < setup.badWords.length; i++) {
if (_toSearch.indexOf(setup.badWords[i]) !== -1) {
@@ -59,9 +60,9 @@ App.UI.SlaveInteract.rename = function(slave, {oldName, oldSurname} = {}) {
}
}
if (!_insultingName) {
- if (V.oldSurname !== slave.slaveSurname && typeof slave.slaveSurname === "string") {
+ if (oldSurname !== slave.slaveSurname && typeof slave.slaveSurname === "string") {
let _toSearch = slave.slaveSurname.toLowerCase();
- for (i = 0; i < setup.badWords.length; i++) {
+ for (let i = 0; i < setup.badWords.length; i++) {
if (_toSearch.indexOf(setup.badWords[i]) !== -1) {
_insultingName = 1;
break;
@@ -82,7 +83,7 @@ App.UI.SlaveInteract.rename = function(slave, {oldName, oldSurname} = {}) {
}
/* Wife's surname reaction */
- if (V.oldSurname !== slave.slaveSurname) {
+ if (oldSurname !== slave.slaveSurname) {
if (slave.relationship >= 5) {
let _i = V.slaveIndices[slave.relationshipTarget];
if (!_i) {
@@ -93,7 +94,7 @@ App.UI.SlaveInteract.rename = function(slave, {oldName, oldSurname} = {}) {
if (slave.slaveSurname === V.slaves[_i].slaveSurname) {
r.push(`${He}'s touched that ${he} now shares a surname with ${his} ${wife2} ${V.slaves[_i].slaveName} ${V.slaves[_i].slaveSurname}, and is <span class="mediumaquamarine">more confident than ever</span> that you intend to keep them together in marital bliss.`);
slave.trust += 5;
- } else if (V.oldSurname === V.slaves[_i].slaveSurname) {
+ } else if (oldSurname === V.slaves[_i].slaveSurname) {
r.push(`${He}'s concerned that ${he} no longer shares a surname with ${his} ${wife2} ${V.slaves[_i].slaveName} ${V.slaves[_i].slaveSurname}, and is <span class="gold">very worried</span> that you might be considering splitting them up.`);
slave.trust -= 5;
}
@@ -102,7 +103,7 @@ App.UI.SlaveInteract.rename = function(slave, {oldName, oldSurname} = {}) {
}
/* PC's surname reaction */
- if (V.oldSurname !== slave.slaveSurname) {
+ if (oldSurname !== slave.slaveSurname) {
if (slave.relationship === -3) {
if (V.PC.slaveSurname) {
if (slave.fetish === "mindbroken") {
@@ -124,7 +125,7 @@ App.UI.SlaveInteract.rename = function(slave, {oldName, oldSurname} = {}) {
} else if (slave.devotion < -20 && slave.trust > 20) {
if (slave.slaveSurname === V.PC.slaveSurname) {
r.push(`When you tell ${him} that ${he}'s to be known as ${slave.slaveName} ${slave.slaveSurname} now, ${he} shows no reaction. You already took everything from ${him}, what's a name at this point?`);
- } else if (V.oldSurname === V.PC.slaveSurname) {
+ } else if (oldSurname === V.PC.slaveSurname) {
r.push(`${He} doesn't care about losing your surname at first, but it quickly sets in that ${he} may have <span class="gold">pushed ${his} position too far.</span>`);
slave.trust -= 20;
}
@@ -132,7 +133,7 @@ App.UI.SlaveInteract.rename = function(slave, {oldName, oldSurname} = {}) {
if (slave.slaveSurname === V.PC.slaveSurname) {
r.push(`When you tell ${him} that ${he}'s to be known as ${slave.slaveName} ${slave.slaveSurname} now, ${he} pleads with you not to steal ${his} name. It matters little to you, and ${he} is forced to <span class="hotpink">accept your will.</span>`);
slave.devotion += 5;
- } else if (V.oldSurname === V.PC.slaveSurname) {
+ } else if (oldSurname === V.PC.slaveSurname) {
r.push(`${He}'s <span class="mediumorchid">happy</span> to no longer have to share a name with ${his} tormentor, but the bliss doesn't last long as <span class="gold">dread</span> quickly sets in about what this may mean.`);
slave.devotion += 5;
slave.trust -= 10;
@@ -141,7 +142,7 @@ App.UI.SlaveInteract.rename = function(slave, {oldName, oldSurname} = {}) {
if (slave.slaveSurname === V.PC.slaveSurname) {
r.push(`When you tell ${him} that ${he}'s to be known as ${slave.slaveName} ${slave.slaveSurname} now, ${he} nods with approval feeling <span class="mediumaquamarine">that ${he} may hold at least some value in your eyes.</span>`);
slave.trust += 5;
- } else if (V.oldSurname === V.PC.slaveSurname) {
+ } else if (oldSurname === V.PC.slaveSurname) {
r.push(`${He} accepts that you'd rename ${him} something other than your name. ${He}'s <span class="gold">a little scared</span> that you intend to discard ${him} as your slave ${V.wife}, or worse, but realizes this was not only a possibility, but likely.`);
slave.trust -= 5;
}
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index 4ee745e80ab7b547b0ed90b79d94efb0ca58aa98..990ab2c42c852dd9e9c2a880f97c89f563365342 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -2617,6 +2617,7 @@ App.UI.SlaveInteract.custom = (function() {
return slaveFullNameNode;
function slaveName() {
+ const oldName = slave.slaveName;
// Slave Name
let slaveNameNode = document.createElement('p');
label = document.createElement('div');
@@ -2634,9 +2635,10 @@ App.UI.SlaveInteract.custom = (function() {
slave.slaveName,
v => {
slave.slaveName = v;
+ App.UI.SlaveInteract.rename(slave, {oldName:oldName});
},
false,
- "Rename");
+ );
label.appendChild(textbox);
slaveNameNode.appendChild(label);
@@ -2645,9 +2647,9 @@ App.UI.SlaveInteract.custom = (function() {
` Restore ${his} birth name`,
() => {
slave.slaveName = slave.birthName;
+ App.UI.SlaveInteract.rename(slave, {oldName:oldName});
},
false,
- "Rename"
));
if (V.arcologies[0].FSPastoralist !== "unset") {
@@ -2657,9 +2659,9 @@ App.UI.SlaveInteract.custom = (function() {
`Give ${him} a random cow given name`,
() => {
slave.slaveName = setup.cowSlaveNames.random();
+ App.UI.SlaveInteract.rename(slave, {oldName:oldName});
},
false,
- "Rename"
));
}
}
@@ -2670,9 +2672,9 @@ App.UI.SlaveInteract.custom = (function() {
`Give ${him} a random stipper given name`,
() => {
slave.slaveName = setup.bimboSlaveNames.random();
+ App.UI.SlaveInteract.rename(slave, {oldName:oldName});
},
false,
- "Rename"
));
}
}
@@ -2682,9 +2684,9 @@ App.UI.SlaveInteract.custom = (function() {
`Give ${him} a random devotional given name`,
() => {
slave.slaveName = setup.chattelReligionistSlaveNames.random();
+ App.UI.SlaveInteract.rename(slave, {oldName:oldName});
},
false,
- "Rename"
));
}
slaveNameNode.appendChild(result);
@@ -2693,6 +2695,8 @@ App.UI.SlaveInteract.custom = (function() {
function slaveSurname() {
// Slave Surname
+ const oldName = slave.slaveName;
+ const oldSurname = slave.slaveSurname;
let slaveSurnameNode = document.createElement('p');
label = document.createElement('div');
result = document.createElement('div');
@@ -2709,9 +2713,9 @@ App.UI.SlaveInteract.custom = (function() {
slave.slaveSurname,
v => {
slave.slaveSurname = textbox.value;
+ App.UI.SlaveInteract.rename(slave, {oldSurname:oldSurname});
},
false,
- "Rename"
);
label.appendChild(textbox);
@@ -2721,9 +2725,9 @@ App.UI.SlaveInteract.custom = (function() {
` Restore ${his} birth surname`,
() => {
slave.slaveSurname = slave.birthSurname;
+ App.UI.SlaveInteract.rename(slave, {oldSurname:oldSurname});
},
false,
- "Rename"
));
if (slave.slaveSurname) {
@@ -2732,9 +2736,9 @@ App.UI.SlaveInteract.custom = (function() {
`Take ${his} surname away`,
() => {
slave.slaveSurname = 0;
+ App.UI.SlaveInteract.rename(slave, {oldSurname:oldSurname});
},
false,
- "Rename"
));
}
if (slave.relationship >= 5) {
@@ -2748,9 +2752,9 @@ App.UI.SlaveInteract.custom = (function() {
`Give ${him} ${his} ${wifePronouns.wife}'s surname`,
() => {
slave.slaveSurname = V.slaves[_i].slaveSurname;
+ App.UI.SlaveInteract.rename(slave, {oldSurname:oldSurname});
},
false,
- "Rename"
));
break;
}
@@ -2766,9 +2770,9 @@ App.UI.SlaveInteract.custom = (function() {
`Give ${him} your surname`,
() => {
slave.slaveSurname = V.PC.slaveSurname;
+ App.UI.SlaveInteract.rename(slave, {oldSurname:oldSurname});
},
false,
- "Rename"
));
}
}
@@ -2780,9 +2784,9 @@ App.UI.SlaveInteract.custom = (function() {
() => {
slave.slaveName = setup.romanSlaveNames.random();
slave.slaveSurname = setup.romanSlaveSurnames.random();
+ App.UI.SlaveInteract.rename(slave, {oldName:oldName, oldSurname:oldSurname});
},
false,
- "Rename"
));
} else if (V.arcologies[0].FSAztecRevivalist !== "unset") {
result.append(` | `);
@@ -2791,9 +2795,9 @@ App.UI.SlaveInteract.custom = (function() {
() => {
slave.slaveName = setup.aztecSlaveNames.random();
slave.slaveSurname = 0;
+ App.UI.SlaveInteract.rename(slave, {oldName:oldName, oldSurname:oldSurname});
},
false,
- "Rename"
));
} else if (V.arcologies[0].FSEgyptianRevivalist !== "unset") {
result.append(` | `);
@@ -2802,9 +2806,9 @@ App.UI.SlaveInteract.custom = (function() {
() => {
slave.slaveName = setup.ancientEgyptianSlaveNames.random();
slave.slaveSurname = 0;
+ App.UI.SlaveInteract.rename(slave, {oldName:oldName, oldSurname:oldSurname});
},
false,
- "Rename"
));
} else if (V.arcologies[0].FSEdoRevivalist !== "unset") {
result.append(` | `);
@@ -2813,9 +2817,9 @@ App.UI.SlaveInteract.custom = (function() {
() => {
slave.slaveName = setup.edoSlaveNames.random();
slave.slaveSurname = setup.edoSlaveSurnames.random();
+ App.UI.SlaveInteract.rename(slave, {oldName:oldName, oldSurname:oldSurname});
},
false,
- "Rename"
));
}
if (V.arcologies[0].FSDegradationist > -1) {
@@ -2824,9 +2828,9 @@ App.UI.SlaveInteract.custom = (function() {
`Give ${him} a degrading full name`,
() => {
DegradingName(slave);
+ App.UI.SlaveInteract.rename(slave, {oldName:oldName, oldSurname:oldSurname});
},
false,
- "Rename"
));
}
slaveSurnameNode.appendChild(result);
diff --git a/src/npc/interaction/rename.tw b/src/npc/interaction/rename.tw
deleted file mode 100644
index f6a7679c4d8216239c2f5cb1d2c272a11c20923c..0000000000000000000000000000000000000000
--- a/src/npc/interaction/rename.tw
+++ /dev/null
@@ -1,140 +0,0 @@
-:: Rename [nobr]
-
-<<set $nextButton = "Back", $nextLink = "Slave Interact">>
-<<set $AS = $activeSlave.ID>>
-
-<<if getSlave($AS).slaveName === $oldName && getSlave($AS).slaveSurname === $oldSurname>>
- <<goto "Slave Interact">>
-<<else>>
-/* First time renaming reaction */
-<<if getSlave($AS).slaveName === "" || ndef getSlave($AS).slaveName>>
- $oldName needs to be called something on the records, so $oldName $he stays.
- <<set getSlave($AS).slaveName = $oldName>>
-<<elseif getSlave($AS).fetish == "mindbroken">>
- <<= getSlave($AS).slaveName>> doesn't even recognize that $he's been renamed. It simply does not register.
-<<elseif ($oldName != getSlave($AS).birthName && getSlave($AS).slaveName == getSlave($AS).birthName) || ($oldSurname != getSlave($AS).birthSurname && getSlave($AS).slaveSurname == getSlave($AS).birthSurname)>>
- <<= getSlave($AS).slaveName>>
- <<if getSlave($AS).devotion > 50>>
- cheerfully accepts $his old name back.
- <<elseif getSlave($AS).devotion >= -20>>
- obediently accepts $his old name back.
- <<elseif getSlave($AS).devotion >= -50>>
- happily accepts $his original name.
- <<elseif getSlave($AS).trust > 20>>
- scoffs at the notion that $he was ever anything other than <<= SlaveFullBirthName(getSlave($AS))>>, @@.orangered;weakening your control over $him.@@
- <<set getSlave($AS).trust += 5>>
- <<else>>
- cautiously accepts the return of $his name.
- <</if>>
-<<elseif ($oldName == getSlave($AS).birthName && getSlave($AS).slaveName != getSlave($AS).birthName) || ($oldSurname == getSlave($AS).birthSurname && getSlave($AS).slaveSurname != getSlave($AS).birthSurname)>>
- <<= getSlave($AS).slaveName>>
- <<if getSlave($AS).devotion > 50>>
- accepts $his new name cheerfully. This attachment to you @@.hotpink; increases $his devotion.@@
- <<set getSlave($AS).devotion += 4>>
- <<elseif getSlave($AS).devotion >= -20>>
- obediently accepts $his new name. This surrender to you @@.hotpink; increases $his obedience.@@
- <<set getSlave($AS).devotion += 4>>
- <<elseif getSlave($AS).devotion >= -50>>
- reluctantly accepts $his new name.
- <<else>>
- angrily tries to resist $his new name, insisting that $his name is <<= SlaveFullBirthName(getSlave($AS))>>. This resistance @@.mediumorchid; increases $his rebelliousness.@@
- <<set getSlave($AS).devotion -= 5>>
- <</if>>
-<<else>>
- Since <<= getSlave($AS).slaveName>> has already had a new name <<if getSlave($AS).devotion > 20>>given to<<else>>forced on<</if>> $him before, the mere fact of having it changed again doesn't really affect $him.
-<</if>>
-
-<<set _insultingName = 0>>
-<<if $oldName != getSlave($AS).slaveName && typeof getSlave($AS).slaveName == "string">>
- <<set _toSearch = getSlave($AS).slaveName.toLowerCase()>>
- <<for $i = 0; $i < setup.badWords.length; $i++>>
- <<if _toSearch.indexOf(setup.badWords[$i]) != -1>>
- <<set _insultingName = 1>>
- <<break>>
- <</if>>
- <</for>>
-<</if>>
-<<if !_insultingName>>
- <<if $oldSurname != getSlave($AS).slaveSurname && typeof getSlave($AS).slaveSurname == "string">>
- <<set _toSearch = getSlave($AS).slaveSurname.toLowerCase()>>
- <<for $i = 0; $i < setup.badWords.length; $i++>>
- <<if _toSearch.indexOf(setup.badWords[$i]) != -1>>
- <<set _insultingName = 1>>
- <<break>>
- <</if>>
- <</for>>
- <</if>>
-<</if>>
-<<if _insultingName == 1>>
- <<if getSlave($AS).fetish == "mindbroken">>
- $His new name would be insulting to a normal $girl, but $he dully accepts that it is an accurate description and goes about $his duties.
- <<elseif getSlave($AS).devotion < -50>>
- Being given such a degrading name @@.mediumorchid;further increases $his hatred@@ of you.
- <<set getSlave($AS).devotion -= 5>>
- <<elseif getSlave($AS).devotion <= 50>>
- Being given such a degrading name @@.gold;terrifies $him,@@ since $he thinks it's fair warning for what $he'll suffer in the future.
- <<set getSlave($AS).trust -= 5>>
- <</if>>
-<</if>>
-
-/* Wife's surname reaction */
-<<if $oldSurname != getSlave($AS).slaveSurname>>
- <<if getSlave($AS).relationship >= 5>>
- <<set _i = $slaveIndices[getSlave($AS).relationshipTarget]>>
- <<if ndef _i>>@@.red;Error, relationshipTarget not found.@@<</if>>
- <<if $slaves[_i].slaveSurname>>
- <<setLocalPronouns $slaves[_i] 2>>
- <<if getSlave($AS).slaveSurname == $slaves[_i].slaveSurname>>
- $He's touched that $he now shares a surname with $his _wife2 $slaves[_i].slaveName $slaves[_i].slaveSurname, and is @@.mediumaquamarine;more confident than ever@@ that you intend to keep them together in marital bliss.
- <<set getSlave($AS).trust += 5>>
- <<elseif $oldSurname == $slaves[_i].slaveSurname>>
- $He's concerned that $he no longer shares a surname with $his _wife2 $slaves[_i].slaveName $slaves[_i].slaveSurname, and is @@.gold;very worried@@ that you might be considering splitting them up.
- <<set getSlave($AS).trust -= 5>>
- <</if>>
- <</if>>
- <</if>>
-<</if>>
-
-/* PC's surname reaction */
-<<if $oldSurname != getSlave($AS).slaveSurname>>
- <<if getSlave($AS).relationship == -3>>
- <<if $PC.slaveSurname>>
- <<if getSlave($AS).fetish == "mindbroken">>
- Names are meaningless to $him and it is unlikely $he'll remember it.
- <<elseif getSlave($AS).devotion+getSlave($AS).trust >= 175>>
- <<if getSlave($AS).slaveSurname == $PC.slaveSurname>>
- When you tell $him that $he's to be known as <<= getSlave($AS).slaveName>> <<= getSlave($AS).slaveSurname>> now, $he starts to cry. $He tries to get $himself under control and thank you as best $he can, <<if hasAnyArms(getSlave($AS))>>wiping at the tears running down $his <<= getSlave($AS).skin>> cheeks, <</if>>but $he can't seem to stop weeping as $he thanks you over and over. $He's a sex slave, your property, and it's understandable that some doubts about the permanence of $his place as your slave $wife. This has @@.mediumaquamarine;helped reassure $him,@@ and explains the strength of $his emotional reaction. The next time you make love to $him, $he @@.hotpink;presses $himself as close to you as $he can,@@ eager to drink in as much of your presence as $he can get.
- <<set getSlave($AS).devotion += 5, getSlave($AS).trust += 5>>
- <<elseif $oldSurname == $PC.slaveSurname>>
- $He's devastated that you'd rename $him something other than your name. $He's @@.gold;terrified@@ that you intend to discard $him as your slave $wife, and @@.mediumorchid;saddened@@ that you would take away something that was precious to $him.
- <<set getSlave($AS).devotion -= 5, getSlave($AS).trust -= 5>>
- <</if>>
- <<elseif getSlave($AS).devotion < -20 && getSlave($AS).trust > 20>>
- <<if getSlave($AS).slaveSurname == $PC.slaveSurname>>
- When you tell $him that $he's to be known as <<= getSlave($AS).slaveName>> <<= getSlave($AS).slaveSurname>> now, $he shows no reaction. You already took everything from $him, what's a name at this point?
- <<elseif $oldSurname == $PC.slaveSurname>>
- $He doesn't care about losing your surname at first, but it quickly sets in that $he may have @@.gold;pushed $his position too far.@@
- <<set getSlave($AS).trust -= 20>>
- <</if>>
- <<elseif getSlave($AS).devotion < -20>>
- <<if getSlave($AS).slaveSurname == $PC.slaveSurname>>
- When you tell $him that $he's to be known as <<= getSlave($AS).slaveName>> <<= getSlave($AS).slaveSurname>> now, $he pleads with you not to steal $his name. It matters little to you, and $he is forced to @@.hotpink;accept your will.@@
- <<set getSlave($AS).devotion += 5>>
- <<elseif $oldSurname == $PC.slaveSurname>>
- $He's @@.mediumorchid;happy@@ to no longer have to share a name with $his tormentor, but the bliss doesn't last long as @@.gold;dread@@ quickly sets in about what this may mean.
- <<set getSlave($AS).devotion += 5, getSlave($AS).trust -= 10>>
- <</if>>
- <<else>>
- <<if getSlave($AS).slaveSurname == $PC.slaveSurname>>
- When you tell $him that $he's to be known as <<= getSlave($AS).slaveName>> <<= getSlave($AS).slaveSurname>> now, $he nods with approval feeling @@.mediumaquamarine;that $he may hold at least some value in your eyes.@@
- <<set getSlave($AS).trust += 5>>
- <<elseif $oldSurname == $PC.slaveSurname>>
- $He accepts that you'd rename $him something other than your name. $He's @@.gold;a little scared@@ that you intend to discard $him as your slave $wife, or worse, but realizes this was not only a possibility, but likely.
- <<set getSlave($AS).trust -= 5>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
-<</if>>
-
-<</if>> /* close new name check */
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 25f8249827c013185df19ac7747724b752bc9624..262c4c606437daec3162e5aa103526bf9be78fbc 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -348,7 +348,7 @@
<<set $beforeGingering = null>>
/% Strings Memory varies. %/
-<<set $buyer = "", $desc = "", $event = "", $goto = "", $malefactor = "", $oldName = "", $oldSurname = "">>
+<<set $buyer = "", $desc = "", $event = "", $goto = "", $malefactor = "">>
/% Done with zeroing out, what should be for the most part Temps %/
<<if $autosave != 0>>