Commit graph

9231 commits

Author SHA1 Message Date
DisherProject
50e4cc5d3f EI S12-S16: Split objectives into main and alternative ones
Also adds a new objective in S16, which was not stated but
actually makes you win.
2018-09-02 15:00:30 +03:00
DisherProject
643f1336dd EI S8: Fix event not being fired
The second event took as filtered unit an ogre that has reached
the border of the map. Unfortunately, he was removed by the map
before such event was fired, causing it to never happen.
2018-09-02 15:00:30 +03:00
DisherProject
e07819619c EI: Remove old TODO and add a new one 2018-09-02 15:00:30 +03:00
josteph
bcb6153b89 Liberty S8: Fix family reference
According to po comments in S1, Baldras is Harper's mother's brother.

Also change "mom"/"dad" to "mother"/"father" to match the general
medieval setting of dialogs.
2018-09-01 13:43:19 -05:00
josteph
4c612400cf Liberty S8: Fix ambiguous pronoun 2018-09-01 13:43:09 -05:00
mattsc
1040dbe5c9 AToTB S2: rename custom AI file
For consistency with the other mainline campaigns
2018-08-30 18:08:04 -07:00
mattsc
a23f06dc20 Lua AIs: don't initiate variables as empty tables
... if they might not be needed.
2018-08-30 17:27:18 -07:00
josteph
8fd1b822db Liberty S3: Play orcish war drums 2018-08-30 15:09:13 -05:00
josteph
6a1b59327e Fix various typos.
AOI S3: Address Erlornas as "lord" in lowercase as done elsewhere in the
scenario.
2018-08-30 14:49:42 -05:00
josteph
e2c591edbd Liberty S3: Add a story part 2018-08-30 14:40:23 -05:00
mattsc
0e7c09f7b5 Lua AIs: no need to set variables to nil explicitely
This is mostly done for consistency across the Lua AI code
2018-08-30 07:35:57 -07:00
mattsc
cb423b2fbd Lua AIs: use math.huge to initialize extrema variables 2018-08-30 07:18:04 -07:00
mattsc
83c4ef2418 Lua AIs: remove unused debug output 2018-08-27 07:29:24 -07:00
mattsc
a6866390df Lua AIs: use unit methods instead of wesnoth functions 2018-08-27 07:05:43 -07:00
Severin Glöckner
5f7b1853dd TSG S8a: add redraw calls
Recalling units may increase the vision area when playing with shroud/fog.

[ci skip]
2018-08-27 04:02:19 +02:00
Severin Glöckner
ddc763f324 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]
2018-08-27 04:02:19 +02:00
Severin Glöckner
f84d6808e9 TSG S6a: Mermen will leave afterwards
The text has already been prepared for this in 1.13

[ci skip]
2018-08-27 04:02:19 +02:00
Severin Glöckner
07c2125afc TSG 9a: gender handling
[ci skip]
2018-08-27 04:02:19 +02:00
Severin Glöckner
c030249043 TSG S5: reformat comments, add translation hint
[ci skip]
2018-08-27 04:02:19 +02:00
Severin Glöckner
f04cdd3803 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]
2018-08-27 04:02:19 +02:00
Severin Glöckner
18db086025 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]
2018-08-27 04:02:19 +02:00
Severin Glöckner
657bf305f5 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]
2018-08-27 04:02:18 +02:00
Severin Glöckner
a46d3f1eb3 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]
2018-08-27 04:02:18 +02:00
Severin Glöckner
63333c688e 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]
2018-08-27 04:02:18 +02:00
Severin Glöckner
8960da0591 TSG S7b & S8b: use undead encampments instead of ordinary ones
[ci skip]
2018-08-27 04:02:18 +02:00
Severin Glöckner
29b4196556 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]
2018-08-27 04:02:18 +02:00
Severin Glöckner
4fecc83f17 TSG S4: add female name string
For some reason they never had one.
[ci skip]
2018-08-27 04:02:18 +02:00
Severin Glöckner
e43b3507fa 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]
2018-08-27 04:02:18 +02:00
Severin Glöckner
f1a465b377 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]
2018-08-27 04:02:18 +02:00
Severin Glöckner
7c89b101b8 TSG S8b: allow while mages to be loyal and have random gender
[ci skip]
2018-08-27 04:02:18 +02:00
Severin Glöckner
ee09bc3b63 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]
2018-08-27 04:02:18 +02:00
Severin Glöckner
00574c0814 TSG S7a: duplicate less WML
use monstrous event instead of monstrous macro

[ci skip]
2018-08-27 04:02:18 +02:00
Severin Glöckner
0dd48bf581 NR: use 1.13 syntax for finding suitable units for [role]
[ci skip]
2018-08-27 04:02:09 +02:00
Severin Glöckner
b681ad8cd9 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]
2018-08-27 03:42:06 +02:00
Severin Glöckner
0c5467c28a 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]
2018-08-27 03:42:06 +02:00
Severin Glöckner
d749005d21 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]
2018-08-27 03:42:06 +02:00
Severin Glöckner
bbc31e623b TSG S3: support debug mode :n and :cl
[ci skip]
2018-08-27 03:42:06 +02:00
Severin Glöckner
101cb21a95 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]
2018-08-27 03:42:06 +02:00
Severin Glöckner
baec30bb0c 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]
2018-08-27 03:42:05 +02:00
Severin Glöckner
844e56b8e0 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]
2018-08-27 03:42:05 +02:00
Severin Glöckner
440efd2560 DiD utils: use 1.13 syntax
It's now possible to have this logic as part of [role]

[ci skip]
2018-08-27 03:42:05 +02:00
Severin Glöckner
4e11d419b5 NR S02a: restrict movement by costs instead moves
because it is not obviously shown in the sidebar

[ci skip]
2018-08-27 03:41:50 +02:00
Severin Glöckner
bed3524567 DiD S10: use self dacaying object
use one event with an object instead of two events

[ci skip]
2018-08-27 03:40:29 +02:00
Jyrki Vesterinen
217eba5f97 Add pofix entries for the recent typo fixes (resolves #3377)
Manual merge of pull request #3490. I also ran pofix.

[ci skip]
2018-08-26 12:25:09 +03:00
josteph
d27b09a3dc HttT units: Fix typo
Thanks 613TheEvil https://forums.wesnoth.org/viewtopic.php?p=619347#p619347
2018-08-22 15:51:48 +02:00
josteph
eb763789ae HttT S20b: Fix typos 2018-08-22 15:51:48 +02:00
josteph
59299ade4b TSG S4: Fix typo. 2018-08-22 15:37:58 +02:00
Wedge009
087a18a156 Slightly rewrite dialogue (fixes #3386)
Some non-native English readers may find use of the word 'disposed' confusing.
2018-08-22 14:48:22 +02:00
sigurdfdragon
7aced87548 SotA S14: Add hint about needing plenty of gold for the next scenario 2018-08-18 12:57:54 -04:00
joeylmaalouf
3d47ed8ab4 NR S14: Update epilogue map to match previous scenario (fixes #3385) 2018-08-17 17:56:09 -05:00