From 837bd4606d47d24006d3da126142640ebc1254c5 Mon Sep 17 00:00:00 2001
From: DCoded <dicoded@email.com>
Date: Fri, 30 Apr 2021 10:41:26 -0400
Subject: [PATCH] Cleaned up descriptionWidgets a bit
---
src/npc/descriptions/descriptionWidgets.js | 47 ++++++++++++++--------
1 file changed, 30 insertions(+), 17 deletions(-)
diff --git a/src/npc/descriptions/descriptionWidgets.js b/src/npc/descriptions/descriptionWidgets.js
index b706529edde..6a0d206d9fb 100644
--- a/src/npc/descriptions/descriptionWidgets.js
+++ b/src/npc/descriptions/descriptionWidgets.js
@@ -397,44 +397,57 @@ App.Desc.ageAndHealth = function(slave) {
}
if (H.shortDamage > 5 || H.longDamage > 5 || H.condition < 0) {
- let end = '';
+ let flag = false;
+ let text = '';
r += ` Upon closer inspection you note that ${he}`;
array = [];
if (H.shortDamage > 5) {
- if (H.longDamage <= 5 && H.condition >= 0) {
- end = '.';
- }
-
if (H.shortDamage >= 100) {
- array.push(`looks <span class="red">absolutely brutalized</span> and will never be quite the way ${he} was${end}`);
+ text += `looks <span class="red">absolutely brutalized</span> and will never be quite the way ${he} was`;
} else if (H.shortDamage >= 70) {
- array.push(`is <span class="red">gravely injured</span> with assured lasting effects${end}`);
+ text += `is <span class="red">gravely injured</span> with assured lasting effects`;
} else if (H.shortDamage >= 40) {
- array.push(`is <span class="red">seriously injured</span> with some lasting effects${end}`);
+ text += `is <span class="red">seriously injured</span> with some lasting effects`;
} else if (H.shortDamage >= 20) {
- array.push(`is <span class="orange">injured${end}</span>`);
+ flag = true;
+ text += `is <span class="orange">injured`;
} else {
- array.push(`seems to have suffered a <span class="yellow">minor injury</span> recently${end}`);
+ text += `seems to have suffered a <span class="yellow">minor injury</span> recently`;
+ }
+
+ if (H.longDamage <= 5 && H.condition >= 0) {
+ text += `.`;
}
+ if (flag) {
+ text += '</span>';
+ }
+
+ array.push(text);
}
if (H.longDamage > 5) {
- if (H.shortDamage <= 5 && H.condition >= 0) {
- end = '.';
- }
+ text = '';
if (H.longDamage >= 70) {
- array.push(`is suffering heavily under accumulated <span class="red">permanent health problems${end}</span>`);
+ text += `is suffering heavily under accumulated <span class="red">permanent health problems`;
} else if (H.longDamage >= 40) {
- array.push(`has some clear <span class="red">permanent health issues${end}</span>`);
+ text += `has some clear <span class="red">permanent health issues`;
} else if (H.longDamage >= 20) {
- array.push(`shows signs of <span class="orange">lasting health problems${end}</span>`);
+ text += `shows signs of <span class="orange">lasting health problems`;
} else {
- array.push(`carries some <span class="yellow">minor niggles${end}</span>`);
+ text += `carries some <span class="yellow">minor niggles`;
}
+
+ if (H.shortDamage <= 5 && H.condition >= 0) {
+ text += `.`;
+ }
+
+ text += `</span>`;
+
+ array.push(text);
}
if (H.condition < 0) {
--
GitLab