Commit Graph

572 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Martin Haye
646d48d206 Now packing weapons spreadsheet. 2016-06-13 08:15:14 -07:00
Martin Haye
4366daef8f Wasn't recording goldLoot for in enemies before. 2016-06-12 13:38:14 -07:00
Martin Haye
944935c4a2 Lots of refactoring of armor, weapons, character stats, etc. 2016-06-12 13:12:14 -07:00
Martin Haye
1122108e75 Refactoring to auto-generate weapon table from spreadsheet in XML file. 2016-06-12 08:52:24 -07:00
Martin Haye
de33ab3b21 Generating stubs for all item types (weapons, armor, ammo, and items). 2016-06-11 10:58:33 -07:00
Martin Haye
a4eaeb5cf1 Fix map name display when returning from combat. 2016-06-09 07:39:09 -07:00
David Schmenk
4810c72423 ProceI can update ame source 2016-06-05 18:01:11 -07:00
Brendan Robert
9b5508a88c Ignore build messages from commit history 2016-06-05 13:11:22 -05:00
Martin Haye
c4b973fabf Changed disk activity indicator to blue per Seth's preference. 2016-06-03 09:42:28 -07:00
Martin Haye
64fa3c0ebb Made disk activity icon. 2016-06-03 09:18:25 -07:00
Martin Haye
170c98508f Moved player info display to separate module, party.pla. Added a few descriptive comments to help Dave get started. 2016-06-01 09:03:14 -07:00
Martin Haye
3df106d6eb Unified build system, with new readme. 2016-05-31 07:45:49 -07:00
Martin Haye
f1aab8572c Fix problems with cursor flash when inputting a string. 2016-05-26 09:09:25 -07:00
Martin Haye
a1dad110dd Fix for 64-map chunk bug. 2016-05-26 07:41:44 -07:00
Martin Haye
334c7e6d71 Fix for missing hi-bits in text windows making characters look like they were cut off. 2016-05-19 09:31:28 +02:00
Martin Haye
6ed1518520 String management: break up long strings into plasma-size chunks; clear string pool after each. 2016-05-10 07:13:22 +02:00
Martin Haye
0f2f2fa4ab Animations now run during combat pauses. 2016-04-28 08:20:28 -07:00
Martin Haye
17772096f5 Merge branch 'master' of https://github.com/peterferrie/lawless-legends into peterferrie-master 2016-04-28 07:44:38 -07:00
Peter Ferrie
2822e6c184 fix more typos 2016-04-26 09:46:25 -07:00
Martin Haye
6745f5c556 Merge branch 'master' of https://github.com/peterferrie/lawless-legends into peterferrie-master 2016-04-26 06:40:11 -07:00
Martin Haye
9cdc68b0ee Improved messaging for errors. 2016-04-26 06:39:44 -07:00
Peter Ferrie
e5cd2ce964 fix typo 2016-04-19 14:22:41 -07:00
Peter Ferrie
d8e235d753 minor size optimisations
note that fontengine.s!Wp_CFnt has a bad compare
2016-04-12 16:54:00 -07:00
Martin Haye
312ee3a8a3 Fixed problem clearing portrait after teleport. 2016-04-07 07:35:28 -07:00
Martin Haye
ccc43368d4 Encounter zones working now. 2016-03-31 10:01:04 -07:00
Martin Haye
453d44b11a Speed things up a little. 2016-03-29 15:22:31 -07:00
Martin Haye
d17ef502e3 Good progress on implementing encounter zones. 2016-03-29 15:17:42 -07:00
Martin Haye
44ef8798e7 Now packing global scripts from the Outlaw file. In particular, now requires a 'New game' script to be present, that it used to set map coordinates now (and much more later). 2016-03-24 09:45:07 -07:00
Martin Haye
99f5879993 String response gathering and checking now working. 2016-03-22 08:22:26 -07:00
Martin Haye
7d6393d9c8 PackPartitions now grabs code files as resources from the Jar file if they're not present locally. 2016-02-15 16:25:24 -08:00
Martin Haye
e05a9691f9 Further work on just-in-time copy to build dir. 2016-02-15 14:43:25 -08:00
Martin Haye
e12555531a Pure-PLASMA scripts from Outlaw now working. 2016-02-09 08:23:25 -08:00
Martin Haye
2851e6ca24 Cleaned up texture divvy code. 2016-01-24 13:11:35 -08:00
Martin Haye
c445c9808f Integrated disk image generation into PackPartitions. 2016-01-24 12:37:11 -08:00
Martin Haye
f239bd4ac2 PackPartitions now does everything itself: compile, assemble, pack. 2016-01-18 19:55:36 -08:00
Martin Haye
d1558d67cf PackPartitions now calls ACME to assemble sources. 2016-01-18 19:28:59 -08:00
Martin Haye
9883d292fc Start with first portrait for test mode. 2016-01-07 11:29:31 -08:00
Martin Haye
a93db4ea66 Took out some useless main/aux switching in decomp routine. 2016-01-07 11:28:03 -08:00
Martin Haye
59106ae953 Fixed nasty decompression bug having to do with match len multiple of 256. 2016-01-07 11:23:46 -08:00
Martin Haye
ecc9cc2016 Fixed portrait confusion, and moved enemy selection code to combat module. 2016-01-01 10:18:33 -08:00
Martin Haye
7e9bcabcc1 Now generating enemies from table instead of hand coding them. 2016-01-01 07:53:57 -08:00
Martin Haye
8c6c658ecf Making translating enemy table to code. 2016-01-01 06:04:42 -08:00
Martin Haye
55cd9892e3 More efficient way to call global scripts. 2015-12-31 09:56:50 -08:00
Martin Haye
9a1a1d0a0e Refactored global scripts into their own module. 2015-12-29 11:22:14 -08:00