diff --git a/Changelog.txt b/Changelog.txt index a255957cebf9dd1b053ee9dec4c0c7e1a5821db3..82706bacd691dc355c8f588bfccb26c9d9aec9e1 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -10,6 +10,7 @@ Pregmod -reminder system -engineering & warfare personal attention options -porn/ads code optimization + -arcology structure optimization -expanded racial eye, hair and skin color ranges -royal blood event can now use real dynasties -CSS replacing SC formatting diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js index 3023d5cbf7b744884bedc3beedee204c5d938d38..b5e14b88c9550150fba1f459a20f3ce46e6f2d5a 100644 --- a/src/js/descriptionWidgets.js +++ b/src/js/descriptionWidgets.js @@ -654,7 +654,7 @@ App.Desc.ageAndHealth = function(slave) { } } } else { - r += ` The Fuckdoll gives no external indication of ${his} health or age, but upon query ${his} systems reports that ${he} is`; + r += ` The Fuckdoll gives no external indication of ${his} health or age, but upon query ${his} systems reports that ${he} is `; if (H.health < -90) { r += `<span class="red"> in dangerously poor health,</span>`; } else if (H.health < -50) { @@ -668,13 +668,13 @@ App.Desc.ageAndHealth = function(slave) { } else { r += `<span class="green">extremely healthy,</span>`; } - r += ` and ${slave.physicalAge} years old. `; + r += ` and ${slave.physicalAge} years old.`; if (H.shortDamage !== 0 || H.longDamage !== 0 || H.illness > 1) { r += ` Diagnostics also report that`; if (H.shortDamage > 0) { - r += `${he} is`; + r += ` ${he} is`; } if (H.shortDamage >= 100) { r += ` <span class="red">critically damaged</span>`; @@ -709,9 +709,11 @@ App.Desc.ageAndHealth = function(slave) { if ((H.shortDamage !== 0 || H.longDamage !== 0) && H.illness > 1) { r += ` and`; } - r += ` ${he} is`; + if (H.illness > 1) { + r += ` ${he} is`; + } if (slave.health.illness === 2) { - r += ` <span class="yellow">affected by a minor illness</span>`; + r += ` <span class="yellow">affected by a minor illness</span>`; } else if (slave.health.illness === 3) { r += ` <span class="red">affected by an illness</span>`; } else if (slave.health.illness === 4) { @@ -720,7 +722,7 @@ App.Desc.ageAndHealth = function(slave) { r += ` <span class="red">dangerously affected by an illness</span>`; } } - r += `. `; + r += `.`; } return r; };