2 files changed, 48 insertions, 21 deletions

diff --git a/info/readme.html b/info/readme.html
index c6c42af..a501bea 100644
--- a/info/readme.html
+++ b/info/readme.html
@@ -43,10 +43,15 @@ Deals in Maria are binding!
 
 <p>
 In order to remember what deals have been made, use the "Propose deal" menu item
-to write down the promises and duration. Deals that have been noted this way will be tracked
+to write down the promises. Deals that have been noted this way will be tracked
 on the political display.
 
 <p>
+A deal has two halves &mdash; one for each party &mdash; detailing what that power promises to
+do, during which phase(s), and for how long. The deal lasts from the current turn until
+the end of the chosen turn.
+
+<p>
 If you check the Politics/Movement/Combat/Retreat/Hussars checkboxes when creating a deal,
 the counterparty will be able to validate your actions so that you keep your promise.
 If they deem that you have broken your promise, your moves will be undone and you have to
diff --git a/rules.js b/rules.js
index feed732..d197ec4 100644
--- a/rules.js
+++ b/rules.js
@@ -1479,8 +1479,8 @@ const advanced_sequence_of_play = [
 	{ power: P_PRAGMATIC, action: goto_movement },
 	{ power: P_PRAGMATIC, action: validate_end_movement },
 
+	// austria + pragmatic shared combat phase
 	{ power: P_AUSTRIA, action: goto_combat },
-	{ power: P_PRAGMATIC, action: goto_combat },
 	{ power: P_AUSTRIA, action: end_action_stage },
 
 	{ power: P_FRANCE, action: goto_end_turn },
@@ -3609,11 +3609,13 @@ states.recruit = {
 		for (let p of all_power_generals[game.power]) {
 			if (is_intro() && is_flanders_space(game.pos[p]))
 				continue
-			if (is_piece_on_map(p))
+			if (is_piece_eliminated(p)) {
+				if (has_re_entry_space_for_general(p)) {
+					av_general += 1
+						av_troops += 8
+				}
+			} else {
 				av_troops += 8 - game.troops[p]
-			else if (is_piece_eliminated(p) && has_re_entry_space_for_general(p)) {
-				av_general += 1
-				av_troops += 8
 			}
 		}
 
@@ -3645,10 +3647,13 @@ states.recruit = {
 				for (let p of all_power_generals[game.power]) {
 					if (is_intro() && is_flanders_space(game.pos[p]))
 						continue
-					if (is_piece_on_map(p) && game.troops[p] > 0 && game.troops[p] < 8)
-						gen_action_piece(p)
-					else if (is_piece_eliminated(p) && has_re_entry_space_for_general(p))
-						gen_action_piece(p)
+					if (is_piece_eliminated(p)) {
+						if (has_re_entry_space_for_general(p))
+							gen_action_piece(p)
+					} else {
+						if (game.troops[p] < 8)
+							gen_action_piece(p)
+					}
 				}
 			}
 		}
@@ -3806,7 +3811,7 @@ function goto_combat() {
 	let from = []
 	let to = []
 
-	for (let p of all_controlled_generals(game.power)) {
+	for (let p of all_coop_generals(game.power)) {
 		if (piece_power[p] === P_PRUSSIA && is_prussia_neutral())
 			continue
 		if (piece_power[p] === P_SAXONY && is_saxony_neutral())
@@ -3834,14 +3839,29 @@ function goto_combat() {
 		}
 	}
 
-	if (game.combat.length > 0)
-		game.state = "combat"
-	else
-		goto_retroactive_conquest()
+	next_combat()
 }
 
-function next_combat() {
+function set_active_to_next_combat_power() {
 	set_active_to_current_sequence_of_play()
+	if (is_intro() || is_two_player())
+		return
+	// resolve all austria (& saxony) combat first; then pragmatic
+	if (game.power === P_AUSTRIA) {
+		for (let i = 0; i < game.combat.length; i += 2) {
+			let p = get_supreme_commander(game.combat[i])
+			if (p >= 0) {
+				let pp = piece_power[p]
+				if (pp === P_AUSTRIA || pp === P_SAXONY)
+					return
+			}
+		}
+		set_active_to_power(P_PRAGMATIC)
+	}
+}
+
+function next_combat() {
+	set_active_to_next_combat_power()
 	game.count = 0
 	delete game.attacker
 	delete game.defender
@@ -3855,8 +3875,11 @@ states.combat = {
 	inactive: "attack",
 	prompt() {
 		prompt("Resolve your attacks.")
-		for (let i = 0; i < game.combat.length; i += 2)
-			gen_action_supreme_commander(game.combat[i])
+		for (let i = 0; i < game.combat.length; i += 2) {
+			let p = get_supreme_commander(game.combat[i])
+			if (p >= 0 && is_controlled_power(game.power, piece_power[p]))
+				gen_action_piece(p)
+		}
 	},
 	piece(p) {
 		push_undo()
@@ -4502,9 +4525,8 @@ function goto_retroactive_conquest() {
 				apply_retroactive_conquest(conq, game.power)
 			}
 		} else {
-			if (game.power === P_AUSTRIA) {
-				// wait until pragmatic has also finished combat
-			} else if (game.power === P_PRAGMATIC) {
+			if (game.power === P_AUSTRIA || game.power === P_PRAGMATIC) {
+				// shared combat phase
 				apply_retroactive_conquest(conq, P_AUSTRIA)
 				apply_retroactive_conquest(conq, P_PRAGMATIC)
 			} else {