From 85e8c961d168099b67c957da01d91c3f02924c27 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Wed, 20 Jun 2018 16:57:11 -0400 Subject: [PATCH] tfv: add fountain art not done yet --- gr-sim/tfv/Makefile | 4 ++- gr-sim/tfv/tfv_backgrounds.c | 52 +++++++++++++++++++++++++++++++++++ gr-sim/tfv/tfv_backgrounds.h | 1 + gr-sim/tfv/tfv_mapinfo.h | 11 ++++++-- tfv/art/fountain.png | Bin 0 -> 552 bytes 5 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 tfv/art/fountain.png diff --git a/gr-sim/tfv/Makefile b/gr-sim/tfv/Makefile index 085092fa..ee628809 100644 --- a/gr-sim/tfv/Makefile +++ b/gr-sim/tfv/Makefile @@ -37,7 +37,8 @@ tfv_backgrounds.c: $(PNG2RLE) \ $(ARTDIR)/dining.png \ $(ARTDIR)/metro.png \ $(ARTDIR)/talbot.png \ - $(ARTDIR)/waterfall.png + $(ARTDIR)/waterfall.png \ + $(ARTDIR)/fountain.png $(PNG2RLE) c $(ARTDIR)/title.png title_rle > tfv_backgrounds.c $(PNG2RLE) c $(ARTDIR)/map.png map_rle >> tfv_backgrounds.c $(PNG2RLE) c $(ARTDIR)/landing.png landing_rle >> tfv_backgrounds.c @@ -51,6 +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 diff --git a/gr-sim/tfv/tfv_backgrounds.c b/gr-sim/tfv/tfv_backgrounds.c index cb99a6af..1abdce72 100644 --- a/gr-sim/tfv/tfv_backgrounds.c +++ b/gr-sim/tfv/tfv_backgrounds.c @@ -465,3 +465,55 @@ unsigned char waterfall_rle[]={ 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, }; +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, }; diff --git a/gr-sim/tfv/tfv_backgrounds.h b/gr-sim/tfv/tfv_backgrounds.h index aa779074..be8030c5 100644 --- a/gr-sim/tfv/tfv_backgrounds.h +++ b/gr-sim/tfv/tfv_backgrounds.h @@ -8,3 +8,4 @@ extern unsigned char talbot_rle[]; extern unsigned char metro_rle[]; extern unsigned char dining_rle[]; extern unsigned char waterfall_rle[]; +extern unsigned char fountain_rle[]; diff --git a/gr-sim/tfv/tfv_mapinfo.h b/gr-sim/tfv/tfv_mapinfo.h index c2d1e2c6..f4886fea 100644 --- a/gr-sim/tfv/tfv_mapinfo.h +++ b/gr-sim/tfv/tfv_mapinfo.h @@ -412,7 +412,7 @@ struct map_info_type map_info[33] = { }, { // 21: FOUNTAIN .name="Fountain", - .ground_color=(COLOR_BLACK|(COLOR_BLACK<<4)), + .ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)), .n_exit=NOEXIT, .s_exit=NOEXIT, .e_exit=U_OF_MD, @@ -420,7 +420,14 @@ struct map_info_type map_info[33] = { .miny=4, .scatter=SCATTER_NONE, .land_type=LAND_BORING, - //.background_image=metro_rle, + .background_image=fountain_rle, + .num_locations=1, + .location[0] = { + .name="Mermaid", + .x0 = 8, .x1 = 20, + .y0 = 20, .y1 = 38, + .type=LOCATION_CONVERSATION, + }, }, diff --git a/tfv/art/fountain.png b/tfv/art/fountain.png new file mode 100644 index 0000000000000000000000000000000000000000..c0427220288bdcae2d13fdd974d9e79216d62b33 GIT binary patch literal 552 zcmV+@0@wYCP)oSYQT{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E% z000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jT`46f!kukG{VE00D?eL_t(Y$F0=~ zj>8}f1<)YXO%*J1|JzP%Ls(+Kv}37K)#den7Ik}@2XXQNfDpp=UmP%J1#!Y9ErTb| zSK;8DwFI7LA6y7mCfsFKR}N^Dgx{@P%m(zd0bj56mCLbeu>(%SmCJUu&aZ65(JWW3 z$Q<$sE^DO-uw8NR^Fh;eG#2IUeYb-HEsGKSo#VDkAYLC2Q*sSNL&!A{$03Ouf*+m$ zad0Sta6{001_Q)BjGHskW?&*^4|VYw;3-`$X~zD(5&?9fQ1(QaaBQth0?l3JDsR<7r$M zgjoBL4|-K)5C@e-ZR!rP5!VOXGhSRXJ)3Yd5bmozt(s<={*%CL8%k~pN=QppE65@H qRa?#ia%tymoC!o{=WHNaF`7TJgKs?A)B3ys0000