From ebcf6aee7aadfe5af296592a07ec25eae591d48c Mon Sep 17 00:00:00 2001
From: Mischa Untaga <99098079+MischaU8@users.noreply.github.com>
Date: Wed, 18 Oct 2023 15:09:32 +0200
Subject: 1958 quick setup

---
 rules.js | 49 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/rules.js b/rules.js
index 984c846..f6fdea8 100644
--- a/rules.js
+++ b/rules.js
@@ -1249,8 +1249,8 @@ const SCENARIO_DEPLOYMENT = {
 			"IV": [FRONT, FRONT, CADRE, CADRE, BAND, BAND],
 			"V": [FRONT, CADRE, BAND],
 			"VI": [FRONT, CADRE, BAND],
-			"Morocco": [BAND],
-			"Tunisia": [BAND, BAND, BAND, BAND, FAILEK]
+			"MOROCCO": [BAND],
+			"TUNISIA": [BAND, BAND, BAND, BAND, FAILEK]
 		},
 		gov: {
 			"I": [FR_XX, FR_XX, FR_X],
@@ -1258,7 +1258,43 @@ const SCENARIO_DEPLOYMENT = {
 			"III": [FR_XX, FR_XX, AL_X, POL, POL],
 			"IV": [FR_XX, FR_XX, EL_X, EL_X, EL_X, AL_X, AL_X, POL, POL],
 			"V": [FR_XX, FR_XX, FR_XX, FR_X, EL_X, AL_X, POL, POL],
-		}
+		},
+		gov_quick: {
+			"I-2": [FR_XX],
+			"I-3": [FR_X],
+			"I-4": [FR_XX],
+			"CONSTANTINE": [EL_X, POL, POL],
+			"II-1": [FR_X, AL_X],
+			"II-2": [FR_XX, EL_X],
+			"II-3": [FR_XX, EL_X],
+			"III-1": [FR_XX, POL],
+			"III-3": [FR_XX, AL_X, POL],
+			"ALGIERS": [FR_XX, EL_X, EL_X, EL_X, POL],
+			"IV-1": [FR_XX, AL_X, POL],
+			"IV-2": [AL_X],
+			"ORAN": [FR_XX, EL_X, POL],
+			"V-1": [AL_X],
+			"V-2": [FR_X],
+			"V-3": [FR_XX],
+			"V-4": [FR_XX, POL],
+			"V-5": [],
+		},
+		fln_quick: {
+			"I-1": [FRONT, CADRE, BAND, BAND],
+			"I-2": [CADRE],
+			"II-1": [CADRE],
+			"II-2": [FRONT, BAND, BAND],
+			"II-3": [CADRE],
+			"III-1": [FRONT, CADRE, BAND],
+			"III-3": [CADRE, BAND],
+			"IV-1": [FRONT, CADRE],
+			"IV-2": [FRONT, CADRE, BAND, BAND],
+			"V-3": [FRONT, BAND],
+			"V-5": [CADRE],
+			"VI-2": [FRONT, CADRE, BAND],
+			"MOROCCO": [BAND],
+			"TUNISIA": [BAND, BAND, BAND, BAND, FAILEK]
+		},
 	},
 	"1960": {
 		fln: {
@@ -1267,8 +1303,8 @@ const SCENARIO_DEPLOYMENT = {
 			"III": [FRONT, FRONT, CADRE, CADRE, BAND, BAND],
 			"IV": [FRONT, CADRE, BAND],
 			"V": [CADRE, BAND],
-			"Morocco": [BAND, BAND, BAND, BAND],
-			"Tunisia": [BAND, BAND, BAND, BAND, FAILEK, FAILEK, FAILEK]
+			"MOROCCO": [BAND, BAND, BAND, BAND],
+			"TUNISIA": [BAND, BAND, BAND, BAND, FAILEK, FAILEK, FAILEK]
 		},
 		gov: {
 			"I": [FR_XX, FR_XX, AL_X],
@@ -1308,7 +1344,6 @@ function setup_scenario(scenario_name) {
 	let deployment = SCENARIO_DEPLOYMENT[scenario_name]
 	setup_units(deployment.fln)
 	setup_units(deployment.gov)
-	ensure_front_in_independent_morocco_tunisia()
 
 	game.phasing = GOV_NAME
 }
@@ -1475,6 +1510,8 @@ function end_scenario_setup() {
 		set_next_player()
 		goto_scenario_setup()
 	} else {
+		ensure_front_in_independent_morocco_tunisia()
+
 		begin_game()
 	}
 }
-- 
cgit v1.2.3