From 94a45ccaabd3a2e60114492151c380753fe3a968 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 25 Jun 2020 13:49:18 -0400 Subject: [PATCH] mist: arbor: made it to elevator2 --- mist/TODO | 2 ++ mist/graphics_arbor/Makefile | 10 ++++-- mist/graphics_arbor/bridge7_closed_w.png | Bin 0 -> 1160 bytes mist/graphics_arbor/bridge7_e.png | Bin 0 -> 1150 bytes mist/graphics_arbor/bridge7_open_w.png | Bin 0 -> 1160 bytes mist/graphics_arbor/doors_closed_w.png | Bin 0 -> 1006 bytes mist/graphics_arbor/doors_e.png | Bin 0 -> 1166 bytes mist/leveldata_arbor.inc | 40 +++++++++++++++++++++-- 8 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 mist/graphics_arbor/bridge7_closed_w.png create mode 100644 mist/graphics_arbor/bridge7_e.png create mode 100644 mist/graphics_arbor/bridge7_open_w.png create mode 100644 mist/graphics_arbor/doors_closed_w.png create mode 100644 mist/graphics_arbor/doors_e.png diff --git a/mist/TODO b/mist/TODO index 997e3843..5349aed4 100644 --- a/mist/TODO +++ b/mist/TODO @@ -28,7 +28,9 @@ For release 1.0 + CHANNEL -- hook up water valves at least + -- show water in pipe (because no sound clue for water running?) -- hook up stairway + -- hook up pages and half letter + ARBOR -- finish level diff --git a/mist/graphics_arbor/Makefile b/mist/graphics_arbor/Makefile index 1d4f3dfd..ef48988c 100644 --- a/mist/graphics_arbor/Makefile +++ b/mist/graphics_arbor/Makefile @@ -28,7 +28,9 @@ arbor_graphics.inc: \ bridge5_n.lzsa bridge5_s.lzsa \ longshack3_n.lzsa longshack3_s.lzsa \ bridge6_n.lzsa bridge6_s.lzsa \ - shack2_n.lzsa shack2_s.lzsa shack2_e.lzsa shack2_w.lzsa + shack2_n.lzsa shack2_s.lzsa shack2_e.lzsa shack2_w.lzsa \ + bridge7_e.lzsa bridge7_open_w.lzsa bridge7_closed_w.lzsa \ + doors_e.lzsa doors_closed_w.lzsa echo "arrival_e_lzsa: .incbin \"arrival_e.lzsa\"" > arbor_graphics.inc echo "arrival_open_e_lzsa: .incbin \"arrival_open_e.lzsa\"" >> arbor_graphics.inc echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> arbor_graphics.inc @@ -77,7 +79,11 @@ arbor_graphics.inc: \ echo "shack2_s_lzsa: .incbin \"shack2_s.lzsa\"" >> arbor_graphics.inc echo "shack2_e_lzsa: .incbin \"shack2_e.lzsa\"" >> arbor_graphics.inc echo "shack2_w_lzsa: .incbin \"shack2_w.lzsa\"" >> arbor_graphics.inc - + echo "bridge7_e_lzsa: .incbin \"bridge7_e.lzsa\"" >> arbor_graphics.inc + echo "bridge7_closed_w_lzsa: .incbin \"bridge7_closed_w.lzsa\"" >> arbor_graphics.inc + echo "bridge7_open_w_lzsa: .incbin \"bridge7_open_w.lzsa\"" >> arbor_graphics.inc + echo "doors_e_lzsa: .incbin \"doors_e.lzsa\"" >> arbor_graphics.inc + echo "doors_closed_w_lzsa: .incbin \"doors_closed_w.lzsa\"" >> arbor_graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_arbor/bridge7_closed_w.png b/mist/graphics_arbor/bridge7_closed_w.png new file mode 100644 index 0000000000000000000000000000000000000000..576770e71e9e398585eaa0e17d1a08ddb411261e GIT binary patch literal 1160 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 literal 0 HcmV?d00001 diff --git a/mist/leveldata_arbor.inc b/mist/leveldata_arbor.inc index da3e2521..0c3ec241 100644 --- a/mist/leveldata_arbor.inc +++ b/mist/leveldata_arbor.inc @@ -8,7 +8,7 @@ locations: .word location8, location9, location10,location11 .word location12,location13,location14,location15 .word location16,location17,location18,location19 - .word location20,location21 + .word location20,location21,location22,location23 ; ARBOR_INSIDE_ELEV1 -- arrival in elevator1 location0: @@ -381,7 +381,7 @@ location21: .byte ARBOR_LONGSHACK3 ; north exit .byte $ff ; south exit .byte $ff ; east exit - .byte $ff ; west exit + .byte ARBOR_BRIDGE7 ; west exit .byte DIRECTION_N ; north exit_dir .byte $ff ; south exit_dir .byte $ff ; east exit_dir @@ -393,3 +393,39 @@ location21: .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST .byte $ff +; ARBOR_BRIDGE7 -- the bridge before the doors +location22: + .byte $ff ; north exit + .byte $ff ; south exit + .byte ARBOR_SHACK2 ; east exit + .byte ARBOR_DOORS ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word bridge7_e_lzsa ; east bg + .word bridge7_closed_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; ARBOR_DOORS -- doors to the stair and elevator +location23: + .byte $ff ; north exit + .byte $ff ; south exit + .byte ARBOR_BRIDGE7 ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word doors_e_lzsa ; east bg + .word doors_closed_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + + +