Apple-2-SW
/
fujirun
mirror of https://github.com/robmcmullen/fujirun.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

WIP to generate maze tiles

This commit is contained in:
Rob McMullen 2017-07-19 10:07:00 -07:00
parent 1f991315ea
commit 566795be89
5 changed files with 484 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -32,7 +32,10 @@ partycrasher-software.hgr: partycrasher-software.png
titles.dsk: cpbg.xex player-missile.hgr partycrasher-software.hgr kansasfest-hackfest.hgr
atrcopy titles.dsk boot -d kansasfest-hackfest.hgr@2000 player-missile.hgr@4000 partycrasher-software.hgr@2000 -b cpbg.xex --brun 6000 -f
working.xex: working.s rand.s
working-sprite-driver.s: $(BWSPRITE)
quicksprite.py -a mac65 -p 6502 -s hgrbw -m -k -d -g -f fatfont128.dat -o working $(BWSPRITE)
working.xex: working.s rand.s maze.s working-sprite-driver.s
rm -f working.xex
atasm -mae -oworking.xex working.s -Lworking.var -gworking.lst
@ -45,4 +48,4 @@ clean:
rm -f titles.dsk
rm -f player-missile.hgr player-missile.hgr.png partycrasher-software.hgr kansasfest-hackfest.hgr
rm -f tmphgr-*
rm -f working.dsk working.xex
rm -f working.dsk working.xex working-*.s

351
maze.s Normal file
View File

@ -0,0 +1,351 @@
; defines
TILE_DOWN = $1
TILE_UP = $2
TILE_RIGHT = $4
TILE_LEFT= $8
TILE_HORZ = TILE_LEFT|TILE_RIGHT
TILE_VERT = TILE_UP|TILE_DOWN
DIR_MASK = $0f
TILE_DOT = $10
LEFT_TILE = TILE_DOT|TILE_RIGHT
MIDDLE_TILE = TILE_DOT|TILE_LEFT|TILE_RIGHT
RIGHT_TILE = TILE_DOT|TILE_LEFT
VPATH_NUM = 6
BOX_WIDTH = 5
VPATH_COL_SPACING = BOX_WIDTH + 1
; storage
vpath_cols .byte 1, 7, 13, 19, 25, 31
vpath_top_tile .byte LEFT_TILE|TILE_DOWN
.byte MIDDLE_TILE|TILE_DOWN
.byte MIDDLE_TILE|TILE_DOWN
.byte MIDDLE_TILE|TILE_DOWN
.byte MIDDLE_TILE|TILE_DOWN
.byte RIGHT_TILE|TILE_DOWN
vpath_bot_tile .byte LEFT_TILE|TILE_UP
.byte MIDDLE_TILE|TILE_UP
.byte MIDDLE_TILE|TILE_UP
.byte MIDDLE_TILE|TILE_UP
.byte MIDDLE_TILE|TILE_UP
.byte RIGHT_TILE|TILE_UP
player_start_col .byte 255,255,255,255, ; zero players!
.byte 16, 0, 0, 0,
.byte 7, 25, 0, 0,
.byte 7, 19, 31, 0,
.byte 1, 13, 25, 31,
amidar_start_col .ds VPATH_NUM
round_robin_up .ds VPATH_NUM
round_robin_down .ds VPATH_NUM
MAZE_TOP_ROW = 1
MAZE_BOT_ROW = 22
SCREEN_ROWS = 24
;# Screen has cols 0 - 39
;# cols 0 - 32 are the maze, of which 1 - 31 are actually used
;# 0 and 32 are border tiles having the value zero
;# cols 33 - 39 is the score area
MAZE_LEFT_COL = 1
MAZE_RIGHT_COL = 31
MAZE_SCORE_COL = 33
SCREEN_COLS = 40
;# Orbiter goes around the outside border, but not through the maze
ORBITER_START_COL = MAZE_RIGHT_COL
ORBITER_START_ROW = (MAZE_TOP_ROW + MAZE_BOT_ROW) / 2
;# Returns address of tile in col 0 of row y
;def mazerow(y):
; return maze[y]
; row in Y
mazerow lda textrows_l,y
sta mazeaddr
lda textrows_h,y
sta mazeaddr+1
rts
;###### Level creation functions
;def clear_maze():
; y = 0
; while y < SCREEN_ROWS:
; addr = mazerow(y)
; x = 0
; while x < MAZE_SCORE_COL:
; addr[x] = 0
; x += 1
; y += 1
; init_boxes()
clear_maze nop
ldx #MAZE_RIGHT_COL
lda #0
?1 jsr text_put_col
dex
bpl ?1
jmp init_boxes
;# Set all elements in a row to dot + left + right; only top and bottom
;def setrow(row):
; addr = mazerow(row)
; x = MAZE_LEFT_COL
; while x <= MAZE_RIGHT_COL:
; addr[x] = TILE_DOT|TILE_LEFT|TILE_RIGHT
; x += 1
; row in Y, clobbered
setrow jsr mazerow
ldy #MAZE_RIGHT_COL
lda #MIDDLE_TILE
?1 sta (mazeaddr),y
dey
cpy #MAZE_LEFT_COL
bcs ?1
rts
;
;# Create all vpaths, using top/bot character from a list to handle both
;# corners and T connections.
;def setvpath(col):
; x = vpath_cols[col]
; y = MAZE_TOP_ROW
; addr = mazerow(y)
; addr[x] = vpath_top_tile[col]
; y += 1
; while y < MAZE_BOT_ROW:
; addr = mazerow(y)
; addr[x] = TILE_DOT|TILE_UP|TILE_DOWN
; y += 1
; addr = mazerow(y)
; addr[x] = vpath_bot_tile[col]
; vpath number in X, AY clobbered
setvpath lda vpath_cols,x
tay
lda #TILE_DOT|TILE_VERT
sta $0500,y ; row 2
sta $0580,y ; row 3
sta $0600,y ; row 4
sta $0680,y ; row 5
sta $0700,y ; row 6
sta $0780,y ; row 7
sta $0428,y ; row 8
sta $04a8,y ; row 9
sta $0528,y ; row 10
sta $05a8,y ; row 11
sta $0628,y ; row 12
sta $06a8,y ; row 13
sta $0728,y ; row 14
sta $07a8,y ; row 15
sta $0450,y ; row 16
sta $04d0,y ; row 17
sta $0550,y ; row 18
sta $05d0,y ; row 19
sta $0650,y ; row 20
sta $06d0,y ; row 21
lda vpath_top_tile,x
sta $0480,y ; row 1
lda vpath_bot_tile,x
sta $0750,y ; row 22
rts
;
;
;# Create hpaths such that there are no hpaths that meet at the same row in
;# adjacent columns (cross-throughs are not allowed in ghost legs). Starts at
;# the rightmost vpath and moves left using the rightmost vpath as the input to
;# this function and building hpaths between it and the vpath to the left. The
;# first time this routine is called there won't be any existing columns to
;# compare to, otherwise if a tile on the left vpath has a rightward pointing
;# hpath, move up one and draw the hpath there. This works because the minimum
;# hpath vertical positioning leaves 2 empty rows, so moving up by one still
;# leaves 1 empty row.
;def sethpath(col):
; x1_save = vpath_cols[col - 1]
; x2 = vpath_cols[col]
; y = MAZE_TOP_ROW
; start_box(y, x1_save)
; y += get_rand_spacing()
; while y < MAZE_BOT_ROW - 1:
; addr = mazerow(y)
;
; # If not working on the rightmost column, check to see there are
; # no cross-throughs.
; if col < VPATH_NUM - 1:
; tile = addr[x2]
; if tile & TILE_RIGHT:
; maze_log.debug("at y=%d on col %d, found same hpath level at col %d" % (y, col, col + 1))
; y -= 1
; addr = mazerow(y)
; add_box(y)
;
; x = x1_save
; addr[x] = TILE_DOT|TILE_UP|TILE_DOWN|TILE_RIGHT
; x += 1
; while x < x2:
; addr[x] = TILE_DOT|TILE_LEFT|TILE_RIGHT
; x += 1
; addr[x2] = TILE_DOT|TILE_UP|TILE_DOWN|TILE_LEFT
; y += get_rand_spacing()
; add_box(MAZE_BOT_ROW)
;
;
;def init_maze():
; clear_maze()
;
; # Draw top and bottom; no intersections anywhere. Corners and T
; # intesections will be placed in setvpath
; setrow(MAZE_TOP_ROW)
; setrow(MAZE_BOT_ROW)
;
; # Draw all vpaths, including corners and top/bot T intersections
; counter = VPATH_NUM
; counter -= 1
; while counter >= 0:
; setvpath(counter)
; counter -= 1
;
; # Draw connectors between vpaths, starting with the rightmost column and
; # the one immediately left of it. This is performed 6 times because it
; # always needs a pair of columns to work with.
; counter = VPATH_NUM
; counter -= 1
; while counter > 0: # note >, not >=
; sethpath(counter)
; counter -= 1
;
; finish_boxes()
init_maze nop
jsr clear_maze
ldy #MAZE_TOP_ROW
jsr setrow
ldy #MAZE_BOT_ROW
jsr setrow
ldx #VPATH_NUM
?1 dex
jsr setvpath
cpx #0
bne ?1
rts
;##### Box handling/painting
;
;# Level box storage uses the left column (we don't need to store the right side
;# because they are always a fixed distance away) and a list of rows.
;#
;# To examine the boundary of each box to check for dots, the top row and the
;# bottom row must look at BOX_WIDTH + 2 tiles, all the middle rows only have to
;# check the left and right tiles
;#
;# The entire list of rows doesn't need to be stored, either; only the top and
;# bottom because everything else is a middle row. Therefore, all we need is the
;# x of the left vpath, the top row and the bottom row:
;#
;# x1, ytop, ybot
;#
;# is 3 bytes. Max number of boxes is 10 per column, 6 columns that's 10 * 6 * 3
;# = 180 bytes. Less than 256, yay!
;#
;# n can also be used as a flag: if n == 0, the box has already been checked and
;# painted. n == 0xff is the flag to end processing.
;
;# for VPATH_NUM == 7:
;# 01 X/----T----T----T----T----T----\X_______
;# 02 X|XXXX|XXXX|XXXX|XXXX|XXXX|XXXX|X_______
;# 03 X|XXXX|XXXX|XXXX|XXXX|XXXX|XXXX|X_______
;# 04 X|XXXX|XXXX|XXXX|XXXX+----+XXXX|X_______
;
;# for VPATH_NUM == 6:
;# 01 X/-----T-----T-----T-----T-----\X_______
;# 02 X|XXXXX|XXXXX|XXXXX|XXXXX|XXXXX|X_______
;# 03 X|XXXXX|XXXXX|XXXXX|XXXXX|XXXXX|X_______
;# 04 X|XXXXX|XXXXX|XXXXX+-----+XXXXX|X_______
;
;NUM_LEVEL_BOX_PARAMS = 3
;level_boxes = [0] * 10 * 6 * NUM_LEVEL_BOX_PARAMS
;
;# Box painting will be in hires so this array will become a tracker for the
;# hires display. It will need y address, y end address, x byte number. It's
;# possible for up to 3 boxes to get triggered to start painting when collecting
;# a dot, and because it will take multiple frames to paint a box there may be
;# even more active at one time, so for safety use 16 as possible max.
;#
;# player #, xbyte, ytop, ybot
;NUM_BOX_PAINTING_PARAMS = 4
;box_painting = [0] * NUM_BOX_PAINTING_PARAMS * 16
;
;def init_boxes():
; zp.next_level_box = 0
init_boxes nop
lda #0
sta next_level_box
rts
;
;def start_box(r, c):
; zp.box_col_save = c
; zp.box_row_save = r
;
;def add_box(r):
; i = zp.next_level_box
; level_boxes[i] = zp.box_col_save
; level_boxes[i + 1] = zp.box_row_save
; level_boxes[i + 2] = r
; zp.box_row_save = r
; zp.next_level_box += NUM_LEVEL_BOX_PARAMS
;
;def finish_boxes():
; i = zp.next_level_box
; level_boxes[i] = 0xff
;
;def check_boxes():
; x = 0
; pad.addstr(28, 0, str(level_boxes[0:21]))
; while level_boxes[x] < 0xff:
; c = level_boxes[x]
; if c > 0:
; r1 = level_boxes[x + 1]
; addr = mazerow(r1)
; r1 += 1
; r1_save = r1
;
; # If there's a dot anywhere, then the box isn't painted. We don't
; # care where it is so we don't need to keep track of individual
; # locations.
; dot = addr[c]|addr[c + 1]|addr[c + 2]|addr[c + 3]|addr[c + 4]|addr[c + 5]|addr[c + BOX_WIDTH + 1]
;
; r2 = level_boxes[x + 2]
; addr = mazerow(r2)
; dot |= addr[c]|addr[c + 1]|addr[c + 2]|addr[c + 3]|addr[c + 4]|addr[c + 5]|addr[c + BOX_WIDTH + 1]
;
; while r1 < r2:
; addr = mazerow(r1)
; dot |= addr[c]|addr[c + BOX_WIDTH + 1]
; r1 += 1
;
; if (dot & TILE_DOT) == 0:
; # No dots anywhere! Start painting
; mark_box_for_painting(r1_save, r2, c + 1)
; num_rows = r2 - r1_save
; player_score[zp.current_actor] += num_rows * 100
; level_boxes[x] = 0 # Set flag so we don't check this box again
;
; x += 3
;
;def mark_box_for_painting(r1, r2, c):
; box_log.debug("Marking box, player $%d @ %d,%d -> %d,%d" % (zp.current_actor, r1, c, r2, c + BOX_WIDTH))
; x = 0
; while x < NUM_BOX_PAINTING_PARAMS * 16:
; if box_painting[x] == 0:
; box_painting[x] = c
; box_painting[x + 1] = r1
; box_painting[x + 2] = r2
; box_painting[x + 3] = zp.current_actor
; break
; x += NUM_BOX_PAINTING_PARAMS
; pad.addstr(27, 0, "starting box, player @ %d %d,%d -> %d,%d" % (zp.current_actor, r1, c, r2, c + BOX_WIDTH))

56
mazetiles.s Normal file
View File

@ -0,0 +1,56 @@
fatfont_maze
; curseschars = [
; curses.ACS_CKBOARD, # illegal
.byte 0,0,0,0,0,0,0,0
; curses.ACS_CKBOARD,
.byte 0,0,0,0,0,0,0,0
; curses.ACS_CKBOARD,
.byte 0,0,0,0,0,0,0,0
; curses.ACS_VLINE, # 3: up/down
.byte %00111000
.byte %00111000
.byte %00111000
.byte %00111000
.byte %00111000
.byte %00111000
.byte %00111000
.byte %00111000
; curses.ACS_CKBOARD,
.byte 0,0,0,0,0,0,0,0
; curses.ACS_ULCORNER, # 5: down/right
; curses.ACS_LLCORNER, # 6: up/right
; curses.ACS_LTEE, # 7: up/down/right
; curses.ACS_CKBOARD,
; curses.ACS_URCORNER, # 9: left/down
; curses.ACS_LRCORNER, # 10: left/up
; curses.ACS_RTEE, # 11: left/up/down
; curses.ACS_HLINE, # 12: left/right
; curses.ACS_TTEE, # 13: left/right/down
; curses.ACS_BTEE, # 14: left/right/up
; curses.ACS_CKBOARD,
;
; # And same again, with dots
; curses.ACS_CKBOARD, # illegal
; curses.ACS_CKBOARD,
; curses.ACS_CKBOARD,
; curses.ACS_VLINE, # 3: up/down
; curses.ACS_CKBOARD,
; curses.ACS_ULCORNER, # 5: down/right
; curses.ACS_LLCORNER, # 6: up/right
; curses.ACS_LTEE, # 7: up/down/right
; curses.ACS_CKBOARD,
; curses.ACS_URCORNER, # 9: left/down
; curses.ACS_LRCORNER, # 10: left/up
; curses.ACS_RTEE, # 11: left/up/down
; curses.ACS_HLINE, # 12: left/right
; curses.ACS_TTEE, # 13: left/right/down
; curses.ACS_BTEE, # 14: left/right/up
; curses.ACS_CKBOARD,
; ]
.byte %

2
rand.s
View File

@ -1,8 +1,6 @@
; defines
VPATH_NUM = 6
rand_test ldx #0
?1 jsr get_rand_byte
sta $2000,x

76
working.s
View File

@ -12,7 +12,70 @@ TXTPAGE2 = $c055
CLRHIRES = $c056
SETHIRES = $c057
; defines
; Zero page locations. Using the whole thing because we aren't using any
; ROM routines
*= $0006
; parameters: these should not be changed by child subroutines
param_x .ds 1
param_y .ds 1
param_col .ds 1
param_row .ds 1
param_index .ds 1
param_count .ds 1
*= $0010
; scratch areas: these may be modified by child subroutines
scratch_addr .ds 2
scratch_ptr .ds 2
scratch_0 .ds 1
scratch_1 .ds 1
scratch_index .ds 1
scratch_count .ds 1
scratch_col .ds 1
scratch_row .ds 1
*= $0020
; required variables for HiSprite
damageindex .ds 1
damageindex1 .ds 1
damageindex2 .ds 1
bgstore .ds 2
damage_w .ds 1
damage_h .ds 1
damageptr .ds 2
damageptr1 .ds 2
damageptr2 .ds 2
hgrhi .ds 1 ; either $20 or $40, the base of each hgr screen
hgrselect .ds 1 ; either $00 or $60, used as xor mask for HGRROWS_H1
*= $0030
; global variables for this program
rendercount .ds 1
drawpage .ds 1 ; pos = page1, neg = page2
tempaddr .ds 2
counter1 .ds 1
textptr .ds 2
hgrptr .ds 2
temprow .ds 1
tempcol .ds 1
*= $0040
mazeaddr .ds 2
next_level_box .ds 1
; constants
DAMAGEPAGE1 = $bf ; page number of damage list for screen 1
DAMAGEPAGE2 = $be ; "" for screen 2
MAXPOSX = 220
MAXPOSY = 192 - 16
*= $80
*= $6000
start nop
bit CLRTEXT ; start with HGR page 1, full screen
@ -21,7 +84,7 @@ start nop
bit SETHIRES
jsr clrscr
jsr init_screen_once
jsr init_game
jsr game_loop
@ -47,11 +110,16 @@ clr1
rts
init_game nop
jsr rand_test
jsr init_maze
jsr copytexthgr
rts
game_loop nop
jmp game_loop
.include "working-sprite-driver.s"
.include "rand.s"
.include "screen.s"
.include "maze.s"