Merge branch 'pregmod-master' into 'pregmod-master'

Improve feedback when a slave has their accent corrected in a language-upgraded schoolroom

See merge request !5406

src/endWeek/saTakeClasses.js

@@ -349,30 +349,21 @@ window.saTakeClasses = (function saServeThePublic() {
 	function speechLessons(slave) {
 		if (slave.intelligenceImplant >= 15 || slave.intelligenceImplant < 0) {
 			if (slave.intelligence > jsRandom(-110, 110)) {
-				if (V.schoolroomUpgradeLanguage === 0) {
-					if (slave.accent > 3 && (V.week - slave.weekAcquired > 24)) {
+				if (slave.accent > 3) {
+					const langWeekThreshold = (V.schoolroomUpgradeLanguage === 0) ? 24 : 16;
+					if (V.week - slave.weekAcquired > langWeekThreshold) {
 						r += ` ${He} has <span class="green">learned some ${V.language},</span> and can make ${his} point with some gesturing, though ${he} speaks ${V.language} horribly.`;
 						slave.accent--;
 						if (slave.speechRules === "language lessons") {
 							slave.speechRules = "accent elimination";
 						}
-					} else if (slave.accent === 3) {
-						r += ` ${He} has <span class="green">learned functional ${V.language},</span> and can make ${himself} understood, though ${his} ${aNational(slave.nationality)} accent is still quite heavy.`;
-						slave.accent--;
-					}
-				} else {
-					if (slave.accent > 3) {
-						if (V.week - slave.weekAcquired > 16) {
-							r += ` ${He} has <span class="green">learned some ${V.language},</span> and can make ${his} point with some gesturing, though ${he} speaks ${V.language} horribly.`;
-							slave.accent--;
-							if (slave.speechRules === "language lessons") {
-								slave.speechRules = "accent elimination";
-							}
-						}
-					} else if (slave.accent >= 2) {
-						r += ` ${He} has <span class="green">learned decent ${V.language},</span> though ${he} retains enough of ${his} ${aNational(slave.nationality)} accent to make ${his} voice distinctly sexy.`;
-						slave.accent--;
 					}
+				} else if (slave.accent === 3) {
+					r += ` ${He} has <span class="green">learned functional ${V.language},</span> and can make ${himself} understood, though ${his} ${aNational(slave.nationality)} accent is still quite heavy.`;
+					slave.accent--;
+				} else if (slave.accent === 2 && V.schoolroomUpgradeLanguage === 1) {
+					r += ` ${He} has <span class="green">learned decent ${V.language},</span> though ${he} retains enough of ${his} ${aNational(slave.nationality)} accent to make ${his} voice distinctly sexy.`;
+					slave.accent--;
 				}
 			}
 		}