Commit graph

937 commits

Author SHA1 Message Date
mattsc
450e3d1a48 Experimental AI: do not use village hunt CA
The algorithm used in this CA is too simple to work reliably in a general setting, it tends to send whole groups of units toward small numbers of villages, or even individual ones. In its current version, it should not be used at all, not even in the Experimental AI. The recommended way to emphasize village hunting is to set the village_value aspect to a larger-than-default value and let the move-to-targets CA take care of it.

An updated version of this CA's code is, however, left in place for potential future work as an external CA in Wesnoth 1.15.
2020-01-01 19:22:11 -08:00
mattsc
b0a79e6e9f Experimental AI: add ids for candidate actions
Also change the names of two CAs to match the function names (and the ids).
2019-12-17 06:33:40 -08:00
josteph
0d611acaf8 Bump deprecation level of old early finish / carryover macros
(cherry picked from commit fff2f13f7f)
2019-10-20 00:12:50 +00:00
Jyrki Vesterinen
7ba24d60d8 Move ms_after= to the right place in music macros (#4459)
I originally added it in #719. At that point ms_after= affected the *previous*
track due to a bug; however, I had assumed the behavior to be intentional and
compensated for it by adding ms_after= to the first track of a scenario instead
of the story screen music.

In April, I saw the documentation for ms_after= which said that it's supposed
to affect the track itself, not the previous one. Hence, I fixed the bug in
commit b023b818c7. However, I had forgotten that the changes I had made
in #719 depended on the old broken behavior of ms_after=.

This commit moves ms_after= to the right place, restoring the fade-out on
scenario start and removing the pointless pause after the first track.
2019-10-13 12:19:07 +03:00
josteph
67373e06f8 Fix #2677: Make SUMMER_SCHEDULE and WINTER_SCHEDULE use {MIDDAY} and {MIDNIGHT} images of the same graphic style as the images of the other times of day.
Images by @beetlenaut https://forums.wesnoth.org/viewtopic.php?p=633042#p633042
2019-03-24 15:17:52 +00:00
Iris Morelle
bee64fc78b Check unit/second_unit existence in FORCE_CHANCE_TO_HIT
Fixes an issue where the auxiliary event handlers for 'attack end' in
this macro might break if the affected unit or units are removed from
the map by a pre-existing 'attack end' event handler.

Unfortunately this still results in log warnings about failing to
auto-store unit/second_unit, but it's better than breaking WML execution
entirely.

    20190313 23:36:48 error engine: failed to auto-store $second_unit at (9,40)

The alternative I contemplated was to force unit/second_unit to be valid
in the event handlers by using empty filters, but then that would result
in the event handler being triggered *later* by another valid unit. This
is especially problematic since the event handler handles special
knowledge about the unit's WML ([specials][original_chance_to_hit]).
That option would not produce any spurious error messages but would
definitely cause new problems, especially when interacting with other
FCTH substitutions in the same scenario.

Ultimately FCTH's design is a bit questionable and relies too much on
state that may be broken by an external agent intentionally or otherwise
and produce unusual results.

Closes #3982.

[ci skip]
2019-03-13 23:49:34 -03:00
Severin Glöckner
cfd7a0038d Core Macro Reference: Fix hint
[ci skip]
2018-09-10 00:36:12 +02:00
Severin Glöckner
5675918963 core macros: don't clear nonexistant variable
A leftover from the switch from {FOREACH} to [foreach]

[ci skip]
2018-09-10 00:02:18 +02:00
Elvish_Hunter
9514386f78 Prevent wmllint from converting Khalifate compatibility stuff 2018-08-08 22:02:45 +02:00
Severin Glöckner
a13331efee Macro reference: Add hint to clear variable afterwards
[ci skip]
2018-07-19 01:43:50 +02:00
Severin Glöckner
c80562aff0 Change campfire timezones in UtBS S3
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is a visual change, no gameplay changes included.

The ToD shifting for 'dawn' looked better than for 'dusk', and was
conidered better looking than having no ToD shift compared to the
surrounding.

part of #3056

[ci skip]
2018-07-05 08:35:57 +02:00
Steve Cotton
a1d92d466e Prose: the Storm Trident's description uses "merfolk" (issue #2936)
Also update Dead Water's copy of it to use race= instead of a
list of unit types (as done for the core object in 613dd431).
2018-06-15 21:01:28 +02:00
Severin Glöckner
93eb0337c7 name generators: update translation hint
[ci skip]
2018-05-21 08:49:21 +02:00
Celtic Minstrel
436d99e261 Fix erroneous/useless [event] in [titlescreen_music], [lobby_music], [editor_music]
The playlist macros set the music list twice, once before the
story screen and again in prestart, but the order of tracks is different.

This means that the track order at the titlescreen and in the lobby is now the same
as the track order in a scenario using the default playlist, which previously was not the case.

Similarly, the track order in the editor is now the same as the track order
in a scenario using the full playlist.

Whether that actually matters? I have no idea. I doubt it.

In any case, as of this commit, there are no schema validation errors
at the title screen, when entering the MP Create screen, or in the map editor.
2018-05-19 16:29:41 -04:00
Celtic Minstrel
f550f2d6f5
Add missing deprecation messages for deprecated macros
This also bumps ON_SIGHTING to level 2.
2018-05-16 20:31:28 -04:00
Celtic Minstrel
73acf9b566 [effect]apply_to=new_animation does not support name
It does support id though, which is used as a sort of caching mechanism
in case the same effect is applied many times, so use that instead of name.
For good measure, also use an id on the sceptre of fire animation
2018-04-11 22:20:56 -04:00
Celtic Minstrel
62bb0253c2 Remove animate=no from {GUARDIAN}
This is the default in [unit] anyway, and if the user specified
animate=yes explicitly then we should not override that.
2018-04-11 22:20:54 -04:00
Celtic Minstrel
7d42fe0f49 Fix error in AI control core macros 2018-04-11 22:20:51 -04:00
Charles Dang
1340c005b3 Fixed minor text errors reported on the wiki
[ci skip]

Added all to pofix except the extra space added before the Initiative ability's special note.
2018-03-13 04:11:54 +11:00
Charles Dang
3a90f86674 Addressed more whitespace issues from #2613
[ci skip]
2018-03-12 03:48:59 +11:00
Celtic Minstrel
1cbe8d9170 Generalize the deprecated unit macro used for the khalifate
This moves a string from one file to another, but I checked:
the textdomain was the same in both files.

So, it doesn't break the string freeze.
2018-03-04 22:03:17 -05:00
Charles Dang
0d0bb91d99 Added a CREDITS_SEPARATOR macro
[ci skip]

This way, UMC can use the default credit's separator in their credits sections.
2018-03-04 02:16:53 +11:00
Charles Dang
91e0bb4911 Fixed some remaining uses of deprecated Khalifate names
[ci skip]

Also "colour"->"color"
2018-02-13 05:45:31 +11:00
Celtic Minstrel
ae50be5bbe Add #deprecated preprocessor directive for marking macros deprecated 2018-02-12 00:09:48 -05:00
Matthias Krüger
b11d3fdcbe fix a bunch of typos found by codespell in data directory.
https://github.com/lucasdemarchi/codespell
2018-02-06 23:03:06 +11:00
sigurdfdragon
264167edcf Macros: Fixup DEPRECATE_ACTION_MACRO 2018-02-03 12:39:03 -05:00
pentarctagon
5b31b87f6a MP: Renames the Khalifate to Dunefolk.
Part of an effort to make the faction better fit into Wesnoth. See:
https://forums.wesnoth.org/viewtopic.php?f=12&t=47643
https://forums.wesnoth.org/viewtopic.php?f=12&t=47703
2018-01-19 17:28:40 -05:00
Jeffrey 'Sigurd' Westcoat
aceabbe018 Macros: Tweak sceptre damage for story reasons (#2220)
Sceptre (15x4) is now stronger than the uncut ruby of fire (14x4) for
regular mainline users Thursagan and Konard II. Level 3 Konrad & Li'sar
in HttT are still exceptional users of the sceptre (18x4 & 16x4).

From discussions with zookeeper in irc.
2017-11-27 13:46:57 +02:00
Severin Glöckner
725815afa2 add an "optional objective" caption
In case of tsg7a neither alternative nor bonus objective fits

[ci skip]
2017-11-01 12:45:21 +11:00
sigurdfdragon
81ea433117 Macros: Fix typo 2017-10-12 20:26:33 -04:00
Charles Dang
a2653980b7 Core: wmlindent pass
[ci skip]
2017-09-12 19:52:10 +11:00
Celtic Minstrel
c734f56922 Update the DEPRECATED macro and [deprecated_message] ActionWML to understand deprecation levels 2017-08-14 12:36:10 -04:00
gfgtdf
e859c1da00 update mainline for [cancel_action] 2017-07-25 21:19:05 +02:00
Severin Glöckner
a31858124c removed inactive ability descriptions, since they are the same
[ci skip]
2017-06-28 19:26:05 +02:00
Severin Glöckner
5da21fc8ef Revert "disallow submerge on bridges and rails"
Skeletons could hide under the bridge and climb up the moment you cross it.

This reverts commit 9ed38aab61.
2017-06-28 18:41:09 +02:00
Severin Glöckner
9ed38aab61 disallow submerge on bridges and rails
[ci skip]
2017-06-28 18:09:48 +02:00
Celtic Minstrel
c47b3f3208 Simplify leadership (and THoT inspire) using new ability formulas 2017-06-25 00:37:56 -04:00
Celtic Minstrel
bdb42b2848 Use WFL to implement backstab, to avoid needing delayed variable substitution 2017-06-25 00:37:50 -04:00
Celtic Minstrel
88ad4ab4cd Use WFL for teleport ability to avoid requiring delayed variable substitution 2017-06-24 19:07:56 -04:00
Celtic Minstrel
4fb25532f2 Use WFL for leadership to avoid needing delayed variable substitution
(Similarly, also use WFL for the inspire ability in THoT)
2017-06-24 19:07:14 -04:00
Celtic Minstrel
5109a36b56 Revert use of Lua for teleport, leadership, and backstab 2017-06-18 11:40:15 -04:00
gfgtdf
70a23cdf83 remove variable substitution from leadership and backstab abilities 2017-06-13 23:22:06 +02:00
gfgtdf
80d27b4584 use lua filter in {ABILITY_TELEPORT}
this way it no longer uses variable substitution

Fixes #1281
2017-06-13 22:51:23 +02:00
Severin Glöckner
a278ad4c0a Instead of having the south set of images for the wail animation being upside-down
and letting the engine flip them the image files themselves are now the same like shown ingame.

[skip ci]
2017-05-21 18:01:17 +03:00
Celtic Minstrel
f43469e3c2 Add comments to the name generators so that their purpose can be divined in the po-files 2017-04-18 00:32:13 -04:00
ln-zookeeper
8bbe4189ed Reverted FOREACH, NEXT and REPEAT to their original forms
This is because the changes (9fb175c9d6) possibly break some existing uses for no reason.
2017-03-22 19:45:21 +02:00
Shiki
45d7cc1459 Changed description of the UMC plague ability. (#947)
[ci skip]
2017-03-18 14:40:12 -04:00
Severin Glöckner
c0a2812829 Moved {SOUND:POISON} and {SOUND:SLOW} to deprecated-utils
These sounds are played now by default.

[ci skip]
2017-03-09 01:51:27 +02:00
gfgtdf
d98525d951 replace true/false with yes/no in mainline 2016-12-09 02:55:59 +01:00
Charles Dang
be8eb90d2f Clarify wording of Heals abilities regarding poisoned units (bug #22945) 2016-11-07 23:07:30 +11:00