Commit graph

9231 commits

Author SHA1 Message Date
mattsc
81ef9ea390
Merge pull request #3506 from mattsc/lua_ai_cleanup
Lua AI Cleanup
2018-09-22 06:18:33 -07:00
Severin Glöckner
b8d8be3436 THoT: replace [filter_wml]
[ci skip]
2018-09-16 00:46:27 +02:00
Severin Glöckner
e5b4fcdfd3 fixup
[ci skip]
2018-09-16 00:42:57 +02:00
Severin Glöckner
56111818e9 THoT: add potential workaround for #3547
It's anyway a good idea to change this code.

[ci skip]
2018-09-16 00:34:19 +02:00
Andras Szell
b16b7f032a Tutorial S1: display an undo message if impossible to reach next target
Fixes #3039

Until the elves attack the quintain it is not allowed to end turns
before completing the given tasks. Display a message how to undo if
there is not enough MP remaining to reach the current destination or
an enemy by either unit.

[ci skip]
2018-09-16 00:23:31 +02:00
DisherProject
648035fa1e SoF: add [show_if] to the objectives 2018-09-14 23:32:45 +02:00
DisherProject
67f49712c6 SoF: Postpone Gryphon Riders availability 2018-09-14 23:32:45 +02:00
DisherProject
bc4a5e832b SoF S9: Fix some events and add TODOs 2018-09-14 23:32:45 +02:00
DisherProject
5013a9f3e5 SoF S7: Don't let the player kill all of the enemies 2018-09-14 23:32:45 +02:00
DisherProject
20cd56324c SoF S6: Set correct speaker for [message]
Alanin addresses Rugnur, and not Thursagan
2018-09-14 23:32:45 +02:00
DisherProject
5dc6b796d3 SoF S5: Place the elvish encampment when the leader arrives
So remove his starting castle from the map; otherwise the user
would see an empty keep and would know where the enemy is
going to spawn
2018-09-14 23:32:45 +02:00
DisherProject
49d12cf1ef SoF S4: Add the tunnel the dwarves came from to reach the mines 2018-09-14 23:32:45 +02:00
DisherProject
29cec1a770 SoF S2: Place glyphs during prestart
So we can see them while our ally is talking about them
2018-09-14 23:32:45 +02:00
DisherProject
76f081addf SoF S1: Remove Caravans' upkeep cost
In exchange, the player will have 2 starting villages
less than before
2018-09-14 23:32:45 +02:00
DisherProject
9e8fb2d3e0 SoF: General cleanup
1) Clear variables and macros
2) Remove default AI values
3) S7: Remove the ghost ship
2018-09-14 23:32:45 +02:00
DisherProject
effb865040 SoF S2t,S3t,S4t - Move scenery items to map file
The braziers will also be animated, while they were still
images before
2018-09-14 23:32:45 +02:00
joeylmaalouf
243a542edd Menu: campaign order tweaks 2018-09-14 08:45:46 -05:00
joeylmaalouf
a3a9b72311 Menu: re-order and re-rank campaigns (including new ranks) (fixes #1222) 2018-09-14 08:45:32 -05:00
josteph
046b141366 HttT S17: Show the 'Comic relief' comment to translators, too.
(cherry picked from commit 31d333cc62)
2018-09-12 16:08:28 +10:00
josteph
c006072356 HttT S17: Make Li'sar's dialog unconditional.
(cherry picked from commit 6ea39b33e6)
2018-09-12 16:08:26 +10:00
josteph
7b2289f818 HttT S17: Add comic relief.
(cherry picked from commit f3407fddc9)
2018-09-12 16:08:24 +10:00
josteph
15acd75636 HttT S17: Further updates to dialog
- Improve Konrad's line
- Use variant portraits for Konrad and Li'sar
- Update the mage's dialog to match the dwarf's

(cherry picked from commit f7d8d0d257)
2018-09-12 16:08:22 +10:00
josteph
865dcbf3a4 HttT S17: Further tweak dwarf's dialog.
(cherry picked from commit 3e3bd320c9)
2018-09-12 16:08:20 +10:00
josteph
0e9e3b30f9 HttT S17: Correct pronoun.
(cherry picked from commit 96387a55d5)
2018-09-12 16:08:18 +10:00
josteph
960a8fcc9f HttT S17: Add a po comments
(cherry picked from commit edcccc56a7)
2018-09-12 16:08:16 +10:00
josteph
25791d64e5 HttT S17: Change again due to an ambiguity.
(cherry picked from commit 18e886d82e)
2018-09-12 16:08:14 +10:00
josteph
c97fe98801 https://github.com/wesnoth/wesnoth/pull/3473#discussion_r211090169
(cherry picked from commit bc52143390)
2018-09-12 16:08:12 +10:00
josteph
0a0920fe79 HttT S17: Explain why Mages of Light aren't considered by the filter.
(cherry picked from commit 4c2f4f7eda)
2018-09-12 16:08:10 +10:00
josteph
2c9aeec8b0 fixup
(cherry picked from commit 62eb450da6)
2018-09-12 16:08:09 +10:00
josteph
fff478112c HttT S17: Fix "naught" and explain why only high-level mages.
(cherry picked from commit 7ed9f2db9a)
2018-09-12 16:08:07 +10:00
josteph
f1d20c1edb HttT S17: Add po comment
(cherry picked from commit b7c431e7b3)
2018-09-12 16:08:03 +10:00
josteph
de9541fd76 HttT S17: Explain the lava mechanic
Gameplay is not affected. The player can still lose units to {EXPAND_LAVA}.

(cherry picked from commit a3be912487)
2018-09-12 16:08:01 +10:00
josteph
95b3ccd9fe HttT S6: Support unlikely player behavior.
Trigger the undead reinforcements even if the player skips the main cave entrance.
2018-09-11 03:36:37 +02:00
josteph
9509eecced HttT S6: Trigger the additional undead as soon as the player touches the cave entry.
Seen in :debug with a Nightgaunt. Not sure if it can happen in normal play.
2018-09-11 03:36:37 +02:00
josteph
e50b6fa7bd HttT S6: Allow canceling attack orders. 2018-09-11 03:36:37 +02:00
Severin Glöckner
f358beda51 TSG S5: fix typo in comment
[ci skip]
2018-09-10 00:37:51 +02:00
mattsc
2591e435a5 EI custom ogre AI: remove a commented out line 2018-09-07 09:50:52 -07:00
mattsc
75843541bc Lua AIs: use ai_helper get_unit functions where applicable
The ai_helper functions are optimized for speed (as much as possible in a general setting) and do all the necessary tests.  For example, get_units_with_attacks() checks both whether the unit has attacks left, and whether it has any attacks in the first place.
2018-09-05 19:38:28 -07:00
mattsc
fdc3249496 Lua AIs: use ai_helper.robust_move_and_attack()
ai_helper.robust_move_and_attack() does the stop_unit_moves automatically if the unit is at the destination hex.
2018-09-04 07:16:56 -07:00
mattsc
23f35546fc Lua AIs: remove commented-out debug code 2018-09-03 14:48:10 -07:00
Severin Glöckner
ce056894da DM S21: use type_adv_tree
the one usage of type is left deliberately, to point out that it affects 3
instad of 2 or 4 types.

[ci skip]
2018-09-03 15:07:09 +02:00
Severin Glöckner
2e7d901517 NR deaths: use one event for both lich brothers
They text is the same, whoever of them dies

[ci skip]
2018-09-03 15:05:52 +02:00
Severin Glöckner
47c3947d0a NR S12: hide empty sides
There has been a report that some scenario would be nearly unbeatable if they
are empty in the first place, so this has the side effect of not showing the
player that he misses something. (Nevertheless, they should be hidden)

[ci skip]
2018-09-03 15:05:52 +02:00
Severin Glöckner
79993ea601 NR S13: slight bonus for AI controlled sides:
- allied AI leaders, whose death causes defeat, use passive_leader=yes
- increased amount of money which the lich brothers have, if one has not the
alternative leaders who can recall units
- also increased Krash's gold to the same amount of as Eryssa has (they are the
alternative leaders)

[ci skip]
2018-09-03 15:05:52 +02:00
mattsc
45a3bf9363 Lua AIs: replace tabs with spaces 2018-09-02 15:08:24 -07:00
mattsc
3bfd59f28b Lua AIs: do not use engine's 'data' variable unless necessary
Now that all the AIs use external CAs, there is no need to use the persistent 'data' variable any more, unless information is to be exchanged between different CAs or is supposed to be persistent across save/load cycles.
2018-09-02 13:20:34 -07:00
DisherProject
9086e17b15 AOI: General AI rewrite
Removes all the default values and improves the syntax where
possible
2018-09-02 15:04:48 +03:00
DisherProject
240d235059 AOI S2: Prefer "id" to "speaker" in non-[message]'s SUFs 2018-09-02 15:04:48 +03:00
DisherProject
34f417c4eb AOI S3: Clear all enemies on victory
... for consistency with the previous message stating that
all orcs are killed by the elves.
2018-09-02 15:04:48 +03:00
DisherProject
64917b70b5 EI S13: Rewrite dragon's AI
Most part of the old AI had no evident effect: the dragon just
moved here and there without attacking you, and since he flied
over shallow water, it was impossible to chase him. The micro
ai makes Khrakhras wander around and attack you when you
approach his castle.
2018-09-02 15:00:30 +03:00