From f430f059f4df3e5519459681c2df1d88ff60d2b0 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Wed, 4 Apr 2018 23:39:41 -0400 Subject: [PATCH] DiD: Fix issues found by the schema validator With this, DiD is now clean of schema errors --- .../scenarios/01_Saving_Parthyn.cfg | 12 ++--- .../scenarios/03_A_Haunting_in_Winter.cfg | 2 +- .../scenarios/06_Return_to_Parthyn.cfg | 6 +-- .../scenarios/07_A_Small_Favor.cfg | 52 +++++++++---------- .../scenarios/09_A_Small_Favor3.cfg | 19 ++++--- .../scenarios/10_Alone_at_Last.cfg | 1 - .../scenarios/11_Descent_into_Darkness.cfg | 28 +++++----- 7 files changed, 59 insertions(+), 61 deletions(-) diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg index c6ebdd7e47a5..0ec3e4078da4 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg @@ -62,9 +62,9 @@ facing=nw # Starting units for Malin - {LOYAL_UNIT () (Spearman) 30 11} - {LOYAL_UNIT () (Bowman) 31 12} - {LOYAL_UNIT () (Spearman) 31 13} + {LOYAL_UNIT 1 (Spearman) 30 11} + {LOYAL_UNIT 1 (Bowman) 31 12} + {LOYAL_UNIT 1 (Spearman) 31 13} [/side] # wmllint: validate-on @@ -112,9 +112,9 @@ facing=ne # Starting units for Drogan - {LOYAL_UNIT () (Spearman) 5 17} - {LOYAL_UNIT () (Swordsman) 6 17} - {LOYAL_UNIT () (Spearman) 6 18} + {LOYAL_UNIT 3 (Spearman) 5 17} + {LOYAL_UNIT 3 (Swordsman) 6 17} + {LOYAL_UNIT 3 (Spearman) 6 18} [ai] village_value=0 diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg index 9b389d4521ee..e03ca99272b7 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg @@ -62,7 +62,7 @@ facing=nw # Dwarf watchman - {NAMED_LOYAL_UNIT () (Dwarvish Guardsman) 14 12 Watchman ( _ "Watchman")} + {NAMED_LOYAL_UNIT 2 (Dwarvish Guardsman) 14 12 Watchman ( _ "Watchman")} [ai] aggression=0.6 diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg index b05cfb16409d..c018ba9c0464 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg @@ -94,9 +94,9 @@ facing=se # Drogan has some guards at the river fort - {NAMED_LOYAL_UNIT () (Spearman) 30 11 () ( _ "River fort guard")} - {NAMED_LOYAL_UNIT () (Bowman) 31 12 () ( _ "River fort guard")} - {NAMED_LOYAL_UNIT () (Spearman) 31 13 () ( _ "River fort guard")} + {NAMED_LOYAL_UNIT 3 (Spearman) 30 11 () ( _ "River fort guard")} + {NAMED_LOYAL_UNIT 3 (Bowman) 31 12 () ( _ "River fort guard")} + {NAMED_LOYAL_UNIT 3 (Spearman) 31 13 () ( _ "River fort guard")} [ai] aggression=0.2 diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg index 507b8eab7326..87fc2bdaf60f 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg @@ -162,41 +162,41 @@ facing=se # Place city guards - {NAMED_LOYAL_UNIT () Spearman 11 3 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () Spearman 17 6 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () Spearman 23 9 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () Spearman 25 14 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () Spearman 13 23 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () Spearman 7 23 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () Spearman 4 18 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () Spearman 2 14 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () Spearman 16 28 () ( _ "Night Watchman")} {GUARDIAN} - - {NAMED_LOYAL_UNIT () Pikeman 20 22 () ( _ "Gate Guard")} {GUARDIAN} - {NAMED_LOYAL_UNIT () Pikeman 24 20 () ( _ "Gate Guard")} {GUARDIAN} - - {NAMED_LOYAL_UNIT () (Heavy Infantryman) 19 22 () ( _ "Gate Guard")} {GUARDIAN} - {NAMED_LOYAL_UNIT () (Heavy Infantryman) 24 19 () ( _ "Gate Guard")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 Spearman 11 3 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 Spearman 17 6 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 Spearman 23 9 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 Spearman 25 14 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 Spearman 13 23 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 Spearman 7 23 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 Spearman 4 18 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 Spearman 2 14 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 Spearman 16 28 () ( _ "Night Watchman")} {GUARDIAN} + + {NAMED_LOYAL_UNIT 2 Pikeman 20 22 () ( _ "Gate Guard")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 Pikeman 24 20 () ( _ "Gate Guard")} {GUARDIAN} + + {NAMED_LOYAL_UNIT 2 (Heavy Infantryman) 19 22 () ( _ "Gate Guard")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 (Heavy Infantryman) 24 19 () ( _ "Gate Guard")} {GUARDIAN} # More guards, depending on the difficulty #ifdef EASY - {NAMED_LOYAL_UNIT () Mage 7 9 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () Mage 8 7 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () Sergeant 21 15 () ( _ "Head Trainer")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 Mage 7 9 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 Mage 8 7 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 Sergeant 21 15 () ( _ "Head Trainer")} {GUARDIAN} #endif #ifdef NORMAL - {NAMED_LOYAL_UNIT () (Mage) 7 9 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () (Red Mage) 8 7 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () (Spearman) 12 7 () ( _ "Townperson")} {GUARDIAN} - {NAMED_LOYAL_UNIT () (Lieutenant) 21 15 () ( _ "Head Trainer")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 (Mage) 7 9 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 (Red Mage) 8 7 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 (Spearman) 12 7 () ( _ "Townperson")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 (Lieutenant) 21 15 () ( _ "Head Trainer")} {GUARDIAN} #endif #ifdef HARD - {NAMED_LOYAL_UNIT () (Silver Mage) 7 9 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () (Red Mage) 8 7 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () (Pikeman) 12 7 () ( _ "Night Watchman")} {GUARDIAN} - {NAMED_LOYAL_UNIT () (Lieutenant) 21 15 () ( _ "Head Trainer")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 (Silver Mage) 7 9 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 (Red Mage) 8 7 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 (Pikeman) 12 7 () ( _ "Night Watchman")} {GUARDIAN} + {NAMED_LOYAL_UNIT 2 (Lieutenant) 21 15 () ( _ "Head Trainer")} {GUARDIAN} #endif [ai] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg index 02e054508199..06c68eeb6dc4 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg @@ -45,17 +45,17 @@ hidden=yes # Mages in rooms - {NAMED_NOTRAIT_UNIT () Mage 16 15 () ( _ "Guardian")} {GUARDIAN} - {NAMED_NOTRAIT_UNIT () Mage 18 15 () ( _ "Guardian")} {GUARDIAN} - {NAMED_NOTRAIT_UNIT () Mage 22 13 () ( _ "Guardian")} {GUARDIAN} - {NAMED_NOTRAIT_UNIT () Mage 24 12 () ( _ "Guardian")} {GUARDIAN} - {NAMED_NOTRAIT_UNIT () Mage 27 10 () ( _ "Guardian")} {GUARDIAN} - {NAMED_NOTRAIT_UNIT () Mage 29 10 () ( _ "Guardian")} {GUARDIAN} + {NAMED_NOTRAIT_UNIT 2 Mage 16 15 () ( _ "Guardian")} {GUARDIAN} + {NAMED_NOTRAIT_UNIT 2 Mage 18 15 () ( _ "Guardian")} {GUARDIAN} + {NAMED_NOTRAIT_UNIT 2 Mage 22 13 () ( _ "Guardian")} {GUARDIAN} + {NAMED_NOTRAIT_UNIT 2 Mage 24 12 () ( _ "Guardian")} {GUARDIAN} + {NAMED_NOTRAIT_UNIT 2 Mage 27 10 () ( _ "Guardian")} {GUARDIAN} + {NAMED_NOTRAIT_UNIT 2 Mage 29 10 () ( _ "Guardian")} {GUARDIAN} # Mages in great hall - {NAMED_NOTRAIT_UNIT () (Silver Mage) 13 8 ("") ( _ "Guardian")} {GUARDIAN} - {NAMED_NOTRAIT_UNIT () (Red Mage) 14 9 ("") ( _ "Guardian")} {GUARDIAN} - {NAMED_NOTRAIT_UNIT () (White Mage) 16 8 ("") ( _ "Guardian")} {GUARDIAN} + {NAMED_NOTRAIT_UNIT 2 (Silver Mage) 13 8 ("") ( _ "Guardian")} {GUARDIAN} + {NAMED_NOTRAIT_UNIT 2 (Red Mage) 14 9 ("") ( _ "Guardian")} {GUARDIAN} + {NAMED_NOTRAIT_UNIT 2 (White Mage) 16 8 ("") ( _ "Guardian")} {GUARDIAN} [ai] village_value=0 @@ -72,7 +72,6 @@ hidden=yes shroud=yes share_maps=no - facing=nw [ai] village_value=0 diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg index 2f1158f16ac7..a0aa22d4b722 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg @@ -55,7 +55,6 @@ no_leader=yes {FLAG_VARIANT undead} - facing=ne [ai] village_value=0.2 diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg index 1d279fe8f8e3..4c5dbd57d09a 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg @@ -197,20 +197,20 @@ shroud=yes # Generic Monsters - {GENERIC_UNIT () (Giant Rat) 14 29} {GUARDIAN} - {GENERIC_UNIT () (Giant Rat) 21 28} {GUARDIAN} - {GENERIC_UNIT () (Giant Rat) 24 34} {GUARDIAN} - {GENERIC_UNIT () (Giant Rat) 18 18} {GUARDIAN} - {GENERIC_UNIT () (Giant Rat) 22 5} {GUARDIAN} - {GENERIC_UNIT () (Vampire Bat) 29 26} {GUARDIAN} - {GENERIC_UNIT () (Vampire Bat) 26 31} {GUARDIAN} - {GENERIC_UNIT () (Vampire Bat) 19 32} {GUARDIAN} - {GENERIC_UNIT () (Vampire Bat) 19 23} {GUARDIAN} - {GENERIC_UNIT () (Vampire Bat) 18 13} {GUARDIAN} - {GENERIC_UNIT () (Vampire Bat) 18 34} {GUARDIAN} - {GENERIC_UNIT () (Giant Spider) 7 12} {GUARDIAN} - {GENERIC_UNIT () (Giant Spider) 8 13} {GUARDIAN} - {GENERIC_UNIT () (Giant Spider) 6 15} {GUARDIAN} + {GENERIC_UNIT 5 (Giant Rat) 14 29} {GUARDIAN} + {GENERIC_UNIT 5 (Giant Rat) 21 28} {GUARDIAN} + {GENERIC_UNIT 5 (Giant Rat) 24 34} {GUARDIAN} + {GENERIC_UNIT 5 (Giant Rat) 18 18} {GUARDIAN} + {GENERIC_UNIT 5 (Giant Rat) 22 5} {GUARDIAN} + {GENERIC_UNIT 5 (Vampire Bat) 29 26} {GUARDIAN} + {GENERIC_UNIT 5 (Vampire Bat) 26 31} {GUARDIAN} + {GENERIC_UNIT 5 (Vampire Bat) 19 32} {GUARDIAN} + {GENERIC_UNIT 5 (Vampire Bat) 19 23} {GUARDIAN} + {GENERIC_UNIT 5 (Vampire Bat) 18 13} {GUARDIAN} + {GENERIC_UNIT 5 (Vampire Bat) 18 34} {GUARDIAN} + {GENERIC_UNIT 5 (Giant Spider) 7 12} {GUARDIAN} + {GENERIC_UNIT 5 (Giant Spider) 8 13} {GUARDIAN} + {GENERIC_UNIT 5 (Giant Spider) 6 15} {GUARDIAN} [/side] # The Wose