1 files changed, 17 insertions, 34 deletions

diff --git a/rules.js b/rules.js
index 05e9cc8..6a20e79 100644
--- a/rules.js
+++ b/rules.js
@@ -110,7 +110,7 @@ function clear_undo() {
 
 function push_undo() {
 	game.undo.push(JSON.stringify(game, (k,v) => {
-		if (k === 'undo') return undefined;
+		if (k === 'undo') return 0;
 		if (k === 'log') return v.length;
 		return v;
 	}));
@@ -119,7 +119,7 @@ function push_undo() {
 function pop_undo() {
 	let undo = game.undo;
 	let save_log = game.log;
-	Object.assign(game, JSON.parse(undo.pop()));
+	game = JSON.parse(undo.pop());
 	game.undo = undo;
 	save_log.length = game.log;
 	game.log = save_log;
@@ -756,9 +756,10 @@ function start_year() {
 }
 
 function start_game_turn() {
-	let turn = 6 - game.e_hand.length;
+	game.turn = 6 - game.e_hand.length;
+
 	log("");
-	log("Start Turn " + turn + " of Year " + game.year + ".");
+	log("Start Turn " + game.turn + " of Year " + game.year + ".");
 
 	// Reset movement and attack tracking state
 	game.truce = false;
@@ -2803,8 +2804,8 @@ states.game_over = {
 
 function make_battle_view() {
 	let battle = {
-		EA: [], EB: [], EC: [], ER: [],
-		SA: [], SB: [], SC: [], SR: [],
+		EF: [], ER: [],
+		SF: [], SR: [],
 		flash: game.flash
 	};
 
@@ -2814,17 +2815,13 @@ function make_battle_view() {
 	function fill_cell(cell, owner, fn) {
 		for (let b in BLOCKS)
 			if (game.location[b] === game.where & block_owner(b) === owner && fn(b))
-				cell.push([b, game.steps[b], game.moved[b]?1:0])
+				cell.push(b);
 	}
 
 	fill_cell(battle.ER, ENGLAND, b => is_battle_reserve(b));
-	fill_cell(battle.EA, ENGLAND, b => !is_battle_reserve(b) && block_initiative(b) === 'A');
-	fill_cell(battle.EB, ENGLAND, b => !is_battle_reserve(b) && block_initiative(b) === 'B');
-	fill_cell(battle.EC, ENGLAND, b => !is_battle_reserve(b) && block_initiative(b) === 'C');
+	fill_cell(battle.EF, ENGLAND, b => !is_battle_reserve(b));
 	fill_cell(battle.SR, SCOTLAND, b => is_battle_reserve(b));
-	fill_cell(battle.SA, SCOTLAND, b => !is_battle_reserve(b) && block_initiative(b) === 'A');
-	fill_cell(battle.SB, SCOTLAND, b => !is_battle_reserve(b) && block_initiative(b) === 'B');
-	fill_cell(battle.SC, SCOTLAND, b => !is_battle_reserve(b) && block_initiative(b) === 'C');
+	fill_cell(battle.SF, SCOTLAND, b => !is_battle_reserve(b));
 
 	return battle;
 }
@@ -2871,7 +2868,7 @@ exports.action = function (state, current, action, arg) {
 		S[action](arg, current);
 	else
 		throw new Error("Invalid action: " + action);
-	return state;
+	return game;
 }
 
 exports.resign = function (state, current) {
@@ -2884,7 +2881,7 @@ exports.resign = function (state, current) {
 		game.victory = current + " resigned.";
 		game.result = ENEMY[current];
 	}
-	return state;
+	return game;
 }
 
 function observer_hand() {
@@ -2894,6 +2891,8 @@ function observer_hand() {
 	return hand;
 }
 
+exports.is_checkpoint = (a, b) => a.turn !== b.turn;
+
 exports.view = function(state, current) {
 	game = state;
 
@@ -2909,8 +2908,9 @@ exports.view = function(state, current) {
 		hand: (current === ENGLAND) ? game.e_hand : (current === SCOTLAND) ? game.s_hand : observer_hand(),
 		who: (game.active === current) ? game.who : null,
 		where: game.where,
-		known: {},
-		secret: { Scotland: {}, England: {} },
+		location: game.location,
+		steps: game.steps,
+		moved: game.moved,
 		battle: null,
 		active: game.active,
 		prompt: null,
@@ -2922,22 +2922,5 @@ exports.view = function(state, current) {
 	if (states[game.state].show_battle)
 		view.battle = make_battle_view();
 
-	for (let b in BLOCKS) {
-		let a = game.location[b];
-		if (current === block_owner(b) || game.state === 'game_over') {
-			if (a)
-				view.known[b] = [a, game.steps[b], game.moved[b] ? 1 : 0];
-		} else {
-			if (a) {
-				let list = view.secret[block_owner(b)];
-				if (!(a in list))
-					list[a] = [0, 0];
-				list[a][0]++;
-				if (game.moved[b])
-					list[a][1]++;
-			}
-		}
-	}
-
 	return view;
 }