24569 Commits

Author SHA1 Message Date
Iris Morelle
7b604c2a89 Fall back to the unit type name for [message] captions for nameless units
Fixes #3211.

(cherry-picked from commit 051182fa1c6fa75184d991920ff4e8e84831a848)
2018-10-07 03:22:17 +00:00
sigurdfdragon
009e789b8b DW: Fix #3207
...by preventing any allied units from moving to the sword.

(cherry-picked from commit 85ba7797b23fd2a98af33b61bfe22ea3e5f56f94)
2018-10-07 03:22:16 +00:00
Iris Morelle
5c04fe72d5 Don't allow [kill] animate=yes to scroll to units through fog and shroud
Restores 1.12's behaviour.

(cherry-picked from commit 4e37cdc713d054a48b1f31f43cb5511f42626847)
2018-10-07 03:22:15 +00:00
Severin Glöckner
8d282c97af NR S5a: more bugfixes
* now the situation can appear that spiders can attack Malifor,
  this handles it.
* add *^Xo Terrain to the filter. While there is no bug to fix,
  it looks like it belongs there too.
* work around a tile glitching with an [item] at 22,4
* remove code referring to removed variables

* and run wmlindent

[ci skip]

(cherry-picked from commit fc427ce58c6ce2c3948711207e67c646d2295951)
2018-10-07 03:22:15 +00:00
Thom Diment
72775f4ebd NR5_1: Fixes to Malifor attack and secret door events (#3154)
NR S5a: bugfixes

* Fixes #3117 - Malifor damage event now occurs on defence as well on attack

* Fixes #3116: - Doors to the study can now be opened from inside

[ci skip]

(cherry-picked from commit 913b77d79d9ac0fb4d67ac1461811aeb691daa60)
2018-10-07 03:22:15 +00:00
Severin Glöckner
2305281666 remove a duplicated space in a translatable string
...thiugh, in this case it has no effect.

[ci skip]

(cherry-picked from commit 4b7a6a98eccc07fd762ec29bcf1cd1ea84636992)
2018-10-07 03:22:13 +00:00
Charles Dang
cc3e79c0a5 Tutorial S2: made enemy starting gold equal to that of the player
[ci skip]

(cherry-picked from commit c7a06939abcc44a9f6d20d5e974ef4dc87b3e34d)
2018-10-07 03:22:13 +00:00
Charles Dang
a5b8053340 Campaign Dialog: renamed Deterministic Mode label to "Save random seed"
[ci skip]

This better conveys its behavior, especially with the introduction of the hidden PRNG
preference.

(cherry-picked from commit bf92dbbfd2c1699a9af11e6ddc1b850e154d16f9)
2018-10-07 03:22:11 +00:00
Charles Dang
49908e5cb9 NR S10 - 14: minor cosmetic map tweaks
[ci skip]

(cherry-picked from commit 20af37d527efdd476aa96cbe57aff071bf8b7dd5)
2018-10-07 03:22:10 +00:00
Charles Dang
01d81d29ad NR S13: further reduce enemy gold
[ci skip]

Also fixed an error in my last commit that gave your ally Dwarvish side *more*
gold on higher difficulties.

(cherry-picked from commit a46eaa28749e48cf4027d1ec4523439b8407bc9b)
2018-10-07 03:22:10 +00:00
Charles Dang
d665a8810d NR S11 - 13: reduced enemy starting gold and income (resolves #3198)
[ci skip]

Also similarly reduced one of your ally's starting gold in S13.

(cherry-picked from commit 5adb931b2aafa1747dda62fad05a0b24754eedbd)
2018-10-07 03:22:08 +00:00
sigurdfdragon
723d6dbc6a SotA S09: Fix #3192
...by making the filter more exact.

(cherry-picked from commit 047ededd9efa9008d931ca483e71b9cc0e582f6b)
2018-10-07 03:22:07 +00:00
Pentarctagon
7dec6296b5 Fixup goblin description.
Somehow missed removing the part about the failing bloodline.

(cherry-picked from commit 9242a5ffd0db9a6bdeb65c498a7e3db852d60f21)
2018-10-07 03:22:04 +00:00
Pentarctagon
7cd78a6b12 Updated goblin spearman description.
See: https://forums.wesnoth.org/viewtopic.php?f=32&t=48137&start=60#p628424 and related posts.

(cherry-picked from commit 0b7ca63a86157b8d6a82c1d59858bdd1713685f4)
2018-10-07 03:22:03 +00:00
Pentarctagon
56db59e1dc Add a couple missing things from the PR that added the units.
Added the elemental trait to the Jinn. Added the undead_variation key to the Jinn, Wyvern Rider, and Wild Wyvern.

(cherry-picked from commit d913aafc534ccaeb239cc910bd963893e313fdcf)
2018-10-07 03:22:03 +00:00
Byteron
54ca88468a TSG: Deoran can't recruit Peasants anymore
for the whole campaign, only in the first two scenarios

closes #3051 [ci skip]

(cherry-picked from commit 7f2a8f7c1971879956eaafe17f7ce0016d1f51d7)
2018-10-07 03:22:03 +00:00
Charles Dang
075d793539 Campaign Difficulty: consolidated both lines into a single label
(cherry-picked from commit f72f89f4d562231f831793b3719a115a79cc102c)
2018-10-07 03:21:57 +00:00
Nils Kneuper
fd58826730 updated Italian translation
(cherry-picked from commit 183bc272eaf867570bcf33a609aa6a8f89ec6d72)
2018-10-07 03:21:52 +00:00
Severin Glöckner
fda634af12 SotA: transform units in S5 instead of S18
this commit differs from the 1.14 one

[ci skip]

(cherry-picked from commit 307d1d1d4466e37d1e6cc589f72a195bed867425)
2018-10-07 03:21:49 +00:00
Severin Glöckner
768c49ec61 SotA & UtBS: replace deprecated code
[ci skip]

(cherry-picked from commit 3a103e6bbf80b47c508088f31892a680abb9dc89)
2018-10-07 03:21:49 +00:00
Severin Glöckner
0eb63a050c SotA S21: fix terrain filter
The map has been adjusted before, but not the filter

[ci skip]

(cherry-picked from commit fec49a53a67d82b8004e1e2fb7169b7d867d0a47)
2018-10-07 03:21:48 +00:00
Severin Glöckner
198f5bed04 SotA: fix S20, was broken with the removal of the old gates
[ci skip]

(cherry-picked from commit 4db9f17e099b813b86f8ea5a9776814d29925593)
2018-10-07 03:21:48 +00:00
Severin Glöckner
e326ba4c57 SotA S18: move DA transformation to lua
[ci skip]

(cherry-picked from commit 627c39a3a87e68e0e57e7c385e531bb67b4b8747)
2018-10-07 03:21:48 +00:00
Severin Glöckner
f815cbcf1c DiD S7: compensate -1 income with +1 support
[ci skip]

(cherry-picked from commit 9f37896f32ea34fa77e5035494ecc4565b673195)
2018-10-07 03:21:47 +00:00
Severin Glöckner
219ba91ae4 DiD S7: make villages unattractive
they give no income anymore, but still support

closes #3162

[ci skip]

(cherry-picked from commit c0d6d4ed944ed11fef788778c332fd91362e3a2a)
2018-10-07 03:21:46 +00:00
Severin Glöckner
a1b2147a40 NR Path B:
* to enable playing the path in debug mode
  * set the betrayed friend variable in S5
  * overwrite redruits and gold
* use lua for unit transformations
* clean up code in S5
* fix ellipse change having no effect (probably since 1.12)
  * work around bug 3172

[ci skip]

(cherry-picked from commit cca5b6f77608bdb11865e57fa944b1240ca1e938)
2018-10-07 03:21:46 +00:00
ln-zookeeper
17a9588643 NR: Gave the Rod of Justice the magical special and improved animation
The animation now uses all three bolt animations (instead of just one), and has a somewhat different color.

(cherry-picked from commit 8b467104bf4caeac8a8afd6217ec0bbe689a22e7)
2018-10-07 03:21:46 +00:00
Charles Dang
886156b0fe Campaign Difficulty: rearranged entry layout
(cherry-picked from commit 67530c437527d525af90b484b9797dad84837d16)
2018-10-07 03:21:45 +00:00
Charles Dang
2873ad1c7e MP Lobby: removed manual player list sorting
It didn't make much sense to have these since there's really no situation you'd want
the "default" sorting order, which is however the server decided to send the list.

(cherry-picked from commit e754e64987b3be3e97adebe0755f408066b2f41d)
2018-10-07 03:21:44 +00:00
Severin Glöckner
a309e5561a DiD S11, Sota S18: move unit type transformation to lua
[ci_skip]

(cherry-picked from commit 51db9d01bf8c690a0b9f74c7b254143c74056a3c)
2018-10-07 03:21:44 +00:00
Severin Glöckner
64f048ad0a DiD S11 & S12: transform all Mages instead of changing their advancements
This has the advantage that they use the same help page as newwly
recruited ons, and their advancement options are correctly shown there.

The transformation code is taken from SotA S18

[ci_skip]

(cherry-picked from commit a24068ad021a45238d31e070ad563e98330216df)
2018-10-07 03:21:43 +00:00
Severin Glöckner
4dd1463692 EI S11: use same approach as in 1e58164
to simplify scenario

[ci_skip]

(cherry-picked from commit 0f511e8e55ac873d632366adc669266d8e5d5faf)
2018-10-07 03:21:43 +00:00
Severin Glöckner
72c7c17ae6 DiD: fix bug for units not being loyal anymore after leveling up
fixes #3163

[ci_skip]

(cherry-picked from commit 1e5816496138ec7c5bdbf1d3a20d6a0a8ec3bd7a)
2018-10-07 03:21:43 +00:00
Severin Glöckner
865738d57d Did S5: make campaign easier to debug
by moving an important change into it's own victory event

[ci skip]

(cherry-picked from commit 1315c660e73d04a3ca80d11b43b52331f8b976b4)
2018-10-07 03:21:43 +00:00
Nils Kneuper
4b87d25a54 updated Chinese (Simplified) translation
(cherry-picked from commit cb43b894eeff5fc1327a612a817bdc275762e629)
2018-10-07 03:21:42 +00:00
Charles Dang
b67fd6d96d Fixup 9bf7a4c (WFL comment syntax)
[ci skip]

(cherry-picked from commit c48a8e7edd4f982d1633521ad3c3e12fbbeb91ad)
2018-10-07 03:21:41 +00:00
Iris Morelle
34c9a2aedc gui2/preferences: Add margin around the version info button
[ci skip]

(cherry-picked from commit f30634842eb92ce31a5d35badec3ae97f4550eac)
2018-10-07 03:21:40 +00:00
Iris Morelle
bcf56aac3a gui2/preferences: Add version info button
Also simplifies the layout of the bottom-most row of the dialog a bit.

(cherry-picked from commit e8c803d4267aa0fb5d8693fb02dca7e6d2e7a0e8)
2018-10-07 03:21:40 +00:00
Charles Dang
ef09c1d10a GUI2/Message: tweaked Magic Numbers to fix layout failure with large portraits
[ci skip]

Fixes #2912

(cherry-picked from commit 9bf7a4c8fb4cf4c0ace3e745c855a26fcdf04626)
2018-10-07 03:21:39 +00:00
ln-zookeeper
5a08ed2bfd SoF S9: Removed garbage terrain code
(cherry-picked from commit cdea2e70cfa446322e59174e28e1ca74183c5f4b)
2018-10-07 03:21:38 +00:00
ln-zookeeper
41d56adedb TRoW S15: Increased the amount of lvl2 units enemies recruit
This will make enemies recruit equally many lvl1 and lvl2 units, thus decreasing the amount of units overall and making it less feasible to last indefinitely due to hordes of lvl1 units blocking better damage-dealers from reaching player units.

(cherry-picked from commit 0de4a4c7068ca82bcdae7242bd6751d03ce1fd5b)
2018-10-07 03:21:38 +00:00
ln-zookeeper
bb0d30d055 HttT S08: Increased Li'sar's income slightly
(cherry-picked from commit bd23bb32535cf69c0507a15e48b7ade5cd8b156a)
2018-10-07 03:21:37 +00:00
ln-zookeeper
cbc6be30f2 TSG S03: Made the scenario very subtly harder
Increased the number of bats/undead the enemy can recruit, and made the terrain east of the enemy camp more easily passable.

(cherry-picked from commit 856b8ce78b196f1d25eeb8d5c6cc28c1b5d2597e)
2018-10-07 03:21:37 +00:00
ln-zookeeper
cea548d2f6 SoF S9: Fixed some issues with the volcano eruption (fixes #3099)
This merely patches the worst problems (multiple successive [endlevel] calls, inconsistent [endlevel] contents, recursive elf die event, lava fills visually broken); ideally the whole scenario should be rewritten and redesigned.

The mask changes only consist of re-sizing them to match the map size.

(cherry-picked from commit c0583a18429204c047aec16dbc553a1ad5cb13e0)
2018-10-07 03:21:37 +00:00
Charles Dang
f68aec177f [remove_sound_source] now accepts a comma-separated ID list
[ci skip]

Lack of this pointed out by @shikadiqueen.
This change will also throw an error if id= is missing. Not sure if it did so before.

(cherry-picked from commit 8d3f54ce7c4647a97efb8ddb8b598d5a1af0f815)
2018-10-07 03:21:36 +00:00
Iris Morelle
56cba5aacf Do not allow [message] to scroll to units through fog/shroud
This was a regression from 1.12.

(cherry-picked from commit 8ae38ac19fa48ec9c380a9bce49c17dc43be9a05)
2018-10-07 03:21:36 +00:00
Iris Morelle
8f0cb83d8c Fix broken TC in a north-facing standing animation frame for the Revenant
[ci skip]

(cherry-picked from commit df782f5401f2f1fc8b6b80d30a03604ff4a1caad)
2018-10-07 03:21:36 +00:00
Severin Glöckner
ea95f26976 LoW 2 S7 - fix repeated endlevel execution
[ci skip]

(cherry-picked from commit f291deb6cfb6aa3819391fb0fc242ab758d91bd3)
2018-10-07 03:21:35 +00:00
Severin Glöckner
13e16b473f name generators: update translation hint
[ci skip]

(cherry-picked from commit 69f17c775d0fc73207f24cdac8db565c71b11ef2)
2018-10-07 03:21:32 +00:00
Iris Morelle
8c369ed799 Remove door terrains that were supposed to be removed by 1.14
If someone was using these despite being hidden and everything they were
really asking to get shot in the foot at some point.

(cherry-picked from commit 6eddc6f978b0c3196bdba67b811459eaabbcaac6)
2018-10-07 03:21:31 +00:00