Run wmlindent on data/campaigns

This commit is contained in:
Bär Halberkamp 2016-09-15 16:55:24 +02:00
parent 6cc92e2624
commit 1acd76e9fe
18 changed files with 145 additions and 149 deletions

View file

@ -409,11 +409,11 @@
amount=100
[/gold]
[modify_side]
side=2,3,4
[modify_side]
side=2,3,4
{INCOME 5 6 7}
[/modify_side]
{INCOME 5 6 7}
[/modify_side]
[if]
[have_unit]

View file

@ -195,7 +195,7 @@
[/not]
[filter_adjacent_location]
x,y=$prison_locations[$i].x,$prison_locations[$i].y
x,y=$prison_locations[$i].x,$prison_locations[$i].y
[/filter_adjacent_location]
include_borders=no
@ -210,7 +210,7 @@
max_moves=0
ai_special=guardian
role=prison guard
[variables]
[variables]
prison_x=$prison_locations[$i].x
prison_y=$prison_locations[$i].y
[/variables]

View file

@ -681,8 +681,8 @@
search_recall_list=no
type="Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
[/role]
[message]
role=ThankfulMerman
@ -753,9 +753,9 @@
search_recall_list=no
type="Elvish Sylph,Great Mage,"+
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider,Paladin,Grand Knight,Mage of Light,Arch Mage,Silver Mage,"+
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider,Knight,Lancer,White Mage,Red Mage,"+
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout,Horseman,Mage"
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider,Paladin,Grand Knight,Mage of Light,Arch Mage,Silver Mage,"+
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider,Knight,Lancer,White Mage,Red Mage,"+
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout,Horseman,Mage"
[/role]
[message]
role=Supporter

View file

@ -98,12 +98,12 @@
[auto_recall][/auto_recall]
type="Elvish Sylph,Great Mage," +
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider,Paladin,Grand Knight,Mage of Light,Arch Mage,Silver Mage," +
"Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider,Knight,Lancer,White Mage,Red Mage," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout,Horseman,Mage," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider,Paladin,Grand Knight,Mage of Light,Arch Mage,Silver Mage," +
"Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider,Knight,Lancer,White Mage,Red Mage," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout,Horseman,Mage," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
[else]
[unit]
side=1

View file

@ -167,38 +167,38 @@
{STORE_KALENZ}
#define ADVISOR
[role]
role=Advisor
[auto_recall][/auto_recall]
[role]
role=Advisor
[auto_recall][/auto_recall]
type="Elvish Sylph,Great Mage," +
type="Elvish Sylph,Great Mage," +
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider," +
"Paladin,Grand Knight," +
"Mage of Light,Arch Mage,Silver Mage," +
"Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Highwayman,Fugitive,Huntsman,Ranger," +
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider," +
"Paladin,Grand Knight," +
"Mage of Light,Arch Mage,Silver Mage," +
"Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Highwayman,Fugitive,Huntsman,Ranger," +
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider," +
"Knight,Lancer," +
"White Mage,Red Mage," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Bandit,Outlaw,Trapper," +
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider," +
"Knight,Lancer," +
"White Mage,Red Mage," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Bandit,Outlaw,Trapper," +
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout," +
"Horseman," +
"Mage," +
"Merman Fighter,Merman Hunter,Mermaid Initiate," +
"Thug,Footpad,Poacher"
[else]
[unit]
side=1
type=Elvish Fighter
role=Advisor
placement=leader
[/unit]
[/else]
[/role]
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout," +
"Horseman," +
"Mage," +
"Merman Fighter,Merman Hunter,Mermaid Initiate," +
"Thug,Footpad,Poacher"
[else]
[unit]
side=1
type=Elvish Fighter
role=Advisor
placement=leader
[/unit]
[/else]
[/role]
#enddef
{ADVISOR}
[/event]

View file

@ -152,26 +152,26 @@
type="Elvish Sylph,Great Mage," +
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider," +
"Paladin,Grand Knight," +
"Mage of Light,Arch Mage,Silver Mage," +
"Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Highwayman,Fugitive,Huntsman,Ranger," +
"Assassin," +
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider," +
"Paladin,Grand Knight," +
"Mage of Light,Arch Mage,Silver Mage," +
"Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Highwayman,Fugitive,Huntsman,Ranger," +
"Assassin," +
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider," +
"Knight,Lancer," +
"White Mage,Red Mage," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Bandit,Outlaw,Trapper," +
"Rogue," +
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider," +
"Knight,Lancer," +
"White Mage,Red Mage," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Bandit,Outlaw,Trapper," +
"Rogue," +
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout," +
"Horseman," +
"Mage," +
"Merman Fighter,Merman Hunter,Mermaid Initiate," +
"Thug,Footpad,Poacher," +
"Thief"
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout," +
"Horseman," +
"Mage," +
"Merman Fighter,Merman Hunter,Mermaid Initiate," +
"Thug,Footpad,Poacher," +
"Thief"
[else]
[unit]
side=1

View file

@ -308,8 +308,8 @@
[unstore_unit]
variable=this_item
[/unstore_unit]
[/do]
[/foreach]
[/do]
[/foreach]
{CLEAR_VARIABLE gryphon_store}
#
# Figure out where Konrad is standing

View file

@ -147,18 +147,18 @@
[auto_recall][/auto_recall]
type="Thief," +
"Poacher,Footpad,Thug," +
"Mage," +
"Horseman," +
"Rogue," +
"Trapper,Outlaw,Bandit," +
"Red Mage,White Mage," +
"Lancer,Knight," +
"Assassin," +
"Ranger,Huntsman,Fugitive,Highwayman," +
"Silver Mage,Arch Mage,Mage of Light," +
"Grand Knight,Paladin," +
"Great Mage"
"Poacher,Footpad,Thug," +
"Mage," +
"Horseman," +
"Rogue," +
"Trapper,Outlaw,Bandit," +
"Red Mage,White Mage," +
"Lancer,Knight," +
"Assassin," +
"Ranger,Huntsman,Fugitive,Highwayman," +
"Silver Mage,Arch Mage,Mage of Light," +
"Grand Knight,Paladin," +
"Great Mage"
[else]
[unit]
side=1

View file

@ -177,11 +177,11 @@
[auto_recall][/auto_recall]
type="Elvish Outrider," +
"Paladin,Grand Knight," +
"Elvish Rider," +
"Knight,Lancer," +
"Elvish Scout," +
"Horseman"
"Paladin,Grand Knight," +
"Elvish Rider," +
"Knight,Lancer," +
"Elvish Scout," +
"Horseman"
[else]
[unit]
side=1
@ -199,8 +199,8 @@
[auto_recall][/auto_recall]
type="Highwayman,Fugitive,Huntsman,Ranger," +
"Bandit,Outlaw,Trapper," +
"Thug,Footpad,Poacher"
"Bandit,Outlaw,Trapper," +
"Thug,Footpad,Poacher"
[/role]
[/event]
@ -662,22 +662,22 @@
[/message]
[role]
type="Thief," +
"Poacher,Footpad,Thug," +
"Horseman," +
"Elvish Scout,Elvish Archer,Elvish Fighter," +
"Fighter," +
"Rogue," +
"Trapper,Outlaw,Bandit," +
"Lancer,Knight," +
"Elvish Rider,Elvish Marksman,Elvish Ranger,Elvish Hero,Elvish Captain," +
"Elvish Lord," +
"Commander," +
"Assassin," +
"Ranger,Huntsman,Fugitive,Highwayman," +
"Grand Knight,Paladin," +
"Elvish Outrider,Elvish Sharpshooter,Elvish Avenger,Elvish Champion,Elvish Marshal," +
"Elvish High Lord," +
"Lord"
"Poacher,Footpad,Thug," +
"Horseman," +
"Elvish Scout,Elvish Archer,Elvish Fighter," +
"Fighter," +
"Rogue," +
"Trapper,Outlaw,Bandit," +
"Lancer,Knight," +
"Elvish Rider,Elvish Marksman,Elvish Ranger,Elvish Hero,Elvish Captain," +
"Elvish Lord," +
"Commander," +
"Assassin," +
"Ranger,Huntsman,Fugitive,Highwayman," +
"Grand Knight,Paladin," +
"Elvish Outrider,Elvish Sharpshooter,Elvish Avenger,Elvish Champion,Elvish Marshal," +
"Elvish High Lord," +
"Lord"
role=whiner
[/role]
[message]

View file

@ -412,7 +412,6 @@
[/modify_unit]
{CLEAR_VARIABLE stored_Lisar}
[/event]
#deaths.cfg only handles death of Li'sar is shes on side '1', so handle

View file

@ -198,8 +198,8 @@
[role]
role=merman-advisor
type="Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
reassign=no
[auto_recall][/auto_recall]
[else]
@ -871,8 +871,8 @@ Soooo... It is you who sent your subordinates to attack us. Now when weve des
reassign=no
search_recall_list=no
type="Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
[/role]
[message]
role=merman-advisor

View file

@ -826,17 +826,17 @@ fire: +10%"
#enddef
#define RESTORE_LISAR
[if]
[variable]
name=lisar_store.id
equals="Li'sar"
[/variable]
[then]
[unstore_unit]
variable=lisar_store
x,y=recall,recall
[/unstore_unit]
{CLEAR_VARIABLE lisar_store}
[/then]
[/if]
[if]
[variable]
name=lisar_store.id
equals="Li'sar"
[/variable]
[then]
[unstore_unit]
variable=lisar_store
x,y=recall,recall
[/unstore_unit]
{CLEAR_VARIABLE lisar_store}
[/then]
[/if]
#enddef

View file

@ -469,7 +469,6 @@ Chapter Three"
y=8-11
[/filter]
{RANDOM_PLACEMENT 32 9 1 (
type=Water Serpent
id=Sealurr

View file

@ -696,7 +696,6 @@
boolean_not_equals=yes
[/variable]
[then]
[message]
speaker=Ethiliel
message= _ "Come, my bodyguard! We must make haste to follow the trail and find Mebrin."

View file

@ -207,8 +207,8 @@
side=3
search_recall_list=no
type="Master Bowman,Royal Guard,Halberdier," +
"Longbowman,Swordsman,Pikeman,Javelineer," +
"Bowman,Spearman"
"Longbowman,Swordsman,Pikeman,Javelineer," +
"Bowman,Spearman"
[/role]
[/else]
[/role]

View file

@ -138,7 +138,7 @@ Will he heed the call? I do not know if he has kept the amulet; we have not spok
[/kill]
{NEED_BARAN (x,y=31,21
facing=se)}
facing=se)}
# The armed villagers, beware them
{NAMED_LOYAL_UNIT () Spearman 30 22 Alwyn (_ "Alwyn")} {FACING nw}
@ -287,8 +287,8 @@ Will he heed the call? I do not know if he has kept the amulet; we have not spok
[role]
type="Royal Guard,Halberdier,Master Bowman,Paladin,Grand Knight,Fugitive," +
"Swordsman,Pikeman,Javelineer,Longbowman,Knight,Lancer,Outlaw," +
"Spearman,Bowman,Horseman,Footpad"
"Swordsman,Pikeman,Javelineer,Longbowman,Knight,Lancer,Outlaw," +
"Spearman,Bowman,Horseman,Footpad"
role=Reporter
[not]
id=Arvith

View file

@ -614,6 +614,5 @@ Besides... I want my brother back."
{CLEAR_VARIABLE found_kidnappers}
{RESTORE_BARAN}
[/event]
[/scenario]

View file

@ -233,30 +233,30 @@ Yet for some reason I fear these brothers more. If Mordak were here it would be
{STORE_BARAN}
#define ANSWER WHICH
[if]
[variable]
[if]
[variable]
name="{WHICH}_password"
not_equals=1
[/variable]
[variable]
name="{WHICH}_password"
not_equals=2
[/variable]
[variable]
name="{WHICH}_password"
not_equals=3
[/variable]
[variable]
name="{WHICH}_password"
not_equals=4
[/variable]
[then]
[set_variable]
name="{WHICH}_password"
not_equals=1
[/variable]
[variable]
name="{WHICH}_password"
not_equals=2
[/variable]
[variable]
name="{WHICH}_password"
not_equals=3
[/variable]
[variable]
name="{WHICH}_password"
not_equals=4
[/variable]
[then]
[set_variable]
name="{WHICH}_password"
value=1
[/set_variable]
[/then]
[/if]
value=1
[/set_variable]
[/then]
[/if]
#enddef
{ANSWER first}