Commit Graph

704 Commits

Author SHA1 Message Date
Martin Haye
dce735786e Generate fancy new report showing how much each resource contributes to memory and disk usage. 2016-10-16 10:06:30 -07:00
Martin Haye
73c08b56dd Little changes: use portrait names instead of numbers in generated code; a little cleanup of interrupts; improve comments. 2016-10-16 08:16:45 -07:00
Martin Haye
d085707158 Fix bug - target addr wasn't being cleared by set heap. 2016-10-13 09:27:43 -07:00
Martin Haye
a6f68275d6 Fix order of frame loading, and properly free temporary buffer. 2016-10-13 09:26:51 -07:00
Martin Haye
4dd39aff55 Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-10-11 09:04:03 -07:00
Martin Haye
0095407c7e Now blitting full screen images from aux mem rather than loading them directly to the hi-res buffer. Prelude to better support for full-screen. 2016-10-11 09:03:57 -07:00
badvision
6d61e2a75d Switching my source over to Windows 10 changed these file modes -- shouldn't really affect anyone. If it does we can revert this commit. 2016-10-08 13:35:27 -05:00
Martin Haye
49d025a44c Fleshed out ability to use an item on a map space. In addition, add item god-mode cheat moved to player info screen and made fancier. 2016-09-24 11:10:17 -07:00
Martin Haye
83a26c901b Made portrait test loop around. 2016-09-22 11:14:07 -07:00
Martin Haye
0fad632eee Better support for forcing combat, not backing up as far when fleeing / exiting a building. 2016-09-22 10:55:34 -07:00
Martin Haye
8dc394cf43 The whole fixupHint thing to avoid fragmentation was (a) not working anyway, and (b) causing crashes. Removed it. 2016-09-22 10:54:56 -07:00
Martin Haye
1d3b08204a Skip encounter check when backing up due to a script event or fleeing combat. 2016-09-22 08:13:17 -07:00
Martin Haye
1465bea426 Fixes for game load and save. 2016-09-22 08:04:24 -07:00
Martin Haye
9b6c00bebb Moved disk activity marker display logic to memory manager, so that it very accurately reflects real disk activity. 2016-09-22 07:51:07 -07:00
Martin Haye
cfadecc9f6 Optimized switching to and from render modes. 2016-09-22 07:32:54 -07:00
Martin Haye
ce7bf1d6cc Now processes 'leave' events on map scripts. 2016-09-20 06:15:49 -07:00
Martin Haye
a2c8008755 Initial infrastructure for event handling. 2016-09-15 11:08:43 -07:00
Martin Haye
c09142a164 Fixed so NPCs can attack now -- but only melee. 2016-09-08 09:34:02 -07:00
Martin Haye
51f73a8565 Finished cleanup of START_LOAD/FINISH_LOAD 2016-09-08 08:39:41 -07:00
Martin Haye
fe704379ce Good progress on reworking START_LOAD/FINISH_LOAD to figure out on their own what to do. 2016-09-08 08:30:08 -07:00
Martin Haye
65b414a954 Rearranged some things to make mem mgr more compact. 2016-08-31 08:34:00 -07:00
Martin Haye
c103afd893 Fixed out-of-mem bug adding Sasquatch to party. 2016-08-31 08:17:02 -07:00
Martin Haye
4238f62520 Fix sequence error when adding npc. 2016-08-31 07:23:11 -07:00
Martin Haye
c5a319d904 Fixed super-long error message. 2016-08-25 08:49:38 -07:00
Martin Haye
7ebe405c41 Fixed bugs with NPC creation, and made mem mgr debug slightly fancier. 2016-08-22 08:08:22 -07:00
Martin Haye
ecf76efde2 Mostly implemented ability to add/remove players, but got some debugging to do. 2016-08-17 08:09:14 -07:00
Martin Haye
243b6c362a Moved and extended garbage-collected heap, to make more room for game items (and take advantage of newly freed space in F800.FFFF range.) 2016-08-12 19:39:36 -07:00
Martin Haye
71895ed546 Fixed a bug with module reloading, and one involving the new F8xx refactor. 2016-08-12 19:18:31 -07:00
Martin Haye
f69b91ecca Removed a bit of useless code. 2016-08-08 08:13:03 -07:00
Martin Haye
779b61f7c0 Continued F8 refactoring. 2016-08-08 08:09:46 -07:00
Martin Haye
6c9515b63c Lots of progress toward freeing up up. 2016-08-08 07:47:01 -07:00
Martin Haye
297d0a4c4a Implementing bank-switching in debug macros, in prep for clearing .FFF9. 2016-08-05 09:28:29 -07:00
Martin Haye
3d06158a04 Added compatibility checking when loading a save game - based on hashing the global structure offset tables. 2016-08-05 09:27:11 -07:00
Martin Haye
8f2a5ada3d Packer now outputs a file with memory use of 3D maps, and warns for high usage. 2016-08-04 09:26:13 -07:00
Martin Haye
d21b269843 Eliminated special patching of PLASMA accessors, now that it's finally decided that PLASMA code doesn't need to use the aux LC bank (it's used by texture expander instead). 2016-08-04 08:30:39 -07:00
Martin Haye
50c78621e6 Fix problem that expander didn't get re-split when it was re-loaded. 2016-08-04 07:16:47 -07:00
Martin Haye
70ead12fb1 Added a god-mode command, '&', to print out the allocated memory blocks. 2016-08-03 08:41:36 -07:00
Martin Haye
2817f1b25e Forgot a raycaster file. 2016-08-03 08:40:42 -07:00
Martin Haye
40f27ef4eb Better memory management handling of split expander. 2016-08-03 08:05:54 -07:00
Martin Haye
7df3e2ced2 Raycaster with split-expander working now. 2016-08-03 07:54:14 -07:00
Martin Haye
0e6c20cffe Making some progress splitting the raycasting expander. 2016-08-01 09:45:09 -07:00
Martin Haye
8babf8c388 Add memory dump whenever out-of-mem occurs. 2016-07-30 11:31:21 -07:00
Martin Haye
b848882090 Fix avatar establishment on game start. 2016-07-28 09:46:38 -07:00
Martin Haye
e71bdea1fe Fixed avatar packing problem, and turned caching back on. 2016-07-26 07:40:01 -07:00
Martin Haye
747a17d6cb Fix for dice 3d6+n problem. Changed Mythos to LegendOS 2016-07-19 08:35:42 -05:00
Martin Haye
7e7c92dc8d Added hack for end-game screen; set sky color to 99 to trigger. 2016-07-19 08:21:34 -05:00
Martin Haye
c85334e22e Add messages back to combat death. 2016-07-18 16:55:49 -07:00
Martin Haye
d034b0530d Really reload game when player dies. Also, they can now be killed by a script. 2016-07-18 16:47:49 -07:00
David Schmenk
ae119a1240 Equipped items all get a '*' 2016-07-18 10:02:46 -07:00
David Schmenk
e9c79ab589 Fists do 1d4+hand2hand skill damage 2016-07-18 09:51:14 -07:00
Martin Haye
e376e9c505 A few fixes for compatibility with Lawless Legends scenario. 2016-07-17 19:16:32 -07:00
David Schmenk
4506c27bc4 Disable weapn change during combat and fix initialization needed when we do 2016-07-17 14:28:36 -07:00
David Schmenk
aab1a74698 Group Gold now just Gold 2016-07-17 12:17:00 -07:00
David Schmenk
1ba785cc0d Implement Change weapon during combat 2016-07-17 12:13:41 -07:00
David Schmenk
f4598db758 party health status sometimes shows up in wrong windows using displayf2 2016-07-17 06:56:07 -07:00
David Schmenk
da809614bb Show player health/max health and weapon damage in stats 2016-07-16 21:34:31 -07:00
David Schmenk
5e1e6a9173 Add item cheat and fix multiple inventory panes 2016-07-16 15:00:50 -07:00
David Schmenk
ff6a4ef59d Fix godmode cmds when switching maps 2016-07-16 10:46:41 -07:00
David Schmenk
0e4b8ca8f8 Add godmode setting. 2016-07-16 10:27:28 -07:00
Martin Haye
25901b9f01 Redisplay party summary if gold or health changes. 2016-07-16 05:39:22 -07:00
Martin Haye
7b103202d1 Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-07-16 05:09:24 -07:00
Martin Haye
43fa3101a3 Slow progress getting packer to run as a plugin. 2016-07-16 05:09:21 -07:00
David Schmenk
8433dab3b7 Clean up more strings during Drop 2016-07-15 15:19:54 -07:00
David Schmenk
ba71bb7fb3 Put some code to check list removal. Clean up local strings in inventory 2016-07-15 15:04:02 -07:00
David Schmenk
e43e042b2a Change player stats to show weapon in 2D and gold in 3D 2016-07-15 14:29:32 -07:00
Martin Haye
39d152720f Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-07-15 07:43:24 -07:00
Martin Haye
a980919cf5 Took out a couple debug stmts. 2016-07-15 07:43:21 -07:00
David Schmenk
1f328ce1d8 Speed up inventory display 2016-07-15 07:09:05 -07:00
David Schmenk
9f3e880c37 Filter selection based on command 2016-07-14 22:24:09 -07:00
David Schmenk
3ec8b61811 Unequip already equipped weapons 2016-07-14 18:42:33 -07:00
Martin Haye
95e4651123 Turned off caching in the packer as it's currently creating more problems than it solves. 2016-07-14 14:19:38 -07:00
Martin Haye
df02ca2367 Making avatar even more persistent, by placing it in the global state. 2016-07-14 14:01:54 -07:00
Martin Haye
66df00309a Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-07-14 13:52:27 -07:00
Martin Haye
d4525a9571 Fix clearEncounterZones and setAvatar to be (more) persistent. 2016-07-14 13:52:23 -07:00
Dave Schmenk
dfc5f974db Get size of map window to adjust number of items displayed 2016-07-13 20:23:01 -07:00
Martin Haye
a3ed0e93a2 More packer refactoring. 2016-07-13 08:05:07 -07:00
Dave Schmenk
ad8d58f62e Inventory formatting updates 2016-07-12 22:23:38 -07:00
Martin Haye
f38f76f1a8 Fixed dependency checking and empty script reporting. 2016-07-12 17:29:03 -07:00
Martin Haye
b5cf46d503 Made progress on alternate packaging of PackPartitions as a plugin for Outlaw. 2016-07-12 17:01:36 -07:00
Martin Haye
7c297f757d Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-07-12 16:10:57 -07:00
Martin Haye
85e01abd95 Fix heap type of 'item' and 'stuff' when they are created. 2016-07-12 16:10:54 -07:00
David Schmenk
c6edbeb703 Use health item 2016-07-12 15:51:05 -07:00
David Schmenk
abcc77d45f Add al skill modifiers 2016-07-12 09:56:54 -07:00
David Schmenk
c3052373dd Use strcmp for s_itemKind and clean up equip flag 2016-07-12 08:58:45 -07:00
David Schmenk
71b4900375 Inventory equip/use/drop 2016-07-12 08:09:55 -07:00
Martin Haye
d7e4c85e10 Fix for null scripts, and for avatar 0. 2016-07-11 08:03:29 -07:00
Martin Haye
504ad63907 Removed support for ESC in inputString - it was for Andrew Hogan's demo, not for Lawless Legends. 2016-07-10 17:37:55 -07:00
Martin Haye
4d5f073afa Adjusted window sizes to avoid overwriting borders. Fixed bug in playerHasItem that was a crasher. 2016-07-10 17:33:48 -07:00
Martin Haye
be40d8f4f4 Added ability to clear all encounter zones, and to set the avatar tile. 2016-07-10 17:18:03 -07:00
Martin Haye
31bf216f6e Fix bug with Korak combat: strings still a bit too long. 2016-07-08 17:50:45 -07:00
Martin Haye
fd0b547e7e Sprinkled in some SEI/CLI to help with future interrupt probs. Fixed yet another problem with the memory accessor patch to PLASMA. 2016-07-08 17:19:59 -07:00
Martin Haye
d773465455 Fix for real Apple hardware: enabling language card requires reads, not writes. 2016-07-07 19:01:56 -07:00
Martin Haye
0837f4a360 Fleshed out new blocks for get/increase/decrease stats. 2016-07-07 17:02:44 -07:00
Martin Haye
df446bc38b Added support for arbitrary game flags, and most of stat increase/decrease. 2016-07-07 16:15:31 -07:00
Martin Haye
2eff48233f Adding global stat names to save space. Adjusted indenting of asm code in gameloop so Sublime Text correctly figures out the default tab size. 2016-07-07 14:22:48 -07:00
Martin Haye
57c65f1c69 Added item-related Blocks. 2016-07-07 13:59:07 -07:00
Martin Haye
333603c064 Added memory clearing and disabling of IIc keyboard buffer, to aid in getting more consistent results on real hardware. 2016-07-06 07:46:17 -07:00
David Schmenk
e9012275d5 Prepare for scripted event handling 2016-07-04 12:59:24 -07:00
David Schmenk
4a0ab503a2 Slight rearrangement of main player stats 2016-07-04 10:56:55 -07:00
David Schmenk
44d51ebf82 Show Group Gold in inventory, cheat health +10 2016-07-04 10:10:19 -07:00
David Schmenk
0df15626d0 Merge gold
Merge branch 'master' of https://github.com/badvision/lawless-legends
2016-07-04 09:33:43 -07:00
David Schmenk
287ecc6702 Add gold to global state and collect loot after combat. 2016-07-04 09:31:33 -07:00
Martin Haye
f2fe6a1989 Fixed bug with hitting 'M' on New/Load screen. 2016-07-04 09:00:37 -07:00
Martin Haye
f88b9bf298 Fix bug where hitting enter on New/Load screen hid the text. 2016-07-04 08:55:29 -07:00
Martin Haye
bd44d405d4 Need to set partition when reloading 3D textures. 2016-07-04 08:46:11 -07:00
Martin Haye
bf666a0f07 Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-07-03 18:20:11 -07:00
Martin Haye
ac680b47d2 Always beep when blocked, whether blocked by an obstacle or the edge of the map. 2016-07-03 18:20:07 -07:00
David Schmenk
9dd02c2236 Just had to fix the PLASMA bug 2016-07-03 15:57:34 -07:00
Martin Haye
cb124995f4 Established some basics of the new A2Pack plugin. 2016-07-03 15:31:13 -07:00
Martin Haye
f15dc1a648 Forgot to check in globalDefs.plh 2016-07-03 15:29:14 -07:00
Martin Haye
0fe5ef28ca Refactored to get rid of lib vectors, thanks to Dave. 2016-07-03 13:39:00 -07:00
Martin Haye
0708cbda95 Took out some debug prints 2016-07-03 12:26:22 -07:00
Martin Haye
29f6df5913 Making good progress on external symbol resolving. 2016-07-03 12:01:35 -07:00
Martin Haye
ea5800155f Got basics of new fixup mechanism working. 2016-07-03 07:33:12 -07:00
Martin Haye
bb0a9339fe Can now define a Help global function in Outlaw, and it'll get called when '?' is hit in the gme. 2016-07-01 17:19:12 -07:00
Martin Haye
30a9f15ae2 Added generation for generic items like amulets. 2016-07-01 16:57:24 -07:00
Martin Haye
d89d9dfbad Fixed so some enemies get a crack at you when you're fleeing. 2016-07-01 16:32:57 -07:00
Martin Haye
dab8bd2908 Now fully supports multi-disk mode. 2016-07-01 15:58:05 -07:00
Martin Haye
437471451b Now handles scripted combat on 2D maps as well, and handles fleeing correctly. 2016-06-30 09:31:29 -07:00
Martin Haye
02bbbf5ac7 Clean up what happens at the end of a combat script. 2016-06-30 08:47:30 -07:00
Martin Haye
f1fbd7bd8c Working on getting script to resume after combat. 2016-06-30 08:36:46 -07:00
Martin Haye
cf0c3d3ac1 Fix memory and screen glitches when switching between scripted portrait moments, combat, and 3D display. 2016-06-29 07:42:58 -07:00
Martin Haye
8ebbc16da8 Fixed streqi logic for matching encounter zone codes. Added a Blockly for starting an encounter. 2016-06-28 07:40:09 -07:00
Martin Haye
30f3e92d37 Tiny script to extract text from the XML files, for spell and grammar checking. 2016-06-28 06:59:28 -07:00
Martin Haye
de0135b3c6 Fix to not ask about loading unless an initial save game is present. Avoid double-locking the heap area. 2016-06-24 08:46:40 -07:00
Martin Haye
cfc84188c6 Fixed bug with game load. 2016-06-24 07:16:08 -07:00
Martin Haye
0e94a6fbb0 Load working better. 2016-06-24 06:12:45 -07:00
Martin Haye
45ab9bafe2 Implementing new game / load game screen. 2016-06-24 05:58:30 -07:00
Martin Haye
17793d011f Preserve previous saved game if 2mg is present. 2016-06-21 08:17:18 -07:00
Martin Haye
b05e138400 Switched base 2mg image to be 800k, to save bandwidth when we send disks around to each other. 2016-06-21 07:42:36 -07:00
Martin Haye
6c49bb2025 Fix crash when traveling on 2D map. 2016-06-21 07:20:55 -07:00
Martin Haye
5f945863c8 Fix bug with game load. 2016-06-20 09:10:41 -07:00
Martin Haye
ec26b8276a Basics of load/save working. 2016-06-20 08:49:01 -07:00
Martin Haye
87ab8b6031 Allow control chars in command table; basic framework for game load/save established. 2016-06-19 08:38:40 -07:00
Martin Haye
dcea57cc7c It was silly to have strcmpi when all we needed was streqi. 2016-06-19 08:15:51 -07:00
Martin Haye
caa05f16f6 Refactored to save space in the main gameloop module. 2016-06-19 08:04:43 -07:00
Martin Haye
c352a867a2 Refactored code to save space when running standalone modules like combat and player-info. 2016-06-19 07:42:11 -07:00
Martin Haye
db95a87e69 Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-06-18 16:31:53 -07:00
Martin Haye
6c33299a77 Split game assets into two partitions, to pave the way for multi-floppy distribution. 2016-06-18 16:31:21 -07:00
David Schmenk
afd05c4bec Prepare for inventory command processing 2016-06-18 12:59:38 -07:00
David Schmenk
e1c2c9c4d5 Fix skills display to not scroll on last line 2016-06-18 12:00:46 -07:00
Martin Haye
b8b2541715 Generalized ammo to just 'stuff' so we can have other countable things. 2016-06-17 07:39:52 -07:00
Martin Haye
d5f1663267 Added ammo generation. 2016-06-17 07:26:53 -07:00
Martin Haye
fd989c0d32 Got rid of old hard-coded globalScripts.pla 2016-06-16 17:48:58 -07:00
Martin Haye
3862931a55 Minor updates to party display for new player attributes scheme. 2016-06-16 17:44:54 -07:00
Martin Haye
3427d01768 Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-06-16 17:42:24 -07:00
Martin Haye
7e758be30e Added player generation. 2016-06-16 17:42:18 -07:00
Martin Haye
4e57da0d53 Now translating armor spreadsheet to code. 2016-06-16 07:27:13 -07:00
Martin Haye
c9300a20c9 Fix crash bug in old global scripts. 2016-06-16 07:13:39 -07:00
David Schmenk
a351b9c772 Add real values to Inventory/Stats 2016-06-15 12:15:10 -07:00