mirror of
https://github.com/deater/dos33fsprogs.git
synced 2024-09-10 23:54:33 +00:00
tfv: add some more artwork
AP calculus done, only one more room left
This commit is contained in:
parent
00c9c49edc
commit
aa842cb238
@ -9,6 +9,7 @@ Soon:
|
|||||||
--> Sound effects
|
--> Sound effects
|
||||||
--> enemy uses magic
|
--> enemy uses magic
|
||||||
--> green background on anti-damage printing
|
--> green background on anti-damage printing
|
||||||
|
--> pick up vortex cannon from someone
|
||||||
|
|
||||||
+ Enable getting back on spaceship (with better animation)
|
+ Enable getting back on spaceship (with better animation)
|
||||||
+ Better collision detection on Spaceship land
|
+ Better collision detection on Spaceship land
|
||||||
|
@ -708,31 +708,58 @@ unsigned char homeroom_rle[]={
|
|||||||
0x77,0xA4,0x88,0xA0,0x1F,0x00,0x08,0xA3,0x88,0x77,0xA3,0x88,0xA1, };
|
0x77,0xA4,0x88,0xA0,0x1F,0x00,0x08,0xA3,0x88,0x77,0xA3,0x88,0xA1, };
|
||||||
unsigned char ap_calculus_rle[]={
|
unsigned char ap_calculus_rle[]={
|
||||||
0x28, /* ysize=40 */
|
0x28, /* ysize=40 */
|
||||||
0xA0,0x19,0x00,0x44,0x44,0xF4,0xF4,0xA3,0x44,0xF4,0xA7,0x44,0xA0,0x19,0x00,
|
0x00,0x00,0x77,0x55,0xA3,0xFF,0x77,0x55,0xA8,0x00,
|
||||||
0x44,0x44,0xFF,0xA4,0x44,0xF4,0x4F,0xA3,0x44,0xF4,
|
0x02,0x22,0x02,0x00,0x22,0x02,0x00,
|
||||||
0x44,0x44,0xA4,0x00,0xA5,0x80,0xA0,0x10,0x00,0x44,0x44,0xFF,0x44,
|
0x20,0x02,0x20,0x00,0x22,0x20,0x00,
|
||||||
0xF4,0x44,0xF4,0x4F,0x4F,0x44,0xF4,0xF4,0xFF,
|
0x20,0x22,0xA8,0x00,0x44,0x77,0xFF,0x0F,
|
||||||
0x44,0xF4,0xA4,0x00,0x08,0xA0,0x14,0x00,0x44,0x44,0xFF,
|
0xF0,0xFF,0xD7,0x55,0x00,0x00,0xA6,0x88,0x00,
|
||||||
0x44,0xF4,0x4F,0xF4,0xA3,0x44,0xFF,0xF4,
|
0x22,0x00,0x00,0x22,0x02,0x00,0x22,0x02,
|
||||||
0xFF,0x44,0xF4,0xA0,0x19,0x00,0x44,0x4F,0x4F,0xAC,0x44,
|
0x22,0x00,0x22,0x00,0x02,0x00,0x22,
|
||||||
0xA0,0x14,0x00,0xB8,0x88,0x00,0x00,0x0A,0xAF,0x07,0xA0,0x13,0x00,
|
0xA7,0x00,0x44,0x44,0x77,0xFF,0xFF,0x0F,0xFF,0xDD,
|
||||||
0x0B,0xBB,0x88,0xA4,0x00,0xB8,0x88,0xAE,0x00,
|
0x55,0x00,0x00,0x88,0xA4,0x77,0x88,0x00,0x02,
|
||||||
0x88,0xB8,0xA0,0x10,0x00,0x2B,0xA4,0x00,0x0B,0xBB,
|
0x00,0x00,0x02,0x02,0x00,0x02,0x00,0x02,0x00,
|
||||||
0x88,0xAE,0x00,0x88,0xBB,0x0B,0xA6,0x00,0xA3,0xF0,
|
0x02,0xA3,0x00,0x02,0xA7,0x00,0x44,0x44,0x77,0xFF,
|
||||||
0xA5,0x00,0x44,0x22,0xA5,0x00,0xFF,0x08,0x80,
|
0xF0,0xFF,0xFF,0xDD,0xD5,0x00,0x00,0x88,0xA4,0x77,
|
||||||
0xAD,0x00,0x88,0xF0,0xA7,0x00,0x70,0x10,0xA5,0x70,
|
0x88,0xA3,0x10,0x00,0x00,0x10,0x00,0x44,0x44,0xF4,0xF4,
|
||||||
0x11,0x74,0x72,0xA3,0x70,0x11,0x7F,0x7F,0xA6,0x70,
|
0xA3,0x44,0xF4,0xAA,0x44,0x77,0x88,0xFF,0xDF,0xDF,
|
||||||
0xA9,0x00,0x77,0x7F,0xB0,0xA4,0x00,0x70,0x77,0x77,
|
0xDD,0xDD,0x00,0x00,0x88,0xA4,0x77,0x88,0x00,0x11,
|
||||||
0x71,0xA5,0x77,0x71,0xA5,0x77,0x71,0xA6,0x77,0x57,
|
0x00,0x00,0x01,0x11,0x00,0x44,0x44,0xFF,0xA4,0x44,
|
||||||
0x55,0xA9,0x00,0x4F,0x4F,0xA4,0x00,0xA0,0x16,0x57,0x55,0x05,
|
0xF4,0x4F,0xA3,0x44,0xF4,0xA5,0x44,0x77,0x88,
|
||||||
0x55,0xA8,0x00,0x04,0xB4,0x04,0x04,0xA3,0x00,0x55,
|
0xDF,0xA4,0xDD,0xD0,0x00,0x88,0xA4,0x77,0x88,
|
||||||
0x05,0x05,0x55,0x05,0xB5,0xA4,0x05,0xD5,0xA5,0x05,
|
0x10,0x11,0x10,0x00,0x10,0x11,0x10,
|
||||||
0xB5,0xA4,0x05,0x55,0x00,0x00,0x55,0xA9,0x00,0x8F,
|
0x44,0x44,0xFF,0x44,0xF4,0x44,0xF4,0x4F,0x4F,
|
||||||
0x80,0xA4,0x00,0x55,0x00,0x00,0x55,0x00,0x08,0x08,
|
0x44,0xF4,0xF4,0xFF,0x44,0xF4,0xA3,0x44,0x77,
|
||||||
0x00,0x00,0x08,0x08,0xA4,0x00,0x08,0x08,0xA4,0x00,0x55,0x00,0x00,
|
0x88,0x7D,0xA5,0xDD,0x00,0xA4,0x88,0x68,0x88,
|
||||||
0x55,0xAF,0x00,0x55,0x00,0x00,0x55,0xA0,0x11,0x00,0x55,
|
0xA7,0x00,0x44,0x44,0xFF,0x44,0xF4,0x4F,0xF4,
|
||||||
0x00,0x00,0x55,0xAF,0x00,0x55,0xA0,0x14,0x00,0x55,0xA0,0x12,0x00,
|
0xA3,0x44,0xFF,0xF4,0xFF,0x44,0xF4,0x4F,
|
||||||
0x05,0xA0,0x14,0x00,0x05,0xA0,0x82,0x00,0xA1, };
|
0x44,0x44,0x77,0x88,0x47,0x44,0x0D,0x0D,0xA3,0xDD,
|
||||||
|
0x28,0xA3,0x88,0x86,0x88,0xA7,0x00,0x44,0x4F,0x4F,
|
||||||
|
0xAF,0x44,0x47,0xFB,0x44,0xA3,0x00,0x55,0x00,
|
||||||
|
0x0D,0x82,0x72,0xA4,0x88,0xA3,0x00,0x80,0x80,0x00,
|
||||||
|
0x0A,0xA4,0x07,0x87,0x87,0xA5,0x07,0xD7,0xD7,0xA3,0x07,0x44,0x44,
|
||||||
|
0xB4,0xBF,0xA4,0x00,0x55,0x00,0x00,0x88,0x77,
|
||||||
|
0xA4,0x88,0x00,0x00,0xB0,0xBB,0x88,0xA5,0x00,0xB0,
|
||||||
|
0xBB,0x88,0xA4,0x00,0xB0,0xBB,0xDD,0xA3,0x00,
|
||||||
|
0x44,0x44,0x5B,0xBB,0xB0,0xA3,0x00,0x55,0x00,
|
||||||
|
0x20,0x28,0x27,0xA4,0x88,0xA3,0x00,0x1B,0x08,
|
||||||
|
0xA6,0x00,0xDB,0x88,0xA5,0x00,0xFB,0xDD,0xA3,0x00,
|
||||||
|
0x44,0x44,0xB5,0x0B,0xA4,0x00,0x5A,0x05,0xA3,0x42,
|
||||||
|
0xA4,0x08,0x75,0x7B,0x71,0x11,0x95,0xA3,0x05,
|
||||||
|
0x75,0x7B,0x7D,0xDD,0x98,0x05,0x05,0x75,
|
||||||
|
0x7B,0x7F,0xFF,0xDD,0xA3,0x05,0x44,0xF0,
|
||||||
|
0xFF,0xA4,0x00,0x5A,0x00,0x00,0x55,0x00,0x55,
|
||||||
|
0xA7,0x00,0x11,0x99,0xA6,0x00,0xDD,0x99,0xA5,0x00,
|
||||||
|
0xFF,0x99,0xA4,0x00,0xBF,0xFF,0xF0,0x00,0x00,
|
||||||
|
0x5A,0xA3,0x00,0x55,0x00,0x55,0xA5,0x00,0xA3,0x44,
|
||||||
|
0x99,0xA4,0x00,0xA3,0x88,0x99,0xA3,0x00,0xA3,0x88,0x99,
|
||||||
|
0xA5,0x00,0x9F,0x9F,0x00,0x5A,0xA4,0x00,0x05,0x00,
|
||||||
|
0x05,0xA5,0x00,0x44,0x79,0x09,0x79,0xA4,0x00,
|
||||||
|
0xBB,0x79,0x09,0x79,0xA3,0x00,0xBB,0x79,
|
||||||
|
0x09,0x79,0xA5,0x00,0x99,0x09,0x55,0xAC,0x00,
|
||||||
|
0x80,0x84,0x77,0x00,0x77,0xA3,0x00,0x80,
|
||||||
|
0x8F,0x77,0x00,0x77,0x00,0x00,0x80,0x8F,
|
||||||
|
0x77,0x00,0x77,0xA5,0x00,0x99,0x55,0xA0,0x26,0x00,
|
||||||
|
0x89,0x80,0xA0,0x25,0x00,0x5A,0xA0,0x26,0x00,0x5A,0xA0,0x27,0x00,0xA1, };
|
||||||
unsigned char patriot_room_rle[]={
|
unsigned char patriot_room_rle[]={
|
||||||
0x28, /* ysize=40 */
|
0x28, /* ysize=40 */
|
||||||
0xA0,0x30,0x88,0xDD,0x8D,0xD8,0x88,0xD8,0x8D,
|
0xA0,0x30,0x88,0xDD,0x8D,0xD8,0x88,0xD8,0x8D,
|
||||||
|
@ -73,6 +73,7 @@ struct location_type {
|
|||||||
#define SCATTER_PALM 0x04
|
#define SCATTER_PALM 0x04
|
||||||
#define SCATTER_CACTUS 0x08
|
#define SCATTER_CACTUS 0x08
|
||||||
#define SCATTER_SPOOL 0x10
|
#define SCATTER_SPOOL 0x10
|
||||||
|
#define SCATTER_JEN_LIZ 0x20
|
||||||
|
|
||||||
#define ENTRY_NORMAL 0x00
|
#define ENTRY_NORMAL 0x00
|
||||||
#define ENTRY_EXPLICIT 0x01
|
#define ENTRY_EXPLICIT 0x01
|
||||||
|
@ -49,6 +49,14 @@
|
|||||||
#define DIALOG_STEVE2 33
|
#define DIALOG_STEVE2 33
|
||||||
#define DIALOG_GRABOWSKI 34
|
#define DIALOG_GRABOWSKI 34
|
||||||
|
|
||||||
|
#define DIALOG_LIZBETH 35
|
||||||
|
#define DIALOG_BLUME 36
|
||||||
|
|
||||||
|
#define DIALOG_APPLEBY 37
|
||||||
|
#define DIALOG_PADRINO 38
|
||||||
|
#define DIALOG_JENNI 39
|
||||||
|
#define DIALOG_KATHY 40
|
||||||
|
|
||||||
struct dialog_words {
|
struct dialog_words {
|
||||||
char *words;
|
char *words;
|
||||||
int next;
|
int next;
|
||||||
@ -187,26 +195,44 @@ struct dialog_type dialog[100]={
|
|||||||
.statement[0].words="557-0868 Utopia BBS is really great!",
|
.statement[0].words="557-0868 Utopia BBS is really great!",
|
||||||
.statement[0].next=0,
|
.statement[0].next=0,
|
||||||
},
|
},
|
||||||
#if 0
|
// AP-CALCULUS
|
||||||
AP CALCULUS, TEAM I-1
|
[DIALOG_APPLEBY]= {
|
||||||
PADRINO
|
.statement[0].words="ROAR!",
|
||||||
I MET SOMEONE AT THE DOG SHOW
|
.statement[0].next=0,
|
||||||
SHE WAS HOLDING MY LEFT ARM
|
},
|
||||||
JENNI
|
[DIALOG_PADRINO]= {
|
||||||
NEED TO GO TO ART ROOM
|
.statement[0].words="I MET SOMEONE AT THE DOG SHOW",
|
||||||
JEN JENNY JENNO AND JENN WAITING
|
.statement[0].next=0,
|
||||||
MR. APPLEBY ROAR
|
.statement[1].words="SHE WAS HOLDING MY LEFT ARM",
|
||||||
KATHY
|
.statement[1].next=0,
|
||||||
LOW D-HIGH LESS HIGH D-LOW
|
},
|
||||||
DRAW A LINE AND DOWN BELOW
|
[DIALOG_JENNI]= {
|
||||||
DENOMINATOR SQUARED MUST GO
|
.statement[0].words="Need to go to art room",
|
||||||
LIZBETH
|
.statement[0].next=0,
|
||||||
BLUME
|
.statement[1].words="Jen, Jenny, Jenno and Jenn waiting",
|
||||||
VINCE CON PATILLAS
|
.statement[1].next=0,
|
||||||
#endif
|
|
||||||
|
},
|
||||||
|
[DIALOG_KATHY]= {
|
||||||
|
.statement[0].words="LOW D-HIGH LESS HIGH D-LOW",
|
||||||
|
.statement[0].next=0,
|
||||||
|
.statement[1].words="DRAW A LINE AND DOWN BELOW",
|
||||||
|
.statement[1].next=0,
|
||||||
|
.statement[2].words="DENOMINATOR SQUARED MUST GO",
|
||||||
|
.statement[2].next=0,
|
||||||
|
},
|
||||||
|
// HALLWAY
|
||||||
|
[DIALOG_LIZBETH]={
|
||||||
|
.statement[0].words="...",
|
||||||
|
.statement[0].next=0,
|
||||||
|
},
|
||||||
|
[DIALOG_BLUME]={
|
||||||
|
.statement[0].words="Deater con patillas",
|
||||||
|
.statement[0].next=0,
|
||||||
|
},
|
||||||
//DEUTSCH
|
//DEUTSCH
|
||||||
[DIALOG_NIRE]= {
|
[DIALOG_NIRE]= {
|
||||||
.statement[0].words="Vince, what are you doing!",
|
.statement[0].words="What are you doing?",
|
||||||
.statement[0].next=0,
|
.statement[0].next=0,
|
||||||
// Sue you?
|
// Sue you?
|
||||||
},
|
},
|
||||||
|
@ -563,10 +563,11 @@ struct map_info_type map_info[34] = {
|
|||||||
.e_exit=NOEXIT,
|
.e_exit=NOEXIT,
|
||||||
.w_exit=JOHN_CARROLL,
|
.w_exit=JOHN_CARROLL,
|
||||||
.miny=4,
|
.miny=4,
|
||||||
.scatter=SCATTER_NONE,
|
.scatter=SCATTER_JEN_LIZ,
|
||||||
|
.scatter_x=8, .scatter_y=18, .scatter_cutoff=22,
|
||||||
.entry_type=ENTRY_CENTER, .entry_x=0, .entry_y=0,
|
.entry_type=ENTRY_CENTER, .entry_x=0, .entry_y=0,
|
||||||
.background_image=jc_hallway_rle,
|
.background_image=jc_hallway_rle,
|
||||||
.num_locations=3,
|
.num_locations=5,
|
||||||
.location[0] = {
|
.location[0] = {
|
||||||
.name="Video Homeroom",
|
.name="Video Homeroom",
|
||||||
.x0 = 2, .x1 = 9,
|
.x0 = 2, .x1 = 9,
|
||||||
@ -588,6 +589,20 @@ struct map_info_type map_info[34] = {
|
|||||||
.destination=DEUTSCH,
|
.destination=DEUTSCH,
|
||||||
.type=LOCATION_PLACE,
|
.type=LOCATION_PLACE,
|
||||||
},
|
},
|
||||||
|
.location[3] = {
|
||||||
|
.name="Blume",
|
||||||
|
.x0 = 4, .x1 = 10,
|
||||||
|
.y0 = 23, .y1 = 35,
|
||||||
|
.destination=DIALOG_BLUME,
|
||||||
|
.type=LOCATION_CONVERSATION,
|
||||||
|
},
|
||||||
|
.location[4] = {
|
||||||
|
.name="Lizbeth",
|
||||||
|
.x0 = 12, .x1 = 16,
|
||||||
|
.y0 = 23, .y1 = 35,
|
||||||
|
.destination=DIALOG_LIZBETH,
|
||||||
|
.type=LOCATION_CONVERSATION,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
[JC_DOWNSTAIRS]={ // 25: JC_DOWNSTAIRS
|
[JC_DOWNSTAIRS]={ // 25: JC_DOWNSTAIRS
|
||||||
.name="JC Downstairs",
|
.name="JC Downstairs",
|
||||||
@ -748,6 +763,35 @@ struct map_info_type map_info[34] = {
|
|||||||
.scatter=SCATTER_NONE,
|
.scatter=SCATTER_NONE,
|
||||||
.entry_type=ENTRY_CENTER, .entry_x=0, .entry_y=0,
|
.entry_type=ENTRY_CENTER, .entry_x=0, .entry_y=0,
|
||||||
.background_image=ap_calculus_rle,
|
.background_image=ap_calculus_rle,
|
||||||
|
.num_locations=4,
|
||||||
|
.location[0] = {
|
||||||
|
.name="Appleby",
|
||||||
|
.x0 = 0, .x1 = 6,
|
||||||
|
.y0 = 30, .y1 = 36,
|
||||||
|
.destination=DIALOG_APPLEBY,
|
||||||
|
.type=LOCATION_CONVERSATION,
|
||||||
|
},
|
||||||
|
.location[1] = {
|
||||||
|
.name="Padrino",
|
||||||
|
.x0 = 15, .x1 = 22,
|
||||||
|
.y0 = 30, .y1 = 36,
|
||||||
|
.destination=DIALOG_PADRINO,
|
||||||
|
.type=LOCATION_CONVERSATION,
|
||||||
|
},
|
||||||
|
.location[2] = {
|
||||||
|
.name="Jenni",
|
||||||
|
.x0 = 31, .x1 = 37,
|
||||||
|
.y0 = 31, .y1 = 36,
|
||||||
|
.destination=DIALOG_JENNI,
|
||||||
|
.type=LOCATION_CONVERSATION,
|
||||||
|
},
|
||||||
|
.location[3] = {
|
||||||
|
.name="Kathy",
|
||||||
|
.x0 = 24, .x1 = 29,
|
||||||
|
.y0 = 30, .y1 = 36,
|
||||||
|
.destination=DIALOG_KATHY,
|
||||||
|
.type=LOCATION_CONVERSATION,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
[MATH_OFFICE]={ // 31: MATH_OFFICE
|
[MATH_OFFICE]={ // 31: MATH_OFFICE
|
||||||
.name="Math Office",
|
.name="Math Office",
|
||||||
|
@ -327,9 +327,9 @@ unsigned char metrocat[]={
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
/***********************/
|
/****************************************/
|
||||||
/* Background Features */
|
/* Background Features / Ground Scatter */
|
||||||
/***********************/
|
/****************************************/
|
||||||
|
|
||||||
|
|
||||||
/* Palm Tree */
|
/* Palm Tree */
|
||||||
@ -410,6 +410,17 @@ unsigned char spool[]={
|
|||||||
0xd0,0xdd,0x88,0x88,0x88,0x88,0x88,0x88,0xdd,0xd0,
|
0xd0,0xdd,0x88,0x88,0x88,0x88,0x88,0x88,0xdd,0xd0,
|
||||||
0x00,0x00,0x0d,0x0d,0x0d,0x0d,0x0d,0x0d,0x00,0x00,
|
0x00,0x00,0x0d,0x0d,0x0d,0x0d,0x0d,0x0d,0x00,0x00,
|
||||||
};
|
};
|
||||||
|
/* Jen and Lizbeth */
|
||||||
|
unsigned char jen_liz[]={
|
||||||
|
0x08,0x07,
|
||||||
|
0x00,0x00,0x00,0x00,0x00,0x80,0x80,0x00,
|
||||||
|
0x88,0xb8,0x00,0x00,0xb0,0xbb,0x88,0x08,
|
||||||
|
0x88,0xbb,0x0b,0x00,0x00,0xfb,0x88,0x08,
|
||||||
|
0x08,0xdd,0xd0,0xb0,0x00,0xff,0x08,0x08,
|
||||||
|
0x00,0x8d,0x00,0x00,0x00,0x8b,0x00,0x00,
|
||||||
|
0x08,0xb8,0x08,0x00,0x08,0xb8,0x08,0x00,
|
||||||
|
0x00,0x8f,0x80,0x00,0x80,0x8f,0x00,0x00,
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -46,6 +46,7 @@ extern unsigned char cactus[];
|
|||||||
extern unsigned char mountain[];
|
extern unsigned char mountain[];
|
||||||
extern unsigned char lightning[];
|
extern unsigned char lightning[];
|
||||||
extern unsigned char spool[];
|
extern unsigned char spool[];
|
||||||
|
extern unsigned char jen_liz[];
|
||||||
|
|
||||||
extern unsigned char numbers[10][11];
|
extern unsigned char numbers[10][11];
|
||||||
|
|
||||||
|
@ -383,6 +383,12 @@ done_entry:
|
|||||||
map_info[map_location].scatter_y);
|
map_info[map_location].scatter_y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (map_info[map_location].scatter&SCATTER_JEN_LIZ) {
|
||||||
|
grsim_put_sprite(jen_liz,
|
||||||
|
map_info[map_location].scatter_x,
|
||||||
|
map_info[map_location].scatter_y);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
#if 0
|
#if 0
|
||||||
@ -463,6 +469,12 @@ done_entry:
|
|||||||
map_info[map_location].scatter_y);
|
map_info[map_location].scatter_y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (map_info[map_location].scatter&SCATTER_JEN_LIZ) {
|
||||||
|
grsim_put_sprite(jen_liz,
|
||||||
|
map_info[map_location].scatter_x,
|
||||||
|
map_info[map_location].scatter_y);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 10 KiB |
Binary file not shown.
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 9.0 KiB |
Loading…
Reference in New Issue
Block a user