Commit graph

185 commits

Author SHA1 Message Date
Tahsin Jahin Khalid
da53b6967f
Units: update falcon and raven races to not get names
* update falcon and raven races to not get names

To conform with other monster units

* units: remove a redundant line of code

from races falcon and raven definitions
2023-10-26 12:54:37 +06:00
doofus-01
c9182b952b
1.17 - Last-minute string cleanups (#7950)
* fix some Raven-related fluff

* small revision to fire ant egg fluff

* replace double-spaces after sentence with single-spaces
2023-10-15 16:08:21 -07:00
doofus-01
aee30af143
1.17 - Ravens (#7902)
* Add ravens unit line

* Update to Roc
2023-09-30 21:45:40 -07:00
Hejnewar
07a64d4603
Arcane Resistances Rework
The basis for this rework is lowering the extremes in acrance resistances between units and factions. That allows for more free usage of arcane damage and helps with balance of games in which high levels are way more frequent than in standard default 1v1 or 2v2.
2023-08-17 14:25:59 +02:00
Jonathan-Kelly
eac522597d Slightly reduce merfolk forest and hill move cost
From 5 to 4. Makes moving them from one water body to another somewhat less tedious. Likewise makes merfolk units a bit more viable on maps with separated waterways.
2022-11-16 22:39:29 -06:00
Jonathan-Kelly
ebe069de0b
Give Shyde and Sylph unwalkable statistics (#6994)
* Give Shyde and Sylph unwalkable flight

With the same unwalkable terrain movement and defense as the Quenoth versions of these units. Makes them behave as true flying/floating units as their wings, movetype name and other statistics suggest, while opening up interesting game play possibilities.
2022-10-23 16:54:12 -07:00
Wedge009
ea576c78ac Drake description: 'in to' should be a single word in this context.
[ci skip]
2022-02-21 13:53:52 +11:00
nemaara
e6574941db Revise drake race description 2022-02-07 02:29:01 -05:00
Wedge009
93ee9de570 Remove non-standard spacing.
[ci skip]
2022-01-03 12:20:21 +11:00
Tahsin Jahin Khalid
01fa0c1e7c Fixed an extra whitespace in the Horse unit race description 2021-11-30 18:30:18 +06:00
Severin Glöckner
1361d12de6 add missing [special_note] to movetypes 2021-10-18 02:56:11 +02: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
Wedge009
a833a55614 Correct spelling error 'bretheren' 2021-05-17 09:54:38 +10:00
doofus-01
540be634df
horse things (#5738)
* some basic cataphract frames for all attacks

* horse unit

* zombie horse variation

* horse soulless

* White Horse variation

* Dark Horse variation

* horse-related attack icons

* adding seahorse unit

* wmlindent corrections
2021-05-09 20:40:05 -07:00
Andrey Bienkowski
5d344526b0
Fix several typos in wml (#5525)
* 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
2021-02-10 10:23:12 +01:00
doofus-01
d6dbc2bb01
animal zombie variations (#5286)
* units - move SotA zombie rats to core

* units - hackish movement anim for zombie gryphons

* units/monsters - better choices from available undead_variations

* units - falcon zombie (no soulless yet)

* units - adding zombie falcon portrait

* units - adding soulless falcon

* units - adding gorer portrait

* units - slight adjustment to zombie falcon

* units - adding zombie rat portrait

* units - zombie tusker

* units - tusker soulless

* units - wire in new undead variations to falcon and tusker

* units - fix some sprite shadows in the zombie tuskers
2020-11-26 19:19:16 -08:00
Hejnewar
2a1a385478
Balance update (#5289)
Dune Rider xp changed from 42 to 47.
Sunderer line dodge on hills changed form 60% to 50%.
Scorcher gold cost changed from 23 to 25.
Dragoon gold cost changed from 27 to 28.
Elvish Rider gold cost changed form 32 to 28.
2020-11-19 22:33:00 -06:00
Steve Cotton
f3f1407ace
Show [race]help_taxonomy= as "This is a group of units, all of whom are $help_taxonomy" (#5143)
The code comments talk about both Dunefolk and Quenoth Elves - of these two, only the
Dunefolk's data is changed in this commit. All Quenoth unit are race=elf at the moment,
I intend to add [race]id=quenoth in a separate PR.

Draft documentation for the Wiki:

* '''help_taxonomy''': {{DevFeature1.15|?}} in the help browser, show this
race as a group of units from another race; the value of this attribute should
be the other race's '''id''' attribute. This only affects the help browser, for
all other purposes (such as WML filters) the two races are completely separate.

How this is visualised in the help browser is a GUI design decision, this attribute
merely tells the engine that the relationship exists.
2020-09-13 15:20:48 +02:00
Hejnewar
525dd2ecd9 Balance changes 2020-08-04 19:35:55 +02:00
nemaara
422c7efcce Elvish race description: fix typo 2020-04-10 05:41:45 -04:00
nemaara
540df4ec71 Reivse wording in elvish race description 2020-04-10 04:07:57 -04:00
nemaara
5d425b6e00 Revise elvish race description 2020-04-10 03:49:25 -04:00
nemaara
d01c937324 Revise elven race description 2020-04-09 18:38:56 -04:00
nemaara
4b8b412e4b Modify elvish race description wording 2020-04-08 17:59:24 -04:00
nemaara
8edc3ee323 Update undead race description 2020-03-20 17:55:34 -04:00
Lukas Jox
02a1203998 fix missing word in troll race description 2020-03-08 08:31:59 +01:00
nemaara
9171733e35 Update troll description 2019-12-31 13:33:59 -05:00
Hejnewar
5024cb2ac6
Update units.cfg 2019-10-31 11:05:43 +01:00
Sergey Lavrenyuk
df136fcc5b Added mushroom defense cap to mounted and some flying units 2019-10-27 12:26:19 +01:00
Severin Glöckner
c1c8f8a20f units: changing undead representations of some
Scorpions: use spider, better than the humanoid
Wyverns: are a rather drakish species than gryphonic
Falcons: more of a huge bird than a tiny bat

Sand Scuttler: official name for the unit is now Scorpion, as
having both the variation and unit name being the same would
show the same name twice.
2019-08-17 19:44:01 +02:00
Severin Glöckner
13626f4109 units: roc changes
- now beloning to monsters
- removed lvl 1 variant (there is only one sprite for both)
2019-08-17 06:03:47 +02: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
Steve Cotton
0f948f793c Refactoring [movetype] to deprecate the "flies" key, use "flying" instead
This makes [movetype] consistent with [unit]. The code in movetype.cpp is used
for handling both of those tags and so already had support for "flying" in the
merge() and write() functions.

This shouldn't be backported to 1.14. For this reason, it also includes
handling the C++ todos to use C++14's std::make_unique.
2019-08-01 18:58:56 +02:00
Pentarctagon
95286cb49f Command line --preprocess missing some macros.
Command line --preprocess doesn't process macros in data/core/units.cfg.

Fixes #4152.
2019-07-16 19:15:29 -05:00
josteph
7186e30803 Typo fixes
In Caves of the Basilisk, give the monsters names so their descriptions
would show in-game.  The descriptions show in the tooltip, so
a non-empty name is required in order for players to be able to summon
th tooltip.
2019-03-03 15:36:54 +00:00
sigurdfdragon
6eaba32413 Fixup ed50b6b
[ci skip]

(cherry-picked from commit 638fd4bda0)
2018-10-07 03:24:16 +00:00
sigurdfdragon
7aa185e530 Help: Add Saurian race description (fix #3372)
[ci skip]

(cherry-picked from commit ed50b6bec4)
2018-10-07 03:24:15 +00:00
Iris Morelle
4712fe1cc6 Fix several typographical style errors in recent race descriptions
[ci skip]

(cherry-picked from commit 61e94c21a9)
2018-10-07 03:22:44 +00:00
Pentarctagon
96b323657f Add new units as discussed on the forums.
See https://forums.wesnoth.org/viewtopic.php?f=32&t=47721&start=450#p625660

All images but the young roc/roc would remain under the GPL, since Kwandulin based them on images by Sleepwalker and I wasn't able to contact him about using the CC BY-SA for them.  The young roc base and attack sprites are under the CC BY-SA, and are by Vyncyn(forum username).

(cherry-picked from commit 16bfab0b0a)
2018-10-07 03:21:26 +00:00
Wedge009
90f9fb9ea5 Revert "Revert "'moreso' isn't a word in any dialect of English.""
This reverts commit 4d5a3de4e6.

Restoring correction at @Vultraz's request.

[ci skip]

(cherry-picked from commit e161d59536)
2018-10-07 03:21:17 +00:00
sigurdfdragon
86fbc68bd6 Help: Add wolves race description
From https://forums.wesnoth.org/viewtopic.php?f=32&t=43721&start=75#p597028

[ci skip]

(cherry-picked from commit a67e068178)
2018-10-07 03:20:35 +00:00
sigurdfdragon
179135ee40 Help: Add falcons race description
From https://forums.wesnoth.org/viewtopic.php?f=32&t=43721&p=593757#p593757

[ci skip]

(cherry-picked from commit e9ab1ce8d1)
2018-10-07 03:20:35 +00:00
Iris Morelle
85bf47990a Revert "'moreso' isn't a word in any dialect of English."
This reverts commit fb866c6d13.

This fix is specific to master and translators aren't supposed to be
touching master at this time. There is no point to its existence.

(cherry-picked from commit 4d5a3de4e6)
2018-10-07 03:19:47 +00: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
Iris Morelle
60c356112c Change the plural race name for merfolk to Merfolk
See issue #2940.

[ci skip]

(cherry-picked from commit 296894c515)
2018-10-07 03:19:38 +00:00
Wedge009
e1506f86bd 'moreso' isn't a word in any dialect of English.
[ci skip]

(cherry-picked from commit fb866c6d13)
2018-10-07 03:18:35 +00:00
pentarctagon
55ec77b7c4 Add the updated Dunefolk race description.
See: https://forums.wesnoth.org/viewtopic.php?f=32&t=47721&start=375#p624668
[ci skip]

(cherry-picked from commit 3b5cbc3e3c)
2018-10-07 03:18:07 +00:00
pentarctagon
0c69e40d52 Remove deprecated Khalifate references.
(cherry-picked from commit 994e6efa79)
2018-10-07 03:18:07 +00:00
Gregory A Lundberg
9c1a80043c
One last Khalifate change
wml unit nests should now run without error
2018-02-12 13:04:18 -06:00
Charles Dang
f5aad72889 wmlindent run 2018-02-13 05:52:21 +11:00