Campaigns: wmlindent pass

[ci skip]
This commit is contained in:
Charles Dang 2020-03-08 21:51:45 +11:00
parent 1f17434ec0
commit daff648482
66 changed files with 807 additions and 861 deletions

View file

@ -389,7 +389,6 @@
[/message] [/message]
[/event] [/event]
# First area (two young ogres) # First area (two young ogres)
[event] [event]
name=last breath name=last breath

View file

@ -364,7 +364,6 @@
variable=orc_leader_store variable=orc_leader_store
[/store_unit] [/store_unit]
{CLEAR_VARIABLE orc_leader_store.status.poisoned} {CLEAR_VARIABLE orc_leader_store.status.poisoned}
[move_unit_fake] [move_unit_fake]

View file

@ -466,7 +466,6 @@
[show_objectives][/show_objectives] [show_objectives][/show_objectives]
[/event] [/event]
# In-scenario Events # In-scenario Events
[event] [event]

View file

@ -250,7 +250,6 @@
{STARTING_VILLAGES 1 3} {STARTING_VILLAGES 1 3}
{STARTING_VILLAGES 2 15} {STARTING_VILLAGES 2 15}
{PLACE_IMAGE scenery/whirlpool.png 38 23} {PLACE_IMAGE scenery/whirlpool.png 38 23}
# City # City

View file

@ -193,7 +193,6 @@
x,y=2,26 x,y=2,26
[/recall] [/recall]
[remove_trait] [remove_trait]
id=Darken Volk id=Darken Volk
trait_id="loyal" trait_id="loyal"

View file

@ -295,7 +295,6 @@
animate=no animate=no
[/harm_unit] [/harm_unit]
[delay] [delay]
time=400 time=400
[/delay] [/delay]
@ -314,7 +313,6 @@
animate=no animate=no
[/harm_unit] [/harm_unit]
[delay] [delay]
time=700 time=700
[/delay] [/delay]
@ -333,7 +331,6 @@
animate=no animate=no
[/harm_unit] [/harm_unit]
[delay] [delay]
time=1000 time=1000
[/delay] [/delay]
@ -741,7 +738,6 @@
[/objectives] [/objectives]
[/event] [/event]
#define RESET_RUNES #define RESET_RUNES
{REMOVE_IMAGE 13 6} {REMOVE_IMAGE 13 6}
{REMOVE_IMAGE 11 9} {REMOVE_IMAGE 11 9}
@ -3625,7 +3621,6 @@ And the tongue of fire begets ashen repose.</i>"
[/if] [/if]
#endif #endif
[message] [message]
speaker=Xanthric speaker=Xanthric
message= _ "<i><big>A few decrepit souls will do you no good, necromancer. Your bones shall soon join my garden of carcasses!</big></i>" message= _ "<i><big>A few decrepit souls will do you no good, necromancer. Your bones shall soon join my garden of carcasses!</big></i>"
@ -4003,7 +3998,6 @@ And the tongue of fire begets ashen repose.</i>"
[/message] [/message]
[/event] [/event]
# Victory # Victory
[event] [event]
name=last breath name=last breath

View file

@ -48,7 +48,6 @@
x=20,28 x=20,28
y= 4, 8 y= 4, 8
[/avoid] [/avoid]
[/ai] [/ai]
{FLAG_VARIANT undead} {FLAG_VARIANT undead}
[/side] [/side]

View file

@ -326,7 +326,6 @@
# #
# GL-2016JUL # GL-2016JUL
# For background references, see Delfador's Memoirs, scenario 8 ("Ur Thorodor"). # For background references, see Delfador's Memoirs, scenario 8 ("Ur Thorodor").
[event] [event]
@ -414,7 +413,6 @@
[/message] [/message]
[/then] [/then]
[else] [else]
[message] [message]
speaker=unit speaker=unit

View file

@ -734,7 +734,6 @@
[/and] [/and]
[/filter_condition] [/filter_condition]
[fire_event] [fire_event]
name=win event name=win event
[/fire_event] [/fire_event]

View file

@ -456,7 +456,6 @@
{GENERIC_UNIT 2 (Heavy Infantryman) 37 15} {GENERIC_UNIT 2 (Heavy Infantryman) 37 15}
{MOVE_UNIT x,y,side=37,15,2 33 15} {MOVE_UNIT x,y,side=37,15,2 33 15}
[gold] [gold]
side=2 side=2
#ifdef EASY #ifdef EASY

View file

@ -90,15 +90,7 @@
name= _ "Glildur" name= _ "Glildur"
side=3 side=3
canrecruit=yes canrecruit=yes
profile="portraits/elves/captain.png~CHAN( {SOF_GLILDUR_PORTRAIT}
if((blue < 100) and (red > green), red*0.6, red),
if(
(blue < 100) and (red < green), green*0.7,
(blue < 100) and (red < 100) and (red > green), green*0.7,
green
),
if((blue < 100) and (red < green), blue*1.5, blue)
)"
facing=sw facing=sw
[modifications] [modifications]
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
@ -213,7 +205,6 @@
[event] [event]
name=prestart name=prestart
[set_variable] [set_variable]
name=incominggold name=incominggold
value=5000 value=5000

View file

@ -352,6 +352,4 @@
{NEW_GOLD_CARRYOVER 40} {NEW_GOLD_CARRYOVER 40}
[/endlevel] [/endlevel]
[/event] [/event]
[/scenario] [/scenario]

View file

@ -562,7 +562,6 @@
replace_if_failed=yes replace_if_failed=yes
terrain=Uu^Br/ terrain=Uu^Br/
[/rule] [/rule]
[/terrain_mask] [/terrain_mask]
# one cart near the player, another cart randomly further out # one cart near the player, another cart randomly further out
@ -575,7 +574,6 @@
canrecruit=yes canrecruit=yes
[/filter] [/filter]
radius=7 radius=7
[/and] [/and]
variable=possible_cart1_locations variable=possible_cart1_locations
@ -642,7 +640,6 @@
carryover_percentage=40 carryover_percentage=40
[/gold_carryover] [/gold_carryover]
[/objectives] [/objectives]
[/event] [/event]
[event] [event]

View file

@ -72,15 +72,7 @@
side=3 side=3
persistent=yes persistent=yes
save_id=Glildur save_id=Glildur
profile="portraits/elves/captain.png~CHAN( {SOF_GLILDUR_PORTRAIT}
if((blue < 100) and (red > green), red*0.6, red),
if(
(blue < 100) and (red < green), green*0.7,
(blue < 100) and (red < 100) and (red > green), green*0.7,
green
),
if((blue < 100) and (red < green), blue*1.5, blue)
)"
facing=sw facing=sw
[modifications] [modifications]
{TRAIT_RESILIENT} {TRAIT_RESILIENT}
@ -419,7 +411,6 @@
[/message] [/message]
[/event] [/event]
[event] [event]
name=moveto name=moveto
[filter] [filter]

View file

@ -32,15 +32,7 @@
id=Glildur id=Glildur
name= _ "Glildur" name= _ "Glildur"
side=2 side=2
profile="portraits/elves/captain.png~CHAN( {SOF_GLILDUR_PORTRAIT}
if((blue < 100) and (red > green), red*0.6, red),
if(
(blue < 100) and (red < green), green*0.7,
(blue < 100) and (red < 100) and (red > green), green*0.7,
green
),
if((blue < 100) and (red < green), blue*1.5, blue)
)"
facing=sw facing=sw
[modifications] [modifications]
{TRAIT_RESILIENT} {TRAIT_RESILIENT}

View file

@ -287,7 +287,6 @@
[/unit] [/unit]
[/event] [/event]
[story] [story]
[part] [part]
story= _ "Rugnur and the dwarves fled down the cave path, deeper into the volcano, with the elves and mercenaries close behind. Unfortunately, they began to see litter and wall markings indicating they were plunging into the land of orcs and trolls." story= _ "Rugnur and the dwarves fled down the cave path, deeper into the volcano, with the elves and mercenaries close behind. Unfortunately, they began to see litter and wall markings indicating they were plunging into the land of orcs and trolls."
@ -1079,7 +1078,6 @@
message= _ "Right, if we can get both the orcs and the elves behind us, maybe they'll fight each other." message= _ "Right, if we can get both the orcs and the elves behind us, maybe they'll fight each other."
[/message] [/message]
[/event] [/event]
[/scenario] [/scenario]
#undef RANDOM_MERCENARY_2 #undef RANDOM_MERCENARY_2

View file

@ -30,6 +30,4 @@
[/specials] [/specials]
attack_weight=0.0 attack_weight=0.0
[/attack] [/attack]
[/unit_type] [/unit_type]

View file

@ -88,3 +88,17 @@
[/endlevel] [/endlevel]
[/event] [/event]
#enddef #enddef
# wmlindent: start ignoring
#define SOF_GLILDUR_PORTRAIT
profile="portraits/elves/captain.png~CHAN(
if((blue < 100) and (red > green), red*0.6, red),
if(
(blue < 100) and (red < green), green*0.7,
(blue < 100) and (red < 100) and (red > green), green*0.7,
green
),
if((blue < 100) and (red < green), blue*1.5, blue)
)"
#enddef
# wmlindent: stop ignoring

View file

@ -196,7 +196,6 @@
{WILDTHING 27 14} {WILDTHING 27 14}
[/event] [/event]
#ifdef EASY #ifdef EASY
# Compensate that you get less experience points on easy. # Compensate that you get less experience points on easy.
[event] [event]
@ -296,7 +295,6 @@
[event] [event]
name=victory name=victory
[/event] [/event]
{HERODEATH_AIGLONDUR} {HERODEATH_AIGLONDUR}

View file

@ -590,7 +590,6 @@
[/message] [/message]
[/event] [/event]
[event] [event]
name=last breath name=last breath
[filter] [filter]

View file

@ -312,7 +312,6 @@
message= _ "Aye. Karrag, calling his troops to battle. Only the Dark Gods know what hellspawn the lich will summon. AXES UP!" message= _ "Aye. Karrag, calling his troops to battle. Only the Dark Gods know what hellspawn the lich will summon. AXES UP!"
[/message] [/message]
{REPLACE_SCENARIO_MUSIC knalgan_theme.ogg} {REPLACE_SCENARIO_MUSIC knalgan_theme.ogg}
{APPEND_MUSIC siege_of_laurelmor.ogg} {APPEND_MUSIC siege_of_laurelmor.ogg}
{APPEND_MUSIC underground.ogg} {APPEND_MUSIC underground.ogg}

View file

@ -94,7 +94,6 @@
{campaigns/The_South_Guard/utils/sg_story.cfg} {campaigns/The_South_Guard/utils/sg_story.cfg}
{campaigns/The_South_Guard/utils/bigmap.cfg} {campaigns/The_South_Guard/utils/bigmap.cfg}
[units] [units]
{campaigns/The_South_Guard/units} {campaigns/The_South_Guard/units}
[/units] [/units]

View file

@ -701,8 +701,6 @@
[/message] [/message]
[/event] [/event]
# Victory - The bandits are defeated. # Victory - The bandits are defeated.
[event] [event]

View file

@ -422,7 +422,6 @@
[/have_unit] [/have_unit]
[/filter_condition] [/filter_condition]
{VARIABLE have_bodyguard yes} {VARIABLE have_bodyguard yes}
[message] [message]

View file

@ -603,7 +603,6 @@
[/message] [/message]
[/event] [/event]
# Confrontation with Mal Brin # Confrontation with Mal Brin
[event] [event]
name=sighted name=sighted
@ -854,7 +853,6 @@
[/message] [/message]
[/event] [/event]
[event] [event]
name=last breath name=last breath
[filter] [filter]

View file

@ -127,7 +127,6 @@
{VARIABLE secret_path.x 18} {VARIABLE secret_path.x 18}
{VARIABLE secret_path.y 35} {VARIABLE secret_path.y 35}
# the first undead will spawn on this turn+1 (i.e. turn {6 5 4}) # the first undead will spawn on this turn+1 (i.e. turn {6 5 4})
#ifdef EASY #ifdef EASY
{VARIABLE first_undead_spawn_turn 5} {VARIABLE first_undead_spawn_turn 5}

View file

@ -138,7 +138,6 @@
{NAMED_LOYAL_UNIT 1 (Heavy Infantryman) 11 11 (Rheban) (_"Rheban")} {NAMED_LOYAL_UNIT 1 (Heavy Infantryman) 11 11 (Rheban) (_"Rheban")}
{NAMED_LOYAL_UNIT 1 (Bowman) 10 10 (Jul) (_"Jul")} {NAMED_LOYAL_UNIT 1 (Bowman) 10 10 (Jul) (_"Jul")}
# Lt. Meris' Section # Lt. Meris' Section
{NAMED_LOYAL_UNIT 1 (Lieutenant) 21 10 (Meris) (_"Meris")} {NAMED_LOYAL_UNIT 1 (Lieutenant) 21 10 (Meris) (_"Meris")}
@ -190,7 +189,6 @@
{LOYAL_UNIT 2 (Blood Bat) 32 10} {LOYAL_UNIT 2 (Blood Bat) 32 10}
#endif #endif
{MODIFY_UNIT x,y=16-33,1-25 facing sw} {MODIFY_UNIT x,y=16-33,1-25 facing sw}
{CLEAR_VARIABLE stored_side_1} {CLEAR_VARIABLE stored_side_1}

View file

@ -79,7 +79,6 @@
{NAMED_GENERIC_UNIT 1 (Bowman) 19 12 () (_"Westin Guard")} {NAMED_GENERIC_UNIT 1 (Bowman) 19 12 () (_"Westin Guard")}
{NAMED_GENERIC_UNIT 1 (Lieutenant) 19 11 () (_"Westin Guard")} {NAMED_GENERIC_UNIT 1 (Lieutenant) 19 11 () (_"Westin Guard")}
#endif #endif
[/side] [/side]
{STARTING_VILLAGES 1 15} {STARTING_VILLAGES 1 15}

View file

@ -373,7 +373,6 @@
{STARTING_VILLAGES 2 5} {STARTING_VILLAGES 2 5}
{STARTING_VILLAGES 3 5} {STARTING_VILLAGES 3 5}
# Start # Start
[event] [event]
name=start name=start

View file

@ -46,7 +46,6 @@ Hd, Dd*, Dd^E*, Rd #enddef
[for] [for]
array=dehydrating_units array=dehydrating_units
[do] [do]
[if] [if]
[have_unit] [have_unit]
x,y=$dehydrating_units[$i].x,$dehydrating_units[$i].y x,y=$dehydrating_units[$i].x,$dehydrating_units[$i].y

View file

@ -578,7 +578,6 @@ If either Shaman advances to become a Druid, then shell be able to heal adjac
[/if] [/if]
[/event] [/event]
[event] [event]
name=turn 2 name=turn 2