add and use data.exile_boxes

3 files changed, 20 insertions, 14 deletions

diff --git a/data.js b/data.js
index ce4ae94..178b352 100644
--- a/data.js
+++ b/data.js
@@ -1,5 +1,6 @@
 const data = {
 seaports:[0,1,5,6,14,15,17,19,20,21,22,24,26,35,37,51,52,54,55,56,57,58,59,60],
+exile_boxes:[52,53,54,55],
 exile_1:55,
 exile_2:52,
 exile_3:54,
diff --git a/rules.js b/rules.js
index 5cdc14d..d8de642 100644
--- a/rules.js
+++ b/rules.js
@@ -1724,7 +1724,7 @@ function calculate_distance(start, adjacent) {
 
 	while (queue.length > 0) {
 		let [ here, d ] = queue.shift()
-		for (let next of data.locales[here][adjacent]) {
+		for (let next of data.locales[here].adjacent) {
 			if (distance[next] < 0) {
 				distance[next] = d + 1
 				queue.push([ next, d + 1 ])
@@ -1736,7 +1736,7 @@ function calculate_distance(start, adjacent) {
 }
 
 for (let loc = 0; loc <= last_locale; ++loc)
-	data.locales[loc].distance = calculate_distance(loc, "adjacent")
+	data.locales[loc].distance = calculate_distance(loc)
 
 function locale_distance(from, to) {
 	return data.locales[from].distance[to]
@@ -2426,13 +2426,15 @@ function prompt_shift_cylinder(list, boxes) {
 		lordship = parent[1]
 
 	let names
-	if (game.what === EVENT_RUSSIAN_PRINCE_OF_POLOTSK)
+	if (game.what === EVENT_RUSSIAN_PRINCE_OF_POLOTSK) {
 		names = "a Russian Lord"
-	else
-		names = list
-			.filter(lord => is_lord_on_calendar(lord))
-			.map(lord => lord_name[lord])
-			.join(" or ")
+	} else {
+		names = []
+		for (let lord of list)
+			if (is_lord_on_calendar(lord))
+				names.push(lord_name[lord])
+		names = names.join(" or ")
+	}
 
 	if (boxes === 1)
 		view.prompt = `${data.cards[game.what].event}: Shift ${names} 1 Calendar box`
@@ -2452,6 +2454,7 @@ function prompt_shift_cylinder(list, boxes) {
 
 	prompt_shift_lord_on_calendar(boxes)
 }
+
 function action_shift_cylinder_calendar(turn) {
 	log(`Shifted L${game.who} to ${turn}.`)
 	set_lord_calendar(game.who, turn)
@@ -6636,8 +6639,9 @@ states.muster_exiles = {
 				}
 			}
 		} else {
-			for (let loc of get_valid_exile_box(game.who))
-				gen_action_locale(loc)
+			for (let loc of data.exile_boxes)
+				if (has_favour_in_locale(game.active, loc))
+					gen_action_locale(loc)
 		}
 
 		if (done) {
@@ -6661,10 +6665,6 @@ function muster_lord_in_exile(lord, exile_box) {
 	muster_lord(lord, exile_box)
 }
 
-function get_valid_exile_box() {
-	return [ LOC_BURGUNDY, LOC_FRANCE, LOC_IRELAND, LOC_SCOTLAND ].filter(l => has_favour_in_locale(game.active, l))
-}
-
 // === PILLAGE ===
 
 function goto_pillage_food() {
diff --git a/tools/gendata.js b/tools/gendata.js
index 07d67e3..a3850fe 100644
--- a/tools/gendata.js
+++ b/tools/gendata.js
@@ -789,6 +789,10 @@ let seaports = [
 	"English Channel", "Bamburgh", "Newcastle", "Scarborough", "Ravenspur", "Lynn", "Ipswich", "North Sea", "Burgundy", "Dover", "Hastings", "Calais", "France", "Arundel", "Southampton","Dorchester","Exeter","Plymouth","Truro","Bristol","Pembroke","Harlech", "Ireland", "Irish Sea"
 ].map(name => locmap[name]).sort(cmpnum)
 
+let exile_boxes = [
+	"Burgundy", "France", "Ireland", "Scotland"
+].map(name => locmap[name]).sort(cmpnum)
+
 function dumplist(name, list) {
 	print(name + ":[")
 	for (let item of list)
@@ -1707,6 +1711,7 @@ vassal(0, "Hastings", -1, 0, "Hastings")
 
 print("const data = {")
 print("seaports:" + JSON.stringify(seaports) + ",")
+print("exile_boxes:" + JSON.stringify(exile_boxes) + ",")
 print("exile_1:" + JSON.stringify(exile_1) + ",")
 print("exile_2:" + JSON.stringify(exile_2) + ",")
 print("exile_3:" + JSON.stringify(exile_3) + ",")