As the disengaged state is part-way between the "partial" and "moved" states,
the orb has parts in each color. On the minimap these units are shown in the
partial color (which is also the color that would be used before this change).
This will match the mounted Quenoth units' "disengage" skill, when they
can still move but can't attack. It should also trigger for some UMC abilities
that get extra moves after a character attacks.
During testing, I found that TSG allows some of the bandits to attack on the
first turn of the bandit branch. There's no gameplay change there, but the orbs
make it much clearer that some units can still attack.
I think there are already too many preferences for orbs, so reused the existing
settings for the colors. A new "show disengaged orb" preference is added, which
when disabled shows the old partial orb instead.
Update the orb and ellipse sections of doc/manual/.
Notes about how I created the new orb image:
* create a color range to_ellipse_red with rgb=FF0000,FF0000,000000,FF0000
* wesnoth --render-image 'misc/orb.png~RC(magenta>to_ellipse_red)' images/misc/orb-ellipse-red.png
* open the orb.png and orb-ellipse-red.png images as layers in Gimp, add a layer mask to both of them
* use the layer mask to get each pixel from exactly one of the layers
* Fix month typo and add months to dictionary
* typo s/cuttle fish/cuttlefish/
The phrase "cuttle fish" is not in wiktionary.org. The unit id used in WML is left as-is ("Cuttle Fish").
* typo s/carvans/caravans/
* add spelling ol’; fix typo s/ol/ol’/
* fix typo s/alloting/allotting/
* Typo? s/movepoints/movement points/
* Typo s/critized/criticized/
* Typo: s/un-life/unlife/
* DW: typo: s/veterens/veterans/
* SoF: typo: s/fulfil/fulfill/
* SoF typo: s/Thursagen/Thursagan/
* SotA typo: s/permanantly/permanently/
* SotA: possible typo s/Rastaban/Ras-Tabahn/
* THoT: typo s/Aiglondor/Aiglondur/
* Use a typographic-style quotation mark
* Undo month name change
* Change spelling un-life -> unlife
World_Conquest has a bunch of campaign-specific tags and attributes. This was causing wmllint to produce spurious errors (see below).
I suppressed the errors with markcheck off
"data/campaigns/World_Conquest/resources/data/training.cfg", line 305: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 519: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 533: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 549: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 565: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 580: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 596: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 620: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 652: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 681: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 692: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 702: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 727: info should not have a translation mark
https://github.com/wesnoth/wesnoth/pull/5481 removed the check that made
wmllint: display on and wmllint: display off necessary.
This PR removes now redundant wmllint comments.
find ./data/ -name '*.cfg' -exec sed -ri '/^ *# *wmllint *:? *display *(on|off) *$/d; s/ *# *wmllint *:? *display *(on|off) *$//' '{}' ';'
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
1. Ibanovic wants all #textdomain declrations in line 1: c10cf2b68b
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
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".
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.
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.
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
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.
