Skip to content

Commit

Permalink
DiD: Fix issues found by the schema validator
Browse files Browse the repository at this point in the history 
With this, DiD is now clean of schema errors
  • Loading branch information
@CelticMinstrel
CelticMinstrel committed Oct 24, 2018
1 parent 1b10534 commit 5da4a6e
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 68 deletions.
14 changes: 7 additions & 7 deletions data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
View file
Expand Up @@ -62,9 +62,9 @@
facing=nw

# Starting units for Malin
{LOYAL_UNIT () (Spearman) 32 11}
{LOYAL_UNIT () (Bowman) 33 13}
{LOYAL_UNIT () (Spearman) 31 13}
{LOYAL_UNIT 1 (Spearman) 32 11}
{LOYAL_UNIT 1 (Bowman) 33 13}
{LOYAL_UNIT 1 (Spearman) 31 13}
[/side]
# wmllint: validate-on

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -292,7 +292,7 @@
[event]
name=die
[filter]
speaker=Drogan
id=Drogan
[/filter]

[message]
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
View file
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
View file
Expand Up @@ -94,9 +94,9 @@
facing=se

# Drogan has some guards at the river fort
{NAMED_LOYAL_UNIT () (Spearman) 32 11 () ( _ "River fort guard")}
{NAMED_LOYAL_UNIT () (Bowman) 33 13 () ( _ "River fort guard")}
{NAMED_LOYAL_UNIT () (Spearman) 31 13 () ( _ "River fort guard")}
{NAMED_LOYAL_UNIT 3 (Spearman) 32 11 () ( _ "River fort guard")}
{NAMED_LOYAL_UNIT 3 (Bowman) 33 13 () ( _ "River fort guard")}
{NAMED_LOYAL_UNIT 3 (Spearman) 31 13 () ( _ "River fort guard")}

[ai]
aggression=0.2
Expand Down
64 changes: 32 additions & 32 deletions data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
View file
Expand Up @@ -166,62 +166,62 @@
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]
passive_leader=yes
aggression=1.0
caution=0.4
grouping=offensive
[protect_area]
[protect_location]
# Manor entrance
x,y=7,8
radius=5
protect_radius=5
value=4
[/protect_area]
[/protect_location]

[protect_area]
[protect_location]
# Rest of city
x=3-22
y=6-22
radius=1
protect_radius=1
value=2
[/protect_area]
[/protect_location]

[goal]
name=protect_unit
Expand Down
19 changes: 9 additions & 10 deletions data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
View file
Expand Up @@ -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
Expand All @@ -72,7 +72,6 @@
hidden=yes
shroud=yes
share_maps=no
facing=nw

[ai]
village_value=0
Expand Down
1 change: 0 additions & 1 deletion data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
View file
Expand Up @@ -55,7 +55,6 @@
no_leader=yes

{FLAG_VARIANT undead}
facing=ne

[ai]
village_value=0.2
Expand Down
28 changes: 14 additions & 14 deletions data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
View file
Expand Up @@ -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
Expand Down

0 comments on commit 5da4a6e

Please sign in to comment.