65373 Commits

Author SHA1 Message Date
Gregory A Lundberg
d45f174259 AToTB S03 Fix bug: Inconsistent objectives
The objectives and conversation presume the player will first find Baran, then kill Rotharik for the key, and finally release Baran from the cell.

If the player kills Rotharik first, the objectives jump around and the conversation makes no sense.

Let's fix the mess.

While we're at it, instead of always extending 6 turns, let's just ensure there are at least 6 turns left if all Arvith need do is run over to Baran's cage.
2016-08-19 18:37:37 -05:00
Gregory A Lundberg
77e714e4ed AToTB S03 Fix bug: Rotharik may be dead
No returning from the dead just to speak a line.
2016-08-19 18:37:37 -05:00
Gregory A Lundberg
a82e556607 AToTB S03 Fix bug: Capture villages
The guards are distracted by the villages. They should be owned by their side, anyway.
2016-08-19 18:37:37 -05:00
Gregory A Lundberg
6c33ecbd94 AToTB S03 Fix bug: Delay guards
Use correct variable name.
2016-08-19 18:37:36 -05:00
Gregory A Lundberg
75986550ad AToTB S02 Fix bug: Missing units
Recruiting the revenants fails because the location is invalid.
2016-08-19 18:37:36 -05:00
Gregory A Lundberg
33c2e1037b AToTB S02 Fix bug: Speaker may be dead
This is basically the Mercenary from S01, so let's use him, instead. If he's died by the closing scene, recruit a replacement.
2016-08-19 18:37:36 -05:00
Gregory A Lundberg
7a3d2e37f7 AToTB S02 Fix bug: Inconsitent objectives
If you find the kidnappers the objective changes to killing them; but if you then kill Nil-Galion, the objective changes back to finding the kidnappers.

Clean up the mess.
2016-08-19 18:37:35 -05:00
Gregory A Lundberg
fbedc205b0 AToTB S01 Fix bug: Mercenary may be dead
The role was assigned too soon, and did not provide for advancements. If none can be found, recruit a Horseman to speak the line.
2016-08-19 18:37:35 -05:00
Gregory A Lundberg
27bda635e7 AToTB S01 Fix bug: No unit for role
Include all possible advancements, but exclude Arvith, and recruit a replacement if no unit found.
2016-08-19 18:37:35 -05:00
Gregory A Lundberg
423f082ebc AToTB S01 Fix bug: Missing advancements
The comments should still apply when the target has advanced.
2016-08-19 18:37:34 -05:00
Gregory A Lundberg
b9a18aee48 AToTB Standardize Baran's last breath
Technically, it is impossible for Baran to die in S03, but handle it anyway, just in case, for story purposes.
2016-08-19 18:35:44 -05:00
Gregory A Lundberg
f351f35703 AToTB Standardize Baran
Use a macro to ensure consistent definition.
2016-08-19 18:35:43 -05:00
Gregory A Lundberg
955b8477d2 AToTB Standardize Arvith's last breath
Use a consistent message instead of sometimes 'all' and sometimes 'everything'. Do it with a macro.
2016-08-19 18:35:43 -05:00
Gregory A Lundberg
21320f7c1c AToTB Standardize on EASY
Use consistent #ifdef tests. Standardize on EASY, the other difficulty is simply 'not EASY'.
2016-08-19 18:35:43 -05:00
Gregory A Lundberg
8199098d74 AToTB Remove variable artifacts 2016-08-19 18:35:43 -05:00
Charles Dang
da561512a4 MP Create: implemented most remaining functionality 2016-08-19 21:34:20 +11:00
Charles Dang
369cabc9ae Use standard label definitions for scroll labels
These were simply copies of their respective label definitions, so this reduces the WML slightly.
This also renames the 'scroll_label_mono' definition, since there's no reason a label couldn't use it,
and this makes that clearer.
2016-08-19 17:45:17 +11:00
Charles Dang
8aa82bd4c3 MP Create: allow description area to grow to fill available height 2016-08-19 17:34:29 +11:00
Charles Dang
0289944299 Small fixup 2016-08-19 16:23:05 +11:00
Charles Dang
20e33d5c58 Game Load: close dialog if you delete all savefiles 2016-08-19 16:06:36 +11:00
Charles Dang
157a579014 MP Create: fixed an issue where the correct game wouldn't appear when filtering 2016-08-19 15:04:37 +11:00
Charles Dang
88726caebc Fixup typo from 6b3f9d8cbde6 2016-08-19 13:41:01 +11:00
Charles Dang
6b3f9d8cbd MP Create: much more efficient method of game filtering 2016-08-19 13:37:23 +11:00
Charles Dang
90c3c05af4 MP Create: improved handling of campaign difficulty selection
Instead of showing the difficulty dialog in post_show and setting the retval to twindow::NONE if the
dialog was canceled, we add a custom exit hook that fires when double clicking the games list or pressing
the Create Game button that shows the dialog instead, and returns if canceled. This is much cleaner.
2016-08-19 12:33:00 +11:00
Charles Dang
1195c01508 tlistbox: made add_row return a reference to the added row's grid
This removes the need to then use list.get_row_grid(list.get_item_count() - 1) if you needed
the row grid after adding one.
2016-08-19 11:26:40 +11:00
Charles Dang
5bac12a53e tscroll_label: proper implementation of 162126026ac (thanks to gfgtdf) 2016-08-19 10:45:38 +11:00
Charles Dang
835bfa646f Unit Attack: reduced weapon label size and disabled max width (bug #24988) 2016-08-19 08:10:57 +11:00
Charles Dang
245a7cc3d5 Updated schema for 119e095ccd24 2016-08-18 17:33:28 +11:00
Charles Dang
119e095ccd Added support for icons/entry tooltips in drop down dialogs/comboboxes
It now works on a vector of configs, meaning it's easy to add new data to entries
2016-08-18 17:20:14 +11:00
Charles Dang
adeefd7248 Unit Attack: don't allow range column to grow so much 2016-08-18 15:25:55 +11:00
Charles Dang
162126026a WIP: make scroll labels not change width when setting a new value 2016-08-18 14:23:39 +11:00
Charles Dang
b8f09213f7 MP Create: hacky implementation of game filtering 2016-08-18 10:43:01 +11:00
Jyrki Vesterinen
b15c9be4d5 Fix delay before drawing menu content 2016-08-17 20:18:51 +03:00
Charles Dang
e33e9b1d32 MP Create: implemented a bunch more functionality 2016-08-18 03:34:27 +11:00
Charles Dang
803e668a22 Remove video argument from MP Lobby tests 2016-08-18 02:07:42 +11:00
Charles Dang
aa1575f997 MP Create: fix combo options not showing 2016-08-18 02:03:47 +11:00
Charles Dang
b2f78104e6 MP Create: make sure there's always an initial era/mod index set 2016-08-18 01:27:10 +11:00
Charles Dang
5142613ed9 MP Create: progress and cleanup 2016-08-18 01:10:55 +11:00
Charles Dang
099109a822 Allow post_show to override a window's retval 2016-08-18 01:10:36 +11:00
Charles Dang
89dd0e7f75 ttree_view: don't shrink width when clearing 2016-08-18 00:02:58 +11:00
gfgtdf
f124dd179c gui2 mp create improvements 2016-08-17 14:41:30 +02:00
Charles Dang
a99e984f42 MP Create: fixed some issues with displaying custom options 2016-08-17 22:40:38 +11:00
Charles Dang
306fa1744f MP Create: work on showing custom options for eras and mods 2016-08-17 21:52:31 +11:00
Charles Dang
425ad0acd5 MP Lobby: few small layout tweaks 2016-08-17 13:42:05 +11:00
Charles Dang
df6ee9263a Improved lobby game status icons 2016-08-17 13:15:01 +11:00
Charles Dang
483fda8638 MP Lobby: few layout fixes for the low-res version 2016-08-17 11:33:54 +11:00
ln-zookeeper
6382660fd3 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2016-08-17 02:11:30 +03:00
ln-zookeeper
402627d851 Roughly cap the number of undead spawns to avoid performance issues 2016-08-17 02:11:01 +03:00
Charles Dang
1209a2fb5b Slightly more sensible scrollbar positioning on content resize
This isn't perfect. Optimally, the scrollbar should never change position at all.
2016-08-17 09:59:10 +11:00
ln-zookeeper
25c31ed720 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2016-08-17 00:35:42 +03:00