diff options
| -rw-r--r-- | play.js | 37 | ||||
| -rw-r--r-- | tools/layout.svg | 45 |
2 files changed, 44 insertions, 38 deletions
@@ -59,9 +59,9 @@ const LAYOUT = { "Atlantico DRUGS": [713, 573], "Choco Govt": [338, 1097], "Choco AUC": [366, 915], - "Choco Cartels": [337, 1275], - "Choco FARC": [396, 1186], - "Choco DRUGS": [456, 957], + "Choco Cartels": [365, 1272], + "Choco FARC": [408, 1179], + "Choco DRUGS": [297, 1184], "Narino Govt": [185, 1562], "Narino AUC": [293, 1554], "Narino Cartels": [217, 1688], @@ -71,17 +71,17 @@ const LAYOUT = { "Meta West AUC": [679, 1549], "Meta West Cartels": [819, 1540], "Meta West FARC": [702, 1632], - "Meta West DRUGS": [763, 1480], + "Meta West DRUGS": [751, 1576], "Guaviare Govt": [907, 1615], "Guaviare AUC": [1091, 1603], "Guaviare Cartels": [972, 1724], "Guaviare FARC": [837, 1682], - "Guaviare DRUGS": [969, 1584], + "Guaviare DRUGS": [998, 1575], "Putumayo Govt": [552, 1798], "Putumayo AUC": [621, 1866], "Putumayo Cartels": [882, 1876], "Putumayo FARC": [749, 1886], - "Putumayo DRUGS": [638, 1715], + "Putumayo DRUGS": [622, 1704], "Cesar Govt": [805, 437], "Cesar AUC": [819, 584], "Cesar Cartels": [985, 338], @@ -98,10 +98,10 @@ const LAYOUT = { "Santander FARC": [716, 1180], "Santander DRUGS": [880, 1089], "Huila Govt": [618, 1318], - "Huila AUC": [504, 1498], - "Huila Cartels": [547, 1402], + "Huila AUC": [507, 1468], + "Huila Cartels": [550, 1387], "Huila FARC": [410, 1688], - "Huila DRUGS": [383, 1766], + "Huila DRUGS": [486, 1553], "Arauca Govt": [981, 1113], "Arauca AUC": [1217, 1036], "Arauca Cartels": [1196, 1118], @@ -667,11 +667,18 @@ function layout_dept_bases(list, xc, yc, s) { } } -function layout_city_bases(list, xc, yc) { - if (list.length > 0) - place_piece(list[0], xc - 21 + 25, yc - 20, 51) - if (list.length > 1) - place_piece(list[1], xc - 21 - 25, yc - 20, 52) +function layout_city_bases(list, xc, yc, s) { + if (data.spaces[s].pop > 1) { + if (list.length > 0) + place_piece(list[0], xc - 21 + 25, yc - 20, 51) + if (list.length > 1) + place_piece(list[1], xc - 21 - 25, yc - 20, 52) + } else { + if (list.length > 0) + place_piece(list[0], xc - 21 - 25, yc - 20, 51) + if (list.length > 1) + place_piece(list[1], xc - 21 + 25, yc - 20, 52) + } } function layout_available_bases(list, x0, y0, cols, rows, dx, dy) { @@ -1148,7 +1155,7 @@ function on_update() { filter_piece_list(bases, s, CARTELS, BASE) xy = get_layout_xy(s) layout_pieces(list, xy[0], xy[1], null, s) - layout_city_bases(bases, xy[0], xy[1] + get_layout_radius(s) - 12) + layout_city_bases(bases, xy[0], xy[1] + get_layout_radius(s) - 12, s) } else if (s <= last_dept) { list.length = bases.length = 0 filter_piece_list(list, s, FARC, GUERRILLA) diff --git a/tools/layout.svg b/tools/layout.svg index 7511850..7723856 100644 --- a/tools/layout.svg +++ b/tools/layout.svg @@ -40,21 +40,20 @@ inkscape:window-height="480" id="namedview330" showgrid="false" - inkscape:zoom="1.0464316" + inkscape:zoom="0.93445935" inkscape:cx="932.7326" - inkscape:cy="650.77941" + inkscape:cy="1036.0289" inkscape:current-layer="svg328" inkscape:document-rotation="0" /> <image sodipodi:absref="/home/tor/src/rally/public/andean-abyss/map75.jpg" xlink:href="../map75.jpg" - x="0" - y="0" width="1650" height="2550" image-rendering="pixelated" sodipodi:insensitive="true" - id="image2" /> + y="0" + x="0" /> <text x="-205.52834" y="113.16729" @@ -133,8 +132,8 @@ id="ellipse20" /> <ellipse inkscape:label="Choco Cartels" - cx="337.04401" - cy="1274.7484" + cx="364.86758" + cy="1271.538" rx="50" ry="40" fill="#32cd32" @@ -142,8 +141,8 @@ id="ellipse22" /> <ellipse inkscape:label="Choco FARC" - cx="395.81378" - cy="1185.5511" + cx="407.5853" + cy="1179.1302" rx="50" ry="40" fill="#ff0000" @@ -151,8 +150,8 @@ id="ellipse24" /> <rect inkscape:label="Choco DRUGS" - x="410.02856" - y="929.33215" + x="250.57806" + y="1156.2014" width="92" height="56" fill="#ffffff" @@ -255,8 +254,8 @@ id="ellipse48" /> <rect inkscape:label="Meta West DRUGS" - x="717.08447" - y="1452.4297" + x="705.31299" + y="1547.6719" width="92" height="56" fill="#ffffff" @@ -307,8 +306,8 @@ id="ellipse60" /> <rect inkscape:label="Guaviare DRUGS" - x="923.38812" - y="1556.0155" + x="952.2818" + y="1547.4545" width="92" height="56" fill="#ffffff" @@ -359,8 +358,8 @@ id="ellipse72" /> <rect inkscape:label="Putumayo DRUGS" - x="592.4621" - y="1687.1282" + x="576.41003" + y="1676.4268" width="92" height="56" fill="#ffffff" @@ -540,8 +539,8 @@ id="ellipse114" /> <ellipse inkscape:label="Huila AUC" - cx="504.02094" - cy="1497.7329" + cx="507.23135" + cy="1467.7692" rx="50" ry="40" fill="#ffff00" @@ -549,8 +548,8 @@ id="ellipse116" /> <ellipse inkscape:label="Huila Cartels" - cx="546.95453" - cy="1402.1168" + cx="550.16492" + cy="1387.1349" rx="50" ry="40" fill="#32cd32" @@ -567,8 +566,8 @@ id="ellipse120" /> <rect inkscape:label="Huila DRUGS" - x="337.48947" - y="1737.989" + x="440.22269" + y="1525.0316" width="92" height="56" fill="#ffffff" |
