The whitespace-fixing script seems to be slightly different depending on the platform.
Even though it produces no effect in the CI, it made these changes locally on my Mac.
I'm committing them now so as to avoid unrelated files being changed in other pull requests.
Based on Pentarctagon's documentation addition, and also improving
the encapsulation of the test to take a boolean value for whether
the ability should be active instead of the expected damage total.
While this will be deleted before 1.18, at the moment UMC authors
are still working on 1.16. While the 1.17 branch is being used for
new development in the engine, I think it's more useful to be able
to run 1.16 UMCs that test engine edge cases rather than force the
UMCs to be upgraded for 1.18's macros.
There's currently circa 1200 units using `{SPECIAL_NOTES}` in
Ageless Era, probably requiring manual checks to update them.
Another option would be to `#define SPECIAL_NOTES` in the UMC
itself, but that would likely also mean that the warning was
silenced when running on 1.16, and few of the 1200 units would
get fixed during the 1.16 cycle.
This reverts part of commit 61fa3627818c1a3fb5181a21fc651b67d17b133a.
Arguably, references to generic sceptres, as is the case with references to the Sceptre of Fire before its completion throughout the rest of this campaign, ought to use the default US English spelling of 'scepter'. This was the case in The Rise of Wesnoth where Haldric quips that the Ruby of Fire should be made into a 'scepter'.
[ci skip]
* SoF Proofread Pass and Campaign Prose edits
This is a proofread pass. But this also has edits that are more than just minor edits which try to improve the campaign text.
commit
* SoF Proofread Second Draft
This is a changelog relative to the first draft:
- Fixed up "nor" in S1.
- reverted the ellipsis I added to indicate pause in story part of S2.
- Reworded my edit in S3 to be closer to the original.
- Followed Wedge's suggestion for S4.
- S5: Exchanged Shorbear dwarves and elves, removed introductory clause in ln 560, rewording in ln 592.
- Reverted my edit in S6.
- in S8, converted comma into ellipsis to indicate pause.
- S9: Reworded exposition of Thursagan, changed wording in ln1221, changed a period to a semi-colon.
* SoF Proofread Third Draft
* Update 4t_The_Jeweler.cfg
* Update 1_A_Bargain_is_Struck.cfg
removed a comma
* Update 1_A_Bargain_is_Struck.cfg
* More prose edits (SoF)
* Update 4t_The_Jeweler.cfg
* SoF Proofread Pass edits
* Capitalize Sceptre
* S5 and S9 small dialog change
* S6 change semicolon to period
* S9 change semicolon to exclamation
This adds help documentation for:
* The deprecated terrain marker
* XO and UO movement overlays
* Castle, keep and village overlays
* Fake Shroud
(cherry picked from commit bd9444ef06e751dadaa39a08eec2305620ea4f57)
Units on the recall list might have x,y coordinates that are on the map, which
therefore need to be replaced with "recall,recall" within [store_unit]. The
existing code created a temporary variable, changed the coordinates, and then
returned the unchanged original instead of the temporary.
Add a new test that `[put_to_recall_list]` followed by `[modify_unit]`
doesn't move the unit back to the map.
(cherry picked from commit 096d8aba1474e9c6583d240e7eedbcd66957f327)
