From 8bb5f1e3a67d7efa5fd22a3bdeadb39bc87ce6f7 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Thu, 30 May 2024 00:33:36 +0200
Subject: polish retired text

---
 play.js  |  4 ++--
 rules.js | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/play.js b/play.js
index 4f46fbb..a6b09e8 100644
--- a/play.js
+++ b/play.js
@@ -1167,9 +1167,9 @@ function on_log(text) {
 	if (text.match(/^\$(\d+)/)) {
 		let fx = parseInt(text.substring(1))
 		if (fx < 48 + 6)
-			text = `<p class="q">${fate_flavor_text[fx]}<p>${fate_effect_text[fx]}`
+			text = `<div class="q">${fate_flavor_text[fx]}</div><div></div><div>${fate_effect_text[fx]}</div><div></div>`
 		else
-			text = `<p class="q">${fate_flavor_text[fx]}`
+			text = `<div class="q">${fate_flavor_text[fx]}</div><div></div>`
 	}
 	else if (text.match(/^# /)) {
 		p.className = "h fate"
diff --git a/rules.js b/rules.js
index d14b7bd..5694fa2 100644
--- a/rules.js
+++ b/rules.js
@@ -803,8 +803,6 @@ function remove_one_troop(p) {
 }
 
 function retire_general(p) {
-	log("P" + p + " retired.")
-
 	// save troops if possible
 	let s = game.pos[p]
 	let n = game.troops[p]
@@ -820,8 +818,14 @@ function retire_general(p) {
 				n -= x
 			}
 		}
-		if (n > 0)
-			log("Lost " + n + " troops.")
+		if (n > 1)
+			log("P" + p + " retired with " + n + " troops.")
+		else if (n === 1)
+			log("P" + p + " retired with 1 troop.")
+		else
+			log("P" + p + " retired.")
+	} else {
+		log("P" + p + " retired.")
 	}
 }
 
-- 
cgit v1.2.3