diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 6a238b32eca009c670d7e4b31e23cd31fe1408a0..924dbdd23d39b6c783fafff62a3c316e518a822e 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -5025,7 +5025,7 @@ App.UI.slaveSummaryList = function (passageName) {
listIndexContent += '</div>';
}
res.push(htag(listIndexContent, {
- id: 'list_index' + _tableCount,
+ id: `list_index${ _tableCount}`,
class: 'hidden'
}));
}
@@ -5053,7 +5053,7 @@ App.UI.slaveSummaryList = function (passageName) {
const _tableCount = 0;
let slaveImagePrinted = (V.seeImages === 1) && (V.seeSummaryImages === 1);
- res.push('<div id="slave_' + _Slave.ID + '" style="clear:both">');
+ res.push(`<div id="slave_${ _Slave.ID }" style="clear:both">`);
switch (passageName) {
case "Main":
@@ -5723,12 +5723,12 @@ App.UI.slaveSummaryList = function (passageName) {
continue;
case "HG Select":
if (setup.HGCareers.includes(_Slave.career) || (_Slave.skillHG >= V.masteredXP)) {
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "Head Girl Suite":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.Flag === 0) {
res.push(`[[Send her to live with your Head Girl|Assign][$i = ${_ssi}]]`);
} else {
@@ -5737,18 +5737,18 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "Recruiter Select":
if (setup.recruiterCareers.includes(_Slave.career) || (_Slave.skillRC >= V.masteredXP)) {
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "BG Select":
if (setup.bodyguardCareers.includes(_Slave.career) || (_Slave.skillBG >= V.masteredXP)) {
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "Spa":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.Flag === 0) {
res.push(`<<link "Send ${_Slave.object} to $spaName" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else if (V.Flag === 1) {
@@ -5759,12 +5759,12 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "Attendant Select":
if (setup.attendantCareers.includes(_Slave.career) || (_Slave.skillAT >= V.masteredXP)) {
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "Nursery":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.Flag === 0) {
res.push(`<<link "Send ${_Slave.object} to $nurseryName" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else if (V.Flag === 1) {
@@ -5775,12 +5775,12 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "Matron Select":
if (setup.matronCareers.includes(_Slave.career) || (_Slave.skillMT >= V.masteredXP)) {
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "Brothel":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.Flag === 0) {
res.push(`<<link "Send ${_Slave.object} to $brothelName" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else if (V.Flag === 1) {
@@ -5791,12 +5791,12 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "Madam Select":
if (setup.madamCareers.includes(_Slave.career) || (_Slave.skillMD >= V.masteredXP)) {
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "Club":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.Flag === 0) {
res.push(`<<link "Send ${_Slave.object} to $clubName" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else if (V.Flag === 1) {
@@ -5806,7 +5806,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "Arcade":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.Flag === 0) {
res.push(`<<link "Confine ${_Slave.object} in $arcadeName" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else {
@@ -5815,12 +5815,12 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "DJ Select":
if (setup.DJCareers.includes(_Slave.career) || (_Slave.skillDJ >= V.masteredXP)) {
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "Clinic":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.clinicUpgradeScanner === 1) {
res.push(`@@.cyan;Estimated DNA error value: ${Math.ceil(_Slave.chem / 10)}@@`);
}
@@ -5834,12 +5834,12 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "Nurse Select":
if (setup.nurseCareers.includes(_Slave.career) || (_Slave.skillNU >= V.masteredXP)) {
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "Schoolroom":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.Flag === 0) {
res.push(`<<link "Assign ${_Slave.object} to $schoolroomName" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else if (V.Flag === 1) {
@@ -5850,12 +5850,12 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "Schoolteacher Select":
if (setup.schoolteacherCareers.includes(_Slave.career) || (_Slave.skillTE >= V.masteredXP)) {
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "Dairy":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.Flag === 0) {
res.push(`<<link "Send ${_Slave.object} to $dairyName" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else if (V.Flag === 1) {
@@ -5866,12 +5866,12 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "Milkmaid Select":
if (setup.milkmaidCareers.includes(_Slave.career) || (_Slave.skillMM >= V.masteredXP)) {
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "Farmyard":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.Flag === 0) {
res.push(`<<link "Send ${_Slave.object} to $farmyardName" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else if (V.Flag === 1) {
@@ -5882,12 +5882,12 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "Farmer Select":
if (setup.farmerCareers.includes(_Slave.career) || (_Slave.skillFA >= V.masteredXP)) {
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "Servants' Quarters":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.Flag === 0) {
res.push(`<<link "Assign ${_Slave.object} to $servantsQuartersName" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else if (V.Flag === 1) {
@@ -5898,12 +5898,12 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "Stewardess Select":
if (setup.stewardessCareers.includes(_Slave.career) || (_Slave.skillST >= V.masteredXP)) {
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "Master Suite":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.Flag === 0) {
res.push(`<<link "Add ${_Slave.object} to $masterSuiteName" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else if (V.Flag === 1) {
@@ -5913,7 +5913,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "Cellblock":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.Flag === 0) {
res.push(`<<link "Confine ${_Slave.object} in $cellblockName" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else if (V.Flag === 1) {
@@ -5924,12 +5924,12 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "Wardeness Select":
if (setup.wardenessCareers.includes(_Slave.career) || (_Slave.skillWA >= V.masteredXP)) {
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push('@@.lime;Has applicable career experience.@@');
}
break;
case "New Game Plus":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
if (V.Flag === 0) {
res.push(`<<link "Add to import list" "New Game Plus">>
<<set $slavesToImport += 1,$Flag = 1>>
@@ -5943,11 +5943,11 @@ App.UI.slaveSummaryList = function (passageName) {
}
break;
case "Matchmaking":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push(`[[Match them|Matchmaking][$subSlave = $slaves[${_ssi}]]]`);
break;
case "Dinner Party Preparations":
- res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? ' ' : '');
+ res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
res.push(`[[Make her the main course|Dinner Party Execution][$activeSlave = $slaves[${_ssi}]]]`);
break;
}