24066 Commits

Author SHA1 Message Date
Charles Dang
ae8f554e58 Campaigns: wmllint run
[ci skip]
2018-01-19 12:24:50 +11:00
Charles Dang
ca7e3c126d Campaigns: wmlindent run
[ci skip]
2018-01-19 12:20:04 +11:00
doofus-01
48fa7d9461 remove specific mention of horses 2018-01-19 10:28:38 +11:00
doofus-01
c669a75e67 touch-up archer sprites 2018-01-19 10:28:38 +11:00
doofus-01
b5b1539143 base sprites for Quenoth scouts 2018-01-19 10:28:38 +11:00
V N
5209271db3 Lua: add variables metatable
The implementation differs from already-existing
wml.variable.proxy in that it does not try to proxy table sub-fields,
and is fast & simple.

Example usage:
wml.variables.test = 123
print(wml.variables.test)
2018-01-19 09:53:06 +11:00
Richard Kettering
b969940ba4 Added frames for a ne stalwart attack. 2018-01-17 23:03:00 -06:00
Jyrki Vesterinen
1386e3945c Added unit tests about which WML tag names Lua API accepts 2018-01-17 23:23:13 +02:00
Gunter Labes
03b6ad568c
Continue if there is an old executable
Chances are that the previous build works just as well.
We just need it for config file parsing which does not change often.
2018-01-12 19:14:41 +01:00
Charles Dang
8ae99bc86a Added some event unit tests by @Pentarctagon
Tests event execution order and events with variable names.
2018-01-11 13:12:28 -05:00
Allefant
4de5cdc7d3 update the addon manager for "simple WML" 2018-01-09 09:23:50 +01:00
Gunter Labes
7cdec04c7f
only keep env vars upper case, add missing quotes 2018-01-09 02:06:04 +01:00
Gunter Labes
a535a3140c
Use a more generic default value 2018-01-08 23:36:10 +01:00
ln-zookeeper
80829106c1 AOI: New story art by Bhoren
I chose 2560x1440 as the size over 1920x1080 simply because when I tried both sizes at compression levels that produced a similar quality result, the difference in filesize was negligible.
2018-01-07 13:31:43 +02:00
sigurdfdragon
d3a58e9424 DiD S12: Allow campaign to end on the third repetition
As players who haven't figured out certain strategies might have too much
trouble beating the third repetition. Also waiting until the fourth
repetition may be too long and have players question what's going on.
2017-12-29 19:50:54 -05:00
sigurdfdragon
44bcd6ef90 DiD S07: Add note about scenario conditions 2017-12-29 19:50:54 -05:00
sigurdfdragon
ec6c174096 DiD: Clear variables when no longer needed and remove unused variable 2017-12-29 19:50:54 -05:00
sigurdfdragon
b0fc2708ae DiD S11: Fix & improve wose implementation
Bug was that a troll on 4,21 could move through the avoid area to attack
player at 11,22 which is a likely occurrence. Expanding the avoid area
further seems inappropriate as troll avoidance is more likely to be noticed.

New implementation ensures only player will trigger the wose, maintains
proper look to the player, no longer interferes with trolls attacking, and
simplifies code.
2017-12-29 19:50:54 -05:00
sigurdfdragon
8db9ec2777 DiD S01: Add the alternative objective to the scenario objectives 2017-12-29 19:50:54 -05:00
sigurdfdragon
cd9af67ff1 DiD S04: Fix dialog so it better fits with if malin_used_necromancy or not 2017-12-29 19:50:54 -05:00
sigurdfdragon
5fbd5affe2 DiD S03: Slightly change gameplay to better match objectives
Have player kill all enemy units in the cave instead of just the leaders.
2017-12-29 19:50:54 -05:00
sigurdfdragon
8b367a184a DiD S11: Have dialog fire if Mal Keshar is defender as well as attacker 2017-12-29 19:50:54 -05:00
Jyrki Vesterinen
d81f230680 Clear unit death animation after killing the unit
This is another and much better way to fix the unit halo remaining.
2017-12-28 12:02:29 +02:00
Jyrki Vesterinen
f50c7d3f2a Revert "Work around unit halo not disappearing with [kill] animate=yes"
This reverts commit 70b468070b71616aa3663088b6ad171391d0c4f0.

As I said in the commit message, the fix is not pretty, and
@CelticMinstrel said in IRC that a different fix would definitely be
better. I'll fix the problem by having an animation automatically
release the unit when done, instead (next commit).
2017-12-28 11:48:12 +02:00
Steve Cotton
1c2968c632 L S8 Give Harper a loyal overlay in Liberty's final scenario
He's been a silver-crowned hero until this scenario, and in
the final scenario he's still loyal with dialogue if he dies,
so make him easily visible to the player.
2017-12-26 08:30:01 -06:00
Jyrki Vesterinen
70b468070b Work around unit halo not disappearing with [kill] animate=yes
The problem was that the kill animation retained a reference to the unit.
Triggering a Lua garbage collection (which destroys the animation object)
fixes it, although it's definitely not a pretty fix.

Closes pull request #2313.
2017-12-25 18:35:01 +02:00
gfgtdf
9cd200032c
fix player not proceeding to next scenario in Low 22
reported on the forum
2017-12-23 20:39:20 +01:00
Jyrki Vesterinen
e0e59ac463 Fix exception when [harm_unit] is used without an attacking unit
Regression from commit 38e31aa61f60abed71bd266e6d2abe61035805b4.
In particular, it broke WML unit tests.
2017-12-21 20:24:48 +02:00
Vasya Novikov
7be364f3b5 addon_manager: fix append_tag usage
Note that this still doesn't allow the --upload
functionality to work. After this fix,
wesnoth still complaints about unordered WML.

It is believed that this is a separate issue though,
happened because of the latest simple_wml changes.
2017-12-20 22:23:53 +02:00
Vasya Novikov
6a1a91cd7c make images not executable 2017-12-20 22:19:35 +03:00
Gregory A Lundberg
38e31aa61f Do not access non-existent unit
The [kill] tag can run animations. But it can also fire the `last breath` event, which can call [kill]. When we get back to the original [kill], the unit is gone, causing an error attempting to run the animations.

Added a check to ensure the unit is still on the map before we attempt to run the animations.

The Issue also requested that [harm_unit] pass the unit causing the harm into the [kill] tag so that `last breath` could use the secondary (killing) unit available like it does elsewhere.

Closes #2298
2017-12-19 15:05:24 -06:00
Jyrki Vesterinen
f064f50f1b [heal_unit]: Turn on floating text with animate=yes
I also moved the animation to be played *before* healing, which is the same
order as in C++ code. In the previous order, the animation isn't played for
some reason.

Fixes #2295.
2017-12-18 23:28:45 +02:00
Jyrki Vesterinen
d80d47eb8a [heal_unit]: fix wrong value of "hits" parameter
Only "hit", "miss" and "kill" are allowed.
2017-12-18 22:04:35 +02:00
Gregory A Lundberg
0353242315
DiD S07: Fix Taylor talks to himself
Use an alternate message if the unit spotting us is General Taylor.
2017-12-17 15:24:31 -06:00
doofus-01
8473e49288
Giant Scorpion unit images (#2266)
NE and SE base/standing frames.  Defending and pincer-ing animations for both NE- and SE-facing frames.  Stinger animation for SE-facing frames.  Portrait replaced.
2017-12-14 19:48:43 -08:00
josteph
d7afadc94b
HttT: Fix OOS when redoing a recall and Li'sar is allied
For #2216.
2017-12-14 14:07:46 -06:00
sigurdfdragon
2e27f05f80 DiD: Fixup MANOR_DOORS macro
Prevent an opened door from being opened again and causing a 'terrain
with a string with more than 4 characters has been found' error.
2017-12-13 22:51:51 -05:00
Charles Dang
ab2cfa0ac2 Fixup 002b1a3c871f (bad indent)
[ci skip]
2017-12-14 11:15:07 +11:00
Charles Dang
002b1a3c87 MP Staging/Join Game: unified player list handling and added player icons
Previously, MP Staging was using connect_engine::connected_users() to fill in the user list.
However, I noticed that the server was already sending the user list to all clients, including
the host, so I could unify the handling between Staging and Join Game by just using the server
data for both.

I've also added appropriate indicators for host, observer, and self in the list for both dialogs.
Additional host= and observer= status keys are sent by the server for that purpose.

I've also made the server dispatch the player list to the host when a game is created. This is
slightly redundant, since the host is the only player at that point, but it's easier than creating
a user config locally, or using connected_users(), not to mention easier to maintain.

The wesnothd::game::send_user_list function no longer exists early id `description_` is null.
No idea why it did that. It's not even used in the function. Anyway, it needed to be removed in
order for the above change to work.

Speaking of the host's copy of the player list, I haven't touched that. It's still needed for
managing things in the connect_engine. Might simplify things further in the future by delegating
more handling to the server, since it has a lot of the data needed already, but that's a different
project.
2017-12-14 11:12:49 +11:00
sigurdfdragon
1f4416e823 SotA S07: Stylistic fix due to terrain graphics change
Due to terrain Xuce change from hewn cavewall to minewall.
Restores original look. No gameplay changes.
2017-12-11 21:58:46 -05:00
sigurdfdragon
0fde54bf12 TSG S07a: Stylistic fix due to terrain graphics change
Due to terrain Xuc change from hewn cavewall to minewall.
Per discussions on irc, restores original look.
No gameplay changes.
2017-12-11 21:58:23 -05:00
sigurdfdragon
966e76b0fa NR: Stylistic fix due to terrain graphics change
Due to terrain Xuc change from hewn cavewall to minewall.
Minewall looks out of place over chasm, so remove it.
No gameplay changes.
2017-12-11 21:57:43 -05:00
newfrenchy83
23e358fa07 add major_amla option in amlas (#2268) 2017-12-09 02:18:59 -05:00
Charles Dang
e4b61eab29 EI: deploy fake shroud overlay in throne room map
[ci skip]
2017-12-07 19:38:06 +11:00
Charles Dang
624cc3b851 Replaced shroud terrain with fake shroud overlay
[ci skip]

Credit to @shikadilord for the idea. The old terrain was kept (hidden) for compatibility.
2017-12-07 19:36:40 +11:00
Charles Dang
e08350cd17 Revert "rebase commit: implemented a surrender dialog that records a surrender command in replays and quits the game"
This reverts commit 4dda0ad9b2dc74f0d2251f6778339f4199bec4e9. This feature needs to be
considered further. Right now the design doesn't make sense.
2017-12-06 13:35:28 +11:00
kallaballa
4dda0ad9b2
rebase commit: implemented a surrender dialog that records a surrender command in replays and quits the game 2017-12-05 17:01:06 -06:00
sigurdfdragon
6cebe328b7 DiD S12: Consolidate and adjust difficulty settings 2017-12-05 02:36:12 +02:00
sigurdfdragon
a384f9dcc9 DiD S12: Remove illuminated from hexes for a darker mood on the map 2017-12-05 02:36:12 +02:00
sigurdfdragon
205f000529 DiD S12: Add proper time area for outside of cave 2017-12-05 02:36:12 +02:00