Commit Graph

420 Commits

Author SHA1 Message Date
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
Martin Haye
4774b07d30 Fix to avoid immediately leveling up on new game. 2017-06-25 07:20:11 -07:00
Martin Haye
1fe0108b63 Added level up cheat, and fixed a couple leveling bugs. 2017-06-25 07:11:58 -07:00
Martin Haye
df81523061 More work on level up / skills 2017-06-24 13:28:28 -07:00
Martin Haye
a52c9cc039 Fleshing out the skills/stats display. 2017-06-24 11:43:16 -07:00
Martin Haye
b972aa34b6 Adding some more XP/leveling stuff. 2017-06-16 11:31:42 -07:00
Martin Haye
6fdc16cd88 Crawling ahead with level up logic. 2017-06-14 09:22:05 -07:00
Martin Haye
76b99504fb Fixed a few arg count mismatches. 2017-06-11 10:15:20 -07:00
Martin Haye
7c9f7138d9 Finally added all function prototypes. Now for bug hunting. 2017-06-11 08:25:15 -07:00
Martin Haye
998d75c1a0 Ongoing giant function prototype refactor. 2017-06-10 08:56:23 -07:00
Martin Haye
eea4767a51 More prototypes. 2017-06-10 07:32:31 -07:00
Martin Haye
3ac73e7165 Adding more function prototypes. 2017-06-10 07:21:58 -07:00
Martin Haye
ee55a7a57a Got rid of redundant __asmPlasm_bank2 2017-06-09 07:47:34 -07:00
Martin Haye
cf17300210 Adding some function prototypes. 2017-06-09 07:14:53 -07:00
Martin Haye
2499d41461 Made death and combat win configurable instead of hard coded. 2017-06-02 08:38:31 -07:00
Martin Haye
2c50d19c48 Outlaw-configurable combat and enemy intro text now working. 2017-06-02 08:25:29 -07:00
Martin Haye
834b6576e2 More work normalizing inventory UI. 2017-05-25 07:50:51 -07:00
Martin Haye
29a72ac5b3 Working to normalize interface diffs between store and plauer info screens. 2017-05-24 08:51:06 -07:00
Martin Haye
58d3386dff Reformatted inventory and stats screen. 2017-05-24 07:47:47 -07:00
Martin Haye
5e4f12b619 Some reformatting of the party member display. 2017-04-20 09:02:03 -07:00
Martin Haye
865ab04cc5 First cut at clear to end-of-line and end-of-page in Font Engine. 2017-04-10 10:01:36 -07:00
Martin Haye
17c94cff7e Marking a map with negative order now causes it to be replicated on every data disk. 2017-04-10 08:35:27 -07:00
Martin Haye
3c221c3316 A couple optimizations, and bug fix for nPages calc in store. 2017-04-10 07:27:10 -07:00
Martin Haye
1215e12e07 Lots of work on selling especially, but also plural item display on inventory screen. 2017-04-03 08:22:32 -07:00
Martin Haye
4c0b02931d Improved buy/sell Blockly blocks that can take parameters, to support a parameterized global Merchant script. 2017-04-02 09:25:11 -07:00
Martin Haye
006b191345 When buying countable things e.g. ammo/pelts, asks quantity. 2017-03-30 06:42:36 -07:00
Martin Haye
1cc3d8b67a Can now buy items. 2017-03-29 09:36:14 -07:00
Martin Haye
8b488e4e1b Fixed font engine's center mode for oversize window. Sped up center mode. Added more capabilities to store buy. 2017-03-25 07:23:10 -07:00
Martin Haye
3f9377088b Sprucing up the buy page. 2017-03-23 08:00:49 -07:00
Martin Haye
35c5ee97ef More progress on store buying. 2017-03-23 07:07:36 -07:00
Martin Haye
142f50a695 Oversized window for buy and sell. 2017-03-22 09:46:17 -07:00
Martin Haye
3611b8ebb5 Making progress on store buying. 2017-03-17 17:18:40 -07:00
Martin Haye
60cc77a59e More groundwork for buy/sell from stores. 2017-03-04 08:20:01 -08:00
Martin Haye
ff1e31cd44 Adding buy/sell store logic. 2017-03-03 08:25:45 -08:00
Martin Haye
6dee0388b1 Added ability to increase or decrease a stat for all party members. 2017-02-24 08:49:12 -08:00
Martin Haye
eb9691cb20 Proper dependencies for global funcs. Look for portrait on correct disk. 2017-02-20 07:42:23 -08:00
Martin Haye
d7d2ae3bbb Added a god-mode cheat for adding an NPC to the party. 2017-02-20 06:43:47 -08:00
Martin Haye
c29176722d Externalized godmode commands; only load when enabled. 2017-02-19 10:08:03 -08:00
Martin Haye
c7e336355a Made combat win and death portraits root deps. Commented out a bunch of debug prints. 2017-02-17 09:26:57 -08:00
Martin Haye
ad6b3f5ef8 Lots of fixes, related to reseek and resource lookup. 2017-02-17 09:01:35 -08:00
Martin Haye
eb2710865f Now using resource index... not right, but using it. 2017-02-06 10:01:00 -08:00
Martin Haye
9e3cd2c45e Modified font engine's parse routine to work better when called multiple times in succession. 2017-01-22 09:23:29 -08:00
Martin Haye
9e5e955fbe Realized I could use simple PLASMA extern for global heap pointer. 2017-01-22 08:44:10 -08:00
Martin Haye
3ff5b34603 Moved speed test code and commented it out until needed again. 2017-01-18 07:27:15 -08:00
Martin Haye
453f2687ab Modified speed test for just 3D transition. 2017-01-18 06:56:10 -08:00
Martin Haye
7fb830793c Doing some speed testing. 2017-01-15 09:10:43 -08:00
Martin Haye
2f8de46d0e Moved more of expander into aux LC to take advantage of space freed up by ProRWTS. Now expander is loaded at startup and remains locked in memory, rather than swapping in and out. 2017-01-12 09:08:05 -08:00
Martin Haye
994388940a Integrated new version of ProRWTS, now with support for big tree files\! Works beautifully. 2017-01-09 07:47:51 -08:00
Martin Haye
8dc84239e4 Now working in 3D mode (had to avoid loading over aux text pg, since hard disk driver uses screen holes there.) 2017-01-07 16:43:27 -08:00
Martin Haye
ae4210a050 Temporary workarounds. 2017-01-07 11:25:01 -08:00
Martin Haye
3123bdd903 Moved ProRWTS to aux LC. Also getting further in boot seq now. 2017-01-05 14:27:44 -08:00
Martin Haye
5f53550df2 Support getCharResponse; better handling of interdependent global scripts; support for backslash-backtick for explicit spaces in strings. 2016-12-13 09:07:36 -08:00
Martin Haye
652673ea01 Now supports 0..3 args on global funcs. 2016-12-08 07:05:28 -08:00
Martin Haye
9d849736e2 More fleshing out of global function calling. 2016-12-06 09:38:24 -08:00
Martin Haye
4d414bd6ce Now compiling each global script as a separate module, in anticipation of large scripts like hotel, store, etc. 2016-12-05 09:23:00 -08:00
Martin Haye
1f55dea477 Basics of benching/unbenching for players. 2016-11-10 08:40:50 -08:00
Martin Haye
0313db8d1a Progress on intimate mode - text display now mostly working. 2016-11-08 08:39:18 -08:00
Martin Haye
e6bcc747bd Outlines of 'intimate mode' 2016-11-07 07:58:46 -08:00
Martin Haye
99606c623c Return to graphics mode when using an item (like TNT) per Seth's request. 2016-11-04 08:27:22 -07:00
Martin Haye
2aa9e342e7 Added tile swap for 3D mode. 2016-11-01 09:25:36 -07:00
Martin Haye
831c0cd822 Fixed memory corruption issue when party screen updated during combat. 2016-10-31 08:04:22 -07:00
Martin Haye
c6e46398c1 Prefix 'You have died' with a newline. 2016-10-26 08:13:06 -07:00
Martin Haye
72fe0986fd Fix for text display followed by animation in 3D mode. 2016-10-26 08:04:29 -07:00
Martin Haye
e363b01c60 Don't reset global avatar flag when re-entering map. It needs to stay what the scripts set it to. 2016-10-26 07:45:47 -07:00
Martin Haye
65b5bf001e Fix for fwd/bkwd animations. 2016-10-26 07:38:07 -07:00
Martin Haye
048c09edf4 Fixed portraitNum bug (was relying on a specific Lawless Legends portrait) 2016-10-25 15:05:00 -07:00
Martin Haye
9dc84046c5 Further reduce aux mem fragmentation by putting the 3D expander at the start of aux mem, leaving one continuous space in the middle. 2016-10-25 08:58:38 -07:00
Martin Haye
520fc7216e Now animating 3D textures. 2016-10-24 08:20:52 -07:00
Martin Haye
33d9f17503 New blocks for setting and clearing full-screen img. 2016-10-24 07:08:37 -07:00
Martin Haye
f3aaa7c6ad Now supports animating title screen and final win screen. 2016-10-23 10:42:11 -07:00
Martin Haye
ee16d7a0d6 Most animations working properly now. 2016-10-23 09:09:43 -07:00
Martin Haye
2ef692c537 Animation progress. 2016-10-22 08:46:37 -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
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
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
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
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
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
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
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
70ead12fb1 Added a god-mode command, '&', to print out the allocated memory blocks. 2016-08-03 08:41:36 -07:00
Martin Haye
40f27ef4eb Better memory management handling of split expander. 2016-08-03 08:05:54 -07:00
Martin Haye
0e6c20cffe Making some progress splitting the raycasting expander. 2016-08-01 09:45:09 -07:00
Martin Haye
b848882090 Fix avatar establishment on game start. 2016-07-28 09:46:38 -07: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
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
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
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
9f3e880c37 Filter selection based on command 2016-07-14 22:24:09 -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
Dave Schmenk
ad8d58f62e Inventory formatting updates 2016-07-12 22:23:38 -07:00
David Schmenk
c6edbeb703 Use health item 2016-07-12 15:51:05 -07:00
David Schmenk
71b4900375 Inventory equip/use/drop 2016-07-12 08:09: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
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
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
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
ac680b47d2 Always beep when blocked, whether blocked by an obstacle or the edge of the map. 2016-07-03 18:20:07 -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
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
d89d9dfbad Fixed so some enemies get a crack at you when you're fleeing. 2016-07-01 16:32:57 -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
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