28404 Commits

Author SHA1 Message Date
Steve Cotton
3761faf925 wmlxgettext: sort-by-filename before processing files
Add a sort inside wmlxgettext so that the order of filenames on the command
line doesn't affect the output. The sort is run unconditionally, because I
don't see a usecase for not enabling it. For consistency with xgettext and
msgcat, if there was an option to enable it then it would be called
`--sort-by-file`.

The aim of this change is to reduce the number of changes in .po files caused
by a pot-update. When multiple comments refer to the same translatable string,
separate runs of pot-update could generate them in a random order. If I've
understood the root cause correctly, wmlxgettext itself was deterministic, but
the order of the files on wmlxgettext's command line was not deterministic.

For testing, I tried reversing the sort order; the resulting reordering hit
lines that commonly swap order during pot-updates.

This affects the ordering of the lines beginning `#.` that are generated from
`#po:` comments and also those auto-generated from `[message]speaker=`, etc.
2021-12-02 09:54:26 +01:00
Descacharrado
d9ea4105a6
UtBS S02 Ogre now dissappears before Nym starts moving or talking (#6343)
* Ogre now dissappears before Nym starts moving/talks

* Changed the adjacency filter to fit the changes to the event

* Updated comment with a proper explanation of what occurs
2021-12-02 19:41:32 +11:00
Wedge009
4248738a38 Minor correction.
[ci skip]
2021-12-01 11:33:56 +11:00
Tahsin Jahin Khalid
01fa0c1e7c Fixed an extra whitespace in the Horse unit race description 2021-11-30 18:30:18 +06:00
Wedge009
a5f7d969aa Phrasing.
[ci skip]
2021-11-30 17:36:07 +11:00
Wedge009
f2203a48da Minor correction.
The statue Ras-Tabahn refers to is on the 'left' (west) from the player's perspective. However, the party is heading south, and still facing south, when this line is spoken.
Thus, the line really should say to 'our right'. Additionally, there is an animation of the statue being broken straight afterwards so it should be pretty unambiguous as to what is being referred to.

[ci skip]
2021-11-30 08:54:09 +11:00
Pentarctagon
370d03ccb7 Fix luacheck warnings and add to CI.
Note the `exclude_files` in .luacheckrc should be deleted once the eventual Ubuntu 22.04 base image has an updated luacheck that supports lua 5.4.
2021-11-28 14:26:02 -06:00
Pentarctagon
254716e41e Expand lua whitespace check. 2021-11-28 14:26:02 -06:00
Wedge009
aa6b45ee9f Ardonna should only call her own bats 'my pet'.
It's possible, however unlikely, for none of Ardonna's bats to have died before killing the hostile bats in 'Following the Shadow'.
In such a case, when the 'You can now raise bat corpses!' event triggers, Ardonna will still refer to the enemy bat as her 'pet' so add this condition to avoid it.
2021-11-27 12:39:22 +11:00
Wedge009
c1bca269cb Capitalise 'Sceptre of Fire'.
[ci skip]
2021-11-24 13:53:18 +11:00
Steve Cotton
b8400b5b72 ui: Fix 800x600 theme's sidebar tooltips
Two changes in the theme config for 1024x600, which is inherited by the config
for 800x600. Both are the same line but otherwise only loosely related to each
other; together these fix issue #6264, which was that trigger areas for some
tooltips overlapped.

Reduce the width for the unit's name, thus giving the side-flag and side-number
(which get the remaining horizontal space) enough space to display themselves.
128 pixels wide is the same as the name gets in larger themes, even though
those larger themes use larger font sizes. This means that the side number
doesn't get ellipsed, at least for games with up to 9 sides, with the
side-effect that the tooltip can be displayed when hovering over the flag.

Move the name, and thus the flag and side-number down by 1 pixel, so that they
don't overlap with the tooltip trigger areas for movement points and terrain
defense. The name's location is based on the placement of `unit-box-botleft`;
the theme for larger screen-sizes similarly adds 5 pixels of padding because
the `unit-box` is only 72x72 for the image, and the text areas for movement
points and defense go lower than that.

(cherry picked from commit 0d4854d5ffdcf265065d9519e2537dce14c8406e)
2021-11-24 00:38:49 +01:00
Wedge009
10e99924b5 Capitalise references to the Academy of Magic on Isle of Alduin, for consistency.
Resolves #6310.

[ci skip]
2021-11-23 14:08:02 +11:00
Wedge009
dcb127ffee Avoid unnecessary wording.
[ci skip]
2021-11-23 13:08:58 +11:00
Wedge009
5cda4f8089 Correct scenario count for SoF.
Looks like scenario '2p5' introduced in #4609 wasn't included in the scenario count.

[ci skip]
2021-11-22 19:35:27 +11:00
Wedge009
3922d04b44 Restore word mistakenly removed in 19a42e3ead717dc1808162168585abe8755df4a4.
[ci skip]
2021-11-21 22:07:37 +11:00
Steve Cotton
c449232730 UtBS: Use a lower-case letter for "taurochs"
It's the name of a species, so lower-casing it is consistent with #6067.
2021-11-20 00:54:53 +01:00
max-torch
78f37713f5 Define KeyboardInterrupt Exception Handler in wmlxgettext
Note: The signal class object was used to avoid wrapping the entire main routine in a try...except clause.
2021-11-17 23:08:37 +01:00
max-torch
e35690c8f9 Edit wmlscope KeyboardInterrupt Displayed Message 2021-11-17 23:08:37 +01:00
max-torch
74d8ac9e77 Edit wmllint KeyboardInterrupt Displayed Message 2021-11-17 23:08:37 +01:00
max-torch
56dc9830dc Define KeyboardInterrupt Exception Handler in wmlindent
Note: The signal class object was used to avoid wrapping the entire main routine in a try...except clause.
2021-11-17 23:08:37 +01:00
Wedge009
76fda0bf3d Refactor the boarding events for TRoW S8 Clearwater Port.
Resolves #6298.
2021-11-17 22:53:56 +11:00
Descacharrado
49e43694f4
HttT S05b - Added cracked temples (#6279)
* Added cracked temples to core and to S05b in HttT

* Compressed png files
2021-11-17 22:53:31 +11:00
Wedge009
541f0a1e73 Add po hints where self-referential troll names have been replaced with variables.
[ci skip]
2021-11-17 22:52:34 +11:00
Wedge009
4a3ddfb143 Refactor handling of allies in UtBS. Resolves #6158.
With four potential allies in the campaign, there is a lot of dialogue duplication. This refactoring attempts to consolidate the text.
Additionally, the ally ID was recorded in the variable ally_name which can be confusing, so rename it to ally_id instead.
2021-11-17 22:52:34 +11:00
Descacharrado
3b951350c8
UtBS S06b Fix Dwarf Sergeant confusing a dust devil or human for a troll (#6198)
* Fix Dwarf Sergeant confusing a dust devil or human for a troll #6196
2021-11-10 14:15:14 +11:00
Descacharrado
a351c78579
DM S07 Fix for player having to pass turn in order to meet alternative win condition (#6189)
Closes #6173
2021-11-10 12:50:08 +11:00
Wedge009
76d0f33e2c Rename kick attack for horses and wyverns.
Makes attack name consistent with other weapon attacks and also avoids translation issues (resolves #6071).
2021-11-10 11:25:39 +11:00
Wedge009
0709145670 Resolve title-screen vs main menu inconsistency.
Discussed in #4390 and originally introduced in 7c8c3114.
2021-11-10 11:20:33 +11:00
Alexander Lacson
cc608a1cd2
Make wmltools Forest avoid version control subdirectories (#6236)
This also makes wmltools Forest avoid .DS_Store and Thumbs.db files.
2021-11-06 23:19:14 +01:00
Steve Cotton
69ee817955
Remove the fast path of [modify_unit] (#6223)
Always use the "slow path", because it stores and unstores the unit, triggering
the desired side effects of unstoring a unit.

Fixes issue #5133, and tests that with the new unit test.

Fixes bug #4978, that changing the facing wasn't updating the display.

This corresponds to 1.16's commit 13c5d8a96ead8d2a7f0435f60b8ec7f7e0af0972,
that commit merely disabled the fast path to be a minimal change.
2021-11-05 21:39:38 +01:00
Charles Dang
65b7baab64 Orb Colors: fixed lack of borders on a label
Also moved this row to the bottom for UI cleanliness
2021-11-05 02:56:07 -04:00
Hejnewar
4fe7751158
Increase the limits of timer values that players can set 2021-11-03 16:07:41 +01:00
Descacharrado
4abe584a06
UtBS S06b: hermit enhancement and tentacle fix. (#6200) 2021-11-03 02:02:18 -04:00
Alexander Lacson
b99b089e90
Add Objective Note for Thursagan's Rune Mechanic (#6207) 2021-11-03 01:59:40 -04:00
Descacharrado
1b905240af
TRoW S19: Automatically collect chest at the end of the scenario (#6192) 2021-11-03 01:54:39 -04:00
Alexander Lacson
3a312f3703
SoF S4: Make mining gold and coal clearer (#6182) 2021-11-03 01:37:50 -04:00
Alexander Lacson
732559e8fa
SoF Add Rune Chest Objective Notes (#6208) 2021-11-03 01:29:33 -04:00
Tahsin Jahin Khalid
e8d841a392 [WC] changed heroes pools for the defiance faction 2021-10-31 19:59:03 +06:00
Tahsin Jahin Khalid
717f8ef5f8 [WC] add some minor adjustments to the new WC factions 2021-10-31 18:40:37 +06:00
Tahsin Jahin Khalid
f1313ff0f5 [WC] added a missing WC2 unit pair in The Empire 2021-10-31 18:26:35 +06:00
Tahsin Jahin Khalid
efb9c431ff [wc] ran wmlindent on files inside the era directory 2021-10-29 18:57:36 +06:00
Tahsin Jahin Khalid
5ad17db715 [wc] added the defiance faction to the WC era
dunefolk+undead
2021-10-29 18:48:24 +06:00
Tahsin Jahin Khalid
3ee980703f [wc] added missing recruit dune herbalist to marauders faction of wc era 2021-10-29 18:40:14 +06:00
Tahsin Jahin Khalid
098403ed0a [WC] changed leaders and random leaders for the marauders 2021-10-29 18:36:21 +06:00
Tahsin Jahin Khalid
268308cb06 [WC] added new faction The Marauders
Dunefolk + Northerners
2021-10-29 18:27:13 +06:00
Tahsin Jahin Khalid
66c18ec629 [wc] adjusted recruit list of artisans 2021-10-29 18:26:12 +06:00
Tahsin Jahin Khalid
512526b4b5 [WC] renamed aristocrats to artisans
reasons: Community suggested name change
2021-10-29 18:09:36 +06:00
Tahsin Jahin Khalid
655dead2e0 [WC] run wmlindent on the WC factions directory 2021-10-29 16:36:52 +06:00
Tahsin Jahin Khalid
10a4de1647 [WC] adjusted empire faction pairs to reduce its weirdness 2021-10-29 16:34:54 +06:00
Tahsin Jahin Khalid
67fdcce6c9 [WC] included the aristocrats faction in WC era 2021-10-29 16:31:36 +06:00