Commit graph

11471 commits

Author SHA1 Message Date
Subhraman Sarkar
6b1ccd9761 change horizontal scrollbar mode and update changelog
(cherry picked from commit 333b3edc42)
2024-04-03 13:03:39 +11:00
Subhraman Sarkar
da79275657 fix double scrollbar bug
(cherry picked from commit 90dcf67076)
2024-04-03 13:03:39 +11:00
Dalas121
be306abb44 EI 12_Evacuation.cfg: fix Dacyn's halo not flickering (#8676)
(cherry picked from commit 4dd164e0b0)
2024-04-03 10:47:01 +11:00
Dalas121
ce35bfd13d EI: survivor trait and sentinel shield bugfix (#8667)
* EI: fix sentinel shield + survivor bug #8632
* EI: fix survivor weaponless bug #8633

(cherry picked from commit 4bed0f2666)
2024-04-03 10:47:01 +11:00
Dalas121
04d29f4e3b EI - show custom traits in help menu (#8652)
* EI - add dummy unit file so traits show up in help menu.
* EI - add help_text to traits

(cherry picked from commit 8deaad2b10)
2024-04-03 10:47:01 +11:00
Steve Cotton
f7a0f119de Tutorial S01: Better timing for the hints
No string changes, just adjusting when the hints at the top-left of the screen
appear and disappear.

The hint about crowns now appears after recruiting both elves, so that there
are units to compare the leader to, who have the same orb color but no crown.

The hint about traits appears when told to attack the quintain with the elves.
The player will probably find a strong or dexterous trait, and Delfador already
comments about those traits after attacking. Even if neither elf has those,
speedy or robust could also influence whether to use melee or ranged attacks.

There's now no hint on screen when first choosing which village to use for
healing; previously it was the hint about crowns which didn't seem relevant.
No strings are added in this commit, but a hint about checking the quintain's
movement range would fit here, see <https://r.wesnoth.org/t54644>.
2024-03-29 10:22:48 +01:00
Jonathan-Kelly
51e8f01627 WoF S11: tweak enemy gold
Testing by effectively droiding the player's side, the enemy side still lost even with 480 gold and otherwise default difficulty settings. So upping enemy side gold to 480 for all difficulty levels.
2024-03-17 14:11:30 -05:00
Nils Kneuper
1a0de0e4b2 updated Italian translation (incl. image changes) 2024-03-16 16:50:35 +01:00
Jonathan-Kelly
58c53f9822 WoF S11: more enemy gold 2024-03-15 14:53:09 -05:00
Jonathan-Kelly
00a0552c18 WoF S10: smaller enemy waves 2024-03-15 14:53:09 -05:00
Jonathan-Kelly
4fd13e5145 WoF S9: yet more yetis 2024-03-15 14:53:09 -05:00
Jonathan-Kelly
b039c67200 WoF S7: slightly weaken guards 2024-03-15 14:53:09 -05:00
Jonathan-Kelly
86d459fc60 WoF S6: minor income consistency 2024-03-15 14:53:09 -05:00
Jonathan-Kelly
c750e78d6b WoF: adjust music 2024-03-15 14:53:09 -05:00
Jonathan-Kelly
ae3bb1331f WoF S9: move crannog village in from map edge
Two other maps and one other scenario which depict the same region get corresponding tweaks.

(cherry picked from commit a3a785f27b)
2024-03-15 08:45:03 +11:00
Wedge009
abf559712a SotA S16: Keep Crelanu within his ring of protective holy waters. Resolves #8361.
Changelog added after cherry-picking.

(cherry picked from commit d106238410)
2024-03-13 13:26:33 +01:00
Iris Morelle
d6a8c98211 EI: Bind translatable strings to wesnoth-units
Barrow Wight's definition includes a couple of attack name strings
from the wesnoth-units textdomain bound to wesnoth-ei by default
instead, which creates two unnecessary extra strings for translators
to translate. This change fixes this by binding these two strings to
wesnoth-units so their existing translations can be used.

(Pyre Wight does not require this change since it already uses the
wesnoth-units textdomain for the single attack name it uses.)
2024-03-07 15:13:19 +01:00
Jonathan-Kelly
37150b4e22 WoF S11: fix wmllint error by reorganizing side 2
Since wmllint gets confused if a side's contained [ai] block comes after any of its contained [unit] blocks. This refactor should make the side 2 code block more human readable too.
2024-03-05 17:04:33 +01:00
Jonathan-Kelly
bac29601fa WoF: add wmllint 'skip-side' magic comments 2024-03-01 20:08:16 -05:00
Jonathan-Kelly
827b3950e8 WoF: fix wrongly capitalized variable name 2024-03-01 20:08:16 -05:00
Steve Cotton
7ac222916a DM S18: Add a po hint about grammatical tense of some text 2024-03-01 22:36:37 +01:00
Celtic Minstrel
3ac99d1d86 [Lua] Fix missing parameter warning when passing empty filter 2024-02-26 13:19:55 -05:00
Steve Cotton
6bfd776157 HttT S06: Make Elensefar's defenses look damaged by the Orcish siege
Just some debris embellishments to suggest that the towers at the
end of the bridges were hit with siege weapons. The defense stats
are still the same and there's no dialogue change to go with this.

(cherry picked from commit b9cb577bac)
2024-02-26 13:13:45 +01:00
Iris Morelle
c64777433a HttT S5b: Fix duplicate loyal trait for Delurin
NAMED_LOYAL_UNIT has the loyal trait built in, so this results in an
extra copy of it being granted to the unit.
2024-02-25 18:46:59 +11:00
Wedge009
f719ae8fc9 Bat images were moved from undead directory to bats in #6655.
(cherry picked from commit a59c32f9e2)
2024-02-21 11:15:01 +11:00
Hejnewar
0034b98fc2 UtBS Heroes: Taunting Strike xp farm fix
In addition make taunting strike more synergised with bolas.
2024-02-18 21:04:29 +01:00
Hejnewar
82128b6b5a UtBS Units: Fighter line adjustments
Adjust Fighter line to allow for easier early leveling and more late game staying power. Add parry to secondary melee attacks in order to incentivise their use.
2024-02-18 21:04:29 +01:00
Steve Cotton
bd31d9042d DiD S10: Fix missing line in human heroes' book endings
A simple case of `role=unit` instead of `speaker=unit`, the
necessary translatable text was already in the scenario.
2024-02-18 16:43:54 +01:00
Hejnewar
cfb7221262 UtBS S01: Improve event/dialog consistency regardless of trigger order
Fix #8201
2024-02-18 14:44:54 +01:00
Hejnewar
a7680561d0 UtBS S05: Use enter_hex so events cannot be triggered out-of-sequence
Fix #8190
2024-02-18 14:44:54 +01:00
Steve Cotton
af8c2fe5cb
EI S11-S18: Add more PO hints
Has a few updates to S04a, S04b, S09 and S99 too.

Lore: this declares Khrakrahs (dragon seen in SoF) to be male.
He's been in many versions of Wesnoth that only had male drakes,
thus will surely already be male in any translation where the
gender has an effect on the wording.

There's a few "TODO for 1.19" comments added:

* In S12, the left behind units say "we must ride ... to save Wesnoth",
    but it should be "you must ride".
* The intro of S13 is confusing, there's little indication of why you
    only have one unit, or what mission he failed.
* In S16, Gweddry says "night approaches" on turn 1 (morning)
2024-02-18 10:44:32 +01:00
gfgtdf
c7ca36be6e
wc: fix #6513 Bezoar artifact (#8340)
* wc: fix #6513  Bezoar artifact

The item now applies the effects directly instead of using [trait]s, 
The lua code that added traits in the wc lua files didn't work, but the main reason why i preferred  this solution instead of changing the lua files is that it makes it possible to simply remove the artifact via for example [remove_object] (which wouldn't work for artifacts using traits as those are separate modifications)

The code now also adds a dummy ability so that players know that this unit has the benefits of the healthy fearless and  undead  traits.
2024-02-17 23:25:07 +01:00
MechanicalDragon963
c6d8c67495 HttT S16, S19a, S19b and S22: Map embellishments
S16 (Hasty Alliance) uses more rocks and bridges, including
bridges over lava.

S19a (Snow Plains) gets some dirt roads without snow on, and the
edge of the map gets some ice and water.

S19b (Swamp of Dread) gets a wide variant of swamp terrains
instead of sand.

S22 gets more variety in the forests and grasslands.

Cherry-picked from the branch in PR #8243.
2024-02-17 22:05:08 +01:00
Steve Cotton
1c4b46add3 EI S01, S13: Fix Gaennell's gender
She's meant to be female, but in S01 the gender defaulted to male,
while in S13 it was set to random.
2024-02-17 20:24:08 +01:00
OrekOrek
97635055f0
HttT S17 Ensure map always has 6 castle hexes around Konrad (#8314)
HttT S17 map height +5

According to several hundred test runs, Konrad's castle seems to be produced between y=59 and y=71 when the center of the chamber is set at y=65 as it currently is.

Because map_height=75 means that the playable map size is y=73 due to the border hexes at the top and bottom, this change probably guarantees that Konrad's castle is fully within the playable map.
2024-02-17 18:05:18 +01:00
Dalas121
e380abd2ce
EI S12: bugfixes for dra_nak_dead and flying undead drowning
EI - dra_nak_dead branch bugfix. Fixes #8414.

* S18 conditionally forwards the player to the bonus scenario, S99. One of the required conditions is that dra_nak_dead is not yes. The victory event of S12 unconditionally cleared dra_nak_dead, meaning that that test in S18 would always pass.
* S12 tests dra_nak_dead to see if he was killed in S11, and if he wasn't then it renames "Varrak-Klar" to "Chief Dra-Nak", as if Dra-Nak was pursuing the heroes. However, S12 didn't set the dra_nak_dead variable if the renamed Varrak-Klar died.

EI - S12 bugfix flying undead being drowned/trapped

* In EI S12, units were killed/lost when a bridge is destroyed.
* Flying units shouldn't be killed/lost, as they can fly.
2024-02-17 03:52:26 +01:00
Celtic Minstrel
8d30761ca8
[WoF] Avoid code duplication and fix a non-translatable string (#8384)
Instead of copy-pasting the multiplayer turns over advantage function, just use that function directly.

This required making some changes to the function to better support this specific use-case,
but I think it's still better than copy-pasting it.

I split the primary functionality out into two separate pieces – calculation and display.
Thus, the main function is technically unchanged, while WoF can avoid the weird things it does
and just calculate and display how it wants.

This fixes #8368.
2024-02-16 09:38:45 -05:00
Dalas121
17ea7cd2c2 EI: fix Terraent standing animation, and update stats to match mainline
When Terraent was created, the mainline paladin had no standing anim. When that was added, it conflicted with Terraent's. This fixes that issue.

This also updates Terraent's other stats to match the mainline paladin's rebalanced stats.
2024-02-16 00:47:45 +01:00
P. J. McDermott
368e270bf3 Fix some spelling errors
These are not translatable strings.

Debian's lintian QA tool found the instances in code.
2024-02-15 17:27:44 -06:00
Steve Cotton
4567d56e22 EI S05-S10: Add more PO hints 2024-02-15 17:33:41 +01:00
Dalas121
1a6e559e5c EI - fix S11 cell-door-open event
You begin the scenario locked in a cell needing to escape through some caves, but it's possible to open the cell from the inside.  This fixes that.
2024-02-15 15:31:41 +01:00
Celtic Minstrel
915fd49ae6 Tutorial: Specify the side of Li'sar in the char select
When a unit data passed to `to_map` either lacks a side or has
side zero, implementation automatically sets it to 1, thus the
existing code worked fine. However:

1. The lack of a `side` could trigger a warning in EmmyLua. It
currently doesn't trigger that, but would with Celtic Minstrel's
planned improvements in Wesnoth's lint hints.

2. The tutorial should be good example code, and the special-case
in the C++ code that made this work is a case of "assume it's a
SP situation, and choose the result that benefits side 1".
2024-02-15 09:57:17 +01:00
Celtic Minstrel
600c88c291 [WC] I think this was a remnant of a global variable removal...? 2024-02-13 19:32:39 -05:00
Celtic Minstrel
0ef38c82c8 [WC] Fix a broken map filter
I'm not sure what the intent was here, so I had to make a guess.
2024-02-13 19:32:29 -05:00
Steve Cotton
bded0465fc EI: Use the translated replacement for Mal Talar
If Mal-Talar dies in S01 then a new leader (actually just a rename)
turns up in S06b and S07b, but the replacement name, "Mel Kevek",
wasn't marked as translatable.

For the case that both necromancers from S01 were killed, S02 already
had a fallback to Mal-Bakral. This reuses it and adds documentation.
2024-02-13 18:48:26 +01:00
Steve Cotton
7aaa2079a0 EI S01-S04x: Add more po hints
No changes to translatable strings, just to the hints.
2024-02-13 09:39:16 +01:00
Dalas121
bcf7d97d81 Fix enemy spawning event not triggering when turns end (#8376) 2024-02-12 12:30:42 +01:00
OrekOrek
4e2cd280ab
HttT S11 Make the objective clearer (#8326)
* Konrad on a sand hex ends the scenario (previously he needed to reach flat terrain)
* Adjust the map so there's more water before reaching the sand hexes.
2024-02-12 12:29:53 +01:00
Steve Cotton
9146db7d5d EI S04b: Fix Hahid's name having a trailing comma
This doesn't change a translatable string, it removes a comma
that was immediately after the translatable string.
2024-02-11 16:55:20 +01:00
Steve Cotton
5b35ca3edd SoF S02: Alanin has planned (unshrouded) his escape route
The intro to this map shows Rugnur running into the stronghold, with the
elves not far behind. Those moves were running into shroud, which
generated "could not find move_unit_fake route" warnings because the
animation prefers routes that moving side can already see.

Also, have the conversation between Alanin and Rugnur take place with
Alanin on a road hex, because if he starts on the keep then he takes a
long route to avoid cave terrain.
2024-02-08 00:47:28 +01:00