From bc6912c237088be5b12a51ca505edaa1d5f2f7b3 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 27 Jul 2020 17:53:13 -0400
Subject: [PATCH] rename adult
---
src/facilities/nursery/customizeChild.tw | 4 +++-
src/interaction/rename.js | 2 +-
src/interaction/slaveInteract.js | 30 ++++++++++++------------
3 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/facilities/nursery/customizeChild.tw b/src/facilities/nursery/customizeChild.tw
index e8d5fbab17f..ed8a8c67b0c 100644
--- a/src/facilities/nursery/customizeChild.tw
+++ b/src/facilities/nursery/customizeChild.tw
@@ -1,8 +1,10 @@
:: Customize Child [nobr]
-<<set $nextButton = "Continue", $nextLink = "Rename Child">>
+<<set $nextButton = "Continue">>
<<set $oldName = $activeChild.slaveName, $oldSurname = $activeChild.slaveSurname>>
+<p id="rename"></p>
+
You may enter custom descriptors for the child's hair color, hair style, tattoos, or anything else here. After typing, press enter to commit your change. These custom descriptors will appear in descriptions of the child, but will have no gameplay effect. Changing them is free.
<br><br>
diff --git a/src/interaction/rename.js b/src/interaction/rename.js
index a61cabe7cc0..f945df5ee5d 100644
--- a/src/interaction/rename.js
+++ b/src/interaction/rename.js
@@ -1,5 +1,5 @@
-App.UI.SlaveInteract.rename = function(slave, {oldName = "", oldSurname = ""} = {}) {
+App.UI.SlaveInteract.renameAdult = function(slave, {oldName = "", oldSurname = ""} = {}) {
const r = [];
const {He, he, His, his, him, girl} = getPronouns(slave);
if (slave.slaveName === oldName && slave.slaveSurname === oldSurname) {
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index 990ab2c42c8..6ff416db1d9 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -2635,7 +2635,7 @@ App.UI.SlaveInteract.custom = (function() {
slave.slaveName,
v => {
slave.slaveName = v;
- App.UI.SlaveInteract.rename(slave, {oldName:oldName});
+ App.UI.SlaveInteract.renameAdult(slave, {oldName:oldName});
},
false,
);
@@ -2647,7 +2647,7 @@ App.UI.SlaveInteract.custom = (function() {
` Restore ${his} birth name`,
() => {
slave.slaveName = slave.birthName;
- App.UI.SlaveInteract.rename(slave, {oldName:oldName});
+ App.UI.SlaveInteract.renameAdult(slave, {oldName:oldName});
},
false,
));
@@ -2659,7 +2659,7 @@ App.UI.SlaveInteract.custom = (function() {
`Give ${him} a random cow given name`,
() => {
slave.slaveName = setup.cowSlaveNames.random();
- App.UI.SlaveInteract.rename(slave, {oldName:oldName});
+ App.UI.SlaveInteract.renameAdult(slave, {oldName:oldName});
},
false,
));
@@ -2672,7 +2672,7 @@ App.UI.SlaveInteract.custom = (function() {
`Give ${him} a random stipper given name`,
() => {
slave.slaveName = setup.bimboSlaveNames.random();
- App.UI.SlaveInteract.rename(slave, {oldName:oldName});
+ App.UI.SlaveInteract.renameAdult(slave, {oldName:oldName});
},
false,
));
@@ -2684,7 +2684,7 @@ App.UI.SlaveInteract.custom = (function() {
`Give ${him} a random devotional given name`,
() => {
slave.slaveName = setup.chattelReligionistSlaveNames.random();
- App.UI.SlaveInteract.rename(slave, {oldName:oldName});
+ App.UI.SlaveInteract.renameAdult(slave, {oldName:oldName});
},
false,
));
@@ -2713,7 +2713,7 @@ App.UI.SlaveInteract.custom = (function() {
slave.slaveSurname,
v => {
slave.slaveSurname = textbox.value;
- App.UI.SlaveInteract.rename(slave, {oldSurname:oldSurname});
+ App.UI.SlaveInteract.renameAdult(slave, {oldSurname:oldSurname});
},
false,
);
@@ -2725,7 +2725,7 @@ App.UI.SlaveInteract.custom = (function() {
` Restore ${his} birth surname`,
() => {
slave.slaveSurname = slave.birthSurname;
- App.UI.SlaveInteract.rename(slave, {oldSurname:oldSurname});
+ App.UI.SlaveInteract.renameAdult(slave, {oldSurname:oldSurname});
},
false,
));
@@ -2736,7 +2736,7 @@ App.UI.SlaveInteract.custom = (function() {
`Take ${his} surname away`,
() => {
slave.slaveSurname = 0;
- App.UI.SlaveInteract.rename(slave, {oldSurname:oldSurname});
+ App.UI.SlaveInteract.renameAdult(slave, {oldSurname:oldSurname});
},
false,
));
@@ -2752,7 +2752,7 @@ 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});
+ App.UI.SlaveInteract.renameAdult(slave, {oldSurname:oldSurname});
},
false,
));
@@ -2770,7 +2770,7 @@ App.UI.SlaveInteract.custom = (function() {
`Give ${him} your surname`,
() => {
slave.slaveSurname = V.PC.slaveSurname;
- App.UI.SlaveInteract.rename(slave, {oldSurname:oldSurname});
+ App.UI.SlaveInteract.renameAdult(slave, {oldSurname:oldSurname});
},
false,
));
@@ -2784,7 +2784,7 @@ App.UI.SlaveInteract.custom = (function() {
() => {
slave.slaveName = setup.romanSlaveNames.random();
slave.slaveSurname = setup.romanSlaveSurnames.random();
- App.UI.SlaveInteract.rename(slave, {oldName:oldName, oldSurname:oldSurname});
+ App.UI.SlaveInteract.renameAdult(slave, {oldName:oldName, oldSurname:oldSurname});
},
false,
));
@@ -2795,7 +2795,7 @@ App.UI.SlaveInteract.custom = (function() {
() => {
slave.slaveName = setup.aztecSlaveNames.random();
slave.slaveSurname = 0;
- App.UI.SlaveInteract.rename(slave, {oldName:oldName, oldSurname:oldSurname});
+ App.UI.SlaveInteract.renameAdult(slave, {oldName:oldName, oldSurname:oldSurname});
},
false,
));
@@ -2806,7 +2806,7 @@ App.UI.SlaveInteract.custom = (function() {
() => {
slave.slaveName = setup.ancientEgyptianSlaveNames.random();
slave.slaveSurname = 0;
- App.UI.SlaveInteract.rename(slave, {oldName:oldName, oldSurname:oldSurname});
+ App.UI.SlaveInteract.renameAdult(slave, {oldName:oldName, oldSurname:oldSurname});
},
false,
));
@@ -2817,7 +2817,7 @@ App.UI.SlaveInteract.custom = (function() {
() => {
slave.slaveName = setup.edoSlaveNames.random();
slave.slaveSurname = setup.edoSlaveSurnames.random();
- App.UI.SlaveInteract.rename(slave, {oldName:oldName, oldSurname:oldSurname});
+ App.UI.SlaveInteract.renameAdult(slave, {oldName:oldName, oldSurname:oldSurname});
},
false,
));
@@ -2828,7 +2828,7 @@ App.UI.SlaveInteract.custom = (function() {
`Give ${him} a degrading full name`,
() => {
DegradingName(slave);
- App.UI.SlaveInteract.rename(slave, {oldName:oldName, oldSurname:oldSurname});
+ App.UI.SlaveInteract.renameAdult(slave, {oldName:oldName, oldSurname:oldSurname});
},
false,
));
--
GitLab