fix trigger for returning french markers

1 files changed, 4 insertions, 2 deletions

diff --git a/rules.js b/rules.js
index ba1f512..be60e29 100644
--- a/rules.js
+++ b/rules.js
@@ -829,7 +829,7 @@ function set_control_of_fortress(s, pow) {
 	}
 
 	if (pow === P_FRANCE && game.vp[SET_ASIDE_FRANCE] > 0) {
-		if (set_has(all_core_austria_fortresses, s))
+		if (is_bohemia_space(s))
 			return_set_aside_markers(P_FRANCE, SET_ASIDE_FRANCE)
 	}
 
@@ -2037,7 +2037,9 @@ function move_general_to(to, is_force_march) {
 	if (!is_force_march && !is_out_of_supply(who)) {
 		if (is_enemy_controlled_fortress(from)) {
 			if (is_protected_from_conquest(from)) {
-				map_set(game.retro, from, coop_major_power(game.power))
+				// first one to place has prio (austria/prag on flanders)
+				if (!map_has(game.retro, from))
+					map_set(game.retro, from, coop_major_power(game.power))
 			} else {
 				set_add(game.move_conq, from)
 				set_control_of_fortress(from, coop_major_power(game.power))