Commit graph

83373 commits

Author SHA1 Message Date
newfrenchy83
791e23b2ba Fix damage_type types show in unit attack window[1.18]
If [damage_type]apply_to= is applied to a unit that does not have the range attack equivalent to that of the user this type will still be shown, which should not be.
2024-06-18 22:39:51 +02:00
Steve Cotton
d5b726df6e Fix warnings about a template id in a constructor
It's redundant, and GCC-14 warns that this isn't allowed in C++20.
2024-06-16 12:48:13 +02:00
Steve Cotton
087fa65dc5 Fix dangling reference warnings about refs to iterators
These are causing warnings with GCC-14.

An iterator can often be a struct containing a single pointer, so
creating a reference to such a small struct doesn't make sense.

The structure returned by child_range is likely to be exactly two
pointers, so it's not a burden to keep it even though back() has
already finished accessing the child_iterator.
2024-06-16 12:48:13 +02:00
Pentarctagon
0d27d59901 Add berserk weapon special abilities tests (#8973)
Changes:
* CHECK_STRIKES macro now takes a comma-delimited list of strike counts for when units have a different number of strikes for different weapons, and updates the existing usage in the attacks tests
* Fixed a typo in the attacks_zero test
* Adds tests for berserk as a weapon special ability.

Berserk's handling differs from attacks as a weapon special ability:
* A value less than 1 is treated as effectively infinite rounds of combat (undocumented)
* The cumulative attribute is handled differently - in some cases it sums the values instead of using the highest single value whereas for attacks it always uses the highest single value

Also now exclude data/tests/ from scons pot-update since it was hitting the argument limit for number of arguments to a script.
2024-06-15 20:21:47 -05:00
Gunter Labes
af9dd1bfb6
Remove left over debug print 2024-06-15 22:47:01 +02:00
Subhraman Sarkar
54f7c206a9 network_download_file: replace spaces with tabs
Merely a whitespace change

(cherry picked from commit 441b2bbfaa)
2024-06-15 14:15:01 +02:00
Subhraman Sarkar
d0111b33b4 replace deprecated CURLOPT_PROTOCOLS with CURLOPT_PROTOCOLS_STR
* replace deprecated CURLOPT_PROTOCOLS with CURLOPT_PROTOCOLS_STR
* use conditional compilation for curl 7.85.0

(cherry picked from commit c12bb8ef69)
2024-06-15 14:15:01 +02:00
Nils Kneuper
b7f703a330 updated Chinese (Simplified) translation 2024-06-15 12:49:15 +02:00
Nils Kneuper
d9fa0ed182 updated French translation 2024-06-15 12:48:08 +02:00
loonycyborg
94412ee7b4
Change id tag in appstream manifest to what is expected
Flathub linter complains about mismatched id in flatpak manifest and
appstream. Based on appstream docs it seems that reverse-DNS name is
expected without .desktop extension so appstream should be changed.
Extra <provides> and <replaces> tags added as per
https://docs.flathub.org/docs/for-app-authors/metainfo-guidelines/#renaming-id-tag
2024-06-12 04:48:54 +03:00
Dalas121
a37aadcbc5 Merge branch '1.18' of https://github.com/wesnoth/wesnoth into 1.18 2024-06-10 19:17:32 -05:00
Dalas121
2a54d4aaf1 Revert "EI S06b: revert string change for 1.18.1 freeze"
This reverts commit 6408559b02.
2024-06-10 19:17:22 -05:00
Dalas121
d1dd992d08 EI S10: add message about Owaec being able to recruit (#8987)
Owaec has a crown but little other indicator that he's a leader, and this scenario requires him to be used to recruit. Make it more obvious to the player.
2024-06-10 19:15:41 -05:00
gfgtdf
e13d4dcaf8 Fix game sending actions too soon leading to OOS erros
Previously undo_blocked() would return false positive results. Leading to OOS erros because the game would then send actions to other clients even though they were still undoable. This would then result in OOS erros when the player attempts to undo the move.

This line is probably not needed at all since using the rng should always set is_simultaneous_ to true, but lets keep the changes minimal for the 1.18 stable branch.
2024-06-10 13:46:51 +02:00
pentarctagon
d8cd3449e0 1.18.1+dev 2024-06-09 22:51:02 -05:00
pentarctagon
e461e35729 1.18.0 2024-06-09 22:48:59 -05:00
pentarctagon
daf204f6f7 pot-update and regenerate doc files 2024-06-09 22:46:17 -05:00
pentarctagon
80d07152c7 changelog_entries 2024-06-09 22:41:49 -05:00
Dalas121
c2a59869cf EI items: add [filter_second] to Sentinel Shield and set delay=0 (#8984)
Delay=0 fixes an annoying animation issue, as the default is delay=500.
2024-06-09 21:12:25 -05:00
Dalas121
08358a38db EI S13: fix gaoler rebuild breaking "free prisoner" events (#8980)
Formerly, EI S13 uses various Deathblades' max-moves status instead of [filter_second] for some reason. This breaks when deathblades get rebuild, which in the bug report was caused by the sentinel shield. Use [filter_second] instead.
2024-06-09 21:12:24 -05:00
Dalas121
6cc8b2e1e1 EI S11: drop equippable items when imprisoned (#8982)
This is thematic, and also prevents cheese with shield+dacyn and baneblade+gate
2024-06-09 21:12:24 -05:00
Dalas121
cfc85d63e2 EI S10, S11, S12: Dacyn difficulty tweaks (#8976)
Resolves #8969

In EI S10, Dacyn picks up a cursed amulet and his HP drops to 1. In EI S11, Dacyn remains on very low HP, and is surrounded by orcs. There's a convenient ford hex he can hide on and be protected, but several players did not notice this hex and complained about difficulty.

In S10, this commit also drops his XP to 0. 1) showing that the amulet interferes with his MoL-ing, and 2) preventing the player from deliberately AMLA-ing Dacyn in the next scenario (partially a difficulty issue, but mostly it's bad to punish blind playthroughs / reward foreknowledge).

In S11, this commit adds a gold pile on Easy/Normal hinting towards the hex, while on Easy Dacyn's HP is fully restored. Hard is unaffected.

In S12, this commit restores Dacyn's HP on Easy (since it would be odd if he had full HP S11 but low HP S12).
2024-06-09 21:12:24 -05:00
Dalas121
f880bbaec8 EI S09: fix Grug telling Gweddry he can recruit the wild ogres after having already done so (#8981) 2024-06-09 21:12:24 -05:00
Dalas121
677e950d75 Merge branch '1.18' of https://github.com/wesnoth/wesnoth into 1.18 2024-06-09 11:24:05 -05:00
Dalas121
1a3ed67ec2 EI S10: reduce difficulty on Easy/Normal (#8956)
https://www.reddit.com/r/wesnoth/comments/1d6a3e7/eastern_invasion_is_much_better_but_still_bad/

EI's S10 is overly hard on Normal, and especially on Easy (which is intended to be a very accessible difficulty). This PR increases the available gold and adds several villages, which aid in both defense and upkeep. This PR also drastically reduces the number of orcs on lower difficulties.

We also move Owaec to his keep to help imply his ability to recruit, and remove the related just-added [note] string to avoid violating 1.18.1 string freeze.
2024-06-09 10:54:30 -05:00
Nils Kneuper
2d4a675069 updated Ukrainian translation 2024-06-09 09:17:04 +02:00
Severin Glöckner
0c409d5391 terrain2wiki tool: link to images on stable 1.18 branch 2024-06-08 21:17:23 +02:00
Severin Glöckner
305166e977 terrain2wiki tool: python 3.12 compatibility 2024-06-08 21:16:18 +02:00
Severin Glöckner
1b55cee68a German translation update 2024-06-08 20:54:00 +02:00
Steve Cotton
55aa8b44cf Add a unit test for a weapon-special activating mid-attack
A weapon with poison, which does extra damage to poisoned opponents.
This tests that the weapon-special's filter is checked on each strike,
instead of being tested once and then cached during the battle.
2024-06-08 15:50:41 +02:00
Nils Kneuper
2a195e128b updated Chinese (Simplified) translation 2024-06-08 15:42:48 +02:00
Nils Kneuper
b4b67f83b2 updated Japanese translation 2024-06-08 15:41:47 +02:00
Nils Kneuper
8b95042949 updated French translation 2024-06-08 15:40:51 +02:00
Nils Kneuper
72a308ab32 updated Czech translation 2024-06-08 15:39:55 +02:00
Nils Kneuper
9da76b2123 updated Bengali translation 2024-06-08 15:38:43 +02:00
Dalas121
6408559b02
EI S06b: revert string change for 1.18.1 freeze
EI S06b objective strings were changed to be less misleading and more transparent. Revert this change, and re-implement after 1.18.1 releases and the string freeze is no longer in effect
2024-06-06 20:35:16 -05:00
newfrenchy83
b990c4c10b
Use type_adv_tree in some filters to support addons adding advancements to existing unit types (#8904)
Cherry-pick of 9dd2d5d94b
2024-06-05 11:50:46 +02:00
Steve Cotton
b1458835cc Fix the whitespace error 2024-06-02 15:15:29 +02:00
Dalas121
961a8d7835 EI: use "bonus objective" instead of "optional objective" (#8947)
"optional" may imply that the scenario will be completed once this objective is finished, which is not accurate for these scenarios.
2024-06-01 17:58:16 -05:00
Dalas121
ef4cf3d0ac EI S06b: clarify bonus objectives
https://forums.wesnoth.org/viewtopic.php?p=690528#p690528

Old verbiage suggested that the scenario would be won as soon as you moved any unit next to Yannic, and didn't give any indication that he'd need to be protected.
2024-06-01 17:57:57 -05:00
Severin Glöckner
e447ccf70d Add [part]text_alignment= to schema
[ci skip]
2024-06-01 19:24:16 +02:00
Nils Kneuper
c51b35f249 updated British English translation 2024-06-01 14:38:45 +02:00
Nils Kneuper
c9c7b5e547 updated Bengali translation 2024-06-01 14:37:26 +02:00
Nils Kneuper
d9619c1fca updated French translation 2024-06-01 14:36:37 +02:00
Nils Kneuper
5f1da43829 updated Chinese (Simplified) translation 2024-06-01 14:35:34 +02:00
pentarctagon
2d816e8786 fix for targeting macos 10.12
note that this will no longer be possible once macos-12 is removed from CI eventually
2024-05-31 11:34:29 -05:00
Charles Dang
9163d84c07 Bump vcpkg baseline
Gives us (among other things) these updates:

Boost:             1.82                            -> 1.84
OpenSSL/libcrypto: 3.1.0a-dev (runtime 3.1.0a-dev) -> 3.2.0a-dev (runtime 3.2.0a-dev)
libcurl:           8.1.2 (runtime 8.1.2-DEV)       -> 8.6.0 (runtime 8.6.0-DEV)
Cairo:             1.17.8 (runtime 1.17.8)         -> 1.18.0 (runtime 1.18.0)
Pango:             1.50.14 (runtime 1.50.14)       -> 1.50.14 (runtime 1.50.14)
SDL:               2.26.5 (runtime 2.26.5)         -> 2.30.0 (runtime 2.30.0)
SDL_image:         2.6.3 (runtime 2.6.3)           -> 2.8.2 (runtime 2.8.2)
SDL_mixer:         2.6.3 (runtime 2.6.3)           -> 2.8.0 (runtime 2.8.0)

(cherry picked from commit f1e6a0e0b1)
2024-05-31 09:35:04 -05:00
pentarctagon
635f6f035a after last minute translation updates 2024-05-26 11:03:12 -05:00
Steve Cotton
2580c34c12 Update the changelog
Just adding entries for commits that should have had a changelog_entries file,
not merging the existing changelog_entries files.
2024-05-26 15:14:13 +02:00
Nils Kneuper
d461156a3d updated Ukrainian translation 2024-05-26 11:44:43 +02:00