diff --git a/mist/Makefile b/mist/Makefile index 3399e69b..6930aff5 100644 --- a/mist/Makefile +++ b/mist/Makefile @@ -21,15 +21,16 @@ mist.dsk: HELLO LOADER MIST_TITLE MIST OCTAGON VIEWER \ $(DOS33) -y mist.dsk BSAVE -a 0x1400 OCTAGON # $(DOS33) -y mist.dsk BSAVE -a 0x1400 MECHE # $(DOS33) -y mist.dsk BSAVE -a 0x1400 SELENA - $(DOS33) -y mist.dsk BSAVE -a 0x1400 CHANNEL +# $(DOS33) -y mist.dsk BSAVE -a 0x1400 CHANNEL $(DOS33) -y mist.dsk BSAVE -a 0x1400 VIEWER $(DOS33) -y mist.dsk BSAVE -a 0x1400 STONEY $(DOS33) -y mist.dsk BSAVE -a 0x9000 ./audio/link_noise.btc LINK_NOISE.BTC -mist_side2.dsk: MECHE SELENA +mist_side2.dsk: MECHE SELENA CHANNEL cp empty.dsk mist_side2.dsk $(DOS33) -y mist_side2.dsk BSAVE -a 0x1400 MECHE $(DOS33) -y mist_side2.dsk BSAVE -a 0x1400 SELENA + $(DOS33) -y mist_side2.dsk BSAVE -a 0x1400 CHANNEL $(DOS33) -y mist_side2.dsk BSAVE -a 0x9000 ./audio/link_noise.btc LINK_NOISE.BTC ### diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 3771c012..a7a47f78 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -231,6 +231,23 @@ STONEY_DOORWAY1 = 16 STONEY_BRIDGE = 17 STONEY_EXIT = 18 STONEY_EXIT_AIRLOCK = 19 +STONEY_EXIT_AIRLOCK_OPEN= 20 +STONEY_BOOK_STAIRS1 = 21 +STONEY_BOOK_STAIRS2 = 22 +STONEY_BOOK_ROOM = 23 +STONEY_BOOK_TABLE = 24 +STONEY_BOOK_TABLE_CLOSED= 25 +STONEY_BOOK_TABLE_OPEN = 26 +STONEY_DOORWAY2 = 27 +STONEY_TELESCOPE_PATH1 = 28 +STONEY_TELESCOPE_PATH2 = 29 +STONEY_TELESCOPE_PATH3 = 30 +STONEY_TELESCOPE = 31 +STONEY_TELESCOPE_VIEW = 32 + + + + ; Channely Wood CHANNEL_OUTSIDE_CABIN = 0 diff --git a/mist/graphics_stoney/Makefile b/mist/graphics_stoney/Makefile index 040df5e3..7320dada 100644 --- a/mist/graphics_stoney/Makefile +++ b/mist/graphics_stoney/Makefile @@ -26,7 +26,18 @@ stoney_graphics.inc: \ doorway1_n.lzsa doorway1_s.lzsa doorway1_e.lzsa doorway1_w.lzsa \ bridge_e.lzsa bridge_w.lzsa \ exit_tunnel_n.lzsa exit_tunnel_s.lzsa \ - exit_airlock_n.lzsa exit_airlock_s.lzsa + exit_airlock_n.lzsa exit_airlock_s.lzsa \ + exit_airlock_open_s.lzsa \ + book_stairs1_n.lzsa book_stairs1_s.lzsa \ + book_stairs2_n.lzsa book_stairs2_w.lzsa \ + book_room_n.lzsa book_room_s.lzsa \ + book_table_n.lzsa \ + doorway2_n.lzsa doorway2_s.lzsa doorway2_e.lzsa doorway2_w.lzsa \ + telescope_path1_e.lzsa telescope_path1_w.lzsa \ + telescope_path2_e.lzsa telescope_path2_w.lzsa \ + telescope_path3_e.lzsa telescope_path3_w.lzsa \ + telescope_e.lzsa telescope_w.lzsa \ + telescope_view.lzsa echo "ship_entry_n_lzsa: .incbin \"ship_entry_n.lzsa\"" > stoney_graphics.inc echo "ship_entry_s_lzsa: .incbin \"ship_entry_s.lzsa\"" >> stoney_graphics.inc echo "ship_bow_s_lzsa: .incbin \"ship_bow_s.lzsa\"" >> stoney_graphics.inc @@ -66,6 +77,28 @@ stoney_graphics.inc: \ echo "exit_tunnel_s_lzsa: .incbin \"exit_tunnel_s.lzsa\"" >> stoney_graphics.inc echo "exit_airlock_n_lzsa: .incbin \"exit_airlock_n.lzsa\"" >> stoney_graphics.inc echo "exit_airlock_s_lzsa: .incbin \"exit_airlock_s.lzsa\"" >> stoney_graphics.inc + echo "exit_airlock_open_s_lzsa: .incbin \"exit_airlock_open_s.lzsa\"" >> stoney_graphics.inc + echo "book_stairs1_n_lzsa: .incbin \"book_stairs1_n.lzsa\"" >> stoney_graphics.inc + echo "book_stairs1_s_lzsa: .incbin \"book_stairs1_s.lzsa\"" >> stoney_graphics.inc + echo "book_stairs2_n_lzsa: .incbin \"book_stairs2_n.lzsa\"" >> stoney_graphics.inc + echo "book_stairs2_w_lzsa: .incbin \"book_stairs2_w.lzsa\"" >> stoney_graphics.inc + echo "book_room_n_lzsa: .incbin \"book_room_n.lzsa\"" >> stoney_graphics.inc + echo "book_room_s_lzsa: .incbin \"book_room_s.lzsa\"" >> stoney_graphics.inc + echo "book_table_n_lzsa: .incbin \"book_table_n.lzsa\"" >> stoney_graphics.inc + echo "doorway2_n_lzsa: .incbin \"doorway2_n.lzsa\"" >> stoney_graphics.inc + echo "doorway2_s_lzsa: .incbin \"doorway2_s.lzsa\"" >> stoney_graphics.inc + echo "doorway2_e_lzsa: .incbin \"doorway2_e.lzsa\"" >> stoney_graphics.inc + echo "doorway2_w_lzsa: .incbin \"doorway2_w.lzsa\"" >> stoney_graphics.inc + echo "telescope_path1_e_lzsa: .incbin \"telescope_path1_e.lzsa\"" >> stoney_graphics.inc + echo "telescope_path1_w_lzsa: .incbin \"telescope_path1_w.lzsa\"" >> stoney_graphics.inc + echo "telescope_path2_e_lzsa: .incbin \"telescope_path2_e.lzsa\"" >> stoney_graphics.inc + echo "telescope_path2_w_lzsa: .incbin \"telescope_path2_w.lzsa\"" >> stoney_graphics.inc + echo "telescope_path3_e_lzsa: .incbin \"telescope_path3_e.lzsa\"" >> stoney_graphics.inc + echo "telescope_path3_w_lzsa: .incbin \"telescope_path3_w.lzsa\"" >> stoney_graphics.inc + echo "telescope_e_lzsa: .incbin \"telescope_e.lzsa\"" >> stoney_graphics.inc + echo "telescope_w_lzsa: .incbin \"telescope_w.lzsa\"" >> stoney_graphics.inc + echo "telescope_view_lzsa: .incbin \"telescope_view.lzsa\"" >> stoney_graphics.inc + %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_stoney/book_room_n.png b/mist/graphics_stoney/book_room_n.png new file mode 100644 index 00000000..b44f02c6 Binary files /dev/null and b/mist/graphics_stoney/book_room_n.png differ diff --git a/mist/graphics_stoney/book_room_s.png b/mist/graphics_stoney/book_room_s.png new file mode 100644 index 00000000..17dbf28f Binary files /dev/null and b/mist/graphics_stoney/book_room_s.png differ diff --git a/mist/graphics_stoney/book_stairs1_n.png b/mist/graphics_stoney/book_stairs1_n.png new file mode 100644 index 00000000..f105ee13 Binary files /dev/null and b/mist/graphics_stoney/book_stairs1_n.png differ diff --git a/mist/graphics_stoney/book_stairs1_s.png b/mist/graphics_stoney/book_stairs1_s.png new file mode 100644 index 00000000..f0234617 Binary files /dev/null and b/mist/graphics_stoney/book_stairs1_s.png differ diff --git a/mist/graphics_stoney/book_stairs2_n.png b/mist/graphics_stoney/book_stairs2_n.png new file mode 100644 index 00000000..6dcb1e07 Binary files /dev/null and b/mist/graphics_stoney/book_stairs2_n.png differ diff --git a/mist/graphics_stoney/book_stairs2_w.png b/mist/graphics_stoney/book_stairs2_w.png new file mode 100644 index 00000000..ff8a61cb Binary files /dev/null and b/mist/graphics_stoney/book_stairs2_w.png differ diff --git a/mist/graphics_stoney/book_table_n.png b/mist/graphics_stoney/book_table_n.png new file mode 100644 index 00000000..b7e2732e Binary files /dev/null and b/mist/graphics_stoney/book_table_n.png differ diff --git a/mist/graphics_stoney/doorway2_e.png b/mist/graphics_stoney/doorway2_e.png new file mode 100644 index 00000000..6d155d46 Binary files /dev/null and b/mist/graphics_stoney/doorway2_e.png differ diff --git a/mist/graphics_stoney/doorway2_n.png b/mist/graphics_stoney/doorway2_n.png new file mode 100644 index 00000000..42c544d6 Binary files /dev/null and b/mist/graphics_stoney/doorway2_n.png differ diff --git a/mist/graphics_stoney/doorway2_s.png b/mist/graphics_stoney/doorway2_s.png new file mode 100644 index 00000000..1e488e80 Binary files /dev/null and b/mist/graphics_stoney/doorway2_s.png differ diff --git a/mist/graphics_stoney/doorway2_w.png b/mist/graphics_stoney/doorway2_w.png new file mode 100644 index 00000000..53933726 Binary files /dev/null and b/mist/graphics_stoney/doorway2_w.png differ diff --git a/mist/graphics_stoney/exit_airlock_open_s.png b/mist/graphics_stoney/exit_airlock_open_s.png new file mode 100644 index 00000000..cf77e3ed Binary files /dev/null and b/mist/graphics_stoney/exit_airlock_open_s.png differ diff --git a/mist/graphics_stoney/telescope_e.png b/mist/graphics_stoney/telescope_e.png new file mode 100644 index 00000000..9cbab9ee Binary files /dev/null and b/mist/graphics_stoney/telescope_e.png differ diff --git a/mist/graphics_stoney/telescope_path1_e.png b/mist/graphics_stoney/telescope_path1_e.png new file mode 100644 index 00000000..15cac1a6 Binary files /dev/null and b/mist/graphics_stoney/telescope_path1_e.png differ diff --git a/mist/graphics_stoney/telescope_path1_w.png b/mist/graphics_stoney/telescope_path1_w.png new file mode 100644 index 00000000..7eaeb253 Binary files /dev/null and b/mist/graphics_stoney/telescope_path1_w.png differ diff --git a/mist/graphics_stoney/telescope_path2_e.png b/mist/graphics_stoney/telescope_path2_e.png new file mode 100644 index 00000000..79f1309b Binary files /dev/null and b/mist/graphics_stoney/telescope_path2_e.png differ diff --git a/mist/graphics_stoney/telescope_path2_w.png b/mist/graphics_stoney/telescope_path2_w.png new file mode 100644 index 00000000..5d596553 Binary files /dev/null and b/mist/graphics_stoney/telescope_path2_w.png differ diff --git a/mist/graphics_stoney/telescope_path3_e.png b/mist/graphics_stoney/telescope_path3_e.png new file mode 100644 index 00000000..e4b8c88b Binary files /dev/null and b/mist/graphics_stoney/telescope_path3_e.png differ diff --git a/mist/graphics_stoney/telescope_path3_w.png b/mist/graphics_stoney/telescope_path3_w.png new file mode 100644 index 00000000..4161cc8a Binary files /dev/null and b/mist/graphics_stoney/telescope_path3_w.png differ diff --git a/mist/graphics_stoney/telescope_view.png b/mist/graphics_stoney/telescope_view.png new file mode 100644 index 00000000..69dc63e3 Binary files /dev/null and b/mist/graphics_stoney/telescope_view.png differ diff --git a/mist/graphics_stoney/telescope_w.png b/mist/graphics_stoney/telescope_w.png new file mode 100644 index 00000000..c4c886b9 Binary files /dev/null and b/mist/graphics_stoney/telescope_w.png differ diff --git a/mist/leveldata_stoney.inc b/mist/leveldata_stoney.inc index 4ecd6e2c..28ae5d19 100644 --- a/mist/leveldata_stoney.inc +++ b/mist/leveldata_stoney.inc @@ -9,6 +9,11 @@ locations: .word location8, location9, location10,location11 .word location12,location13,location14,location15 .word location16,location17,location18,location19 + .word location20,location21,location22,location23 + .word location24,location25,location26,location27 + .word location28,location29,location30,location31 + .word location32 + ; STONEY_SHIP_STERN -- back of the ship location0: @@ -313,7 +318,7 @@ location16: location17: .byte $ff ; north exit .byte $ff ; south exit - .byte $ff ; east exit + .byte STONEY_DOORWAY2 ; east exit .byte STONEY_DOORWAY1 ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir @@ -346,7 +351,7 @@ location18: ; STONEY_EXIT_AIRLOCK -- exit door airlock location19: .byte STONEY_EXIT ; north exit - .byte $ff ; south exit + .byte STONEY_EXIT_AIRLOCK_OPEN ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte DIRECTION_N ; north exit_dir @@ -359,3 +364,225 @@ location19: .word $0000 ; west bg .byte BG_NORTH|BG_SOUTH .byte $ff + +; STONEY_EXIT_AIRLOCK_OPEN -- exit door airlock open +location20: + .byte $ff ; north exit + .byte STONEY_BOOK_STAIRS1 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word $0000 ; north bg + .word exit_airlock_open_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_SOUTH + .byte $ff + +; STONEY_BOOK_STAIRS1 -- exit door top of stairs +location21: + .byte STONEY_EXIT_AIRLOCK ; north exit + .byte STONEY_BOOK_STAIRS2 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_N ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word book_stairs1_n_lzsa ; north bg + .word book_stairs1_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_SOUTH|BG_NORTH + .byte $ff + +; STONEY_BOOK_STAIRS2 -- stairs landing +location22: + .byte STONEY_BOOK_ROOM ; north exit + .byte STONEY_BOOK_STAIRS1 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_N ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word book_stairs2_n_lzsa ; north bg + .word book_stairs2_w_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_SOUTH|BG_NORTH + .byte $ff + +; STONEY_BOOK_ROOM -- table book room +location23: + .byte STONEY_BOOK_TABLE ; north exit + .byte STONEY_BOOK_STAIRS2 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word book_room_n_lzsa ; north bg + .word book_room_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +; STONEY_BOOK_TABLE -- table book +location24: + .byte STONEY_BOOK_TABLE_CLOSED ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte $ff ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word book_table_n_lzsa ; north bg + .word $0000 ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH + .byte $ff + + +; STONEY_BOOK_TABLE_CLOSED -- table book closed +location25: + .byte STONEY_BOOK_TABLE_OPEN ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte $ff ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word book_table_n_lzsa ; north bg + .word $0000 ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH + .byte $ff + +; STONEY_BOOK_TABLE_OPEN -- table book open +location26: + .byte STONEY_BOOK_ROOM ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte $ff ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word book_table_n_lzsa ; north bg + .word $0000 ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH + .byte $ff + +; STONEY_DOORWAY2 -- doorway on other half of ship +location27: + .byte $ff ; north exit + .byte $ff ; south exit + .byte STONEY_TELESCOPE_PATH1 ; east exit + .byte STONEY_BRIDGE ; 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 doorway2_n_lzsa ; north bg + .word doorway2_s_lzsa ; south bg + .word doorway2_e_lzsa ; east bg + .word doorway2_w_lzsa ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST + .byte $ff + +; STONEY_TELSCOPE_PATH1 -- path to telescope +location28: + .byte $ff ; north exit + .byte $ff ; south exit + .byte STONEY_TELESCOPE_PATH2 ; east exit + .byte STONEY_DOORWAY2 ; 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 telescope_path1_e_lzsa ; east bg + .word telescope_path1_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; STONEY_TELESCOPE_PATH2 -- path to telescope +location29: + .byte $ff ; north exit + .byte $ff ; south exit + .byte STONEY_TELESCOPE_PATH3 ; east exit + .byte STONEY_TELESCOPE_PATH1 ; 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 telescope_path2_e_lzsa ; east bg + .word telescope_path2_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; STONEY_TELESCOPE_PATH3 -- path to telescope +location30: + .byte $ff ; north exit + .byte $ff ; south exit + .byte STONEY_TELESCOPE ; east exit + .byte STONEY_TELESCOPE_PATH2 ; 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 telescope_path3_w_lzsa ; east bg + .word telescope_path3_e_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; STONEY_TELESCOPE -- telescope +location31: + .byte $ff ; north exit + .byte $ff ; south exit + .byte STONEY_TELESCOPE_VIEW ; east exit + .byte STONEY_TELESCOPE_PATH3 ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E|DIRECTION_SPLIT ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word telescope_e_lzsa ; east bg + .word telescope_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; STONEY_TELESCOPE_VIEW -- telescope +location32: + .byte $ff ; north exit + .byte $ff ; south exit + .byte STONEY_TELESCOPE ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte $ff ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word telescope_view_lzsa ; east bg + .word $0000 ; west bg + .byte BG_EAST + .byte $ff