Commit graph

11471 commits

Author SHA1 Message Date
Steve Cotton
d1bd5991cf
SotA S02: Add l10n hints about temple label and bats (#6224)
The lines about bats were converted to typographic quotes in 3fcba6aa, so this
could be cherry-picked to the 1.16 branch along with that (but shouldn't be
cherry-picked without it).
2021-10-25 04:56:49 +02:00
Wedge009
3ff8afa160 Minor correction.
Was written 13 years ago. While 'the many' could be acceptable as well, there is no precedent for its use elsewhere in this dialogue. Plus the prior sentence just says 'some'.

[ci skip]
2021-10-23 10:16:47 +11:00
newfrenchy83
b68e858526
Have the names of the abilities used as weapons show in the attack dialog window when apply_to=opponent (#6110)
If a weapon with apply_to=opponent is used, this name will appear in the opponent attack affected.
2021-10-20 16:27:01 -05:00
Descacharrado
a292afe183
AToTB S01 and S02 mercenary spawn overhaul (#6186)
* Fix for #6183
2021-10-19 22:52:56 +02:00
Wedge009
96756a7583 Minor correction.
[ci skip]
2021-10-18 16:58:29 +11:00
Iris Morelle
0da6e68f65
Update credits 2021-10-17 22:33:26 -03:00
Alexander Lacson
b5bda6ca99
DM: Proofread Pass (#6178) 2021-10-17 19:43:37 -04:00
Wedge009
2bba4a4df4 Avoid event taking away a village just captured by the player.
Resolves #6187.
2021-10-15 01:18:13 +11:00
Alexander Lacson
c80f7f7608
SotBE: Proofread Pass (#6166) 2021-10-13 00:31:14 -04:00
Alexander Lacson
8ca8bc08b1
Tutorial: Suggested Proofread Edits (#6179) 2021-10-11 12:49:49 -04:00
Wedge009
0d78c64c91
TSG Epilogue: wording revision (fix #6169)
[ci skip]
2021-10-09 21:23:03 -04:00
Descacharrado
59e23813d7
TRoW S8: smoothen naga appearance (fix #6140) 2021-10-07 15:23:05 -04:00
Alexander Lacson
750d5457e0
SotA clarifications and prose edits. (#6168)
* SotA S6 Provide better tomato surprise hint. (fix #6120)

* SotA S2 Add objective note about guardhouse. (fix #6121)

* SotA S4 Add objective note. (fix #6123)
2021-10-07 15:20:10 -04:00
Alexander Lacson
c3a852cef8
Dead Water Proofread Pass (#6139)
DW: proofread text
2021-10-07 15:17:35 -04:00
Wedge009
f0ba2c386e Specify specials mode.
Unset specials mode is deprecated.
2021-10-08 00:35:57 +11:00
Alexander Lacson
e49b5c7b0e
Reference SotA in SoF, closes #6151 (#6152)
SoF: Add a reference to SotA North Knalga in Sceptre of Fire. (fix #6151)
2021-10-06 15:19:28 -04:00
nemaara
32386bd2e1
Merge pull request #6143 from max-torch/TRoW-Proofread-Pass
TRoW: proofread text
2021-10-06 15:14:58 -04:00
Wedge009
8436700b36 Add label to mark Alanin's goal. Resolves #6159.
[ci skip]
2021-10-06 12:22:45 +11:00
Wedge009
60a451932b Accommodate variable $ally_name and translations. Resolves #6155.
[ci skip]
2021-10-05 23:53:54 +11:00
Wedge009
dac45d3eb5 Correct 13-year-old variable error...
Previously the invalid variable would just be rendered blank, leaving the remaining text as 'which way should we go?' which is still sensible albeit with a lack of starting capital letter.

[ci skip]
2021-10-05 22:27:08 +11:00
max-torch
e24f1beaaa Update 21_The_Plan.cfg
Restoring to original without comma. To satisfy requested change in pull request.
2021-10-05 05:11:31 +08:00
max-torch
1ee5b511a1 TRoW Proofread Pass Third Draft
In response to concerns in #6143.
2021-10-04 12:38:36 +08:00
max-torch
a4cd9d4aa7 TroW Proofread Pass Second Draft
Second Draft of ef932b939f.
2021-10-03 13:38:31 +08:00
max-torch
ef932b939f TRoW Proofread Pass
For the campaign The Rise of Wesnoth. For Approval. Minor edits and proofreads. `wmlxgettext` was used so as to ensure all text was reviewed.
2021-10-02 18:06:57 +08:00
Alexander Lacson
dd3baa4881
Sota proofread (#6136)
Only proofreading. No major edits to tone, meaning or dialog. The `wmlxgettext` module was used so that no text would be overlooked.
2021-10-02 06:18:39 +10:00
Descacharrado
ade778cab0 Pinnacle rock map label covered during dialog fix
Issue #6125 - UtBS S2 Across the Harsh Sands Pinnacle Rock is covered during dialog fix. Now the camera will scroll to the tile where the "Pinnacle Rock" map label is.
2021-10-01 00:28:00 +10:00
Wedge009
7f6c7c0283 Make 100% gold carry-over explicit in objectives (resolves #6131) 2021-09-30 11:25:17 +10:00
Astrid Halberkamp
5e5ce2cdd0
TRoW S12: Always give Lord Typhon a storm trident (#6113)
Per #6103
2021-09-23 15:16:23 +02:00
Wedge009
da3eac4ecb Correct punctuation.
[ci skip]
2021-09-23 20:40:44 +10:00
Astrid Halberkamp
060ab198ee LoW S3: fix deprecated WML warning 2021-09-23 10:05:58 +02: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
Astrid Halberkamp
74e98278a5 TRoW S07: Make sure Lady Jessene is visible 2021-09-21 15:36:16 +02:00
Wedge009
c45c6d8ddd TRoW S22: Remove out-of-turns lose condition. (Resolves #6109)
Turns are unlimited for this scenario.

[ci skip]
2021-09-20 22:24:03 +10:00
Wedge009
1b48ace4f3
Avoid use of 'cool' and 'guys' (closes #6107) (#6108)
Avoid use of 'cool' and 'guys' (closes #6107)

Have left 'guys' in Camerin's lines as it's justifiable in his informal crazy talk - Northern Rebirth is supposed to be rather informal in parts and light-hearted in tone.

[ci skip]
2021-09-20 15:50:26 +10:00
Wedge009
4c9e016fa3 Clear dehydration status on victory (resolves #5687)
Even though units are not dehydrated in subsequent scenarios, the dehydration icon may otherwise still appear in the side-bar without this.
2021-09-19 14:48:51 +10:00
Wedge009
5f3382e8d8 Make the team Eryssa leads (if alive) have consistent colour (resolves #5375) 2021-09-18 12:23:37 +10:00
Wedge009
b5fa99c5a3 Correct inconsistency in Ring description (resolves #6043)
Otherwise contradicts desert mechanic explanation: '...at the *beginning* of each your turns, every unit... will suffer from thirst...'
2021-09-18 10:24:56 +10:00
Wedge009
2a1a53f211 LoW S4: Avoid use of 'men' with respect to female elves (resolves #4880)
See issue #4880 for discussion.
2021-09-18 10:24:34 +10:00
newfrenchy83
304b7d15e9
Replace steadfast with resistance abilities special for Garak (#6075)
if Garak have 0% or -10% resistance only then steadfeast don't usable here.
2021-09-17 16:28:59 -05:00
Pentarctagon
a8c9dc4847
Specify a non-zero value for nplayers.
Fixes #6077
2021-09-16 22:48:41 -05:00
Wedge009
9941ee2258 Use existing macro to avoid situations where Nym's otherwise-mute Dust Devil pet might speak.
Resolves #4892.
2021-09-17 12:45:54 +10:00
Wedge009
20fd6d80ba Clarify objectives (resolves #5608)
According to the bonus objective as it stands, it should be possible to end the scenario early by simply destroying the 'generator' stones even if leaving a few skeletons around.
However, the way victory condition is established simply by counting the number of enemy units at the start of a turn - if there are no units left, then the stones are assumed to be destroyed. (No generator stones active -> no enemy units)
As a work-around, simply update the objectives to make it clear that all enemies need to be eliminated for victory to be achieved.
2021-09-17 08:41:32 +10:00
Steve Cotton
f8a41624e3 UtBS: Remove leading whitespace from Ethereal Shadow's special note
The Ethereal Nightgaunt's equivalent note was already fixed in
f94d0bb80a.
2021-09-15 20:03:15 +02:00
Wedge009
3fcba6aa1c Replace 'straight' apostrophes with 'curly' or 'typesetter' apostrophes or quotes as per https://wiki.wesnoth.org/Typography_Style_Guide
[ci skip]
2021-09-15 16:26:56 +10:00
nemaara
6c78d376fe
UtBS S4: reduce difficulty 2021-09-06 16:52:45 -04:00
Steve Cotton
dbc7c5e984 WC: Add a WC_ prefix to defines with generic names
Macros with very generic names such as "STR_CASTLE" were defined and not
undefined. This prefixes all of them to be WC_STR_CASTLE, etc.

Either fixes or reduces the severity of #6062.

(cherry picked from commit d3d21e59ee)
2021-09-06 19:53:17 +02:00
Wedge009
5ba9620ae3 Rephrase #6060 as per suggestion from @CelticMinstrel. 2021-09-06 14:36:29 +10:00
Wedge009
60e52a61d9 Avoid contemporary phrasing
Introduced in #5382, discussion seems to agree that we should avoid this.
2021-09-05 18:30:24 +10:00
Wedge009
71ebeb8eb4 Correct typo.
This string appears to be untouched for 13 years so hard to ask for the original intent but it doesn't appear to be an intentional attempt to sound archaic.
2021-09-05 14:00:17 +10:00
Pentarctagon
5431810b62
Also re-enable WC on the master branch. 2021-09-02 14:52:56 -05:00