diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index 6808ad215d49614d0dc9b05c265415f804f6ffdd..bf4e9550e6f0e5ffc9c7e8fe5ee5cd2d51390cd5 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -148,7 +148,7 @@ App.UI.SlaveInteract.fucktoyPref = function(slave) {
// add a note node if required
if (linkDesc.note) {
- App.UI.DOM.appendNewElement("span", link, `${linkDesc.note} `, "note");
+ App.UI.DOM.appendNewElement("span", link, linkDesc.note, "note");
}
return link;
}
@@ -284,10 +284,7 @@ App.UI.SlaveInteract.work = function(slave) {
div.append(span);
div.append(`. `);
- span = document.createElement('span');
- span.className = "note";
- span.textContent = `This is the highest class they are allowed to service, when eligible `;
- div.append(span);
+ div.append(App.UI.DOM.makeElement('span', `This is the highest class they are allowed to service, when eligible `, 'note'));
appendLink(`Auto`, 0, true);
appendLink(`Lower Class`, 1, true);
@@ -315,7 +312,7 @@ App.UI.SlaveInteract.work = function(slave) {
// add a note node if required
if (linkDesc.note) {
- App.UI.DOM.appendNewElement("span", link, `${linkDesc.note} `, "note");
+ App.UI.DOM.appendNewElement("span", link, linkDesc.note, "note");
}
return link;
}
@@ -1421,10 +1418,7 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
// add a note node if required
if (sexArray[i].note) {
- let note = document.createElement('span');
- note.textContent = `${sexArray[i].note} `;
- note.className = "note";
- link.appendChild(note);
+ link.appendChild(App.UI.DOM.makeElement('span', sexArray[i].note, 'note');
}
}
row.appendChild(link);
@@ -1495,13 +1489,13 @@ App.UI.SlaveInteract.bloating = function(slave) {
let link = App.UI.DOM.link(
`Let ${him} deflate`,
() => {
- slave.inflation = 0,
- slave.inflationType = "none",
- slave.inflationMethod = 0,
- slave.cumSource = 0,
- slave.milkSource = 0,
- SetBellySize(slave),
- App.UI.SlaveInteract.refreshAll(slave);
+ slave.inflation = 0;
+ slave.inflationType = "none";
+ slave.inflationMethod = 0;
+ slave.cumSource = 0;
+ slave.milkSource = 0;
+ SetBellySize(slave);
+ App.UI.SlaveInteract.refreshAll(slave);
},
);
bloating.append(link);
@@ -1509,11 +1503,11 @@ App.UI.SlaveInteract.bloating = function(slave) {
let link = App.UI.DOM.link(
`Let ${him} deflate`,
() => {
- slave.inflation = 0,
- slave.inflationType = "none",
- slave.inflationMethod = 0,
- SetBellySize(slave),
- App.UI.SlaveInteract.refreshAll(slave);
+ slave.inflation = 0;
+ slave.inflationType = "none";
+ slave.inflationMethod = 0;
+ SetBellySize(slave);
+ App.UI.SlaveInteract.refreshAll(slave);
},
);
bloating.append(link);
@@ -1575,8 +1569,8 @@ App.UI.SlaveInteract.fertility = function(slave) {
link.append(App.UI.DOM.link(
`Turn on implant`,
() => {
- slave.broodmotherOnHold = 0,
- slave.broodmotherCountDown = 0;
+ slave.broodmotherOnHold = 0;
+ slave.broodmotherCountDown = 0;
},
[],
"Slave Interact"
@@ -1606,8 +1600,8 @@ App.UI.SlaveInteract.fertility = function(slave) {
link.appendChild(App.UI.DOM.link(
`Use contraceptives`,
() => {
- slave.preg = -1,
- App.UI.SlaveInteract.refreshAll(slave);
+ slave.preg = -1;
+ App.UI.SlaveInteract.refreshAll(slave);
},
));
fertilityblock.append(link);
@@ -1615,8 +1609,8 @@ App.UI.SlaveInteract.fertility = function(slave) {
link.appendChild(App.UI.DOM.link(
`Let ${him} get pregnant`,
() => {
- slave.preg = 0,
- App.UI.SlaveInteract.refreshAll(slave);
+ slave.preg = 0;
+ App.UI.SlaveInteract.refreshAll(slave);
},
));
fertilityblock.append(link);
@@ -1626,9 +1620,9 @@ App.UI.SlaveInteract.fertility = function(slave) {
link.appendChild(App.UI.DOM.link(
`Induce labor`,
() => {
- slave.labor = 1,
- slave.induce = 1,
- V.birthee = 1;
+ slave.labor = 1;
+ slave.induce = 1;
+ V.birthee = 1;
},
[],
"Slave Interact"
@@ -1641,8 +1635,8 @@ App.UI.SlaveInteract.fertility = function(slave) {
link.appendChild(App.UI.DOM.link(
`Turn off implant`,
() => {
- slave.broodmotherOnHold = 1,
- slave.broodmotherCountDown = 38 - WombMinPreg(slave);
+ slave.broodmotherOnHold = 1;
+ slave.broodmotherCountDown = 38 - WombMinPreg(slave);
},
));
fertilityblock.append(link);
@@ -1658,8 +1652,8 @@ App.UI.SlaveInteract.fertility = function(slave) {
link.appendChild(App.UI.DOM.link(
`Give ${him} a cesarean section`,
() => {
- slave.broodmotherOnHold = 0,
- slave.broodmotherCountDown = 0;
+ slave.broodmotherOnHold = 0;
+ slave.broodmotherCountDown = 0;
},
[],
"csec"
@@ -1671,8 +1665,8 @@ App.UI.SlaveInteract.fertility = function(slave) {
link.appendChild(App.UI.DOM.link(
`Abort ${his} pregnancy`,
() => {
- slave.broodmotherOnHold = 0,
- slave.broodmotherCountDown = 0;
+ slave.broodmotherOnHold = 0;
+ slave.broodmotherCountDown = 0;
},
[],
"Abort"
@@ -1720,16 +1714,16 @@ App.UI.SlaveInteract.fertility = function(slave) {
link.appendChild(App.UI.DOM.link(
`Normal Birth`,
() => {
- slave.pregControl = "none",
- App.UI.SlaveInteract.fertility(slave);
+ slave.pregControl = "none";
+ App.UI.SlaveInteract.fertility(slave);
},
));
} else {
link.appendChild(App.UI.DOM.link(
`Suppress Labor`,
() => {
- slave.pregControl = "labor suppressors",
- App.UI.SlaveInteract.fertility(slave);
+ slave.pregControl = "labor suppressors";
+ App.UI.SlaveInteract.fertility(slave);
},
));
}
@@ -1738,8 +1732,8 @@ App.UI.SlaveInteract.fertility = function(slave) {
link.appendChild(App.UI.DOM.link(
`Normal Gestation`,
() => {
- slave.pregControl = "none",
- App.UI.SlaveInteract.fertility(slave);
+ slave.pregControl = "none";
+ App.UI.SlaveInteract.fertility(slave);
},
));
}
@@ -1748,8 +1742,8 @@ App.UI.SlaveInteract.fertility = function(slave) {
link.appendChild(App.UI.DOM.link(
`Slow Gestation`,
() => {
- slave.pregControl = "slow gestation",
- App.UI.SlaveInteract.fertility(slave);
+ slave.pregControl = "slow gestation";
+ App.UI.SlaveInteract.fertility(slave);
},
));
}
@@ -1758,8 +1752,8 @@ App.UI.SlaveInteract.fertility = function(slave) {
link.appendChild(App.UI.DOM.link(
`Fast Gestation`,
() => {
- slave.pregControl = "speed up",
- App.UI.SlaveInteract.fertility(slave);
+ slave.pregControl = "speed up";
+ App.UI.SlaveInteract.fertility(slave);
},
));
}
@@ -2369,9 +2363,7 @@ App.UI.SlaveInteract.custom = (function() {
let intro = document.createElement('p');
intro.className = "scene-intro";
intro.append(`You may enter custom descriptors for your slave's hair color, hair style, tattoos, or anything else here. After typing, press `);
- let introPiece = document.createElement('kbd');
- introPiece.textContent = `enter`;
- intro.appendChild(introPiece);
+ intro.appendChild(App.UI.DOM.makeElement("kbd", "enter"));
intro.append(` to commit your change. These custom descriptors will appear in descriptions of your slave, but will have no gameplay effect. Changing them is free.`);
return intro;
}
@@ -2392,9 +2384,9 @@ App.UI.SlaveInteract.custom = (function() {
label = document.createElement('div');
if (slave.devotion >= -50) {
if (slave.custom.title !== "") {
- label.textContent = `You have instructed ${him} to always refer to you as ${slave.custom.title}, which, should ${he} lisp, comes out as ${slave.custom.titleLisp}. `;
+ label.textContent = `You have instructed ${him} to always refer to you as ${slave.custom.title}, which, should ${he} lisp, comes out as ${slave.custom.titleLisp}.`;
} else {
- label.textContent = `You expect ${him} to refer to you as all your other slaves do. `;
+ label.textContent = `You expect ${him} to refer to you as all your other slaves do.`;
}
result = document.createElement('div');
result.id = "result";
@@ -2416,11 +2408,11 @@ App.UI.SlaveInteract.custom = (function() {
textbox = App.UI.DOM.makeTextBox(
"",
v => {
- slave.custom.title = v,
- jQuery('#result').empty().append(
- document.createTextNode(`${He}'ll try ${his} best to call you ${slave.custom.title}. `)
- ),
- slave.custom.titleLisp = lispReplace(slave.custom.title);
+ slave.custom.title = v;
+ jQuery('#result').empty().append(
+ document.createTextNode(`${He}'ll try ${his} best to call you ${slave.custom.title}.`)
+ );
+ slave.custom.titleLisp = lispReplace(slave.custom.title);
});
shownTextBox.appendChild(textbox);
} else {
@@ -2428,11 +2420,11 @@ App.UI.SlaveInteract.custom = (function() {
textbox = App.UI.DOM.makeTextBox(
slave.custom.title,
v => {
- slave.custom.title = v,
- jQuery('#result').empty().append(
- document.createTextNode(`${He}'ll try ${his} best to call you ${slave.custom.title}. `)
- ),
- slave.custom.titleLisp = lispReplace(slave.custom.title);
+ slave.custom.title = v;
+ jQuery('#result').empty().append(
+ document.createTextNode(`${He}'ll try ${his} best to call you ${slave.custom.title}.`)
+ );
+ slave.custom.titleLisp = lispReplace(slave.custom.title);
});
result.appendChild(textbox);
result.appendChild(
@@ -2441,8 +2433,8 @@ App.UI.SlaveInteract.custom = (function() {
() => {
jQuery('#result').empty().append(
document.createTextNode(`${He} will no longer refer to you with a special title.`)
- ),
- slave.custom.title = "";
+ );
+ slave.custom.title = "";
slave.custom.titleLisp = "";
}
)
@@ -2485,7 +2477,7 @@ App.UI.SlaveInteract.custom = (function() {
slaveFullNameNode.appendChild(slaveName());
slaveFullNameNode.appendChild(slaveSurname());
} else {
- slaveFullNameNode.textContent = `You must break ${his} will further before you can successfully force a new name on ${him}. `;
+ slaveFullNameNode.textContent = `You must break ${his} will further before you can successfully force a new name on ${him}.`;
slaveFullNameNode.className = "note";
}
@@ -2735,8 +2727,8 @@ App.UI.SlaveInteract.custom = (function() {
let textbox = App.UI.DOM.makeTextBox(
slave.hStyle,
v => {
- slave.hStyle = v,
- App.UI.SlaveInteract.custom(slave);
+ slave.hStyle = v;
+ App.UI.SlaveInteract.custom(slave);
});
label.appendChild(textbox);
@@ -2757,10 +2749,7 @@ App.UI.SlaveInteract.custom = (function() {
let choices = document.createElement('div');
choices.className = "choices";
- let note = document.createElement('span');
- note.className = "note";
- note.textContent = ` For best results, use a short, uncapitalized and unpunctuated description; for example: 'back in a ponytail'`;
- choices.appendChild(note);
+ choices.appendChild(App.UI.DOM.makeElement('span', ` For best results, use a short, uncapitalized and unpunctuated description; for example: 'back in a ponytail'`, 'note'));
hairStyleNode.appendChild(choices);
return hairStyleNode;
}
@@ -2773,8 +2762,8 @@ App.UI.SlaveInteract.custom = (function() {
let textbox = App.UI.DOM.makeTextBox(
slave.hColor,
v => {
- slave.hColor = v,
- App.UI.SlaveInteract.custom(slave);
+ slave.hColor = v;
+ App.UI.SlaveInteract.custom(slave);
});
label.appendChild(textbox);
label.append(` "${His} hair is ${slave.hColor}."`);
@@ -2782,10 +2771,7 @@ App.UI.SlaveInteract.custom = (function() {
let choices = document.createElement('div');
choices.className = "choices";
- let note = document.createElement('span');
- note.className = "note";
- note.textContent = ` For best results, use a short, uncapitalized and unpunctuated description; for example: 'black with purple highlights'`;
- choices.appendChild(note);
+ choices.appendChild(App.UI.DOM.makeElement('span', ` For best results, use a short, uncapitalized and unpunctuated description; for example: 'black with purple highlights'`, 'note'));
hairStyleNode.appendChild(choices);
return hairStyleNode;
}
@@ -2826,8 +2812,8 @@ App.UI.SlaveInteract.custom = (function() {
textbox = App.UI.DOM.makeTextBox(
slave.eye.left.iris,
v => {
- slave.eye.left.iris = v,
- App.UI.SlaveInteract.custom(slave);
+ slave.eye.left.iris = v;
+ App.UI.SlaveInteract.custom(slave);
});
eye.appendChild(textbox);
choices.appendChild(eye);
@@ -2838,16 +2824,13 @@ App.UI.SlaveInteract.custom = (function() {
textbox = App.UI.DOM.makeTextBox(
slave.eye.right.iris,
v => {
- slave.eye.right.iris = v,
- App.UI.SlaveInteract.custom(slave);
+ slave.eye.right.iris = v;
+ App.UI.SlaveInteract.custom(slave);
});
eye.appendChild(textbox);
choices.appendChild(eye);
}
- let note = document.createElement('span');
- note.className = "note";
- note.textContent = `For best results, use a short, uncapitalized and unpunctuated description; for example: 'blue'`;
- choices.appendChild(note);
+ choices.appendChild(App.UI.DOM.makeElement('span', `For best results, use a short, uncapitalized and unpunctuated description; for example: 'blue'`, 'note'));
eyeColorNode.appendChild(choices);
return eyeColorNode;
}
@@ -2869,17 +2852,13 @@ App.UI.SlaveInteract.custom = (function() {
el.appendChild(App.UI.DOM.makeTextBox(
slave.custom.tattoo,
v => {
- slave.custom.tattoo = v,
- App.UI.SlaveInteract.custom(slave);
+ slave.custom.tattoo = v;
+ App.UI.SlaveInteract.custom(slave);
}));
let choices = document.createElement('div');
choices.className = "choices";
-
- let note = document.createElement('span');
- note.className = "note";
- note.textContent = `For best results, use complete sentences; for example: '${He} has blue stars tattooed along ${his} cheekbones.'`;
- choices.appendChild(note);
+ choices.appendChild(App.UI.DOM.makeElement('span', `For best results, use complete sentences; for example: '${He} has blue stars tattooed along ${his} cheekbones.'`, 'note'));
el.appendChild(choices);
return el;
@@ -2903,17 +2882,13 @@ App.UI.SlaveInteract.custom = (function() {
el.appendChild(App.UI.DOM.makeTextBox(
slave.origin,
v => {
- slave.origin = v,
- App.UI.SlaveInteract.custom(slave);
+ slave.origin = v;
+ App.UI.SlaveInteract.custom(slave);
}));
let choices = document.createElement('div');
choices.className = "choices";
-
- let note = document.createElement('span');
- note.className = "note";
- note.textContent = ` For best results, use complete, capitalized and punctuated sentences; for example: '${He} followed you home from the pet store.'`;
- choices.appendChild(note);
+ choices.appendChild(App.UI.DOM.makeElement('span', ` For best results, use complete, capitalized and punctuated sentences; for example: '${He} followed you home from the pet store.'`, 'note'));
el.appendChild(choices);
return el;
@@ -2937,17 +2912,13 @@ App.UI.SlaveInteract.custom = (function() {
el.appendChild(App.UI.DOM.makeTextBox(
slave.custom.desc,
v => {
- slave.custom.desc = v,
- App.UI.SlaveInteract.custom(slave);
+ slave.custom.desc = v;
+ App.UI.SlaveInteract.custom(slave);
}));
let choices = document.createElement('div');
choices.className = "choices";
-
- let note = document.createElement('span');
- note.className = "note";
- note.textContent = ` For best results, use complete, capitalized and punctuated sentences; for example: '${He} has a beauty mark above ${his} left nipple.'`;
- choices.appendChild(note);
+ choices.appendChild(App.UI.DOM.makeElement('span', ` For best results, use complete, capitalized and punctuated sentences; for example: '${He} has a beauty mark above ${his} left nipple.'`, 'note'));
el.appendChild(choices);
return el;
@@ -2971,17 +2942,13 @@ App.UI.SlaveInteract.custom = (function() {
el.appendChild(App.UI.DOM.makeTextBox(
slave.custom.label,
v => {
- slave.custom.label = v,
- App.UI.SlaveInteract.custom(slave);
+ slave.custom.label = v;
+ App.UI.SlaveInteract.custom(slave);
}));
let choices = document.createElement('div');
choices.className = "choices";
-
- let note = document.createElement('span');
- note.className = "note";
- note.textContent = ` For best results, use a short phrase; for example: 'Breeder.'`;
- choices.appendChild(note);
+ choices.appendChild(App.UI.DOM.makeElement('span', ` For best results, use a short phrase; for example: 'Breeder.'`, 'note'));
el.appendChild(choices);
return el;
@@ -3036,9 +3003,9 @@ App.UI.SlaveInteract.custom = (function() {
App.UI.DOM.link(
` Reset`,
() => {
- slave.custom.image = null,
- App.UI.SlaveInteract.custom(slave),
- App.Art.refreshSlaveArt(slave, 3, "artFrame");
+ slave.custom.image = null;
+ App.UI.SlaveInteract.custom(slave);
+ App.Art.refreshSlaveArt(slave, 3, "artFrame");
},
)
);
@@ -3140,17 +3107,17 @@ App.UI.SlaveInteract.custom = (function() {
el.appendChild(App.UI.DOM.makeTextBox(
slave.custom.hairVector,
v => {
- slave.custom.hairVector = v,
- App.UI.SlaveInteract.custom(slave);
+ slave.custom.hairVector = v;
+ App.UI.SlaveInteract.custom(slave);
}));
el.appendChild(
App.UI.DOM.link(
` Reset`,
() => {
- slave.custom.hairVector = 0,
- App.UI.SlaveInteract.custom(slave),
- App.Art.refreshSlaveArt(slave, 3, "artFrame");
+ slave.custom.hairVector = 0;
+ App.UI.SlaveInteract.custom(slave);
+ App.Art.refreshSlaveArt(slave, 3, "artFrame");
},
)
);
@@ -3183,9 +3150,9 @@ App.UI.SlaveInteract.generateRows = function(array, slave, category, accessCheck
if (accessCheck === true) {
if (category === "chastity") {
let text = array[i].text.toLowerCase(); // Yucky. Category name does not match for chastity (since it sets multiple kinds of chastity at once). Compare using a lowercased name instead.
- unlocked = isItemAccessible.entry(text, `${category}`, slave, true);
+ unlocked = isItemAccessible.entry(text, `${category}`, slave);
} else {
- unlocked = isItemAccessible.entry(array[i].updateSlave[category], `${category}`, slave, true);
+ unlocked = isItemAccessible.entry(array[i].updateSlave[category], `${category}`, slave);
}
}
if (accessCheck === false || unlocked) {
@@ -3219,10 +3186,7 @@ App.UI.SlaveInteract.generateRows = function(array, slave, category, accessCheck
// add a note node if required
if (array[i].note) {
- let note = document.createElement('span');
- note.textContent = (` ${array[i].note}`);
- note.className = "note";
- link.appendChild(note);
+ link.appendChild(App.UI.DOM.makeElement('span', ` ${array[i].note}`, 'note'));
}
}
row.appendChild(link);