1044 Commits

Author SHA1 Message Date
Celtic Minstrel
cc40d5c55b
Move the Merman Citizen and Brawler units to core (#7323) 2023-01-26 22:45:29 -05:00
Celtic Minstrel
77baa1efc7 Split unit abilities and weapon specials into separate files 2023-01-25 00:26:29 -05: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
doofus-01
1603dea8f6
make north-breathing drakes face se instead of s (#7233) 2022-12-26 17:13:53 -08:00
Jonathan-Kelly
1ba0a11a18 Make Nightblade the default advancement for Slayer 2022-11-14 17:22:25 -05:00
MJ
14706e52ed
Saurian Spearthrower tree (#6912)
Add Saurian spearthrower tree
2022-10-26 23:17:21 -05:00
Tommy
2d37a13bb8 WML: Add macros for screen_fade, and modify FLASH to use it as well
New macros:
 * SCREEN_FADE_OUT - to replace FADE_TO_BLACK in most cases
 * SCREEN_FADE_IN - to replace FADE_IN in most cases
 * SCREEN_FADE r g b duration
   - convenience wrapper for [screen_fade] with 255 alpha
 * SCREEN_UNFADE duration
   - convenience wrapper for [screen_fade] with 0 alpha
 * FLASH r g b actionWML
   - like FLASH_WHITE etc but takes a colour
 * FLASH_LIGHTNING actionWML
   - flashes an appropriate colour and plays lightning.ogg

Modified macros:
 * FLASH_WHITE/RED/GREEN/BLUE}
   - these now use [screen_fade] not [color_adjust]
2022-08-07 23:11:21 +12:00
Tommy
36d43da21a Add new PLACE_IMAGE_SUBMERGED macro and use for HttT:04_BoP
It does the same thing as PLACE_IMAGE except the created item may
use the same submerge code as units. If not placed on water there
will be no submersion effect. If placed on water it will be submerged
to the same level a unit would be submerged to. In general physical
items placed into water should use this, whereas items placed on top
of water should use PLACE_IMAGE.

The new macro has been applied to the merfolk cages in the Bay of Pearls
scenario in HttT.
2022-07-30 14:56:38 +12:00
Tommy
b4119dce4a Change pickuppable item macros to create submergable items
This fixes #1146.
2022-07-30 14:56:38 +12:00
Elvish_Hunter
1be1ba4282 Fixed {IS_HERO} to prevent loss of hero ellipse when leveling up 2022-07-27 16:18:06 +02:00
Discontinuum
6991fcf5a8 Fix the description of concealment
It affects all villages, water villages included
2022-07-21 18:21:15 +02:00
Pentarctagon
1244639dc7
Fix whitespace. 2022-06-28 23:34:27 -05:00
Celtic Minstrel
a089c6e5ea Deprecate {AI_CA_POISONING}
This was already effectively deprecated by proxy due to the overall deprecation of FormulaAI.
So this just adds a message.
2022-06-28 23:07:50 -04:00
doofus-01
5e8a467813
1.17 some orc standing animations (#6722)
* orc grunt north-facing breeze

* orc grunt south-facing breeze

* orc assassin south-facing conditional standing anim

* assassin wounded bob anim

* slayer breeze animation

* slurbow revision and breeze anim

* update orcish warlord sprite

* orc warrior sprite update & standing animations

* orc crossbowman breeze anim
2022-05-30 21:07:30 -07:00
Luis Miguel Iglesias Sánchez
2acc8e5e79
Added PASSABLE_HEX macro to core and Fixed wallstuck units in UtBS S8 (#6677) 2022-05-05 23:44:45 +06: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
28012997d2 Removed no longer necessary {CLEAR_VARIABLE heal_amount} lines 2022-01-16 17:23:09 +01:00
Tahsin Jahin Khalid
4f51ac18d4 fixed a typo in an optional advancement macro 2021-12-08 21:36:03 +06:00
Tahsin Jahin Khalid
07e694acee update all existing optional advancements to generalized macro 2021-12-08 21:33:11 +06:00
Tahsin Jahin Khalid
25340e3ee3 run wmlindent 2021-12-08 04:42:59 +06:00
Tahsin Jahin Khalid
8e63a0cab2 added 2 generalized macros for advancements 2021-12-08 04:41:12 +06:00
Discontinuum
36a610603e
Simplify the description of leadership (#6117) 2021-10-11 13:10:31 -04: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
doofus-01
4811de8642
Last minute Naga things (#5855)
* move UtBS mace nagas to core

* adding mace naga portraits from LordBob

* move naga hunter portrait to UtBS from core

* de-bow-ify the ophidian nagas and add Deflect weapon special

* revisions to mace nagas base sprites

* revisions to naga guards, including new weapon special Absorb

* compatibility Nagas for UtBS
2021-06-13 20:51:38 -07: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
newfrenchy83
128869d897
fix teleport message. (#5824)
Fix #5816 issue . 04455c0 commit forget second owner and unit.side in formula.
2021-05-31 13:45:28 -04:00
Celtic Minstrel
04455c01b4 Fix deprecated WFL side number usage
Fixes #5816
2021-05-29 11:23:04 -04:00
newfrenchy83
1cb2393b42 fix anerror 2021-05-02 19:40:48 -05:00
newfrenchy83
ad95696b4a Fix teaching_anim not implmmented in variation_id=sceptre of Httt Princes and Battle Princess
I have forget to pull this in variation scpeter of unit_type
2021-05-02 19:40:48 -05:00
Hejnewar
f027cd4900
Fix #5729 2021-04-26 18:17:47 +02:00
newfrenchy83
3db6b8b9d0 modify overwrites_specials in engine and utils.cfg macro 2021-04-20 23:30:23 -05:00
newfrenchy83
e3b737cfd6
Add [teaching_anim] for abilities used like weapon specials given by an adjacent unit
When a unit gives adjacent units abilities used like weapon specials, and is not already showing an animation from giving a resistance or leadership effect, a [teaching_anim] can be played instead.
2021-03-15 10:30:30 -05:00
Celtic Minstrel
a12de1f90f Fix several races using the Markov name generator instead of the new CFG generator 2021-03-05 09:29:11 -05:00
newfrenchy83
05b2ea2262
Extend special_id_active and special_type_active to account for abilities used as specials 2021-02-18 18:19:35 -06:00
doofus-01
d3f94aaaa6 unit animations - fix wrong-facing glitch for units with animated torch flame overlay - also allow for ne facing standing animations 2021-02-06 15:11:53 -08:00
Andrey Bienkowski
5cb1790669 Cleanup wmllint: display on/off
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) *$//' '{}' ';'
2021-02-02 18:36:28 +03: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
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
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
doofus-01
41b2030113
Revise the bobbing animation convention (#5388)
This shifts many bobbing animations to only run if the unit HP falls below a certain point.  Bobbing animations are a subset of standing animation, it is a case-by-case decision whether an animation should fall into this category or even be affected by this change.

Also in this:

* add wounded filter to STANDARD_IDLE_FILTER

* unit sprites - update orcish grunt and heaving anim

* units - north-facing sprites for orcish grunt
2020-12-28 10:43:21 -08:00
doofus-01
0daabf73ea
Units - various work on new fauna (#5344)
* finish Giant Stoat -> Frost Stoat conversion

* adding scarab (Horned Scarab)

* various fauna animations work
2020-12-20 19:19:43 -08:00
newfrenchy83
2168f629fb
Add overwrite_specials attribute to allow forcing a lower chance to hit
The reported issue being that the FORCE_CHANCE_TO_HIT macro was able to force an increase in an attack's chance to hit, but no longer able to force a decrease.
2020-12-14 14:57:59 -06:00
newfrenchy83
70e4f7bb7e
Move documentation outside some macros
Fixes #5347
2020-12-07 22:26:06 -06:00
Pentarctagon
62aa0b252f
Run wmlindent. 2020-11-30 16:10:28 -06:00
Celtic Minstrel
9c102a64c6
Fix OBJECTIVE_FOOTNOTE 2020-11-30 13:41:09 -05:00
Celtic Minstrel
212b4fc3d1 Put back the documentation comments removed in 0e800d36a6b57ad28d5e2a1d46c3181bb92b597c
This time they're added in the wrong place so as not to break the schema validation; they can be moved to the correct place later once that actually works.
2020-11-29 12:44:31 -05:00