tfv: update art and bounding boxes

This commit is contained in:
Vince Weaver 2018-06-20 23:50:17 -04:00
parent 85e8c961d1
commit 5e778e0310
8 changed files with 155 additions and 98 deletions

View File

@ -52,7 +52,7 @@ tfv_backgrounds.c: $(PNG2RLE) \
$(PNG2RLE) c $(ARTDIR)/metro.png metro_rle >> tfv_backgrounds.c
$(PNG2RLE) c $(ARTDIR)/talbot.png talbot_rle >> tfv_backgrounds.c
$(PNG2RLE) c $(ARTDIR)/waterfall.png waterfall_rle >> tfv_backgrounds.c
$(PNG2RLE) c $(ARTDIR)/waterfall.png fountain_rle >> tfv_backgrounds.c
$(PNG2RLE) c $(ARTDIR)/fountain.png fountain_rle >> tfv_backgrounds.c

View File

@ -71,6 +71,12 @@ METRO STATION
LARGE BIRD
WARK
FOUNTAIN -- drink from it restore heatlh?
MERMAID
Did ye put bubbles in fountain?
BEL AIR
CMW
@ -82,6 +88,9 @@ MINIGOLF
CLOSED FOR THE SEASON
JC
VIDEO HOMEROOM
SISTER SCARYNUN
GUS I FOUND THIS

View File

@ -467,53 +467,42 @@ unsigned char waterfall_rle[]={
0xE6,0xA4,0xEE,0xEF,0xFE,0xFF,0xEE,0x88,0xA1, };
unsigned char fountain_rle[]={
0x28, /* ysize=40 */
0xA6,0x88,0x85,0x58,0xAB,0x88,0x55,0xA6,0x88,0x55,
0xA5,0x88,0xEE,0x77,0xEE,0x77,0xEE,0x77,
0xEE,0xA8,0x88,0x85,0x58,0x88,0x88,0x48,0x44,0x44,
0x48,0xA5,0x88,0x5A,0xA6,0x88,0x5A,0xA4,0x88,0xEE,
0x77,0xEE,0x77,0xEE,0x77,0xEE,0xA9,0x88,
0x85,0x58,0x88,0x44,0x42,0x44,0x44,0xA5,0x88,
0x55,0xA6,0x88,0x5A,0xA4,0x88,0xEE,0x77,0xEE,
0x77,0xEE,0x77,0xEE,0xA3,0x88,0x48,0xA6,0x88,
0x85,0x58,0x88,0x84,0x82,0xA7,0x88,0x5A,
0xA5,0x88,0x55,0xA4,0x88,0xEE,0x77,0xEE,0x77,
0xEE,0x77,0xEE,0x88,0x88,0x48,0x44,0x48,
0xA6,0x88,0x85,0x58,0xA9,0x88,0x55,0xA5,0x88,0x85,
0x58,0xA3,0x88,0xEE,0x77,0xEE,0x77,0xEE,
0x77,0xEE,0x88,0xA5,0x84,0xA6,0x88,0x85,0x58,
0xA9,0x88,0x5A,0xA5,0x88,0x5A,0xA3,0x88,0xEE,0x77,
0xEE,0x77,0xEE,0x77,0xEE,0x88,0x5A,
0x58,0xAA,0x88,0x85,0x58,0xA8,0x88,0x55,0xA5,0x88,
0x5A,0xA3,0x88,0xEE,0x77,0xEE,0x77,0xEE,
0x77,0xEE,0x88,0x88,0x85,0x58,0x58,0xA9,0x88,0x85,
0x58,0xA7,0x88,0x58,0x5A,0xA4,0x55,0x85,0xA3,0x88,
0xEE,0x77,0xEE,0x77,0xEE,0x77,0xEE,
0xA4,0x88,0x8A,0x58,0xA9,0x88,0x85,0x58,0x88,
0xA3,0x58,0xA9,0x55,0x88,0xFF,0x5F,0xEF,0x77,
0xEE,0x77,0xEE,0x77,0xEE,0xA6,0x88,0x5A,
0x88,0x88,0xA7,0x58,0xAD,0x55,0xF5,0xA3,0xFF,0xEF,0xFF,
0xFE,0xF7,0xFE,0xF7,0xEE,0x88,0xAB,0x5A,
0xAE,0x55,0x65,0x65,0xE6,0xFF,0x7F,0xEF,0xFF,
0xEF,0x7F,0xFF,0x7F,0xEF,0xF7,0xFF,
0x88,0xA6,0x5A,0xAF,0x55,0x65,0x65,0xE6,0xE6,0xA4,0xEE,0xFF,
0xEF,0xFF,0xFF,0x87,0x88,0xF7,0xFE,0x7F,
0xEF,0xF8,0x5A,0xA0,0x10,0x55,0x65,0x65,0xE6,0xE6,0xA5,0xEE,
0x6E,0x6E,0xE6,0xEE,0xFF,0xEF,0xA4,0xF8,0x8F,
0xFF,0xFE,0xFF,0xAD,0x55,0x65,0x65,0xE6,0xE6,0xA6,0xEE,
0x6E,0x6E,0xE6,0xA4,0xEE,0x6E,0xFF,0xFE,0x88,0x88,
0xF8,0xEF,0xF5,0xFF,0xFF,0xA9,0x55,0x65,0x65,0xE6,0xE6,
0xA6,0xEE,0x6E,0x6E,0xE6,0xE6,0xA5,0xEE,0x6E,0xE6,0xEE,
0xEF,0xFE,0xEE,0xEE,0xA3,0xFF,0xEE,0xFF,0xA5,0x55,
0x65,0x65,0xE6,0xE6,0xA7,0xEE,0x6E,0x86,0x86,0x8E,0x8E,0xA4,0xEE,
0x6E,0x6E,0xE6,0xA4,0xEE,0xFE,0xFF,0xFF,0xFE,0x7F,
0xF8,0x88,0x8F,0x55,0x65,0x65,0xE6,0xE6,0xA7,0xEE,
0x6E,0x6E,0xE6,0xE6,0xA4,0x88,0xE8,0xEE,0xEE,0x6E,0xE6,
0xA8,0xEE,0x6F,0xFF,0xFE,0xE5,0x5F,0xF8,
0x88,0xE6,0xA8,0xEE,0x6E,0x6E,0xE6,0xA4,0xEE,0xE8,0xE8,
0xA3,0xEE,0x6E,0xE6,0xEE,0xEE,0x8E,0x8E,0xA5,0xEE,0x66,
0xEE,0xFF,0xFF,0xEF,0xFE,0xEF,0x88,0xA6,0xEE,
0x6E,0x6E,0xE6,0xA9,0xEE,0x6E,0x6E,0xE6,0xA3,0xEE,0xA3,0x88,
0xE8,0xEE,0xEE,0x6E,0xE6,0xEE,0xEE,0xEF,0xFE,
0xEE,0xFF,0xEE,0x88,0xA3,0xEE,0x6E,0xE6,0xE6,
0xAA,0xEE,0x6E,0xE6,0xA6,0xEE,0xE8,0xE8,0xA3,0xEE,0x6E,
0xE6,0xA4,0xEE,0xEF,0xFE,0xFF,0xEE,0x88,0xA1, };
0xAD,0x44,0x14,0xA6,0x44,0x84,0x88,0xC8,0xA9,0xCC,
0x5C,0x55,0xE7,0xE7,0xA4,0xEE,0x44,0x41,0xA5,0x44,
0x14,0xAA,0x44,0x84,0x88,0xC8,0xAB,0xCC,0x55,
0xEE,0x55,0xA5,0xEE,0xAA,0x44,0x14,0xA3,0x44,0x41,
0x84,0x88,0x88,0xC8,0xAD,0xCC,0x55,0x5E,0xFF,
0x55,0xA4,0xEE,0xA3,0x44,0x14,0xA9,0x44,0x84,0x88,
0xC8,0xAC,0xCC,0x5C,0x5C,0x75,0x75,0xE7,0xE5,0x5F,
0xEE,0x55,0xA3,0xEE,0x14,0xA5,0x44,0x41,0xA3,0x44,
0x84,0x88,0x88,0xC8,0xAC,0xCC,0x5C,0x75,0xE7,0xE7,
0xA4,0xEE,0xE5,0x5E,0xFF,0x55,0xEE,0xEE,0xA9,0x84,
0x88,0xC8,0xAB,0xCC,0x5C,0x5C,0x75,0x75,0xE7,0xA8,0xEE,
0xE5,0x5F,0xEE,0x55,0x75,0xA9,0xC8,0xAB,0xCC,
0x5C,0x55,0xE7,0xE7,0xAC,0xEE,0xE5,0x5E,0x55,
0x77,0xA0,0x12,0xCC,0xDC,0xDC,0x55,0xE5,0x5E,0xAE,0xEE,
0x55,0x55,0x77,0xAD,0xCC,0xA3,0x8C,0xDC,0xA3,0xDD,0x55,
0xEE,0xFA,0x5E,0xAA,0xEE,0x5E,0x5E,0x55,0x75,
0x77,0x77,0xAD,0xCC,0xBB,0xB8,0x88,0x8D,0x5D,
0x75,0x75,0xE7,0x55,0xFF,0xEA,0x5E,0xA6,0xEE,
0x5E,0x55,0x55,0x75,0x75,0xA4,0x77,0xAB,0xCC,0xDC,0xDD,
0xBB,0xBB,0x88,0x88,0x87,0xA4,0xEE,0x55,0xEE,0xF5,
0x5E,0xEE,0xEE,0x5E,0x5E,0x55,0x75,0x75,0xA6,0x77,0x57,
0xAA,0xCC,0xDC,0xA3,0xDD,0xBB,0xBB,0x88,0x88,0xEE,0xA3,0x11,
0xE1,0x55,0xFF,0xE5,0x55,0x55,0x5A,0x75,
0xA7,0x77,0x57,0xD5,0xDD,0xAA,0xCC,0xCD,0x5D,
0xBA,0x11,0x11,0xBB,0xEE,0xE8,0xEE,0xEE,0x11,
0xA3,0xEE,0x55,0xEE,0x55,0xA7,0x77,0x57,0xD5,0xD5,
0xA3,0xDD,0xAB,0xCC,0x7B,0x5B,0xEE,0xBB,0xBB,0xBE,
0xEE,0xEE,0x1E,0x11,0xA4,0xEE,0x55,0x55,0xA4,0x77,0x57,0x57,
0xD5,0xA6,0xDD,0xAB,0xCC,0x77,0x75,0x5B,0xA7,0x11,
0xA3,0xEE,0x5E,0x55,0x75,0x77,0x77,0x57,0xD5,
0xA9,0xDD,0xAB,0xCC,0xCA,0x77,0x75,0x5E,0xE1,
0xA3,0x11,0xE1,0xEE,0xEE,0x5E,0x75,0x75,0x77,0x57,
0xD5,0xD5,0xA9,0xDD,0xCD,0xAD,0xCC,0xC5,0x77,0x75,
0x5E,0xEE,0xEE,0x5E,0x5E,0x55,0x75,0x77,0x57,0x57,
0xD5,0xA9,0xDD,0xCD,0xCD,0xA0,0x10,0xCC,0xC5,0x77,0x75,
0x5E,0x55,0x75,0x77,0x77,0x57,0xD5,0xAA,0xDD,
0xCD,0xA0,0x14,0xCC,0xC5,0x77,0x55,0x55,0x57,0xD5,0xD5,
0xAA,0xDD,0xCD,0xA0,0x17,0xCC,0xC5,0xC5,0xCD,0xAA,0xDD,0xCD,0xCD,
0xAA,0xCC,0xA1, };

View File

@ -9,3 +9,4 @@ extern unsigned char metro_rle[];
extern unsigned char dining_rle[];
extern unsigned char waterfall_rle[];
extern unsigned char fountain_rle[];
extern unsigned char belair_rle[];

View File

@ -25,18 +25,23 @@
#define FOUNTAIN 21
#define BEL_AIR 22
#define C_MILTON 23
#define HARFORD_MALL 24
#define MINIGOLF 25
#define JOHN_CARROLL 26
//#define C_MILTON 23
//#define HARFORD_MALL 24
//#define MINIGOLF 25
#define JOHN_CARROLL 23
#define VIDEO_HOMEROOM 27
#define AP_CALCULUS 28
#define DEUTSCH 29
#define HOMEROOM 30
#define MATH_OFFICE 31
#define PATRIOT_ROOM 32
#define MAIN_OFFICE 33
// UPSTAIRS
#define VIDEO_HOMEROOM 24
#define DEUTSCH 26
#define HOMEROOM 27
// DOWNSTAIRS
#define AP_CALCULUS 25
#define MATH_OFFICE 28
#define PATRIOT_ROOM 29
// OFFICE
#define MAIN_OFFICE 30
#define NOEXIT 255

View File

@ -17,7 +17,7 @@
struct map_info_type map_info[33] = {
{ // 0: NORTH_BEACH
[NORTH_BEACH]={ // 0: NORTH_BEACH
.name="North Beach",
.n_exit=NOEXIT,
.s_exit=PINE_BEACH,
@ -29,7 +29,7 @@ struct map_info_type map_info[33] = {
.scatter=SCATTER_NONE,
.background_image=NULL,
},
{ // 1: ARCTIC_WOODS
[ARCTIC_WOODS]={ // 1: ARCTIC_WOODS
.name="Arctic Woods",
.n_exit=NOEXIT,
.s_exit=LANDING_SITE,
@ -42,7 +42,7 @@ struct map_info_type map_info[33] = {
.scatter_x=10, .scatter_y=22, .scatter_cutoff=22,
.background_image=NULL,
},
{ // 2: ARCTIC_MOUNTAINS
[ARCTIC_MOUNTAINS]={ // 2: ARCTIC_MOUNTAINS
.name="Arctic Mountains",
.n_exit=NOEXIT,
.s_exit=NORTH_MOUNTAIN,
@ -54,7 +54,7 @@ struct map_info_type map_info[33] = {
.scatter=SCATTER_NONE,
.background_image=NULL,
},
{ // 3: HARFORD_COUNTY
[HARFORD_COUNTY]={ // 3: HARFORD_COUNTY
.name="Harford County",
.n_exit=NOEXIT,
.s_exit=NORTH_FOREST,
@ -65,8 +65,15 @@ struct map_info_type map_info[33] = {
.land_type=LAND_LIGHTNING,
.scatter=SCATTER_NONE,
.background_image=harfco_rle,
.num_locations=1,
.location[0] = {
.name="Bel Air",
.x0 = 11, .x1 = 29,
.y0 = 16, .y1 = 26,
.destination = BEL_AIR,
},
},
{ // 4: PINE_BEACH
[PINE_BEACH]={ // 4: PINE_BEACH
.name="Pine Beach",
.n_exit=NORTH_BEACH,
.s_exit=PALM_BEACH,
@ -79,7 +86,7 @@ struct map_info_type map_info[33] = {
.land_type=LAND_LEFT_BEACH,
.background_image=NULL,
},
{ // 5: LANDING_SITE
[LANDING_SITE]={ // 5: LANDING_SITE
.name="Landing Site",
.num_locations=1,
// .locations
@ -93,7 +100,7 @@ struct map_info_type map_info[33] = {
.land_type=LAND_GRASSLAND,
.background_image=landing_rle,
},
{ // 6: NORTH_MOUNTAIN
[NORTH_MOUNTAIN]={ // 6: NORTH_MOUNTAIN
.name="North Mountain",
.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
.n_exit=ARCTIC_MOUNTAINS,
@ -105,7 +112,7 @@ struct map_info_type map_info[33] = {
.land_type=LAND_MOUNTAIN,
.background_image=NULL,
},
{ // 7: NORTH_FOREST
[NORTH_FOREST]={ // 7: NORTH_FOREST
.name="North Forest",
.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
.n_exit=HARFORD_COUNTY,
@ -117,7 +124,7 @@ struct map_info_type map_info[33] = {
.land_type=LAND_FOREST|LAND_RIGHT_BEACH,
.background_image=NULL,
},
{ // 8: PALM_BEACH
[PALM_BEACH]={ // 8: PALM_BEACH
.name="Palm Beach",
.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
.n_exit=PINE_BEACH,
@ -130,7 +137,7 @@ struct map_info_type map_info[33] = {
.land_type=LAND_LEFT_BEACH,
.background_image=NULL,
},
{ // 9: GRASSLAND
[GRASSLAND]={ // 9: GRASSLAND
.name="Grassland",
.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
.n_exit=LANDING_SITE,
@ -142,7 +149,7 @@ struct map_info_type map_info[33] = {
.land_type=LAND_GRASSLAND,
.background_image=NULL,
},
{ // 10: MORIA
[MORIA]={ // 10: MORIA
.name="Khazad-dum",
.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
.n_exit=NORTH_MOUNTAIN,
@ -154,7 +161,7 @@ struct map_info_type map_info[33] = {
.land_type=LAND_MOUNTAIN,
.background_image=NULL,
},
{ // 11: SOUTH_FOREST
[SOUTH_FOREST]={ // 11: SOUTH_FOREST
.name="South Forest",
.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
.n_exit=NORTH_FOREST,
@ -166,7 +173,7 @@ struct map_info_type map_info[33] = {
.land_type=LAND_FOREST|LAND_RIGHT_BEACH,
.background_image=NULL,
},
{ // 12: SOUTH_BEACH
[SOUTH_BEACH]={ // 12: SOUTH_BEACH
.name="South Beach",
.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
.n_exit=PALM_BEACH,
@ -179,7 +186,7 @@ struct map_info_type map_info[33] = {
.land_type=LAND_LEFT_BEACH|LAND_SOUTHSHORE,
.background_image=NULL,
},
{ // 13: CACTUS_RANCH
[CACTUS_RANCH]={ // 13: CACTUS_RANCH
.name="Cactus Ranch",
.ground_color=(COLOR_ORANGE|(COLOR_ORANGE<<4)),
.n_exit=GRASSLAND,
@ -192,7 +199,7 @@ struct map_info_type map_info[33] = {
.land_type=LAND_GRASSLAND|LAND_SOUTHSHORE,
.background_image=NULL,
},
{ // 14: COLLEGE_PARK
[COLLEGE_PARK]={ // 14: COLLEGE_PARK
.name="College Park",
.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
.n_exit=MORIA,
@ -216,7 +223,7 @@ struct map_info_type map_info[33] = {
.destination = WATERFALL,
},
},
{ // 15: OCEAN_CITY
[OCEAN_CITY]={ // 15: OCEAN_CITY
.name="Ocean City",
.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
.n_exit=SOUTH_FOREST,
@ -228,7 +235,7 @@ struct map_info_type map_info[33] = {
.land_type=LAND_RIGHT_BEACH|LAND_SOUTHSHORE,
.background_image=NULL,
},
{ // 16: U of MD
[U_OF_MD]={ // 16: U of MD
.name="University of M",
.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
.n_exit=NOEXIT,
@ -269,7 +276,7 @@ struct map_info_type map_info[33] = {
.type=LOCATION_PLACE,
},
},
{ // 17: Waterfall
[WATERFALL]={ // 17: Waterfall
.name="Waterfall",
.ground_color=(COLOR_GREY|(COLOR_GREY<<4)),
.n_exit=NOEXIT,
@ -281,7 +288,7 @@ struct map_info_type map_info[33] = {
.land_type=LAND_BORING,
.background_image=waterfall_rle,
},
{ // 18: Talbot Hall
[TALBOT_HALL]={ // 18: Talbot Hall
.name="Talbot Hall",
.ground_color=(COLOR_BLACK|(COLOR_BLACK<<4)),
.n_exit=NOEXIT,
@ -330,7 +337,7 @@ struct map_info_type map_info[33] = {
.type=LOCATION_CONVERSATION,
},
},
{ // 19: Dining Hall
[DINING_HALL]={ // 19: Dining Hall
.name="Dining Hall",
.ground_color=(COLOR_BLACK|(COLOR_BLACK<<4)),
.n_exit=NOEXIT,
@ -373,7 +380,7 @@ struct map_info_type map_info[33] = {
.type=LOCATION_CONVERSATION,
},
},
{ // 20: METRO_STATION
[METRO_STATION]={ // 20: METRO_STATION
.name="Metro Station",
.ground_color=(COLOR_BLACK|(COLOR_BLACK<<4)),
.n_exit=NOEXIT,
@ -410,7 +417,7 @@ struct map_info_type map_info[33] = {
.type=LOCATION_CONVERSATION,
},
},
{ // 21: FOUNTAIN
[FOUNTAIN]={ // 21: FOUNTAIN
.name="Fountain",
.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
.n_exit=NOEXIT,
@ -429,25 +436,47 @@ struct map_info_type map_info[33] = {
.type=LOCATION_CONVERSATION,
},
},
[BEL_AIR]={ // 22: BEL_AIR
.name="Bel Air",
.ground_color=(COLOR_BLACK|(COLOR_BLACK<<4)),
.n_exit=NOEXIT,
.s_exit=HARFORD_COUNTY,
.e_exit=NOEXIT,
.w_exit=NOEXIT,
.miny=4,
.scatter=SCATTER_NONE,
.background_image=belair_rle,
.num_locations=4,
.location[0] = {
.name="C. Milton HS",
.x0 = 0, .x1 = 9,
.y0 = 20, .y1 = 30,
.type=LOCATION_CONVERSATION,
},
.location[1] = {
.name="JC Highschool",
.x0 = 10, .x1 = 24,
.y0 = 16, .y1 = 24,
.destination = JOHN_CARROLL,
},
.location[2] = {
.name="Harford Mall",
.x0 = 25, .x1 = 32,
.y0 = 22, .y1 = 30,
.type=LOCATION_CONVERSATION,
},
.location[3] = {
.name="Minigolf",
.x0 = 34, .x1 = 39,
.y0 = 27, .y1 = 35,
.type=LOCATION_CONVERSATION,
},
},
};
#if 0
umcp_rle
"TALBOT HALL",X1,Y1,X2,Y2,TALBOT_HALL,
"SOUTH CAMPUS DINING",X1,Y1,X2,Y2,SOUTH_CAMPUS,
"METRO STATION",X1,Y1,X2,Y2,METRO_STATION,
"FOUNTAIN" -- drink from it restore heatlh?
mermaid. Did ye put bubbles in fountain?
bel_air_rle
"C. MILTON",
"JOHN CARROLL",
"SHOPPING MALL",
"MINIGOLF",
jc_rle:
"VIDEO HOMEROOM"
"AP CALCULUS, TEAM I-1"
@ -468,6 +497,30 @@ struct map_info_type map_info[33] = {
"FORD",
"SISTER SCARYNUN",
calculs_rle:
PADRINO
JENNI
MR. APPLEBY
KATHY
LIZBETH
BLUME
DEUTSCH:
Agent G
Agent AP
Agent S
NIRE
FRAU:
homeroom:
trapani
warwick
wargo
mean lady
patriot_room:
agent N
#endif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 709 B

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 552 B

After

Width:  |  Height:  |  Size: 6.8 KiB