From 5a2c18dab07b1b04ab10c8bb6aff94f57a4f3ef1 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 20 Mar 2020 17:42:35 -0400
Subject: [PATCH] fix rename
---
src/interaction/slaveInteract.js | 114 ++++++++++++++++++-------------
src/js/utilsDOM.js | 10 ++-
2 files changed, 73 insertions(+), 51 deletions(-)
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index da18b52ede0..b778f0f66ae 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -1812,9 +1812,10 @@ App.UI.SlaveInteract.custom = (function() {
textbox = App.UI.DOM.makeTextBox(
slave.slaveName,
v => {
- slave.slaveName = v,
- App.UI.SlaveInteract.custom(slave);
- });
+ slave.slaveName = v;
+ },
+ false,
+ "Rename");
label.appendChild(textbox);
slaveNameNode.appendChild(label);
@@ -1822,9 +1823,10 @@ App.UI.SlaveInteract.custom = (function() {
result.appendChild(App.UI.DOM.link(
` Restore ${his} birth name`,
() => {
- slave.slaveName = slave.birthName,
- App.UI.SlaveInteract.custom(slave);
- }
+ slave.slaveName = slave.birthName;
+ },
+ false,
+ "Rename"
));
if (V.arcologies[0].FSPastoralist !== "unset") {
@@ -1833,9 +1835,10 @@ App.UI.SlaveInteract.custom = (function() {
result.appendChild(App.UI.DOM.link(
`Give ${him} a random cow given name`,
() => {
- slave.slaveName = setup.cowSlaveNames.random(),
- App.UI.SlaveInteract.custom(slave);
- }
+ slave.slaveName = setup.cowSlaveNames.random();
+ },
+ false,
+ "Rename"
));
}
}
@@ -1845,9 +1848,10 @@ App.UI.SlaveInteract.custom = (function() {
result.appendChild(App.UI.DOM.link(
`Give ${him} a random stipper given name`,
() => {
- slave.slaveName = setup.bimboSlaveNames.random(),
- App.UI.SlaveInteract.custom(slave);
- }
+ slave.slaveName = setup.bimboSlaveNames.random();
+ },
+ false,
+ "Rename"
));
}
}
@@ -1856,9 +1860,10 @@ App.UI.SlaveInteract.custom = (function() {
result.appendChild(App.UI.DOM.link(
`Give ${him} a random devotional given name`,
() => {
- slave.slaveName = setup.chattelReligionistSlaveNames.random(),
- App.UI.SlaveInteract.custom(slave);
- }
+ slave.slaveName = setup.chattelReligionistSlaveNames.random();
+ },
+ false,
+ "Rename"
));
}
slaveNameNode.appendChild(result);
@@ -1882,9 +1887,11 @@ App.UI.SlaveInteract.custom = (function() {
textbox = App.UI.DOM.makeTextBox(
slave.slaveSurname,
v => {
- slave.slaveSurname = textbox.value,
- App.UI.SlaveInteract.custom(slave);
- });
+ slave.slaveSurname = textbox.value;
+ },
+ false,
+ "Rename"
+ );
label.appendChild(textbox);
slaveSurnameNode.appendChild(label);
@@ -1892,9 +1899,10 @@ App.UI.SlaveInteract.custom = (function() {
result.appendChild(App.UI.DOM.link(
` Restore ${his} birth surname`,
() => {
- slave.slaveSurname = slave.birthSurname,
- App.UI.SlaveInteract.custom(slave);
- }
+ slave.slaveSurname = slave.birthSurname;
+ },
+ false,
+ "Rename"
));
if (slave.slaveSurname) {
@@ -1902,9 +1910,10 @@ App.UI.SlaveInteract.custom = (function() {
result.appendChild(App.UI.DOM.link(
`Take ${his} surname away`,
() => {
- slave.slaveSurname = 0,
- App.UI.SlaveInteract.custom(slave);
- }
+ slave.slaveSurname = 0;
+ },
+ false,
+ "Rename"
));
}
if (slave.relationship >= 5) {
@@ -1917,9 +1926,10 @@ App.UI.SlaveInteract.custom = (function() {
result.appendChild(App.UI.DOM.link(
`Give ${him} ${his} ${wifePronouns.wife}'s surname`,
() => {
- slave.slaveSurname = V.slaves[_i].slaveSurname,
- App.UI.SlaveInteract.custom(slave);
- }
+ slave.slaveSurname = V.slaves[_i].slaveSurname;
+ },
+ false,
+ "Rename"
));
break;
}
@@ -1934,9 +1944,10 @@ App.UI.SlaveInteract.custom = (function() {
result.appendChild(App.UI.DOM.link(
`Give ${him} your surname`,
() => {
- slave.slaveSurname = V.PC.slaveSurname,
- App.UI.SlaveInteract.custom(slave);
- }
+ slave.slaveSurname = V.PC.slaveSurname;
+ },
+ false,
+ "Rename"
));
}
}
@@ -1946,40 +1957,44 @@ App.UI.SlaveInteract.custom = (function() {
result.appendChild(App.UI.DOM.link(
`Give ${him} a random full Roman name`,
() => {
- slave.slaveName = setup.romanSlaveNames.random(),
- slave.slaveSurname = setup.romanSlaveSurnames.random(),
- App.UI.SlaveInteract.custom(slave);
- }
+ slave.slaveName = setup.romanSlaveNames.random();
+ slave.slaveSurname = setup.romanSlaveSurnames.random();
+ },
+ false,
+ "Rename"
));
} else if (V.arcologies[0].FSAztecRevivalist !== "unset") {
result.append(` | `);
result.appendChild(App.UI.DOM.link(
`Give ${him} a random full Aztec name`,
() => {
- slave.slaveName = setup.aztecSlaveNames.random(),
- slave.slaveSurname = 0,
- App.UI.SlaveInteract.custom(slave);
- }
+ slave.slaveName = setup.aztecSlaveNames.random();
+ slave.slaveSurname = 0;
+ },
+ false,
+ "Rename"
));
} else if (V.arcologies[0].FSEgyptianRevivalist !== "unset") {
result.append(` | `);
result.appendChild(App.UI.DOM.link(
`Give ${him} a random full ancient Egyptian name`,
() => {
- slave.slaveName = setup.ancientEgyptianSlaveNames.random(),
- slave.slaveSurname = 0,
- App.UI.SlaveInteract.custom(slave);
- }
+ slave.slaveName = setup.ancientEgyptianSlaveNames.random();
+ slave.slaveSurname = 0;
+ },
+ false,
+ "Rename"
));
} else if (V.arcologies[0].FSEdoRevivalist !== "unset") {
result.append(` | `);
result.appendChild(App.UI.DOM.link(
`Give ${him} a random full feudal Japanese name`,
() => {
- slave.slaveName = setup.edoSlaveNames.random(),
- slave.slaveSurname = setup.edoSlaveSurnames.random(),
- App.UI.SlaveInteract.custom(slave);
- }
+ slave.slaveName = setup.edoSlaveNames.random();
+ slave.slaveSurname = setup.edoSlaveSurnames.random();
+ },
+ false,
+ "Rename"
));
}
if (V.arcologies[0].FSDegradationist > -1) {
@@ -1987,9 +2002,10 @@ App.UI.SlaveInteract.custom = (function() {
result.appendChild(App.UI.DOM.link(
`Give ${him} a degrading full name`,
() => {
- DegradingName(slave),
- App.UI.SlaveInteract.custom(slave);
- }
+ DegradingName(slave);
+ },
+ false,
+ "Rename"
));
}
slaveSurnameNode.appendChild(result);
diff --git a/src/js/utilsDOM.js b/src/js/utilsDOM.js
index 046f0bc7fe6..459914c0113 100644
--- a/src/js/utilsDOM.js
+++ b/src/js/utilsDOM.js
@@ -199,7 +199,7 @@ App.UI.DOM.combineNodes = function(...content) {
* @param {boolean} [numberOnly]
* @returns {HTMLInputElement}
*/
-App.UI.DOM.makeTextBox = function(defaultValue, onEnter, numberOnly = false) {
+App.UI.DOM.makeTextBox = function(defaultValue, onEnter, numberOnly = false, passage) {
const input = document.createElement("input");
input.type = "text";
input.value = defaultValue;
@@ -223,7 +223,13 @@ App.UI.DOM.makeTextBox = function(defaultValue, onEnter, numberOnly = false) {
};
input.oldValue = defaultValue;
} else {
- updateValue = e => { onEnter(e.target.value); };
+ updateValue = e => {
+ onEnter(e.target.value);
+ if (passage !== '') {
+ SugarCube.Engine.play(passage);
+ }
+ console.log("passage", passage);
+ };
}
input.addEventListener('change', updateValue);
--
GitLab