72827 Commits

Author SHA1 Message Date
jostephd
a3d9b7f11b Don't scroll to an enemy leader that has an effective [hides] ability (#3492)
(cherry-picked from commit 24cb784d4bc8f7910d015ff1753ab945a2be9dc9)
2018-10-07 03:24:35 +00:00
Severin Glöckner
f6e2a9f28f TSG S8a: add redraw calls
Recalling units may increase the vision area when playing with shroud/fog.

[ci skip]

(cherry-picked from commit 5f7b1853dd61154183ad4042bd4c41510943f4d9)
2018-10-07 03:24:35 +00:00
Severin Glöckner
260339ad64 TSG S7b: use 1.13 code and make it debug safe
The invulnerable status is player-visible and does not insert new events which
are checked at each attack.

[ci skip]

(cherry-picked from commit ddc763f3244f5fff731f61a26553566226494679)
2018-10-07 03:24:35 +00:00
Severin Glöckner
b1ab098935 TSG S6a: Mermen will leave afterwards
The text has already been prepared for this in 1.13

[ci skip]

(cherry-picked from commit f84d6808e9fa7a17a1065b2587e3fb8847df66b7)
2018-10-07 03:24:34 +00:00
Severin Glöckner
4ae3afb512 TSG 9a: gender handling
[ci skip]

(cherry-picked from commit 07c2125afc714f035edbbc877ec37e3c6e590468)
2018-10-07 03:24:34 +00:00
Severin Glöckner
c1b5edbed2 TSG S5: reformat comments, add translation hint
[ci skip]

(cherry-picked from commit c030249043e62d6a878a052a29037889ae0fcde1)
2018-10-07 03:24:34 +00:00
Severin Glöckner
6c37f2c056 TSG S2: add female strings for the units placed at start
On the other hand, all these units could as well use custom names.
[ci skip]

(cherry-picked from commit f04cdd3803d7381fb178b94f0a20a7d75cb16ce0)
2018-10-07 03:24:34 +00:00
Severin Glöckner
d3f791ae7a TSG S6a: may the queen be always female and have a more prominent ellipse
And remove one mention of Mebrin before meeting him in S7b.
[ci skip]

(cherry-picked from commit 18db086025a76cc700a542aa582a6d782466a011)
2018-10-07 03:24:33 +00:00
Severin Glöckner
21dfccf7bb TSG 5: ensure no additional event is triggered during allying
Ensure that allying with the bandits does not trigger the lich sighted event.
It's unlikely that the bandits advanced that far though.

[ci skip]

(cherry-picked from commit 657bf305f528016c0bc6b5218c3e18587fd792d3)
2018-10-07 03:24:33 +00:00
Severin Glöckner
b5f7e8b5aa TSG S4: minor optimizations
Made it impossible that the undead leader can advance to a lich - though you do
sth. badly wrong if he advances at all. Also, some more 1.13 syntactic sugar.

[ci skip]

(cherry-picked from commit a46d3f1eb394af158062690e9f3a98933f90e8d9)
2018-10-07 03:24:33 +00:00
Severin Glöckner
0ee46faf34 TSG S5: Beast of the Lake is now loyal
It shall not hinder the recruiting capabilities of side 3 if the player spawns
the monster.

[ci skip]

(cherry-picked from commit 63333c688e700de41cee571346142b7dd7d00ef6)
2018-10-07 03:24:33 +00:00
Severin Glöckner
e772f6ea37 TSG S7b & S8b: use undead encampments instead of ordinary ones
[ci skip]

(cherry-picked from commit 8960da0591bf5b5523800648e726f97d666ee1a7)
2018-10-07 03:24:32 +00:00
Severin Glöckner
89c5dace00 TSG: change inclusion of death events
That way less events need to be duplicated in scenarios.
It also does not include the full Hylas death event in S7a to S9a.
Previously the Jarek event was not present in one of the final scenarios,
now both include it, but the shorter variant of it.

[ci skip]

(cherry-picked from commit 29b4196556dbe401766f48d0f46faa6a9245d351)
2018-10-07 03:24:32 +00:00
Severin Glöckner
1eae58dbd8 TSG S4: add female name string
For some reason they never had one.
[ci skip]

(cherry-picked from commit 4fecc83f1762a3744bdb59e890566c8303b3474f)
2018-10-07 03:24:32 +00:00
Severin Glöckner
b0bd8a7851 TSG S4: Avoid submerging Rangers
If no suitable forest hex is found, the radius of the locations considered is
extended instead of placing the unit next to Ethiliel.

Also, a change of behaviour:
 * non-free hexes will not be considered
 * the bodyguards won't be placed adjacent to other units, like the ambush
 ability works normally
 * this includes Ethiliel
In general that means that units may be placed farther away than before.

[ci skip]

(cherry-picked from commit e43b3507fa18e79b6e2a4893f73b8c75160d7959)
2018-10-07 03:24:31 +00:00
Severin Glöckner
e8455cc0a5 TSG S5: Duo leader setup for the zombies
This adds on the one hand a second leader with secons keep in the same caslte.
for the same side, on the other hand ich changes the speack when they die.
They adverturers are not assuming they killed the undead masters anymore if they
saw the lich before.

(mentioned in #1954)

[ci skip]

(cherry-picked from commit f1a465b3779c0194613971fbbcae4fe43a69dd26)
2018-10-07 03:24:31 +00:00
Severin Glöckner
252fa8ccd3 TSG S8b: allow while mages to be loyal and have random gender
[ci skip]

(cherry-picked from commit 7c89b101b8606f5e16521e8482b5e48ff3da6ed5)
2018-10-07 03:24:31 +00:00
Severin Glöckner
fe0613b394 TSG S2: adjust AI settings
This follows the earlier commit which unified side 2 and 3.

In the first rounds the AI behaves like former side 3, later like side 2.

This is seemlessly possible, because side 3's AI settings were having practical
effect at the beginning of the game, and side 2's conflicing settings don't come
into action before the recruited troops met the ones of the player.

(bug #3032)

[ci skip]

(cherry-picked from commit ee09bc3b6309950c10ed8e0800952ce3c6cd6607)
2018-10-07 03:24:31 +00:00
Severin Glöckner
db9576670e TSG S7a: duplicate less WML
use monstrous event instead of monstrous macro

[ci skip]

(cherry-picked from commit 00574c0814a5acf4cb9c85115b150b84ce6536db)
2018-10-07 03:24:30 +00:00
Severin Glöckner
3435adc255 NR: use 1.13 syntax for finding suitable units for [role]
[ci skip]

(cherry-picked from commit 0dd48bf5818e11d7914cbd70a8fcfdf7ba8c51e2)
2018-10-07 03:24:30 +00:00
Severin Glöckner
f993caaa04 TSG S7a-S9a: prepare to let Hylas die
(FR #3316)

This includes changing when the overlays and ellipses for the hero units are
changed, and for better testing part of the event is split into a victory event
in S6a.

[ci skip]

(cherry-picked from commit b681ad8cd98d4ee3168257ee6116a2ac513f28ab)
2018-10-07 03:24:30 +00:00
Severin Glöckner
3f36501511 TSG S2: fix issues with killing the bandit leader first
- The peasants told Deoran to go for the already defeated bandit leader.
- The pesants were useless at that time - they are now instead spawned when
  defeating the bandit leader or when Deoran arrives, whatever happens first.
  They may still have a fight with remaining bandits – or provoke their attack.
- The dialogue when reaching the citadel after having defeated the bandits got a
  slight change, to better switch to the victory dance event.

(issue #1954)

[ci skip]

(cherry-picked from commit 0c5467c28a3ca2e6be2bd2cb72e5c9266d91a3d4)
2018-10-07 03:24:30 +00:00
Severin Glöckner
c1bdccc010 TSG S2: avoid the possibility of the AI neutralizing villages...
...which it neither burns or captures.
The AI has two sides which are presented as one to the player. It's not the best
approach, because it is possible that the player realizes it looking at the side
informations, e.g. how many units the enemy side has listed there.

This commit unifies both sides, while still keeping the units from formerly side
3 being unable to burn villages, but, as now being in a side with a leader, they
can capture them.

An advantage of having two sides was, that the units could have different AI
settings, and that the leaderless side was not interrested in villages.
The AI settings will be adressed in a seperate commit.

(bug #3032)

[ci skip]

(cherry-picked from commit d749005d21d3407a6bd1aff991df4ae3d0372d80)
2018-10-07 03:24:29 +00:00
Severin Glöckner
4e91a6dbeb TSG S3: support debug mode :n and :cl
[ci skip]

(cherry-picked from commit bbc31e623b38ec719b0c672deff8a2345f3571d1)
2018-10-07 03:24:29 +00:00
Severin Glöckner
b6616ffd2f TSG S3: change side switch procedure for Ethiliel
Ethiliel remains on side 3, but a copy of her is added to the player's recall
list for next scenario. The loyal trait is obtained at that point.

[ci skip]

(cherry-picked from commit 101cb21a95836f9d96a511336c9a759bea850887)
2018-10-07 03:24:29 +00:00
Severin Glöckner
90776d8efe TSG S3: Don't kill the elves at the end
This is a relict from when they had not their own side, and needed to be killed
to not be added to the recall list.

[ci skip]

(cherry-picked from commit baec30bb0c606f73826dace5ea771dc4c85ddf27)
2018-10-07 03:24:29 +00:00
Severin Glöckner
d99e659856 TSG: S8b don't show the objectives when the mages arrive again
This is one of the few cases where it is not only a refactoring, but has
an actual advanatge to use [show_if] - the note can be removed from the
objectives witout showing them to the player.

[ci skip]

(cherry-picked from commit 844e56b8e0dc5d241f5ab640db4bf44ef2958e66)
2018-10-07 03:24:28 +00:00
Severin Glöckner
f25243f0a3 DiD utils: use 1.13 syntax
It's now possible to have this logic as part of [role]

[ci skip]

(cherry-picked from commit 440efd25600245ce5a69561312494ff2cdd8332b)
2018-10-07 03:24:28 +00:00
Severin Glöckner
b6c7dd1635 NR S02a: restrict movement by costs instead moves
because it is not obviously shown in the sidebar

[ci skip]

(cherry-picked from commit 4e11d419b55a1be21e467925301cdd1820f983fd)
2018-10-07 03:24:28 +00:00
Severin Glöckner
76c1da1f7c DiD S10: use self dacaying object
use one event with an object instead of two events

[ci skip]

(cherry-picked from commit bed35245678cb097dfea0b584d4a3ba2a86ceade)
2018-10-07 03:24:27 +00:00
Jyrki Vesterinen
7cfd220976 Fix another pofix mistake
That comma wasn't supposed to be replaced with a period, and I didn't
notice the mistake before pushing the commit.

[ci skip]

(cherry-picked from commit 20bfb35bdda3dca06a9e997812d50bea0e24f341)
2018-10-07 03:24:27 +00:00
Jyrki Vesterinen
9a3084fbd5 Pofix fixes
The tool that generates .po files splits lines in order to limit line
length, and pofix can't track split strings. Thus, pofix search rules need
to be shorter so that pofix finds the affected strings.

I also moved the replacements to the right text domains, placed wesnoth-l
to the right spot, and removed the "Asheviere is the Queen of Wesnoth"
replacement because it isn't pofixable. (The second part of the string
becomes just "Queen of Wesnoth." and "queen of Wesnoth." with lowercase Q
is used legitimately elsewhere.)

[ci skip]

(cherry-picked from commit 3df91c9fc126ac3fd70ab9c0ea9e97eb3d008b33)
2018-10-07 03:24:26 +00:00
Jyrki Vesterinen
2d8f8ea53a Add pofix entries for the recent typo fixes (resolves #3377)
Manual merge of pull request #3490. I also ran pofix.

[ci skip]

(cherry-picked from commit 217eba5f97f5593375c17daeb2ddb82c7da5f7b3)
2018-10-07 03:24:24 +00:00
josteph
fa66bfdf32 Game Load: Show the user-name difficulty name instead of the internal name.
The internal name (Easy/Medium/Hard/Nightmare) will only be shown if the campaign
is not installed, or doesn't declare the saved difficulty.

(cherry-picked from commit 937e971e50788faf5519c169d95efc97cf873193)
2018-10-07 03:24:24 +00:00
Severin Glöckner
c2d09e9763 fixup, use same capitalization
[ci skip]

(cherry-picked from commit c3227f53d75512e2a2ea6fdbe18f499e2de6577b)
2018-10-07 03:24:24 +00:00
Severin Glöckner
8a90f814ba ANL worker: converting to flatland is not the same as creating a farm
Farms have a multi turn cycle:
1) crate farm (converts to Re)
2) end turn on the filed to harvest (Re has been automatically converted)
3) convert to grasland [othrwise the fields remains unusable for building]

Step 3 was labeled the same as step 1.

[ci skip]

(cherry-picked from commit 1867274d25993d465c74dda528381895e79de7ae)
2018-10-07 03:24:23 +00:00
josteph
0b49f33874 HttT units: Fix typo
Thanks 613TheEvil https://forums.wesnoth.org/viewtopic.php?p=619347#p619347

(cherry-picked from commit d27b09a3dc772429d3e9c45b741be9b0af15bf2b)
2018-10-07 03:24:23 +00:00
josteph
e720ef657a HttT S20b: Fix typos
(cherry-picked from commit eb763789aec44b18eb55ed99cf212d6121adfea4)
2018-10-07 03:24:23 +00:00
josteph
ee8b70abe5 Help: Re-fix Ancient Wose description.
Thanks @CelticMinstrel

(cherry-picked from commit 9e296b4c5b9147664c7b330de714a2dd09c0d47e)
2018-10-07 03:24:22 +00:00
josteph
5fad21a965 TSG S4: Fix typo.
(cherry-picked from commit 59299ade4bbc2816dfa918c6c3a1f2783acd3688)
2018-10-07 03:24:22 +00:00
josteph
83ee54641f Help: Fix typos.
(cherry-picked from commit 86eba2b600486055efcd1fb3c061edbd5b123ea8)
2018-10-07 03:24:22 +00:00
gfgtdf
b6cce36c34 Revert "preserve traslatable strings in simple_wml."
This reverts commit 4f3ce6865cdd628634fc3ffe2154093d6ccbfba4.
This reverts commit 20128ac9914c971d759399dff6f7ed8edcb960c8.

see issue #3454, there were problems caused by simple_wml when
joining/observing games and this commit is the obvious suspect
so i'm reverting it until we can fix that one.

(cherry-picked from commit 6b58ce7c04d7f369f8fc5dd5cba0b58def2c2697)
2018-10-07 03:24:22 +00:00
gfgtdf
3c8143539e fixup 'fix game freezes on droiding when using dsu #3453'
fixes https://github.com/wesnoth/wesnoth/issues/3486

(cherry-picked from commit 08bb6a4e9600bfe1aa533d684cc5fa1f8a9ed0f4)
2018-10-07 03:24:21 +00:00
gfgtdf
9cc105f018 show add-on loading times on --log-debug=config
(cherry-picked from commit 6781fe17ca40e1f8af5f117c7e3645b3ab6f599c)
2018-10-07 03:24:21 +00:00
gfgtdf
a0eaf4e7a4 fix editor cannot add starting location for > 9 players.
previously attempting to place a starting location for side 10 or higher would result in a "invalid location id" error.

(cherry-picked from commit cbf078a030305ac523ecd7472d3c7f32d566d20b)
2018-10-07 03:24:21 +00:00
Wedge009
6f66e0d52f Slightly rewrite dialogue (fixes #3386)
Some non-native English readers may find use of the word 'disposed' confusing.

(cherry-picked from commit 087a18a156096c8a7b9fb56359aca579a222011d)
2018-10-07 03:24:21 +00:00
Nobun
90956117ab wmlxgettext: fix #3469: lua plural strings not recognized in some context (#3481)
* bugfix: https://github.com/wesnoth/wesnoth/issues/3469

* wmlxgettext: removed a debug comment forgotten on the previous bugfix

(cherry-picked from commit 4b79c263d357fb23e4531ad8fbd37b2bfbc85c55)
2018-10-07 03:24:20 +00:00
Iris Morelle
79fd02cd0f pofix: Genericize the Lua version number for the 1.14 announcement
Otherwise people will keep complaining that it doesn't reflect the
latest 1.14 version since the original number was valid for 1.14.0 and
1.14.4.

[ci skip]

(cherry-picked from commit c589e39098614b2180b4043db6b9faa71afe6c84)
2018-10-07 03:24:20 +00:00
Severin Glöckner
bd88e4d153 Capitalize Pango
[ci skip]

(cherry-picked from commit 12369a2fa490b87bdf44a0cee34065a03a22e8e8)
2018-10-07 03:24:20 +00:00
Severin Glöckner
bb680ba5f4 clarify that pango markup is the cause
changed as proposed by soliton

(cherry-picked from commit 6998885cc1d2f063c02f803b1f4f7644804e9626)
2018-10-07 03:24:20 +00:00