Commit graph

646 commits

Author SHA1 Message Date
Thewodoros
9f1bea517c Fix the attack_end event in Liberty S5
The event has to use side 3 because side 2 is idle. Also remove the dollar sign because IF_VAR doesn't work with it.

(cherry picked from commit ae5b2f0da6)
2024-10-31 10:27:22 +11:00
Earth-Cake
99d5190b79 liberty generals name achievement fix for dawn 2024-05-21 23:21:59 -05:00
Wedge009
5294bbf3cd Spelling corrections.
[ci skip]
2023-09-18 17:06:12 +10:00
nemaara
5b09a348e2
Liberty: text editing and work on Harper's character (#7854) 2023-08-23 09:53:26 -07:00
Wedge009
9be683cbba
Liberty S5: Make the loss of Hans a lose-condition (#7756)
* Liberty S5: Make the loss of Hans a lose-condition (resolves #7750).

* Remove second line as per nemaara's review.
2023-07-04 13:15:46 +10:00
Wedge009
0871e8953e Liberty S6: Correct target hex for Shadow Mage (resolves #7751). 2023-07-04 12:04:35 +10:00
Wedge009
8f1c7481de
Liberty S4: Resolve nameless enemies gaining names (#7749)
* Liberty S4: Keep nameless enemies nameless. Resolves #7748.
2023-07-01 18:33:02 -07:00
nemaara
052665ebe0 Liberty S7: change a line 2023-04-20 09:57:06 -07:00
Pentarctagon
1b90c770e6 whitespace 2023-04-16 19:49:49 -05:00
nemaara
cdac40a797 Liberty: add achievements 2023-04-12 12:50:09 -07:00
nemaara
50fbee1556 Liberty S4: make enemies nameless 2023-04-10 21:31:44 -07:00
Tommy
dcf65fd7b9 Liberty:04: Use FLASH for surprise events
This needs checking for timing
2023-02-12 10:29:35 -06:00
Pentarctagon
99bb65d1b3 whitespace fix. 2023-01-21 14:37:48 -06:00
Pentarctagon
fa084677c5 Add textdomain to achievements files. 2023-01-21 10:51:25 -06:00
Pentarctagon
d1465a9eb9
Add basic achievements functionality. (#7237)
* Add basic achievements functionality.

This reads the mainline achievements.cfg and then all the achievements of each installed add-on.

This is intentionally handled separately from other WML loading so that:
a) All achievements and their status are able to be displayed on the main menu right after Wesnoth starts and regardless of which add-ons are active.
b) Add-ons can add additional achievements to other content, whether UMC or mainline. For example, a modification that adds more achievements for mainline campaigns.

Marking something as achieved is handled by the new [set_achieved] tag and whether an achievement has been completed can be checked via [has_achievement].

There is no attempt to prevent people from manually editing which achievements they've accomplished.

NOTE: These are *not* in any way related to Steam achievements!
2023-01-21 10:32:45 -06:00
Tahsin Jahin Khalid
837045168c
Campaigns: Sync Delurin between HttT and Liberty
* HttT: sync Delurin with Liberty's Delurin

* Liberty: sync Delurin with HttT's Delurin
2022-11-30 18:27:38 +08:00
Astrid Halberkamp
4878c3565e
Add the Skeleton Rider line and Death Squire to core (#6088) 2022-06-30 23:34:17 -04:00
Tahsin Jahin Khalid
945d1c8160 [liberty] fix missing background image 2022-04-30 14:59:01 -05:00
Pentarctagon
9bfd432abe Update image pages for webp extension. 2022-04-30 14:23:32 -05:00
Pentarctagon
51b58ad218 Rename converted images to webp. 2022-04-30 14:23:32 -05:00
Pentarctagon
e5d6d806bf Convert image contents to webp. 2022-04-30 14:23:32 -05:00
Elvish_Hunter
c23cdd5fb1 maps/background.jpg -> maps/background.webp 2022-03-16 22:34:06 +01:00
Severin Schoepke
1dd8c60fc8 Fix typo: "with heavy loses" -> "with heavy losses" 2022-01-17 10:05:35 +11:00
Descacharrado
e81cef3a08
Eastern Invasion and Liberty Bone Knight attack image (#6297)
* Added attack images for the Bone Knight's trample and Nightblade's kick
2021-12-05 09:35:06 +11:00
Wedge009
9cd5503338
Revise capitalisation (#6067)
* Revise capitalisation as per https://wiki.wesnoth.org/ProseStyle

Capitalisation of race names was inconsistent in parts, even within the same scenario in some cases.
As per https://wiki.wesnoth.org/ProseStyle, race names are generally lower-case unless part of unit or place names, or a specific group (such as 'Quenoth Elves'):
* Elf/Elves/Elvish/Elven
* Drakes
* Dwarf/Dwarves/Dwarvish/Dwarven
* Goblins
* Gryphons
* Humans
* Mer/Merfolk
* Nagas
* Ogres
* Orcs
* Saurians
* Trolls
* Woses

I substitute 'human' for 'men' on occasion, not for PC-ness, but to make it clear it's a reference to the race, not males (non-humans sometimes say 'men' when speaking to fellow male soldiers, for example).

Capitalisation of titles is a little less straightforward. Clearly cases such as King Haldric, Queen Asheviere, Prince of Wesnoth, Great Chief, etc, are capitalised.
However, use of a title alone can be valid with or without capital, eg 'the king/King'. I try to be consistent and consider the context:
* Title is used in place of the name, eg compare 'by the King's order' with 'by Garard's order'
* Would the speaker show respect to the person concerned as their leader, or a foreign dignitary? Contrast, 'Asheviere, that vile queen'.
* Compare 'my king' with 'my father' (latter is not usually capitalised in everyday English)
* Occasionally, when the speaker may not otherwise know a character's name or the correct protocol to address, may say something like 'Sir Elf'.

I apologise if I run counter to previous revisions - removal of 'princess' as a direct address in Northern Rebirth, for example, also dealt with the capitalisation issue, if I recall correctly.

Miscellaneous changes:
* Magi, as plural of mage, is not usually capitalised.
* Council may be capitalised when referring to a specific instance, such as the Elvish High Council in the Ka'lian, but not in instances such as 'making council'.

The review focused solely on campaign prose - there may be cases in other data files where capitalisation needs revising too.

* Capitalise proper noun use of 'kingdom'.

Just as England may be referred to as such on its own, it was also known as the Kingdom of England.
In the same way, Wesnoth is usually referred to simply as Wesnoth, but it would be formally called the Kingdom of Wesnoth.

* Capitalise 'majesty' when used as an address.

For consistency with existing instances of 'Your Majesty'.

* Capitalise 'Land of the Dead'.

While we might not normally refer to such as a place as a proper noun, Delfador's Memoirs seems to establish this as a specific location in Wesnoth lore.
For consistency, also capitalise a few references to this place in Northern Rebirth and Son of the Black-Eye.

(Granted, this does make Iliah-Malal's line in DM S18 seem a bit awkward, contrasting with 'land of the living', but the precedent has been set throughout the rest of the campaign.)

* Capitalise instances of the Book of Crelanu.

I leave book as lower-case when it's not yet famously known as the Book of Crelanu, such as in Legend of Wesmere, as well as in DM S15, where it is simply described as a book belonging to the old mage Crelanu.

* Harbour of Tirigaz does not appear to be a formal (capitalised) name.

In S12, Tirigaz is only described as a 'harbour'. Other instances of Tirigaz describes it as (lower-case) a port city.

[ci skip]
2021-09-22 18:15:01 +10:00
Wedge009
89a5319006 Resolve #6019 - allied side not triggering failure condition when sighted 2021-08-16 20:00:24 +10: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
nemaara
1b0d63f305
Liberty S7: date fix 2021-04-19 15:17:21 -04:00
nemaara
609ebf4551
Liberty S8: prose fix 2021-03-16 21:06:10 -04:00
nemaara
39c52c2cb0 Liberty: yet another dialogue revision 2021-03-16 02:58:11 -04:00
nemaara
9b4ffff694 Liberty: reduce difficulty 2021-03-13 23:05:30 -05:00
nemaara
afc81cdee8 Fix campaign difficult ratings 2021-03-13 22:46:50 -05:00
nemaara
76886c4381 Liberty: dialogue revision again 2021-03-13 02:26:06 -05:00
nemaara
33fd1e97eb Liberty: change default difficulty 2021-03-13 01:38:40 -05:00
nemaara
bb2dcfc7d5 Liberty: revise dialogue 2021-03-11 02:01:17 -05:00
nemaara
157ed152e7 Liberty: use background 2021-02-14 22:13:19 -05: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
nemaara
1182c0d8e7 Liberty: typo fixes 2020-08-13 02:14:28 -04:00
nemaara
3f37105ff8 Liberty S2: add mace for Baldras 2020-06-10 18:02:24 -04:00
Nils Kneuper
fd5368e7d7 updated Russian translation (add image translations) 2020-06-07 23:49:14 +02:00
nemaara
4927438c4b Liberty: fix typo in campaign description 2020-04-06 17:30:41 -04:00
nemaara
f13132be86 Liberty: update credits 2020-04-06 00:24:34 -04:00
nemaara
bfb01e5976 Liberty: revise campaign description 2020-04-06 00:24:32 -04:00
nemaara
eecb6f7923 Liberty S7: reduce difficulty 2020-04-05 23:54:12 -04:00
nemaara
04d91efb8d Liberty S3: reduce difficulty 2020-04-05 22:47:47 -04:00
nemaara
787ba7c2f0 Liberty: use set side colors 2020-04-05 22:43:32 -04:00
nemaara
c553cc681e Liberty: touchup dialogue 2020-04-05 21:07:34 -04:00
nemaara
c16f504a87 Liberty S8: revise text 2020-04-05 16:18:19 -04:00
nemaara
bc518ceddc Liberty S7: revise scenario 2020-04-05 00:35:28 -04:00