46 Commits

Author SHA1 Message Date
Steve Cotton
bc64ea75c5 Fix some multiline po: comments
Multiline comments need the `po:` prefix on each line, otherwise that
line is ignored. This fixes all occurances of this.

Any lines which have nothing after the `po:` are still ignored, so I
haven't added it to the paragraph-break lines. The resulting .pot file
doesn't have paragraphs.
2024-01-05 10:19:44 +01:00
doofus-01
f5fec569ab
1.17 - Ant Queen (#7879)
* giant ant queen

* ant  eggs

* fire ant queen

* ant zombie and soulless

* empty ant egg item image
2023-09-10 21:10:12 -07:00
Steve Cotton
b9e4fdffb4 Update deprecation but postpone removal of the SPECIAL_NOTES macro
Units still using this in their descriptions will have the player-visible
header change from "Special Notes:" to "Special Notes (1.14-style, please
update to the new list format)".

The SPECIAL_NOTES macro was originally removed early in the 1.17 dev cycle.
That removal was reverted and postponed in the roadmap until Jan 2023, on the
grounds that it's a lot easier to test 1.17 when the big add-ons from 1.16 can
run on it.

In 1.16, UMC that hasn't upgraded yet already has a cosmetic bug - the help
pages of units still using the {SPECIAL_NOTES} macro will include duplicate
notes (assuming the expected usage of {SPECIAL_NOTES} as a heading in
[unit_type]description=, which is followed by old-style notes). These are minor
cosmetic bugs, which are expected to be removed as UMC gets updated.

That leaves the issue of what to do with the deprecated macro in 1.18. My
feeling is that we can easily continue to support the macro, albeit with the
cosmetic bug, so we should keep it for 1.18. However we could make it clearer
that the duplicated notes should be removed from the UMC.

This also removes some docs about NOTE_*s, those macros have already been
removed after being deprecated in 3568b5ff66ece00ec09f40059e552123f356d962.
2022-12-29 16:53:13 +01:00
Elvish_Hunter
0a3ab226b6 Fix a deprecated macro call 2022-03-01 10:15:44 +01:00
Steve Cotton
30a87e1391
Temporarily re-introduce the SPECIAL_NOTES macro (#6463)
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.
2022-01-26 19:12:46 -05:00
Elvish_Hunter
eaa26b0006 Removed two no longer useful wmlscope directives 2021-10-08 22:03:12 +02:00
Celtic Minstrel
61fa362781 Delete some deprecated special note macros
This only covers those deprecated at level 4
2021-06-20 23:36:20 -04:00
Steve Cotton
0fdf52058b Support [movetype][special_note] and [language]special_note_damage_type_*
Refactor special notes for abilities, attack types, movetypes and weapon specials

An easier way of setting special notes in the most common use-cases. Text given
in the following attributes will be collected and added to the special notes
for units and unit types (some of these were added in the previous commit):

* [ability tag name]special_note=
* [language]special_note_damage_type_TYPE=
* [movetype][special_note]note=
* [attack][specials][special tag name]special_note=

It's no longer necessary to put these notes in each unit_type's .cfg file, and
the macros for doing so are now deprecated.

C++ changes
-----

Simplify both unit_type::special_notes and unit::unit_special_notes. Add
utils::stable_unique, similar to std::unique but accepts non-ordered input and
preserves the order in the output.

Remove unit_type::has_special_notes() - callers can instead call
special_notes() and then check if the returned vector is empty, which removes
the need for duplicating code in unit_type.

Trade-off: the new [language]special_note_damage_type_TYPE is likely deprecated in 1.19.
-----

Adding [language]special_note_damage_type_TYPE= uses the same existing design
as [language]type_TYPE=, however both are hacks that don't fit the general
style of WML. It could be better to define a new [damage_type] tag that
supercedes both and also provides a place for specifying the damage icon;
however that won't be done in time for the API freeze for 1.16.

Doing it in the way that this commit does it is a hack, but it's one where
replacing it with the better solution in 1.18 will affect very few UMCs (only
those that define additional damage types). Even in the UMCs that would be
affected, it would likely only be a few changes in a single central file.

Trade-off: NOTE_DEFENSE_CAP is not auto-added
-----

It might be better to auto-add NOTE_DEFENSE_CAP when movetype.cpp detects that
the type has capped values. However as NOTE_SPIRIT already requires
[movetype][special_note], it's simple to use the same mechanism. If we decide
to change it to being auto-added, the current commit greatly reduces the number
of places that would need to change again, as it's now in the [movetype]
instead of the many [unit_type]s using that movetype.
2021-06-01 14:29:57 +02:00
Celtic Minstrel
3568b5ff66 An easier way of setting special notes in the most common use-case (abilities and weapon specials)
Rebased version of e6c58fc35cc398d70f31817f8b3ba783bfa08a6d, with merge conflicts resolved.
2021-06-01 14:29:57 +02:00
Celtic Minstrel
059dabcb6a Do a pass of macro documentation
- Adds a bunch of documentation
- Fixes some incorrect or inaccurate documentation
- Moves some documentation so that wmlscope actually picks it up
- Excludes some internal macros from being documented
2020-11-22 12:24:43 -05:00
gfgtdf
b21c110f30 run wmlindent 2020-10-19 23:53:52 +02:00
doofus-01
182a7bb602
Units - Dunefolk - Falconer branch of Skirmisher line (#4779)
* Units - Dunefolk - first draft at Falconer branch of skirmisher

* Dunefolk - revision to Falconer line

* Units - dunefolk - some progress on falconer standing animation

* Units - dunefolk - attack animations for falconer

* Units - dunefolk - defense and melee (partial) attack anims

* units - dunefolk - WIP lvl3 falconer

* units - dunefolk - revise falconer

* units - dunefolk - animation work on Falconer line

* units - dunefolk - falconer ability diversion revised to affect enemy chance-to-hit. Animation filter/trigger not yet resolved

* units/abilities - dunefolk falconer diversion ability-related animations mechanism

* units - dunefolk - sky_hunter animation frames

* dunefolk/abilities - fix diversion animations to work on die event

* abilities - schema validation induced correction

* abilities - diversion animations - attempt to fix case of undo movement

* units - dunefolk - finish some cosmetic issues for Falconer line

* units - dunefolk - wmlindent

* use on_undo over select in diversionability

undoing can only change the 'diversion' state if the original action also did,
so there is no reason to check it in all 'select' events.

* fixup

* minor clean-up

Co-authored-by: gfgtdf <daniel.gfgtdf@gmail.com>
2020-03-23 17:59:53 -07:00
Celtic Minstrel
d090f91bce Alter the special notes syntax in EffectWML so that the note macros can be reused in that context 2019-10-04 23:49:05 -04:00
Celtic Minstrel
4dd7824353 Redo the special notes macros so that the new ones won't trigger deprecation warnings 2019-09-12 08:51:05 -04:00
Celtic Minstrel
15f431785a Add [special_note] tag in [unit_type] as a neater way of specifying special notes for the unit's description 2019-09-12 08:51:05 -04:00
josteph
093fbc82fd Help: Show special notes one per line.
https://forums.wesnoth.org/viewtopic.php?f=12&t=49621
2019-03-25 22:40:00 +00:00
Ignacio R. Morelle
0e55f61051 Remove help markup from SPECIAL_NOTES_DEFENSE_CAP
Causes issues with tooltips in-game.
2015-04-16 22:03:23 -03:00
Ignacio R. Morelle
218b81f833 Use em dash in SPECIAL_NOTES_DEFENSE_CAP 2015-04-16 18:35:26 -03:00
Chris Beck
51725fd671 add a "special notes" for defense caps, with a link to explanation
This is better than what it was doing before this commit, which was
putting the link in the text in the table.
2014-07-16 15:30:54 -04:00
Steven Panek
9052a3576e 'The unit' -> 'This unit' in magical's special notes. 2011-07-27 05:09:26 +00:00
Eric S. Raymond
b0516d4b4f Write missing SPECIAL_NOTES_EXTRA_HEAL. 2011-05-08 15:39:14 +00:00
Nils Kneuper
bc1d7ec1a5 create textdomain wesnoth-help (part3)
load the textdomain ingame

change the textdomain for some relevant files
2010-12-22 11:36:22 +00:00
Steven Panek
a195d6f8b0 Added some pofix rules for quote conversions and spacing fixes. 2010-09-02 23:23:34 +00:00
Steven Panek
9c74e7292e Converted more apostrophes; ran pofix. 2010-06-29 21:26:06 +00:00
Eric S. Raymond
e7b27b6435 Change the trannstive verb "stone" (as in "turn to stone") to "petrify",
...and all related words such as "unstone", "stoned", etc. Former
usage was not really correct and led to unhelpful ambigiuity with both
"to stone" is in to hit with thrown stones, and "stoned" meaning
intoxicated.

All C++ code, WML, and tags are changed. New wmllint rules will handle all
lifting for UMC.  The wiki has been updated.

Will cause incompatibility with old savefiles containing stoned units.
2009-04-12 00:40:07 +00:00
Eric S. Raymond
4861e50155 Reindent mainline in preparation for 1.6. 2008-12-08 17:45:47 +00:00
Gunter Labes
f9b3df8d7d replaced "friendly units" in descriptions with more accurate phrases 2008-10-13 16:10:16 +00:00
George Birthisel
ccae3338d4 clarified special notes for plague 2008-06-23 18:14:01 +00:00
Lari Nieminen
c9b3d224cb Reverted core leadership back to its normal form.
The THoT loremaster line still needs to adjust accordingly.
2008-03-26 10:46:29 +00:00
Eric S. Raymond
22c0411b08 SpellingMistakes fixes (dev branch). 2008-03-25 14:13:58 +00:00
Nils Kneuper
983637898c add "while attacking it" to the backstab description in the special notes 2008-03-25 13:24:59 +00:00
Eric S. Raymond
f1c78b1c1b Address bug #11263. 2008-03-15 18:10:07 +00:00
Eric S. Raymond
364a4decbd wmlindent strikes again. 2008-03-07 21:26:44 +00:00
Benoît Timbert
31d20e87ea Revert 2008-03-04T03:14:09Z!esr@thyrsus.com since the side effect of this change cause more trouble...
...than the bug it addresses.

Never user several different description for the same ability :

- it causes trouble in the help

- it's not KISS and can confuse beginners
2008-03-04 20:26:07 +00:00
Eric S. Raymond
79a0b8fcfb Address bug #11189. 2008-03-04 03:14:09 +00:00
Eric S. Raymond
1a43511b37 Address bug #11079. (Change for 1.4 and 1.5.) 2008-03-02 18:04:18 +00:00
Eric S. Raymond
759f1dc262 Spelling, typo and text fixes related to meta-bug #10960. 2008-02-02 19:14:38 +00:00
Gunter Labes
493f7b1cd6 revert parts of 2008-01-14T22:08:08Z!benoit.timbert@free.fr
(removes the header markup from the special notes and the added
newlines between them)
2008-01-16 12:56:04 +00:00
Benoît Timbert
3559a385b3 Apply patch #941 by Vladimír Slávik:
Fix and enhance the special notes by adding a line between special
notes and highlight "Special notes:"
2008-01-14 22:08:08 +00:00
Nils Kneuper
f59aaf2ef8 write special_notes macros for the new abilities...
...and added them to the correct units
2007-12-30 13:44:35 +00:00
Nils Kneuper
170c33654e seperate 'Special Notes:' from the units into a macro on its own (patch #889) 2007-12-20 19:23:12 +00:00
Eric S. Raymond
7b059c1077 Add SPECIAL_NOTES_UNPOISON. 2007-10-26 22:26:42 +00:00
Ali El Gariani
80f7551397 Fix error in the description of backstab in special-note.
I used parts of the text from the backstab ability: 

"If there is an enemy of the target on the opposite side of the target.
This unit may backstab, inflicting double damage, by creeping around 
behind that enemy."
2007-08-31 19:07:58 +00:00
Nils Kneuper
c19e3c2311 added a default textdomain definition to all .cfg files 2007-07-06 09:00:49 +00:00
Eric S. Raymond
5f58e50664 Reindented all macros except utils.cfg,
that has unbalanced FOREACH/NEXT in it and will need to be
hand-checked.
2007-06-29 11:19:19 +00:00
Lari Nieminen
7f02e3438a Moved all the rest of the .cfg's in core/ containing only macro definitions...
...to core/macros/.
2007-06-10 11:17:28 +00:00