28500 Commits

Author SHA1 Message Date
Elvish_Hunter
2c993867cf wmllint: removed --stringfreeze command line flag
This flag was supposed to disable repair attempts for newlines in messages, however it never did so, even when the non-standard word wrap check was still available. Instead, it just disabled repair attempts for double spaces after sentence ends.
2022-04-25 23:05:39 +02:00
doofus-01
4e00e30640
1.17 - minor terrain updates (#6626)
* updates to desert terrain

*  ^Bsa snowy stone bridges 

* fix wooden bridge bug introduced by #6606
2022-04-23 20:23:35 -07:00
Steve Cotton
792f630c50 SoF: A few extra translation hints
po: In SoF S09, many strings involving Krawg (a gryphon) assumed that Krawg was
the only flying unit. Similar texts have been added that are used when the player
has gryphon riders too; most of these will be marked as fuzzy versions of the
Krawg-only strings.

(cherry picked from commit 745a0e127122b9b157ea89f178b906c610d59bce)
2022-04-23 12:41:39 +02:00
Nils Kneuper
f0e21155bd updated Chinese (Simplified) translation 2022-04-23 11:13:57 +02:00
Wedge009
f82079bcc0 SoF S9: Allow for Gryphon Riders to trigger an event on the final runic tablet, and add translator hint
Things in the scenario didn't quite make logical sense considering the presence of Gryphon Riders. This resolves the issue by allowing them to trigger an event, and by acknowledging them in the endlevel dialog. Additionally, one translator hint is added for the "Smash" text when the rune is smashed.
2022-04-22 11:30:03 +10:00
Steve Cotton
0f6a94f2a7 Unit tests for [drains], [poison] and [slow], with apply_to=opponent
Slightly different to PR #6582, which was the 1.16 version of this. The five
lines that were labelled `preserving known bug` are changed to test that it's
been fixed.

Here `apply_to=opponent` means that the weapon special gives the opponent the
ability, the unit that should get poisoned or slowed is the unit that has the
weapon special.

There's a known bug in 1.16, that `apply_to=opponent` check the wrong unit to
see it it's `unpoisonable`, `undrainable` etc. It also checks the wrong unit to
see if it's already poisoned or slowed, so a battle between two units that both
have reverse-poison results in at most one being poisoned.

Most of the credit for this is Newfrenchy's, as he's already written a fix
and a WML based test. This commit uses a Lua test instead to test more
combinations of statuses.

This adds a `COMMON_KEEP_A_B_UNIT_TEST` macro, which is a counterpart to the
`GENERIC_UNIT_TEST` macro that starts the leaders next to each other, ready
to attack. The `A_B` is because I'm planning a multiple-side variant too.

There's no test for [petrify], as simulate_combat doesn't provide a stat for it.

This tests only 3 of the 6 abilities whose behavior changed in 650f70405ff.
My thoughts on testing the others are:
* [firststrike]'s test is in 650f70405ff.
* [drains], [poison] and [slow] are tested here.
* [petrify] ends combat, it's also not exposed in simulate_combat's stats.
* [plague] triggers after combat ends.
2022-04-19 15:27:49 +02:00
Tommy
3a781c87ad Add pixel scale preference option. 2022-04-18 17:25:06 +12:00
Steve Cotton
c5dec73784 Unit tests: make separate files for each starting position
Turn the 4 side setup of the firststrike_and_laststrike test into a macro
called `COMMON_KEEP_A_B_C_D`for reuse in other tests.

The comment for `GENERIC_UNIT_TEST` gets a couple of extra paragraphs.

All the files get wmlindent run on them, which reindents `FAIL_IF_NOT`.

The main reason for having these is separate files is Git's fuzzy-patch
matching when merging and rebasing. Having large blocks of identical text
in `wml_unit_test_macros.cfg` can mean the wrong section gets patched.
2022-04-18 04:48:53 +02:00
Pentarctagon
073d4111b2
1.17.3+dev 2022-04-16 19:35:46 -05:00
Pentarctagon
4a6ba74ea8
1.17.3 2022-04-16 19:34:19 -05:00
loonycyborg
d10a784486
pot-update and regenerate doc files 2022-04-17 03:29:07 +03:00
doofus-01
19fcc1424f
Deprecation of old-style _PLFB and script-generated macros
1.17 terrain-graphics macros clean-up (#6606)
2022-04-16 10:01:09 -07:00
Celtic Minstrel
a76aa9bddc
Add wesnoth.interface.add_floating_label as a replacement for wesnoth.print (#5837)
This returns a label handle which allows you to remove, reposition, or replace the label later.

In addition to all the features of wesnoth.print, you can now specify where the label appears onscreen, as well as a fadeout time separate from the duration.

You can also anchor the text to an edge or corner instead of centering in on the screen,
specify the maximum width it can occupy as an absolute width or a percentage,
and specify a background colour and transparency.

It includes a demo scenario that demonstrates many of the capabilities of the API.
To play the demo scenario, run with -toverlay_text_demo or select it from the in-game test list.
2022-04-10 13:00:29 -04:00
Steve Cotton
c7acca4ea7 SoF: Consistently use lower-case after ellipses
Sadly, this takes the campaign up to 100 string changes between 1.16.2 and
1.16.3. The only one of these that was already going to change for 1.16.3 is
S04t's volcanic forge one.

(cherry picked from commit a1e60f061dd85237215966e5733a8da8f7ec126b)
2022-04-09 01:27:48 +02:00
Pentarctagon
c3a5763f03
Fix schema. 2022-04-08 11:49:02 -05:00
Charles Dang
c8f1e63742 Merge branch 'master' of github.com:wesnoth/wesnoth 2022-04-08 03:08:07 -04:00
Charles Dang
a3b6f57e4d Game Load: revamped design 2022-04-08 03:02:21 -04:00
Charles Dang
6b329a020a Loading Screen: added an (as-yet unused) image background layer 2022-04-08 02:59:11 -04:00
newfrenchy83
650f70405f
fix [firststrike] special with apply_to=opponent crashes Wesnoth 1.17.x (#6574)
As reported on the forum in https://forums.wesnoth.org/viewtopic.php?p=672374#p672374
If a unit with "last strike" ([firststrike] special with apply_to=opponent, on any of its attacks)
was targeted by other unit for attack, wesnoth crashed.

Fix similar problems for other weapon specials like poisons, when two users of specials with
apply_to=opponent fought, one fighter only could be poisoned or slowed.

* Add a unit test for poison
* Add a unit test for firststrike and laststrike
2022-04-08 02:30:14 +02:00
Luis Miguel Iglesias Sánchez
8561fb64e3
NR S05a_01 Enhance dialogue between Tallin and Abhai (#6612) 2022-04-08 02:26:09 +02:00
Wedge009
dbf50b01be THoT: Move unused images to attic.
Resolves #6602.
2022-04-05 10:34:19 +10:00
Descacharrado
eb123ed8bb Fix units stuck in spider wall and filter 2022-04-05 10:27:07 +10:00
doofus-01
9f98081cb5
1.17 terrain graphics transitions update (#6588)
* small improvements to wooden walls

* intra-pile rubble terrain transition

* fixing some bad perspective in desert mountain transition images
2022-04-02 04:13:20 -07:00
Elvish_Hunter
c2ece934bd wmlindent: refactored indentation level handling code 2022-04-01 22:53:44 +02:00
Steve Cotton
071ba9d7d6 Add a unit test for [move_unit]location_id with an occupied hex
(cherry picked from commit ba1767f8b90a4ca34cf8ef2abbc03cf98fd488f8)
2022-03-31 09:33:13 +02:00
Tahsin Jahin Khalid
32e0542b3b
Xol -> Xos^Efs for 4 maps of AToTB/SotA/THoT/NR
Updates deprecated maps to current tileset.
2022-03-29 13:26:04 +06:00
Pentarctagon
31cd64a374
Using cwebp directly shaves another 1 MB off the image size. 2022-03-28 23:12:47 -05:00
Steve Cotton
5c07604c01 wmlxgettext: add a --no-sort-by-file option
Some users of wmlxgettext have scripts that already provide the file list in
a deterministic order, and the sorting added in 3761faf925 was choosing a
different order to the one desired.

(cherry picked from commit 904bb9bfb82c391d20e89dfbaacc1e71749dc3d9)
2022-03-28 10:36:12 +02:00
Wedge009
1726c1ce48 THoT: Remove unused Ratheln character.
Resolves #6587.
2022-03-28 15:06:54 +11:00
Tahsin Jahin Khalid
000dde5bb1 THoT map 09: Xol -> Xos^Efs 2022-03-26 22:22:05 +06:00
Tahsin Jahin Khalid
90b68b5388 NR map 5A: Xol -> Xos^Efs 2022-03-26 22:21:52 +06:00
Tahsin Jahin Khalid
63e9d4d02b SotA map 20: Xol -> Xos^Efs 2022-03-26 22:21:41 +06:00
Tahsin Jahin Khalid
c5d7b6a954 AToTB map 03: Xol -> Xos^Efs 2022-03-26 22:21:00 +06:00
inferno8
c8958ff4a5
Convert Isar's Cross map background images to webp format (#6254) 2022-03-25 18:56:28 -05:00
Tahsin Jahin Khalid
2a679a76df DiD S8: Add Spectral Servant-line (ghost)
to list of units who cannot pick up the book
2022-03-24 06:16:29 +06:00
Tahsin Jahin Khalid
b1d0c983ed DiD S8: make Spectral Servant ghost-line trigger dialogue
for book pickup
2022-03-24 06:14:39 +06:00
Steve Cotton
2888f0417d Add unit tests for Lua API wesnoth.simulate_combat
(cherry picked from commit d96968b2ec0ea3198982fc530ee68054dd19af63)
2022-03-23 07:43:10 +01:00
doofus-01
3f500e3a4c
1.17 new Fence terrain (#6555)
* palisade terrain (*^Eqp) addition

* make Eqf and Eqp play nice

* try to make barrier fence editor tiles clearer

* get specific terrain codes out of the NEW:FENCE rules

* fence terrain macro cleanup

* better transitions for portals/fences
2022-03-20 20:35:08 -07:00
Pentarctagon
3f41d911f2
1.17.2+dev. 2022-03-20 12:03:51 -05:00
Pentarctagon
7ce603e565
1.17.2. 2022-03-20 12:02:51 -05:00
loonycyborg
400f5af475
pot-update and regenerate doc files 2022-03-20 06:52:10 +03:00
Elvish_Hunter
c23cdd5fb1 maps/background.jpg -> maps/background.webp 2022-03-16 22:34:06 +01:00
Elvish_Hunter
e1553e8c52 wmllint: added conversion rule for maps/background.png to WebP 2022-03-15 22:47:17 +01:00
Elvish_Hunter
9e98be3676 wmlscope: recognize webp images 2022-03-15 18:35:46 +01:00
Wedge009
170c124bcb UtBS: Rename ally_name to ally_id for clarity.
Justification: ally_name variable actually holds the ID attribute of the unit, not the name attribute.
This change was originally included in #6165, which has since been reverted, so reinstating the variable renaming here.
2022-03-15 10:51:13 +11:00
Wedge009
d5b95e621d While this is far from the only place where variables are used in translated text, the use of variables adds challenges to some translations.
The particular discussion which led to this reversion relates to the Czech translation.

Revert "Refactor handling of allies in UtBS. Resolves #6158."
Revert "Add po hints where self-referential troll names have been replaced with variables."

This reverts commit 541f0a1e73c45a8e58237e3a635d8d3bcbe1305a.
This reverts commit 4a3ddfb1430ce715e0ffbb519aef1c4592db3575.
2022-03-14 11:22:32 +11:00
Pentarctagon
f44acd68c2 Add build support for webp images. 2022-03-12 13:47:46 -06:00
Celtic Minstrel
57c2e6de4a Fix shroud unit tests not being classified as unit tests and showing up in the in-game test list 2022-03-11 09:46:33 -05:00
Celtic Minstrel
876827c644 Update deprecated uses of [replace_map] 2022-03-11 09:45:56 -05:00
Pentarctagon
95aaac76a9 Store add-on passwords in the credentials file as well.
This allows storing add-on passwords for uploading in the same credentials file as is currently used by the client when connecting to a multiplayer server. For add-on authors that don't keep their passwords as plaintext in their _server.pbl, this removes the need for them to manually enter their password each time they upload an add-on.
2022-03-10 10:23:01 -06:00