Commit graph

114 commits

Author SHA1 Message Date
newfrenchy83
a17369597c
give to abilitie support of halo or overlay (#7856)
give abilities support of halo or overlay so that the unit benefits from a second halo or overlay when conditions are matched

One of the things that bothers me is the permanent character of the halos of the Mage of Light and other units with the "illuminates" ability, which forces them to program only a permanent illumination applied only to the possessor of the ability.

Adding the halo attribute to ability does not change anything about the behavior of the unit, but can be used in several cases:

1 allowing the use of ""illuminates" whose activity would be variable, in this case encoding the halo in [illuminates] ability and not in the unit_type allows to modulate the appearance of the halo under the same conditions

2. Applying illumination to adjacent units, I know it's pretty cheesy but a set developer might consider it easier if the hlo display follows the same logic.

3 The halo used to illustrate the possession in the unit of a special weapon used as leadership, the halo would be used to raise the possessor of the ability.

for overlay, same logic for illustrate possession of a special weapon used as leadership, or influence on student

with the "halo_image" attribute, it is now possible to give Sun Sylph units an illumination ability with an activity depending on the incarnate sun attack instead of giving the ability and the halo via obect and therefore allowing the player to have access to the description of the ability even when it is inactive.
2023-09-25 11:06:41 -05:00
Hejnewar
36822eca3f
Miscellaneous units changes (mostly) 2023-09-16 19:55:28 +02:00
Hejnewar
091b094685
Balance for Rebels 1.18 2023-07-16 00:26:02 +02:00
Hejnewar
51bb130919
Balance for Loyalists 1.18 2023-07-16 00:20:12 +02:00
Severin Glöckner
1bedcf8bfe change textdomain & image path of mainline merfolk units 2023-04-13 06:10:28 +02:00
Celtic Minstrel
cc40d5c55b
Move the Merman Citizen and Brawler units to core (#7323) 2023-01-26 22:45:29 -05:00
Pentarctagon
9bfd432abe Update image pages for webp extension. 2022-04-30 14:23:32 -05:00
doofus-01
d9f6c3616b 1.16 - some attack icon work (#6339)
* feet

* different icons for ranged and melee mug globs

* spiked mace icon and alternate

* empty border for easier IPF-constructed images

* some spear icon alternates

* shadow claws icon added and wired into the mainline ghost shadow branch

* trident icon alternates for Triton

* icemonax tail attack icon

(cherry picked from commit 68aa08ad21)
2021-12-12 12:54:06 +11: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 e6c58fc35c, with merge conflicts resolved.
2021-06-01 14:29:57 +02:00
Hejnewar
525dd2ecd9 Balance changes 2020-08-04 19:35:55 +02:00
Hejnewar
11dcfe14a7
AoH balancing changes 2020-02-25 00:33:02 +01:00
nemaara
a311a3e194 Merman Hoplite: update description 2020-02-12 20:37:03 -05:00
Celtic Minstrel
c0210efb6d Move all core units to the new special notes system 2019-09-12 08:51:05 -04:00
FranPrin
4819846910 Dunefolk faction rework by various people
Changelog provided by @ghype below. Additional credits at the end.
=================================================================================================

*Art*
Most of units were reworked - some more some less - but our goal was to make them fit for mainline all together.
If any changes are needed to any unit, then we gladly execute those. There have been months worth of progress
documented in the according art thread for this project.

Base Units: https://forums.wesnoth.org/viewtopic.php?f=9&t=49075
Extra Units: https://forums.wesnoth.org/viewtopic.php?f=9&t=49625

*Balance*
The main reason why this project started in the first place. Here as well we have all the progress for balancing
Dunefolk documented and all developers and users interested in this project and seemed to agree on the current
state of balance. Thats the reason why we will not enlist all the changes here. If there are any problems with
the balance, then we too are willing to provide alternatives that can be discussed either here or on forum.

Balance Thread: https://forums.wesnoth.org/viewtopic.php?f=15&t=49627

*Alignment*
The balance of this faction was based on the newly proposed liminal alignment which works as +0/+0/+25/+0/+0/+25
instead of the old -25/-25/+0/-25/-25/+0

*Weapon Portraits*
As Dunefolk features entirely new units, we found some weapon portraits that fits the attacks of certain units.
The portrait - called „blade-curved“ is a franken but a convincing one. As the current blow pipe for UtbS is a
franken as well, this new weapon portrait should good enough to be mainlined as well. If this request get’s denied,
then we are free to provide alternatives as well. It just fits very well the theme of exotic Naga weapon
craftsmanship without relying on the orcish theme. It used for the following two units:

Lv2 Naga Bladewhirler
Lv3 Naga Dervish

*Descriptions*
New unit concepts require changes and new units require entirely new descriptions. We enlisted all problems and
inconsistencies that resulted with the rework and provided either solutions for them or new descriptions. Yumi
already started doing them but for those who want to see the initial conflicts, here you can find all the problems
displayed:

Unit Descriptions: https://forums.wesnoth.org/viewtopic.php?f=32&t=49867#p642698

*Female Dunefolk Names*
With the introduction of female units to this faction, we would require female names as well. Apparently this was
already coded in mainline, but simple not used.

*Future Plans - Animations*
There are some recourses from past works that allow us to - more or less - easily animate most of Dunefolk units.
The animations range from idle to attack-only, while other units will be fully animated. Some of the units that
are harder to animate will first receive single attack/defend frames until animation concepts were agreed upon.
Our goal is to make Dunefolk as alive as possible.

*Future Plans - Theme, Sound FX*
Rather unimportant to most people but I am interested to add some new sound fx that can start with different hit/death
sounds or new weapon sounds for scimitars. Those are just example and I do not know what I will end up with. But I know
that I will compose a Dunefolk Theme at some point. Using your feedback, I am sure I can manage to create something that
fits the faction the best.

*Future Plans - Wyvern Rider*
This is the only unit is the only one that did not get touched or reworked. The wyvern on it self looks amazing an does
not need any rework but the rider does not really fit thematically anymore, not to mention the weapon is too oversized
and not the usual Wesnoth style. But I won’t touch this sprite until it actually will be needed, most likely - IF -
there is ever going to be a mainline Dunefolk campaign.

*Credits*
I don’t know how detailed you need this to be but here all contributors.
ghype, Hejnewar, Krogen, The_Gnat, Lordlewis, EarthCake, Tom_Of_Wesnoth

It is however important to mention that the amount of contributions of each varies a lot in different categories. I will
organise it a bit and you make use of this info how ever you want. The names are in order of the amount of work put in.

Art: ghype, The_Gnat, Lordlewis
Balance: Hejnewar, Krogen, ghype, The_Gnat
Descriptions: Tom_Of_Wesnoth, Hejnewar

Earthcake joined us in the end and helped us finishing this project by cleaning/finishing the codes and doing all the git
stuff together with The_Gnat. Although none of his work can be categorised in one of the three categories, he still deserves
to be credit in one way or another.

Thanks for your time and efforts.
2019-08-11 07:02:58 +11:00
nemaara
c86cdb6853 Merfolk: increase HP of initiate advancements 2019-05-29 19:15:09 -04:00
nemaara
5489bc7002 Merfolk: change mer to merfolk 2019-04-16 23:39:21 -04:00
nemaara
9ce614675d Merfolk: change references of mermen to merfolk/mer 2019-04-14 11:34:10 -04:00
doofus-01
915cdf93b7 some basic animations - forwardporting PR#3896 2019-02-25 10:19:41 +11:00
Iris Morelle
2d7f6cd4c7 Replace a few instances of "mermen" with "merfolk" in core descriptions
These are only the ones were it's sufficiently unambiguous that the
description is referring to the merfolk race at whole. There are a few
instances I didn't touch were it's possible that the text refers
exclusively to mermen fighters (e.g. "the mermen armies").

See issue #2940.

[ci skip]

(cherry-picked from commit 14ec9954f1)
2018-10-07 03:19:39 +00:00
Matthias Krüger
b11d3fdcbe fix a bunch of typos found by codespell in data directory.
https://github.com/lucasdemarchi/codespell
2018-02-06 23:03:06 +11:00
jostephd
95b4d89eda Fix grammar in Merman Netcaster description (#1913)
Similar to #908.
2017-08-21 08:31:36 -04:00
Lari Nieminen
929093b4e7 Gyra_Solune's unit description updates (#743)
* Updated unit descriptions for the Orcish Grunt line

* Updated unit descriptions for the Merman Fighter line

* Updated unit descriptions for the Sergeant, Lieutenant and General

* Updated unit description for the Peasant

* Updated unit description for the Royal Warrior

* Updated unit description for Ancient Lich

* Updated unit description for Dwarvish Steelclad
2016-11-15 19:34:04 +02:00
Celtic Minstrel
b295aab4ba Deprecate {MAGENTA_IS_THE_TEAM_COLOR}
The magenta colour is now the default flag_rgb colour if one is not specified.
2016-08-05 00:49:39 -04:00
Celtic Minstrel
c2e216be5a Tweak some small_profiles 2016-03-21 12:50:04 -04:00
Celtic Minstrel
60a819f17e Remove all non-transparent portrait images
The small_profile key has been used in several cases to approximately preserve the cropping and orientation from the non-transparent portraits. Some of these could be up for review.
2016-03-21 12:50:04 -04:00
ln-zookeeper
f15c7643b9 Unified sword sound timing to -100/-75 (cases of -75 left unchanged) 2016-01-11 16:48:18 +02:00
ln-zookeeper
eb1da88f67 Unified staff sound timing to -125 2015-12-22 17:44:51 +02:00
ln-zookeeper
d8e5410086 Wired in the new staff sounds 2015-12-22 17:34:01 +02:00
ln-zookeeper
e4ed29c0ce Removed all uses of the now unnecessary SOUND:SLOW and SOUND:POISON 2015-09-08 12:11:12 +03:00
Charles Dang
dc566e46b6 Strip unused [portrait] blocks from unit files 2015-04-19 21:06:22 +11:00
ln-zookeeper
c4ad38a251 Revert failed attempt to fix slow/poison sounds
The fix failed because attacker/defender hits events are fired after the
attack animation has finished, not in the middle of it when the hit
occurs.
2015-04-17 08:47:07 +03:00
ln-zookeeper
6943bc0d6a Removed uses of SOUND:SLOW and SOUND:POISON 2014-12-07 14:28:46 +02:00
David Mikos
971dde985a Animation WML: fix unit/macro WML for sound start time in additional frames without duration 1 work around. 2013-10-08 19:31:31 +10:30
Alexander van Gessel
38b224c1ff Revert "Revert "Merge branch 'master' of github.com:wesnoth/wesnoth-old""
This reverts commit 23b72d6956.
2013-08-09 00:13:46 +02:00
Thibault Févry
23b72d6956 Revert "Merge branch 'master' of github.com:wesnoth/wesnoth-old"
This reverts commit 5fa5c03411, reversing
changes made to 06374c64ba.
2013-08-08 18:50:46 +02:00
Elvish_Hunter
695850efed Removed no longer useful ellipse= key from mainline units (merfolk) 2013-07-21 14:26:31 +02:00
David Mikos
1c1022e07a Minor changes to unit attack sound timings in collaboration with Bumbadadabum.
Units sound timings changed: Assassin, Orcish Assassin, Orcish Slayer,
Merman Warrior, Fencer, and Spearman ranged.
2013-03-22 21:29:38 +00:00
David Mikos
d60d4d7c61 Unit animation WML to use SOUND:HIT_AND_MISS macro throughout.
Large simplification and reduction in cache.
2013-03-20 20:01:25 +00:00
Jérémy Rosen
e1590a4254 apply patch #3682 by Coffee:
make image a progressive parameter+big WML simplification
2013-02-16 18:13:39 +00:00
Jérémy Rosen
dc02698fa8 change syntax of square bracket animations, ~ is not used for range 2013-01-30 21:37:44 +00:00
Jérémy Rosen
5662cbcc38 new syntax for animation lines, simplifies mainline WML quite a bit.
patch by Coffee
2013-01-26 22:33:51 +00:00
Alexander van Gessel
ffeca20f87 Remove [unit_type] undead_variation keys that are now unnecessary 2011-11-05 17:16:46 +01:00
Simon Forsyth
cb11c1df69 Long delayed commit of merman fighter se attack 2011-09-20 21:57:35 +00:00
Gunter Labes
4fd1e6fefb [[Balancing changes]]
* Decreased the XP requirement of the Mage from 60 to 54.
* Decreased the XP requirement of the White Mage from 150 to 136.
* Decreased the XP requirement of the Mermaid Priestess from 150 to 132.
2010-09-25 18:02:29 +00:00
Eric S. Raymond
e7d337a676 Reindent mainline. 2010-09-23 13:04:56 +00:00
Steven Panek
d784c34fd2 Applied file #10184 from patch #1926 with modifications. 2010-09-12 04:20:34 +00:00
Phil Barber
072e7e60c8 Add and wire new defence anim and se attack anim for Merman Warrior.
Update changelogs.
2010-08-20 08:50:49 +00:00
Phil Barber
85fc61f16f Add and wire new merman Hunter ranged animation and defence.
Update changelogs, credits.
2010-08-19 18:08:53 +00:00
Guillaume Melquiond
e027953a97 Fixed broken attack animation. (Patch #1779 by Anonymissimus.) 2010-07-29 02:30:00 +00:00