Commit Graph

659 Commits

Author SHA1 Message Date
5d8f974742 Catch all exceptions in the editors in order to show an error dialog.
(This is the same as what the game already does.)
2014-12-18 12:52:01 -05:00
c1d489c636 Convert area description dialogs 2014-12-18 12:51:28 -05:00
150feed662 Fix scenario editor not handling keystrokes in the main window 2014-12-18 01:39:00 -05:00
2a2326035e Fix up all the mini-map stuff!
- Preset animated graphics now start at 960 instead of 400, due to all the new preset terrains from the previous commit running into their range.
- Tore out some optimization in the automap drawing, because it made it harder to figure out why it wasn't working
- Both game and editor now use the larger 12x12 map graphics, and fall back to shrinking down the 28x36 terrain graphic if no map graphic is set
- Upon loading an old scenario, map graphic is automatically set the same as the main graphic if it's a preset graphic; for custom graphics it's set to none
- Scenario now has three zoom levels for mini-map - the original in which the entire town is visible, a slightly closer one that matches the in-game view, and a large one using the 12x12 map graphics at full size.
- Fix some map patterns having the wrong bounding rect
- Graphics (and sounds) now included in the project by folder reference, so that I don't need to manually every new sheet to the project
2014-12-18 01:38:22 -05:00
2f64789003 Rearrange the new graphics on the terrain sheets and add all of the graphics Mistb0rn made for the project
- Also add credits and fill in termap.png
2014-12-17 18:48:35 -05:00
5de6d3d661 Convert two more dialogs 2014-12-17 13:13:23 -05:00
e864d9f7eb Replace living statue and crystal soul graphics with versions that don't have a background
- Also included is details on how this was done, in case someone else can improve on it.
- Living statue attack graphic is derived from Exile III.
2014-12-17 11:39:07 -05:00
8bb96396a5 Remove the RECT typedef for my custom rectangle class 2014-12-17 00:30:02 -05:00
23b2414c0d Name most converted editor DITL resources with the filename of the dialog that replaces them 2014-12-16 23:18:20 -05:00
f60b3f7b8e Picture controls now calculate their bounding rect on load 2014-12-16 23:15:55 -05:00
d409c8b616 Fix tab/newline stripping in dialogs not inserting a space to replace a run of newlines 2014-12-16 23:15:33 -05:00
045e49543c Convert the last two core scenario dialogs
- Edit special encounter dialog now expects a parent and returns false if the user cancelled.
2014-12-16 21:47:07 -05:00
2ef6d01ec7 Update spell data
- Fireball mistakenly required you to select a PC target while Haste did not.
- Forgot the two special monster priest spells
- Changed display name of ICE_WALL_BALL
2014-12-16 18:40:54 -05:00
d376d97de9 Remove a useless function 2014-12-16 18:20:45 -05:00
6866bf70c5 Fix special spots not being properly cleared from the previous town
(And get rid of the old forwarder functions for the field bitfields.)
2014-12-16 18:18:58 -05:00
bfafc42d46 Fix some issue with dialog picture display, mainly in special node dialogs 2014-12-16 17:34:00 -05:00
58c34423ac Rearrange field types enum and use it when setting fields on a space 2014-12-16 17:33:28 -05:00
ba1f385227 Fix dialogs looking up the wrong strings when not in town 2014-12-16 15:14:26 -05:00
c4136c862a Fix unseen mask 2014-12-16 14:57:59 -05:00
d88ace968f Use the spell enum for monster spells
- Enemy priests now cast Goo instead of Stumble; this was changed to match the effect of the spell.
- Enemy priests now cast Minor Heal instead of Light Heal; this is merely a name change to match the equivalent PC spell.
- PCs now cast Bless All instead of Bless Party; this is merely a name change to match the equivalent monster spell.
2014-12-16 14:45:32 -05:00
0f140d3d86 The names of spells and alchemy were duplicated in several places, all slightly different; this unifies them all in one place 2014-12-16 00:39:24 -05:00
dddc508f2f Fix repetition count in transcript being off by one 2014-12-16 00:06:55 -05:00
c9456334d5 Fix priest spells only being castable in combat 2014-12-16 00:06:42 -05:00
a3edc5cba6 Spread out magic-names string list to make sure there's room for special spells 2014-12-15 23:35:31 -05:00
35d20e15da Fix monster avatar spell not blessing 2014-12-15 22:49:45 -05:00
65c6919b1d Organize talking strings rather than stuffing them all in one big array
(Note: This seems to break recording talking/encounter strings.)
2014-12-15 20:06:08 -05:00
c6d960d078 Remove the string forwarders that were introduced to allow use of the original string indices
(A few things might be broken, probably just related to recording talk/encounter notes.)
2014-12-15 13:55:00 -05:00
c90afdc013 Move Wand of Pyhrrus spell into main combat cast routine. 2014-12-15 11:16:45 -05:00
5af865368f Mass reformatting (braces from next line) 2014-12-15 11:09:56 -05:00
d7d08cbaa3 Mass reformatting (space after keywords) 2014-12-15 10:09:23 -05:00
140e0b58ef Mass re-indentation
(Also removes some trailing whitespace)
2014-12-15 09:59:43 -05:00
aaad894ccb Simplify tons of comparisons to true/false 2014-12-15 08:46:48 -05:00
a1c52d4e3c Make the special nodes appendix in the documentation readable
Note: This doesn't update the information in it to account for the various changes and new nodes.
2014-12-15 08:46:47 -05:00
02478da9d7 Lots of TODO comments, some noting things related to the Windows version 2014-12-15 08:46:47 -05:00
e511f5280d Refresh screen when pausing
- Seems to partially fix issue of monster moves not being shown
2014-12-15 08:46:47 -05:00
85e582f32e Fix transcript destroying the previous message if a message consisting solely of spaces is printed 2014-12-15 08:46:46 -05:00
1ad2cf85ac Fix typo 2014-12-15 08:46:46 -05:00
2ed3eca8d1 Remove the redundant combat_terrain array 2014-12-15 08:46:46 -05:00
9fd647b7d8 Remove relic of Pascal strings in the spell menus 2014-12-15 08:46:45 -05:00
54e1a5d981 Make use space cancellable by keyboard and reimplement the bash/lockpick keyboard shortcuts (allowing you to bypass the usual dialog) 2014-12-15 08:46:45 -05:00
d9698cc0e9 Make end scenario debug key actually work 2014-12-15 08:46:45 -05:00
3c802a1158 Support for stairways during talking or combat
(Adapted from Windows version; I don't allow it during outdoor combat, though.)
2014-12-15 08:46:45 -05:00
2cfe9640c7 Change town portal nodes so that ex2a specifies the type of flash
(0-normal, 1-none, 2-out only, 3-in only; forced to 1 if called while talking)
2014-12-15 08:46:45 -05:00
c5b1e9bdb3 Make it possible for stairways to be triggered when in combat and in other circumstances where they were previously disallowed
(Inspired by Windows code, but this version doesn't need a compatibility flag as it allows the designer to choose whether it's allowed)
2014-12-15 08:46:44 -05:00
179cce0819 Fix newly placed monsters always showing up as empties 2014-12-15 08:46:44 -05:00
fbe186f8b7 Stuff about force cages, stone blocks, move mountains
- Add all objects, fields, and sfx to place_spell_pattern
- Add move mountains effect to place_spell_pattern
- Most of the implementation for force cages and stone blocks is now done (still untested)
- Properly implement MOVE_MOUNTAINS_MASS spell
2014-12-15 08:46:44 -05:00
c8889a9989 Prevent party from getting a victory dialog if they die during special node processing in a chain that contains an end scenario node 2014-12-15 08:46:43 -05:00
402065fa80 Add a check to prevent entering boats in combat (from Windows version) 2014-12-15 08:46:43 -05:00
8cf5b3d04e Fix spellcasting in town not being cancellable by keyboard, as well as throwing/firing in combat 2014-12-15 08:46:43 -05:00
6926410ce3 Fix an issue with transcript not updating after cancelling a spell in town 2014-12-15 08:46:43 -05:00