diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js index 791cbf53f4458854a8447b4684da4b49081ca79d..09a73cebd12864d666607b5e04a246ef13bac5f4 100644 --- a/src/endWeek/saWhore.js +++ b/src/endWeek/saWhore.js @@ -138,7 +138,7 @@ window.saWhore = (function saWhore() { if (isStacked(slave)) { r += ` ${His} stacked body fits ${V.brothelName}'s ad campaign, getting ${him} more business.`; } - } else if (V.clubAdsStacked === -1) { + } else if (V.brothelAdsStacked === -1) { if (isSlim(slave)) { r += ` ${His} slim body fits ${V.brothelName}'s ad campaign, getting ${him} more business.`; } diff --git a/src/js/assignJS.js b/src/js/assignJS.js index ea032e85b8a7bd38aae751e1fe0fe8f506a6ca94..71178130adfa5f7026ebd986cb135a1ea702605f 100644 --- a/src/js/assignJS.js +++ b/src/js/assignJS.js @@ -525,7 +525,7 @@ window.removeJob = function removeJob(slave, assignment) { * Indicate whether a slave's current assignment is shown in Main * Often used as a proxy for "penthouse slave" * @param {App.Entity.SlaveState} slave - * @return {boolean} + * @returns {boolean} */ window.assignmentVisible = function assignmentVisible(slave) { switch (slave.assignment) { @@ -543,7 +543,7 @@ window.assignmentVisible = function assignmentVisible(slave) { case "work as a servant": case "rest in the spa": case "work as a nanny": - return 0; + return false; /* outside leadership jobs */ case "be the Attendant": @@ -557,20 +557,20 @@ window.assignmentVisible = function assignmentVisible(slave) { case "be the Stewardess": case "be the Wardeness": case "be your Concubine": - return 0; + return false; /* agents are not in the arcology at all */ case "be your agent": case "live with your agent": - return 0; + return false; /* transition state */ case "choose her own job": - return 1; // show + return true; // show } /* all other jobs are shown in penthouse */ - return 1; + return true; }; window.resetJobIDArray = function resetJobIDArray() { diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js index 0ba6735a9560c08d2ae4924c512d0bddb5c48f3e..fdc22b9405219ec4437541e07c2b71e2a2a0a382 100644 --- a/src/js/slaveSummaryWidgets.js +++ b/src/js/slaveSummaryWidgets.js @@ -3838,6 +3838,18 @@ window.SlaveSummaryUncached = (function() { addText(block, `${V.missingTable[slave.mother].fullName}'s `); makeSpan(block, `${getPronouns(slave).daughter}.`, "lightgreen"); } + if (areSisters(V.PC, slave) > 0) { + addText(block, `Your `); + if (slave.relationship === -3) { + makeSpan(block, `${relativeTerm(V.PC, slave)} and ${getPronouns(slave).wife}.`, "lightgreen"); + handled = 1; + } else if (slave.relationship === -2) { + makeSpan(block, `${relativeTerm(V.PC, slave)} and lover.`, "lightgreen"); + handled = 1; + } else { + makeSpan(block, `${relativeTerm(V.PC, slave)}.`, "lightgreen"); + } + } if (slave.daughters === 1) { let _ssj = V.slaves.findIndex(s => s.mother === slave.ID); if (_ssj !== -1) { @@ -3898,7 +3910,7 @@ window.SlaveSummaryUncached = (function() { addText(block, `${SlaveFullName(V.slaves[_ssj])}'s `); makeSpan(block, `${friendship}.`, "lightgreen"); } - } else if (slave.relationship === -3 && slave.mother !== -1 && slave.father !== -1) { + } else if (slave.relationship === -3 && slave.mother !== -1 && slave.father !== -1 && areSisters(V.PC, slave) === 0) { makeSpan(block, `Your ${getPronouns(slave).wife}.`, "lightgreen"); } else if (slave.relationship === -2) { makeSpan(block, "Emotionally bonded to you.", "lightgreen"); diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 9afd11140694ed64abbf942682e6879b4b1383c5..5ce558b59b72459493ad39774d57230c49995965 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -145,7 +145,7 @@ <</if>> <<if $releaseID < 1059>> - <<set $customSlave.eye = new App.Entity.SlaveState()>> + <<set $customSlave.eye = new App.Entity.EyeState()>> <<run delete $customSlave.eyes>> <</if>>