diff --git a/src/endWeek/reports/arcadeReport.js b/src/endWeek/reports/arcadeReport.js index 86bf873ce2d12ff2cfdc5e2524ac597a777e43a3..fb3894ec553b41568a96f2afc451d91bfaa76907 100644 --- a/src/endWeek/reports/arcadeReport.js +++ b/src/endWeek/reports/arcadeReport.js @@ -82,7 +82,7 @@ App.EndWeek.arcadeReport = function() { if (V.showEWD !== 0) { const {He} = getPronouns(slave); const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry); App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave); r = []; r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name")); @@ -102,6 +102,7 @@ App.EndWeek.arcadeReport = function() { "div", "indent" ); + App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); } else { // discard return values silently App.SlaveAssignment.choosesOwnJob(slave); diff --git a/src/endWeek/reports/brothelReport.js b/src/endWeek/reports/brothelReport.js index d68b757f87383772b4c73d2b63221c8da4fc4d6d..41342c1dbb46183f9cb69e92df8508dca76de2c6 100644 --- a/src/endWeek/reports/brothelReport.js +++ b/src/endWeek/reports/brothelReport.js @@ -266,7 +266,7 @@ App.EndWeek.brothelReport = function() { tired(madam); if (V.showEWD !== 0) { const madamEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(madamEntry, madam); + const artSpan = App.UI.DOM.appendNewElement("span", madamEntry); App.SlaveAssignment.appendSlaveLinks(madamEntry, madam); App.Events.addNode( madamEntry, @@ -276,6 +276,7 @@ App.EndWeek.brothelReport = function() { ] ); madamEntry.append(App.SlaveAssignment.standardSlaveReport(madam, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, madam); } else { App.SlaveAssignment.standardSlaveReport(madam, true); } @@ -338,7 +339,7 @@ App.EndWeek.brothelReport = function() { if (V.showEWD !== 0) { const {He} = getPronouns(slave); const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry); App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave); r = []; r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name")); @@ -359,6 +360,7 @@ App.EndWeek.brothelReport = function() { "indent" ); slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { // discard return values silently App.SlaveAssignment.choosesOwnJob(slave); diff --git a/src/endWeek/reports/cellblockReport.js b/src/endWeek/reports/cellblockReport.js index 61ec702120605a74bbb01a048374a819e5305de2..76d0ceaab01bdac7fca90968eb6414b8ce8b2ac9 100644 --- a/src/endWeek/reports/cellblockReport.js +++ b/src/endWeek/reports/cellblockReport.js @@ -174,7 +174,7 @@ App.EndWeek.cellblockReport = function() { /* apply following SA passages to facility leader */ if (V.showEWD !== 0) { const wardenessEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(wardenessEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", wardenessEntry); App.SlaveAssignment.appendSlaveLinks(wardenessEntry, slave); App.Events.addNode( wardenessEntry, @@ -184,6 +184,7 @@ App.EndWeek.cellblockReport = function() { ] ); wardenessEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { App.SlaveAssignment.standardSlaveReport(slave, true); } @@ -293,7 +294,7 @@ App.EndWeek.cellblockReport = function() { if (V.showEWD !== 0) { const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry); App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave); r = []; r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name")); @@ -310,7 +311,8 @@ App.EndWeek.cellblockReport = function() { brokenSlaves++; continue; // slave has been reassigned; remaining report will run at her new assignment } - slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + artSpan.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); } else { // discard return values silently App.SlaveAssignment.choosesOwnJob(slave); diff --git a/src/endWeek/reports/clinicReport.js b/src/endWeek/reports/clinicReport.js index f75cb416b2c9481fef1187f12e5974843c64e77e..9e4a859019413ade5748acd9d606cc76e9aef95a 100644 --- a/src/endWeek/reports/clinicReport.js +++ b/src/endWeek/reports/clinicReport.js @@ -257,10 +257,11 @@ App.EndWeek.clinicReport = function() { /* apply following SA passages to facility leader */ if (V.showEWD !== 0) { const nurseEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(nurseEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", nurseEntry); App.SlaveAssignment.appendSlaveLinks(nurseEntry, slave); $(nurseEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> is serving as the clinical nurse.`); nurseEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { App.SlaveAssignment.standardSlaveReport(slave, true); } @@ -398,7 +399,7 @@ App.EndWeek.clinicReport = function() { if (V.showEWD !== 0) { const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry); App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave); $(slaveEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> `); if (slave.choosesOwnAssignment === 2) { @@ -412,6 +413,7 @@ App.EndWeek.clinicReport = function() { $(patientContent).append(`${He} stays in the clinic ${toSentence(remainReasons)}.`); } slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { // discard return values silently App.SlaveAssignment.choosesOwnJob(slave); diff --git a/src/endWeek/reports/clubReport.js b/src/endWeek/reports/clubReport.js index 0d79a0438f806d6330378088e544e6c5a4a113c2..172bf78bbaed0ee0b1d3b790d1fd306bf4ce1b9e 100644 --- a/src/endWeek/reports/clubReport.js +++ b/src/endWeek/reports/clubReport.js @@ -151,7 +151,7 @@ App.EndWeek.clubReport = function() { /* apply following SA passages to facility leader */ if (V.showEWD !== 0) { const DJEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(DJEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", DJEntry); App.SlaveAssignment.appendSlaveLinks(DJEntry, slave); App.Events.addNode( DJEntry, @@ -161,6 +161,7 @@ App.EndWeek.clubReport = function() { ] ); DJEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { App.SlaveAssignment.standardSlaveReport(slave, true); } @@ -203,7 +204,7 @@ App.EndWeek.clubReport = function() { if (V.showEWD !== 0) { const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry); App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave); r = []; r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name")); @@ -225,6 +226,7 @@ App.EndWeek.clubReport = function() { "indent" ); slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { // discard return values silently App.SlaveAssignment.choosesOwnJob(slave); diff --git a/src/endWeek/reports/dairyReport.js b/src/endWeek/reports/dairyReport.js index 243cde7eced61372ad82c924231b3a3f632f2125..73d5840e7feccbdf44bf09f57cd04f9de120e63e 100644 --- a/src/endWeek/reports/dairyReport.js +++ b/src/endWeek/reports/dairyReport.js @@ -339,7 +339,7 @@ App.EndWeek.dairyReport = function() { /* apply following SA passages to facility leader */ if (V.showEWD !== 0) { const milkMaidEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(milkMaidEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", milkMaidEntry); App.SlaveAssignment.appendSlaveLinks(milkMaidEntry, slave); App.Events.addNode( milkMaidEntry, @@ -349,6 +349,7 @@ App.EndWeek.dairyReport = function() { ] ); milkMaidEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { App.SlaveAssignment.standardSlaveReport(slave, true); } @@ -461,7 +462,7 @@ App.EndWeek.dairyReport = function() { cumWeek += milkResults.cum; if (V.showEWD !== 0) { const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry); App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave); r = []; r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name")); @@ -483,6 +484,7 @@ App.EndWeek.dairyReport = function() { "indent" ); slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { // discard return values silently App.SlaveAssignment.choosesOwnJob(slave); diff --git a/src/endWeek/reports/farmyardReport.js b/src/endWeek/reports/farmyardReport.js index 389fdb27dfa8fbd100a240e0babcd10f5432cb43..93ed24e49df3d6a970d7ba5e1c29d98bdde3b3f8 100644 --- a/src/endWeek/reports/farmyardReport.js +++ b/src/endWeek/reports/farmyardReport.js @@ -258,10 +258,11 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { if (V.showEWD) { const farmerEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(farmerEntry, Farmer); + const artSpan = App.UI.DOM.appendNewElement("span", farmerEntry); App.SlaveAssignment.appendSlaveLinks(farmerEntry, Farmer); $(farmerEntry).append(`<span class="slave-name">${SlaveFullName(Farmer)}</span> is serving as the Farmer.`); farmerEntry.append(App.SlaveAssignment.standardSlaveReport(Farmer, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, Farmer); } else { App.SlaveAssignment.standardSlaveReport(Farmer, true); } @@ -353,7 +354,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { if (V.showEWD) { const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry); App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave); $(slaveEntry).append(`<span class="slave-name">${SlaveFullName(slave)}</span> `); @@ -376,6 +377,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { $(farmhandContent).append(App.SlaveAssignment.workTheFarm(slave)); slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { // silently discard return values App.SlaveAssignment.workTheFarm(slave); App.SlaveAssignment.standardSlaveReport(slave, true); diff --git a/src/endWeek/reports/masterSuiteReport.js b/src/endWeek/reports/masterSuiteReport.js index c6d08951a85c19310d2f59f6f25ba95583e99cfd..ed0f38e73410e9f2271b9cce676fb03e4927eac5 100644 --- a/src/endWeek/reports/masterSuiteReport.js +++ b/src/endWeek/reports/masterSuiteReport.js @@ -431,16 +431,18 @@ App.EndWeek.masterSuiteReport = function() { if (concubine) { tired(concubine); const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(slaveEntry, concubine); + const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry); App.SlaveAssignment.appendSlaveLinks(slaveEntry, concubine); App.Events.addNode(slaveEntry, [concubineText(), commonText(concubine)]); + App.SlaveAssignment.appendSlaveArt(artSpan, concubine); } for (const slave of App.SlaveAssignment.reportSlaves(slaves)) { const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry); App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave); App.Events.addNode(slaveEntry, [nonConcubineText(slave), commonText(slave)]); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } if (pregnantSlaves > 0 && V.arcologies[0].FSRestart !== "unset" && V.propOutcome !== 1 && V.eugenicsFullControl !== 1) { diff --git a/src/endWeek/reports/nurseryReport.js b/src/endWeek/reports/nurseryReport.js index 71540f5f0838db2452450ae5e20beb594806d10d..821fb0ec56f529330b29b3aacbb9875a0a6d49a2 100644 --- a/src/endWeek/reports/nurseryReport.js +++ b/src/endWeek/reports/nurseryReport.js @@ -140,10 +140,11 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() { if (V.showEWD !== 0) { const matronEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(matronEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", matronEntry); App.SlaveAssignment.appendSlaveLinks(matronEntry, slave); $(matronEntry).append(`<span class="slave-name">${SlaveFullName(slave)}</span> is serving as your Matron.`); matronEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { App.SlaveAssignment.standardSlaveReport(slave, true); } @@ -196,7 +197,7 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() { if (V.showEWD) { const {He} = getPronouns(slave); const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry); App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave); $(slaveEntry).append(`<span class="slave-name">${SlaveFullName(slave)}</span> `); @@ -211,6 +212,7 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() { $(nannyContent).append(`${He} ${App.SlaveAssignment.nanny(slave, matronBonus)}`); // FIXME: nanny() takes one argument slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { // silently discard return values App.SlaveAssignment.nanny(slave, matronBonus); // FIXME: nanny() takes one argument App.SlaveAssignment.standardSlaveReport(slave, true); diff --git a/src/endWeek/reports/schoolroomReport.js b/src/endWeek/reports/schoolroomReport.js index c80b267bce98021a3dcd09f286e50fdf4df08413..ba4a6f594458051a15fcb69094a63ab6c28ea28f 100644 --- a/src/endWeek/reports/schoolroomReport.js +++ b/src/endWeek/reports/schoolroomReport.js @@ -152,10 +152,11 @@ App.EndWeek.schoolroomReport = function() { /* apply following SA passages to facility leader */ if (V.showEWD !== 0) { const schoolteacherEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(schoolteacherEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", schoolteacherEntry); App.SlaveAssignment.appendSlaveLinks(schoolteacherEntry, slave); $(schoolteacherEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> is serving as your Schoolteacher.`); schoolteacherEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { App.SlaveAssignment.standardSlaveReport(slave, true); } @@ -225,7 +226,7 @@ App.EndWeek.schoolroomReport = function() { if (V.showEWD !== 0) { const {He} = getPronouns(slave); const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry); App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave); $(slaveEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> `); if (slave.choosesOwnAssignment === 2) { @@ -242,6 +243,7 @@ App.EndWeek.schoolroomReport = function() { const studentContent = App.UI.DOM.appendNewElement("div", slaveEntry, '', "indent"); $(studentContent).append(`${He} ${App.SlaveAssignment.takeClasses(slave)}`); slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { // discard return values silently App.SlaveAssignment.choosesOwnJob(slave); diff --git a/src/endWeek/reports/servantsQuartersReport.js b/src/endWeek/reports/servantsQuartersReport.js index ee308803e0b63c034cf8ff341018aca0b62f2f2f..623406d9ee9c823a59866839db35da43ab83c65d 100644 --- a/src/endWeek/reports/servantsQuartersReport.js +++ b/src/endWeek/reports/servantsQuartersReport.js @@ -241,10 +241,11 @@ App.EndWeek.servantsQuartersReport = function() { /* apply following SA passages to facility leader */ if (V.showEWD !== 0) { const stewardessEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(stewardessEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", stewardessEntry); App.SlaveAssignment.appendSlaveLinks(stewardessEntry, slave); $(stewardessEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> is serving as your Stewardess.`); stewardessEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { App.SlaveAssignment.standardSlaveReport(slave, true); } @@ -314,7 +315,7 @@ App.EndWeek.servantsQuartersReport = function() { if (V.showEWD !== 0) { const {He} = getPronouns(slave); const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry); App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave); $(slaveEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> `); if (slave.choosesOwnAssignment === 2) { @@ -332,6 +333,7 @@ App.EndWeek.servantsQuartersReport = function() { SQMilkSale += milkResults.milkSale; } slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { // discard return values silently App.SlaveAssignment.choosesOwnJob(slave); diff --git a/src/endWeek/reports/spaReport.js b/src/endWeek/reports/spaReport.js index 1e9884e14d96cc0fce638c9d15d2a94928ee2c4d..0c728e041c022e9bb5d43c2e3897f874bab77ac5 100644 --- a/src/endWeek/reports/spaReport.js +++ b/src/endWeek/reports/spaReport.js @@ -289,7 +289,7 @@ App.EndWeek.spaReport = function() { /* apply following SA passages to facility leader */ if (V.showEWD !== 0) { const attendantEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(attendantEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", attendantEntry); App.SlaveAssignment.appendSlaveLinks(attendantEntry, slave); App.Events.addNode( attendantEntry, @@ -299,6 +299,7 @@ App.EndWeek.spaReport = function() { App.SlaveAssignment.standardSlaveReport(slave, false), ] ); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { App.SlaveAssignment.standardSlaveReport(slave, true); } @@ -374,7 +375,7 @@ App.EndWeek.spaReport = function() { if (V.showEWD !== 0) { const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report"); - App.SlaveAssignment.appendSlaveArt(slaveEntry, slave); + const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry); App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave); r = []; r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name")); @@ -402,6 +403,7 @@ App.EndWeek.spaReport = function() { } App.Events.addNode(slaveEntry, r, "div", "indent"); slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); + App.SlaveAssignment.appendSlaveArt(artSpan, slave); } else { // discard return values silently App.SlaveAssignment.choosesOwnJob(slave);