0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Campaigns: wmlindent pass

Browse source 
[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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Dead_Water/scenarios/03_Wolf_Coast.cfg
View file

@ -258,7 +258,7 @@
[/if] [/if]
[/event] [/event]
# This event makes the storm trident even more obvious # This event makes the storm trident even more obvious
[event] [event]
name=turn 3 name=turn 3

4
data/campaigns/Dead_Water/utils/specials.cfg
View file

@ -1,9 +1,9 @@
#textdomain wesnoth-dw #textdomain wesnoth-dw
#define NOTE_STUN #define NOTE_STUN
[special_note] [special_note]
note=_ "This unit is able to stun its enemies, disrupting their zones of control." note=_ "This unit is able to stun its enemies, disrupting their zones of control."
[/special_note] [/special_note]
#enddef #enddef
#define WEAPON_SPECIAL_STUN #define WEAPON_SPECIAL_STUN

6
data/campaigns/Delfadors_Memoirs/utils/characters.cfg
View file

@ -1,9 +1,9 @@
#textdomain wesnoth-dm #textdomain wesnoth-dm
#define OBJECT_LOYAL #define OBJECT_LOYAL
# There are several changes of leader to hero & vice versa during the campaign, # There are several changes of leader to hero & vice versa during the campaign,
# so this object is given to any that may have hero status at some point to ensure # so this object is given to any that may have hero status at some point to ensure
# the unit has no upkeep and to avoid taking up another trait slot # the unit has no upkeep and to avoid taking up another trait slot
[object] [object]
[effect] [effect]
apply_to=loyal apply_to=loyal

1
data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
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

1
data/campaigns/Descent_Into_Darkness/scenarios/05_Schism.cfg
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]

1
data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
View file

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

1
data/campaigns/Descent_Into_Darkness/scenarios/07a_A_Small_Favor.cfg
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

1
data/campaigns/Descent_Into_Darkness/scenarios/08_Alone_at_Last.cfg
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"

50
data/campaigns/Descent_Into_Darkness/scenarios/09_Descent_into_Darkness.cfg
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}
@ -757,7 +753,7 @@
{PLACE_IMAGE scenery/rune1.png 13 9} {PLACE_IMAGE scenery/rune1.png 13 9}
#enddef #enddef
# Ritual part 2 # Ritual part 2
[event] [event]
name=die name=die
@ -969,7 +965,7 @@
{MODIFY_UNIT (side=2) moves 0} {MODIFY_UNIT (side=2) moves 0}
[/event] [/event]
# Ritual part 3 # Ritual part 3
[event] [event]
name=die name=die
@ -1178,7 +1174,7 @@
[/random_placement] [/random_placement]
[/event] [/event]
# Malin gets to heal upon killing a unit # Malin gets to heal upon killing a unit
[event] [event]
name=die name=die
first_time_only=no first_time_only=no
@ -1215,7 +1211,7 @@
[/message] [/message]
[/event] [/event]
# Sighting the bosses # Sighting the bosses
[event] [event]
name=sighted name=sighted
[filter] [filter]
@ -1259,7 +1255,7 @@
[/message] [/message]
[/event] [/event]
# Ritual runes # Ritual runes
[event] [event]
name=moveto name=moveto
@ -1528,7 +1524,7 @@
[/message] [/message]
[/event] [/event]
# Ritual completion # Ritual completion
[event] [event]
name=last breath name=last breath
@ -1940,7 +1936,7 @@
[/objectives] [/objectives]
[/event] [/event]
# text at lair entrance # text at lair entrance
[event] [event]
name=moveto name=moveto
first_time_only=no first_time_only=no
@ -1977,7 +1973,7 @@
[/message] [/message]
[/event] [/event]
# monolith # monolith
[event] [event]
name=moveto name=moveto
[filter] [filter]
@ -2158,7 +2154,7 @@
[/remove_event] [/remove_event]
[/event] [/event]
# treasure boxes # treasure boxes
[event] [event]
name=moveto name=moveto
[filter] [filter]
@ -2283,10 +2279,10 @@
[/gold] [/gold]
[/event] [/event]
# potion puzzle # potion puzzle
# Solution: Pick up the brazier and melt the ice, creating water # Solution: Pick up the brazier and melt the ice, creating water
# pick up the empty flask and move to the water, then pick up the filled flask # pick up the empty flask and move to the water, then pick up the filled flask
# go to the altar, which puts the filled flask there and creates a potion # go to the altar, which puts the filled flask there and creates a potion
[event] [event]
name=moveto name=moveto
@ -2608,10 +2604,10 @@ Into pitch black shadow.</i>"
[/message] [/message]
[/event] [/event]
# coffin puzzle # coffin puzzle
# Solution: pick up the key, move to the coffin to open it # Solution: pick up the key, move to the coffin to open it
# then, pick up the bones, put them in the coffin # then, pick up the bones, put them in the coffin
# finally, pick up the brazier and cremate the bones # finally, pick up the brazier and cremate the bones
[event] [event]
name=moveto name=moveto
@ -2906,7 +2902,7 @@ And the tongue of fire begets ashen repose.</i>"
[/message] [/message]
[/event] [/event]
# reflection pool scene # reflection pool scene
[event] [event]
name=moveto name=moveto
[filter] [filter]
@ -3245,7 +3241,7 @@ And the tongue of fire begets ashen repose.</i>"
[unlock_view][/unlock_view] [unlock_view][/unlock_view]
[/event] [/event]
# Sighting the enemy lair # Sighting the enemy lair
[event] [event]
name=moveto name=moveto
[filter] [filter]
@ -3292,7 +3288,7 @@ And the tongue of fire begets ashen repose.</i>"
[cancel_action][/cancel_action] [cancel_action][/cancel_action]
[/event] [/event]
# Initiate boss battle # Initiate boss battle
[event] [event]
name=enter hex name=enter hex
[filter] [filter]
@ -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>"
@ -3667,7 +3662,7 @@ And the tongue of fire begets ashen repose.</i>"
[cancel_action][/cancel_action] [cancel_action][/cancel_action]
[/event] [/event]
# flavor text if you capture the dragon's keep # flavor text if you capture the dragon's keep
[event] [event]
name=moveto name=moveto
[filter] [filter]
@ -3692,7 +3687,7 @@ And the tongue of fire begets ashen repose.</i>"
[/message] [/message]
[/event] [/event]
# spawns # spawns
[event] [event]
name=new turn name=new turn
first_time_only=no first_time_only=no
@ -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

1
data/campaigns/Eastern_Invasion/scenarios/17a_The_Duel.cfg
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]

2
data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg
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

4
data/campaigns/Heir_To_The_Throne/utils/abilities.cfg
View file

@ -17,7 +17,7 @@
#enddef #enddef
#define NOTE_INITIATIVE #define NOTE_INITIATIVE
[special_note] [special_note]
note=_"This unit’s grasp of melee tactics allows adjacent allies to strike the first blow even when defending." note=_"This unit’s grasp of melee tactics allows adjacent allies to strike the first blow even when defending."
[/special_note] [/special_note]
#enddef #enddef

4
data/campaigns/Heir_To_The_Throne/utils/intro.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth-httt #textdomain wesnoth-httt
#define HTTT_INTRO #define HTTT_INTRO
[story] [story]
[part] [part]
music=revelation.ogg music=revelation.ogg
story= _ "In the twenty-eighth year of the reign of Garard II, king of Wesnoth, the kingdom was plunged into a bitter war with the Orcs of the North." story= _ "In the twenty-eighth year of the reign of Garard II, king of Wesnoth, the kingdom was plunged into a bitter war with the Orcs of the North."
@ -52,5 +52,5 @@
story= _ "Fleeing to the Aethenwood beyond the south-western border of Wesnoth, Delfador raised the child Konrad under the protection of the Elves, watching sadly as Asheviere’s reign of terror over the land began..." story= _ "Fleeing to the Aethenwood beyond the south-western border of Wesnoth, Delfador raised the child Konrad under the protection of the Elves, watching sadly as Asheviere’s reign of terror over the land began..."
background=story/httt_story8.jpg background=story/httt_story8.jpg
[/part] [/part]
[/story] [/story]
#enddef #enddef

1
data/campaigns/Liberty/scenarios/06_The_Hunters.cfg
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]

1
data/campaigns/Liberty/scenarios/07_Glory.cfg
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

13
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
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
@ -239,7 +230,7 @@
{VARIABLE_CONDITIONAL havestone boolean_not_equals yes} {VARIABLE_CONDITIONAL havestone boolean_not_equals yes}
[/show_if] [/show_if]
[/objective] [/objective]
# {ALTERNATIVE_OBJECTIVE_BONUS ( _ "Defeat Glildur")} # {ALTERNATIVE_OBJECTIVE_BONUS ( _ "Defeat Glildur")}
[objective] [objective]
description= _ "Death of Rugnur" description= _ "Death of Rugnur"
condition=lose condition=lose

20
data/campaigns/Sceptre_of_Fire/scenarios/2p5_Reaching_the_Runecrafter.cfg
View file

@ -37,10 +37,10 @@
team_name=orcs team_name=orcs
user_team_name= _ "Orcs" user_team_name= _ "Orcs"
{FLAG_VARIANT ragged} {FLAG_VARIANT ragged}
# [ai] # [ai]
# aggression=1.0 # aggression=1.0
# caution=0.0 # caution=0.0
# [/ai] # [/ai]
[/side] [/side]
[side] [side]
@ -55,10 +55,10 @@
team_name=orcs team_name=orcs
user_team_name= _ "Goblins" user_team_name= _ "Goblins"
{FLAG_VARIANT ragged} {FLAG_VARIANT ragged}
# [ai] # [ai]
# aggression=1.0 # aggression=1.0
# caution=0.0 # caution=0.0
# [/ai] # [/ai]
[/side] [/side]
[story] [story]
@ -70,7 +70,7 @@
[/part] [/part]
[/story] [/story]
# {SOF_TRACK {JOURNEY_02_NEW} } # {SOF_TRACK {JOURNEY_02_NEW} }
{SOF_DEATHS} {SOF_DEATHS}
@ -352,6 +352,4 @@
{NEW_GOLD_CARRYOVER 40} {NEW_GOLD_CARRYOVER 40}
[/endlevel] [/endlevel]
[/event] [/event]
[/scenario] [/scenario]

3
data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
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]

27
data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
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}
@ -235,7 +227,7 @@
name= _ "Durstorn" name= _ "Durstorn"
unrenamable=yes unrenamable=yes
side=1 side=1
# profile=portraits/durstorn-insane.png # profile=portraits/durstorn-insane.png
profile=portraits/durstorn.png profile=portraits/durstorn.png
random_traits=no random_traits=no
[modifications] [modifications]
@ -377,13 +369,13 @@
speaker=Thursagan speaker=Thursagan
message= {WHISPER _"Are you mad?!"} message= {WHISPER _"Are you mad?!"}
[/message] [/message]
# this is causing errors, so doing it the hard way for now but this could be fixed # this is causing errors, so doing it the hard way for now but this could be fixed
# [modify_unit] # [modify_unit]
# [filter] # [filter]
# id=Durstorn # id=Durstorn
# [/filter] # [/filter]
# profile=portraits/durstorn-insane.png # profile=portraits/durstorn-insane.png
# [/modify_unit] # [/modify_unit]
[message] [message]
speaker=Durstorn speaker=Durstorn
message= _ "Of course not!" message= _ "Of course not!"
@ -419,7 +411,6 @@
[/message] [/message]
[/event] [/event]
[event] [event]
name=moveto name=moveto
[filter] [filter]

10
data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
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}

8
data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
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."
@ -743,8 +742,8 @@
[recall] [recall]
side=1 side=1
[/recall] [/recall]
# original version of this scenario recalled everyone at the start, but that makes this a slog. # original version of this scenario recalled everyone at the start, but that makes this a slog.
# instead, recall cost is now just 1, and there are lots of little keeps scattered on the map. # instead, recall cost is now just 1, and there are lots of little keeps scattered on the map.
#ifdef __UNUSED__ #ifdef __UNUSED__
[store_unit] [store_unit]
[filter] [filter]
@ -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

2
data/campaigns/Sceptre_of_Fire/units/Caravan.cfg
View file

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

50
data/campaigns/Sceptre_of_Fire/utils/cart-utils.cfg
View file

@ -8,7 +8,7 @@
#define SOF_MINECART_PLACE_IMAGE X Y #define SOF_MINECART_PLACE_IMAGE X Y
[if] [if]
[have_location] [have_location]
terrain=*^Br/ terrain=*^Br/
x,y={X},{Y} x,y={X},{Y}
@ -41,12 +41,12 @@
x,y={X},{Y} x,y={X},{Y}
[/item] [/item]
[/else] [/else]
[/if] [/if]
#enddef #enddef
#define SOF_OBJ_MINECART VAR #define SOF_OBJ_MINECART VAR
[object] [object]
silent=yes silent=yes
id=sof_mine_cart_{VAR} id=sof_mine_cart_{VAR}
take_only_once=no take_only_once=no
@ -191,22 +191,22 @@
x,y=${VAR}.x|,${VAR}.y| x,y=${VAR}.x|,${VAR}.y|
[/remove_item] [/remove_item]
[/then] [/then]
[/object] [/object]
#enddef #enddef
#define SOF_REMOVE_OBJ_MINECART VAR #define SOF_REMOVE_OBJ_MINECART VAR
[remove_object] [remove_object]
id=${VAR}.id id=${VAR}.id
object_id=sof_mine_cart_{VAR} object_id=sof_mine_cart_{VAR}
[/remove_object] [/remove_object]
#enddef #enddef
#define SOF_MINECART_MENU VAR X Y #define SOF_MINECART_MENU VAR X Y
{SOF_MINECART_PLACE_IMAGE {X} {Y}} {SOF_MINECART_PLACE_IMAGE {X} {Y}}
[set_variables] [set_variables]
name={VAR} name={VAR}
mode=replace mode=replace
[value] [value]
@ -214,9 +214,9 @@
x={X} x={X}
y={Y} y={Y}
[/value] [/value]
[/set_variables] [/set_variables]
[set_menu_item] [set_menu_item]
id=sof_minecart_boarding_{VAR} id=sof_minecart_boarding_{VAR}
description= _ "Board Cart" description= _ "Board Cart"
image=buttons/WML-custom.png image=buttons/WML-custom.png
@ -288,8 +288,8 @@
side=1 side=1
[/redraw] [/redraw]
[/command] [/command]
[/set_menu_item] [/set_menu_item]
[set_menu_item] [set_menu_item]
id=sof_minecart_unboarding_{VAR} id=sof_minecart_unboarding_{VAR}
description= _ "Leave Cart" description= _ "Leave Cart"
image=buttons/WML-custom.png image=buttons/WML-custom.png
@ -343,10 +343,10 @@
{SOF_MINECART_PLACE_IMAGE $x1 $y1} {SOF_MINECART_PLACE_IMAGE $x1 $y1}
{CLEAR_VARIABLE passenger_{VAR}} {CLEAR_VARIABLE passenger_{VAR}}
[/command] [/command]
[/set_menu_item] [/set_menu_item]
# if a cart-rider attacks, they exit the cart # if a cart-rider attacks, they exit the cart
[event] [event]
name=attack name=attack
first_time_only=no first_time_only=no
[filter_condition] [filter_condition]
@ -370,10 +370,10 @@
{SOF_REMOVE_OBJ_MINECART passenger_{VAR}} {SOF_REMOVE_OBJ_MINECART passenger_{VAR}}
{SOF_MINECART_PLACE_IMAGE $x1 $y1} {SOF_MINECART_PLACE_IMAGE $x1 $y1}
{CLEAR_VARIABLE passenger_{VAR}} {CLEAR_VARIABLE passenger_{VAR}}
[/event] [/event]
# if a cart-rider is attacked, they exit the cart # if a cart-rider is attacked, they exit the cart
[event] [event]
name=attack name=attack
first_time_only=no first_time_only=no
[filter_condition] [filter_condition]
@ -397,20 +397,20 @@
{SOF_REMOVE_OBJ_MINECART passenger_{VAR}} {SOF_REMOVE_OBJ_MINECART passenger_{VAR}}
{SOF_MINECART_PLACE_IMAGE $x2 $y2} {SOF_MINECART_PLACE_IMAGE $x2 $y2}
{CLEAR_VARIABLE passenger_{VAR}} {CLEAR_VARIABLE passenger_{VAR}}
[/event] [/event]
# part of mechanism that prevents infinite movement by reboarding the cart # part of mechanism that prevents infinite movement by reboarding the cart
[event] [event]
name=side 1 turn name=side 1 turn
first_time_only=no first_time_only=no
{CLEAR_VARIABLE passenger_moves} {CLEAR_VARIABLE passenger_moves}
[/event] [/event]
# variables cleanup # variables cleanup
[event] [event]
name=scenario_end name=scenario_end
{SOF_REMOVE_OBJ_MINECART passenger_{VAR}} {SOF_REMOVE_OBJ_MINECART passenger_{VAR}}
{CLEAR_VARIABLE passenger_{VAR}} {CLEAR_VARIABLE passenger_{VAR}}
[/event] [/event]
#enddef #enddef

14
data/campaigns/Sceptre_of_Fire/utils/utils.cfg
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

6
data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
View file

@ -222,7 +222,7 @@ I decided to hide in the cemetery. That way I could try my experiment to animate
[/modifications] [/modifications]
[/unit] [/unit]
#enddef #enddef
# wmllint: whofield PLACE_GUARD 6 # wmllint: whofield PLACE_GUARD 6
# *************************** PRESTART *************************** # *************************** PRESTART ***************************
[event] [event]
@ -620,7 +620,7 @@ of Healing"
name=location name=location
[/clear_variable] [/clear_variable]
#enddef #enddef
# wmllint: whofield MOVE_AND_PLACE_GUARD 3 # wmllint: whofield MOVE_AND_PLACE_GUARD 3
[event] [event]
name=guards_emerge name=guards_emerge
@ -936,7 +936,7 @@ Well, I might as well do my experiment and worry about leaving later."
{MAKE_BATS_NORMAL} {MAKE_BATS_NORMAL}
{ZOMBIES} {ZOMBIES}
# wmllint: whofield clear PLACE_GUARD MOVE_AND_PLACE_GUARD # wmllint: whofield clear PLACE_GUARD MOVE_AND_PLACE_GUARD
#undef PLACE_GUARD #undef PLACE_GUARD
#undef MOVE_AND_PLACE_GUARD #undef MOVE_AND_PLACE_GUARD
#undef SET_MENU_ITEM_FOR #undef SET_MENU_ITEM_FOR

16
data/campaigns/Secrets_of_the_Ancients/utils/zombie-utils.cfg
View file

@ -137,14 +137,14 @@
# concatenation of a boolean, presumably because the strings are all either # concatenation of a boolean, presumably because the strings are all either
# "yes" or "no". If that changes, this code can be uncommented, and the code # "yes" or "no". If that changes, this code can be uncommented, and the code
# above removed. # above removed.
# [set_variable] # [set_variable]
# name=ardonna_zombies # name=ardonna_zombies
# [join] # [join]
# variable=zombies # variable=zombies
# key=allow_recruit # key=allow_recruit
# separator="," # separator=","
# [/join] # [/join]
# [/set_variable] # [/set_variable]
#enddef #enddef
#define LOAD_ZOMBIE_LIST VARIABLE #define LOAD_ZOMBIE_LIST VARIABLE

6
data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
View file

@ -198,8 +198,8 @@
#enddef #enddef
#define ENABLE_AI_COMMAND_CA_TRANSPORT_S6 #define ENABLE_AI_COMMAND_CA_TRANSPORT_S6
[lua] [lua]
code = << code = <<
local helper = wesnoth.require "helper" local helper = wesnoth.require "helper"
function wesnoth.custom_synced_commands.ship_unload(cfg) function wesnoth.custom_synced_commands.ship_unload(cfg)
@ -223,5 +223,5 @@ function wesnoth.custom_synced_commands.ship_unload(cfg)
end end
>> >>
[/lua] [/lua]
#enddef #enddef

2
data/campaigns/The_Hammer_of_Thursagan/scenarios/04_High_Pass.cfg
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}

5
data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Fear.cfg
View file

@ -380,7 +380,7 @@
[/objectives] [/objectives]
[/event] [/event]
# wmllint: unbalanced-on # wmllint: unbalanced-on
#define PLACE_ENEMY_UNITS #define PLACE_ENEMY_UNITS
[lua] [lua]
code = << code = <<
@ -414,7 +414,7 @@
name=orc dialogue name=orc dialogue
[/fire_event] [/fire_event]
#enddef #enddef
# wmllint: unbalanced-off # wmllint: unbalanced-off
[event] [event]
name=orc dialogue name=orc dialogue
@ -590,7 +590,6 @@
[/message] [/message]
[/event] [/event]
[event] [event]
name=last breath name=last breath
[filter] [filter]

1
data/campaigns/The_Hammer_of_Thursagan/scenarios/09_The_Underlevels.cfg
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}

4
data/campaigns/The_Hammer_of_Thursagan/utils/abilities.cfg
View file

@ -1,9 +1,9 @@
#textdomain wesnoth-thot #textdomain wesnoth-thot
#define NOTE_INSPIRE #define NOTE_INSPIRE
[special_note] [special_note]
note=_"The presence of this unit inspires own units next to it to deal more damage in combat, though this only applies to units of lower or equal level." note=_"The presence of this unit inspires own units next to it to deal more damage in combat, though this only applies to units of lower or equal level."
[/special_note] [/special_note]
#enddef #enddef
#define ABILITY_INSPIRE #define ABILITY_INSPIRE

4
data/campaigns/The_Rise_Of_Wesnoth/utils/trow-abilities.cfg
View file

@ -13,7 +13,7 @@
#enddef #enddef
#define NOTE_DISTRACT #define NOTE_DISTRACT
[special_note] [special_note]
note=_"This unit is capable of distracting opponents, allowing allied units to trespass their Zones of Control and move unhindered around them." note=_"This unit is capable of distracting opponents, allowing allied units to trespass their Zones of Control and move unhindered around them."
[/special_note] [/special_note]
#enddef #enddef

1
data/campaigns/The_South_Guard/_main.cfg
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]

2
data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
View file

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

1
data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
View file

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

2
data/campaigns/The_South_Guard/scenarios/06a_Into_the_Depths.cfg
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]

1
data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
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}

2
data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg
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}

1
data/campaigns/The_South_Guard/scenarios/08a_Vengeance.cfg
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}

1
data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
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

14
data/campaigns/The_South_Guard/utils/sg_utils.cfg
View file

@ -7,24 +7,24 @@
# Text for storytelling (by narrator and [story]) is shown in a different color # Text for storytelling (by narrator and [story]) is shown in a different color
#define NARRATOR_COLOR #define NARRATOR_COLOR
<<#BAAC7D>> #enddef <<#BAAC7D>> #enddef
# Explanation of the game mechanics and strategic information uses this instead # Explanation of the game mechanics and strategic information uses this instead
#define TUTOR_COLOR #define TUTOR_COLOR
<<#D563D7>> #enddef <<#D563D7>> #enddef
# macro for usage in [message] tags # macro for usage in [message] tags
#define NARRATOR: MESSAGE #define NARRATOR: MESSAGE
message=<span color='{NARRATOR_COLOR}'> + {MESSAGE} + </span> # wmllint: ignore message=<span color='{NARRATOR_COLOR}'> + {MESSAGE} + </span> # wmllint: ignore
#enddef #enddef
# macro for usage in [part] tags # macro for usage in [part] tags
#define STORY: MESSAGE #define STORY: MESSAGE
story=<span color='{NARRATOR_COLOR}'> + {MESSAGE} + </span> # wmllint: ignore story=<span color='{NARRATOR_COLOR}'> + {MESSAGE} + </span> # wmllint: ignore
#enddef #enddef
# macro for usage in [message] tags # macro for usage in [message] tags
# often combined with an image of the explained object # often combined with an image of the explained object
#define TUTOR: MESSAGE #define TUTOR: MESSAGE
message=<span color='{TUTOR_COLOR}'> + {MESSAGE} + </span> # wmllint: ignore message=<span color='{TUTOR_COLOR}'> + {MESSAGE} + </span> # wmllint: ignore
#enddef #enddef

4
data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
View file

@ -478,7 +478,7 @@
{CLEAR_VARIABLE tents} {CLEAR_VARIABLE tents}
{CLEAR_VARIABLE rally_chance} {CLEAR_VARIABLE rally_chance}
# depending on what units rally, and where, player can lose a village to the north champion purely to RNG, this scout can block that without being too wonderful otherwise # depending on what units rally, and where, player can lose a village to the north champion purely to RNG, this scout can block that without being too wonderful otherwise
#ifndef HARD #ifndef HARD
[recall] [recall]
type=Quenoth Scout type=Quenoth Scout
@ -1223,7 +1223,7 @@
[/event] [/event]
#define BOOL_CHECK VARIABLE VALUE #define BOOL_CHECK VARIABLE VALUE
{VARIABLE_CONDITIONAL {VARIABLE} boolean_equals {VALUE}} {VARIABLE_CONDITIONAL {VARIABLE} boolean_equals {VALUE}}
#enddef #enddef
# Turn 12 # Turn 12

4
data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
View file

@ -1,8 +1,8 @@
#textdomain wesnoth-utbs #textdomain wesnoth-utbs
#define UNDEAD_TROLL_DESCRIPTION #define UNDEAD_TROLL_DESCRIPTION
_ "These undead trolls fight again in death as they did in life, except this time they smell much worse." _ "These undead trolls fight again in death as they did in life, except this time they smell much worse."
{NOTE_PLAGUE} {NOTE_PLAGUE}
#enddef #enddef
[scenario] [scenario]

32
data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg
View file

@ -62,21 +62,21 @@ A poisoned unit cannot be cured of its poison by a healer, and must seek the car
#textdomain wesnoth-utbs #textdomain wesnoth-utbs
#define NOTE_UTBS_HEALS #define NOTE_UTBS_HEALS
[special_note] [special_note]
note=_"This unit is capable of basic healing and slowing dehydration." note=_"This unit is capable of basic healing and slowing dehydration."
[/special_note] [/special_note]
#enddef #enddef
#define NOTE_UTBS_CURES #define NOTE_UTBS_CURES
[special_note] [special_note]
note=_"This unit is capable of healing those around it, slowing dehydration, and curing them of poison." note=_"This unit is capable of healing those around it, slowing dehydration, and curing them of poison."
[/special_note] [/special_note]
#enddef #enddef
#define NOTE_ETHEREAL #define NOTE_ETHEREAL
[special_note] [special_note]
note=_"SPECIAL_NOTE^This unit is able to move through solid stone walls." note=_"SPECIAL_NOTE^This unit is able to move through solid stone walls."
[/special_note] [/special_note]
#enddef #enddef
# This is the Teaching ability owned by Garak # This is the Teaching ability owned by Garak
@ -188,33 +188,33 @@ Marksman attacks are only affected if the chance to hit is greater than 60%."
#enddef #enddef
#define NOTE_SHOCK #define NOTE_SHOCK
[special_note] [special_note]
note=_"This unit’s melee attack can overwhelm the defenses of enemies, preventing them from retaliating as effectively." note=_"This unit’s melee attack can overwhelm the defenses of enemies, preventing them from retaliating as effectively."
[/special_note] [/special_note]
#enddef #enddef
#define NOTE_FORMATION #define NOTE_FORMATION
[special_note] [special_note]
note=_"Groups of units of this type are able to shield each other in combat." note=_"Groups of units of this type are able to shield each other in combat."
[/special_note] [/special_note]
#enddef #enddef
#define NOTE_DISENGAGE #define NOTE_DISENGAGE
[special_note] [special_note]
note=_"This unit can move either before or after attacking." note=_"This unit can move either before or after attacking."
[/special_note] [/special_note]
#enddef #enddef
#define NOTE_DAZE #define NOTE_DAZE
[special_note] [special_note]
note=_"This unit can daze its enemies, reducing their accuracy and defense until they end a turn." note=_"This unit can daze its enemies, reducing their accuracy and defense until they end a turn."
[/special_note] [/special_note]
#enddef #enddef
#define NOTE_DISTRACT #define NOTE_DISTRACT
[special_note] [special_note]
note=_"This unit is capable of distracting opponents, allowing allied units to trespass their Zones of Control and move unhindered around them." note=_"This unit is capable of distracting opponents, allowing allied units to trespass their Zones of Control and move unhindered around them."
[/special_note] [/special_note]
#enddef #enddef
#define ABILITY_DISENGAGE_EVENTS #define ABILITY_DISENGAGE_EVENTS

1
data/campaigns/Under_the_Burning_Suns/utils/dehydration-utils.cfg
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

1
data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
View file

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