From 4156a237905e1a13b90e138ae6513a96f7ccbf6c Mon Sep 17 00:00:00 2001 From: Arkerthan <arkerthan@gmail.com> Date: Sun, 26 Apr 2020 11:10:56 +0200 Subject: [PATCH] fix eye description grammar --- src/js/descriptionWidgets.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js index 464d824b6de..86a273ae8a5 100644 --- a/src/js/descriptionWidgets.js +++ b/src/js/descriptionWidgets.js @@ -252,15 +252,15 @@ App.Desc.eyes = function(slave) { if (slave.intelligence + slave.intelligenceImplant > 95) { r += `${His} ${App.Desc.eyeColor(slave)}-eyed gaze is incisive, quick, cunning; with ${his} education, ${he} can be considered <span class="deepskyblue">brilliant.</span> `; } else if (slave.intelligence + slave.intelligenceImplant <= 50) { - r += `${His} ${App.Desc.eyesColor(slave, "", "eye is", "eyes are", false)} alive with intelligence; with ${his} miseducation, however, ${he} performs merely <span class="orangered">above average.</span> `; + r += `${His} ${App.Desc.eyesColor(slave, "", "eye", "eyes", false)} ${hasBothEyes(slave) ? "are" : "is"} alive with intelligence; with ${his} miseducation, however, ${he} performs merely <span class="orangered">above average.</span> `; } else if (slave.intelligenceImplant >= 15) { - r += `${His} ${App.Desc.eyesColor(slave, "", "eye is", "eyes are", false)} alive with intelligence; ${he} is both <span class="deepskyblue">highly intelligent</span> and `; + r += `${His} ${App.Desc.eyesColor(slave, "", "eye", "eyes", false)} ${hasBothEyes(slave) ? "are" : "is"} alive with intelligence; ${he} is both <span class="deepskyblue">highly intelligent</span> and `; if (slave.intelligenceImplant >= 30) { r += `well `; } r += `educated. `; } else { - r += `${His} ${App.Desc.eyesColor(slave, "", "eye is", "eyes are", false)} alive with intelligence; ${he} is so <span class="deepskyblue">highly intelligent</span> that ${his} `; + r += `${His} ${App.Desc.eyesColor(slave, "", "eye", "eyes", false)} ${hasBothEyes(slave) ? "are" : "is"} alive with intelligence; ${he} is so <span class="deepskyblue">highly intelligent</span> that ${his} `; if (slave.intelligenceImplant > 0) { r += `meager`; } else if (slave.intelligenceImplant <= -15) { @@ -271,7 +271,7 @@ App.Desc.eyes = function(slave) { r += ` education is unimportant. `; } } else if (slave.intelligence > 15) { - r += `${His} ${App.Desc.eyesColor(slave, "", "eye is", "eyes are", false)} `; + r += `${His} ${App.Desc.eyesColor(slave, "", "eye", "eyes", false)} ${hasBothEyes(slave) ? "are" : "is"} `; if (slave.intelligence + slave.intelligenceImplant > 50) { r += `alive with intelligence; with ${his} education, ${he} can be considered <span class="deepskyblue">highly intelligent.</span> `; } else if (slave.intelligence + slave.intelligenceImplant <= 15) { @@ -288,7 +288,7 @@ App.Desc.eyes = function(slave) { r += `clever; ${he} is of <span class="deepskyblue">above average intelligence</span> despite being undereducated. `; } } else if (slave.intelligence >= -15) { - r += `${His} ${App.Desc.eyesColor(slave, "", "eye is", "eyes are", false)} `; + r += `${His} ${App.Desc.eyesColor(slave, "", "eye", "eyes", false)} ${hasBothEyes(slave) ? "are" : "is"} `; if (slave.intelligence + slave.intelligenceImplant > 15) { r += `clever; with ${his} education, ${he} can be considered of <span class="deepskyblue">above average intelligence.</span> `; } else if (slave.intelligence + slave.intelligenceImplant < -15) { @@ -305,7 +305,7 @@ App.Desc.eyes = function(slave) { r += `alert; ${he} is of average intelligence and is undereducated. `; } } else if (slave.intelligence >= -50) { - r += `${His} ${App.Desc.eyesColor(slave, "", "eye is", "eyes are", false)} `; + r += `${His} ${App.Desc.eyesColor(slave, "", "eye", "eyes", false)} ${hasBothEyes(slave) ? "are" : "is"} `; if (slave.intelligence + slave.intelligenceImplant >= -15) { r += `alert; with ${his} education, ${he} can be considered of average intelligence. `; } else if (slave.intelligence + slave.intelligenceImplant < -50) { @@ -322,7 +322,7 @@ App.Desc.eyes = function(slave) { r += `dim; ${he} is of <span class="orangered">below average intelligence</span> and is poorly educated. `; } } else if (slave.intelligence >= -95) { - r += `${His} ${App.Desc.eyesColor(slave, "", "eye is", "eyes are", false)} `; + r += `${His} ${App.Desc.eyesColor(slave, "", "eye", "eyes", false)} ${hasBothEyes(slave) ? "are" : "is"} `; if (slave.intelligence + slave.intelligenceImplant >= -50) { r += `dim; even with ${his} education, ${he} can only be considered of <span class="orangered">below average intelligence.</span> `; } else if (slave.intelligence + slave.intelligenceImplant < -95) { -- GitLab