More image renaming.

3 files changed, 23 insertions, 15 deletions

diff --git a/tools/gendata.js b/tools/gendata.js
index f0c9c31..555d6a7 100644
--- a/tools/gendata.js
+++ b/tools/gendata.js
@@ -7,6 +7,10 @@ const fs = require('fs')
 function cmpnum(a,b) { return a - b }
 function cmpnum2(a,b) { return a[0] - b[0] }
 
+function clean_name(name) {
+	return name.toLowerCase().replaceAll("&", "and").replaceAll(" ", "_")
+}
+
 // :r !python3 genboxes.py
 const boxes = {
 	"0": [60,1613,48,48],
@@ -1264,6 +1268,10 @@ function vassal(service, name, seat, influence, capability) {
 	vassals.push({service, name, seat, influence, capability })
 }
 
+lords.forEach(lord => {
+	lord.id = "lord_" + clean_name(lord.name)
+})
+
 vassal(1, "Norfolk", "Arundel", 0)
 vassal(1, "Stanley", "Derby", 0)
 vassal(3, "Fauconberg", "Dover", 2)
diff --git a/tools/markers2.sh b/tools/markers2.sh
index 6fcec7e..3d5ebc8 100644
--- a/tools/markers2.sh
+++ b/tools/markers2.sh
@@ -81,11 +81,11 @@ large2 38 vassal_essex
 large2 40 vassal_westmorld
 large2 47 vassal_worcester
 
-large2 6 marker_hastings
-large2 49 marker_trollope
-large2 50 marker_clifford
-large2 51 marker_edward
-large2 52 marker_stanley
+large2 6 vassal_hastings
+large2 49 vassal_trollope
+large2 50 vassal_clifford
+large2 51 vassal_edward
+large2 52 vassal_thomas_stanley
 
 large2 7 seat_lancaster_henry_vi
 large2 8 seat_lancaster_somerset
diff --git a/tools/markers3.sh b/tools/markers3.sh
index e0572b9..e470e87 100644
--- a/tools/markers3.sh
+++ b/tools/markers3.sh
@@ -46,11 +46,11 @@ single fled
 single hits_lancaster
 single hits_york
 single levy
-single marker_clifford
-single marker_edward
-single marker_hastings
-single marker_stanley
-single marker_trollope
+single vassal_clifford
+single vassal_edward
+single vassal_hastings
+single vassal_thomas_stanley
+single vassal_trollope
 single moved_fought
 single prov_x1
 single prov_x2
@@ -121,11 +121,11 @@ multi "#ffffff" 6x1 numbers_lancaster \
 
 exit
 
-single marker_clifford_b
-single marker_edward_b
-single marker_hastings_b
-single marker_stanley_b
-single marker_trollope_b
+single vassal_clifford_b
+single vassal_edward_b
+single vassal_hastings_b
+single vassal_thomas_stanley_b
+single vassal_trollope_b
 
 multi '#ffffff' 4x seats_york \
 	HIRES/output/seat_york_devon.png \