78109 Commits

Author SHA1 Message Date
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
92fedf8f2a Add DW rebalance to changelog 2021-01-14 05:03:23 -05:00
nemaara
9917854fa3 DW: rebalancing pass 2021-01-14 04:58:34 -05:00
nemaara
5b84e142e3 DW S8: no bah 2021-01-14 04:23:15 -05:00
Charles Dang
c5e5ce1352
Merge pull request #5429 from hexagonrecursion/wmllint-fog-fix
Fix wmllint confusing fake map border for fog
2021-01-14 18:22:01 +11:00
Andrey Bienkowski
73bc19576a Fix wmllint confusing fake map border for fog
According to this: https://wiki.wesnoth.org/TerrainCodeTableWML
^_fme is Fake Map Border
_f is Fog
2021-01-14 09:57:21 +03:00
Charles Dang
d0ee52e922
Merge pull request #5427 from hexagonrecursion/wmllint-skyhunter
Add missing NOTE_MARKSMAN to Dune Sky Hunter
2021-01-14 16:55:11 +11:00
Charles Dang
4a8245b04d
Merge pull request #5426 from hexagonrecursion/terrain-textdomain
Fix wmllint textdomain warnings in data/core/terrain-graphics
2021-01-14 16:54:44 +11:00
Charles Dang
fa450356b2
Merge pull request #5428 from hexagonrecursion/wmllint-data-core-units
Fix several wmllint errors in data/core/units
2021-01-14 16:54:10 +11:00
Andrey Bienkowski
518f6953d5 Fix several wmllint errors in data/core/units 2021-01-14 08:48:06 +03:00
Andrey Bienkowski
095123d678 Add missing NOTE_MARKSMAN to Dune Sky Hunter 2021-01-14 08:20:23 +03:00
Andrey Bienkowski
426564047e Fix more wmllint textdomain warnings 2021-01-14 07:05:33 +03:00
Charles Dang
cd833206b1 Utils: import make_optional 2021-01-14 12:32:00 +11:00
Charles Dang
a224b465ed Used default initialization instead of nullopt for default function parameters 2021-01-14 10:42:42 +11:00
Charles Dang
cc7204f66e Game Display: make first_turn a static local to the only function that uses it 2021-01-14 10:42:03 +11:00
Charles Dang
2005cfd92e Removed empty doxygen file descriptions (/** @file */) 2021-01-14 09:26:56 +11:00
Charles Dang
543e0d3e4c Display: format initializer list 2021-01-14 07:37:23 +11:00
Charles Dang
ca90cbe620 ToD Manager: minor code cleanup 2021-01-14 07:36:05 +11:00
Charles Dang
17b37737d8 ToD Manager: code formatting 2021-01-14 07:34:19 +11:00
Charles Dang
7703e9264f Time of Day: used emplace_back 2021-01-14 07:32:14 +11:00
Charles Dang
5ef2799ae1 Time of Day: code formatting 2021-01-14 07:07:30 +11:00
Andrey Bienkowski
ad4778037d Add textdomain wesnoth to two files w/o explicit textdomain
wmllint complained:
"../../data/core/macros/movetypes.cfg", line 1: no textdomain string
"../../data/core/macros/optional_unit_advancements.cfg", line 1: no textdomain string
2021-01-13 19:20:52 +01:00
hexagonrecursion
d9ec9b9b55 Add a note about wmllint-1.4 2021-01-13 18:27:16 +01:00
Andrey Bienkowski
c2badb8fc6 Add textdomain wesnoth to data/core/about_i18n.cfg
wmllint complained:
"../../data/core/about_i18n.cfg", line 1: no textdomain string
2021-01-13 13:56:52 -03:00
hexagonrecursion
7dce7fcffe wmllint: fix typo in a comment 2021-01-13 16:41:38 +01:00
Steve Cotton
5dc167a8e6 Remove the unused completely_redrawn event
No observers attached themselves to this event. Commit ea257355 removed some
code that should have been triggered by the event, but which now (since
ea257355) uses the "theme_reset" event or update_enabled_buttons() instead.
2021-01-13 01:55:10 +01:00
Charles Dang
fbef35bcbf Fixup doc comment 2021-01-13 05:18:40 +11:00
Charles Dang
bc6ff3140a Playsingle Controller: minor code cleanup 2021-01-13 03:01:03 +11:00
Charles Dang
1911906a80 MP: minor doc updates 2021-01-13 03:00:40 +11:00
Charles Dang
6982166d4d Game Display: removed unused ctor argument and member 2021-01-13 03:00:17 +11:00
Charles Dang
5bb45cda4a Game Display: format initializer list 2021-01-13 02:50:05 +11:00
loonycyborg
de6489da5a Fixed potential UB
this pointer needs to be duplicated because accepted_versions_ change
e.g. from load_config() could invalidate it
2021-01-12 13:05:50 +03:00
Charles Dang
a452fdc732 Lua/Terrain: removed utils::make_unique 2021-01-12 06:11:47 +11:00
Pentarctagon
20896278b5
Fix WML schema errors. 2021-01-10 15:48:39 -06:00
Charles Dang
47f6d15238
Merge pull request #5415 from newfrenchy83/patch-6
fix WFL variables aren't getting assigned correctly
2021-01-11 04:24:03 +11:00
newfrenchy83
b294aaa45d
flip other_ self_ 2021-01-10 18:08:59 +01:00
newfrenchy83
b68b2e4207
fix https://github.com/wesnoth/wesnoth/issues/5414 issue
fix attacker and defender formula pointed both' self'
2021-01-10 13:48:13 +01:00
Charles Dang
2cf8ec63a9 MP: used manager member for post-scenario screens 2021-01-10 13:29:51 +11:00
Charles Dang
b5d9d9cf3e
Merge pull request #5333 from wesnoth/vmp-pr
MP: unique background graphics for Isar's Cross
2021-01-10 11:50:46 +11:00
Nils Kneuper
e475a172ff updated Catalan translation 2021-01-09 12:23:38 +01:00
Nils Kneuper
1aa12caab8 updated French translation 2021-01-09 12:22:14 +01:00
Nils Kneuper
da5098a9ab updated Portuguese (Brazil) translation 2021-01-09 12:21:16 +01:00
Charles Dang
df87395aaf Removed overlays= from NAMED_LOYAL_UNIT
This key is deprecated and TRAIT_LOYAL handles setting the icon now.
2021-01-09 21:48:51 +11:00
Charles Dang
99fe4293c0 IS_HERO/IS_LOYAL: use [object] instead of overlays= 2021-01-09 21:48:00 +11:00
Steve Cotton
0ba433203e Fix [resistance_defaults] and [terrain_defaults] (issue #5308)
These now work:

    [resistance_defaults]
        id="special_res_for_test"
        default="30"
    [/resistance_defaults]

    [resistance_defaults]
        id="copy_of_arcane"
        default="(arcane)"
    [/resistance_defaults]

and so do these:

    [terrain_defaults]
        id="special_terrain_for_test"
        [movement_costs]
            default="(swamp_water + 1)"
            orcishfoot="(vision_costs.swamp_water * 2)"
        [/movement_costs]
    [/terrain_defaults]
    [terrain_defaults]
        id="special_terrain_for_test"
        [defense]
            default="(20 + 7 * movement_costs.special_terrain_for_test)"
        [/defense]
    [/terrain_defaults]

For [terrain_defaults], I've approached it as a new feature rather than a
simple fix. The subtags now use the same names as the [movetype] subtags and
[effect]'s `apply_to` attribute, so [terrain_defaults][movement_costs] instead
of [terrain_defaults][movement].

The formula handling will now recognise "resistance", "movement_costs",
"vision_costs", "jamming_costs" and "defense". For [resistance_defaults], the
formula will recognise both "(arcane)" and "(resistance.arcane)" as equivalent,
similarly for [terrain_defaults] "(swamp_water)" is a shorthand for whichever
subtag is being patched.

A [terrain_defaults] tag may use data added in a previous [terrain_defaults],
as in the examples above where the second tag's [defense] is based on the first
tag's [movement_costs], this gives orcish grunts on the special terrain a 62%
chance to be hit. However, relying on data in the same [terrain_defaults] that
creates or changes it is unsupported - if the [movement_costs] and [defense]
were in a single [terrain_defaults] tag then the result would be implementation
defined, because no guarantee is made of the order in which the children of the
tag are processed.

The schema gets fixed for [resistance_defaults] and [terrain_defaults], as it
only allowed one instance of each tag. The subtags of [terrain_defaults]
already had the new names.

In the schema's MOVETYPE_PATCHING macro, the default= key is mandatory except
for the types that fallback to using movement costs as their default. The tag's
implementation doesn't need it, however omitting it seems more likely to be
an oversight than a deliberate use of an edge case.
2021-01-09 09:13:41 +01:00
Charles Dang
b466230ee8 Fixup ef5296f 2021-01-09 13:33:37 +11:00
Charles Dang
6ed4900aea Merge branch 'master' of github.com:wesnoth/wesnoth into master 2021-01-09 11:56:09 +11:00
Charles Dang
ef5296faf5 Game Config Manager: removed jump_to_editor ctor argument
This was taken from the value in game_launcher, which was set to true if commandline_options::editor was set.
This uses that value instead of passing in the flag manually, which is consistent with the other defines.

This also removes game_launcher::jump_to_editor since it's no longer needed.
2021-01-09 11:38:33 +11:00