26734 Commits

Author SHA1 Message Date
nemaara
9171733e35 Update troll description 2019-12-31 13:33:59 -05:00
doofus-01
c2f9645519
More SoF revisions (#4662)
* SoF units: make Caravans slightly less helpless and slow

* SoF S1: revisions to map and elf AI

* SoF S2: revisions to map (cosmetic) and elf AI

* SoF S2t: some minor scripting and dialog revisions

* SoF utils: quash the idle anim of a unit riding a mine-cart

* SoF S3: cosmetic map and dialog revisions

* SoF S2p5: remove the goblin kill animation

* SoF S3t: cutscene dialog revision

* SoF S4: adding carts and rails to random map

* SoF S4: revise tracks placement and randomize cart locations

* SoF : make the dwarf city cut-scenes use the same map

* SoF S4 - revise recruit lists and side names for everyone, also make coal and gold look more like something that still needs to be mined

* SoF S4t - cut-scene dialog revisions

* SoF S5 and S6 - map and dialog revisions

* SoF S6 and S7 - mostly cosmetic and dialog revisions

* SoF S8 and S9 - update maps

* SoF S8-end: dialog revisions

* SoF - cleanup including changelog, about, and cart image
2019-12-30 12:14:12 -08:00
Charles Dang
0acef0232c Removed Wings of Victory
See https://forums.wesnoth.org/viewtopic.php?p=650262#p650262
2019-12-29 23:25:22 -05:00
Charles Dang
50839dd49f
Merge pull request #4663 from Chergnobarp/master
More wesml.vim fixes
2019-12-28 19:52:49 -05:00
Steve Cotton
a5a1fec226 Make map_file= search for a maps directory in the [binary_path] (#4633)
For both [scenario]map_file= and [replace_map]map_file=, this allows both of
these to have the same effect:

* map_file=campaigns/Heir_To_The_Throne/maps/01_The_Elves_Besieged.map
* map_file=01_The_Elves_Besieged.map

This allows a lot of copies of the campaign/add-on's name to be omitted. Thus
it's no longer necessary to change every scenario's .cfg file to rename an
add-on, or to move a campaign between UMC and mainline.

This makes [binary_path] a misnomer, as it now also handles a text-based type
of file, however that's going to be the correct path for campaigns or add-ons
that use the standard layout with images/, maps/, scenarios/, etc.

This commit has the change itself, in filesystem_common.cpp, and the updates
for most of the campaigns. DM, LoW, UtBS and WoV are omitted from this, as they
all use a macro to do the same effect:

 #define MEMOIRS_MAP NAME
-    map_file=campaigns/Delfadors_Memoirs/maps/{NAME}
+    map_file={NAME}
 #enddef
2019-12-26 19:01:28 +01:00
Severin Glöckner
76a6e79fe6 update wmllint about DF changes
- Piercer was removed, it's line starts now from L2
 (Rider has different properties, but can advance to it)

- Strider is a better replacement for Monawish
  (Skirmisher was once a L2 and is now L1, while Strider is the new L2)

closes #4658
2019-12-26 12:25:56 +01:00
Earth-Cake
729a42db4e Remove trailing dashes 2019-12-23 16:33:15 +11:00
Earth-Cake
ed8c9e6937 tips.cfg miscellaneous fixes 2019-12-23 16:33:15 +11:00
Severin Glöckner
dd3247c62d core macros – overlay of NO_UPKEEP macro
The past change in 1.15 changed not only internal things,
but also the overlay given by the NO_UPKEEP macro.

Now it gives the same overlay as the loyal trait does.
Which is also the same which this macro gave in 1.14.
2019-12-23 01:29:44 +01:00
Severin Glöckner
80d398d775 TSG: explain in po-hints to which scenario the text belongs
It's not visible in the po-files otherwise because
the stroy text is defined in the same file for all

[ci skip]
2019-12-23 01:29:43 +01:00
Severin Glöckner
37bbb65023 TSG 7a: add some po-hints
[ci skip]
2019-12-23 01:29:43 +01:00
Severin Glöckner
9965c277b9 TSG 5: minor tweaks
- tweaks to monster side, i.e. has same flag like other factions
(visible in the top bar when it's their turn)
- play a sound when the monster spwans, but don't reveal it
- remove event setting options which are already set in the side definition
2019-12-23 01:29:43 +01:00
Severin Glöckner
2518cef313 ANL: ai tweaks – don't retreat
In this scenario, the AI can't heal his units, as they destroy buildings
(except for leaders). Thus no sense in keeping units alive.

Disable caste_switch, in case players find a way to abuse it (as they can build castles)

For the Spiders, disable the poison CA, as it's only a monster encounter,
no need to be tactically smart in the long run.
2019-12-23 01:29:43 +01:00
Steve Cotton
7359fddecb
Separate unit test statuses for WML exceptions and strict warnings (#4599)
This is part of working out whether a subset of the "fail" tests could be run
in one Wesnoth instance. To run a test that returns TEST_FAIL_BROKE_STRICT with
any other test would require a mechanism to reset lg::broke_strict()'s flag.

All tests that fail with an {ASSERT} will also set the lg::broke_strict() flag,
the tests with the new status are only those that would pass without the strict
flag.

In the SUF tests, change a test from fail-on-success to breaks-strict, rename
the formula tests and add some comments. The rename is because "fai" is
"Formula AI", an obsolete name for WFL.
2019-12-22 19:11:48 +01:00
Chris Nasser
ef7d696935 Merge remote-tracking branch 'upstream/master' 2019-12-21 23:08:57 -04:00
Chris Nasser
8b2e589465 wesml.vim: Missing tags and typos. 2019-12-21 23:03:47 -04:00
nemaara
d6a746ee77
Merge pull request #4653 from nemaara/master
Liberty: merge S6 and S7 into one scenario
2019-12-20 11:04:27 -05:00
Elvish_Hunter
d2e8d8cfd8 wesnoth_addon_manager: use tabs instead of spaces as field separators in --list output 2019-12-20 11:53:20 +01:00
nemaara
83108832bb Liberty S6: lift fog before dialogue 2019-12-20 02:55:50 -05:00
nemaara
167de74242 Liberty: merge S6 and S7 into one scenario 2019-12-20 02:46:16 -05:00
nemaara
ce3ac1e33d Tutorial: starting grunt should not have random traits 2019-12-19 11:50:15 -05:00
mattsc
a78150e366 Bottleneck Micro AI: add [filter] as optional parameter 2019-12-19 07:33:25 -08:00
mattsc
a90964fd41 ai_helper: deprecate has_weapon_special() 2019-12-19 07:09:13 -08:00
mattsc
705b576c2a data/lua/core.lua: remove trailing white spaces 2019-12-19 07:06:02 -08:00
mattsc
a1de3a0d72 wesnoth.units.find_attack: also return attack index 2019-12-19 07:05:10 -08:00
nemaara
b0aed28de1 Tutorial: reduce difficulty 2019-12-19 02:51:12 -05:00
nemaara
9d11b4e103
Merge pull request #4650 from Earth-Cake/httt-diff_select_menu-sprites
HttT - Change sprites in difficulty-choosing screen from Elves' to Konrad's sprites
2019-12-19 02:45:45 -05:00
Earth-Cake
7bff41392d
Change sprites from Elves' to Konrad's sprites 2019-12-18 22:53:41 +01:00
mattsc
68bb48ddf1 Lua AIs: fix uses of new unit functions
I switched to using defense_on() and resistance_against() incorrectly in 55478e20. I had tested these, but apparently for cases when it does not make a difference ...

The change for movement_on() is for convenience and consistency with other code only.
2019-12-18 09:23:23 -08:00
mattsc
f1e8807330 ai_helper.has_ability: add optional parameter 'exact_match'
The default behavior is unchanged.
2019-12-18 07:40:16 -08:00
mattsc
f2df220579 Lua AIs: eliminate usages of __cfg
These are cases for which the respective variable was not accessible otherwise when the code was originally written.
2019-12-18 07:21:33 -08:00
Chris Nasser
bcffc9c7b9 Typo fix in wesml.vim.
store_village and story had no space between them, so they didn't
highlight correctly.
2019-12-18 07:13:11 -06:00
Chris Nasser
f6f339da4e Typo fix in wesml.vim.
store_village and story had no space between them, so they didn't
highlight correctly.
2019-12-18 00:39:13 -04:00
Earth-Cake
abb85d3dbe Tutorial S2 map overhaul (#4644) 2019-12-17 23:47:41 +01:00
Steve Cotton
4588af1b81 Update test_relative_dir (which is not a unit test) for the tag being renamed
This isn't a unit test, it's just meant to be run interactively. And it's been
broken since 3103fe2561d4eb351afaa94f4e4aafb809b72d60, so maybe it should just
be deleted.
2019-12-17 21:22:35 +01:00
mattsc
55478e20ad Lua AI code: update deprecated functions 2019-12-17 07:34:48 -08:00
Severin Glöckner
8080271231 use map_file in [replace_map] 2019-12-16 18:01:23 +01:00
Severin Glöckner
663ceed680 LoW 03: fix breackage, caused by incorrect move from map_data to map_files
fixes #4638
fixes #4640

As an error in an [event] causes the event to be dropped:
closes #4639

These ones were triggered by this bug:
closes #4641
closes #4642
closes #4643
2019-12-16 18:01:23 +01:00
mattsc
09cffab77b Bottleneck Micro AI: bug fix for units in front of bottleneck
Previously, units so far in front of the bottleneck that they could not get behind it in one move were left stranded. Now they are moved toward it.
2019-12-16 08:45:47 -08:00
Severin Glöckner
116a6671cd move armor icon to core 2019-12-16 16:33:16 +01:00
doofus-01
8ae546e9d4
Terrain Cf* - dwarf castles under normal castle rules (#4645)
* Terrain Cf* - first non-cave dwarf castle reivision (includes snow version)

* recut dwarf castle (Cf) images

* fix-up to remaining images in outside and winter dwarf castles

* Terrain Cfr - dwarf castle ruins variation
2019-12-15 19:51:40 -08:00
nemaara
259ea6f628
Merge pull request #4637 from Earth-Cake/tutorial-undo_reminder
Tutorial - remove repeating help messages
2019-12-15 21:31:56 -05:00
mattsc
d650a8336d
Merge pull request #4600 from mattsc/expai_ca_merge
Merge Experimental AI candidate actions into the default AI
2019-12-15 14:15:55 -08:00
nemaara
16cdecc064
Merge pull request #4636 from walodar/dunefolk_usage_attributes
Dunefolk usage attributes and recruitment patterns
2019-12-15 01:54:48 -05:00
doofus-01
c7fcaba0c1
New Terrain: Snowy Elf and Dwarf Castles, and outdoor snow embellishments (#4616)
* terrain: snowbits embellishment overlay

* terrain: snowbits embellishment overlay images

* snow elf castle (no keep yet)

* snow elf keeps (no keep-castle yet)

* keep-castle transitions

* deciduous winter snow tree image updates

* snowy dwarven castles (no transition to regular dwarven castle yet)

* small fixes to winter elf castles

* some more image touch-ups, mostly to snow-bits

* winter dwarf castle button images

* some snow-dwarf/regular-dwarf castle base transitions (not wall transitions)

* changing terrain code for snow dwarf castle to make it non-underground version
2019-12-14 18:02:45 -08:00
Celtic Minstrel
55fa2759a1 Fix the test_move_unit_in_circle test
Just needed to extract the unit earlier, so that it wouldn't be counted as blocking itself

Closes #4635
2019-12-14 12:12:29 -05:00
Steve Cotton
de92d17a6d WIP: Test [move_unit] moving back to the starting hex 2019-12-14 11:31:55 -05:00
Celtic Minstrel
3303be6c91 Restore the dir+count test for move_unit and add the syntax to the schema 2019-12-14 11:28:37 -05:00
jostephd
bb583c8e98
Merge pull request #4612 from jostephd/lua-deprecate_api-__index-__newindex-simplify
lua: Simplify the __index and __newindex wrappers in wesnoth.deprecate_api
2019-12-14 14:15:09 +00:00
josteph
1df045fba0 fixup! lua: Simplify the __index and __newindex wrappers in wesnoth.deprecate_api 2019-12-14 14:14:12 +00:00