Fix town names.

2 files changed, 65 insertions, 62 deletions

diff --git a/data.js b/data.js
index 4f7b94a..2f5d596 100644
--- a/data.js
+++ b/data.js
@@ -29,142 +29,144 @@ data.map = {
 		[ 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1114, 1115, 1116, 1117, 1120 ],
 	],
 	names: {
-		1015: "Mortigny",
+
+		1015: "Montigny le Tilleul",
 		1018: "Couillet",
-		1021: "Boufoux",
+		1021: "Bouffioulx",
 		1024: "Presles",
 		1026: "Le Roux",
-		1100: "Estinnes-au-Mont",
+		1100: "Estinnes au Mont",
 		1117: "Marcinelle",
-		1118: "Montigny Sur Sambre",
-		1129: "Fosses la Ville",
-		1201: "Estinnes-au-Val",
+		1118: "Montigny sur Sambre",
+		1129: "Fosses",
+		1201: "Estinnes au Val",
 		1204: "Binche",
 		1209: "Anderlues",
-		1211: "Fontain l'Eveque",
+		1211: "Fontaine l'Évêque",
 		1215: "Marchienne au Pont",
 		1217: "Charleroi",
-		1221: "Chatellet",
+		1221: "Châtelet",
 		1239: "Dave",
 		1340: "Nanine",
 		1401: "Bray",
-		1407: "Mont St. Aldegonde",
+		1407: "Mont Ste Aldegonde",
 		1423: "Farcienne",
 		1433: "Floreffe",
-		1516: "Tuxiet",
-		1526: "Auvelius",
+		1516: "Jumet",
+		1526: "Auveloix",
 		1528: "Ham sur Sambre",
 		1534: "Malonne",
-		1601: "Steffy",
-		1603: "Triviéres",
-		1605: "Haine St. Pierre",
+		1601: "Strépy",
+		1603: "Trivières",
+		1605: "Haine St Pierre",
 		1623: "Lambusart",
 		1631: "Soye",
-		1716: "Gosselics",
-		1728: "Jemeppe sur Sombre", // -> Jemeppe-sur-Sambre
+		1716: "Gosselies",
+		1728: "Jemeppe",
 		1737: "Namur",
 		1800: "Thieu",
-		1810: "Chapelle Lez Herlaimont", // -> Chapelle-lez-Herlaimont
-		1821: "Wagnee",
-		1825: "Verlaine",
+		1810: "Chapelle lez Herlaimont",
+		1821: "Wangenies",
+		1825: "Velaine",
 		1830: "Spy",
-		1903: "Lognies",
-		1911: "Gouy",
+		1903: "Houdeng-Gœgnies",
+		1911: "Gouy lez Piéton",
 		1915: "Vieuville",
-		1916: "Thumeon",
+		1916: "Thuméon",
 		1919: "Heppignies",
 		1922: "Fleurus",
 		1928: "Onoz",
 		1932: "Temploux",
-		2001: "La Roeulx",
-		2027: "St. Martin",
+		2001: "Rœulx",
+		2027: "St Martin",
 		2035: "Rhisnes",
 		2119: "Mellet",
-		2122: "St. Amand",
+		2122: "St Amand",
 		2123: "Ligny",
-		2219: "Villers Peruin",
-		2222: "Wagnee",
+		2219: "Villers Perwin",
+		2222: "Wagnelée",
 		2223: "Bry",
-		2230: "Bossieres",
+		2230: "Bossière",
 		2308: "Seneffe",
-		2315: "Reves",
+		2315: "Rèves",
 		2317: "Frasnes",
 		2324: "Sombreffe",
-		2327: "Corroy Le Chateau", // -> Corroy-le-Château
-		2333: "St. Denis",
+		2327: "Corroy le Château",
+		2333: "St Denis",
 		2337: "Warisoulx",
-		2404: "Marche",
+		2404: "Marche lez Écaussines",
 		2500: "Naast",
 		2521: "Marbais",
 		2529: "Gembloux",
 		2537: "Dhuy",
-		2604: "Escaussinnes",
-		2609: "Aroue",
-		2618: "Quatre-Bras",
+		2604: "Écaussinnes",
+		2609: "Arquesnes",
+		2618: "Quatre Bras",
 		2623: "Tilly",
-		2721: "Villers la Ville",
 		2715: "Hautain le Val",
-		2723: "Melloreux",
-		2725: "Centinnes",
+		2721: "Villers la Ville",
+		2723: "Melioreux",
+		2725: "Gentinnes",
 		2730: "Sauvenière",
-		2733: "Grand-Leez",
+		2733: "Grand Leez",
 		2736: "Liernu",
 		2739: "Longchamps",
 		2827: "Courtil",
-		2829: "Brenage",
-		2840: "Eghezee",
+		2829: "Ernage",
+		2840: "Éghezée",
 		2911: "Nivelles",
-		2936: "Aische",
+		2936: "Aische en Refail",
 		3002: "Braine le Comte",
 		3013: "Beaulers",
 		3018: "Genappe",
 		3020: "Bousseval",
 		3031: "Sart lez Walhain",
-		3125: "Hevillers",
+		3125: "Hévillers",
 		3129: "Walhain",
 		3135: "Perwez",
 		3138: "Hottomont",
-		3204: "Bennlieres",
-		3206: "Vercinae",
-		3226: "Mont St. Guibert",
+		3204: "Hennuières",
+		3206: "Virginal",
+		3226: "Mont St Guibert",
 		3231: "Tourinnes",
 		3233: "Orbais",
-		3234: "Thorembais Sitron",
+		3234: "Thorembais St Trond",
 		3240: "Ramillies",
 		3313: "Lillois",
 		3327: "Corbaix",
-		3328: "Nils St. Mautin",
-		3402: "Rebeque",
+		3328: "Nil St Martin",
+		3402: "Rebecq",
 		3408: "Ittre",
-		3417: "Plancenoit",
+		3417: "Planchenoit",
 		3418: "Maransart",
-		3438: "Mont St. André",
-		3441: "Toulz",
+		3438: "Mont St André",
+		3441: "Foulz",
 		3512: "Ophain",
-		3514: "-",
+		3514: "Hougoumont",
 		3523: "Ottignies",
 		3528: "Corroy le Grand",
-		3614: "Braine l'Allead", // TYPO
+		3614: "Braine l'Alleud",
+		3616: "La Haye Sainte",
+		3617: "La Haye",
 		3631: "Chaumont",
-		3616: "-",
-		3617: "-",
 		3636: "Glimes",
 		3705: "Tubize",
-		3708: "Braine le Chateau",
-		3715: "Mont St. Jean",
+		3708: "Braine le Château",
+		3715: "Mont St Jean",
 		3718: "Ohain",
-		3719: "Chapelle St. Lambert",
-		3723: "Ismale",
+		3719: "Chapelle St Lambert",
+		3723: "Limal",
 		3803: "Saintes",
 		3828: "Dion le Mont",
 		3832: "Longueville",
 		3915: "Waterloo",
 		3919: "Genval",
 		3925: "Wavre",
-		3933: "Roux-Miroir",
+		3933: "Roux Miroir",
 		4006: "Halle",
 		4038: "Jodoigne",
-	}
+
+	},
 }
 
 data.pieces = [
diff --git a/rules.js b/rules.js
index 204575c..2620444 100644
--- a/rules.js
+++ b/rules.js
@@ -1892,6 +1892,7 @@ states.attack_who = {
 
 function begin_attack() {
 	game.count = 0
+	// TODO: move to just before rolling so we can see committed fresh cav!
 	for (let p of friendly_infantry_corps())
 		if (can_attack_infantry_support(p))
 			game.count |= (1 << p)