upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-19 19:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some indentation and make CI abort if wmlindent errors

Browse Source 
Indentation was fixed by adding a newline to constructs with excessive density
and running wmlindent again. While the constructs were not particularly
readable it wouldn't hurt if wmlindent would cope a bit better.
This commit is contained in:
Gunter Labes 2025-03-05 21:56:21 +01:00
parent cbe333583e
commit 49564ed86c
No known key found for this signature in database
GPG Key ID: C0C7B971CC910216
6 changed files with 1159 additions and 1154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-main.yml vendored
View File

@ -30,7 +30,7 @@ jobs:
./utils/CI/utf8_bom_dog.sh ./utils/CI/utf8_bom_dog.sh
- name: Whitespace and WML indentation check - name: Whitespace and WML indentation check
if: success() || failure() if: success() || failure()
run: ./utils/CI/fix_whitespace.sh; git status; git diff --exit-code run: ./utils/CI/fix_whitespace.sh && git status && git diff --exit-code
- name: WML missing images check - name: WML missing images check
if: success() || failure() if: success() || failure()
run: utils/CI/check_wml_images.sh run: utils/CI/check_wml_images.sh

23
data/campaigns/The_South_Guard/scenarios/03_Vale_of_Tears.cfg
View File

@ -209,17 +209,18 @@
alpha={ALPHA} alpha={ALPHA}
[/frame] [/frame]
[/standing_anim])} [/standing_anim])}
{EFFECT new_animation ([death] {EFFECT new_animation (
base_score=99 [death]
[frame] base_score=99
duration,image_mod=500,"~CS(127,0,127)~BL([15,10,20,30,40,50,60,70])" [frame]
blend_ratio,blend_color=0~1,255,255,255 duration,image_mod=500,"~CS(127,0,127)~BL([15,10,20,30,40,50,60,70])"
alpha=1,1~0 blend_ratio,blend_color=0~1,255,255,255
[/frame] alpha=1,1~0
[/death] )} [/frame]
[/object] [/death] )}
[/modify_unit] [/object]
{DELAY 150} [/modify_unit]
{DELAY 150}
#enddef #enddef
{REMOVE_IMAGE 28 12} {PLACE_IMAGE "scenery/rune4.png~CS(-50,100,-50)~O(0.5)" 28 12} {REMOVE_IMAGE 28 12} {PLACE_IMAGE "scenery/rune4.png~CS(-50,100,-50)~O(0.5)" 28 12}
{ELF (Elvish Captain ) "captain.png" "elves/captain.webp" 26 12 Ithelden _"Ithelden" se male 6000 "1~0.6:2250,0.6:500,0.6~1:2250,1:1000"} {ELF (Elvish Captain ) "captain.png" "elves/captain.webp" 26 12 Ithelden _"Ithelden" se male 6000 "1~0.6:2250,0.6:500,0.6~1:2250,1:1000"}

215
data/campaigns/The_South_Guard/scenarios/04_Choice_in_the_Fog.cfg
View File

@ -1056,117 +1056,118 @@ Believe the truths you have seen, not the lies you have heard. No fake niceties
############################# #############################
[event] [event]
name=victory name=victory
[if] {NOT({HAVE_UNIT({FILTER_SIDE( [if]
[enemy_of] {NOT({HAVE_UNIT({FILTER_SIDE(
side=1 [enemy_of]
[/enemy_of] side=1
)})})} [/enemy_of]
[then] )})})}
{ACHIEVE s04} [then]
[/then] {ACHIEVE s04}
[/if] [/then]
[/event] [/if]
[/event]
############################# #############################
# TIME LOW # TIME LOW
############################# #############################
[event] [event]
name=turn {TURN_WARNING} name=turn {TURN_WARNING}
[if] {VARIABLE_CONDITIONAL s04_phase equals elf_alliance} [if] {VARIABLE_CONDITIONAL s04_phase equals elf_alliance}
[then] [then]
[message] [message]
speaker=Ethiliel speaker=Ethiliel
message= _ "Do not delay, Deoran! If we do not finish off this vermin Afalas soon, he shall surely make his escape!" message= _ "Do not delay, Deoran! If we do not finish off this vermin Afalas soon, he shall surely make his escape!"
[/message] [/message]
[/then] [/then]
[/if] [/if]
[if] {VARIABLE_CONDITIONAL s04_phase equals bandit_alliance} [if] {VARIABLE_CONDITIONAL s04_phase equals bandit_alliance}
[then] [then]
[message] [message]
speaker=Afalas speaker=Afalas
message= _ "Better hurry, Deoran. Whatever Mebrin’s plans are, he gets closer to finishin’ them every day. We’ve got to finish him off soon!" message= _ "Better hurry, Deoran. Whatever Mebrin’s plans are, he gets closer to finishin’ them every day. We’ve got to finish him off soon!"
[/message] [/message]
[/then] [/then]
[/if] [/if]
[message] [message]
speaker,image=narrator,wesnoth-icon.png speaker,image=narrator,wesnoth-icon.png
{TUTOR: _"You are running out of turns to complete this scenario! See your objectives by pressing Ctrl+J, and remember that the turn limit can be seen in the top-left-hand corner."} {TUTOR: _"You are running out of turns to complete this scenario! See your objectives by pressing Ctrl+J, and remember that the turn limit can be seen in the top-left-hand corner."}
[/message] [/message]
[/event] [/event]
[event] [event]
name=time over name=time over
[message] [message]
speaker=Deoran speaker=Deoran
message= _ "We have moved so slowly! If the last Urza brother was ever here, he has surely fled by now, and we still have no answers..." message= _ "We have moved so slowly! If the last Urza brother was ever here, he has surely fled by now, and we still have no answers..."
[/message] [/message]
[message] [message]
speaker,image=narrator,wesnoth-icon.png speaker,image=narrator,wesnoth-icon.png
{TUTOR: _"You have run out of turns to complete the scenario, and have been defeated!"} {TUTOR: _"You have run out of turns to complete the scenario, and have been defeated!"}
[/message] [/message]
[endlevel] [endlevel]
result=defeat result=defeat
[/endlevel] [/endlevel]
[/event] [/event]
############################# #############################
# TIME OVER # TIME OVER
############################# #############################
[event] [event]
name=side 1 turn {TURN_LIMIT} end name=side 1 turn {TURN_LIMIT} end
[if] {VARIABLE_CONDITIONAL s04_phase equals elf_alliance} [if] {VARIABLE_CONDITIONAL s04_phase equals elf_alliance}
[then] [then]
{REVEAL x,y,radius=21,7,2} {REVEAL x,y,radius=21,7,2}
{REVEAL x,y,radius=22,5,2} {REVEAL x,y,radius=22,5,2}
{GENERIC_UNIT 2 Boat 24 4} {GENERIC_UNIT 2 Boat 24 4}
{SOUND ambient/ship.ogg} {SOUND ambient/ship.ogg}
{MOVE_UNIT type=Boat 20 7} {MOVE_UNIT type=Boat 20 7}
[message] [message]
type,caption,image=boat,_"Sailor",portaits/humans/ruffian.webp type,caption,image=boat,_"Sailor",portaits/humans/ruffian.webp
message= _ "Hey, boss, it’s me. Anyone still alive out here?" message= _ "Hey, boss, it’s me. Anyone still alive out here?"
[/message] [/message]
[message] [message]
speaker=Afalas speaker=Afalas
message= _ "Finally, what took ye so long! C’mon, let’s get us all out o’ here afore that crazy elf lady kills any more o’ us!" message= _ "Finally, what took ye so long! C’mon, let’s get us all out o’ here afore that crazy elf lady kills any more o’ us!"
[/message] [/message]
{MOVE_UNIT id=Afalas 21 8} {MOVE_UNIT id=Afalas 21 8}
{KILL id=Afalas} {KILL id=Afalas}
{MOVE_UNIT type=Boat 35 1} {MOVE_UNIT type=Boat 35 1}
{KILL side=2} {KILL side=2}
[message] [message]
speaker=Deoran speaker=Deoran
message= _ "Urza Afalas has fled up the river! If he ever held Mebrin prisoner, the gentle sage is now far beyond our reach..." message= _ "Urza Afalas has fled up the river! If he ever held Mebrin prisoner, the gentle sage is now far beyond our reach..."
[/message] [/message]
[/then] [/then]
[/if] [/if]
[if] {VARIABLE_CONDITIONAL s04_phase equals bandit_alliance} [if] {VARIABLE_CONDITIONAL s04_phase equals bandit_alliance}
[then] [then]
{GENERIC_UNIT 6 "Vampire Bat" 30 13} {ROLE messenger} {GENERIC_UNIT 6 "Vampire Bat" 30 13} {ROLE messenger}
{REVEAL x,y,radius=32,19,4} {REVEAL x,y,radius=32,19,4}
{MOVE_UNIT role=messenger 33 19} {MOVE_UNIT role=messenger 33 19}
[message] [message]
role=messenger role=messenger
message= _ "Neep, neep!" message= _ "Neep, neep!"
[/message] [/message]
[message] [message]
speaker=Mebrin speaker=Mebrin
message= _ "Ah ha, ha ha ha ha. You have tarried too long, mayflies! My messenger brings news — your beloved town of Westin has been destroyed!" message= _ "Ah ha, ha ha ha ha. You have tarried too long, mayflies! My messenger brings news — your beloved town of Westin has been destroyed!"
[/message] [/message]
[message] [message]
speaker=Deoran speaker=Deoran
message= _ "What? How is this possible! With the undead armies fighting us here, how could Westin have already fallen?" message= _ "What? How is this possible! With the undead armies fighting us here, how could Westin have already fallen?"
[/message] [/message]
[/then] [/then]
[/if] [/if]
[message] [message]
speaker,image=narrator,wesnoth-icon.png speaker,image=narrator,wesnoth-icon.png
{TUTOR: _"You have run out of turns to complete the scenario, and have been defeated!"} {TUTOR: _"You have run out of turns to complete the scenario, and have been defeated!"}
[/message] [/message]
[endlevel] [endlevel]
result=defeat result=defeat
[/endlevel] [/endlevel]
[/event] [/event]
[/scenario] [/scenario]
#undef TURN_LIMIT #undef TURN_LIMIT

435
data/campaigns/The_South_Guard/scenarios/06a_Vengeance.cfg
View File

@ -909,228 +909,229 @@ then survive until turns run out"
# AFALAS ARRIVES # AFALAS ARRIVES
############################# #############################
{SCROLL_TO 1 12} {DELAY 250} {SCROLL_TO 1 12} {DELAY 250}
{NAMED_UNIT 6 (Elvish Champion) 1 12 Galdrad _"Galdrad" (canrecruit,facing,animate=yes,ne,yes {NAMED_UNIT 6 (Elvish Champion) 1 12 Galdrad _"Galdrad" (
[modifications] canrecruit,facing,animate=yes,ne,yes
{TRAIT_RESILIENT} [modifications]
{TRAIT_STRONG} {TRAIT_RESILIENT}
[/modifications] {TRAIT_STRONG}
)} [/modifications]
{MOVE_UNIT id=Galdrad 2 11} )}
{MODIFY_UNIT id=Ethiliel facing sw} {MOVE_UNIT id=Galdrad 2 11}
{DELAY 250} {MODIFY_UNIT id=Ethiliel facing sw}
[message] {DELAY 250}
speaker=Galdrad [message]
message = _"Ethiliel! What in Irdya is going on here?" speaker=Galdrad
[/message] message = _"Ethiliel! What in Irdya is going on here?"
[message] [/message]
speaker,image=Ethiliel,portraits/ethiliel-mad.webp [message]
message = _"These snakes have captured Mebrin, and committed who knows what horrible atrocities against him! Galdrad, we must take him back!" speaker,image=Ethiliel,portraits/ethiliel-mad.webp
[/message] message = _"These snakes have captured Mebrin, and committed who knows what horrible atrocities against him! Galdrad, we must take him back!"
[message] [/message]
speaker=Galdrad [message]
message = _"Kidnapped Mebrin? I have heard otherwise. Ethiliel, this is Urza Afalas of the humans." speaker=Galdrad
[/message] message = _"Kidnapped Mebrin? I have heard otherwise. Ethiliel, this is Urza Afalas of the humans."
[unstore_unit] [/message]
variable=stored_afalas [unstore_unit]
x,y,animate=1,12,yes variable=stored_afalas
[/unstore_unit] x,y,animate=1,12,yes
{MODIFY_UNIT id=Afalas facing ne} [/unstore_unit]
{MOVE_UNIT id=Afalas 1 11} {MODIFY_UNIT id=Afalas facing ne}
{DELAY 500} {MOVE_UNIT id=Afalas 1 11}
{MOVE_UNIT id=Ethiliel 2 10} {DELAY 500}
[message] {MOVE_UNIT id=Ethiliel 2 10}
speaker=Ethiliel [message]
message = _"We’ve met. This absolute scum, pig of a mudling—" speaker=Ethiliel
[/message] message = _"We’ve met. This absolute scum, pig of a mudling—"
[harm_unit] [/message]
{FILTER id=Ethiliel} [harm_unit]
{FILTER_SECOND id=Afalas} {FILTER id=Ethiliel}
[primary_attack] {FILTER_SECOND id=Afalas}
name=ensnare [primary_attack]
[/primary_attack] name=ensnare
amount,damage_type=6,impact [/primary_attack]
animate,delay=yes,0 amount,damage_type=6,impact
[/harm_unit] animate,delay=yes,0
{MODIFY_UNIT id=Afalas status.slowed yes} [/harm_unit]
[message] {MODIFY_UNIT id=Afalas status.slowed yes}
speaker=Afalas [message]
message = _"Hey! Hands off, lady! I try to make things right, come back t’ try an’ explain, an’ this be what I get? Trussed up in vines an’ called names by some—" speaker=Afalas
[/message] message = _"Hey! Hands off, lady! I try to make things right, come back t’ try an’ explain, an’ this be what I get? Trussed up in vines an’ called names by some—"
[/message]
#############################
# EXPLAINING MEBRIN
#############################
[message]
speaker=Galdrad
message = _"What Urza Afalas <i><b>means</b></i> to say, is that I can corroborate the humans’ story. Some days ago, this outlaw came to me with unlikely words."
[/message]
[message]
speaker=Afalas
message = _"...yeah, I did. I heard them rangers in the forest southways, knew they’d be wantin’ my head. I could’a ran an’ hid, but I wanted to make things right. I went back t’ where we fought Mebrin, then t’ the Aethenwood."
[/message]
[message]
speaker=Afalas
message = _"You may think us men t’ all be criminals an’ outlaws, but we’re still human bei— err, livin’ beings, and we still know justice an’ truth. My brothers an’ I did wrong. It’s my responsibility to make things right."
[/message]
[message]
speaker=Galdrad
message = _"Afalas’ words could have seen him imprisoned, or worse, but at the height of my anger he produced the skull of a lich. The druids confirmed it — the skull was Mebrin’s."
[/message]
[message]
speaker,image=Ethiliel,portraits/ethiliel-mad.webp
message = _"The Mebrin I know is so gentle. So wise! It cannot be... can it?"
[/message]
[message]
speaker=Ethiliel
message = _"I did not want to believe the humans’ words. I could not bear to believe... But if Mebrin really did turn to undeath, then I have been the cause of so much meaningless bloodshed."
[/message]
[message]
speaker=Ethiliel
message = _"It’s true, isn’t it..."
[/message]
[message]
speaker=Ethiliel
message = _"..."
[/message]
{DELAY 250}
{MOVE_UNIT id=Ethiliel 3 10}
{DELAY 250}
{MODIFY_UNIT id=Ethiliel facing sw}
#############################
# ETHILIEL APOLOGIZES
#############################
[message]
speaker=Ethiliel
message = _"Urza Afalas, thank you. I see now that not all humans are alike, and that you, too, are capable of courage and loyalty. Vengeance only begets more vengeance. You — and your brothers, posthumously — are forgiven."
[/message]
[message]
speaker=Afalas
message = _"<i>You</i> forgive <i>me</i>! After all the blood—"
[/message]
[message]
speaker=Galdrad
message = _"And Urza Afalas graciously accepts your forgiveness. Now come, Ethiliel. You have been away from your people for far too long. Our attack against the humans is over."
[/message]
{VARIABLE epilogue elves}
[endlevel]
result=victory
linger_mode=no
carryover_report=no
save=no
[/endlevel]
[/event]
############################# #############################
# EXPLAINING MEBRIN # TIME OVER (DEORAN)
############################# #############################
[message] [event]
speaker=Galdrad name=side 6 turn {TURN_LIMIT} end
message = _"What Urza Afalas <i><b>means</b></i> to say, is that I can corroborate the humans’ story. Some days ago, this outlaw came to me with unlikely words." {FILTER_CONDITION({VARIABLE_CONDITIONAL s05c equals yes})}
[/message] {FADE_MUSIC_OUT 800}
[message] {ACHIEVE s05c}
speaker=Afalas {REPLACE_SCENARIO_MUSIC heroes_rite.ogg}
message = _"...yeah, I did. I heard them rangers in the forest southways, knew they’d be wantin’ my head. I could’a ran an’ hid, but I wanted to make things right. I went back t’ where we fought Mebrin, then t’ the Aethenwood." {FADE_MUSIC_IN 100}
[/message] #############################
[message] # DEORAN ARRIVES
speaker=Afalas #############################
message = _"You may think us men t’ all be criminals an’ outlaws, but we’re still human bei— err, livin’ beings, and we still know justice an’ truth. My brothers an’ I did wrong. It’s my responsibility to make things right." {SCROLL_TO 9 22} {DELAY 500}
[/message] [unstore_unit]
[message] variable=stored_deoran
speaker=Galdrad x,y,animate=9,22,yes
message = _"Afalas’ words could have seen him imprisoned, or worse, but at the height of my anger he produced the skull of a lich. The druids confirmed it — the skull was Mebrin’s." [/unstore_unit]
[/message] {MODIFY_UNIT id=Deoran side 2}
[message] {MODIFY_UNIT id=Deoran facing ne}
speaker,image=Ethiliel,portraits/ethiliel-mad.webp {DELAY 500}
message = _"The Mebrin I know is so gentle. So wise! It cannot be... can it?" [unstore_unit]
[/message] variable=stored_companion
[message] x,y,animate=8,22,yes
speaker=Ethiliel [/unstore_unit]
message = _"I did not want to believe the humans’ words. I could not bear to believe... But if Mebrin really did turn to undeath, then I have been the cause of so much meaningless bloodshed." {MODIFY_UNIT id=$companion_id facing ne}
[/message] {MODIFY_UNIT id=$companion_id side 2}
[message] {DELAY 500}
speaker=Ethiliel {GENERIC_UNIT 1 "Troll" 10 22} {ANIMATE}
message = _"It’s true, isn’t it..." {DELAY 500}
[/message] #############################
[message] # DEORAN CONFRONTS ETHILIEL
speaker=Ethiliel #############################
message = _"..." [message]
[/message] speaker,image=Deoran,portraits/deoran-mad.webp
{DELAY 250} message= _ "Ethiliel! What’s going on here? What have you done?!"
{MOVE_UNIT id=Ethiliel 3 10} [/message]
{DELAY 250} [message]
{MODIFY_UNIT id=Ethiliel facing sw} speaker=Ethiliel
############################# message= _ "Deoran — good, you’re finally here. I knew that under enough pressure, Westin would eventually cave and summon you back. Does this mean you humans have reconsidered your decisions, and have finally freed Mebrin from his bonds?"
# ETHILIEL APOLOGIZES [/message]
############################# [message]
[message] speaker=Deoran
speaker=Ethiliel message= _ "No-one summoned me here, Ethiliel. Afalas was right. I saw the lich Mal M’Brin with my own two eyes, heard his ravings with my own two ears! I watched him raise the dead up out of the ground!"
message = _"Urza Afalas, thank you. I see now that not all humans are alike, and that you, too, are capable of courage and loyalty. Vengeance only begets more vengeance. You — and your brothers, posthumously — are forgiven." [/message]
[/message] [message]
[message] speaker,image=Ethiliel,portraits/ethiliel-mad.webp
speaker=Afalas message= _ "More lies, infuriating lies! Where is his corpse, mayfly? Where is the evidence for the horrible things of which you accuse? No elf would fall to undeath, much less our wisest teacher."
message = _"<i>You</i> forgive <i>me</i>! After all the blood—" [/message]
[/message] {MOVE_UNIT id=Deoran 6 10}
[message] [message]
speaker=Galdrad speaker=Deoran
message = _"And Urza Afalas graciously accepts your forgiveness. Now come, Ethiliel. You have been away from your people for far too long. Our attack against the humans is over." message= _ "No elf could fall to undeath? What is this, then? I show you the skull of a lich, unmistakably elven, and unmistakably undead!"
[/message] [/message]
[message]
speaker=Deoran
message= _ "My men and I chased Mal M’Brin down into the depths of the earth, pushing ourselves nearly to exhaustion. When at last the lich was on the brink of defeat, with his last gasp of foul magic he collapsed his cave on us."
[/message]
[message]
speaker=Deoran
message= _ "Many perished, including Mebrin himself. But after days of hard labor by both man and troll, we dug ourselves free and set out for Westin, bringing the skull of our vanquished foe. You recognize its elven features, Ethiliel, do you not?"
[/message]
{VARIABLE epilogue elves} #############################
[endlevel] # ETHILIEL BELIEVES DEORAN
result=victory #############################
linger_mode=no [message]
carryover_report=no speaker=Ethiliel
save=no message = _"The Mebrin I know is so gentle. So wise! It cannot be... can it?"
[/endlevel] [/message]
[/event] [message]
speaker=Deoran
message= _ "You believe, but you do not want to believe. Please, Ethiliel — enough blood has been shed today."
[/message]
[message]
speaker=Ethiliel
message = _"Mebrin... oh Mebrin... a lich!? But if Mebrin really did turn to undeath, then I have been the cause of so much meaningless bloodshed."
[/message]
[message]
speaker=Ethiliel
message = _"It’s true, isn’t it..."
[/message]
[message]
speaker=Ethiliel
message = _"..."
[/message]
{DELAY 250}
{MOVE_UNIT id=Ethiliel 3 10}
{DELAY 250}
{MODIFY_UNIT id=Ethiliel facing sw}
#############################
# ETHILIEL APOLOGIZES
#############################
[message]
speaker=Ethiliel
message = _"Deoran, thank you. I see now that not all humans are alike, and that you, too, are capable of courage and loyalty."
[/message]
[message]
speaker=Ethiliel
message = _"Vengeance only begets more vengeance. Our attack against Westin is over."
[/message]
############################# {VARIABLE epilogue elves}
# TIME OVER (DEORAN) [endlevel]
############################# result=victory
[event] linger_mode=no
name=side 6 turn {TURN_LIMIT} end carryover_report=no
{FILTER_CONDITION({VARIABLE_CONDITIONAL s05c equals yes})} save=no
{FADE_MUSIC_OUT 800} [/endlevel]
{ACHIEVE s05c} [/event]
{REPLACE_SCENARIO_MUSIC heroes_rite.ogg}
{FADE_MUSIC_IN 100}
#############################
# DEORAN ARRIVES
#############################
{SCROLL_TO 9 22} {DELAY 500}
[unstore_unit]
variable=stored_deoran
x,y,animate=9,22,yes
[/unstore_unit]
{MODIFY_UNIT id=Deoran side 2}
{MODIFY_UNIT id=Deoran facing ne}
{DELAY 500}
[unstore_unit]
variable=stored_companion
x,y,animate=8,22,yes
[/unstore_unit]
{MODIFY_UNIT id=$companion_id facing ne}
{MODIFY_UNIT id=$companion_id side 2}
{DELAY 500}
{GENERIC_UNIT 1 "Troll" 10 22} {ANIMATE}
{DELAY 500}
#############################
# DEORAN CONFRONTS ETHILIEL
#############################
[message]
speaker,image=Deoran,portraits/deoran-mad.webp
message= _ "Ethiliel! What’s going on here? What have you done?!"
[/message]
[message]
speaker=Ethiliel
message= _ "Deoran — good, you’re finally here. I knew that under enough pressure, Westin would eventually cave and summon you back. Does this mean you humans have reconsidered your decisions, and have finally freed Mebrin from his bonds?"
[/message]
[message]
speaker=Deoran
message= _ "No-one summoned me here, Ethiliel. Afalas was right. I saw the lich Mal M’Brin with my own two eyes, heard his ravings with my own two ears! I watched him raise the dead up out of the ground!"
[/message]
[message]
speaker,image=Ethiliel,portraits/ethiliel-mad.webp
message= _ "More lies, infuriating lies! Where is his corpse, mayfly? Where is the evidence for the horrible things of which you accuse? No elf would fall to undeath, much less our wisest teacher."
[/message]
{MOVE_UNIT id=Deoran 6 10}
[message]
speaker=Deoran
message= _ "No elf could fall to undeath? What is this, then? I show you the skull of a lich, unmistakably elven, and unmistakably undead!"
[/message]
[message]
speaker=Deoran
message= _ "My men and I chased Mal M’Brin down into the depths of the earth, pushing ourselves nearly to exhaustion. When at last the lich was on the brink of defeat, with his last gasp of foul magic he collapsed his cave on us."
[/message]
[message]
speaker=Deoran
message= _ "Many perished, including Mebrin himself. But after days of hard labor by both man and troll, we dug ourselves free and set out for Westin, bringing the skull of our vanquished foe. You recognize its elven features, Ethiliel, do you not?"
[/message]
#############################
# ETHILIEL BELIEVES DEORAN
#############################
[message]
speaker=Ethiliel
message = _"The Mebrin I know is so gentle. So wise! It cannot be... can it?"
[/message]
[message]
speaker=Deoran
message= _ "You believe, but you do not want to believe. Please, Ethiliel — enough blood has been shed today."
[/message]
[message]
speaker=Ethiliel
message = _"Mebrin... oh Mebrin... a lich!? But if Mebrin really did turn to undeath, then I have been the cause of so much meaningless bloodshed."
[/message]
[message]
speaker=Ethiliel
message = _"It’s true, isn’t it..."
[/message]
[message]
speaker=Ethiliel
message = _"..."
[/message]
{DELAY 250}
{MOVE_UNIT id=Ethiliel 3 10}
{DELAY 250}
{MODIFY_UNIT id=Ethiliel facing sw}
#############################
# ETHILIEL APOLOGIZES
#############################
[message]
speaker=Ethiliel
message = _"Deoran, thank you. I see now that not all humans are alike, and that you, too, are capable of courage and loyalty."
[/message]
[message]
speaker=Ethiliel
message = _"Vengeance only begets more vengeance. Our attack against Westin is over."
[/message]
{VARIABLE epilogue elves}
[endlevel]
result=victory
linger_mode=no
carryover_report=no
save=no
[/endlevel]
[/event]
[/scenario] [/scenario]
#undef TURN_LIMIT #undef TURN_LIMIT

1633
data/campaigns/The_South_Guard/scenarios/06b_The_Tides_of_War.cfg
View File

File diff suppressed because it is too large Load Diff

5
utils/CI/fix_whitespace.sh
View File

@ -1,7 +1,5 @@
#!/bin/sh #!/bin/sh
make -C data/tools reindent
# use -i for GNU sed and -i '' otherwise # use -i for GNU sed and -i '' otherwise
sed --version 2>/dev/null | grep -q 'GNU sed' || i=1 sed --version 2>/dev/null | grep -q 'GNU sed' || i=1
@ -12,3 +10,6 @@ find src -path src/modules -prune -o \
find data -name '*.lua' -type f \ find data -name '*.lua' -type f \
-exec sed -i ${i:+''} -e 's/[[:blank:]]*$//' -e '$a\' {} + \ -exec sed -i ${i:+''} -e 's/[[:blank:]]*$//' -e '$a\' {} + \
-exec data/tools/check_mixed_indent {} + -exec data/tools/check_mixed_indent {} +
# run this last so it determines the exit status
make -C data/tools reindent