diff --git a/play.js b/play.js
index e5e1549..38172d9 100644
--- a/play.js
+++ b/play.js
@@ -4,10 +4,10 @@
const SCALE = 1.80333333333333333333
-const RURAL = 0
-const URBAN = 1
-const REMOTE = 2
-const COUNTRY = 3
+const RURAL = 1
+const URBAN = 2
+const REMOTE = 3
+const COUNTRY = 4
const DEPLOY = 1
const ELIMINATED = 2
@@ -68,6 +68,7 @@ let ui = {
tracker: [],
drm: [],
areas: [],
+ boxes: [],
locations: [],
zones: [],
units: [],
@@ -156,21 +157,6 @@ function is_action(action, arg) {
return !!(view.actions && view.actions[action] && view.actions[action].includes(arg))
}
-function create(t, p, ...c) {
- let e = document.createElement(t)
- Object.assign(e, p)
- e.append(c)
- if (p.my_action)
- register_action(e, p.my_action, p.my_id)
- return e
-}
-
-function create_item(p) {
- let e = create("div", p)
- ui.board.appendChild(e)
- return e
-}
-
let on_init_once = false
function build_units() {
@@ -191,8 +177,8 @@ function build_units() {
function on_click_loc(evt) {
if (evt.button === 0) {
- console.log('loc', evt.target.loc)
- if (send_action('loc', evt.target.loc))
+ console.log('loc', evt.target.dataset.loc)
+ if (send_action('loc', evt.target.dataset.loc))
evt.stopPropagation()
}
}
@@ -204,6 +190,59 @@ function on_click_unit(evt) {
}
}
+function create_tracker(i, x, y) {
+ let e = ui.tracker[i] = document.createElement("div")
+ e.dataset.id = i
+ e.className = "space stack"
+ e.style.left = x / SCALE + "px"
+ e.style.top = y / SCALE + "px"
+ e.style.width = 85 / SCALE + "px"
+ e.style.height = 85 / SCALE + "px"
+ document.getElementById("tracker").appendChild(e)
+}
+
+function create_border_zone(i) {
+ let e = ui.drm[i] = document.createElement("div")
+ e.dataset.id = i
+ e.className = "space"
+ e.style.left = (288.2 + (i * 99)) / SCALE + "px"
+ e.style.top = 396 / SCALE + "px"
+ e.style.width = 94 / SCALE + "px"
+ e.style.height = 94 / SCALE + "px"
+ document.getElementById("tracker").appendChild(e)
+}
+
+function create_area(i, area_id, type) {
+ let e = ui.areas[i] = document.createElement("div")
+ e.id = `area-${area_id}`
+ e.dataset.loc = data.areas[i].loc
+ e.className = "space"
+ e.addEventListener("mousedown", on_click_loc)
+ e.style.left = data.areas[i].x / SCALE + "px"
+ e.style.top = data.areas[i].y / SCALE + "px"
+ if (type !== COUNTRY) {
+ e.style.width = 193 / SCALE + "px"
+ e.style.height = 193 / SCALE + "px"
+ } else {
+ e.style.width = data.areas[i].w / SCALE + "px"
+ e.style.height = data.areas[i].h / SCALE + "px"
+ }
+ document.getElementById("areas").appendChild(e)
+}
+
+function create_box(i, area_id, box_id) {
+ let e = ui.boxes[area_id * 4 + box_id] = document.createElement("div")
+ e.id = `ops-${area_id}-${box_id}`
+ e.dataset.loc = data.areas[i].loc
+ e.className = "space stack"
+ e.addEventListener("mousedown", on_click_loc)
+ e.style.left = (data.areas[i].x + (box_id % 2) * 99) / SCALE + "px"
+ e.style.top = (data.areas[i].y + Math.floor(box_id / 2) * 99) / SCALE + "px"
+ e.style.width = 94 / SCALE + "px"
+ e.style.height = 94 / SCALE + "px"
+ document.getElementById("boxes").appendChild(e)
+}
+
function on_init() {
if (on_init_once)
return
@@ -213,14 +252,7 @@ function on_init() {
let x = 5
let y = 5
for (let i = 0; i < 100; ++i) {
- let e = ui.tracker[i] = document.createElement("div")
- e.dataset.id = i
- e.className = "box stack"
- e.style.left = x / SCALE + "px"
- e.style.top = y / SCALE + "px"
- e.style.width = 85 / SCALE + "px"
- e.style.height = 85 / SCALE + "px"
- document.getElementById("tracker").appendChild(e)
+ create_tracker(i, x, y)
if (i < 29) {
x += 90
@@ -235,49 +267,23 @@ function on_init() {
// Border Zone DRM
for (let i = 0; i < 4; ++i) {
- let e = ui.drm[i] = document.createElement("div")
- e.dataset.id = i
- e.className = "box"
- e.style.left = (288.2 + (i * 99)) / SCALE + "px"
- e.style.top = 396 / SCALE + "px"
- e.style.width = 94 / SCALE + "px"
- e.style.height = 94 / SCALE + "px"
- document.getElementById("boxes").appendChild(e)
+ create_border_zone(i)
}
// Areas
for (let i = 0; i < data.areas.length; ++i) {
- let id = data.areas[i].id
- let name = data.areas[i].name
+ let area_id = data.areas[i].id
let type = data.areas[i].type
- let e = document.createElement("div")
- e.id = `area-${name}`
- e.dataset.id = id
- e.className = "box"
- e.style.left = data.areas[i].x / SCALE + "px"
- e.style.top = data.areas[i].y / SCALE + "px"
- if (type !== COUNTRY) {
- e.style.width = 193 / SCALE + "px"
- e.style.height = 193 / SCALE + "px"
- } else {
- e.style.width = data.areas[i].w / SCALE + "px"
- e.style.height = data.areas[i].h / SCALE + "px"
- }
- document.getElementById("boxes").appendChild(e)
-
- if (type !== COUNTRY) {
- for (let j = 0; j < 4; ++j) {
- let e = ui.locations[id * 4 + j] = document.createElement("div")
- let box_name = BOX_NAMES[j]
- e.id = `ops-${name}-${box_name}`
- e.className = "box stack loc"
- e.addEventListener("mousedown", on_click_loc)
- e.dataset.id = id * 4 + j
- e.style.left = (data.areas[i].x + (j % 2) * 99) / SCALE + "px"
- e.style.top = (data.areas[i].y + Math.floor(j / 2) * 99) / SCALE + "px"
- e.style.width = 94 / SCALE + "px"
- e.style.height = 94 / SCALE + "px"
- document.getElementById("boxes").appendChild(e)
+ if (type) {
+ create_area(i, area_id, type)
+
+ // Unit Boxes
+ if (type !== COUNTRY) {
+ for (let box_id = 0; box_id < 4; ++box_id) {
+ create_box(i, area_id, box_id)
+ }
+ } else {
+ create_box(i, area_id, 0)
}
}
}
@@ -313,7 +319,7 @@ function update_map() {
if (loc) {
e.loc = loc
- if (data.free_deploy_locations.includes(loc) || loc === DEPLOY) {
+ if (loc === DEPLOY) {
if (is_gov_unit(u) && !ui.gov_supply.contains(e))
ui.gov_supply.appendChild(e)
if (is_fln_unit(u) && !ui.fln_supply.contains(e))
@@ -323,8 +329,8 @@ function update_map() {
if (!ui.eliminated.contains(e))
ui.eliminated.appendChild(e)
} else {
- if (!ui.locations[loc].contains(e))
- ui.locations[loc].appendChild(e)
+ if (!ui.boxes[loc].contains(e))
+ ui.boxes[loc].appendChild(e)
}
update_unit(e, u)
} else {
@@ -332,10 +338,10 @@ function update_map() {
}
}
- for (let i = 0; i < ui.locations.length; ++i) {
- let e = ui.locations[i]
+ for (let i = 0; i < ui.areas.length; ++i) {
+ let e = ui.areas[i]
if (e) {
- e.classList.toggle("action", is_loc_action(ui.locations[i].loc))
+ e.classList.toggle("action", is_loc_action(ui.areas[i].loc))
}
}
}
@@ -343,7 +349,7 @@ function update_map() {
function on_update() {
on_init()
- update_map()
+ // update_map()
for (let e of action_register)
e.classList.toggle("action", is_action(e.my_action, e.my_id))
diff --git a/rules.js b/rules.js
index d3bdec1..700575a 100644
--- a/rules.js
+++ b/rules.js
@@ -1,7 +1,7 @@
"use strict"
-const FLN = "FLN"
-const GOV = "Government"
+const FLN_NAME = "FLN"
+const GOV_NAME = "Government"
const BOTH = "Both"
const unit_count = 120
@@ -10,6 +10,14 @@ const last_gov_unit = 39
const first_fln_unit = 40
const last_fln_unit = 119
+const UG = 0
+const OPS = 1
+const PTL = 2
+const OC = 3
+
+const FLN = 0
+const GOV = 1
+
const FR_XX = 0
const FR_X = 1
const EL_X = 2
@@ -29,7 +37,7 @@ var game = null
var view = null
const {
- areas, zones, locations, units, free_deploy_locations
+ areas, zone_areas, locations, units
} = require("./data.js")
var first_friendly_unit, last_friendly_unit
@@ -45,7 +53,7 @@ function set_active_player() {
function set_passive_player() {
clear_undo()
- let nonphasing = (game.phasing === GOV ? FLN : GOV)
+ let nonphasing = (game.phasing === GOV_NAME ? FLN_NAME : GOV_NAME)
if (game.active !== nonphasing) {
game.active = nonphasing
update_aliases()
@@ -68,15 +76,15 @@ function is_passive_player() {
}
function is_gov_player() {
- return game.active === GOV
+ return game.active === GOV_NAME
}
function is_fln_player() {
- return game.active === FLN
+ return game.active === FLN_NAME
}
function update_aliases() {
- if (game.active === GOV) {
+ if (game.active === GOV_NAME) {
first_friendly_unit = first_gov_unit
last_friendly_unit = last_gov_unit
first_enemy_unit = first_fln_unit
@@ -98,7 +106,7 @@ function load_state(state) {
// === UNIT STATE ===
-// location (8 bits), dispersed (1 bit), airmobile (1 bit), neutralized (1 bit)
+// location (8 bits), op box (2 bits), dispersed (1 bit), airmobile (1 bit), neutralized (1 bit)
function apply_select(u) {
if (game.selected === u)
@@ -122,7 +130,10 @@ const UNIT_AIRMOBILE_MASK = 1 << UNIT_AIRMOBILE_SHIFT
const UNIT_DISPERSED_SHIFT = 2
const UNIT_DISPERSED_MASK = 1 << UNIT_DISPERSED_SHIFT
-const UNIT_LOC_SHIFT = 3
+const UNIT_BOX_SHIFT = 3
+const UNIT_BOX_MASK = 2 << UNIT_BOX_SHIFT
+
+const UNIT_LOC_SHIFT = 5
const UNIT_LOC_MASK = 255 << UNIT_LOC_SHIFT
// neutralized
@@ -153,6 +164,16 @@ function set_unit_loc(u, x) {
game.units[u] = (game.units[u] & ~UNIT_LOC_MASK) | (x << UNIT_LOC_SHIFT)
}
+// box
+
+function unit_box(u) {
+ return (game.units[u] & UNIT_BOX_MASK) >> UNIT_BOX_SHIFT
+}
+
+function set_unit_box(u, x) {
+ game.units[u] = (game.units[u] & ~UNIT_BOX_MASK) | (x << UNIT_BOX_SHIFT)
+}
+
// airmobile
function is_unit_airmobile(u) {
@@ -212,6 +233,7 @@ function set_unit_fired(u) {
function eliminate_unit(u) {
game.units[u] = 0
set_unit_loc(u, ELIMINATED)
+ set_unit_box(u, OC)
}
function is_unit_eliminated(u) {
@@ -227,6 +249,18 @@ function find_free_unit_by_type(type) {
throw new Error("cannot find free unit of type: " + type)
}
+function is_gov_unit(u) {
+ return units[u].side === GOV
+}
+
+function is_fln_unit(u) {
+ return units[u].side === FLN
+}
+
+function is_police_unit(u) {
+ return units[u].type === POL
+}
+
// === ITERATORS ===
function for_each_friendly_unit_in_loc(x, fn) {
@@ -242,6 +276,13 @@ function for_each_friendly_unit_in_locs(xs, fn) {
fn(u)
}
+function has_friendly_unit_in_loc(x) {
+ for (let u = first_friendly_unit; u <= last_friendly_unit; ++u)
+ if (unit_loc(u) === x)
+ return true
+ return false
+}
+
function has_friendly_unit_in_locs(xs) {
for (let u = first_friendly_unit; u <= last_friendly_unit; ++u)
for (let x of xs)
@@ -254,7 +295,7 @@ function has_friendly_unit_in_locs(xs) {
exports.scenarios = [ "1954", "1958", "1960" ]
-exports.roles = [ FLN, GOV ]
+exports.roles = [ FLN_NAME, GOV_NAME ]
function gen_action(action, argument) {
if (!(action in view.actions))
@@ -331,8 +372,8 @@ exports.resign = function (state, player) {
load_state(state)
if (game.state !== 'game_over') {
if (player === FLN_NAME)
- goto_game_over(GOV, "FLN resigned.")
- if (player === GOV)
+ goto_game_over(GOV_NAME, "FLN resigned.")
+ if (player === GOV_NAME)
goto_game_over(FLN_NAME, "Government resigned.")
}
return game
@@ -364,8 +405,8 @@ exports.setup = function (seed, scenario, options) {
state: null,
selected: -1,
- phasing: GOV,
- active: GOV,
+ phasing: GOV_NAME,
+ active: GOV_NAME,
scenario: null,
turn: 0,
@@ -438,6 +479,7 @@ function setup_units(where, list) {
for (let u of list) {
u = find_free_unit_by_type(u)
set_unit_loc(u, loc)
+ set_unit_box(u, OC)
}
}
@@ -494,7 +536,7 @@ function setup_scenario(scenario_name) {
log(`Government PSL=${game.gov_psl}`)
SETUP[scenario_name]()
- game.phasing = GOV
+ game.phasing = GOV_NAME
}
function goto_scenario_setup() {
@@ -510,7 +552,7 @@ states.scenario_setup = {
prompt() {
view.prompt = `Setup: ${game.active} Deployment.`
let done = true
- for_each_friendly_unit_in_locs(free_deploy_locations, u => {
+ for_each_friendly_unit_in_loc(DEPLOY, u => {
gen_action_unit(u)
done = false
})
@@ -518,10 +560,8 @@ states.scenario_setup = {
gen_action('end_deployment')
if (game.selected.length > 0) {
for (let i = 0; i < areas.length; ++i) {
- let loc = areas[i].id
- for (let j = 0; j < 4; ++j) {
- gen_action_loc(loc * 4 + j)
- }
+ let loc = areas[i].loc
+ gen_action_loc(loc)
}
}
// XXX
@@ -536,8 +576,18 @@ states.scenario_setup = {
game.selected = []
push_undo()
game.summary[to] = (game.summary[to] | 0) + list.length
- for (let who of list)
+ for (let who of list) {
set_unit_loc(who, to)
+
+ // deploy unit: all FLN in UG, GOV in OPS, police in PTL
+ if (is_fln_unit(u)) {
+ set_unit_box(who, UG)
+ } else if (is_police_unit(u)) {
+ set_unit_box(who, PTL)
+ } else {
+ set_unit_box(who, OPS)
+ }
+ }
},
end_deployment() {
log(`Deployed`)
@@ -557,7 +607,7 @@ states.scenario_setup = {
function end_scenario_setup() {
set_enemy_player()
- if (has_friendly_unit_in_locs(free_deploy_locations)) {
+ if (has_friendly_unit_in_loc(DEPLOY)) {
goto_scenario_setup()
} else {
game.selected = -1
diff --git a/tools/gendata.js b/tools/gendata.js
index 104681e..f4932b3 100644
--- a/tools/gendata.js
+++ b/tools/gendata.js
@@ -4,52 +4,36 @@ const fs = require("fs")
let data = {}
-const RURAL = 0
-const URBAN = 1
-const REMOTE = 2
-const COUNTRY = 3
+const RURAL = 1
+const URBAN = 2
+const REMOTE = 3
+const COUNTRY = 4
-let areas = []
-let zones = {}
let locations = {}
-let location_id = 0
-
-function def_location(name) {
- locations[name] = ++location_id
- return location_id
-}
-
-def_location("DEPLOY")
-def_location("ELIMINATED")
-def_location("I")
-def_location("II")
-def_location("III")
-def_location("IV")
-def_location("V")
-def_location("VI")
-// def_location("France")
-// def_location("Morocco")
-// def_location("Tunisia")
+let areas = []
+let zone_areas = {}
+let next_location_id = 0
function def_area(id, name, type, zone, x, y, w, h) {
- let loc = 0
- if (id in locations) {
- loc = locations[id]
- } else {
- loc = def_location(id)
- }
+ let loc = next_location_id++
areas.push({loc, id, name, type, zone, x, y, w, h})
if (zone) {
- if (!(zone in zones)) {
- zones[zone] = []
+ if (!(zone in zone_areas)) {
+ zone_areas[zone] = []
}
- zones[zone].push(id)
+ zone_areas[zone].push(loc)
}
}
-def_area("FRANCE", "France", COUNTRY, null, 1605, 185.3, 266, 212.4)
-def_area("TUNISIA", "Tunisia", COUNTRY, null, 2499.9, 1667.6, 94, 94)
-def_area("MOROCCO", "Morocco", COUNTRY, null, 109, 1765, 94, 94)
+// special locations
+def_area("NONE", "None")
+def_area("DEPLOY", "Deployment")
+def_area("ELIMINATED", "Eliminated")
+
+// countries
+def_area("FRANCE", "France", COUNTRY, null, 1690.3, 244.8, 94, 94)
+def_area("TUNISIA", "Tunisia", COUNTRY, "TUNISIA", 2499.9, 1667.6, 94, 94)
+def_area("MOROCCO", "Morocco", COUNTRY, "MOROCCO", 109, 1765, 94, 94)
def_area("I-1", "Barika", RURAL, "I", 1708.1, 1117.9)
def_area("I-2", "Batna", REMOTE, "I", 2185.6, 1390.9)
@@ -82,7 +66,6 @@ def_area("V-8", "Laghouat", REMOTE, "V", 1191, 1615.6)
def_area("VI-1", "Sidi Aissa", REMOTE, "VI", 1385, 1186)
def_area("VI-2", "Ain Qussera", RURAL, "VI", 1070.6, 1235.6)
-
let adjecents = {}
function def_adjecent(id, neighbours) {
@@ -119,24 +102,18 @@ def_adjecent("V-4", ["VI-2"])
def_adjecent("V-6", ["VI-2"])
def_adjecent("V-8", ["VI-1", "VI-2"])
-
-// XXX not sure about this
-let free_deploy_locations = []
-for (let l of ["I", "II", "III", "IV", "V", "VI"]) {
- free_deploy_locations.push(locations[l])
-}
-
-data.areas = areas
-data.zones = zones
data.locations = locations
+data.areas = areas
+data.zone_areas = zone_areas
data.adjecents = adjecents
-data.free_deploy_locations = free_deploy_locations
let units = []
const FLN = 0
const GOV = 1
+// unit types
+
const FR_XX = 0
const FR_X = 1
const EL_X = 2
--
cgit v1.2.3