27670 Commits

Author SHA1 Message Date
Charles Dang
745b774102 GUI2/Preferences Dialog: utilized maximum_value_label 2021-01-25 18:52:17 +11:00
Eric Gallager
3118f7cecf
Tweak Delfador's Memoirs difficulty (#5382)
* DM: tweak difficulty

this should be equivalent to the following commits in my other repository:
3427219b45 (diff-f2f73b177895cba8d63b07c163e862b8fdd9da442fc060ae5d6b871ae321c867)
bb211951c1 (diff-f2f73b177895cba8d63b07c163e862b8fdd9da442fc060ae5d6b871ae321c867)
20e2a751f1 (diff-f2f73b177895cba8d63b07c163e862b8fdd9da442fc060ae5d6b871ae321c867)
2021-01-24 23:16:29 -05:00
doofus-01
2a8baa9590
various small fixes (#5495)
* units - set image_icon for sidebar display of Cataphract

* units - remove inactive ability description for Diversion

* add recruit/recall to event list triggering check for diversion animation (Dunefolk Falconer)
2021-01-24 16:59:54 -08:00
doofus-01
9229600b72
Sprite work (#5417)
* units - north facing bowman and troll whelp

* units - north facing standing and defense frames for dunefolk skirmisher

* units - defense and (half-hearted) dagger attack anims (SE) for poacher

* units - update footpad sprite (SE-only)

* ran wmlindent
2021-01-24 16:56:33 -08:00
Charles Dang
454bed95ce GUI2/Loading Screen: improved animation 2021-01-25 09:21:01 +11:00
Pentarctagon
47ba5b7af8
This script was never finished and never used, so delete it. 2021-01-23 12:42:34 -06:00
Andrey Bienkowski
a8a3bedc46 TSG: Add missing NOTE_DEFENSE_CAP
Three units with movement_type=mounted were missing {NOTE_DEFENSE_CAP}
2021-01-22 20:28:15 +01:00
Charles Dang
4bf5acf3f2 GUI2/Chat Log: marked text area as link-aware (fixes #5485) 2021-01-22 14:08:10 +11:00
nemaara
780a08016e
Merge pull request #5471 from hexagonrecursion/httt-side
Add side=1 in httt_utils.cfg to appease wmllint
2021-01-20 14:26:37 -05:00
Andrey Bienkowski
361a10241a Fix wmllint error: double space after sentence end 2021-01-20 16:59:09 +01:00
Andrey Bienkowski
f7c5b9c80e LOW: Don't forget to undefine local macros
Fix preprocessor warning:
warning preprocessor: Redefining macro LEAVE_BEHIND_L3 without explicit #undef at campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg:105
    included from campaigns/Legend_of_Wesmere/_main.cfg:18
    included from _main.cfg:38
previously defined at campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg:240
    included from campaigns/Legend_of_Wesmere/_main.cfg:17
    included from _main.cfg:38
2021-01-20 15:24:34 +01:00
Andrey Bienkowski
5b7865e36f wmllint: fix textdomain errors
1. Ibanovic wants all #textdomain declrations in line 1: c10cf2b68b6

2. Several files were missing an explicit textdomain declaration.
Three of them actually have translated strings that defaulted to "wesnoth" textdomain:
- data/campaigns/World_Conquest/resources/data/training.cfg
- data/campaigns/World_Conquest/era/campaign/heroes.cfg
- data/campaigns/World_Conquest/scenarios/WC_II_scenario.cfg
2021-01-20 14:00:11 +01:00
Andrey Bienkowski
22ab2eca92 HTTT: add wmllint: recognize Kalenz Delfador Konrad Li'sar
wmllint tries to detect errors such as a scenario referencing the unit by id before it is introduced by via [recall], [unit] etc.
The definition of "before" wmllint wants to check is chronological: "does an event that introduces a unit happen before an event that references it?",
but the current implementation cheats by simply checking if the definition textually precedes the reference.

22_Return_to_Wesnoth contains two prestart events. The first prestart event defines an event that triggers on turn 4. The second prestart event introduces Kalenz, Delfador and Li'sar.
I could merge the prestart events and reorder the code to avoid the wmllint error, but since it does not actually make the code easier to read I chose a less disruptive option of simply adding "wmllint: recognize".
2021-01-19 10:00:05 -06:00
Andrey Bienkowski
6d53a2ae7e HTTT: add wmllint: recognize Simyr
wmllint tries to detect errors such as a scenario author forgetting to introduce a unit via [recall], [unit] etc and then referencing the unit by id.

Simyr is added to your recall list if you beat 02_Blackwater_Port on HARD by killing the orc leader.

In this instance the scenario author not automatically recalling Simyr is clearly intentional.
2021-01-19 09:57:30 -06:00
Andrey Bienkowski
fff94cd463 Add side=1 in httt_utils.cfg to appease wmllint
Fix the following wmllint errors:
"data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg", line 697: unit declaration without side attribute
"data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg", line 712: unit declaration without side attribute
"data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg", line 727: unit declaration without side attribute

As far as I understand this should be safe - side defaults to 1 anyway.
2021-01-19 18:39:50 +03:00
mattsc
0905ee1fe7 Fast Micro AI: fix variable name
This wouldn't have been an issue, if there weren't also a local variable of the same name in the evaluation function. The way it was though, it caused an error when trying to execute an attack by the AI leader.
2021-01-18 19:29:55 -08:00
Andrey Bienkowski
1f374dd0a7 HTTT: don't change unit id
05b_Isle_of_the_Damned was using black magic: [store_unit] plus [set_variable] to change a unit's id. This confused wmllint. This is also just unnecessarily complicated since there are two more conventional ways to refer to the same unit: role=Advisor and id=$hidden_advisor.id
2021-01-18 21:18:15 +01:00
Andrey Bienkowski
579cec4139 Fix wmllint error: no textdomain string 2021-01-18 13:58:04 -06:00
Andrey Bienkowski
26ac543d71 [wmllint] DiD: suppress: Inky speaks in his/her "die" event rather than "last breath"
It is a common mistake to have a unit speak in his/her "die" event (after the death animation is played). Wmllint tries to catch that. In this case, however, Inky does not actually die (as far as the plot is concerned) so it is a perfectly
valid stylistic choice for her to make a "Bloub" sound as she dives into the water.
2021-01-18 13:57:56 -06:00
Andrey Bienkowski
67ea5b5eed DiD: Explain the Inky encounter logic 2021-01-18 13:57:56 -06:00
Andrey Bienkowski
b155192fb3 DiD: add wmllint: recognize Jaime 2021-01-18 13:57:27 -06:00
Andrey Bienkowski
208bf55c86 Use wmllint: recognize instead of blanket ignore 2021-01-18 13:57:02 -06:00
Steve Cotton
8bff60f441 Run wmlindent on DiD's scenarios 2021-01-18 14:08:29 +01:00
Andrey Bienkowski
b9d64a63e5 Add wmllint: display on/off around multiline messsages 2021-01-18 01:09:07 -06:00
Andrey Bienkowski
92ecc63962 Silence a wmllint false positive 2021-01-18 01:09:07 -06:00
Pentarctagon
3ddb5ce313
Fix macro arguments. 2021-01-18 00:57:49 -06:00
Andrey Bienkowski
30fb6a7d96 DiD: refactor scripted experience gain
My primary motivation was internationalization: with one added string we can translate all these messages.
2021-01-17 19:57:05 +03:00
Charles Dang
248eab0267 Fixup efa330a35c04bada6ae65a522597eaf144356e98 2021-01-17 21:29:15 +11:00
Severin Glöckner
efa330a35c NR S12: move dialogue from victory event
It's not shown with :n then
2021-01-17 06:35:49 +01:00
Severin Glöckner
deb007f1b1 NR S13: use new code features
Using location_id (which accepts multiple values sice 1.15.0)
and the new macros for handling overlays and ellipses.

Side effect: the now-leaders won't have the loyal trait anmore
2021-01-17 06:35:49 +01:00
Severin Glöckner
2d94d90449 NR S13: use Sisal as fallback for Eryssa
The situation of having her but not Eryssa is new.
2021-01-17 06:35:49 +01:00
Severin Glöckner
c5bc4e9c3f NR S12+S13: let Eryssa die
She's not needed anymore.
2021-01-17 06:35:49 +01:00
Severin Glöckner
7733e55077 NR S10: Fix side 7 objectives
closes #5373
2021-01-17 06:35:49 +01:00
Severin Glöckner
4846a08c5f NR: Krash's side is always orange 2021-01-17 06:35:49 +01:00
Charles Dang
e3f8b68796 Added basic dialog definitions for the Match History viewer 2021-01-17 11:48:21 +11:00
loonycyborg
3d81892b95 pot-update and regenerate doc files 2021-01-16 17:22:09 +03:00
Charles Dang
e2e50645cd DW: ditch the ENABLE_KRAKEN macro 2021-01-16 23:27:36 +11:00
Charles Dang
f69aa281c1 Revert "Avoid [+campaign] use"
This reverts commit f29ff0518034284610e057009aa380e6b6fe0da6. Since ENABLE_KRAKEN is defined in one of
the DW unit files, this causes the preprocessor to fail on game start.
2021-01-16 22:54:52 +11:00
Andrey Bienkowski
a71056df2f Quote an attribute value 2021-01-16 10:20:06 +01:00
Gunter Labes
f29ff05180
Avoid [+campaign] use 2021-01-15 20:45:00 +01:00
Andrey Bienkowski
8f84425ba5 Fix typo: team_name was used instead of user_team_name 2021-01-15 20:28:12 +01:00
Andrey Bienkowski
8581d21e1b Silence warnings about a missing translation mark
There is nothing that needs translating here
2021-01-15 15:33:23 +01:00
Charles Dang
75271a8246
Merge pull request #5430 from hexagonrecursion/wmllint-fog
Replace fog and shroud in map files
2021-01-15 09:25:30 +11:00
Charles Dang
f0d51ac57f
Merge pull request #5431 from hexagonrecursion/wmllint-fix-comment-parsing
Fix comment parsing in wmllint
2021-01-15 09:24:10 +11:00
Charles Dang
2157cf9768
Merge pull request #5432 from hexagonrecursion/wmllint-campaign-id-is-not-missing
Silence wmllint error about a missing campaign id
2021-01-15 07:11:30 +11:00
Andrey Bienkowski
48d001add7 Fix wrong comment handling in wmllint
A comment containing a string [advancefrom] was causing wmllint to get confused

../../data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg, line 22: [advancefrom] needs to be manually updated to [modify_unit_type] and moved into the _main.cfg file
2021-01-14 22:57:20 +03:00
Andrey Bienkowski
17a9cb720a Silence wmllint error about a missing campaign id
The following wmllint error was caused by the fact that the campaign definition is split into two and wmllint is not smart enough to understand that.

"../../data/campaigns/Dead_Water/_main.cfg", line 76: campaign requires an ID attribute but has none
2021-01-14 22:28:15 +03:00
Andrey Bienkowski
038f0d5109 Fix comment parsing in wmllint
wmllint saw [side] inside a comment and incorrectly assumed it is reading a side definition

"../../data/multiplayer/scenarios/4p_A_New_Land.cfg", line 484: side number 5 is out of sequence (11 expected)
"../../data/multiplayer/scenarios/4p_A_New_Land.cfg", line 488: side number 5 is out of sequence (11 expected)
"../../data/multiplayer/scenarios/4p_A_New_Land.cfg", line 512: side number 6 is out of sequence (11 expected)
"../../data/multiplayer/scenarios/4p_A_New_Land.cfg", line 516: side number 6 is out of sequence (11 expected)
"../../data/multiplayer/scenarios/4p_A_New_Land.cfg", line 540: side number 7 is out of sequence (11 expected)
"../../data/multiplayer/scenarios/4p_A_New_Land.cfg", line 544: side number 7 is out of sequence (11 expected)
"../../data/multiplayer/scenarios/4p_A_New_Land.cfg", line 568: side number 8 is out of sequence (11 expected)
"../../data/multiplayer/scenarios/4p_A_New_Land.cfg", line 572: side number 8 is out of sequence (11 expected)
"../../data/multiplayer/scenarios/4p_A_New_Land.cfg", line 805: side number 1 is out of sequence (11 expected)
"../../data/multiplayer/scenarios/4p_A_New_Land.cfg", line 818: side number 2 is out of sequence (11 expected)
"../../data/multiplayer/scenarios/4p_A_New_Land.cfg", line 831: side number 3 is out of sequence (11 expected)
"../../data/multiplayer/scenarios/4p_A_New_Land.cfg", line 844: side number 4 is out of sequence (11 expected)
2021-01-14 21:53:00 +03:00
Andrey Bienkowski
e39bf8f4e5 Replace fog and shroud in map files
"../../data/multiplayer/maps/6p_Team_Survival.map", line 2: warning, fog or shroud in map file
"../../data/multiplayer/maps/Dark_Forecast_drought.map", line 2: warning, fog or shroud in map file
"../../data/multiplayer/maps/Dark_Forecast_firstsnow.map", line 2: warning, fog or shroud in map file
"../../data/multiplayer/maps/Dark_Forecast_secondsnow.map", line 2: warning, fog or shroud in map file
2021-01-14 21:16:46 +03:00
nemaara
9917854fa3 DW: rebalancing pass 2021-01-14 04:58:34 -05:00