Sort vassals by service length.

2 files changed, 10 insertions, 10 deletions

diff --git a/tools/build_counters3.sh b/tools/build_counters3.sh
index a4681f2..cc7081f 100644
--- a/tools/build_counters3.sh
+++ b/tools/build_counters3.sh
@@ -1,5 +1,5 @@
 mkdir -p service300
 montage -mode concatenate -tile 1x counters300/lord_teutonic_andreas.a.png counters300/lord_teutonic_heinrich.a.png counters300/lord_teutonic_hermann.a.png counters300/lord_teutonic_knud_and_abel.a.png counters300/lord_teutonic_rudolf.a.png counters300/lord_teutonic_yaroslav.a.png service300/service_lords_teutonic.png
 montage -mode concatenate -tile 1x counters300/lord_russian_aleksandr.a.png counters300/lord_russian_andrey.a.png counters300/lord_russian_domash.a.png counters300/lord_russian_gavrilo.a.png counters300/lord_russian_karelians.a.png counters300/lord_russian_vladislav.a.png service300/service_lords_russian.png
-montage -mode concatenate -tile 3x counters300/vassal_teutonic_andreas_lettgallian_auxiliaries.a.png counters300/vassal_teutonic_andreas_summer_crusaders.a.png counters300/vassal_teutonic_andreas_teutonic_vassals.a.png counters300/vassal_teutonic_heinrich_heinrich_von_lode.a.png counters300/vassal_teutonic_heinrich_odward_von_lode.a.png counters300/vassal_teutonic_hermann_helmond_von_luneburg.a.png counters300/vassal_teutonic_hermann_johannes_von_dolen.a.png counters300/vassal_teutonic_hermann_ugaunian_auxiliaries.a.png counters300/vassal_teutonic_knud_and_abel_dietrich_von_kivel.a.png counters300/vassal_teutonic_knud_and_abel_estonian_auxiliaries.a.png counters300/vassal_teutonic_knud_and_abel_otto_von_luneburg.a.png counters300/vassal_teutonic_rudolf_ex_sword_brethren.a.png counters300/vassal_teutonic_rudolf_jerwen_teutonic_vassals.a.png counters300/vassal_teutonic_rudolf_summer_crusaders.a.png counters300/vassal_teutonic_yaroslav_mstislavich_partisans.a.png service300/service_vassals_teutonic.png
-montage -mode concatenate -tile 3x counters300/vassal_russian_aleksandr_mongols.a.png counters300/vassal_russian_aleksandr_pereyaslavl.a.png counters300/vassal_russian_aleksandr_rostov.a.png counters300/vassal_russian_aleksandr_yaroslavl.a.png counters300/vassal_russian_andrey_kipchaqs.a.png counters300/vassal_russian_andrey_suzdal.a.png counters300/vassal_russian_andrey_vladimir.a.png counters300/vassal_russian_domash_novgorod.a.png counters300/vassal_russian_gavrilo_borderland_russians.a.png counters300/vassal_russian_gavrilo_pskov_militia.a.png counters300/vassal_russian_gavrilo_pskov.a.png counters300/vassal_russian_vladislav_izhoran_auxiliaries.a.png counters300/vassal_russian_vladislav_ingrian_auxiliaries.a.png counters300/vassal_russian_vladislav_vepsian_auxiliaries.a.png counters300/vassal_russian_vladislav_vodian_auxiliaries.a.png service300/service_vassals_russian.png
+montage -mode concatenate -tile 3x counters300/vassal_teutonic_andreas_teutonic_vassals.a.png counters300/vassal_teutonic_andreas_lettgallian_auxiliaries.a.png counters300/vassal_teutonic_andreas_summer_crusaders.a.png counters300/vassal_teutonic_heinrich_heinrich_von_lode.a.png counters300/vassal_teutonic_heinrich_odward_von_lode.a.png counters300/vassal_teutonic_hermann_helmond_von_luneburg.a.png counters300/vassal_teutonic_hermann_johannes_von_dolen.a.png counters300/vassal_teutonic_hermann_ugaunian_auxiliaries.a.png counters300/vassal_teutonic_knud_and_abel_dietrich_von_kivel.a.png counters300/vassal_teutonic_knud_and_abel_otto_von_luneburg.a.png counters300/vassal_teutonic_knud_and_abel_estonian_auxiliaries.a.png counters300/vassal_teutonic_rudolf_ex_sword_brethren.a.png counters300/vassal_teutonic_rudolf_jerwen_teutonic_vassals.a.png counters300/vassal_teutonic_rudolf_summer_crusaders.a.png counters300/vassal_teutonic_yaroslav_mstislavich_partisans.a.png service300/service_vassals_teutonic.png
+montage -mode concatenate -tile 3x counters300/vassal_russian_aleksandr_pereyaslavl.a.png counters300/vassal_russian_aleksandr_rostov.a.png counters300/vassal_russian_aleksandr_yaroslavl.a.png counters300/vassal_russian_aleksandr_mongols.a.png counters300/vassal_russian_andrey_suzdal.a.png counters300/vassal_russian_andrey_vladimir.a.png counters300/vassal_russian_andrey_kipchaqs.a.png counters300/vassal_russian_domash_novgorod.a.png counters300/vassal_russian_gavrilo_pskov.a.png counters300/vassal_russian_gavrilo_pskov_militia.a.png counters300/vassal_russian_gavrilo_borderland_russians.a.png counters300/vassal_russian_vladislav_izhoran_auxiliaries.a.png counters300/vassal_russian_vladislav_ingrian_auxiliaries.a.png counters300/vassal_russian_vladislav_vepsian_auxiliaries.a.png counters300/vassal_russian_vladislav_vodian_auxiliaries.a.png service300/service_vassals_russian.png
diff --git a/tools/gendata.js b/tools/gendata.js
index ef29c5d..8cb238c 100644
--- a/tools/gendata.js
+++ b/tools/gendata.js
@@ -711,9 +711,9 @@ function vassal(lord, service, name, forces, capability) {
 	vassals.push({ lord: lord_id, name, service, forces, capability })
 }
 
+vassal("Andreas", 3, "Teutonic Vassals", { knights: 1, men_at_arms: 2 })
 vassal("Andreas", 1, "Lettgallian Auxiliaries", { light_horse: 1, militia: 1 })
 vassal("Andreas", 2, "Summer Crusaders", { knights: 3 }, "Crusade")
-vassal("Andreas", 3, "Teutonic Vassals", { knights: 1, men_at_arms: 2 })
 
 vassal("Heinrich", 2, "Heinrich von Lode", { knights: 1, men_at_arms: 1 })
 vassal("Heinrich", 2, "Odward von Lode", { knights: 1, men_at_arms: 1 })
@@ -723,8 +723,8 @@ vassal("Hermann", 2, "Johannes von Dolen", { knights: 1, men_at_arms: 1 })
 vassal("Hermann", 1, "Ugaunian Auxiliaries", { light_horse: 1, militia: 1 })
 
 vassal("Knud & Abel", 2, "Dietrich von Kivel", { knights: 1, men_at_arms: 1 })
-vassal("Knud & Abel", 1, "Estonian Auxiliaries", { light_horse: 1, militia: 1 })
 vassal("Knud & Abel", 2, "Otto von Lüneburg", { knights: 1, men_at_arms: 1 })
+vassal("Knud & Abel", 1, "Estonian Auxiliaries", { light_horse: 1, militia: 1 })
 
 vassal("Rudolf", 2, "Ex-Sword Brethren", { knights: 1, sergeants: 1 })
 vassal("Rudolf", 2, "Jerwen Teutonic Vassals", { knights: 1, men_at_arms: 1 })
@@ -732,24 +732,24 @@ vassal("Rudolf", 2, "Summer Crusaders", { knights: 2 }, "Crusade")
 
 vassal("Yaroslav", 1, "Mstislavich Partisans", { militia: 2 })
 
-vassal("Aleksandr", 3, "Mongols", { asiatic_horse: 2 }, "Steppe Warriors")
-vassal("Aleksandr", 3, "Mongols", { asiatic_horse: 2 }, "Steppe Warriors")
 vassal("Aleksandr", 4, "Pereyaslavl", { men_at_arms: 1 })
 vassal("Aleksandr", 3, "Rostov", { men_at_arms: 1 })
 vassal("Aleksandr", 3, "Yaroslavl", { men_at_arms: 1 })
+vassal("Aleksandr", 3, "Mongols", { asiatic_horse: 2 }, "Steppe Warriors")
+vassal("Aleksandr", 3, "Mongols", { asiatic_horse: 2 }, "Steppe Warriors")
 
-vassal("Andrey", 3, "Kipchaqs", { asiatic_horse: 3 }, "Steppe Warriors")
-vassal("Andrey", 3, "Kipchaqs", { asiatic_horse: 3 }, "Steppe Warriors")
 vassal("Andrey", 4, "Suzdal", { men_at_arms: 1 })
 vassal("Andrey", 4, "Vladimir", { men_at_arms: 1 })
+vassal("Andrey", 3, "Kipchaqs", { asiatic_horse: 3 }, "Steppe Warriors")
+vassal("Andrey", 3, "Kipchaqs", { asiatic_horse: 3 }, "Steppe Warriors")
 
 vassal("Domash", 2, "Novgorod", { militia: 2 })
 vassal("Domash", 2, "Novgorod", { militia: 2 })
 vassal("Domash", 2, "Novgorod", { militia: 2 })
 
-vassal("Gavrilo", 1, "Borderland Russians", { light_horse: 1, militia: 1 })
-vassal("Gavrilo", 2, "Pskov Militia", { militia: 2 })
 vassal("Gavrilo", 4, "Pskov", { men_at_arms: 1 })
+vassal("Gavrilo", 2, "Pskov Militia", { militia: 2 })
+vassal("Gavrilo", 1, "Borderland Russians", { light_horse: 1, militia: 1 })
 
 vassal("Vladislav", 1, "Izhoran Auxiliaries", { militia: 1 })
 vassal("Vladislav", 1, "Ingrian Auxiliaries", { militia: 1 })