Commit graph

203 commits

Author SHA1 Message Date
joeylmaalouf
a3a9b72311 Menu: re-order and re-rank campaigns (including new ranks) (fixes #1222) 2018-09-14 08:45:32 -05:00
pentarctagon
649fdc9a62 Remove unused images from Dead Water.
Also confirmed via PM with beetlenaut that they can be removed, and aren't supposed to still be there.
2018-06-29 15:35:22 -05:00
Steve Cotton
ad7bc19dd9 Prose: the Storm Trident's description uses "merfolk" (issue #2936)
Also update Dead Water's copy of it to use race= instead of a
list of unit types (as done for the core object in 613dd431).
2018-06-15 21:02:56 +02:00
Steve Cotton
d5f6c17239 Dead Water: Change "mermen" to "merfolk" (part of #2940)
This commit excludes changes to S05 Tirigaz, I think changing the dialogue
there is going to be more complicated, and it's better for that to have a
separate PR.
2018-06-15 21:02:56 +02:00
Steve Cotton
94dd2880c6 DW: Change the team name from Merman Forces to Merfolk 2018-06-15 21:02:56 +02:00
Steve Cotton
ce093e2290 DW S05: Add a po hint about the orc saying "mermen" (part of #2940) (#3243)
The orc calls them fish-men several times, so changing it to "merfolk"
wouldn't fit.

Also a whitespace fix from wmlindent.

[ci skip]
2018-06-13 13:55:04 +02:00
Thom Diment
b3c40498d8 DW 5 Tirigaz - Changes to orc leader death event (#3103)
DW 5 Tirigaz - Changes to orc leader death event

Fixes #3092 - Updates objectives if orc leader is killed first, and gives additional dialogue
Fixes #3903 - Gold event doesn't fire if ghosts kill the orc leader
2018-06-11 14:40:47 +02:00
sigurdfdragon
85ba7797b2 DW: Fix #3207
...by preventing any allied units from moving to the sword.
2018-06-04 23:56:39 -04:00
Nils Kneuper
f9b9d5018f remove executable flag from italian translation images 2018-05-13 11:27:29 +02:00
Nils Kneuper
4918a6234e updated Italian translation (images) 2018-05-13 11:23:45 +02:00
Severin Glöckner
469488d981 update 2nd stunned event as well with additions from 1.13.2
[ci skip]
2018-04-12 22:27:26 -04:00
Charles Dang
471c9e876a Addressed a large chunk of the whitespace issues from #2613
[ci skip]
2018-03-09 11:37:00 +11:00
Matthias Krüger
dc33cf7ceb pofix: add fixes of previous commits. 2018-02-06 23:03:06 +11: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
sigurdfdragon
ca853a0607 Campaigns: Deploy Cutscene_Minimal theme for dialog only scenarios
Used for scenarios that are dialog only and use [endlevel] linger=no.
Two scenarios in NR had linger=no added for Cutscene_Minimal use.
2017-10-28 08:52:15 +11:00
Severin Glöckner
7605943e80 DW: add hit sound to the king
(got lost when the old images were disabled)

[ci skip]
2017-09-30 16:52:56 +02:00
Celtic Minstrel
25a0d099a9 Enable sorting campaign list in chronological or lexicographical order 2017-08-14 12:36:07 -04:00
ln-zookeeper
6c35ea3ec1 DW: Added missing "the" 2017-05-29 19:52:09 +03:00
Charles Dang
49ec75829e Campaigns: wmlindent run 2017-03-18 20:11:14 +11:00
Severin Glöckner
0d03f9b4d4 textdomain changes
many campaigs were using weapon names which already exist in wesnoth-units
2017-02-26 19:49:36 +02:00
Celtic Minstrel
1e9454b6f9 Rename type_tree to type_adv_tree in SUF
This matches the usage in the [hide_help] tag.
2017-02-11 20:18:57 -05:00
ln-zookeeper
801ef5ab2d DW: Position Marg-Tonz's treasure chest a bit better on his keep
A tiny detail and not necessary at all, but why not.
2017-01-19 15:30:50 +02:00
ln-zookeeper
7b0ebf6c5b DW: Assorted speaker and dialogue tweaks
Most changes according to reports and fixes posted by Wesbane on the forums, but I've tweaked most of his code and added a few things. Most notable change is that I'm not accounting for the player's possible undead units, because I intend to remove the Undead Bat.
2017-01-19 15:28:13 +02:00
Severin Glöckner
9c2bedcec5 DW, maps: On maps which use tropical water (Wwt), changed the villages from Ww^Vm to Wwt^Vm 2017-01-05 21:29:27 +02:00
Severin Glöckner
0a7e147759 DW, scenario 1: avoid zombie spawning if the village from the starting sequence get's recaptured midgame 2017-01-05 21:29:27 +02:00
Severin Glöckner
b4ee041f2e DW, scenario 1: set the villiage flag when the unit moves there, not shortly before. 2017-01-05 21:29:27 +02:00
ln-zookeeper
2cf66ff442 DW: Clarified the Death Knight's gold chest; fixes bug #25363 2016-12-10 19:16:42 +02:00
gfgtdf
a53090d648 wml cleanups, add terrain= attribute to [random_placement] loc
replacing some [while] with [repeat] or [random_placement]

Adding  terrain= attribute to the variable generated by [random_placement] this mkaes it easier to use [random_placement] as a replacement for [store_locations] + [while] since [store_locations] also generates the [terrain] attribute:
2016-12-10 14:07:13 +01:00
gfgtdf
d98525d951 replace true/false with yes/no in mainline 2016-12-09 02:55:59 +01:00
gfgtdf
c8236777ab remove [portait] tags
these had no effect since the corresponding c++ code was never
implemented.
2016-12-09 02:55:53 +01:00
ln-zookeeper
5638e1dcb6 DW: Make use of the new aquatic encampment and castle terrains 2016-11-05 11:47:07 +02:00
ln-zookeeper
15241cd0a6 Convert remaining – to × in strings describing attack stats 2016-09-07 10:43:30 +03:00
fendrin
aa8b541757 DW: Replace FOREACH 2016-08-06 06:20:41 +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
fendrin
7e0c853f42 Campaigns: [+units] -> [units] 2016-08-03 22:04:47 +02:00
Gregory A Lundberg
010f943a40 [option]message= deprecated, use label=
According to the Wiki, since 1.13.2 message= is an alias for label=.

Using message= provokes a warning about it being deprecated.

This replaces message= with label= in the entire mainline (where it had not already been changed).
2016-07-03 13:41:44 -05:00
Celtic Minstrel
3b4b858a40 DW S10: Fix invalid [object] IDs 2016-04-06 19:48:17 -04:00
Elvish_Hunter
2c5763216b wmllint: added female_text to the translatable keys
Also removed a few wmllint directives that I placed to handle female_text.
2016-03-24 20:43:17 +01:00
Elvish_Hunter
56b8ed9560 DW and UtBS: shut a few wmllint warnings about translation markers 2016-03-24 20:26:44 +01:00
Celtic Minstrel
7c9e24aa29 Remove several deprecated recruitment-related aspects
- number_of_possible_recruits_to_force_recruit
- recruitment_ignore_bad_combat
- recruitment_ignore_bad_movement
2016-03-22 07:22:22 -07: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
3118969428 Wired in new mace sounds 2015-12-22 17:07:21 +02:00
gfgtdf
203f7b0ded clenaup DW scenario9 scorpion placement code. 2015-12-21 13:11:14 +01:00
aquileia
4f7ad480f3 German translation update
Authored by Chewan, proof-read and amended by aquileia and chber.

Includes a fix by Dennis_ for the steadfast ability, see
http://r.wesnoth.org/t43237

Based on 0d5c50a7 (1.12 branch) but slightly expanded.
2015-12-02 00:36:34 +01:00
ln-zookeeper
3a5f25b999 New ink sounds 2015-10-18 15:00:25 +03:00
Charles Dang
b253a331b5 DW S2: convert inline mask to new format 2015-10-08 05:07:34 +11:00
Charles Dang
b8c5641baf DW: convert maps to new format 2015-10-08 04:12:51 +11:00
Charles Dang
bd6467d166 Converted mainline campaigns to use new difficulty syntax 2015-09-29 15:35:40 +11:00
Charles Dang
bec40a3c39 Merge pull request #483 from Wedge009/Spelling_Corrections
Spelling and Grammar Corrections
2015-09-20 07:07:00 +11:00
Celtic Minstrel
f54d6b5d28 Rewrite leadership ability as a single macro using $other_unit
Note: It's no longer supported to use the macro in a unit with a non-matching level,
for example giving a 2nd-level unit 4th-level leadership.
2015-09-19 02:14:38 -04:00