Merge branch 'display-morale-enemy' into 'pregmod-master'

Restore display of enemy morale modifier

See merge request !11669

src/Mods/SecExp/events/conflictHandler.js

@@ -732,6 +732,21 @@ App.Events.conflictHandler = function() {
 			node,
 			`Morale: ${num(Math.round(enemyMorale))}.`,
 		);
+		if (inBattle) {
+			App.UI.DOM.appendNewElement(
+				'div',
+				node,
+				// Allowing displaying 'Rebels' is just future-proofing. Currently that branch will never be taken.
+				`${inBattle ? 'Enemy' : 'Rebels'} morale modifier: +${morale.enemy}%`,
+				['indent'],
+			);
+			App.UI.DOM.appendNewElement(
+				'div',
+				node,
+				`${inBattle ? 'Enemy' : 'Rebels'} morale extra modifier due to troop numbers: +${Math.round((enemyMoraleTroopMod-1) * 100)}%`,
+				['indent'],
+			);
+		}
 	}
 
 	let i = 0; // simulates the combat by pitting attk against def