From 38fb542621e7062f8a80f91f29a582c582f0af9d Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Mon, 25 Mar 2019 18:58:51 -0400
Subject: [PATCH] Spoke too soon

---
 src/js/descriptionWidgets.js | 72 +++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 38 deletions(-)

diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 10210248a79..5bc628e1c2e 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -170,68 +170,64 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 				}
 			}
 		} else if (slave.intelligence > 15) {
-			r += `${His} ${App.Desc.EyeColor(slave)} eyes are`;
+			r += `${His} ${App.Desc.EyeColor(slave)} eyes are `;
 			if (slave.intelligence+slave.intelligenceImplant >= 50) {
 				r += `alive with intelligence; with ${his} education, ${he} can be considered <span class=deepskyblue>highly intelligent.</span>`;
-				if (slave.intelligenceImplant >= 15) {
-					r += `clever; ${he} is of <span class=deepskyblue>above average intelligence</span> and `;
-					if (slave.intelligenceImplant >= 30) {
-						r += `well `;
-					}
-					r += `educated.`;
-				} else {
-					r += `clever; ${he} is of <span class=deepskyblue>above average intelligence</span> despite being undereducated.`;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `clever; ${he} is of <span class=deepskyblue>above average intelligence</span> and `;
+				if (slave.intelligenceImplant >= 30) {
+					r += `well `;
 				}
+				r += `educated.`;
+			} else {
+				r += `clever; ${he} is of <span class=deepskyblue>above average intelligence</span> despite being undereducated.`;
 			}
 		} else if (slave.intelligence >= -15) {
-			r += `${His} ${App.Desc.EyeColor(slave)} eyes are`;
+			r += `${His} ${App.Desc.EyeColor(slave)} eyes are `;
 			if (slave.intelligence+slave.intelligenceImplant >= 15) {
 				r += `clever; with ${his} education, ${he} can be considered of <span class=deepskyblue>above average intelligence.</span>`;
-				if (slave.intelligenceImplant >= 15) {
-					r += `alert; ${he} is of average intelligence due to being `;
-					if (slave.intelligenceImplant >= 30) {
-						r += `well `;
-					}
-					r += `educated.`;
-				} else {
-					r += `alert; ${he} is of average intelligence and is undereducated.`;
+			}else if (slave.intelligenceImplant >= 15) {
+				r += `alert; ${he} is of average intelligence due to being `;
+				if (slave.intelligenceImplant >= 30) {
+					r += `well `;
 				}
+				r += `educated.`;
+			} else {
+				r += `alert; ${he} is of average intelligence and is undereducated.`;
 			}
 		} else if (slave.intelligence >= -50) {
-			r += `${His} ${App.Desc.EyeColor(slave)} eyes are`;
+			r += `${His} ${App.Desc.EyeColor(slave)} eyes are `;
 			if (slave.intelligence+slave.intelligenceImplant >= -15) {
 				r += `alert; with ${his} education, ${he} can be considered of average intelligence.`;
-				if (slave.intelligenceImplant >= 15) {
-					r += `dim; ${he} is of <span class=orangered>below average intelligence</span> despite having been `;
-					if (slave.intelligenceImplant >= 30) {
-						r += `thoroughly `;
-					} else {
-						r += `educated.`;
-					}
-					r += `dim; ${he} is of <span class=orangered>below average intelligence</span> and is poorly educated.`;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `dim; ${he} is of <span class=orangered>below average intelligence</span> despite having been `;
+				if (slave.intelligenceImplant >= 30) {
+					r += `thoroughly `;
 				} else {
-					r += `dim; even with ${his} education, ${he} can only be considered of <span class=orangered>below average intelligence.</span>`;
+					r += `educated.`;
 				}
+				r += `dim; ${he} is of <span class=orangered>below average intelligence</span> and is poorly educated.`;
+			} else {
+				r += `dim; even with ${his} education, ${he} can only be considered of <span class=orangered>below average intelligence.</span>`;
 			}
 		} else if (slave.intelligence >= -95) {
-			r += `${His} ${App.Desc.EyeColor(slave)} eyes are`;
+			r += `${His} ${App.Desc.EyeColor(slave)} eyes are `;
 			if (slave.intelligence+slave.intelligenceImplant >= -50) {
 				r += `dull; ${he} is <span class=orangered>quite stupid</span> despite having `;
-				if (slave.intelligenceImplant >= 15) {
-					r += `an advanced`;
-					if (slave.intelligenceImplant >= 30) {
-						r += `some`;
-					}
-					r += ` education.`;
-				} else {
-					r += `dull; ${he} is <span class=orangered>quite stupid</span> and ignorant.`;
+			} else if (slave.intelligenceImplant >= 15) {
+				r += `an advanced`;
+				if (slave.intelligenceImplant >= 30) {
+					r += `some`;
 				}
+				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;`;
 			if (slave.intelligence+slave.intelligenceImplant >= -95) {
 				r += `even with ${his} education, ${he} is still <span class=orangered>really stupid.</span>`;
-			} if (slave.intelligenceImplant > 0) {
+			} else if (slave.intelligenceImplant > 0) {
 				r += `${he} is <span class=orangered>a moron,</span> yet somehow still remembers the basics of an education.`;
 			} else {
 				r += `${he} is <span class=orangered>a moron,</span> and ignorant to boot.`;
-- 
GitLab