Skip to content

Commit 966f8e2

Browse files
cooljeaniuscooljeanius
committed
Swamps of Jamolar: backport traitor event changes
1 parent 3310a1a commit 966f8e2

2 files changed

Lines changed: 50 additions & 56 deletions

File tree

‎scenarios_b/02b_Swamps_Jamolar.cfg‎

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,11 @@
242242
side=2
243243
type=Saurian Skirmisher,Saurian Augur,Saurian Headhunter,Saurian Skald,Saurian Assassin
244244
[/filter]
245-
# TODO: scroll to the Saurian recruited and highlight it, so that players can know who Malakar
246-
# is talking to here:
245+
[scroll_to_unit]
246+
id=$unit.id
247+
highlight=yes
248+
[/scroll_to_unit]
249+
[redraw][/redraw]
247250
[message]
248251
speaker=Malakar
249252
message= _ "Saurians! You have no part in this madness. The humans are our common enemy!"
@@ -332,11 +335,16 @@
332335
name=moveto
333336
[filter]
334337
side=1
335-
# TODO: provide some sort of visual hint on the tiles at these coordinates
336-
# to indicate that they're Hartholar's home territory, so that a paranoid player
337-
# can know not to move into them:
338-
x=29-40
339-
y=23-37
338+
# 1.19 branch includes level 0 units here, but I dunno, I don't think
339+
# it makes sense to allow Hatchlings to trigger this:
340+
level=1
341+
[filter_location]
342+
[filter_adjacent_location]
343+
[filter]
344+
id=Hartholar
345+
[/filter]
346+
[/filter_adjacent_location]
347+
[/filter_location]
340348
[not]
341349
id=Malakar
342350
[or]
@@ -355,41 +363,27 @@
355363
[/message]
356364
[message]
357365
speaker=Malakar
358-
message= _ "Loyal drakes! Kill the traitor, before he reaches Hartholar!"
366+
message= _ "Loyal drakes! Kill the traitor, before he kills Hartholar!"
359367
[/message]
360368
#so he can recruit a little bit of a defense in case the player doesn't have any units close enough to catch the traitor (e.g. a village-raiding glider)
361369
[gold]
362370
side=2
363371
amount=60
364372
[/gold]
365-
[/event]
366-
367-
[event]
368-
name=moveto
369-
[filter]
370-
side=3
371-
[filter_location]
372-
[filter_adjacent_location]
373-
[filter]
374-
id=Hartholar
375-
[/filter]
376-
[/filter_adjacent_location]
377-
[/filter_location]
378-
[/filter]
379-
[message]
380-
speaker=unit
381-
# po: Note for translators: this is supposed to be sarcastic:
382-
message= _ "For Malakar, the honorable! So honorable that he cannot even strike down his enemies!"
383-
[/message]
384-
#ifdef EASY
385-
# (let it attack as normal)
386-
#else
387-
[kill]
388-
id=Hartholar
389-
animate=yes
390-
fire_event=yes
391-
[/kill]
392-
#endif
373+
[event]
374+
name=last_breath
375+
[filter]
376+
id=Hartholar
377+
[/filter]
378+
[filter_second]
379+
side=3
380+
[/filter_second]
381+
[message]
382+
speaker=second_unit
383+
# po: Note for translators: this is supposed to be sarcastic:
384+
message= _ "For Malakar, the honorable! So honorable that he cannot even strike down his enemies!"
385+
[/message]
386+
[/event]
393387
[/event]
394388

395389
[event]

‎translations/Flight_Freedom.pot‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: https://bugs.wesnoth.org/\n"
5-
"POT-Creation-Date: 2024-10-31 05:15 UTC\n"
5+
"POT-Creation-Date: 2025-12-13 19:51 UTC\n"
66
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
77
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
88
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -7268,88 +7268,88 @@ msgid "NOTE: The campaign will not end if Hartholar is killed."
72687268
msgstr ""
72697269

72707270
#. [message]: speaker=Malakar
7271-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:247
7271+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:252
72727272
msgid "Saurians! You have no part in this madness. The humans are our common enemy!"
72737273
msgstr ""
72747274

72757275
#. [message]: speaker=Hartholar
7276-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:251
7276+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:256
72777277
msgid "These saurians are sworn to my service! You cannot stand against them!"
72787278
msgstr ""
72797279

72807280
#. [message]: speaker=Malakar
7281-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:259
7281+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:264
72827282
msgid "Hartholar! End these games! As we fight, the humans approach!"
72837283
msgstr ""
72847284

72857285
#. [message]: speaker=narrator
7286-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:264
7286+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:269
72877287
msgid "Hartholar does not respond."
72887288
msgstr ""
72897289

72907290
#. [message]: speaker=Malakar
7291-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:273
7291+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:278
72927292
msgid "Enough! Hartholar, surrender at once!"
72937293
msgstr ""
72947294

72957295
#. [message]: speaker=Malakar
7296-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:311
7296+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:316
72977297
msgid "Stay your hand! We do not have the right of assassination!"
72987298
msgstr ""
72997299

73007300
#. [message]: speaker=unit
7301-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:325
7301+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:330
73027302
msgid "Die, foul one!"
73037303
msgstr ""
73047304

73057305
#. [message]: speaker=unit
7306-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:349
7306+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:362
73077307
msgid "I will kill Hartholar, for the good of my tribe! Malakar, do not try to stop me. Although I understand that you are bound by honor to spare your vile enemy, I will do what must be done!"
73087308
msgstr ""
73097309

73107310
#. [message]: speaker=Malakar
7311-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:353
7312-
msgid "Loyal drakes! Kill the traitor, before he reaches Hartholar!"
7311+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:366
7312+
msgid "Loyal drakes! Kill the traitor, before he kills Hartholar!"
73137313
msgstr ""
73147314

7315-
#. [message]: speaker=unit
7315+
#. [message]: speaker=second_unit
73167316
#. Note for translators: this is supposed to be sarcastic:
7317-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:377
7317+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:384
73187318
msgid "For Malakar, the honorable! So honorable that he cannot even strike down his enemies!"
73197319
msgstr ""
73207320

73217321
#. [message]: speaker=Malakar
7322-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:393
7322+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:396
73237323
msgid "The Jamolar tribe is shattered, and my honor blackened! Nobody will stand with me now!"
73247324
msgstr ""
73257325

73267326
#. [message]: speaker=Malakar
7327-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:449
7327+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:452
73287328
msgid "Hartholar! There, to the north, are the humans' scouts! All hope is lost! As chief, I will face the hordes in single combat."
73297329
msgstr ""
73307330

73317331
#. [message]: speaker=Malakar
7332-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:453
7332+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:456
73337333
msgid "Hartholar, you are bound by this sacrifice to accept my people into your tribe. Perhaps your combined strength can succeed where ours has failed."
73347334
msgstr ""
73357335

73367336
#. [event]: type=Drake Priest, id=Morlin Ka
7337-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:465
7337+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:468
73387338
msgid "Morlin Ka"
73397339
msgstr ""
73407340

73417341
#. [message]: speaker=Morlin Ka
7342-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:476
7342+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:479
73437343
msgid "The Kakatar chief speaks true! Our fighting in the face of a greater enemy is a dishonor to Gar-Alagar himself!"
73447344
msgstr ""
73457345

73467346
#. [message]: speaker=Hartholar
7347-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:480
7347+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:483
73487348
msgid "Stay, warrior-chief! This sacrifice... I see that you are free of Stakron's taint. Forgive me, Malakar, I have done you a great wrong. I pledge myself and my tribe to your service, upon my honor."
73497349
msgstr ""
73507350

73517351
#. [message]: speaker=Malakar
7352-
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:484
7352+
#: Flight_Freedom/scenarios_b/02b_Swamps_Jamolar.cfg:487
73537353
msgid "Then we must plan our resistance!"
73547354
msgstr ""
73557355

0 commit comments

Comments
 (0)