summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data.js2
-rw-r--r--play.css1
-rw-r--r--play.html5
-rw-r--r--play.js11
-rw-r--r--rules.js17
-rw-r--r--tools/gendata.js23
6 files changed, 30 insertions, 29 deletions
diff --git a/data.js b/data.js
index e8619bd..d8fe4cf 100644
--- a/data.js
+++ b/data.js
@@ -1,2 +1,2 @@
-const data = {"first_space":0,"first_pop":0,"first_city":0,"last_city":10,"first_dept":11,"last_pop":22,"last_dept":26,"first_foreign":27,"last_foreign":31,"first_loc":32,"last_loc":49,"last_space":49,"coastal_spaces":[11,12,13,17],"card_name":[null,"1st Division","Ospina & Mora","Tapias","Caño Limón - Coveñas","Occidental & Ecopetrol","Oil Spill","7th Special Forces","Fuerza Aérea Colombiana","High Mountain Battalions","Blackhawks","National Defense & Security Council","Plan Colombia","Plan Meteoro","Tres Esquinas","War Tax","Coffee Prices","Madrid Donors","NSPD-18","General Offensive","Mono Jojoy","Raúl Reyes","Alfonso Cano","DoD Contractors","Operación Jaque","Ejército de Liberación Nacional","Gramaje","Misil Antiaéreo","Hugo Chávez","Kill Zone","Peace Commission","Betancourt","Secuestrados","Sucumbíos","Airdropped AKs","Crop Substitution","Zona de Convivencia","Former Military","National Coordination Center","Soldados Campesinos","Demobilization","Mancuso","Senado & Cámara","Calima Front","Colombia Nueva","Los Derechos Humanos","Limpieza","Pinto & del Rosario","Unión Sindical Obrera","Bloques","Carabineros","Pipeline Repairs","Castaño","Criminal Air Force","Deserters & Defectors","DEA Agents","Drogas La Rebaja","Op Millennium","General Serrano","Salcedo","The Chess Player","Air Bridge","Amazonía","Narco-War","Cocaine Labs","Poppies","Tingo María","Mexican Traffickers","Narco-Subs","Riverines & Fast Boats","Ayahuasca Tourism","Darién","Sicarios","Propaganda!","Propaganda!","Propaganda!","Propaganda!"],"card_order":[null,[0,1,2,3],[0,1,2,3],[0,1,2,3],[0,1,3,2],[0,1,3,2],[0,1,3,2],[0,2,1,3],[0,2,1,3],[0,2,1,3],[0,2,3,1],[0,2,3,1],[0,2,3,1],[0,3,1,2],[0,3,1,2],[0,3,1,2],[0,3,2,1],[0,3,2,1],[0,3,2,1],[1,0,2,3],[1,0,2,3],[1,0,2,3],[1,0,3,2],[1,0,3,2],[1,0,3,2],[1,2,0,3],[1,2,0,3],[1,2,0,3],[1,2,3,0],[1,2,3,0],[1,2,3,0],[1,3,0,2],[1,3,0,2],[1,3,0,2],[1,3,2,0],[1,3,2,0],[1,3,2,0],[2,0,1,3],[2,0,1,3],[2,0,1,3],[2,0,3,1],[2,0,3,1],[2,0,3,1],[2,1,0,3],[2,1,0,3],[2,1,0,3],[2,1,3,0],[2,1,3,0],[2,1,3,0],[2,3,0,1],[2,3,0,1],[2,3,0,1],[2,3,1,0],[2,3,1,0],[2,3,1,0],[3,0,1,2],[3,0,1,2],[3,0,1,2],[3,0,2,1],[3,0,2,1],[3,0,2,1],[3,1,0,2],[3,1,0,2],[3,1,0,2],[3,1,2,0],[3,1,2,0],[3,1,2,0],[3,2,0,1],[3,2,0,1],[3,2,0,1],[3,2,1,0],[3,2,1,0],[3,2,1,0],[0,1,2,3],[0,1,2,3],[0,1,2,3],[0,1,2,3]],"space_name":["Bogotá","Cali","Medellín","Bucaramanga","Ibagué","Santa Marta","Cartagena","Cúcuta","Neiva","Pasto","Sincelejo","Atlántico","Chocó","Nariño","Meta West","Guaviare","Putumayo","Cesar","Antioquia","Santander","Huila","Arauca","Meta East","Vichada","Guainía","Vaupés","Amazonas","Panamá","Ecuador","Brasil","Perú","Venezuela","Santa Marta / Cartagena","Cali / Pasto","Neiva / Pasto","Bogotá / San José","Pasto / Tumaco","Cali / Buenaventura","Cartagena / Sincelejo","Sincelejo / Medellín","Medellín / Ibagué","Ibagué / Cali","Bucaramanga / Ibagué / Bogotá","Bogotá / Neiva","Cúcuta / Arauca","Bogotá / Yopal","Santa Marta / Ayacucho","Bucaramanga / Ayacucho","Sincelejo / Ayacucho","Cúcuta / Ayacucho"],"spaces":[{"type":"city","id":"Bogota","pop":8,"adjacent":[14,19,20,22,35,42,43,45]},{"type":"city","id":"Cali","pop":3,"adjacent":[12,13,20,33,37,41]},{"type":"city","id":"Medellin","pop":3,"adjacent":[12,18,39,40]},{"type":"city","id":"Bucaramanga","pop":2,"adjacent":[18,19,42,47]},{"type":"city","id":"Ibague","pop":2,"adjacent":[12,18,20,40,41,42]},{"type":"city","id":"Santa Marta","pop":2,"adjacent":[11,17,32,46]},{"type":"city","id":"Cartagena","pop":1,"adjacent":[11,32,38]},{"type":"city","id":"Cucuta","pop":1,"adjacent":[19,31,44,49]},{"type":"city","id":"Neiva","pop":1,"adjacent":[14,16,20,34,43]},{"type":"city","id":"Pasto","pop":1,"adjacent":[13,16,20,28,33,34,36]},{"type":"city","id":"Sincelejo","pop":1,"adjacent":[11,12,18,38,39,48]},{"type":"forest","id":"Atlantico","pop":1,"adjacent":[5,6,10,17,18,19,32,38,46,47,48,49]},{"type":"forest","id":"Choco","pop":1,"adjacent":[1,2,4,10,13,18,20,27,37,39,40,41]},{"type":"forest","id":"Narino","pop":1,"adjacent":[1,9,12,20,28,33,36,37]},{"type":"forest","id":"Meta West","pop":1,"adjacent":[0,8,15,16,20,22,35,43]},{"type":"forest","id":"Guaviare","pop":1,"adjacent":[14,16,22,23,24,25,35]},{"type":"forest","id":"Putumayo","pop":1,"adjacent":[8,9,14,15,20,25,26,28,30,34]},{"type":"mountain","id":"Cesar","pop":1,"adjacent":[5,11,18,19,31,46,47,48,49]},{"type":"mountain","id":"Antioquia","pop":2,"adjacent":[2,3,4,10,11,12,17,19,20,39,40,42,46,47,48,49]},{"type":"mountain","id":"Santander","pop":2,"adjacent":[0,3,7,11,17,18,20,21,22,31,42,44,45,46,47,48,49]},{"type":"mountain","id":"Huila","pop":2,"adjacent":[0,1,4,8,9,12,13,14,16,18,19,33,34,41,42,43]},{"type":"grassland","id":"Arauca","pop":1,"adjacent":[19,22,23,31,44,45]},{"type":"grassland","id":"Meta East","pop":1,"adjacent":[0,14,15,19,21,23,35,45]},{"type":"grassland","id":"Vichada","pop":0,"adjacent":[15,21,22,24,31]},{"type":"forest","id":"Guainia","pop":0,"adjacent":[15,23,25,29,31]},{"type":"forest","id":"Vaupes","pop":0,"adjacent":[15,16,24,26,29]},{"type":"forest","id":"Amazonas","pop":0,"adjacent":[16,25,29,30]},{"type":"foreign","id":"Panama","pop":0,"adjacent":[12]},{"type":"foreign","id":"Ecuador","pop":0,"adjacent":[9,13,16,36]},{"type":"foreign","id":"Brasil","pop":0,"adjacent":[24,25,26]},{"type":"foreign","id":"Peru","pop":0,"adjacent":[16,26]},{"type":"foreign","id":"Venezuela","pop":0,"adjacent":[7,17,19,21,23,24,44,49]},{"type":"road","id":"Santa Marta / Cartagena","econ":1,"adjacent":[5,6,11]},{"type":"road","id":"Cali / Pasto","econ":1,"adjacent":[1,9,13,20]},{"type":"road","id":"Neiva / Pasto","econ":1,"adjacent":[8,9,16,20]},{"type":"road","id":"Bogota / San Jose","econ":1,"adjacent":[0,14,15,22]},{"type":"road","id":"Pasto / Tumaco","econ":1,"adjacent":[9,13,28]},{"type":"pipeline","id":"Cali / Buenaventura","econ":1,"adjacent":[1,12,13]},{"type":"pipeline","id":"Cartagena / Sincelejo","econ":1,"adjacent":[6,10,11]},{"type":"pipeline","id":"Sincelejo / Medellin","econ":2,"adjacent":[2,10,12,18]},{"type":"pipeline","id":"Medellin / Ibague","econ":1,"adjacent":[2,4,12,18]},{"type":"pipeline","id":"Ibague / Cali","econ":1,"adjacent":[1,4,12,20]},{"type":"pipeline","id":"Bucaramanga / Ibague / Bogota","econ":2,"adjacent":[0,3,4,18,19,20]},{"type":"pipeline","id":"Bogota / Neiva","econ":2,"adjacent":[0,8,14,20]},{"type":"pipeline","id":"Cucuta / Arauca","econ":3,"adjacent":[7,19,21,21,31]},{"type":"pipeline","id":"Bogota / Yopal","econ":2,"adjacent":[0,19,21,22]},{"type":"pipeline","id":"Santa Marta / Ayacucho","econ":2,"adjacent":[5,11,17,18,19,47,48,49]},{"type":"pipeline","id":"Bucaramanga / Ayacucho","econ":2,"adjacent":[3,11,17,18,19,46,48,49]},{"type":"pipeline","id":"Sincelejo / Ayacucho","econ":3,"adjacent":[10,11,17,18,19,46,47,49]},{"type":"pipeline","id":"Cucuta / Ayacucho","econ":3,"adjacent":[7,11,17,18,19,31,46,47,48]}],"adjacent_patrol":[[35,42,43,45],[33,37,41],[39,40],[42,47],[40,41,42],[32,46],[32,38],[44,49],[34,43],[33,34,36],[38,39,48],[5,6,10,32,38,46,47,48,49],[1,2,4,10,37,39,40,41],[1,9,33,36,37],[0,8,35,43],[35],[8,9,34],[5,46,47,48,49],[2,3,4,10,39,40,42,46,47,48,49],[0,3,7,42,44,45,46,47,48,49],[0,1,4,8,9,33,34,41,42,43],[44,45],[0,35,45],[],[],[],[],[],[9,36],[],[],[7,44,49],[5,6],[1,9],[8,9],[0],[9],[1],[6,10],[2,10],[2,4],[1,4],[0,3,4],[0,8],[7],[0],[5,47,48,49],[3,46,48,49],[10,46,47,49],[7,46,47,48]],"first_piece":[[0,3,3,33,0],[63,72],[102,108],[126,141]],"last_piece":[[2,2,32,62,-1],[71,101],[107,125],[140,152]]}
+const data = {"first_space":0,"first_pop":0,"first_city":0,"last_city":10,"first_dept":11,"last_pop":22,"last_dept":26,"first_foreign":27,"last_foreign":28,"first_loc":29,"last_loc":46,"last_space":46,"coastal_spaces":[11,12,13,17],"card_name":[null,"1st Division","Ospina & Mora","Tapias","Caño Limón - Coveñas","Occidental & Ecopetrol","Oil Spill","7th Special Forces","Fuerza Aérea Colombiana","High Mountain Battalions","Blackhawks","National Defense & Security Council","Plan Colombia","Plan Meteoro","Tres Esquinas","War Tax","Coffee Prices","Madrid Donors","NSPD-18","General Offensive","Mono Jojoy","Raúl Reyes","Alfonso Cano","DoD Contractors","Operación Jaque","Ejército de Liberación Nacional","Gramaje","Misil Antiaéreo","Hugo Chávez","Kill Zone","Peace Commission","Betancourt","Secuestrados","Sucumbíos","Airdropped AKs","Crop Substitution","Zona de Convivencia","Former Military","National Coordination Center","Soldados Campesinos","Demobilization","Mancuso","Senado & Cámara","Calima Front","Colombia Nueva","Los Derechos Humanos","Limpieza","Pinto & del Rosario","Unión Sindical Obrera","Bloques","Carabineros","Pipeline Repairs","Castaño","Criminal Air Force","Deserters & Defectors","DEA Agents","Drogas La Rebaja","Op Millennium","General Serrano","Salcedo","The Chess Player","Air Bridge","Amazonía","Narco-War","Cocaine Labs","Poppies","Tingo María","Mexican Traffickers","Narco-Subs","Riverines & Fast Boats","Ayahuasca Tourism","Darién","Sicarios","Propaganda!","Propaganda!","Propaganda!","Propaganda!"],"card_order":[null,[0,1,2,3],[0,1,2,3],[0,1,2,3],[0,1,3,2],[0,1,3,2],[0,1,3,2],[0,2,1,3],[0,2,1,3],[0,2,1,3],[0,2,3,1],[0,2,3,1],[0,2,3,1],[0,3,1,2],[0,3,1,2],[0,3,1,2],[0,3,2,1],[0,3,2,1],[0,3,2,1],[1,0,2,3],[1,0,2,3],[1,0,2,3],[1,0,3,2],[1,0,3,2],[1,0,3,2],[1,2,0,3],[1,2,0,3],[1,2,0,3],[1,2,3,0],[1,2,3,0],[1,2,3,0],[1,3,0,2],[1,3,0,2],[1,3,0,2],[1,3,2,0],[1,3,2,0],[1,3,2,0],[2,0,1,3],[2,0,1,3],[2,0,1,3],[2,0,3,1],[2,0,3,1],[2,0,3,1],[2,1,0,3],[2,1,0,3],[2,1,0,3],[2,1,3,0],[2,1,3,0],[2,1,3,0],[2,3,0,1],[2,3,0,1],[2,3,0,1],[2,3,1,0],[2,3,1,0],[2,3,1,0],[3,0,1,2],[3,0,1,2],[3,0,1,2],[3,0,2,1],[3,0,2,1],[3,0,2,1],[3,1,0,2],[3,1,0,2],[3,1,0,2],[3,1,2,0],[3,1,2,0],[3,1,2,0],[3,2,0,1],[3,2,0,1],[3,2,0,1],[3,2,1,0],[3,2,1,0],[3,2,1,0],[0,1,2,3],[0,1,2,3],[0,1,2,3],[0,1,2,3]],"space_name":["Bogotá","Cali","Medellín","Bucaramanga","Ibagué","Santa Marta","Cartagena","Cúcuta","Neiva","Pasto","Sincelejo","Atlántico","Chocó","Nariño","Meta West","Guaviare","Putumayo","Cesar","Antioquia","Santander","Huila","Arauca","Meta East","Vichada","Guainía","Vaupés","Amazonas","Ecuador","Panamá","Santa Marta / Cartagena","Cali / Pasto","Neiva / Pasto","Bogotá / San José","Pasto / Tumaco","Cali / Buenaventura","Cartagena / Sincelejo","Sincelejo / Medellín","Medellín / Ibagué","Ibagué / Cali","Bucaramanga / Ibagué / Bogotá","Bogotá / Neiva","Cúcuta / Arauca","Bogotá / Yopal","Santa Marta / Ayacucho","Bucaramanga / Ayacucho","Sincelejo / Ayacucho","Cúcuta / Ayacucho"],"spaces":[{"type":"city","id":"Bogota","pop":8,"adjacent":[14,19,20,22,32,39,40,42]},{"type":"city","id":"Cali","pop":3,"adjacent":[12,13,20,30,34,38]},{"type":"city","id":"Medellin","pop":3,"adjacent":[12,18,36,37]},{"type":"city","id":"Bucaramanga","pop":2,"adjacent":[18,19,39,44]},{"type":"city","id":"Ibague","pop":2,"adjacent":[12,18,20,37,38,39]},{"type":"city","id":"Santa Marta","pop":2,"adjacent":[11,17,29,43]},{"type":"city","id":"Cartagena","pop":1,"adjacent":[11,29,35]},{"type":"city","id":"Cucuta","pop":1,"adjacent":[19,41,46]},{"type":"city","id":"Neiva","pop":1,"adjacent":[14,16,20,31,40]},{"type":"city","id":"Pasto","pop":1,"adjacent":[13,16,20,27,30,31,33]},{"type":"city","id":"Sincelejo","pop":1,"adjacent":[11,12,18,35,36,45]},{"type":"forest","id":"Atlantico","pop":1,"adjacent":[5,6,10,17,18,19,29,35,43,44,45,46]},{"type":"forest","id":"Choco","pop":1,"adjacent":[1,2,4,10,13,18,20,28,34,36,37,38]},{"type":"forest","id":"Narino","pop":1,"adjacent":[1,9,12,20,27,30,33,34]},{"type":"forest","id":"Meta West","pop":1,"adjacent":[0,8,15,16,20,22,32,40]},{"type":"forest","id":"Guaviare","pop":1,"adjacent":[14,16,22,23,24,25,32]},{"type":"forest","id":"Putumayo","pop":1,"adjacent":[8,9,14,15,20,25,26,27,31]},{"type":"mountain","id":"Cesar","pop":1,"adjacent":[5,11,18,19,43,44,45,46]},{"type":"mountain","id":"Antioquia","pop":2,"adjacent":[2,3,4,10,11,12,17,19,20,36,37,39,43,44,45,46]},{"type":"mountain","id":"Santander","pop":2,"adjacent":[0,3,7,11,17,18,20,21,22,39,41,42,43,44,45,46]},{"type":"mountain","id":"Huila","pop":2,"adjacent":[0,1,4,8,9,12,13,14,16,18,19,30,31,38,39,40]},{"type":"grassland","id":"Arauca","pop":1,"adjacent":[19,22,23,41,42]},{"type":"grassland","id":"Meta East","pop":1,"adjacent":[0,14,15,19,21,23,32,42]},{"type":"grassland","id":"Vichada","pop":0,"adjacent":[15,21,22,24]},{"type":"forest","id":"Guainia","pop":0,"adjacent":[15,23,25]},{"type":"forest","id":"Vaupes","pop":0,"adjacent":[15,16,24,26]},{"type":"forest","id":"Amazonas","pop":0,"adjacent":[16,25]},{"type":"foreign","id":"Ecuador","pop":0,"adjacent":[9,13,16,33]},{"type":"foreign","id":"Panama","pop":0,"adjacent":[12]},{"type":"road","id":"Santa Marta / Cartagena","econ":1,"adjacent":[5,6,11]},{"type":"road","id":"Cali / Pasto","econ":1,"adjacent":[1,9,13,20]},{"type":"road","id":"Neiva / Pasto","econ":1,"adjacent":[8,9,16,20]},{"type":"road","id":"Bogota / San Jose","econ":1,"adjacent":[0,14,15,22]},{"type":"road","id":"Pasto / Tumaco","econ":1,"adjacent":[9,13,27]},{"type":"pipeline","id":"Cali / Buenaventura","econ":1,"adjacent":[1,12,13]},{"type":"pipeline","id":"Cartagena / Sincelejo","econ":1,"adjacent":[6,10,11]},{"type":"pipeline","id":"Sincelejo / Medellin","econ":2,"adjacent":[2,10,12,18]},{"type":"pipeline","id":"Medellin / Ibague","econ":1,"adjacent":[2,4,12,18]},{"type":"pipeline","id":"Ibague / Cali","econ":1,"adjacent":[1,4,12,20]},{"type":"pipeline","id":"Bucaramanga / Ibague / Bogota","econ":2,"adjacent":[0,3,4,18,19,20]},{"type":"pipeline","id":"Bogota / Neiva","econ":2,"adjacent":[0,8,14,20]},{"type":"pipeline","id":"Cucuta / Arauca","econ":3,"adjacent":[7,19,21,21]},{"type":"pipeline","id":"Bogota / Yopal","econ":2,"adjacent":[0,19,21,22]},{"type":"pipeline","id":"Santa Marta / Ayacucho","econ":2,"adjacent":[5,11,17,18,19,44,45,46]},{"type":"pipeline","id":"Bucaramanga / Ayacucho","econ":2,"adjacent":[3,11,17,18,19,43,45,46]},{"type":"pipeline","id":"Sincelejo / Ayacucho","econ":3,"adjacent":[10,11,17,18,19,43,44,46]},{"type":"pipeline","id":"Cucuta / Ayacucho","econ":3,"adjacent":[7,11,17,18,19,43,44,45]}],"adjacent_patrol":[[32,39,40,42],[30,34,38],[36,37],[39,44],[37,38,39],[29,43],[29,35],[41,46],[31,40],[30,31,33],[35,36,45],[5,6,10,29,35,43,44,45,46],[1,2,4,10,34,36,37,38],[1,9,30,33,34],[0,8,32,40],[32],[8,9,31],[5,43,44,45,46],[2,3,4,10,36,37,39,43,44,45,46],[0,3,7,39,41,42,43,44,45,46],[0,1,4,8,9,30,31,38,39,40],[41,42],[0,32,42],[],[],[],[],[9,33],[],[5,6],[1,9],[8,9],[0],[9],[1],[6,10],[2,10],[2,4],[1,4],[0,3,4],[0,8],[7],[0],[5,44,45,46],[3,43,45,46],[10,43,44,46],[7,43,44,45]],"first_piece":[[0,3,3,33,0],[63,72],[102,108],[126,141]],"last_piece":[[2,2,32,62,-1],[71,101],[107,125],[140,152]]}
if (typeof module !== 'undefined') module.exports = data
diff --git a/play.css b/play.css
index be8588e..2032c7e 100644
--- a/play.css
+++ b/play.css
@@ -146,6 +146,7 @@ path.selected { stroke: yellow; }
transition: none;
}
+.token.reminder,
.token.action {
pointer-events: auto;
}
diff --git a/play.html b/play.html
index a45b7b7..c496a70 100644
--- a/play.html
+++ b/play.html
@@ -115,10 +115,7 @@
<path class="forest" id="Putumayo" d="M912 1993c-9-3-10-17-22-13-8-2-17 8-23-2-7-5-19-4-25 2-7 13-16-4-24-7-10-3-20 1-29 1-6-5-11-8-16-14-9-4-20-2-30-2-11 0-20 8-31 9-11 4-22 10-33 12-5-9-16-6-20-16-7-4-13-7-11-16v-31h-58c-7-6-17-12-27-11-9-3-9 14-16 6-8-3-17-4-21-11-8-5-18-2-27-5-9-1-15-8-22-13-8-4-10-17-20-22-8-2-11-11-20-10-10 0-19-5-29-2-7 1-18 0-16 11 2 9-7 15-14 8-9-4-19-5-27 0-8-1-19-1-24-8-6-7-17-7-25-4l-24-7c-5-1-7-10 1-7 9 3 16-4 25-7 7-4 12-11 19-14 11 0 21 5 33 2 8-3 17 1 25-1l24-3c8-4 18 0 26-4 11-1 20-7 31-8 9-4 22-1 28-11 8-7 3-18 6-27 5-9 1-19 5-27 3-12 17-9 23-17 5-8 17-8 22-15 3-8 6-20-3-26-4-5-1-17 6-20 6-8 18-8 25-16 9-7 12-16 15-26 4-6 5-14 8-20 10-2 21-4 28-12 5 4 2 16 4 23 3 8 8 16 6 25-3 9 4 15 7 23 4 9 15 10 21 17 9 5 20-1 28 6 9 7 17 16 27 22 10 4 20 0 30-1 7 0 17-9 16 2 3 8 6 16 11 23 8 5 17 11 18 21 0 13 11 19 19 27 8 6 17 10 25 17 7 4 20 5 24-5 9-4 20-11 18-23 4-5 15-3 19-4 5 8 16 7 22 14 9 2 11 12 16 18 0 8 9 13 12 21 6 9 19 4 26 9 12 2 3 21 17 20 6 2 2 16 13 14 7 2 6 15 15 17 5 8 15 10 23 15 11 5-8 13-10 20-4 9-13 14-19 21-4 4-8 9-14 8h-15c-6 5-11 11-19 14-3 9-13 14-14 24 1 4 1 13-5 6-10-7-23 0-31 7-1 1-2 4-3 3z"/>
<path class="forest" id="Amazonas" d="M1255 2451c-8-5-11-13-14-21-7-5-10-13-18-18-3-10-15-8-24-8-7 3-15 12-22 3-3-5 7-13 10-19 4-7 9-12 12-20 5-8 7-17 13-23l16-24c3-6 7-11 13-17 4-6 5-14 11-19 4-8 5-19 2-28-7-6-18 1-21-10-7-5-11-12-18-15-8-2-16 3-21-5-7-6-17 0-21-9-7-6-13-14-23-15-3-11-16-7-24-7-10 1-14 11-24 12-5 7-18 5-24 6-6-7-15-8-21-15-9-2-20-1-27-8-9-4-17 3-24 7-6 5-6 14-15 17-10-2-17 6-24 10-8-3-12 7-19 4-5-4-15-2-22-3-8 1-17-7-26-2-6 6-18 1-25 7-4-10-15-12-23-14-8-8 5-16 2-25v-32l-17-18c-8-6-17 3-24 4-6 1-5-8-11-8 4-9 3-20-2-28-3-10-7-19-14-26-6-9-16-11-25-15-7 0-9-1-11-8-4-9-18-4-21-14-3-8-13-4-20-7-12 1-15-11-14-20-3-7-9-12-9-21-6-10 12-7 17-12 9-3 17-8 27-9 9-5 18-6 28-7 8 0 9 10 17 12 6 8 18 6 27 5 10-7 14 7 22 10 8 1 19 3 26-2 3-7 8-8 11-1 8 5 18 4 26 0 7-3 8 11 16 11 7 4 18 5 23-3 7-11 16-2 26-3 9 1 16-9 14-17 0-8 9-12 12-19 8-4 14-15 24-9 11 0 19-10 27-17 6-8 16-12 19-22 7-6 12-19 23-19 6 5 13 11 22 9 9 0 14 13 24 13 13 0 1 14 10 20 5 7 4 21 15 22 8 2 15-4 22 1 9 3 22 2 26 13 4 10 18 2 22 11 9 7 2 16 0 25 1 8 8 13 2 20-4 11 5 17 13 21 4 9 18 9 24 3 3-5 1-13 8-10-2 12 12 10 20 11 5 2 11 0 15-2 6 6 5 17 16 15 8 2 19 0 15 11 1 9-7 16-8 25l-9 51c-3 15-4 29-8 44-1 14-3 28-8 41-5 7-4 17-5 26-2 16-5 33-9 49-2 17-3 34-8 50l-7 33c-1 8-4 16-4 24z"/>
<path class="foreign" id="Panama" d="M211 926c-5-7-9-14-17-18-7-7-8-18-17-24-3-8-5-17-11-25-4-5-12-14-1-15 8-3 15-10 15-19-1-7-3-13 6-13 5 7 13 10 21 11 10 3 20-2 19-13 0-13-16-9-22-18-4-9-10-20-22-21-6-4-15-4-21-3-4-8-18-2-18-14-4-10-14-14-23-19-5-7-16-4-19-13-4-6-7-12-15-13-8-3-14-10-22-12-14-5-29-3-43-5-6-2-20 6-18-3v-47c10-2 20 1 30 4 10 1 25-4 23 11 11 0 21 2 31 4 11 0 23-1 34 1 10 3 21 4 30 12 11 5 22 9 33 10 8 3 15 6 19 13l19 17c4 6 7 13 13 18 4 7 10 12 18 15 2 7 8 15 12 19-9 6-5 20 1 27 12 2 6 16 12 22 8 5 13 12 15 22 0 5 5 10-3 11-6 7-16 12-16 22-2 6 6 13-3 11-5 1-8 13-11 5-8-3-10-12-17-16-9-2-18 2-20 11-3 7-2 16 2 21-10 3-13 15-14 24z"/>
-<path class="foreign" id="Venezuela" d="M1356 1097c-8-7-18-6-24-15l-23-23c-2-7-7-14-11-19-2-5-9-11 0-9l260 1h26v42c-7-6-18-5-27-8-10 0-22 2-30 7-5 9-18 2-26 4-10-2-18 8-27 7-9-6-19 0-28 2-9 1-16 3-25-1-11 1-21-3-31-7-10-1-18 4-26 10-3 3-4 7-8 9zm-70-71c-7-6-13-14-18-22-7-7-11-16-20-22-7-4-17-5-24 0-7-1-15-6-22-8-11-4-20-12-32-10-4-8-13-11-22-10-9-1-16 5-25 6l-58 5c-9 0-18-1-26 3-10-1-22 2-29-5-6-6-16-6-22-11-11-7-19-19-32-25 12-3 24-6 33-14 16-11 25-31 23-51 0-19-8-39-26-50-8-6-18-8-28-9-11-1-14-13-15-22-6-9-12-17-16-27-4-8-8-16-9-25-4-9-12-16-17-24-7-8-15-15-25-17-5-4-4-20-16-17-6-1-16 4-18 4 4-9 7-19 16-24 6-6 2-17 10-22 8-6 11-14 9-24-4-8 0-19-1-28 3-14 10-28 9-42 4-9 13-14 16-24 5-10 10-22 17-32 9-6 11-17 18-25 4-10 16-4 23-10 6-4 15-5 18-12 3-6 4-18 8-21v160c0 12-6 23-13 31-7 10 0 22 6 31 8 6 9 14 8 23v156h300z"/>
<path class="foreign" id="Ecuador" d="M3 1848v-68c9-2 18-5 27-5 10 0 16-12 24-11 12 5 15-9 23-13 6 0 7-14 11-5 9 6 20 9 30 15 10 3 8 14 15 21 6 6 17 0 23 5 6 8 13 15 24 15 10-1 15 7 25 9 10 1 18 4 22 14 6 8 15 12 24 17 7 7 3 21 14 25l29 8c9 0 18-3 24 6 9 2 17 6 27 7 9 2 18-1 27-1 8 5 18 5 27 2 10 0 15-10 13-19 10-5 21 0 30 6 8 4 11 12 16 18l21 17c4 2 16 6 6 5H3Z"/>
-<path class="foreign" id="Brasil" d="M1338 1764c-8-4-17-3-26-4-8 0-16-5-25-2 0-21-2-42-1-63 11-3 22-2 32-7 9 4 19 3 28 6v69zm-66 715c3-9 4-19 5-28 2-14 3-28 8-41 3-13 2-26 7-39 3-13 5-27 6-42 2-11 3-23 7-34 3-9 4-19 4-29 2-12 7-22 8-34 3-15 3-31 7-46 2-12 4-25 8-37 0-10 2-20 5-29 0-9 4-15 9-23v382zm74-417c-5-9-4-19-9-28-7-6-12-15-17-23-1-11 5-23-2-34-3-8-11-12-19-14-8-5-13-13-21-17-9-3-14-12-20-18l1-81c2-10 18-2 25-6 10-5 20-7 31-9 6-5 11-7 17-1 5 4 16 4 14 13z"/>
-<path class="foreign" id="Peru" d="M1014 2479v-220H648v-277c7 8 18 11 19 23 0 8 5 16 7 22-4 9 5 17 9 25 5 6 14 7 21 9 10 1 16 10 26 13 7 5 10 17 21 17 8 1 16 3 21 10 6 9 12 21 11 31-4 10-3 20 7 25 6 10 18 11 28 10 8-4 16-1 16 9 0 8 2 16-2 23-6 11-1 24 4 34 6 8 19 3 23 13 6 7 17 5 26 4 7-4 15 5 22-1 9-4 22-3 32 0 11 6 26 3 37-3 9-1 14-12 25-10 10-1 15-11 20-18 5-6 16 1 24 1 4 7 11 10 19 12 7 9 19 4 29 4 8 0 17-1 23-7 9-1 14-11 21-8 9 3 14 9 21 14 5 6 8 15 17 17 8-2 15-2 22 3 8-1 17 2 21 10 2 8 19 9 10 17-2 9-9 16-14 23l-16 25c-9 8-12 21-17 31-5 7-12 14-16 22l-14 20c-4 9 2 18 10 23 9 3 17 7 26 8s17-13 22-1c9 5 14 14 18 24 1 4 16 10 5 8-5-1-10 8-10-2-2-11-14-12-22-11-11-2-22 0-32-3-9 1-19 4-28 7-6 6-12 14-16 21-10 6-26 2-38 3z"/>
</svg>
<div id="cities">
@@ -178,6 +175,8 @@
<div class="token" id="token_total_support"></div>
<div class="token" id="token_el_presidente" style="left:254px;top:245px"></div>
<div class="token" id="token_prop_card" style="left:1029px;top:666px"></div>
+<div id="rem_darien" class="token reminder darien hide" style="left:160px;top:655px"></div>
+<div id="rem_sucumbios" class="token reminder sucumbios hide" style="left:10px;top:1740px"></div>
</div>
<div id="pieces">
diff --git a/play.js b/play.js
index 00ac551..99cc0ef 100644
--- a/play.js
+++ b/play.js
@@ -63,6 +63,9 @@ const MOM_MISIL_ANTIAEREO = 27
const MOM_SENADO_CAMARA = 42
const MOM_MEXICAN_TRAFFICKERS = 67
+const EVT_SUCUMBIOS = 33
+const EVT_DARIEN = 71
+
const senado_class_list = [
"token reminder hide",
"token reminder senado_farc",
@@ -125,6 +128,8 @@ let ui = {
president: document.getElementById("token_el_presidente"),
propaganda: document.getElementById("token_prop_card"),
senado: document.getElementById("rem_senado"),
+ darien: document.getElementById("rem_darien"),
+ sucumbios: document.getElementById("rem_sucumbios"),
},
pieces: [],
resources: [
@@ -284,6 +289,9 @@ function init_ui() {
register_card_tip(ui.momentum[c], c)
for (let c of capability_events)
register_card_tip(ui.capabilities[c], c)
+ register_card_tip(ui.tokens.senado, MOM_SENADO_CAMARA)
+ register_card_tip(ui.tokens.darien, EVT_DARIEN)
+ register_card_tip(ui.tokens.sucumbios, EVT_SUCUMBIOS)
for (let i = 0; i < data.spaces.length; ++i) {
let id = data.spaces[i].id
@@ -727,6 +735,9 @@ function on_update() {
ui.tokens.president.style.left = [ 0, "254px", "337px", "420px" ][view.president]
ui.tokens.senado.classList = senado_class_list[view.senado]
+ ui.tokens.darien.classList.toggle("hide", !set_has(view.capabilities, EVT_DARIEN))
+ ui.tokens.sucumbios.classList.toggle("hide", !set_has(view.capabilities, EVT_SUCUMBIOS))
+
for (let cap of capability_events) {
let shaded = set_has(view.capabilities, -cap)
let unshaded = set_has(view.capabilities, cap)
diff --git a/rules.js b/rules.js
index f144449..725792b 100644
--- a/rules.js
+++ b/rules.js
@@ -45,6 +45,9 @@ const MOM_MISIL_ANTIAEREO = 27
const MOM_SENADO_CAMARA = 42
const MOM_MEXICAN_TRAFFICKERS = 67
+const EVT_SUCUMBIOS = 33
+const EVT_DARIEN = 71
+
// Events with no shaded/unshaded variants
const single_events = [ 19, 36, 46, 53, 54, 63, 65, 69 ]
@@ -174,11 +177,10 @@ const VAUPES = 25
const AMAZONAS = 26
// Foreign Countries
-const BRASIL = 27
-const ECUADOR = 28
-const PANAMA = 29
-const PERU = 30
-const VENEZUELA = 31
+const ECUADOR = 27
+const PANAMA = 28
+
+const next_to_venezuela = [ CESAR, SANTANDER, ARAUCA, VICHADA, GUAINIA ]
const COASTAL_SPACES = [ ATLANTICO, CHOCO, NARINO, CESAR ]
@@ -3625,6 +3627,11 @@ function execute_shaded_event() {
game.senado = game.current
}
+ if (c === EVT_DARIEN)
+ set_add(game.capabilities, EVT_DARIEN)
+ if (c === EVT_SUCUMBIOS)
+ set_add(game.capabilities, EVT_SUCUMBIOS)
+
if (set_has(capability_events, c)) {
logi(event_name_shaded[c])
set_add(game.capabilities, -c)
diff --git a/tools/gendata.js b/tools/gendata.js
index 37fbba9..f576a79 100644
--- a/tools/gendata.js
+++ b/tools/gendata.js
@@ -222,11 +222,8 @@ data.last_dept = spaces.length-1
data.first_foreign = spaces.length
-def_space("foreign", 0, "Panamá")
def_space("foreign", 0, "Ecuador")
-def_space("foreign", 0, "Brasil")
-def_space("foreign", 0, "Perú")
-def_space("foreign", 0, "Venezuela")
+def_space("foreign", 0, "Panamá")
data.last_foreign = spaces.length-1
@@ -249,14 +246,14 @@ def_loc("pipeline", 1, [ "Ibagué", "Cali"], [ "Chocó", "Huila" ])
def_loc("pipeline", 2, [ "Bucaramanga", "Ibagué", "Bogotá" ], [ "Antioquia", "Santander", "Huila" ])
def_loc("pipeline", 2, [ "Bogotá", "Neiva" ], [ "Huila", "Meta West" ])
-def_loc("pipeline", 3, [ "Cúcuta", "Arauca" ], [ "Venezuela", "Arauca", "Santander" ])
+def_loc("pipeline", 3, [ "Cúcuta", "Arauca" ], [ "Arauca", "Santander" ])
def_loc("pipeline", 2, [ "Bogotá", "Yopal" ], [ "Santander", "Arauca", "Meta East"])
let ayacucho = [
def_loc("pipeline", 2, [ "Santa Marta", "Ayacucho" ], [ "Cesar", "Santander", "Antioquia", "Atlántico" ]),
def_loc("pipeline", 2, [ "Bucaramanga", "Ayacucho" ], [ "Antioquia", "Atlántico", "Cesar", "Santander" ]),
def_loc("pipeline", 3, [ "Sincelejo", "Ayacucho" ], [ "Atlántico", "Cesar", "Santander", "Antioquia" ]),
- def_loc("pipeline", 3, [ "Cúcuta", "Ayacucho" ], [ "Santander", "Antioquia", "Atlántico", "Cesar", "Venezuela" ]),
+ def_loc("pipeline", 3, [ "Cúcuta", "Ayacucho" ], [ "Santander", "Antioquia", "Atlántico", "Cesar" ]),
]
for (let a of ayacucho) {
@@ -289,7 +286,6 @@ adjacent("Pasto", "Nariño")
adjacent("Pasto", "Huila")
adjacent("Pasto", "Putumayo")
adjacent("Pasto", "Ecuador")
-adjacent("Cúcuta", "Venezuela")
adjacent("Cúcuta", "Santander")
adjacent("Bucaramanga", "Antioquia")
adjacent("Bucaramanga", "Santander")
@@ -305,22 +301,9 @@ adjacent("Neiva", "Putumayo")
adjacent("Panamá", "Chocó")
-adjacent("Venezuela", "Cesar")
-adjacent("Venezuela", "Santander")
-adjacent("Venezuela", "Arauca")
-adjacent("Venezuela", "Vichada")
-adjacent("Venezuela", "Guainía")
-
-adjacent("Brasil", "Guainía")
-adjacent("Brasil", "Vaupés")
-adjacent("Brasil", "Amazonas")
-
adjacent("Ecuador", "Nariño")
adjacent("Ecuador", "Putumayo")
-adjacent("Perú", "Putumayo")
-adjacent("Perú", "Amazonas")
-
// Dept - Dept (with redundancies)
adjacent("Atlántico", "Cesar")