Commit Graph

403 Commits

Author SHA1 Message Date
d8c3d857fc Blades Base: Use leaves instead of mushrooms as the Holly icon 2017-01-21 16:21:00 -05:00
4a9d8af7ff Blades Base: Use the new hammer icon 2017-01-21 16:19:15 -05:00
324922b15d Scenarios: Correct a few item errors inherited from the Blades of Exile Base 2017-01-21 16:17:39 -05:00
57aa6645fd Scenarios: Correct several monster errors inherited from the Blades of Exile Base 2017-01-21 16:17:10 -05:00
2e9ffbdf71 Convert all scenarios to new scenario format
The old-format versions have been filed under legacy, in case they are needed in the future (eg for comparison)
2017-01-21 15:31:26 -05:00
ec9058ddbb Fixup special spot in Warrior's Grove 2017-01-21 15:18:02 -05:00
44fb222afb Bladbase: minor cleanup
This is little formatting things which would probably end up as spurious changes later anyway
2017-01-21 15:14:53 -05:00
5c16195303 Apply bladbase corrections to new bladbase
(And remove the old-format corrected version.)
2017-01-20 21:50:36 -05:00
1a64245400 Convert bladbase to the new scenario format 2017-01-20 21:47:46 -05:00
c9b7346ca3 Tweak an editor button to reduce confusion
(New button by ADoS)
2017-01-20 21:36:18 -05:00
3fc4d259c4 Fix incorrect menu mapping on Windows 2017-01-20 21:31:18 -05:00
e80086923d Fixup cursor hotspots 2017-01-15 15:04:21 -05:00
916b9992ac Shrink down the cursors a little (thanks to ADoS) 2017-01-13 23:00:50 -05:00
9aed4b418f Several small bugfixes
- Wrong image in generic lever dialog
- Crash in adventure notes dialog
- Incorrect spell costs shown on second page of spellcasting dialog
- Enable messages in "if context" node, but only for legacy scenarios
- Fix recorded dialogue not working
- Fix special items leaking between scenarios
- Fix training dialog
- Fix scenario editor sometimes crashing on scenarios that it wrote itself
2016-09-26 20:23:09 -04:00
4e9117035d Small improvements to scenario validation script
- Now works for paths containing spaces
- No longer deletes the scenario/ folder if the scenario was already called that
2016-09-17 19:23:16 -04:00
59b68dc78d Remove a mostly-redundant static array 2016-09-15 22:28:44 -04:00
7008bf9149 Some updates to game tips 2016-09-13 22:13:40 -04:00
4cbd0d3013 New toolbar buttons for placing boats and horses; replaces the edit boats/horses dialogs 2016-08-25 21:28:42 -04:00
aecbea01a4 Fix incorrect fire barrier icon in help dialog 2015-10-15 15:42:48 -04:00
aab6d36fae Convert some images from indexed to RGBA
This is because, for reasons unknown, SFML on Windows was inappropriately complaining that they were not 8-bit.
The problem appears to be that it can't even handle colour maps of less than 8 bits.
2015-10-15 15:40:10 -04:00
e2a88873e7 Minor improvement to "save legacy scenario" dialog. 2015-10-12 14:11:54 -04:00
ba984279b0 Some item ability stuff
- Two new item abilities that increase damage as sp/hp is lost
- Two new item abilities that reduce damage as sp/hp is lost
- Support for using sp/hp as a weapon's key skill to determine hit chance
2015-10-12 14:11:27 -04:00
b61200f627 A few item graphic updates
- New weird meat graphic by ADoS
- Fix up artifacts in mist orb graphic
- Fix some erroneously transparent pixels
2015-10-11 23:11:47 -04:00
a62b4f15fd Tweaks/fixes to crystal wallset 2015-10-11 14:41:57 -04:00
72e871b8d4 New igloo wall (by ADoS) and desert crater (by me) 2015-10-10 23:54:51 -04:00
ce2d00abc1 More graphics updates
- Add shadow to grass hut (based on cave hut's shadow)
- Two new town graphics by ADoS
- New hut on hills.
- Desaturate snow/water shores to reduce weird purplish streaks
- Fix water tone in ice/water shores
- Add 3-way ice/water/snow shores
- Remove duplicate snow/ice shore
2015-10-10 23:51:26 -04:00
bd3aa33807 Schemas: Fix indentation 2015-10-06 22:17:27 -04:00
5667849835 Dialog schema: Convert indentation to tabs 2015-10-06 22:17:27 -04:00
f0af9ff67f Schemas: Enforce root element by eliminating global element declarations 2015-10-06 22:17:27 -04:00
68eec0fe16 Some schema updates
- Store timers as a type instead of an element in the common schema
- Fix errors in terrain and monster schemas
2015-10-06 22:17:26 -04:00
d19880a463 Stop storing preferences and legacy flags in the saved game
- Nuke global preference variables (they're now fetched with get_xxx_pref whenever needed)
- Nuke magic SDFs that store preferences and other info
- The only preferences now stored in the saved game are those related to difficulty
- play_sound no longer takes an option repeat parameter, but instead takes a delay which will be used if sounds are disabled
- SDF array increased to 350x50
- When saving a legacy scenario, a dialog is shown to remind you to update and to allow you to clear the legacy flag
2015-10-06 22:17:25 -04:00
7f00d0c775 Change image resource type from sf::Image to sf::Texture
This includes an added optimization to the resource manager - it now uses unordered (hash) maps instead of ordered (tree) maps to keep track of loaded resources and paths, for the average constant lookup time.
2015-10-05 23:57:42 -04:00
17095e1760 Three new wallsets and one new floorset by ADoS 2015-10-05 18:27:40 -04:00
f8deb48edb Add keyboard shortcuts to the death dialog and the quit confirm dialogs 2015-10-04 18:47:17 -04:00
d178dcea63 Allow customizing how much food a waterfall takes 2015-10-04 18:26:16 -04:00
0dbf747602 Update legacy resource file
- Add a missing resource name
2015-10-04 00:39:53 -04:00
5e8530969d Update Erdos's name in the credits, at his request 2015-10-03 23:56:11 -04:00
d908cdff9c Tweak Vahnatai PC traits and add Magery item ability
- Vahnatai no longer have a bonus to mage spells (that's now the Magery item ability)
- Vahnatai XP gain bonus changed
- Fix sliths being noted as resistant to poison (they aren't and never have been)
2015-10-03 23:55:52 -04:00
8afd3825b0 Refactor the dialog engine's event handling to make it easier to add new events in the future
- Focus event split into focus and defocus
- Scroll event added but not yet properly implemented

Also:
- Remove the useless (and ignored) clickable attributes from the schema
- Pave the way for controls other than fields to be able to recieve keyboard focus
2015-10-03 19:49:33 -04:00
547e78dc86 Minor fix to about dialog 2015-10-03 12:30:47 -04:00
8b90fa614b Make stack control a real container instead of a controller
- Also add framed/outlined attributes to it and to LED groups
2015-10-03 12:30:26 -04:00
b176918dda DialogXML: Make the frame style format parameter a first-class citizen
- It's now exposed in the schema with a new attribute, outline, on all elements that accept framed
- It now has four possible values: solid, outset, inset, double. Dashed or dotted may be added later; they're a lot harder.
- Second make scenario dialog uses a custom frame style
2015-10-03 11:13:33 -04:00
8b5396c980 Remove all def-key='enter' in favour of defbtn attribute
In addition, the default button is finally properly outlined when specified with the defbtn attribute.
(It would also be outlined if specified with def-key='enter'.)
The following preset buttons (available to special nodes) now respond to the enter key:
- "Leave", "Done", "OK"
2015-10-03 03:40:48 -04:00
da58f09fca All dialogs now use default skin and foreground colour
(The attributes are still available in the schema though, and will not be removed.)
2015-10-03 03:00:22 -04:00
893fa1e4ff Dialog formatting
- Newlines at end of file
- Remove debug attribute
- Indentation in the XSL
2015-10-03 02:50:44 -04:00
84dc913241 Improve dialog preview XSL sheet
- Now uses apply-templates, meaning output is in the same order as input
- Fully accounts for stack and pane, including adjusting coordinates
2015-10-03 02:33:40 -04:00
03bc3d05e6 Remove key-mod attribute from dialog schema
- Modifiers are now given in the def-key attribute, as originally intended
- Dialogs that have a help button now assign F1 to that button (replacing shift+/ in some cases)
- F1 also brings up help in the main game (in addition to shift+/)
2015-10-03 00:53:32 -04:00
0f273eba7e Fix resize outdoors dialog using the dark skin 2015-10-03 00:07:08 -04:00
2645818aeb Fix two minor graphical glitches in alternate scrollbar style 2015-10-03 00:02:26 -04:00
1b75bb4755 Add constraint for defbtn attribute to refer to a valid name in the dialog schema 2015-10-02 23:31:02 -04:00