# HG changeset patch # User David Boddie # Date 1318108004 -7200 # Node ID 72baa631819229d7c9c5a48066c39db05ee8b4f8 # Parent 2e43c7e90f426f12e03d89b62acb482547f404c0 Added the final two enemies. Fixed enemy type selection to include the fifth enemy type. diff -r 2e43c7e90f42 -r 72baa6318192 build.py --- a/build.py Sun Oct 02 21:04:54 2011 +0200 +++ b/build.py Sat Oct 08 23:06:44 2011 +0200 @@ -123,15 +123,15 @@ # 4 * 2 * 0x30 (player movement) # 4 * 0x30 (player demise) # 4 * 2 * 0x10 (projectile) - # 5 * 4 * 2 * 0x40 (enemies) 36C0 + # 5 * 4 * 2 * 0x40 (enemies) 41C0 # 4 * 0x40 (enemy appear) # 4 * 0x40 (enemy demise) - # 4 * 0x40 (weapons) 42C0 + # 4 * 0x40 (weapons) 4dC0 # 5 * 0x40 (treasure) - # 2 * 0x60 (exit) 4500 + # 2 * 0x60 (exit) 5000 # 2 * 0x60 (final exit) # - # 4*2*0x30 + 4*0x30 + 4*2*0x10 + 5*4*2*0x40 + 4*0x40 + 4*0x40 + 4*0x40 + 5*0x40 + 2*0x60 + 2*0x60 + 0x3f00 + # 0x3f00 + 4*2*0x30 + 4*0x30 + 4*2*0x10 + 5*4*2*0x40 + 4*0x40 + 4*0x40 + 4*0x40 + 5*0x40 + 2*0x60 + 2*0x60 # # 5180 high scores (8 * 12 = 0xe0) # n 3 bytes score + 9 bytes ASCII diff -r 2e43c7e90f42 -r 72baa6318192 images/beastld1.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/beastld1.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * beastld1_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +"................", +"................", +"..............+.", +".......+++++...+", +"..+...++++@++.+.", +"..+++.+@++++++..", +"..+@+++++@+++++.", +"++++++++++++@++.", +"+..+++@+++@++++.", +"..++.+++++++++..", +"......++..++....", +"......++..++....", +"....+++....+++..", +".....+......+...", +"................", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/beastld2.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/beastld2.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * beastld2_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +"................", +"................", +"..............+.", +".......+++++...+", +"..+...++++@++.+.", +"..+++.+@++++++..", +"..+@+++++@+++++.", +"++++++++++++@++.", +"+..+++@+++@++++.", +"..++.+++++++++..", +"......++..++....", +"......++..++....", +"......++..++....", +".....++....++...", +"......+....+....", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/beastld3.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/beastld3.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * beastld3_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +"................", +"................", +"...............+", +".......+++++..+.", +"..+...++++@++.+.", +"..+++.+@++++++..", +"..+@+++++@+++++.", +"++++++++++++@++.", +"+.++++@+++@++++.", +".....+++++++++..", +"......++..++....", +"......++..++....", +"......++..++....", +".......+.++.....", +"......++..+.....", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/beastld4.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/beastld4.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * beastld4_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +"................", +"................", +"...............+", +".......+++++..+.", +"..+...++++@++.+.", +"..+++.+@++++++..", +"..+@+++++@+++++.", +"++++++++++++@++.", +"+..+++@+++@++++.", +"..++.+++++++++..", +"......++..++....", +"......++..++....", +"......++..++....", +".......++..++...", +".......+...+....", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/beastrd1.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/beastrd1.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * beastrd1_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +"................", +"................", +".+..............", +"+...+++++.......", +".+.++@++++...+..", +"..++++++@+.+++..", +".+++++@+++++@+..", +".++@++++++++++++", +".++++@+++@+++..+", +"..+++++++++.++..", +"....++..++......", +"....++..++......", +"..+++....+++....", +"...+......+.....", +"................", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/beastrd2.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/beastrd2.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * beastrd2_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +"................", +"................", +".+..............", +"+...+++++.......", +".+.++@++++...+..", +"..++++++@+.+++..", +".+++++@+++++@+..", +".++@++++++++++++", +".++++@+++@+++..+", +"..+++++++++.++..", +"....++..++......", +"....++..++......", +"....++..++......", +"...++....++.....", +"....+....+......", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/beastrd3.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/beastrd3.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * beastrd3_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +"................", +"................", +"+...............", +".+..+++++.......", +".+.++@++++...+..", +"..++++++@+.+++..", +".+++++@+++++@+..", +".++@++++++++++++", +".++++@+++@++++.+", +"..+++++++++.....", +"....++..++......", +"....++..++......", +"....++..++......", +".....++.+.......", +".....+..++......", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/beastrd4.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/beastrd4.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * beastrd4_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +"................", +"................", +"+...............", +".+..+++++.......", +".+.++@++++...+..", +"..++++++@+.+++..", +".+++++@+++++@+..", +".++@++++++++++++", +".++++@+++@+++..+", +"..+++++++++.++..", +"....++..++......", +"....++..++......", +"....++..++......", +"...++..++.......", +"....+...+.......", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/lizardld1.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/lizardld1.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * lizardld1_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +".......+........", +".......++.......", +"......++........", +"......++......++", +"...+...+.....@+.", +"...++.++@++@++..", +"..++..++@++@++..", +"..++.+@++@......", +"...@++@++++.....", +"...@+++@..++....", +".+++@++....+++..", +"++@++.+.....+...", +"++++..++........", +"..++...+++......", +".++.....+.......", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/lizardld2.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/lizardld2.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * lizardld2_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +".......+........", +".......++.......", +"......++........", +"......++......++", +"..+....+....+@+.", +".+++..++@++@++..", +".++...++@++@+...", +"..++.+@++@......", +"...@++@+++......", +"...@+++@.++.....", +".+++@++...++....", +"++@++.+....++...", +"++++..++...+....", +"..++...+++......", +".++.....+.......", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/lizardld3.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/lizardld3.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * lizardld3_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +"......+.........", +"......++........", +".....++......++.", +".....++....++@++", +"..+...+...@++...", +".+++..++@++@....", +".++...++@++@....", +"..++.+@++@......", +"...@++@+++......", +"...@+++@.++.....", +".+++@++...++....", +"++@++.+....++...", +"++++..++...+....", +"..++...+++......", +".++.....+.......", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/lizardld4.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/lizardld4.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * lizardld4_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +"................", +".....+..........", +"....++.......++.", +".....++....++@++", +".+....+...@++...", +"++....++@++@....", +".++...++@++@....", +"..++.+@++@......", +"...@++@+++......", +"...@+++@.++.....", +".+++@++...++....", +"++@++.+....++...", +"++++..++...+....", +"..++...+........", +".++....++.......", +".......+........"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/lizardrd1.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/lizardrd1.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * lizardrd1_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +"........+.......", +".......++.......", +"........++......", +"++......++......", +".+@.....+...+...", +"..++@++@++.++...", +"..++@++@++..++..", +"......@++@+.++..", +".....++++@++@...", +"....++..@+++@...", +"..+++....++@+++.", +"...+.....+.++@++", +"........++..++++", +"......+++...++..", +".......+.....++.", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/lizardrd2.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/lizardrd2.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * lizardrd2_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +"........+.......", +".......++.......", +"........++......", +"++......++......", +".+@+....+....+..", +"..++@++@++..+++.", +"...+@++@++...++.", +"......@++@+.++..", +"......+++@++@...", +".....++.@+++@...", +"....++...++@+++.", +"...++....+.++@++", +"....+...++..++++", +"......+++...++..", +".......+.....++.", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/lizardrd3.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/lizardrd3.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * lizardrd3_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +".........+......", +"........++......", +".++......++.....", +"++@++....++.....", +"...++@...+...+..", +"....@++@++..+++.", +"....@++@++...++.", +"......@++@+.++..", +"......+++@++@...", +".....++.@+++@...", +"....++...++@+++.", +"...++....+.++@++", +"....+...++..++++", +"......+++...++..", +".......+.....++.", +"................"}; diff -r 2e43c7e90f42 -r 72baa6318192 images/lizardrd4.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/lizardrd4.xpm Sat Oct 08 23:06:44 2011 +0200 @@ -0,0 +1,23 @@ +/* XPM */ +static char * lizardrd4_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FF0000", +"@ c #FFFF00", +"................", +"..........+.....", +".++.......++....", +"++@++....++.....", +"...++@...+....+.", +"....@++@++....++", +"....@++@++...++.", +"......@++@+.++..", +"......+++@++@...", +".....++.@+++@...", +"....++...++@+++.", +"...++....+.++@++", +"....+...++..++++", +"........+...++..", +".......++....++.", +"........+......."}; diff -r 2e43c7e90f42 -r 72baa6318192 mapcode.oph --- a/mapcode.oph Sun Oct 02 21:04:54 2011 +0200 +++ b/mapcode.oph Sat Oct 08 23:06:44 2011 +0200 @@ -2294,11 +2294,11 @@ jsr unlimited_values lda $7d and #7 - cmp #4 + cmp #5 bmi emerge_type_ok sec - sbc #4 + sbc #5 clc emerge_type_ok: diff -r 2e43c7e90f42 -r 72baa6318192 tools/makesprites.py --- a/tools/makesprites.py Sun Oct 02 21:04:54 2011 +0200 +++ b/tools/makesprites.py Sat Oct 08 23:06:44 2011 +0200 @@ -93,7 +93,6 @@ read_xpm("images/wasprd3.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), read_xpm("images/wasprd4.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - # placeholder enemy sprites read_xpm("images/snakeld1.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), read_xpm("images/snakeld2.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), read_xpm("images/snakeld3.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), @@ -103,25 +102,23 @@ read_xpm("images/snakerd3.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), read_xpm("images/snakerd4.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - # placeholder enemy sprites - read_xpm("images/birdld1.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdld2.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdld3.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdld4.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdrd1.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdrd2.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdrd3.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdrd4.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/lizardld1.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/lizardld2.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/lizardld3.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/lizardld4.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/lizardrd1.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/lizardrd2.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/lizardrd3.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/lizardrd4.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - # placeholder enemy sprites - read_xpm("images/birdld1.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdld2.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdld3.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdld4.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdrd1.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdrd2.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdrd3.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), - read_xpm("images/birdrd4.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/beastld1.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/beastld2.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/beastld3.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/beastld4.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/beastrd1.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/beastrd2.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/beastrd3.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), + read_xpm("images/beastrd4.xpm", [(".", "0"), ("+", "1"), ("@", "3")]), # Enemy emerge read_xpm("images/emerge1.xpm", [(".", "0"), ("+", "1"), ("#", "2"), ("@", "3")]),