Commit Graph

967 Commits

Author SHA1 Message Date
Martin Haye
32021f42fa Replaced random number generator. Made good progress on record mode. 2019-04-24 06:33:18 -07:00
Martin Haye
ff6c08b9d7 Working on record mode (required refactoring buildString to save cswl/cswh) 2019-04-12 07:21:57 -07:00
Martin Haye
027d988171 Story loading now works. 2019-02-21 09:23:34 -08:00
Martin Haye
023c33218f Implemented scroll-lock mode in font engine, in support of story mode. 2019-01-24 09:51:56 -08:00
Martin Haye
0139adca30 Progress on story mode. 2019-01-24 08:52:02 -08:00
Martin Haye
63f40d60b5 Basics of storybook packing now operational. 2019-01-10 09:45:40 -08:00
Martin Haye
6455a56f30 Final sprint to get display of quest target coords (or nearest exit when applicable). 2019-01-07 11:38:57 -08:00
Martin Haye
046141958a Had forgotten to use gen_mapsizes to validate the disk marks on load. That's done now. 2018-11-20 08:29:19 -08:00
Martin Haye
a208b5b4a0 More work on quest log locations. 2018-11-20 06:54:52 -08:00
Martin Haye
e1bc8de7f6 Lots of progress making automap target work. 2018-11-15 09:00:20 -08:00
Martin Haye
44a3aadf86 Fix for proper reload after player death. 2018-09-29 10:10:25 -07:00
Martin Haye
2b6edd912a Refactored enemies table to make it smaller and split it in half. It was getting too big for memory. 2018-09-29 09:46:19 -07:00
Martin Haye
30405be0c2 Some fixes to quest log. 2018-09-13 08:27:57 -07:00
Martin Haye
eb0e68e33c Not sure what all that allowZoneInit stuff was about, but we need to able to adjust encounter zones at any time. 2018-06-07 09:11:07 -07:00
Martin Haye
06a9600d7a Now clears automap marks when starting new game. 2018-05-31 08:33:25 -07:00
Martin Haye
2b0e13b105 Wording change per Seth's request. 2018-05-31 07:35:09 -07:00
Martin Haye
7f4c90ddcb Fix to leave global tileset in mem. 2018-05-15 13:17:52 -07:00
Martin Haye
3d348a2a5e Added capability to 'Use' any skill. 2018-05-14 07:35:52 -07:00
Martin Haye
4839168bbf Even simpler automap icons. Fix big string generation problem. 2018-05-12 07:58:27 -07:00
Martin Haye
80cf33d17b Fix crash when starting combat. 2018-05-10 08:07:19 -07:00
Martin Haye
de9de7288c Fix to put automap marks even on blank squares (since they may need an automap-special icon for a script there). 2018-05-10 06:53:40 -07:00
Martin Haye
ba748eed52 Excellent progress on displaying map special icons. 2018-05-09 09:11:27 -07:00
Martin Haye
7ffc63db8e Making progress on display of automap specials. 2018-05-06 09:25:42 -07:00
Martin Haye
f49a34434d Generating mapSpecials table. 2018-05-03 08:38:35 -07:00
Martin Haye
54735f5317 Refined the resource index so that wilderness map really does fully function from any of the data disks. 2018-04-28 09:38:24 -07:00
Martin Haye
28b7a97add Deduplicated strings to make gen_enemies and gen_items smaller. Optimized load order in combat. 2018-04-27 09:23:24 -07:00
Martin Haye
7e06ed5da7 Updated memory map. 2018-04-27 08:15:47 -07:00
Martin Haye
52ad5e43c7 Changed memory manager allocation policy to best-fit. 2018-04-27 08:03:21 -07:00
Martin Haye
3f73ebaf17 Refactoring mem mgr scan loops. 2018-04-26 09:55:57 -07:00
Martin Haye
8ab58e2ad1 Moved expander down into aux 00.790 2018-04-26 09:19:33 -07:00
Martin Haye
96f6529823 Use new FIND_IN_MEM. 2018-04-25 08:58:20 -07:00
Martin Haye
a94bd71ef6 Removed some debug code. 2018-04-25 08:58:09 -07:00
Martin Haye
d29ac7ffea Fixed bug causing NPCs to never be attacked in combat. 2018-04-20 10:10:18 -07:00
Martin Haye
80bc9c277c Refactored godmode so it's not occupying memory most of the time. 2018-04-20 09:21:52 -07:00
Martin Haye
c7dfbef4c6 Fix bug when move backward called twice. 2018-04-16 08:19:38 -07:00
Martin Haye
eb4701f0d4 Working on marks verification and clearing. 2018-04-16 08:19:30 -07:00
Martin Haye
b487223783 Generating map sizes for diskops checking. 2018-04-16 07:46:54 -07:00
Martin Haye
c1bca9e125 Fixed bug in automap mark merging. 2018-04-16 06:18:47 -07:00
Martin Haye
f4062d506a Lots of work on automap marks. 2018-04-16 05:35:40 -07:00
Martin Haye
df61fb6baa Fix pluralization, and pave the way for multiple enemy groups. 2018-04-16 05:35:25 -07:00
Martin Haye
1e9813ba2a Fixed bug where script module wasn't beeing freed when wandering (or teleporting) for a long time on the wilderness map. 2018-04-08 10:08:50 -07:00
Martin Haye
4964220863 Added proper automap mark flushing. 2018-04-08 07:46:53 -07:00
Martin Haye
3f77c7cade Unload textures at proper moments. 2018-04-08 07:46:26 -07:00
Martin Haye
2db272f368 Slightly better debug messaging. 2018-04-08 07:46:01 -07:00
Martin Haye
b2eef925d8 Fixed several mark storage bugs. 2018-04-08 07:32:46 -07:00
Martin Haye
0248c70646 Automap mark saving working for 3D maps. 2018-04-05 08:30:04 -07:00
Martin Haye
94f5ab3a7e Tested out mark queueing code. 2018-04-01 07:55:13 -07:00
Martin Haye
fa6454fdfb Now loading mark queue/flush code into proper RAM bank. 2018-03-30 09:54:39 -07:00
Martin Haye
6fae3b6ea8 More groundwork for automap mark cache/flush. 2018-03-29 10:12:22 -07:00
Martin Haye
322fc7b1ba No need for string workaround anymore -- yay\! 2018-03-28 16:42:42 -07:00
Martin Haye
1dbd41d79e Workaround for PLASMA string thing. 2018-03-28 16:36:52 -07:00
Martin Haye
add1c62f75 Fix for double-freeing. 2018-03-28 16:36:37 -07:00
Martin Haye
5d71d911a4 Massaging load/unload with an eye to automap flushing. 2018-03-28 15:29:49 -07:00
Martin Haye
7350c47b89 Better fix for return-to-2d from automap. 2018-03-28 15:16:34 -07:00
Martin Haye
ba46785fec Fix return to 2D map from automap. 2018-03-28 14:48:43 -07:00
Martin Haye
6468c0fef1 I couldn't resist saving a few bytes. 2018-03-28 14:47:39 -07:00
Martin Haye
420db30768 Automap scrolling optimization. 2018-03-27 10:43:51 -07:00
Martin Haye
580a5126c5 Fix for adding countable things to inventory. 2018-03-27 10:01:40 -07:00
Martin Haye
314355e2ff Speeding up automap display. 2018-03-27 10:01:03 -07:00
Martin Haye
8f3f60ede7 Some little optimizations for automap display. 2018-03-27 07:37:11 -07:00
Martin Haye
faa5270a0c Improved song conversion and playback. 2018-03-26 13:48:10 -07:00
Martin Haye
c819c30b34 Added scrolling code to automap, in preparation for making everything faster. 2018-03-26 13:48:00 -07:00
Martin Haye
820fba95e3 Now correctly sequencing the test song. 2018-03-20 10:43:20 -07:00
Martin Haye
0c20264a9b More work integrating sound - it makes a tone now. 2018-03-20 08:35:19 -07:00
Martin Haye
9a9464da3c Merge branch 'master' of github.com:badvision/lawless-legends 2018-03-20 07:59:06 -07:00
Martin Haye
0693ea2fec Working on integrating music. 2018-03-20 07:58:59 -07:00
David Schmenk
e163e709cf music.pla is now sndseq.pla 2018-03-19 09:04:43 -07:00
David Schmenk
999a7d48ec Initial check-in for music sequencer 2018-03-19 09:01:45 -07:00
David Schmenk
4cf8d7e8c4 Initial check-in for music sequencer 2018-03-19 09:00:57 -07:00
Martin Haye
ba18a6d290 Fixes for emulator signaling. 2018-03-17 10:04:10 -07:00
Martin Haye
be6fb14d6a Added emulator signals so Jace can intelligently decolorize text. Fixed clock on return from engines. 2018-03-17 08:52:29 -07:00
Martin Haye
a0b02c7177 Fixed art town texture bug. Fixed some automap bugs. 2018-03-16 10:15:49 -07:00
Martin Haye
d398e3ea38 Added cursor and title to automap. 2018-03-15 09:14:49 -07:00
Martin Haye
cf03ab7f60 Fixes for PLASMA 1.1 2018-03-15 08:02:21 -07:00
Martin Haye
16f411adde OMG how many times will I fix the lamp. 2018-03-15 06:20:28 -07:00
Martin Haye
073457d56d Major automap improvements. Fixes for lamp. 2018-03-14 09:28:57 -07:00
Martin Haye
2151819d95 Clipping is actually working now (for 3D maps at least). 2018-03-11 15:21:00 -07:00
Martin Haye
ae7d885a9e Cleanup. 2018-03-11 12:32:41 -07:00
Martin Haye
d5ce5197e7 Debugging new refactored automap. 2018-03-11 12:26:12 -07:00
Martin Haye
a82cef30cc Moving forward on generalizing automap display. 2018-03-11 11:54:38 -07:00
Martin Haye
1e6a12fd4c Improved look and consistency of automap size reduction. 2018-03-10 15:45:17 -08:00
Martin Haye
a245855a5e First very basic automap display. 2018-03-10 08:31:09 -08:00
Martin Haye
07c810e294 Changed swapTile to copyTile, since that's how we effectively use it in the game, and makes for a consistent outcome every time. 2018-03-07 08:49:21 -08:00
Martin Haye
4391114680 Enable u)se of weapons / armor 2018-03-07 08:47:10 -08:00
Martin Haye
c26843d221 Fixed dark rendering at map edges. 2018-03-07 07:51:37 -08:00
Martin Haye
1bca56a497 Fixed level-up bug for scripted XP bonuses. Fixed render order issue that caused intermittent crashes opening 3D maps. 2018-03-06 08:58:47 -08:00
Martin Haye
f82fe0153e Fixed some double-rendering that was slowing things down. 2018-03-05 08:15:43 -08:00
Martin Haye
eaf266f828 Fixed problem with no 2d maps working. Reordered rendering to give a faster feel. 2018-03-05 07:37:42 -08:00
Martin Haye
5ab08d6683 Added interrupt-on-keyboard mode to 3D renderer, for faster response to a key pressed. 2018-03-03 10:22:10 -08:00
Martin Haye
c54bb8e05f Optimization of dark fading. 2018-03-03 09:34:31 -08:00
Martin Haye
342de6c35c Distance fade working better now. Still a bit of speed opt to do. 2018-03-03 07:35:37 -08:00
Martin Haye
7915e66b97 Forgot to check these in. 2018-03-01 07:11:57 -08:00
Martin Haye
d2c8601cb5 Fixed flickering, again again. 2018-03-01 07:11:45 -08:00
Martin Haye
2b90f198a1 Lamp flickering is much improved. 2018-02-26 06:45:15 -08:00
Martin Haye
7b9522d6d6 Added automap-compatible 2D tiles to 3D maps. 2018-02-24 10:20:01 -08:00
Martin Haye
18cb015c13 Some work on lamp and automap. 2018-02-21 09:54:30 -08:00
Martin Haye
e65956a8a0 More flag work. 2018-02-14 09:42:54 -08:00
Martin Haye
ab5c423bc0 Converted flags to constants for easier reading. 2018-02-14 09:11:37 -08:00
Martin Haye
1de7a61344 Freed up old script hint flag, so I can use it for automap marking instead. 2018-02-14 08:58:22 -08:00
Martin Haye
d8e4161cdd Fix for flashing text when waiting for Y/N. 2018-01-17 08:50:29 -08:00
Martin Haye
0179dc07ce Call time func when loading map, to correctly set sky/ground colors. 2018-01-16 09:42:31 -08:00
Martin Haye
459f5037af Can now get and set the time (as an hour, 0-23). 2018-01-16 09:15:52 -08:00
Martin Haye
1f0e96bd00 Now identifies and runs time scripts; handles sky and ground color changes better. 2018-01-10 08:47:20 -08:00
Martin Haye
cb4558ffae Implemented cmd to show / advance time. 2018-01-10 07:10:43 -08:00
Martin Haye
de5a6bef25 Fixed hashing function which was allowing loading of incompatible games. Added basic clock advancing. 2018-01-09 10:02:28 -08:00
Martin Haye
c85c153363 Perfected drawing clock on hi-res page 2 while showing pg 1. 2018-01-05 09:17:01 -08:00
Martin Haye
22dcfc8cd9 Now drawing clock hands, and inverting at night. 2018-01-04 10:36:21 -08:00
Martin Haye
887600efc9 Finally made progress drawing the outline of the clock. 2018-01-04 08:41:48 -08:00
Martin Haye
b385a5e769 Changed to new compass. Messing around with line drawing. 2017-12-27 07:21:46 -08:00
Martin Haye
a2d46dd720 Fixed bug where font engine CopyWindow was missing last line. 2017-12-06 08:04:21 -08:00
Martin Haye
f6069c576d Integrated new PLASMA compiler, including delicious ternary operator. 2017-11-29 09:21:24 -08:00
Martin Haye
21a333323c Slight fix where last pix of version number was cut off. 2017-11-29 08:45:21 -08:00
Martin Haye
f3e53f1f4a Merge branch 'master' of https://github.com/badvision/lawless-legends 2017-11-09 07:41:46 -08:00
Dave Schmenk
bf5fd4fafa Better delta time tracking of MIDI events 2017-11-07 16:24:09 -08:00
David Schmenk
1b412b8112 Update documentation for useage 2017-11-02 13:11:57 -07:00
David Schmenk
ca3f80d318 Forgot RND seed update in noSequence 2017-11-01 14:38:07 -07:00
David Schmenk
f92d4c9417 Capture timing wrap-around when not sequencing 2017-11-01 14:27:58 -07:00
David Schmenk
27e0d895df Initial commit for MockingBoard/Speaker music sequencer 2017-11-01 12:03:50 -07:00
Martin Haye
d5dd1fe449 Some optimization to make game loop smaller. 2017-09-20 08:44:35 -07:00
Martin Haye
b25224558c No longer need tossStrings() workaround. 2017-09-19 08:49:00 -07:00
Martin Haye
52f42d7fcf Can now avoid fixups for gamelib functions, and (with care) use abs addressing there. 2017-09-19 08:32:25 -07:00
Martin Haye
0fc0e6b852 Placing gameloop at a static location. 2017-09-19 07:50:42 -07:00
Martin Haye
be7de86526 A bit of optimization. 2017-09-19 06:36:50 -07:00
Martin Haye
35969f4127 One more pack fix. 2017-09-14 09:56:46 -07:00
Martin Haye
ef251e479a More progress on pack limits. 2017-09-14 09:53:01 -07:00
Martin Haye
a34c54fdcd Working on pack limits, and some fixes to inv screen. 2017-09-14 08:09:21 -07:00
Martin Haye
b3ec104561 Fixed flag when girding NPC that has no weapons. 2017-09-13 08:29:44 -07:00
Martin Haye
84d3cf44c2 Merge branch 'master' into newplasma 2017-09-13 08:20:27 -07:00
Martin Haye
cb0c203502 Fix crash in sell when selecting non-existent player. 2017-09-13 08:20:21 -07:00
Martin Haye
91638a6bfc Merge branch 'master' into newplasma 2017-09-13 08:17:50 -07:00
Martin Haye
8aeb6a0595 Fix crash when selecting non-existent player in store. 2017-09-13 08:17:46 -07:00
Martin Haye
4354ef5916 Merge master into newplasma branch. 2017-09-13 08:14:34 -07:00
Martin Haye
68399614a5 Refactor to use lambdas for list iteration everywhere it's reasonable. 2017-09-13 08:06:52 -07:00
Martin Haye
05d96b1243 Expanded small-object heap to make more space for inventory. Started implementing pack size limits. 2017-09-12 08:21:23 -07:00
Martin Haye
ea25619c78 Added code to display % heap memory in use. 2017-09-11 11:16:10 -07:00
Martin Haye
3e54dcf80c Optimized 3D flipToPage1, and text screen copy to pg2. 2017-09-09 10:08:33 -07:00
Martin Haye
b8e89af594 Save game after initial character created, in case they quick. 2017-09-09 10:08:06 -07:00
Martin Haye
f33aa1f143 Added friendly advice on character creation screen - thanks to Brian Wiser for the suggestion. 2017-09-09 09:25:14 -07:00
Martin Haye
53e0f8bbb4 Added automatic title-casing to text inputs (e.g. character name in particular) 2017-09-09 08:43:35 -07:00
Martin Haye
9e5fe1262a Fixed (uncommon) case of scrolling text in the map window. 2017-09-09 07:56:37 -07:00
Martin Haye
572a22fa65 Finally fixed longstanding bug with long-word splitting in font engine. 2017-09-09 07:56:22 -07:00
Martin Haye
082bd4bf22 Merge branch 'master' into newplasma 2017-09-04 17:25:14 -07:00
Martin Haye
b723a25bef Fixed memory management problems in combat (preloaded funcs, item generation). Fixed problems with join/split. Normalized keyboard commands on inv screen. Fixed using TNT if Paul has it instead of plyr. 2017-09-03 09:28:46 -07:00
Martin Haye
5286d766df Merge branch 'master' into newplasma 2017-09-03 07:00:38 -07:00
Martin Haye
1e00b8f703 Fixed bug where level-up went to wrong char. 2017-09-03 07:00:30 -07:00
Martin Haye
3d70f886d4 A few last fixes on the buy page. 2017-09-02 11:27:21 -07:00
Martin Haye
805a1e426a Added god-mode cheat to edit game flags. 2017-09-02 11:09:49 -07:00
Martin Haye
2b2e93f59b Implemented split and join. 2017-09-02 09:46:06 -07:00
Martin Haye
2cd9d70e9a Enabled trading between characters. Fixed add-player command when party is full. 2017-09-02 09:04:00 -07:00
Martin Haye
73b98f5b89 Fixed many little bugs and annoyances on inventory sheet. 2017-09-02 08:23:24 -07:00
Martin Haye
801500798a Fixed compass display when coming out of script. Implemented player switching in buy/sell. 2017-09-01 09:31:50 -07:00
Martin Haye
43dac98afd Fixed up sell page - it was pretty broken. 2017-09-01 08:27:26 -07:00
Martin Haye
288c8bbfbe Added periodic heap checking. Fixed big bug when rolling large number of dice. Added some mechanics of trade/split/join items. 2017-08-30 10:33:01 -07:00
Martin Haye
acc78864bf Fixed bugs with using items and salves. 2017-08-30 09:27:10 -07:00
Martin Haye
ddbeebd9b0 More work on stackables. 2017-08-30 08:50:28 -07:00
Martin Haye
dbc94d707c Coding done on big item and flag refactor. Now for testing. 2017-08-29 09:06:53 -07:00
Martin Haye
865c2fe8f2 Improved plural processing. 2017-08-25 08:16:06 -07:00
Martin Haye
ffa1bb9afe Removed old kludged finalWin() logic. Moved a couple of functions to godmode.pla that were only used there anyway. 2017-08-15 10:01:28 -07:00
Martin Haye
be58f38628 Cleaner memory regimen to avoid out-of-mem situations. 2017-08-14 09:25:38 -07:00
Martin Haye
5c42a66eb8 Fix for bug that allows slipping between diagonal walls 2017-08-14 09:25:06 -07:00
Martin Haye
abcf6f9c94 Fixed display problems with godmode teleport. 2017-08-14 08:16:38 -07:00
Martin Haye
9c45ed0fb5 Added import-game function. 2017-08-14 08:01:31 -07:00
Martin Haye
4cf10aba0a Took out some debugging code, and made next/prev portrait more efficient. 2017-08-12 10:29:54 -07:00
Martin Haye
1ce5b2b0a0 Fixed latent animation bug introduced by PF - when advancing anim ptr, need to get both bytes of offset before changing ptr. 2017-08-12 10:25:24 -07:00
Martin Haye
8cd36fad17 Added version stamp (encoded engine time, plus scenario differential) 2017-08-11 11:17:38 -07:00
Martin Haye
3a452e3de1 More rational suppression of script-within-script. Fix for rendering wrong direction while going backward. 2017-08-10 10:51:20 -07:00
Martin Haye
e1cc6c37b9 Temporary fix for text overwrite problem. 2017-08-10 09:56:46 -07:00
Martin Haye
8c46ccc34d Messing around with lambda functions. 2017-08-10 07:31:31 -07:00
Martin Haye
276157fa8e Added validation of character name and gender. 2017-08-06 16:44:10 -07:00
Martin Haye
c02f9f8f83 Allow scripts to add skills and XP. 2017-08-06 11:23:40 -07:00
Martin Haye
d3132cc318 Working to get compass direction actually right. 2017-08-04 08:30:08 -07:00
Martin Haye
a86d7d8764 Now with working compass in 3D mode. 2017-08-04 08:15:40 -07:00
Martin Haye
f3f070bcba Pack clock and compass icons into global tileset in addition to avatars. 2017-08-04 06:58:17 -07:00
Martin Haye
9af91c0343 Removed debug pause. 2017-08-02 19:14:47 -07:00
Martin Haye
db6ffb680c Integrated a suggestion from qkumba, and fixed a couple bugs in his fixes. 2017-08-02 19:14:35 -07:00
Martin Haye
81a02fd805 Merge branch 'master' of https://github.com/peterferrie/lawless-legends into peterferrie-master 2017-08-02 13:13:18 -07:00
Martin Haye
5efd81102f Fixed CB opcode (again) 2017-08-02 10:20:22 -07:00
Peter Ferrie
b466c539a9 size optimising bits and pieces
two possible bugs, search for";;pf:"
2017-07-31 15:18:39 -07:00
Martin Haye
dba14b92bc Fix auto-reload for Bows. A couple minor combat display fixes. 2017-07-17 07:58:20 -07:00
Martin Haye
1ecddcf190 Fixes for ammo on buy/sell/loot pages. Also, halved store profit so total for buy+sell is 100%. 2017-07-16 12:34:24 -07:00
Martin Haye
729758ab0f Making good progress on loot hand-outs. 2017-07-16 10:49:27 -07:00
Martin Haye
64fb24bd90 Fixed healing salve. 2017-07-16 08:09:54 -07:00
Martin Haye
926ba84665 Cleanup of ammo giving. 2017-07-16 07:38:47 -07:00
Martin Haye
e2b0d2d51d Coded ammo consumption and reloading. Now to test test test. 2017-07-15 11:41:29 -07:00
Martin Haye
07ba262072 Format dice in more user-friendly min/max form. 2017-07-14 10:05:21 -07:00
Martin Haye
ee91583e1d More aesthetic adjustments. 2017-07-14 09:45:33 -07:00
Martin Haye
d635cfc4ea Removed debug print. 2017-07-14 08:54:15 -07:00
Martin Haye
817affadfb Some visual tweaks to the skills screen. 2017-07-14 08:53:10 -07:00
Martin Haye
4d9516901e Reworked skills/attributes screen so you can revise your decisions. 2017-07-14 08:41:10 -07:00
Martin Haye
4b92a18209 Combat bugs: changing weapons with none equipped; single shot fix. 2017-07-14 06:58:34 -07:00
Martin Haye
6bdfd378b7 Implementing more and more combat logic. 2017-07-13 10:12:28 -07:00
Martin Haye
e4030334a1 Fixed some combat bugs; added initial equipping 2017-07-11 08:56:14 -07:00
Martin Haye
30a5881f24 Implemented initial character naming, gender assignment, and XP/SP init. 2017-07-08 16:36:08 -07:00
Martin Haye
bf4e3c7792 Fixed null ptr bug with item use. 2017-07-08 09:29:36 -07:00
Martin Haye
bca6410d70 Added debug mode for combat formulas, which will help in balancing the formulas. 2017-07-07 10:18:43 -07:00
Martin Haye
3b15ff0e48 Most combat rules implemented now. Also, combat speed now adjustable with up/down arrow, or +/- keys. 2017-07-04 09:15:50 -07:00
Martin Haye
19f53f99a5 Fixed menu range for items and skills. 2017-06-30 09:38:03 -07:00
Martin Haye
4a44aee1f8 Some fixes on the inv/stat screens. 2017-06-30 09:30:29 -07:00
Martin Haye
3cc0fba61a Fixed null ptr bug in party display. 2017-06-30 08:48:56 -07:00
Martin Haye
e6c94eee6c Lots of work on combat. 2017-06-30 08:11:34 -07:00