Commit Graph

940 Commits

Author SHA1 Message Date
Martin Haye
d3132cc318 Working to get compass direction actually right. 2017-08-04 08:30:08 -07:00
Martin Haye
0a077a83e2 Rebuilt plasma compiler for new features. 2017-08-04 08:26:46 -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
David Schmenk
6b8e02db98 PLASMA compiler update 2017-08-03 12:15:24 -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
David Schmenk
7b8637b773 Fix CFFB BIT operation with CB 2017-08-02 09:31:10 -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
efc524c659 Merge branch 'master' of https://github.com/badvision/lawless-legends 2017-07-31 09:20:16 -07:00
Martin Haye
60a6269b19 Temporary fix for disk detection logic in ProRWTS. 2017-07-31 09:20:08 -07:00
David Schmenk
131bcddcc4 Add new CFFB opcode in anticipation of new compiler optimizations 2017-07-29 07:38:41 -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
2da46eacb4 Recompiled PLASMA to pick up Dave's recent fix. 2017-07-10 10:19:34 -07:00
Dave Schmenk
176a602bfa Fix dereference off of array 2017-07-10 10:09:25 -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
ce31c5bda8 Fixed cat locket problem. 2017-07-07 10:18:20 -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
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
c2dc5fab12 Now properly updates totals and decrements avail skill pts. 2017-06-24 16:46:02 -07:00
Martin Haye
7fa12c2a27 Can now increase stats. 2017-06-24 16:25:48 -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
90d9238002 Adding level, XP, SP, etc. 2017-06-13 10:07:03 -07:00
Martin Haye
76b99504fb Fixed a few arg count mismatches. 2017-06-11 10:15:20 -07:00
Martin Haye
2585a84553 Some argument count fixes. 2017-06-11 08:55:03 -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
94c3b50cc6 Stop suppressing PLASMA warnings. 2017-06-09 07:43:52 -07:00
Martin Haye
5e7ae1dc58 Turned on PLASMA optimizer - saves 4.2k\! 2017-06-09 07:17:37 -07:00
Martin Haye
cf17300210 Adding some function prototypes. 2017-06-09 07:14:53 -07:00
Martin Haye
f56fb140d0 Jar'd new version of PLASMA. 2017-06-09 06:57:49 -07:00
Martin Haye
7ba5bcb3e7 Merge branch 'master' of https://github.com/badvision/lawless-legends 2017-06-09 06:44:10 -07:00
Dave Schmenk
1cb302f75d Fix predef and asm with parameters & multiple predefs per line 2017-06-07 19:28:13 -07:00
David Schmenk
1f6ed64793 Optimize NOT before branch true/false 2017-06-07 17:43:28 -07:00
David Schmenk
082f10424e Branch optimizations 2017-06-07 16:20:08 -07:00
David Schmenk
4343292057 Add warning for all mismatched funtion parameter counts 2017-06-07 10:16:13 -07:00
David Schmenk
7ee5a3d524 Implement better constant string management 2017-06-07 10:07:14 -07:00
Martin Haye
9d5acd1006 Updated PLASMA compiler and VM. 2017-06-07 07:01:50 -07:00
Martin Haye
b69be27f84 Merge branch 'master' of https://github.com/badvision/lawless-legends 2017-06-07 06:54:51 -07:00
David Schmenk
3f880ecb67 Fix pointer, pointer constructs and quoted string scan_rewind 2017-06-06 12:54:19 -07:00
Martin Haye
7a43bf0d95 Merge branch 'master' of https://github.com/badvision/lawless-legends 2017-06-05 08:36:49 -07:00
dschmenk
0c041f7f97 Add warnings to plasm compiles 2017-06-04 07:39:46 -07:00
dschmenk
1e031d6de0 Update PLASMA VM and compler to pre-1.0 2017-06-04 07:33:44 -07:00
dschmenk
52ec55babe Merge branch 'master' of https://github.com/badvision/lawless-legends 2017-06-04 07:26:05 -07:00
dschmenk
640b305401 VM updates for 1.0 2017-06-04 07:25:20 -07:00
David Schmenk
a38667e704 Update PLASMA VM and compiler to pre-1.0 2017-06-03 15:51:48 -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
1d0b205d48 Making progress on customizable global functions for leveling and combat messages. 2017-05-30 11:18:37 -07:00
Martin Haye
a5e50d02b9 Can now equip with comparison. 2017-05-25 10:40:53 -07:00
Martin Haye
0846209382 More refactoring. 2017-05-25 09:33:11 -07:00
Martin Haye
834b6576e2 More work normalizing inventory UI. 2017-05-25 07:50:51 -07:00
Martin Haye
da33bded45 Fixed a bunch of little bugs in the font itself. 2017-05-25 06:55:12 -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
91fca1abac Corrected width of lower-case 'l' and 'g'. Still need to fix the source spreadsheet. 2017-05-24 07:47:28 -07:00
Martin Haye
824d5aadbe Minor refactoring of function names. 2017-04-25 07:30:45 -07:00
Martin Haye
cc8fa3bb7d Refactored item display so party and store can share it. 2017-04-20 09:36:08 -07:00
Martin Haye
cc725f0657 Properly lock hi-res page 1. 2017-04-20 09:35:57 -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
8fdaf7b237 Merge branch 'master' of https://github.com/badvision/lawless-legends 2017-03-29 07:36:30 -07:00
Martin Haye
7622f4e41b Working on comparison shopper. 2017-03-29 07:36:27 -07:00
dschmenk
be928b081d Check for existing string in pool before copying CS string from aux mem 2017-03-27 08:53:01 -07:00
Martin Haye
2e779c5028 Even faster center mode scrolling. 2017-03-25 07:57:21 -07:00
Martin Haye
411294dae8 Tiny improvements. 2017-03-25 07:25:50 -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
121753c45d Fixed warning display. 2017-03-23 07:07:29 -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
4ee9116e82 Added floppy disk usage to pack_report.txt 2017-03-15 07:46:27 -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
47d86a3dca Fix for number of fixups > 127 2017-02-25 11:56:27 -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
e2b5ccf375 Bench/unbench now working. 2017-02-20 08:02:55 -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
d81e5ff8c0 Forgot these files. 2017-02-19 10:08:32 -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
421614f605 Added IIc detection logic, thanks to qkumba. 2017-02-06 07:54:05 -08:00
Martin Haye
826176f344 Work around AppleCommander last-block bug. Add resource map to disk 1. 2017-02-06 07:49:00 -08:00
Martin Haye
c4898ef65f Now calculating exact disk sizes. 2017-02-05 11:49:23 -08:00
Martin Haye
87926d1584 Trying to get exact sizes now. 2017-02-05 11:20:13 -08:00
Martin Haye
3c49a6c7ce Fixed some disk split bugs. 2017-02-05 11:05:26 -08:00
Martin Haye
c060bf31d4 Lots of progress on disk split allocation. 2017-02-05 09:45:34 -08:00
Martin Haye
30dd953d44 Made some progress on disk splitting... lots left though. 2017-02-02 10:20:39 -08:00
Martin Haye
847228a73d Added clean script shortcut for Martin's use. 2017-02-02 07:10:51 -08:00
Martin Haye
2b78f31b5a I think I'm now tracking all the dependencies needed for proper disk splitting. 2017-01-29 10:47:58 -08:00
Martin Haye
6bf9889488 A couple little comments. 2017-01-29 09:43:02 -08:00
Martin Haye
cd090db01f Split long lines to making editing easier. 2017-01-29 09:40:14 -08:00
Martin Haye
9d313d5176 Added order field to maps. Fixed some loader bugs. 2017-01-29 09:23:58 -08:00
Martin Haye
32656bd6fc Removed dependency on lz4, since we have our own compression algorithm now. 2017-01-25 07:48:20 -08:00
Martin Haye
a143026583 Refactored packer to use compressed byte arrays most everywhere, because they're so much easier to work with then Java ByteBuffer. 2017-01-24 10:47:01 -08:00
Martin Haye
12760c330b Read XML file only once. 2017-01-22 14:45:41 -08:00
Martin Haye
1d131d523d Updated mem mgr to recognize that we no longer need buffers for ProDOS and copying. 2017-01-22 09:44:58 -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
421807719b Slightly more readable. 2017-01-18 09:59:00 -08:00
Martin Haye
a8126a1c75 New disk polling code. 2017-01-18 09:29:26 -08:00
Martin Haye
7056e09458 Properly retain previous game save when rebuilding image. 2017-01-18 08:24:09 -08:00
Martin Haye
a00e019b75 Got game-exist check working. 2017-01-18 08:21:01 -08:00
Martin Haye
4dd4ae02b1 Fixed load game. 2017-01-18 07:43:55 -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
eed337af74 Used up the last two bytes. 2017-01-17 10:34:35 -08:00
Martin Haye
5c0ba2dfa3 Saved a byte, and a little time. 2017-01-17 10:29:49 -08:00
Martin Haye
ead90f2bf3 Optimized litlen=1 common case. 2017-01-17 10:19:19 -08:00
Martin Haye
a4fede35f7 Made gamma refactor permanent. 2017-01-15 15:40:47 -08:00
Martin Haye
5a9f8f749b Refactored gamma. 2017-01-15 15:19:22 -08:00
Martin Haye
22e4b4b681 Saved a byte. 2017-01-15 11:54:21 -08:00