diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js index c2e7c0e9e0d51d1400c799a8c3e63d6ee4b688d0..bbfe369e411dae61084a5dd8c70f3723014a4cf7 100644 --- a/src/interaction/main/mainLinks.js +++ b/src/interaction/main/mainLinks.js @@ -170,23 +170,23 @@ App.UI.View.MainLinks = function() { } if (V.completedOrgans.length > 0 && V.limbsCompleted > 0) { - r += `<br>[[Implant and Attach|Multiple Organ Implant]] <span class=yellow>all organs and limbs that are ready.</span><br>`; + r += `<br>[[Implant and Attach|Multiple Organ Implant]] <span class=yellow>all organs and limbs that are ready.</span>`; } else if (V.completedOrgans.length > 0) { - r += `<br>[[Implant|Multiple Organ Implant]] <span class=yellow>all organs that are ready for implantation.</span><br>`; + r += `<br>[[Implant|Multiple Organ Implant]] <span class=yellow>all organs that are ready for implantation.</span>`; } else if (V.limbsCompleted > 0) { - r += `<br>[[Attach|Multiple Organ Implant]] <span class=yellow>all sets of limbs that are ready to be attached.</span><br>`; + r += `<br>[[Attach|Multiple Organ Implant]] <span class=yellow>all sets of limbs that are ready to be attached.</span>`; } if (V.slaveCostFactor > 1.05) { - r += `<span class=yellow>There is a bull market for slaves; the price of slaves is very high.</span>`; + r += `<br><span class=yellow>There is a bull market for slaves; the price of slaves is very high.</span>`; } else if (V.slaveCostFactor > 1) { - r += `<span class=yellow>The slave market is bullish; the price of slaves is high.</span>`; + r += `<br><span class=yellow>The slave market is bullish; the price of slaves is high.</span>`; } else if (V.slaveCostFactor < 0.95) { - r += `<span class=yellow>There is a bear market for slaves; the price of slaves is very low.</span>`; + r += `<br><span class=yellow>There is a bear market for slaves; the price of slaves is very low.</span>`; } else if (V.slaveCostFactor < 1) { - r += `<span class=yellow>The slave market is bearish; the price of slaves is low.</span>`; + r += `<br><span class=yellow>The slave market is bearish; the price of slaves is low.</span>`; } else { - r += `The slave market is stable; the price of slaves is average.`; + r += `<br>The slave market is stable; the price of slaves is average.`; } r += ` <span id="buySlaves"><strong><<link "Buy Slaves">><<goto "Buy Slaves">><</link>></strong></span> <span class=cyan>[S]</span>`; diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js index 759d3f863b0171eb200d42667f6468087f6d394e..810adf3ee28b080295cb22b1790a91b1d3033614 100644 --- a/src/js/descriptionWidgets.js +++ b/src/js/descriptionWidgets.js @@ -23,7 +23,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) { if (HC) { r += `, heterochromatic,`; } - r += ` and clearly nonfunctional` + r += ` and clearly nonfunctional`; } else { if (HC) { r += `, heterochromatic,`; @@ -32,10 +32,10 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) { } r += `, `; } else { - r += `${His} gaze is empty.` + r += `${His} gaze is empty.`; } if (slave.intelligence > 95) { - r += `but ${his} facial expressions reveal ${he} is incisive, quick, cunning;`; + r += `but ${his} facial expressions reveal ${he} is incisive, quick, cunning; `; if (slave.intelligence+slave.intelligenceImplant >= 130) { r += `with ${his} education, ${he} is so far <span class=deepskyblue>beyond brilliant</span> that ${he} is nearly peerless.`; } else if (slave.intelligenceImplant >= 15) { @@ -63,7 +63,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) { } r += `educated.`; } else { - r += `but ${his} face is alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his}`; + r += `but ${his} face is alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his} `; if (slave.intelligenceImplant > 0) { r += `meager`; } else { @@ -87,7 +87,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) { if (slave.intelligence+slave.intelligenceImplant > 15) { r += `but ${his} facial expressions reveal ${his} cleverness; with ${his} education, ${he} can be considered of <span class=deepskyblue>above average intelligence.</span>`; } else if (slave.intelligenceImplant >= 15) { - r += `but ${his} facial expressions reveal ${his} alertness; ${he} is of average intelligence due to being`; + r += `but ${his} facial expressions reveal ${his} alertness; ${he} is of average intelligence due to being `; if (slave.intelligenceImplant >= 30) { r += `well `; } @@ -113,16 +113,16 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) { } else if (slave.intelligenceImplant >= 15) { r += `but ${his} facial expressions reveal ${he} is as dull as ${his} eyes; ${he} is <span class=orangered>quite stupid</span> despite having `; if (slave.intelligenceImplant >= 30) { - r += `an advanced`; + r += `an advanced `; } else { - r += `some`; + r += `some `; } - r += ` education.`; + r += `education.`; } else { r += `but ${his} facial expressions reveal ${he} is as dull as ${his} eyes; ${he} is <span class=orangered>quite stupid</span> and ignorant.`; } } else { - r += `though you doubt it would be much different if ${he} could see;`; + r += `though you doubt it would be much different if ${he} could see; `; if (slave.intelligence+slave.intelligenceImplant >= -95) { r += `even with ${his} education, ${he} is still <span class=orangered>really stupid.</span>`; } else if (slave.intelligenceImplant > 0) { @@ -133,7 +133,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) { } } else { if (slave.intelligence > 95) { - r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze is incisive, quick, cunning;`; + r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze is incisive, quick, cunning; `; if (slave.intelligence+slave.intelligenceImplant >= 130) { r += `with ${his} education, ${he} is so far <span class=deepskyblue>beyond brilliant</span> that ${he} is nearly peerless.`; } else if (slave.intelligenceImplant >= 15) { @@ -145,29 +145,29 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) { } else { r += `${he} is so <span class=deepskyblue>brilliant</span> that ${his} `; if (slave.intelligenceImplant > 0) { - r += `meager`; + r += `meager `; } else { - r += `lack of`; + r += `lack of `; } r += `education is unimportant.`; } } else if (slave.intelligence > 50) { - r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze is incisive, quick, cunning; with ${his} education, ${he} can be considered <span class=deepskyblue>brilliant.</span>`; - if (slave.intelligence+slave.intelligenceImplant > 95) { + r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze is incisive, quick, cunning; `; + if (slave.intelligence+slave.intelligenceImplant >= 95) { r += `${His} ${App.Desc.EyeColor(slave)} eyes are alive with intelligence; ${he} is both <span class=deepskyblue>highly intelligent</span> and `; } else if (slave.intelligenceImplant >= 15) { r += `well `; if (slave.intelligenceImplant >= 30) { r += `educated.`; } - r += `${His} ${App.Desc.EyeColor(slave)} eyes are alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his} `; } else { - r += `meager`; + r += `${His} ${App.Desc.EyeColor(slave)} eyes are alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his} `; if (slave.intelligenceImplant > 0) { - r += `lack of`; + r += `meager `; } else { - r += ` education is unimportant.`; + r += `lack of `; } + r += `education is unimportant.`; } } else if (slave.intelligence > 15) { r += `${His} ${App.Desc.EyeColor(slave)} eyes are `; @@ -215,16 +215,16 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) { if (slave.intelligence+slave.intelligenceImplant >= -50) { r += `dull; ${he} is <span class=orangered>quite stupid</span> despite having `; } else if (slave.intelligenceImplant >= 15) { - r += `an advanced`; + r += `an advanced `; if (slave.intelligenceImplant >= 30) { - r += `some`; + r += `some `; } - r += ` education.`; + r += `education.`; } else { r += `dull; ${he} is <span class=orangered>quite stupid</span> and ignorant.`; } } else { - r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze betrays near-total insensibility;`; + r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze betrays near-total insensibility; `; if (slave.intelligence+slave.intelligenceImplant >= -95) { r += `even with ${his} education, ${he} is still <span class=orangered>really stupid.</span>`; } else if (slave.intelligenceImplant > 0) {