diff options
| -rw-r--r-- | play.html | 4 | ||||
| -rw-r--r-- | play.js | 54 | ||||
| -rw-r--r-- | rules.js | 222 |
3 files changed, 125 insertions, 155 deletions
@@ -947,7 +947,7 @@ c5 3 13 7 17 8 8 2 9 3 11 12 1 5 5 12 8 16 5 8 5 8 3 22 l-3 14 -30 -1 c-35 <div class="piece yes" style="left:500px;top:400px;"></div> <div class="piece no" style="left:350px;top:400px;"></div> - <div class="piece cube red" style="left:100px;top:150px;"></div> + <!-- <div class="piece cube red" style="left:100px;top:150px;"></div> <div class="piece cube red" style="left:120px;top:150px;"></div> <div class="piece cube red" style="left:140px;top:150px;"></div> <div class="piece cube red" style="left:160px;top:150px;"></div> @@ -957,7 +957,7 @@ c5 3 13 7 17 8 8 2 9 3 11 12 1 5 5 12 8 16 5 8 5 8 3 22 l-3 14 -30 -1 c-35 <div class="piece cube purple" style="left:100px;top:190px;"></div> <div class="piece cube purple" style="left:120px;top:190px;"></div> <div class="piece cube purple" style="left:140px;top:190px;"></div> - <div class="piece cube purple" style="left:160px;top:190px;"></div> + <div class="piece cube purple" style="left:160px;top:190px;"></div> --> </div> </div> @@ -7,13 +7,6 @@ const OPP = 1 const SUF_NAME = "Suffragist" const OPP_NAME = "Opposition" -const WEST = 1 -const PLAINS = 2 -const SOUTH = 3 -const MIDWEST = 4 -const ATLANTIC_APPALACHIA = 5 -const NORTHEAST = 6 - const REGION_NAMES = [ null, "West", @@ -152,19 +145,6 @@ function red_cubes(u) { return (view.us_states[u] & RED_MASK) >> RED_SHIFT } -function support_cubes(u) { - return purple_cubes(u) + yellow_cubes(u) -} - -function color_cubes(cube, u) { - if (cube === PURPLE) - return purple_cubes(u) - else if (cube === YELLOW) - return yellow_cubes(u) - else - return red_cubes(u) -} - // CARD MENU var card_action_menu = Array.from(document.getElementById("popup").querySelectorAll("li[data-action]")).map(e => e.dataset.action) @@ -271,6 +251,24 @@ function is_us_state_action(i) { return false } +function is_purple_cube_action(i) { + if (view.actions && view.actions.purple_cube && view.actions.purple_cube.includes(i)) + return true + return false +} + +function is_yellow_cube_action(i) { + if (view.actions && view.actions.yellow_cube && view.actions.yellow_cube.includes(i)) + return true + return false +} + +function is_red_cube_action(i) { + if (view.actions && view.actions.red_cube && view.actions.red_cube.includes(i)) + return true + return false +} + function is_space_action(i) { if (view.actions && view.actions.space && view.actions.space.includes(i)) return true @@ -349,8 +347,12 @@ function on_click_space(evt) { function on_click_cube(evt) { if (evt.button === 0) { - console.log("piece", evt.target.my_cube) - if (send_action('piece', evt.target.my_cube)) + console.log("cube", evt.target.my_cube, evt.target.my_us_state) + if (evt.target.my_cube === PURPLE && send_action('purple_cube', evt.target.my_us_state)) + evt.stopPropagation() + if (evt.target.my_cube === YELLOW && send_action('yellow_cube', evt.target.my_us_state)) + evt.stopPropagation() + if (evt.target.my_cube === RED && send_action('red_cube', evt.target.my_us_state)) evt.stopPropagation() } hide_popup_menu() @@ -631,7 +633,7 @@ function on_update() { // eslint-disable-line no-unused-vars if (view.us_states[i]) { let state_cubes = [] let cube = null - console.log("US_STATE", i, purple_cubes(i), yellow_cubes(i), red_cubes(i), is_green_check(i), is_red_x(i)) + // console.log("US_STATE", i, purple_cubes(i), yellow_cubes(i), red_cubes(i), is_green_check(i), is_red_x(i)) for (let c = 0; c < purple_cubes(i); ++c) { cube = ui.cubes[ci++] // TODO track both state and color @@ -639,9 +641,9 @@ function on_update() { // eslint-disable-line no-unused-vars cube.my_cube = PURPLE cube.classList.add("purple") cube.classList.remove("yellow", "red") + cube.classList.toggle("action", is_purple_cube_action(i)) state_cubes.push(cube) ui.pieces.appendChild(cube) - console.log("add purple", cube) } for (let c = 0; c < yellow_cubes(i); ++c) { cube = ui.cubes[ci++] @@ -649,9 +651,9 @@ function on_update() { // eslint-disable-line no-unused-vars cube.my_cube = YELLOW cube.classList.add("yellow") cube.classList.remove("purple", "red") + cube.classList.toggle("action", is_yellow_cube_action(i)) state_cubes.push(cube) ui.pieces.appendChild(cube) - console.log("add yellow", cube) } for (let c = 0; c < red_cubes(i); ++c) { cube = ui.cubes[ci++] @@ -659,9 +661,9 @@ function on_update() { // eslint-disable-line no-unused-vars cube.my_cube = RED cube.classList.add("red") cube.classList.remove("purple", "yellow") + cube.classList.toggle("action", is_red_cube_action(i)) state_cubes.push(cube) ui.pieces.appendChild(cube) - console.log("add red", cube) } let [x, y] = US_STATES_LAYOUT[i] layout_cubes(state_cubes, x, y) @@ -270,6 +270,20 @@ function support_cubes(u) { return purple_cubes(u) + yellow_cubes(u) } +function player_cubes(u) { + if (game.active === SUF) + return support_cubes(u) + else + return red_cubes(u) +} + +function opponent_cubes(u) { + if (game.active === SUF) + return red_cubes(u) + else + return support_cubes(u) +} + function color_cubes(cube, u) { if (cube === PURPLE) return purple_cubes(u) @@ -337,6 +351,18 @@ function gen_action_us_state(s) { gen_action("us_state", s) } +function gen_action_purple_cube(s) { + gen_action("purple_cube", s) +} + +function gen_action_yellow_cube(s) { + gen_action("yellow_cube", s) +} + +function gen_action_red_cube(s) { + gen_action("red_cube", s) +} + exports.action = function (state, player, action, arg) { game = state if (states[game.state] && action in states[game.state]) { @@ -1255,102 +1281,6 @@ function vm_support_discard_2_random_draw_2() { vm_next() } - -// XXX Placeholders from RFOP - -// function vm_ops() { -// goto_operations(vm_operand(1), vm_operand_spaces(2)) -// } - -// function vm_operand_spaces(x) { -// let s = vm_operand(x) -// if (typeof s === "number") -// return [ s ] -// return s -// } - -// function vm_remove_up_to() { -// game.vm.upto = 1 -// game.vm.count = vm_operand(1) -// game.vm.spaces = vm_operand_spaces(2) -// goto_vm_remove() -// } - -// function vm_remove() { -// game.vm.count = vm_operand(1) -// game.vm.spaces = vm_operand_spaces(2) -// goto_vm_remove() -// } - -// function vm_remove_own() { -// game.vm.spaces = vm_operand_spaces(1) -// game.state = "vm_remove_own" -// } - -// function vm_replace_up_to() { -// game.vm.upto = 1 -// game.vm.count = vm_operand(1) -// game.vm.spaces = vm_operand_spaces(2) -// game.state = "vm_replace" -// goto_vm_replace() -// } - -// function vm_replace_different() { -// game.vm.count = vm_operand(1) -// game.vm.spaces = vm_operand_spaces(2).slice() // make a copy for safe mutation -// game.state = "vm_replace_different" -// } - -// function vm_replace() { -// game.vm.count = vm_operand(1) -// game.vm.spaces = vm_operand_spaces(2) -// goto_vm_replace() -// } - -// function vm_place_removed_up_to() { -// game.vm.removed = 1 -// game.vm.upto = 1 -// game.vm.count = vm_operand(1) -// game.vm.spaces = vm_operand_spaces(2) -// goto_vm_place() -// } - -// function vm_place_up_to() { -// game.vm.upto = 1 -// game.vm.count = vm_operand(1) -// game.vm.spaces = vm_operand_spaces(2) -// goto_vm_place() -// } - -// function vm_place() { -// game.vm.count = vm_operand(1) -// game.vm.spaces = vm_operand_spaces(2) -// goto_vm_place() -// } - -// function vm_may_place_disc() { -// game.vm.upto = 1 -// game.vm.count = 1 -// game.vm.spaces = vm_operand_spaces(1) -// game.state = "vm_place_disc" -// goto_vm_place_disc() -// } - -// function vm_place_disc() { -// game.vm.count = 1 -// game.vm.spaces = vm_operand_spaces(1) -// goto_vm_place_disc() -// } - -// function vm_move_up_to() { -// game.vm.count = vm_operand(1) -// game.vm.a = vm_operand_spaces(2) -// game.vm.b = vm_operand_spaces(3) -// goto_vm_move() -// } - -// #endregion - // #region EVENT STATES states.vm_switch = { @@ -1477,21 +1407,39 @@ function goto_vm_add_cubes() { states.vm_add_cubes = { inactive: "add a cube", prompt() { - if (!game.vm.cube_color) { - event_prompt("Choose a cube to add.") - } else { - event_prompt(`Add a ${COLOR_NAMES[game.vm.cube_color]} cube.`) - } - if (game.vm.cubes === PURPLE_OR_YELLOW) { gen_action("purple") gen_action("yellow") } // TODO remove cube if opponent has any cubes here - if (game.vm.cube_color) { - for (let s of game.vm.us_states) + let has_opponent_cubes = false + for (let s of game.vm.us_states) { + if (opponent_cubes(s)) { + has_opponent_cubes = true + if (game.active === SUF) { + gen_action_red_cube(s) + } else { + if (purple_cubes(s)) + gen_action_purple_cube(s) + if (yellow_cubes(s)) + gen_action_yellow_cube(s) + } + } else if (game.vm.cube_color) { gen_action_us_state(s) + } + } + + if (!game.vm.cube_color) { + if (!has_opponent_cubes) + event_prompt("Choose a cube to add.") + else + event_prompt("Choose a cube to add or remove an Opponent's cube.") + } else { + if (!has_opponent_cubes) + event_prompt(`Add a ${COLOR_NAMES[game.vm.cube_color]} cube.`) + else + event_prompt(`Add a ${COLOR_NAMES[game.vm.cube_color]} cube or remove an Opponent's cube.`) } }, purple() { @@ -1500,39 +1448,59 @@ states.vm_add_cubes = { yellow() { game.vm.cube_color = YELLOW }, + purple_cube(s) { + push_undo() + remove_cube(PURPLE, s) + after_add_cube(s) + }, + yellow_cube(s) { + push_undo() + remove_cube(YELLOW, s) + after_add_cube(s) + }, + red_cube(s) { + push_undo() + remove_cube(RED, s) + after_add_cube(s) + }, us_state(s) { push_undo() // TODO remove cube if opponent has any cubes here add_cube(game.vm.cube_color, s) - map_incr(game.vm.added, s, 1) + after_add_cube(s) + } +} - if (game.vm.in_one_state_of_each_region) { - for (let other of region_us_states(us_state_region(s))) - if (s !== other) - set_delete(game.vm.us_states, other) - } +// XXX pick a better name +function after_add_cube(us_state) { + map_incr(game.vm.added, us_state, 1) - if (game.vm.per_state_in_any_one_region) { - // TODO only need to do this the first time - // XXX does set_deletion work while iterating? - for (let other of game.vm.us_states) - if (us_state_region(s) !== us_state_region(other)) - set_delete(game.vm.us_states, other) - } + if (game.vm.in_one_state_of_each_region) { + for (let other of region_us_states(us_state_region(us_state))) + if (us_state !== other) + set_delete(game.vm.us_states, other) + } - if (game.vm.limit) { - if (map_get(game.vm.added, s) === game.vm.limit) - set_delete(game.vm.us_states, s) - if (map_count(game.vm.added) === game.vm.count) - vm_next() - } else { - if (map_get(game.vm.added, s) === game.vm.count) - set_delete(game.vm.us_states, s) - } + if (game.vm.per_state_in_any_one_region) { + // TODO only need to do this the first time + // XXX does set_deletion work while iterating? + for (let other of game.vm.us_states) + if (us_state_region(us_state) !== us_state_region(other)) + set_delete(game.vm.us_states, other) + } - if (!game.vm.us_states.length) + if (game.vm.limit) { + if (map_get(game.vm.added, us_state) === game.vm.limit) + set_delete(game.vm.us_states, us_state) + if (map_count(game.vm.added) === game.vm.count) vm_next() + } else { + if (map_get(game.vm.added, us_state) === game.vm.count) + set_delete(game.vm.us_states, us_state) } + + if (!game.vm.us_states.length) + vm_next() } states.vm_add_congress = { |