Commit graph

10088 commits

Author SHA1 Message Date
Steve Cotton
c5df7c4558 Tutorial S02: Show "recruit the right units" when the player has gold
It's confusing when it pops up on turn 12, regardless of the game state. My
leader is normally on the other side of the river from my keep, and I always
wonder "what about my play triggered that?"

Move the message to be part of the "I now have enough gold to recruit more
units" hint.

(cherry picked from commit 80a2ace28c)
2019-10-08 19:39:11 +02:00
Steve Cotton
caf1c8eebd Tutorial S02: Make the grunt cross the bridge without bait (#4425)
Not a code-revert, but a behavior-revert of the switch of this unit
to use the guardian AI. 26327a5bdc.

If he somehow doesn't get across the bridge, warn the player
that something has broken.

(cherry picked from commit 656a44664d)
2019-10-05 20:18:35 +02:00
Steve Cotton
a8c96ba1f4 NR S06a: Fix the filter for Tallin complaining that they're sitting in the caves (#4371)
Now it only triggers if five or less units are outside.

(cherry picked from commit 0be05d06d5)
2019-10-03 15:53:44 +02:00
Severin Glöckner
9c099d5d07 remove TODOs regaring overlays 2019-10-02 03:50:39 +02:00
Severin Glöckner
6da85e9042 switch from map_data to map_file in SP 2019-10-02 02:54:25 +02:00
Severin Glöckner
a70bb58a21 TSG 5: add color to narrator message. 2019-10-01 16:36:51 +02:00
Severin Glöckner
ea039d6050 TSG 4: avoid endless loop in debug mode
There are no adjacent hexes if she isn't there.
2019-10-01 16:32:33 +02:00
Nils Kneuper
3bf54fd9b7 updated Chinese (Simplified) translation 2019-10-01 14:00:58 +02:00
Wedge009
50ebd92e58 Dialogue correction
https://forums.wesnoth.org/viewtopic.php?p=647742#p647742
[ci skip]
2019-10-01 18:02:11 +10:00
Steve Cotton
53bea37b61 THoT: fix bigmap for the removed Troll Bridge 2019-09-28 15:47:22 +02:00
Steve Cotton
be177abcf8 TRoW: Replace ^Uf mushrooms with ^Tf mushrooms
For the units that these scenarios have, the stats are almost identical. Burin
and the troll-hole's spiders get a 10% defense boost on the new terrain.
2019-09-27 14:40:43 +02:00
Steve Cotton
6126fc3f47 TRoW S04a S04b: Move Sir Ladoc / Sir Ruddry to the victory event
This means that they join even when debugging with the :next_level command.

The enemies_defeated event could be replaced by victory_when_enemies_defeated
and the appropriate carryover amounts, but that should probably be done as a
single commit updating the entire campaign.
2019-09-27 13:05:02 +02:00
nemaara
4b8d7adf25 HttT: modify dates (fixes #4320) 2019-09-27 03:21:16 -04:00
nemaara
d2c86c71f0 HttT S18: change enemy side names (fixes #4261) 2019-09-27 02:59:59 -04:00
nemaara
de0fda74d0 SotBE S7: change objective wording 2019-09-27 02:55:48 -04:00
nemaara
d16b65c9a9 TSG: change Halidel's relation to Deoran (fixes #4321) 2019-09-27 02:47:42 -04:00
nemaara
6f235466cb
Merge pull request #4319 from clockback/master
Resolving date inconsistency
2019-09-26 16:36:01 -04:00
Severin Glöckner
1f66baca84 Copy NOTE_SHOCK over to EI 2019-09-26 01:08:46 +02:00
pentarctagon
745c6b3dea
The NOTE_SHOCK macro doesn't exist in EI anymore. 2019-09-25 15:40:25 -05:00
Severin Glöckner
425802413b UtBS: add special note
[ci skip]
2019-09-23 22:00:44 +02:00
Severin Glöckner
9ebb45d50b ThoT: let AI patter match recruit list on easy
[ci skip]
2019-09-23 21:18:37 +02:00
Severin Glöckner
f171198150 ThoT: let wmllint skip [lua]
[ci skip]
2019-09-23 21:12:31 +02:00
Severin Glöckner
851cd6eae3 DiD: use last breath instead of die event for speech
[ci skip]
2019-09-23 20:57:05 +02:00
Severin Glöckner
2978534509 Liberty: add defense cap notes
[ci skip]
2019-09-23 20:53:10 +02:00
Severin Glöckner
6a895beabf EI: changes for wmllint & add defense cap note
[ci skip]
2019-09-23 20:52:04 +02:00
Severin Glöckner
cdd3c253e5 TSG 4: add back ruined elvish keep
[ci skip]
2019-09-23 16:53:57 +02:00
Severin Glöckner
8ca4ab075a Tutorial: use numerical comparision
[ci skip]
2019-09-23 16:45:25 +02:00
Severin Glöckner
bcab520601 TSG: remove trailing space (as part of a string)
[ci skip]
2019-09-23 16:43:39 +02:00
Severin Glöckner
ce4d55cec3 NR 08: typography fix
Current standard is that objectives do not end with a dot,
but notes to the objectives do.
[ci skip]
2019-09-23 16:43:39 +02:00
Severin Glöckner
f2eb1aad3f HttT 14: remove loyal overlay over spider
There's no reason why a monster should have an overlay.

[ci skip]
2019-09-23 16:43:39 +02:00
Nils Kneuper
da92a5cec5 updated Italian translation 2019-09-22 01:10:00 +02:00
Steve Cotton
7c32bf81de NR: Replace ^Uf mushrooms with ^Tf mushrooms, and update changelog
This doesn't include updates to the maps in the evil branch, the old
mushrooms are still used in 06b_Slave_of_the_Undead and 08b_Ray_of_Hope,
however the evil branch is currently not available to players either.
2019-09-19 18:39:36 +02:00
josteph
410cc852ce HttT: Remove superfluous {SPECIAL_NOTES} macros.
The "Special Notes:" line was duplicated because of the {NOTE_*} macros on the next line.
2019-09-18 09:09:13 +00:00
Severin Glöckner
c23364b213 indent special notes
[ci skip]
2019-09-16 04:01:07 +02:00
Severin Glöckner
a090a0ff78 UtBS: refactor to use drake macro
That way there's less duplicated code
2019-09-15 19:53:30 +02:00
Celtic Minstrel
26d1ca7a7d Merge pull request #4351 from wesnoth/special_notes
Update to new special notes syntax in campaigns
2019-09-15 13:39:16 -04:00
Celtic Minstrel
02eda177f7 WoV: Update special notes syntax 2019-09-15 11:30:59 -04:00
Celtic Minstrel
f94d0bb80a UtBS: Update special notes syntax 2019-09-15 11:30:08 -04:00
Celtic Minstrel
99b79fb74d Tutorial: Update special notes syntax 2019-09-15 11:23:39 -04:00
Celtic Minstrel
f9abb40e3f TSG: Update special notes syntax 2019-09-15 11:23:18 -04:00
Celtic Minstrel
c7d1cb4a18 TRoW: Update special notes syntax 2019-09-15 11:23:03 -04:00
Celtic Minstrel
317656fc43 THoT: Update special notes syntax 2019-09-15 11:22:00 -04:00
Celtic Minstrel
c19a24783b SotBE: Update special notes syntax 2019-09-15 11:20:50 -04:00
Celtic Minstrel
1bd77e83bd SotA: Update special notes syntax 2019-09-15 11:19:18 -04:00
Celtic Minstrel
a5cfee8742 SoF: Update special notes syntax 2019-09-15 11:17:05 -04:00
josteph
78db7f2c31 HttT S15: Add po comment 2019-09-14 07:57:37 +00:00
josteph
1c481c7c2b HttT S15: Improve dialog flow when Geldar survives
Fixes #4333
2019-09-14 07:57:37 +00:00
josteph
43fb5fa17c HttT S15: Tweak the hint to be more explicit. 2019-09-14 07:57:12 +00:00
josteph
4a76d0b9b3 HttT S15: Add a hint about the Guardsmen. 2019-09-14 07:57:12 +00:00
josteph
973a3ee320 HttT S23: Give a more explicit hint on EASY
Thanks to forum user "Poison".
2019-09-14 07:57:12 +00:00