Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-05-28 17:41:29 +00:00
Code Issues Projects Releases Wiki Activity

tfv: update the world map area

Browse Source 
all it needs is collision detection
This commit is contained in:
Vince Weaver 2017-07-30 21:31:28 -04:00
parent efda3b3d7d
commit 22f6ec2e2f
7 changed files with 138 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
gr-sim/backgrounds.h
View File

@ -26,27 +26,26 @@ static unsigned char title_rle[]=
static unsigned char worldmap_rle[]=
{ 0x28,0x28,
0x23,0x66,0x01,0x46,0x01,0x06,
0x05,0x66,0x01,0x56,0x0E,0x66,0x01,0xE6,0x04,0x66,0x01,0x77,0x01,0xFF,0x01,0xF6,0x08,0x66,0x01,0x46,0x03,0x44,
0x04,0x66,0x01,0x56,0x01,0x55,0x01,0x56,0x01,0xE6,0x0B,0x66,0x01,0x6E,0x01,0x66,0x01,0x6E,0x02,0x66,0x01,0x67,0x04,0x6F,0x07,0x66,0x01,0x4F,0x01,0x47,0x01,0x4F,0x01,0x44,0x03,0x66,
0x01,0x6E,0x06,0x66,0x06,0xA6,0x02,0x56,0x04,0xA6,0x01,0x56,0x01,0xA6,0x01,0x56,0x03,0xA6,0x01,0x56,0x02,0xA6,0x01,0x56,0x02,0xA6,0x01,0x56,0x02,0x66,0x01,0x64,0x03,0x44,0x01,0x46,
0x08,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x03,0x66,0x01,0xE6,0x03,0xE4,0x01,0xE6,
0x07,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,
0x0F,0x66,0x01,0xAA,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,
0x0A,0x66,0x01,0xE6,0x04,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,
0x09,0x66,0x01,0x6E,0x01,0x66,0x01,0x6E,0x03,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,
0x0C,0x66,0x01,0xE6,0x02,0x66,0x01,0xAA,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,
0x0B,0x66,0x01,0x6E,0x01,0x66,0x01,0x6E,0x01,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,
0x0F,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x02,0x66,0x01,0x55,0x01,0x56,0x02,0x66,0x01,0x55,
0x08,0x66,0x01,0xAA,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x02,0x66,0x01,0x55,0x01,0x66,0x01,0x65,0x01,0x56,0x01,0x55,
0x08,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x02,0x66,0x01,0x65,0x03,0x66,0x01,0x65,
0x02,0x66,0x01,0x6E,0x01,0xE6,0x01,0x6E,0x03,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x03,0x66,0x01,0x16,0x01,0x91,0x01,0x16,
0x04,0x66,0x01,0xEE,0x04,0x66,0x01,0xAA,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x03,0x66,0x01,0x69,0x01,0x99,0x01,0x69,
0x03,0x66,0x01,0x05,0x01,0x55,0x01,0x66,0x01,0x55,0x01,0x65,0x1C,0x66,0x01,0x86,0x01,0x96,0x01,0x99,0x01,0x96,0x01,0x86,
0x02,0x66,0x04,0x65,0x1F,0x66,0x01,0x99,
0x1B,0x66,0x01,0xE6,0x01,0x6E,0x01,0xE6,0x09,0x66,0x01,0x69,
0x2B,0x66,
0xff,0xff,};
0x23,0x66, 0x01,0x46, 0x01,0x06,
0x05,0x66, 0x01,0x56, 0x0E,0x66, 0x01,0xE6, 0x04,0x66, 0x01,0x77, 0x01,0xFF, 0x01,0xF6, 0x08,0x66, 0x01,0x46, 0x03,0x44, 0x03,0x66,
0x01,0xE6, 0x01,0x56, 0x01,0x55, 0x01,0x56, 0x01,0xE6, 0x0B,0x66, 0x01,0x6E, 0x01,0x66, 0x01,0x6E, 0x02,0x66, 0x01,0x67, 0x04,0x6F, 0x07,0x66, 0x01,0x4F, 0x01,0x47, 0x01,0x4F, 0x01,0x44,
0x0B,0x66, 0x17,0xD6, 0x03,0x66, 0x01,0x64, 0x03,0x44, 0x01,0x46,
0x08,0x66, 0x01,0xDD, 0x07,0xFF, 0x01,0x4F, 0x05,0xFF, 0x01,0x8F, 0x01,0x88, 0x01,0x8F, 0x01,0xFF, 0x01,0x7F, 0x01,0x77, 0x01,0x07, 0x01,0x77, 0x01,0x07, 0x01,0x77, 0x01,0xDD, 0x03,0x66, 0x01,0xE6, 0x03,0xE4, 0x01,0xE6,
0x07,0x66, 0x01,0xDD, 0x06,0xFF, 0x01,0xF4, 0x01,0x84, 0x01,0xF4, 0x04,0xFF, 0x01,0x8F, 0x03,0xFF, 0x01,0x7F, 0x01,0x77, 0x03,0x75, 0x01,0x77, 0x01,0xDD,
0x0F,0x66, 0x01,0xDD, 0x0C,0xCF, 0x03,0xC8, 0x03,0xCF, 0x05,0xC7, 0x01,0xDD,
0x0A,0x66, 0x01,0xE6, 0x04,0x66, 0x01,0xDD, 0x02,0xCC, 0x01,0x4C, 0x03,0xCC, 0x01,0x77, 0x06,0xCC, 0x01,0x8C, 0x01,0x88, 0x01,0x8C, 0x01,0xCC, 0x01,0x4C, 0x05,0x44, 0x01,0xDD,
0x09,0x66, 0x01,0x6E, 0x01,0x66, 0x01,0x6E, 0x03,0x66, 0x01,0xDD, 0x01,0xCC, 0x01,0x4C, 0x01,0x44, 0x01,0x4C, 0x01,0xCC, 0x01,0x22, 0x03,0xFF, 0x01,0x22, 0x03,0xCC, 0x01,0x8C, 0x03,0xCC, 0x01,0xC4, 0x05,0x44, 0x01,0xDD,
0x0C,0x66, 0x01,0xE6, 0x02,0x66, 0x01,0xDD, 0x02,0xCC, 0x01,0xC8, 0x02,0xCC, 0x01,0xC2, 0x02,0xC7, 0x01,0xCF, 0x02,0xC2, 0x01,0xCC, 0x03,0xC8, 0x03,0xCC, 0x01,0xC8, 0x01,0xCC, 0x01,0xC8, 0x01,0xCC, 0x01,0xC8, 0x01,0xDD,
0x0B,0x66, 0x01,0x6E, 0x01,0x66, 0x01,0x6E, 0x01,0x66, 0x01,0xDD, 0x01,0x4C, 0x01,0x84, 0x01,0xC4, 0x0A,0xCC, 0x01,0x8C, 0x01,0x88, 0x01,0x8C, 0x01,0xCC, 0x01,0x4C, 0x05,0x44, 0x01,0xDD,
0x0F,0x66, 0x01,0xDD, 0x01,0xC4, 0x01,0xCC, 0x01,0x88, 0x0A,0xCC, 0x01,0x8C, 0x03,0xCC, 0x06,0x44, 0x01,0xDD, 0x02,0x66, 0x01,0x55, 0x01,0x56, 0x02,0x66, 0x01,0x55,
0x08,0x66, 0x01,0xDD, 0x0B,0xCC, 0x01,0x1C, 0x03,0xC8, 0x01,0x1C, 0x02,0xCC, 0x01,0x84, 0x01,0xC4, 0x01,0x84, 0x01,0xC4, 0x01,0x84, 0x01,0xDD, 0x02,0x66, 0x01,0x55, 0x01,0x66, 0x01,0x65, 0x01,0x56, 0x01,0x55,
0x08,0x66, 0x01,0xDD, 0x03,0xCC, 0x02,0x4C, 0x06,0xCC, 0x01,0x11, 0x01,0xC1, 0x01,0x1C, 0x01,0xC1, 0x01,0x11, 0x07,0xCC, 0x01,0xDD, 0x02,0x66, 0x01,0x65, 0x03,0x66, 0x01,0x65,
0x02,0x66, 0x01,0x6E, 0x01,0xE6, 0x01,0x6E, 0x03,0x66, 0x01,0xDD, 0x02,0xCC, 0x01,0x44, 0x01,0xC8, 0x01,0x8C, 0x06,0xCC, 0x01,0xC1, 0x03,0xCC, 0x01,0xC1, 0x07,0xCC, 0x01,0xDD, 0x03,0x66, 0x01,0x16, 0x01,0x91, 0x01,0x16,
0x04,0x66, 0x01,0xEE, 0x04,0x66, 0x01,0x6D, 0x04,0xDC, 0x01,0xD8, 0x07,0xDC, 0x01,0x8C, 0x01,0x88, 0x01,0x8E, 0x01,0xEE, 0x07,0xDC, 0x01,0x6D, 0x03,0x66, 0x01,0x69, 0x01,0x99, 0x01,0x69,
0x03,0x66, 0x01,0x05, 0x01,0x55, 0x01,0x66, 0x01,0x55, 0x01,0x65, 0x1C,0x66, 0x01,0x86, 0x01,0x96, 0x01,0x99, 0x01,0x96, 0x01,0x86,
0x02,0x66, 0x04,0x65, 0x1F,0x66, 0x01,0x99,
0x1B,0x66, 0x01,0xE6, 0x01,0x6E, 0x01,0xE6, 0x09,0x66, 0x01,0x69,
0x2B,0x66, 0xFF,0xFF,};
static unsigned char landing_rle[]=
{ 0x28,0x28,
@ -65,3 +64,51 @@ static unsigned char landing_rle[]=
0x11,0xCC, 0x01,0xC8, 0x09,0xCC, 0x04,0x85, 0x04,0xCC, 0x01,0xC8,
0x1E,0xCC, 0x06,0x85,
0xFE,0xCC, 0x06,0xCC, 0xFF,0xFF,};
static unsigned char collegep_rle[]=
{ 0x28,0x28,
0x21,0x66, 0x02,0xF6,
0x08,0x66, 0x02,0xF6, 0x03,0xFF, 0x01,0xF6, 0x15,0x66, 0x01,0xF6, 0x05,0xFF, 0x01,0xF6,
0x06,0x66, 0x01,0x6F, 0x01,0x5F, 0x01,0xFF, 0x01,0xF5, 0x03,0xFF, 0x05,0x66, 0x01,0x76, 0x04,0xA6, 0x01,0x76, 0x04,0xA6, 0x01,0x76, 0x03,0x66, 0x02,0x5F, 0x03,0xFF, 0x02,0x5F, 0x01,0x6F,
0x08,0x66, 0x04,0x65, 0x05,0x66, 0x03,0x17, 0x02,0x1A, 0x01,0x17, 0x01,0xF7, 0x01,0x17, 0x02,0x1A, 0x03,0x17, 0x03,0x66, 0x02,0x65, 0x02,0x6F,
0x14,0x66, 0x01,0x1F, 0x01,0xFF, 0x01,0x1F, 0x01,0x4F, 0x01,0x1F, 0x01,0xFF, 0x01,0x1F, 0x01,0xFF, 0x01,0x1F, 0x01,0x4F, 0x01,0x1F, 0x01,0xFF, 0x01,0x1F, 0x0D,0x66,
0x0E,0xCC, 0x01,0x11, 0x01,0xFF, 0x01,0x11, 0x01,0x84, 0x01,0x11, 0x01,0xFF, 0x01,0x00, 0x01,0xFF, 0x01,0x11, 0x01,0x84, 0x01,0x11, 0x01,0xFF, 0x01,0x11,
0x1B,0xCC, 0x01,0xC7, 0x01,0xCF, 0x01,0xC7, 0x01,0xC8, 0x01,0xC7, 0x01,0xCF, 0x01,0xC0, 0x01,0xCF, 0x01,0xC7, 0x01,0xC8, 0x01,0xC7, 0x01,0xCF, 0x01,0xC7,
0x1E,0xCC, 0x01,0x5C, 0x02,0x15, 0x01,0x55, 0x02,0x15, 0x01,0x5C,
0x21,0xCC, 0x01,0x55, 0x01,0x11, 0x01,0x55, 0x01,0x51, 0x01,0x55, 0x01,0x11, 0x01,0x55,
0x21,0xCC, 0x01,0xC5, 0x01,0x51, 0x03,0x55, 0x01,0x51, 0x01,0xC5, 0x05,0xCC, 0x01,0x5C, 0x0A,0x88,
0x0B,0xCC, 0x01,0xFC, 0x01,0xFF, 0x01,0x5C, 0x01,0xCC, 0x01,0xDC, 0x08,0x8C, 0x05,0xCC, 0x01,0x88, 0x01,0x77, 0x01,0x7E, 0x08,0xEE,
0x0A,0xCC, 0x01,0x8F, 0x02,0xFF, 0x01,0x85, 0x01,0xED, 0x09,0xEE, 0x02,0xE8, 0x01,0xDC, 0x02,0xCC, 0x01,0x88, 0x02,0x77, 0x01,0x85, 0x01,0x58, 0x01,0x98, 0x05,0x88,
0x09,0xCC, 0x01,0x9C, 0x02,0x88, 0x01,0x48, 0x01,0x58, 0x01,0x88, 0x01,0x8E, 0x0A,0xEE, 0x01,0xED, 0x01,0xDC, 0x01,0xCC, 0x01,0x88, 0x02,0x77, 0x01,0x88, 0x01,0x85, 0x03,0x58, 0x01,0x55, 0x02,0x58,
0x08,0xCC, 0x01,0x8C, 0x01,0x98, 0x03,0x88, 0x01,0x48, 0x01,0x88, 0x01,0xA8, 0x01,0x8E, 0x0A,0xEE, 0x01,0xDD, 0x01,0xCC, 0x01,0xC8, 0x02,0x77, 0x02,0x88, 0x01,0x55, 0x02,0x88, 0x01,0x85, 0x02,0x88,
0x07,0xCC, 0x01,0x8C, 0x01,0x89, 0x02,0x88, 0x01,0x89, 0x04,0x88, 0x01,0x85, 0x01,0x88, 0x0B,0xEE, 0x03,0xC7, 0x01,0xC8, 0x01,0x88, 0x01,0x55, 0x03,0x88, 0x02,0x48,
0x06,0xCC, 0x01,0x8C, 0x01,0x89, 0x01,0x98, 0x01,0x88, 0x01,0x98, 0x01,0x88, 0x01,0x84, 0x03,0x88, 0x01,0x85, 0x01,0x88, 0x01,0xA8, 0x06,0xEE, 0x01,0xDE, 0x01,0xCE, 0x07,0xCC, 0x01,0x55, 0x01,0x48, 0x02,0x44, 0x01,0x49, 0x01,0x44,
0x08,0xCC, 0x05,0xC8, 0x06,0x88, 0x05,0xEE, 0x01,0xDD, 0x01,0xCD, 0x07,0xCC, 0x01,0x4C, 0x02,0x44, 0x01,0x49, 0x03,0x44,
0x11,0xDD, 0x01,0xED, 0x05,0xEE, 0x11,0xDD,
0x10,0x77, 0x01,0xE7, 0x05,0xEE, 0x12,0x77,
0x28,0x22, 0xFF,0xFF,};
static unsigned char harfco_rle[]=
{ 0x28,0x28,
0x05,0x00, 0x1D,0xAA, 0x01,0x77,
0x09,0x00, 0x01,0xF0, 0x01,0x00, 0x1B,0xAA, 0x01,0x77, 0x03,0x00, 0x01,0xF0,
0x03,0x00, 0x01,0xF0, 0x17,0x00, 0x01,0xF0,
0x15,0x00, 0x01,0x0F, 0x19,0x00, 0x01,0xF0,
0x16,0x00, 0x01,0x0F, 0x17,0x00,
0x28,0x22,
0x27,0x77, 0x01,0x22,
0x27,0x77, 0x01,0x22,
0x27,0x77, 0x01,0x22,
0x11,0x77, 0x01,0x07, 0x01,0x77, 0x05,0x07, 0x01,0x77, 0x01,0x00, 0x01,0x77, 0x01,0x07, 0x0B,0x77, 0x01,0x22,
0x0C,0x77, 0x01,0x57, 0x01,0x00, 0x01,0x57, 0x01,0x00, 0x01,0x57, 0x01,0x00, 0x01,0x57, 0x05,0x00, 0x01,0x57, 0x01,0x00, 0x01,0x57, 0x01,0x00, 0x01,0x57, 0x0A,0x77, 0x01,0x22,
0x0B,0x77, 0x01,0x75, 0x01,0x55, 0x01,0x50, 0x03,0x55, 0x01,0x50, 0x09,0x55, 0x01,0x50, 0x01,0x55, 0x01,0x75, 0x09,0x77, 0x01,0x22,
0x27,0x77, 0x01,0x22,
0x27,0x77, 0x01,0x22,
0x27,0x77, 0x01,0x22,
0x27,0x77, 0x01,0x22,
0x27,0x77, 0x01,0x22,
0x27,0x77, 0x01,0x22,
0x27,0x77, 0x01,0x22,
0x27,0x77, 0x01,0x22, 0xFF,0xFF,};

62
gr-sim/tfv.c
View File

@ -787,17 +787,25 @@ static int load_map_bg(void) {
int i,temp,ground_color;
int start,end;
if (map_x==3) {
grsim_unrle(harfco_rle,0x800);
return 0;
}
if (map_x==5) {
grsim_unrle(landing_rle,0x800);
return 0;
}
if (map_x==14) {
grsim_unrle(collegep_rle,0x800);
return 0;
}
/* Should we make a thick-hlin? twice as fast? */
/* Sky */
color_equals(COLOR_MEDIUMBLUE);
for(i=0;i<10;i++) {
hlin(1,0,40,i);
for(i=0;i<10;i+=2) {
hlin_double(1,0,40,i);
}
if (map_x<4) ground_color=COLOR_WHITE;
@ -889,6 +897,7 @@ static int world_map(void) {
int ch;
int direction=1;
int i,limit;
/************************************************/
/* Landed */
@ -994,6 +1003,14 @@ static int world_map(void) {
if (map_x==8) if (tfv_y>=22) grsim_put_sprite(0,palm_tree,10,20);
if (map_x==12) if (tfv_y>=22) grsim_put_sprite(0,palm_tree,20,20);
if ((map_x==7) || (map_x==11)) {
for(i=10;i<tfv_y+8;i+=2) {
limit=22+(i/4);
color_equals(COLOR_DARKGREEN);
hlin_double(0,0,limit,i);
}
}
if (direction==-1) {
if (odd) grsim_put_sprite(0,tfv_walk_left,tfv_x,tfv_y);
else grsim_put_sprite(0,tfv_stand_left,tfv_x,tfv_y);
@ -1008,6 +1025,45 @@ static int world_map(void) {
if (map_x==8) if (tfv_y<22) grsim_put_sprite(0,palm_tree,10,20);
if (map_x==12) if (tfv_y<22) grsim_put_sprite(0,palm_tree,20,20);
if ((map_x==7) || (map_x==11)) {
for(i=tfv_y+8;i<36;i+=2) {
limit=22+(i/4);
color_equals(COLOR_DARKGREEN);
hlin_double(0,0,limit,i);
}
color_equals(COLOR_BROWN);
hlin_double(0,0,1,39);
for(i=0;i<13;i++) {
color_equals(COLOR_GREY);
hlin_double_continue(1);
color_equals(COLOR_BROWN);
hlin_double_continue(1);
}
color_equals(COLOR_BROWN);
hlin_double(0,0,1,37);
for(i=0;i<13;i++) {
color_equals(COLOR_GREY);
hlin_double_continue(1);
color_equals(COLOR_BROWN);
hlin_double_continue(1);
}
}
if (map_x==3) {
if ((steps&0xf)==0) {
grsim_put_sprite(0,lightning,25,4);
/* Hurt hit points if in range? */
if ((tfv_x>25) && (tfv_x<30) && (tfv_y<12)) {
printf("HIT! %d %d\n\n",steps,hp);
hp=hp-10;
if (hp<1) hp=1;
steps++;
}
}
}
grsim_update();
if (steps>=60) {

11
gr-sim/tfv_sprites.h
View File

@ -151,3 +151,14 @@ static unsigned char mountain[]={
0xD0,0x89,0x98,0x88,0x98,0x88,0x84,0x88,0x88,0x88,0x85,0x88,0x55,
0x00,0x00,0x08,0x08,0x08,0x08,0x08,0x88,0x88,0x88,0x08,0x00,0x00,
};
/* Lightning, @25,4 */
static unsigned char lightning[]={
0x06,0x05,
0x00,0x00,0xdd,0x00,0x00,0x00,
0x00,0x00,0x00,0xdd,0x00,0x00,
0x00,0x00,0xdd,0x00,0xdd,0x00,
0x00,0xdd,0x00,0x00,0xdd,0x00,
0xdd,0x00,0x00,0x0d,0x00,0xdd,
};

BIN
tfv/collegep.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 536 B

After

Width:  |  Height:  |  Size: 515 B

BIN
tfv/harfco.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 316 B

BIN
tfv/map.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 649 B

After

Width:  |  Height:  |  Size: 521 B

BIN
tfv/umcp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 536 B