24040 Commits

Author SHA1 Message Date
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
sigurdfdragon
821f68a3a1 DiD S12: Add race-specific ending dialog 2017-12-05 02:36:12 +02:00
sigurdfdragon
b477729a2f DiD S12: Add status table names & flags for side 2 2017-12-05 02:36:12 +02:00
sigurdfdragon
6139e22b25 DiD S12: Change and improve objectives
1. Makes it clear to the player that the loop is not a bug by adjusting
   and clarifying objectives & adding a scenario repetition counter.
2. Allow campaign to end by leader death on fourth repetition instead
   of second to better convey endlessness/hopelessness feeling, with
   music & dialog to match.
2017-12-05 02:36:12 +02:00
sigurdfdragon
a9d016f84a DiD S12: Move and adjust scenario repetition variable
1. So forthcoming objective changes work correcly in linger mode.
2. So forthcoming objective code is simpler.
3. Allows jumping directly to scenario in debug to work correctly.
2017-12-05 02:36:12 +02:00
sigurdfdragon
4f899d44c5 DiD S12: Use macros 2017-12-05 02:36:12 +02:00
Gregory A Lundberg
3f646cc965 DiD S04 Todo: Add snow
Lifted code from HttT to add snow coverage.
2017-11-29 16:32:44 -06:00
Gregory A Lundberg
128413da5a DiD S02 Fix bug: Swamp only
Use a terrain filter to avoid triggering the Ghouls when ending in forest instead of swamp.
2017-11-29 16:32:44 -06:00
Gregory A Lundberg
a599436ec3 DiD Remove variable artifacts 2017-11-29 16:32:44 -06:00
Gregory A Lundberg
a6fce92585 DiD S02 Cannot undo
The first moveto to 15,11 also causes a capture, which sets some variables and creates some units. So allow_undo has no effect.
2017-11-29 16:32:44 -06:00
Gregory A Lundberg
bdcfe84d6f DiD S01 Fix bug: Allow undo
Be consistent and allow undo on both sign posts.
2017-11-29 16:32:44 -06:00
Jeffrey 'Sigurd' Westcoat
822f98b754 HttT S17: Fix lava issues (#2249)
1. Undo now works again in the scenario.
2. Lava now works again.
3. Triggering on a moveto event was not good, as several shorter moves
   would make rate of lava grow much faster than fewer longer moves.
2017-11-30 00:25:22 +02:00
sigurdfdragon
3213e63efe DM S19: Fix carryover report 2017-11-27 20:15:54 -05:00
sigurdfdragon
4bafb736f0 DM S19: Rebalance scenario for a more exciting battle
1. Increases difficulty
2. Allows player and enemy to field more units
2017-11-27 20:15:54 -05:00
mattsc
b7efaadec4 Protect Unit Micro AI: fix typo/bug in AI aspect change 2017-11-27 06:54:14 -08: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
doofus-01
090810a778
updating Ixthala Demon unit (#2240) 2017-11-25 11:43:49 -08:00
sigurdfdragon
23c23b7a55 WML: Add [show_if] usage in [objectives] subtag [gold_carryover] 2017-11-22 20:27:13 -05:00
sigurdfdragon
64d3aa1ab6 SotA: Fix and improve freeze/thaw unit implementation
Bug was that when a unit was thawed, mouse over in unit sidebar would show
incorrect movement costs (all 1's).

New implementation properly uses {UNREACHABLE} and makes use of the now
available [remove_object] tag.
2017-11-22 17:37:14 -05:00
Charles Dang
976f37c08a Fixed graphical artifacts appearing in Fake Map Border/Off Map terrains with SDL 2.0.6+ (fixes #2061)
[ci skip]

Something was screwy about these image's alpha. Normally when I remove an alpha channel in GIMP,
it shows up white. With these images, it showed up black. Maybe they had an embedded palette or
something, I don't know, but the problem is fixed.

Something must have changed in SDL 2.0.6 that caused this issue to appear. Not sure if anything
needs to be patched in our source code, though (but not likely)
2017-11-21 16:22:12 +11:00
sigurdfdragon
8ba4e33e7a DM S19: Fix dialog 2017-11-18 13:40:49 -05:00
sigurdfdragon
22492fc1b5 DM S19: Have either undead or Delfador be able to kill Iliah-Malal
Previously, there was temptation for players to ditch all of their
undead before leaving the land of the dead scenarios so they had
Delfador instead of the undead able to kill Iliah-Malal.
2017-11-18 13:40:49 -05:00
sigurdfdragon
ac2c6e6e6d DM S08: Use simpler way to keep leader on his keep
He won't attack, but that's not a big deal here.
2017-11-15 20:31:31 -05:00
Alexander van Gessel
ca0b5033f0 Don't break recall/traitless-recruit undo (Fixes #2196) 2017-11-16 00:52:16 +01:00
Jyrki Vesterinen
b0c139c16a Chatbox tabs can no longer shrink vertically 2017-11-15 21:03:44 +02:00
Jyrki Vesterinen
506ee85d2d Revert "GUI2: implemented fixed_width and fixed_height keys for all widgets"
This reverts commit 556331ac3f53f2fd58fd4e137cf86af71d5c064b.

Since the keys aren't working, the implementation shouldn't be in the
Git repository. Otherwise some poor soul will attempt to use them and
face additional work afterwards.
2017-11-15 19:04:47 +02:00
Jyrki Vesterinen
18e208e07c Revert "GUI2: removed GUI_FORCE_WIDGET_SIZE macro in favor of fixed_width/fixed_height keys"
This reverts commit 9f386ed563e84e355130a940be804d13bf5b3d9c.

fixed_width/fixed_height are broken and completely fail to block the
widget from growing.
2017-11-15 19:04:03 +02:00