diff --git a/data/campaigns/Delfadors_Memoirs/utils/characters.cfg b/data/campaigns/Delfadors_Memoirs/utils/characters.cfg index 18849620e011..252964152b2a 100644 --- a/data/campaigns/Delfadors_Memoirs/utils/characters.cfg +++ b/data/campaigns/Delfadors_Memoirs/utils/characters.cfg @@ -1,9 +1,9 @@ #textdomain wesnoth-dm #define OBJECT_LOYAL -# 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 -# the unit has no upkeep and to avoid taking up another trait slot + # 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 + # the unit has no upkeep and to avoid taking up another trait slot [object] [effect] apply_to=loyal diff --git a/data/campaigns/Delfadors_Memoirs/utils/sides.cfg b/data/campaigns/Delfadors_Memoirs/utils/sides.cfg index 94b5436c0575..92d5bac50c97 100644 --- a/data/campaigns/Delfadors_Memoirs/utils/sides.cfg +++ b/data/campaigns/Delfadors_Memoirs/utils/sides.cfg @@ -263,7 +263,7 @@ {CLEAR_VARIABLE delfador_store} # "n" tells us if {X} is even or odd. If it's even, "n" is equal to 1; - # otherwise, it's set to 0 + # otherwise, it's set to 0 {VARIABLE n "$(if(({X}/2.0 = {X}/2), 1, 0))"} {NAMED_UNIT 1 (Royal Guard) "$({X}-1)" "$({Y}-(1-$n))" Clogrin _"Clogrin" (facing=nw)} 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 6fe6bce67032..7423de4afc46 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 @@ -711,7 +711,7 @@ [event] name=time over - + [unit] type=Paladin side=3 @@ -728,7 +728,7 @@ {GENERIC_UNIT 3 (Paladin) 32 26} {FACING nw} {GENERIC_UNIT 3 (Mage of Light) 33 27} {FACING nw} {GENERIC_UNIT 3 (Mage of Light) 34 26} {FACING nw} - + [message] speaker=Telemon message= _ "Foul necromancer! Your time has come!" diff --git a/data/campaigns/Descent_Into_Darkness/utils/macros.cfg b/data/campaigns/Descent_Into_Darkness/utils/macros.cfg index fe8d1a1350a5..be447c1634a3 100644 --- a/data/campaigns/Descent_Into_Darkness/utils/macros.cfg +++ b/data/campaigns/Descent_Into_Darkness/utils/macros.cfg @@ -248,15 +248,15 @@ #enddef #define SET_GOT_INSIDE_MANOR - {MODIFY_UNIT ( - side=1 - {NOT_ON_RECALL_LIST} - [not] - id=Malin Keshar + {MODIFY_UNIT ( + side=1 + {NOT_ON_RECALL_LIST} + [not] + id=Malin Keshar - [or] - id=Darken Volk - [/or] - [/not] - ) variables.got_inside_manor yes} + [or] + id=Darken Volk + [/or] + [/not] + ) variables.got_inside_manor yes} #enddef diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg index b41b8b391aa6..63a5b2e37de0 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg @@ -645,7 +645,7 @@ # A denizen of caves answers Konrad's question. [message] race=dwarf - # po: "sowl" is a rare word synonymous with "sully", meaning "contaminate". + # po: "sowl" is a rare word synonymous with "sully", meaning "contaminate". # po: "toiled" means "difficult, requires effort". message=_ "Lord Konrad, yon rumble was made by nae living creature. ’Tis the echoes o’ the very bedrock witherin’ and crumbling beneath us that we ’eard. Are ye nae feeling the heat redoubling? Is yer breath nae toiled for the ashes sowling the air? I beseech that we not tarry ’ere any more than we ha’ to, lest the forming abysses claim us." [/message] diff --git a/data/campaigns/Heir_To_The_Throne/utils/intro.cfg b/data/campaigns/Heir_To_The_Throne/utils/intro.cfg index 7a2ef24cc777..f4dbb6686690 100644 --- a/data/campaigns/Heir_To_The_Throne/utils/intro.cfg +++ b/data/campaigns/Heir_To_The_Throne/utils/intro.cfg @@ -1,56 +1,56 @@ #textdomain wesnoth-httt #define HTTT_INTRO -[story] - [part] - 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." - {HTTT_BIGMAP} - [/part] - [part] - # wmllint: local spelling Galcadar - story= _ "The Northern host encamped at Galcadar, by the ford of Abez, and the king led his forces to meet them. Splitting his army in two, he led one half while his son, the crown prince Eldred, led the other." - background=story/httt_story1.jpg - [/part] - [part] - story= _ "Eldred was a brave and courageous warrior, able to lead his soldiers well. Unfortunately for Garard, his son was also ambitious... and treacherous. In the heat of battle, Eldred’s men turned on the king. And so, Garard was slain in battle that day, along with his brother and all his sons but Eldred." - background=story/httt_story2.jpg - [/part] - [part] - story= _ "Garard’s queen, Asheviere, looked on with glee, having come to watch the battle from a nearby hill. The rule of her son would surely satisfy her lust for power far better than her husband’s had." - background=story/httt_story3.jpg - [/part] - [part] - story= _ "In exchange for tribute, the warlord of the North happily made peace with Eldred, who proclaimed himself king and led his army south towards Weldyn." - {HTTT_BIGMAP} - [/part] - [part] - story= _ "But Garard’s arch-mage, Delfador, had escaped the battle and, riding with haste, reached Weldyn first. He mustered a force of loyalists to fight Eldred and avenge the king’s death. The loyalist army marched north to meet Eldred." - background=story/httt_story4.jpg - [/part] - [part] - story= _ "Eldred made war upon Delfador and his forces with his mother’s advice ringing in his ears: “Fight no one great or small except the old mage, whose head should be severed from his shoulders.”" - background=story/httt_story4.jpg - [/part] - [part] - story= _ "And Eldred did indeed meet Delfador face-to-face in battle, in the hinterlands near Tath. Sword clashed against staff, as the wise old mage fought the brash young warrior." - background=story/httt_story5.jpg - [/part] - [part] - story= _ "In the end Delfador’s men were defeated and routed, but Asheviere found her son’s lifeless body, fixed to the ground by the great mage’s staff." - background=story/httt_story6.jpg - [/part] - [part] - story= _ "Asheviere herself then took command of the army and led it back to Weldyn. Knowing that the king’s young nephews were next in line to the throne, she ordered them all killed, and declared herself Queen of Wesnoth." - {HTTT_BIGMAP} - [/part] - [part] - story= _ "Soon after news of Asheviere’s orders reached Delfador, he secretly entered the palace and stole away Konrad, the youngest of Garard’s nephews, thereby saving him from death." - background=story/httt_story7.jpg - [/part] - [part] - 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 - [/part] -[/story] + [story] + [part] + 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." + {HTTT_BIGMAP} + [/part] + [part] + # wmllint: local spelling Galcadar + story= _ "The Northern host encamped at Galcadar, by the ford of Abez, and the king led his forces to meet them. Splitting his army in two, he led one half while his son, the crown prince Eldred, led the other." + background=story/httt_story1.jpg + [/part] + [part] + story= _ "Eldred was a brave and courageous warrior, able to lead his soldiers well. Unfortunately for Garard, his son was also ambitious... and treacherous. In the heat of battle, Eldred’s men turned on the king. And so, Garard was slain in battle that day, along with his brother and all his sons but Eldred." + background=story/httt_story2.jpg + [/part] + [part] + story= _ "Garard’s queen, Asheviere, looked on with glee, having come to watch the battle from a nearby hill. The rule of her son would surely satisfy her lust for power far better than her husband’s had." + background=story/httt_story3.jpg + [/part] + [part] + story= _ "In exchange for tribute, the warlord of the North happily made peace with Eldred, who proclaimed himself king and led his army south towards Weldyn." + {HTTT_BIGMAP} + [/part] + [part] + story= _ "But Garard’s arch-mage, Delfador, had escaped the battle and, riding with haste, reached Weldyn first. He mustered a force of loyalists to fight Eldred and avenge the king’s death. The loyalist army marched north to meet Eldred." + background=story/httt_story4.jpg + [/part] + [part] + story= _ "Eldred made war upon Delfador and his forces with his mother’s advice ringing in his ears: “Fight no one great or small except the old mage, whose head should be severed from his shoulders.”" + background=story/httt_story4.jpg + [/part] + [part] + story= _ "And Eldred did indeed meet Delfador face-to-face in battle, in the hinterlands near Tath. Sword clashed against staff, as the wise old mage fought the brash young warrior." + background=story/httt_story5.jpg + [/part] + [part] + story= _ "In the end Delfador’s men were defeated and routed, but Asheviere found her son’s lifeless body, fixed to the ground by the great mage’s staff." + background=story/httt_story6.jpg + [/part] + [part] + story= _ "Asheviere herself then took command of the army and led it back to Weldyn. Knowing that the king’s young nephews were next in line to the throne, she ordered them all killed, and declared herself Queen of Wesnoth." + {HTTT_BIGMAP} + [/part] + [part] + story= _ "Soon after news of Asheviere’s orders reached Delfador, he secretly entered the palace and stole away Konrad, the youngest of Garard’s nephews, thereby saving him from death." + background=story/httt_story7.jpg + [/part] + [part] + 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 + [/part] + [/story] #enddef diff --git a/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg b/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg index 4817796fe56e..a7b0f0f7aae2 100644 --- a/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg +++ b/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg @@ -207,10 +207,10 @@ speaker=Relana message= _ "I agree. But, Baldras, what will you tell him? We know something has been going badly wrong in Wesnoth of late, that more than ordinary corruption and incompetence is afoot. But when the effects fall on mere peasants, the wrong of it may not seem so obvious from a noble’s chair." [/message] - [sound] - name=ambient/wardrums.ogg - repeat=3 - [/sound] + [sound] + name=ambient/wardrums.ogg + repeat=3 + [/sound] [message] speaker=Baldras message= _ "We need evidence. Hard evidence... but wait— Are those orcish war drums I hear?" diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg index 2a5ea1b60783..7c9b4466205b 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg @@ -124,7 +124,6 @@ [event] name=prestart - [set_variable] name=incominggold value=5000 diff --git a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg index c3343d8e0fca..b3468f715aa9 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg @@ -201,8 +201,8 @@ #enddef #define ENABLE_AI_COMMAND_CA_TRANSPORT_S6 -[lua] -code = << + [lua] + code = << local helper = wesnoth.require "helper" function wesnoth.custom_synced_commands.ship_unload(cfg) @@ -226,5 +226,5 @@ function wesnoth.custom_synced_commands.ship_unload(cfg) end >> -[/lua] + [/lua] #enddef diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg index 1cb51b66ff0d..dbf59e7eb8e5 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg @@ -214,7 +214,6 @@ {WILDTHING 27 14} [/event] - #ifdef EASY # Compensate that you get less experience points on easy. [event] diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg index 6857aee194ba..4119550ac0ef 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg @@ -315,7 +315,6 @@ message= _ "Aye. Karrag, calling his troops to battle. Only the Dark Gods know what hellspawn the lich will summon. AXES UP!" [/message] - {REPLACE_SCENARIO_MUSIC knalgan_theme.ogg} {APPEND_MUSIC siege_of_laurelmor.ogg} {APPEND_MUSIC underground.ogg} diff --git a/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg b/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg index 28ab3192c38b..a22e7ab83ea4 100644 --- a/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg +++ b/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg @@ -707,8 +707,6 @@ [/message] [/event] - - # Victory - The bandits are defeated. [event] diff --git a/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg b/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg index a3fad0ab4b57..7bf16723d5f3 100644 --- a/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg +++ b/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg @@ -546,7 +546,7 @@ {VARIABLE EthilielV.x recall} {VARIABLE EthilielV.y recall} {CLEAR_VARIABLE EthilielV.modifications} - + [set_variables] name=EthilielV.modifications mode=insert @@ -555,9 +555,9 @@ {TRAIT_QUICK} [/value] [/set_variables] - - {CLEAR_VARIABLE EthilielV.upkeep} - + + {CLEAR_VARIABLE EthilielV.upkeep} + [unstore_unit] variable=EthilielV [/unstore_unit] diff --git a/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg b/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg index d1c58b71c849..9ff2b579d345 100644 --- a/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg +++ b/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg @@ -128,8 +128,7 @@ {VARIABLE secret_path.x 18} {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 {VARIABLE first_undead_spawn_turn 5} #endif diff --git a/data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg b/data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg index 4209a137accf..3e157e15bd25 100644 --- a/data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg +++ b/data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg @@ -95,8 +95,8 @@ recruit=Bone Shooter,Deathblade,Ghoul,Revenant,Blood Bat,Dark Adept #endif - # decrease Mebrin's moves so he doesn't run around too much - # also make him weaker + # decrease Mebrin's moves so he doesn't run around too much + # also make him weaker [modifications] [object] [effect] @@ -296,7 +296,7 @@ {NAMED_LOYAL_UNIT 2 (Necromancer) 20 27 (Mal Maul) (_"Mal Maul")} {GUARDIAN} #endif - # trolls + # trolls #ifdef EASY {LOYAL_UNIT 5 (Troll) 5 17} {GUARDIAN} @@ -614,7 +614,6 @@ [/redraw] [/event] - # Confrontation with Mal Brin [event] name=sighted @@ -826,7 +825,6 @@ [/message] [/event] - [event] name=last breath [filter] diff --git a/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg b/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg index fd82ff04005b..f552741fc1bd 100644 --- a/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg +++ b/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg @@ -138,7 +138,6 @@ {NAMED_LOYAL_UNIT 1 (Heavy Infantryman) 11 11 (Rheban) (_"Rheban")} {NAMED_LOYAL_UNIT 1 (Bowman) 10 10 (Jul) (_"Jul")} - # Lt. Meris' Section {NAMED_LOYAL_UNIT 1 (Lieutenant) 21 10 (Meris) (_"Meris")} @@ -190,7 +189,6 @@ {LOYAL_UNIT 2 (Blood Bat) 32 10} #endif - {MODIFY_UNIT x,y=16-33,1-25 facing sw} {CLEAR_VARIABLE stored_side_1} diff --git a/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg b/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg index ccd89985db19..e538625a7e20 100644 --- a/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg +++ b/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg @@ -373,7 +373,6 @@ {STARTING_VILLAGES 2 5} {STARTING_VILLAGES 3 5} - # Start [event] name=start diff --git a/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg b/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg index e7cdee43ec58..17ff83727bd1 100644 --- a/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg +++ b/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg @@ -79,7 +79,6 @@ {NAMED_GENERIC_UNIT 1 (Bowman) 19 12 () (_"Westin Guard")} {NAMED_GENERIC_UNIT 1 (Lieutenant) 19 11 () (_"Westin Guard")} #endif - [/side] {STARTING_VILLAGES 1 15} @@ -282,7 +281,7 @@ y=8 ,8 ,8 ,8 ,8 ,8 ,8 ,8 ,8 ,8 ,7 ,7 ,6 ,6 [/move_unit_fake] - [music] + [music] name=the_city_falls.ogg immediate=yes append=no diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg index 0d555fdbae08..5d59d352dc8b 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg @@ -469,7 +469,7 @@ {CLEAR_VARIABLE tents} {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 [recall] type=Quenoth Scout diff --git a/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Body.cfg b/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Body.cfg index 52847c603a31..a671d54cd606 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Body.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Body.cfg @@ -93,15 +93,15 @@ hide_help=yes do_not_list=yes [abilities] - [regenerate] - value=100 - id=regenerates_yec - name= _ "alien regenerates" - female_name= _ "female^alien regenerates" - description= _ "The unit will heal itself 100 HP per turn. If it is poisoned, it will remove the poison instead of healing." - affect_self=yes - poison=cured - [/regenerate] + [regenerate] + value=100 + id=regenerates_yec + name= _ "alien regenerates" + female_name= _ "female^alien regenerates" + description= _ "The unit will heal itself 100 HP per turn. If it is poisoned, it will remove the poison instead of healing." + affect_self=yes + poison=cured + [/regenerate] [/abilities] [/unit_type] diff --git a/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg b/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg index 23336313b49e..8eb4e48b81cc 100644 --- a/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg +++ b/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg @@ -143,7 +143,7 @@ caption= _ "Welcome to Wesnoth!" image=wesnoth-icon.png message= _ "This is a two-part tutorial intended for people who are new to the game. Part 1 will teach you the basics about movement, attacking, healing, and recruiting. Firstly, you’ll choose a hero (both heroes play the same)." + - {CONTINUE_MSG} + {CONTINUE_MSG} [/message] [select_character][/select_character] diff --git a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg index d5374ff447ea..38ff10290646 100644 --- a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg +++ b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg @@ -186,7 +186,7 @@ caption= _ "Welcome to Wesnoth!" image=wesnoth-icon.png message= _ "Welcome back! This is second part of the two-part tutorial. Part 2 will teach you about recalling units, abilities and weapon specials, income and upkeep, long-distance movement, zone of control, and time of day." + - {CONTINUE_MSG} + {CONTINUE_MSG} [/message] [message]