From 310781167f731177d6d46b15093dc32606eeac4e Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sun, 18 Mar 2018 13:31:57 +0100 Subject: [PATCH] fixed name of element 'beamer' to 'teleporter' --- docs/elements/mm_beamer.txt | 1 - docs/elements/mm_teleporter.txt | 1 + src/conf_gfx.c | 648 ++++++++++++++++---------------- src/editor.c | 168 ++++----- src/game_mm/mm_main.c | 162 ++++---- src/main.c | 484 ++++++++++++------------ src/main.h | 180 ++++----- 7 files changed, 822 insertions(+), 822 deletions(-) delete mode 100644 docs/elements/mm_beamer.txt create mode 100644 docs/elements/mm_teleporter.txt diff --git a/docs/elements/mm_beamer.txt b/docs/elements/mm_beamer.txt deleted file mode 100644 index b1e03cff..00000000 --- a/docs/elements/mm_beamer.txt +++ /dev/null @@ -1 +0,0 @@ -Beamers can teleport the ray of light to their twin of the same color. diff --git a/docs/elements/mm_teleporter.txt b/docs/elements/mm_teleporter.txt new file mode 100644 index 00000000..92d7a698 --- /dev/null +++ b/docs/elements/mm_teleporter.txt @@ -0,0 +1 @@ +Teleporters can transfer the ray of light to their twin of the same color. diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 6bbe1d49..2cff9f1f 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -4603,330 +4603,330 @@ struct ConfigInfo image_config[] = { "mm_polarizer_cross_4.ypos", "6" }, { "mm_polarizer_cross_4.frames", "1" }, - { "mm_beamer_1", "RocksMM.png" }, - { "mm_beamer_1.xpos", "0" }, - { "mm_beamer_1.ypos", "3" }, - { "mm_beamer_1.frames", "1" }, - { "mm_beamer_2", "RocksMM.png" }, - { "mm_beamer_2.xpos", "1" }, - { "mm_beamer_2.ypos", "3" }, - { "mm_beamer_2.frames", "1" }, - { "mm_beamer_3", "RocksMM.png" }, - { "mm_beamer_3.xpos", "2" }, - { "mm_beamer_3.ypos", "3" }, - { "mm_beamer_3.frames", "1" }, - { "mm_beamer_4", "RocksMM.png" }, - { "mm_beamer_4.xpos", "3" }, - { "mm_beamer_4.ypos", "3" }, - { "mm_beamer_4.frames", "1" }, - { "mm_beamer_5", "RocksMM.png" }, - { "mm_beamer_5.xpos", "4" }, - { "mm_beamer_5.ypos", "3" }, - { "mm_beamer_5.frames", "1" }, - { "mm_beamer_6", "RocksMM.png" }, - { "mm_beamer_6.xpos", "5" }, - { "mm_beamer_6.ypos", "3" }, - { "mm_beamer_6.frames", "1" }, - { "mm_beamer_7", "RocksMM.png" }, - { "mm_beamer_7.xpos", "6" }, - { "mm_beamer_7.ypos", "3" }, - { "mm_beamer_7.frames", "1" }, - { "mm_beamer_8", "RocksMM.png" }, - { "mm_beamer_8.xpos", "7" }, - { "mm_beamer_8.ypos", "3" }, - { "mm_beamer_8.frames", "1" }, - { "mm_beamer_9", "RocksMM.png" }, - { "mm_beamer_9.xpos", "8" }, - { "mm_beamer_9.ypos", "3" }, - { "mm_beamer_9.frames", "1" }, - { "mm_beamer_10", "RocksMM.png" }, - { "mm_beamer_10.xpos", "9" }, - { "mm_beamer_10.ypos", "3" }, - { "mm_beamer_10.frames", "1" }, - { "mm_beamer_11", "RocksMM.png" }, - { "mm_beamer_11.xpos", "10" }, - { "mm_beamer_11.ypos", "3" }, - { "mm_beamer_11.frames", "1" }, - { "mm_beamer_12", "RocksMM.png" }, - { "mm_beamer_12.xpos", "11" }, - { "mm_beamer_12.ypos", "3" }, - { "mm_beamer_12.frames", "1" }, - { "mm_beamer_13", "RocksMM.png" }, - { "mm_beamer_13.xpos", "12" }, - { "mm_beamer_13.ypos", "3" }, - { "mm_beamer_13.frames", "1" }, - { "mm_beamer_14", "RocksMM.png" }, - { "mm_beamer_14.xpos", "13" }, - { "mm_beamer_14.ypos", "3" }, - { "mm_beamer_14.frames", "1" }, - { "mm_beamer_15", "RocksMM.png" }, - { "mm_beamer_15.xpos", "14" }, - { "mm_beamer_15.ypos", "3" }, - { "mm_beamer_15.frames", "1" }, - { "mm_beamer_16", "RocksMM.png" }, - { "mm_beamer_16.xpos", "15" }, - { "mm_beamer_16.ypos", "3" }, - { "mm_beamer_16.frames", "1" }, - - { "mm_beamer_red_1", "RocksDF.png" }, - { "mm_beamer_red_1.xpos", "0" }, - { "mm_beamer_red_1.ypos", "4" }, - { "mm_beamer_red_1.frames", "1" }, - { "mm_beamer_red_2", "RocksDF.png" }, - { "mm_beamer_red_2.xpos", "1" }, - { "mm_beamer_red_2.ypos", "4" }, - { "mm_beamer_red_2.frames", "1" }, - { "mm_beamer_red_3", "RocksDF.png" }, - { "mm_beamer_red_3.xpos", "2" }, - { "mm_beamer_red_3.ypos", "4" }, - { "mm_beamer_red_3.frames", "1" }, - { "mm_beamer_red_4", "RocksDF.png" }, - { "mm_beamer_red_4.xpos", "3" }, - { "mm_beamer_red_4.ypos", "4" }, - { "mm_beamer_red_4.frames", "1" }, - { "mm_beamer_red_5", "RocksDF.png" }, - { "mm_beamer_red_5.xpos", "4" }, - { "mm_beamer_red_5.ypos", "4" }, - { "mm_beamer_red_5.frames", "1" }, - { "mm_beamer_red_6", "RocksDF.png" }, - { "mm_beamer_red_6.xpos", "5" }, - { "mm_beamer_red_6.ypos", "4" }, - { "mm_beamer_red_6.frames", "1" }, - { "mm_beamer_red_7", "RocksDF.png" }, - { "mm_beamer_red_7.xpos", "6" }, - { "mm_beamer_red_7.ypos", "4" }, - { "mm_beamer_red_7.frames", "1" }, - { "mm_beamer_red_8", "RocksDF.png" }, - { "mm_beamer_red_8.xpos", "7" }, - { "mm_beamer_red_8.ypos", "4" }, - { "mm_beamer_red_8.frames", "1" }, - { "mm_beamer_red_9", "RocksDF.png" }, - { "mm_beamer_red_9.xpos", "8" }, - { "mm_beamer_red_9.ypos", "4" }, - { "mm_beamer_red_9.frames", "1" }, - { "mm_beamer_red_10", "RocksDF.png" }, - { "mm_beamer_red_10.xpos", "9" }, - { "mm_beamer_red_10.ypos", "4" }, - { "mm_beamer_red_10.frames", "1" }, - { "mm_beamer_red_11", "RocksDF.png" }, - { "mm_beamer_red_11.xpos", "10" }, - { "mm_beamer_red_11.ypos", "4" }, - { "mm_beamer_red_11.frames", "1" }, - { "mm_beamer_red_12", "RocksDF.png" }, - { "mm_beamer_red_12.xpos", "11" }, - { "mm_beamer_red_12.ypos", "4" }, - { "mm_beamer_red_12.frames", "1" }, - { "mm_beamer_red_13", "RocksDF.png" }, - { "mm_beamer_red_13.xpos", "12" }, - { "mm_beamer_red_13.ypos", "4" }, - { "mm_beamer_red_13.frames", "1" }, - { "mm_beamer_red_14", "RocksDF.png" }, - { "mm_beamer_red_14.xpos", "13" }, - { "mm_beamer_red_14.ypos", "4" }, - { "mm_beamer_red_14.frames", "1" }, - { "mm_beamer_red_15", "RocksDF.png" }, - { "mm_beamer_red_15.xpos", "14" }, - { "mm_beamer_red_15.ypos", "4" }, - { "mm_beamer_red_15.frames", "1" }, - { "mm_beamer_red_16", "RocksDF.png" }, - { "mm_beamer_red_16.xpos", "15" }, - { "mm_beamer_red_16.ypos", "4" }, - { "mm_beamer_red_16.frames", "1" }, - - { "mm_beamer_yellow_1", "RocksDF.png" }, - { "mm_beamer_yellow_1.xpos", "0" }, - { "mm_beamer_yellow_1.ypos", "5" }, - { "mm_beamer_yellow_1.frames", "1" }, - { "mm_beamer_yellow_2", "RocksDF.png" }, - { "mm_beamer_yellow_2.xpos", "1" }, - { "mm_beamer_yellow_2.ypos", "5" }, - { "mm_beamer_yellow_2.frames", "1" }, - { "mm_beamer_yellow_3", "RocksDF.png" }, - { "mm_beamer_yellow_3.xpos", "2" }, - { "mm_beamer_yellow_3.ypos", "5" }, - { "mm_beamer_yellow_3.frames", "1" }, - { "mm_beamer_yellow_4", "RocksDF.png" }, - { "mm_beamer_yellow_4.xpos", "3" }, - { "mm_beamer_yellow_4.ypos", "5" }, - { "mm_beamer_yellow_4.frames", "1" }, - { "mm_beamer_yellow_5", "RocksDF.png" }, - { "mm_beamer_yellow_5.xpos", "4" }, - { "mm_beamer_yellow_5.ypos", "5" }, - { "mm_beamer_yellow_5.frames", "1" }, - { "mm_beamer_yellow_6", "RocksDF.png" }, - { "mm_beamer_yellow_6.xpos", "5" }, - { "mm_beamer_yellow_6.ypos", "5" }, - { "mm_beamer_yellow_6.frames", "1" }, - { "mm_beamer_yellow_7", "RocksDF.png" }, - { "mm_beamer_yellow_7.xpos", "6" }, - { "mm_beamer_yellow_7.ypos", "5" }, - { "mm_beamer_yellow_7.frames", "1" }, - { "mm_beamer_yellow_8", "RocksDF.png" }, - { "mm_beamer_yellow_8.xpos", "7" }, - { "mm_beamer_yellow_8.ypos", "5" }, - { "mm_beamer_yellow_8.frames", "1" }, - { "mm_beamer_yellow_9", "RocksDF.png" }, - { "mm_beamer_yellow_9.xpos", "8" }, - { "mm_beamer_yellow_9.ypos", "5" }, - { "mm_beamer_yellow_9.frames", "1" }, - { "mm_beamer_yellow_10", "RocksDF.png" }, - { "mm_beamer_yellow_10.xpos", "9" }, - { "mm_beamer_yellow_10.ypos", "5" }, - { "mm_beamer_yellow_10.frames", "1" }, - { "mm_beamer_yellow_11", "RocksDF.png" }, - { "mm_beamer_yellow_11.xpos", "10" }, - { "mm_beamer_yellow_11.ypos", "5" }, - { "mm_beamer_yellow_11.frames", "1" }, - { "mm_beamer_yellow_12", "RocksDF.png" }, - { "mm_beamer_yellow_12.xpos", "11" }, - { "mm_beamer_yellow_12.ypos", "5" }, - { "mm_beamer_yellow_12.frames", "1" }, - { "mm_beamer_yellow_13", "RocksDF.png" }, - { "mm_beamer_yellow_13.xpos", "12" }, - { "mm_beamer_yellow_13.ypos", "5" }, - { "mm_beamer_yellow_13.frames", "1" }, - { "mm_beamer_yellow_14", "RocksDF.png" }, - { "mm_beamer_yellow_14.xpos", "13" }, - { "mm_beamer_yellow_14.ypos", "5" }, - { "mm_beamer_yellow_14.frames", "1" }, - { "mm_beamer_yellow_15", "RocksDF.png" }, - { "mm_beamer_yellow_15.xpos", "14" }, - { "mm_beamer_yellow_15.ypos", "5" }, - { "mm_beamer_yellow_15.frames", "1" }, - { "mm_beamer_yellow_16", "RocksDF.png" }, - { "mm_beamer_yellow_16.xpos", "15" }, - { "mm_beamer_yellow_16.ypos", "5" }, - { "mm_beamer_yellow_16.frames", "1" }, - - { "mm_beamer_green_1", "RocksDF.png" }, - { "mm_beamer_green_1.xpos", "0" }, - { "mm_beamer_green_1.ypos", "6" }, - { "mm_beamer_green_1.frames", "1" }, - { "mm_beamer_green_2", "RocksDF.png" }, - { "mm_beamer_green_2.xpos", "1" }, - { "mm_beamer_green_2.ypos", "6" }, - { "mm_beamer_green_2.frames", "1" }, - { "mm_beamer_green_3", "RocksDF.png" }, - { "mm_beamer_green_3.xpos", "2" }, - { "mm_beamer_green_3.ypos", "6" }, - { "mm_beamer_green_3.frames", "1" }, - { "mm_beamer_green_4", "RocksDF.png" }, - { "mm_beamer_green_4.xpos", "3" }, - { "mm_beamer_green_4.ypos", "6" }, - { "mm_beamer_green_4.frames", "1" }, - { "mm_beamer_green_5", "RocksDF.png" }, - { "mm_beamer_green_5.xpos", "4" }, - { "mm_beamer_green_5.ypos", "6" }, - { "mm_beamer_green_5.frames", "1" }, - { "mm_beamer_green_6", "RocksDF.png" }, - { "mm_beamer_green_6.xpos", "5" }, - { "mm_beamer_green_6.ypos", "6" }, - { "mm_beamer_green_6.frames", "1" }, - { "mm_beamer_green_7", "RocksDF.png" }, - { "mm_beamer_green_7.xpos", "6" }, - { "mm_beamer_green_7.ypos", "6" }, - { "mm_beamer_green_7.frames", "1" }, - { "mm_beamer_green_8", "RocksDF.png" }, - { "mm_beamer_green_8.xpos", "7" }, - { "mm_beamer_green_8.ypos", "6" }, - { "mm_beamer_green_8.frames", "1" }, - { "mm_beamer_green_9", "RocksDF.png" }, - { "mm_beamer_green_9.xpos", "8" }, - { "mm_beamer_green_9.ypos", "6" }, - { "mm_beamer_green_9.frames", "1" }, - { "mm_beamer_green_10", "RocksDF.png" }, - { "mm_beamer_green_10.xpos", "9" }, - { "mm_beamer_green_10.ypos", "6" }, - { "mm_beamer_green_10.frames", "1" }, - { "mm_beamer_green_11", "RocksDF.png" }, - { "mm_beamer_green_11.xpos", "10" }, - { "mm_beamer_green_11.ypos", "6" }, - { "mm_beamer_green_11.frames", "1" }, - { "mm_beamer_green_12", "RocksDF.png" }, - { "mm_beamer_green_12.xpos", "11" }, - { "mm_beamer_green_12.ypos", "6" }, - { "mm_beamer_green_12.frames", "1" }, - { "mm_beamer_green_13", "RocksDF.png" }, - { "mm_beamer_green_13.xpos", "12" }, - { "mm_beamer_green_13.ypos", "6" }, - { "mm_beamer_green_13.frames", "1" }, - { "mm_beamer_green_14", "RocksDF.png" }, - { "mm_beamer_green_14.xpos", "13" }, - { "mm_beamer_green_14.ypos", "6" }, - { "mm_beamer_green_14.frames", "1" }, - { "mm_beamer_green_15", "RocksDF.png" }, - { "mm_beamer_green_15.xpos", "14" }, - { "mm_beamer_green_15.ypos", "6" }, - { "mm_beamer_green_15.frames", "1" }, - { "mm_beamer_green_16", "RocksDF.png" }, - { "mm_beamer_green_16.xpos", "15" }, - { "mm_beamer_green_16.ypos", "6" }, - { "mm_beamer_green_16.frames", "1" }, - - { "mm_beamer_blue_1", "RocksDF.png" }, - { "mm_beamer_blue_1.xpos", "0" }, - { "mm_beamer_blue_1.ypos", "7" }, - { "mm_beamer_blue_1.frames", "1" }, - { "mm_beamer_blue_2", "RocksDF.png" }, - { "mm_beamer_blue_2.xpos", "1" }, - { "mm_beamer_blue_2.ypos", "7" }, - { "mm_beamer_blue_2.frames", "1" }, - { "mm_beamer_blue_3", "RocksDF.png" }, - { "mm_beamer_blue_3.xpos", "2" }, - { "mm_beamer_blue_3.ypos", "7" }, - { "mm_beamer_blue_3.frames", "1" }, - { "mm_beamer_blue_4", "RocksDF.png" }, - { "mm_beamer_blue_4.xpos", "3" }, - { "mm_beamer_blue_4.ypos", "7" }, - { "mm_beamer_blue_4.frames", "1" }, - { "mm_beamer_blue_5", "RocksDF.png" }, - { "mm_beamer_blue_5.xpos", "4" }, - { "mm_beamer_blue_5.ypos", "7" }, - { "mm_beamer_blue_5.frames", "1" }, - { "mm_beamer_blue_6", "RocksDF.png" }, - { "mm_beamer_blue_6.xpos", "5" }, - { "mm_beamer_blue_6.ypos", "7" }, - { "mm_beamer_blue_6.frames", "1" }, - { "mm_beamer_blue_7", "RocksDF.png" }, - { "mm_beamer_blue_7.xpos", "6" }, - { "mm_beamer_blue_7.ypos", "7" }, - { "mm_beamer_blue_7.frames", "1" }, - { "mm_beamer_blue_8", "RocksDF.png" }, - { "mm_beamer_blue_8.xpos", "7" }, - { "mm_beamer_blue_8.ypos", "7" }, - { "mm_beamer_blue_8.frames", "1" }, - { "mm_beamer_blue_9", "RocksDF.png" }, - { "mm_beamer_blue_9.xpos", "8" }, - { "mm_beamer_blue_9.ypos", "7" }, - { "mm_beamer_blue_9.frames", "1" }, - { "mm_beamer_blue_10", "RocksDF.png" }, - { "mm_beamer_blue_10.xpos", "9" }, - { "mm_beamer_blue_10.ypos", "7" }, - { "mm_beamer_blue_10.frames", "1" }, - { "mm_beamer_blue_11", "RocksDF.png" }, - { "mm_beamer_blue_11.xpos", "10" }, - { "mm_beamer_blue_11.ypos", "7" }, - { "mm_beamer_blue_11.frames", "1" }, - { "mm_beamer_blue_12", "RocksDF.png" }, - { "mm_beamer_blue_12.xpos", "11" }, - { "mm_beamer_blue_12.ypos", "7" }, - { "mm_beamer_blue_12.frames", "1" }, - { "mm_beamer_blue_13", "RocksDF.png" }, - { "mm_beamer_blue_13.xpos", "12" }, - { "mm_beamer_blue_13.ypos", "7" }, - { "mm_beamer_blue_13.frames", "1" }, - { "mm_beamer_blue_14", "RocksDF.png" }, - { "mm_beamer_blue_14.xpos", "13" }, - { "mm_beamer_blue_14.ypos", "7" }, - { "mm_beamer_blue_14.frames", "1" }, - { "mm_beamer_blue_15", "RocksDF.png" }, - { "mm_beamer_blue_15.xpos", "14" }, - { "mm_beamer_blue_15.ypos", "7" }, - { "mm_beamer_blue_15.frames", "1" }, - { "mm_beamer_blue_16", "RocksDF.png" }, - { "mm_beamer_blue_16.xpos", "15" }, - { "mm_beamer_blue_16.ypos", "7" }, - { "mm_beamer_blue_16.frames", "1" }, + { "mm_teleporter_1", "RocksMM.png" }, + { "mm_teleporter_1.xpos", "0" }, + { "mm_teleporter_1.ypos", "3" }, + { "mm_teleporter_1.frames", "1" }, + { "mm_teleporter_2", "RocksMM.png" }, + { "mm_teleporter_2.xpos", "1" }, + { "mm_teleporter_2.ypos", "3" }, + { "mm_teleporter_2.frames", "1" }, + { "mm_teleporter_3", "RocksMM.png" }, + { "mm_teleporter_3.xpos", "2" }, + { "mm_teleporter_3.ypos", "3" }, + { "mm_teleporter_3.frames", "1" }, + { "mm_teleporter_4", "RocksMM.png" }, + { "mm_teleporter_4.xpos", "3" }, + { "mm_teleporter_4.ypos", "3" }, + { "mm_teleporter_4.frames", "1" }, + { "mm_teleporter_5", "RocksMM.png" }, + { "mm_teleporter_5.xpos", "4" }, + { "mm_teleporter_5.ypos", "3" }, + { "mm_teleporter_5.frames", "1" }, + { "mm_teleporter_6", "RocksMM.png" }, + { "mm_teleporter_6.xpos", "5" }, + { "mm_teleporter_6.ypos", "3" }, + { "mm_teleporter_6.frames", "1" }, + { "mm_teleporter_7", "RocksMM.png" }, + { "mm_teleporter_7.xpos", "6" }, + { "mm_teleporter_7.ypos", "3" }, + { "mm_teleporter_7.frames", "1" }, + { "mm_teleporter_8", "RocksMM.png" }, + { "mm_teleporter_8.xpos", "7" }, + { "mm_teleporter_8.ypos", "3" }, + { "mm_teleporter_8.frames", "1" }, + { "mm_teleporter_9", "RocksMM.png" }, + { "mm_teleporter_9.xpos", "8" }, + { "mm_teleporter_9.ypos", "3" }, + { "mm_teleporter_9.frames", "1" }, + { "mm_teleporter_10", "RocksMM.png" }, + { "mm_teleporter_10.xpos", "9" }, + { "mm_teleporter_10.ypos", "3" }, + { "mm_teleporter_10.frames", "1" }, + { "mm_teleporter_11", "RocksMM.png" }, + { "mm_teleporter_11.xpos", "10" }, + { "mm_teleporter_11.ypos", "3" }, + { "mm_teleporter_11.frames", "1" }, + { "mm_teleporter_12", "RocksMM.png" }, + { "mm_teleporter_12.xpos", "11" }, + { "mm_teleporter_12.ypos", "3" }, + { "mm_teleporter_12.frames", "1" }, + { "mm_teleporter_13", "RocksMM.png" }, + { "mm_teleporter_13.xpos", "12" }, + { "mm_teleporter_13.ypos", "3" }, + { "mm_teleporter_13.frames", "1" }, + { "mm_teleporter_14", "RocksMM.png" }, + { "mm_teleporter_14.xpos", "13" }, + { "mm_teleporter_14.ypos", "3" }, + { "mm_teleporter_14.frames", "1" }, + { "mm_teleporter_15", "RocksMM.png" }, + { "mm_teleporter_15.xpos", "14" }, + { "mm_teleporter_15.ypos", "3" }, + { "mm_teleporter_15.frames", "1" }, + { "mm_teleporter_16", "RocksMM.png" }, + { "mm_teleporter_16.xpos", "15" }, + { "mm_teleporter_16.ypos", "3" }, + { "mm_teleporter_16.frames", "1" }, + + { "mm_teleporter_red_1", "RocksDF.png" }, + { "mm_teleporter_red_1.xpos", "0" }, + { "mm_teleporter_red_1.ypos", "4" }, + { "mm_teleporter_red_1.frames", "1" }, + { "mm_teleporter_red_2", "RocksDF.png" }, + { "mm_teleporter_red_2.xpos", "1" }, + { "mm_teleporter_red_2.ypos", "4" }, + { "mm_teleporter_red_2.frames", "1" }, + { "mm_teleporter_red_3", "RocksDF.png" }, + { "mm_teleporter_red_3.xpos", "2" }, + { "mm_teleporter_red_3.ypos", "4" }, + { "mm_teleporter_red_3.frames", "1" }, + { "mm_teleporter_red_4", "RocksDF.png" }, + { "mm_teleporter_red_4.xpos", "3" }, + { "mm_teleporter_red_4.ypos", "4" }, + { "mm_teleporter_red_4.frames", "1" }, + { "mm_teleporter_red_5", "RocksDF.png" }, + { "mm_teleporter_red_5.xpos", "4" }, + { "mm_teleporter_red_5.ypos", "4" }, + { "mm_teleporter_red_5.frames", "1" }, + { "mm_teleporter_red_6", "RocksDF.png" }, + { "mm_teleporter_red_6.xpos", "5" }, + { "mm_teleporter_red_6.ypos", "4" }, + { "mm_teleporter_red_6.frames", "1" }, + { "mm_teleporter_red_7", "RocksDF.png" }, + { "mm_teleporter_red_7.xpos", "6" }, + { "mm_teleporter_red_7.ypos", "4" }, + { "mm_teleporter_red_7.frames", "1" }, + { "mm_teleporter_red_8", "RocksDF.png" }, + { "mm_teleporter_red_8.xpos", "7" }, + { "mm_teleporter_red_8.ypos", "4" }, + { "mm_teleporter_red_8.frames", "1" }, + { "mm_teleporter_red_9", "RocksDF.png" }, + { "mm_teleporter_red_9.xpos", "8" }, + { "mm_teleporter_red_9.ypos", "4" }, + { "mm_teleporter_red_9.frames", "1" }, + { "mm_teleporter_red_10", "RocksDF.png" }, + { "mm_teleporter_red_10.xpos", "9" }, + { "mm_teleporter_red_10.ypos", "4" }, + { "mm_teleporter_red_10.frames", "1" }, + { "mm_teleporter_red_11", "RocksDF.png" }, + { "mm_teleporter_red_11.xpos", "10" }, + { "mm_teleporter_red_11.ypos", "4" }, + { "mm_teleporter_red_11.frames", "1" }, + { "mm_teleporter_red_12", "RocksDF.png" }, + { "mm_teleporter_red_12.xpos", "11" }, + { "mm_teleporter_red_12.ypos", "4" }, + { "mm_teleporter_red_12.frames", "1" }, + { "mm_teleporter_red_13", "RocksDF.png" }, + { "mm_teleporter_red_13.xpos", "12" }, + { "mm_teleporter_red_13.ypos", "4" }, + { "mm_teleporter_red_13.frames", "1" }, + { "mm_teleporter_red_14", "RocksDF.png" }, + { "mm_teleporter_red_14.xpos", "13" }, + { "mm_teleporter_red_14.ypos", "4" }, + { "mm_teleporter_red_14.frames", "1" }, + { "mm_teleporter_red_15", "RocksDF.png" }, + { "mm_teleporter_red_15.xpos", "14" }, + { "mm_teleporter_red_15.ypos", "4" }, + { "mm_teleporter_red_15.frames", "1" }, + { "mm_teleporter_red_16", "RocksDF.png" }, + { "mm_teleporter_red_16.xpos", "15" }, + { "mm_teleporter_red_16.ypos", "4" }, + { "mm_teleporter_red_16.frames", "1" }, + + { "mm_teleporter_yellow_1", "RocksDF.png" }, + { "mm_teleporter_yellow_1.xpos", "0" }, + { "mm_teleporter_yellow_1.ypos", "5" }, + { "mm_teleporter_yellow_1.frames", "1" }, + { "mm_teleporter_yellow_2", "RocksDF.png" }, + { "mm_teleporter_yellow_2.xpos", "1" }, + { "mm_teleporter_yellow_2.ypos", "5" }, + { "mm_teleporter_yellow_2.frames", "1" }, + { "mm_teleporter_yellow_3", "RocksDF.png" }, + { "mm_teleporter_yellow_3.xpos", "2" }, + { "mm_teleporter_yellow_3.ypos", "5" }, + { "mm_teleporter_yellow_3.frames", "1" }, + { "mm_teleporter_yellow_4", "RocksDF.png" }, + { "mm_teleporter_yellow_4.xpos", "3" }, + { "mm_teleporter_yellow_4.ypos", "5" }, + { "mm_teleporter_yellow_4.frames", "1" }, + { "mm_teleporter_yellow_5", "RocksDF.png" }, + { "mm_teleporter_yellow_5.xpos", "4" }, + { "mm_teleporter_yellow_5.ypos", "5" }, + { "mm_teleporter_yellow_5.frames", "1" }, + { "mm_teleporter_yellow_6", "RocksDF.png" }, + { "mm_teleporter_yellow_6.xpos", "5" }, + { "mm_teleporter_yellow_6.ypos", "5" }, + { "mm_teleporter_yellow_6.frames", "1" }, + { "mm_teleporter_yellow_7", "RocksDF.png" }, + { "mm_teleporter_yellow_7.xpos", "6" }, + { "mm_teleporter_yellow_7.ypos", "5" }, + { "mm_teleporter_yellow_7.frames", "1" }, + { "mm_teleporter_yellow_8", "RocksDF.png" }, + { "mm_teleporter_yellow_8.xpos", "7" }, + { "mm_teleporter_yellow_8.ypos", "5" }, + { "mm_teleporter_yellow_8.frames", "1" }, + { "mm_teleporter_yellow_9", "RocksDF.png" }, + { "mm_teleporter_yellow_9.xpos", "8" }, + { "mm_teleporter_yellow_9.ypos", "5" }, + { "mm_teleporter_yellow_9.frames", "1" }, + { "mm_teleporter_yellow_10", "RocksDF.png" }, + { "mm_teleporter_yellow_10.xpos", "9" }, + { "mm_teleporter_yellow_10.ypos", "5" }, + { "mm_teleporter_yellow_10.frames", "1" }, + { "mm_teleporter_yellow_11", "RocksDF.png" }, + { "mm_teleporter_yellow_11.xpos", "10" }, + { "mm_teleporter_yellow_11.ypos", "5" }, + { "mm_teleporter_yellow_11.frames", "1" }, + { "mm_teleporter_yellow_12", "RocksDF.png" }, + { "mm_teleporter_yellow_12.xpos", "11" }, + { "mm_teleporter_yellow_12.ypos", "5" }, + { "mm_teleporter_yellow_12.frames", "1" }, + { "mm_teleporter_yellow_13", "RocksDF.png" }, + { "mm_teleporter_yellow_13.xpos", "12" }, + { "mm_teleporter_yellow_13.ypos", "5" }, + { "mm_teleporter_yellow_13.frames", "1" }, + { "mm_teleporter_yellow_14", "RocksDF.png" }, + { "mm_teleporter_yellow_14.xpos", "13" }, + { "mm_teleporter_yellow_14.ypos", "5" }, + { "mm_teleporter_yellow_14.frames", "1" }, + { "mm_teleporter_yellow_15", "RocksDF.png" }, + { "mm_teleporter_yellow_15.xpos", "14" }, + { "mm_teleporter_yellow_15.ypos", "5" }, + { "mm_teleporter_yellow_15.frames", "1" }, + { "mm_teleporter_yellow_16", "RocksDF.png" }, + { "mm_teleporter_yellow_16.xpos", "15" }, + { "mm_teleporter_yellow_16.ypos", "5" }, + { "mm_teleporter_yellow_16.frames", "1" }, + + { "mm_teleporter_green_1", "RocksDF.png" }, + { "mm_teleporter_green_1.xpos", "0" }, + { "mm_teleporter_green_1.ypos", "6" }, + { "mm_teleporter_green_1.frames", "1" }, + { "mm_teleporter_green_2", "RocksDF.png" }, + { "mm_teleporter_green_2.xpos", "1" }, + { "mm_teleporter_green_2.ypos", "6" }, + { "mm_teleporter_green_2.frames", "1" }, + { "mm_teleporter_green_3", "RocksDF.png" }, + { "mm_teleporter_green_3.xpos", "2" }, + { "mm_teleporter_green_3.ypos", "6" }, + { "mm_teleporter_green_3.frames", "1" }, + { "mm_teleporter_green_4", "RocksDF.png" }, + { "mm_teleporter_green_4.xpos", "3" }, + { "mm_teleporter_green_4.ypos", "6" }, + { "mm_teleporter_green_4.frames", "1" }, + { "mm_teleporter_green_5", "RocksDF.png" }, + { "mm_teleporter_green_5.xpos", "4" }, + { "mm_teleporter_green_5.ypos", "6" }, + { "mm_teleporter_green_5.frames", "1" }, + { "mm_teleporter_green_6", "RocksDF.png" }, + { "mm_teleporter_green_6.xpos", "5" }, + { "mm_teleporter_green_6.ypos", "6" }, + { "mm_teleporter_green_6.frames", "1" }, + { "mm_teleporter_green_7", "RocksDF.png" }, + { "mm_teleporter_green_7.xpos", "6" }, + { "mm_teleporter_green_7.ypos", "6" }, + { "mm_teleporter_green_7.frames", "1" }, + { "mm_teleporter_green_8", "RocksDF.png" }, + { "mm_teleporter_green_8.xpos", "7" }, + { "mm_teleporter_green_8.ypos", "6" }, + { "mm_teleporter_green_8.frames", "1" }, + { "mm_teleporter_green_9", "RocksDF.png" }, + { "mm_teleporter_green_9.xpos", "8" }, + { "mm_teleporter_green_9.ypos", "6" }, + { "mm_teleporter_green_9.frames", "1" }, + { "mm_teleporter_green_10", "RocksDF.png" }, + { "mm_teleporter_green_10.xpos", "9" }, + { "mm_teleporter_green_10.ypos", "6" }, + { "mm_teleporter_green_10.frames", "1" }, + { "mm_teleporter_green_11", "RocksDF.png" }, + { "mm_teleporter_green_11.xpos", "10" }, + { "mm_teleporter_green_11.ypos", "6" }, + { "mm_teleporter_green_11.frames", "1" }, + { "mm_teleporter_green_12", "RocksDF.png" }, + { "mm_teleporter_green_12.xpos", "11" }, + { "mm_teleporter_green_12.ypos", "6" }, + { "mm_teleporter_green_12.frames", "1" }, + { "mm_teleporter_green_13", "RocksDF.png" }, + { "mm_teleporter_green_13.xpos", "12" }, + { "mm_teleporter_green_13.ypos", "6" }, + { "mm_teleporter_green_13.frames", "1" }, + { "mm_teleporter_green_14", "RocksDF.png" }, + { "mm_teleporter_green_14.xpos", "13" }, + { "mm_teleporter_green_14.ypos", "6" }, + { "mm_teleporter_green_14.frames", "1" }, + { "mm_teleporter_green_15", "RocksDF.png" }, + { "mm_teleporter_green_15.xpos", "14" }, + { "mm_teleporter_green_15.ypos", "6" }, + { "mm_teleporter_green_15.frames", "1" }, + { "mm_teleporter_green_16", "RocksDF.png" }, + { "mm_teleporter_green_16.xpos", "15" }, + { "mm_teleporter_green_16.ypos", "6" }, + { "mm_teleporter_green_16.frames", "1" }, + + { "mm_teleporter_blue_1", "RocksDF.png" }, + { "mm_teleporter_blue_1.xpos", "0" }, + { "mm_teleporter_blue_1.ypos", "7" }, + { "mm_teleporter_blue_1.frames", "1" }, + { "mm_teleporter_blue_2", "RocksDF.png" }, + { "mm_teleporter_blue_2.xpos", "1" }, + { "mm_teleporter_blue_2.ypos", "7" }, + { "mm_teleporter_blue_2.frames", "1" }, + { "mm_teleporter_blue_3", "RocksDF.png" }, + { "mm_teleporter_blue_3.xpos", "2" }, + { "mm_teleporter_blue_3.ypos", "7" }, + { "mm_teleporter_blue_3.frames", "1" }, + { "mm_teleporter_blue_4", "RocksDF.png" }, + { "mm_teleporter_blue_4.xpos", "3" }, + { "mm_teleporter_blue_4.ypos", "7" }, + { "mm_teleporter_blue_4.frames", "1" }, + { "mm_teleporter_blue_5", "RocksDF.png" }, + { "mm_teleporter_blue_5.xpos", "4" }, + { "mm_teleporter_blue_5.ypos", "7" }, + { "mm_teleporter_blue_5.frames", "1" }, + { "mm_teleporter_blue_6", "RocksDF.png" }, + { "mm_teleporter_blue_6.xpos", "5" }, + { "mm_teleporter_blue_6.ypos", "7" }, + { "mm_teleporter_blue_6.frames", "1" }, + { "mm_teleporter_blue_7", "RocksDF.png" }, + { "mm_teleporter_blue_7.xpos", "6" }, + { "mm_teleporter_blue_7.ypos", "7" }, + { "mm_teleporter_blue_7.frames", "1" }, + { "mm_teleporter_blue_8", "RocksDF.png" }, + { "mm_teleporter_blue_8.xpos", "7" }, + { "mm_teleporter_blue_8.ypos", "7" }, + { "mm_teleporter_blue_8.frames", "1" }, + { "mm_teleporter_blue_9", "RocksDF.png" }, + { "mm_teleporter_blue_9.xpos", "8" }, + { "mm_teleporter_blue_9.ypos", "7" }, + { "mm_teleporter_blue_9.frames", "1" }, + { "mm_teleporter_blue_10", "RocksDF.png" }, + { "mm_teleporter_blue_10.xpos", "9" }, + { "mm_teleporter_blue_10.ypos", "7" }, + { "mm_teleporter_blue_10.frames", "1" }, + { "mm_teleporter_blue_11", "RocksDF.png" }, + { "mm_teleporter_blue_11.xpos", "10" }, + { "mm_teleporter_blue_11.ypos", "7" }, + { "mm_teleporter_blue_11.frames", "1" }, + { "mm_teleporter_blue_12", "RocksDF.png" }, + { "mm_teleporter_blue_12.xpos", "11" }, + { "mm_teleporter_blue_12.ypos", "7" }, + { "mm_teleporter_blue_12.frames", "1" }, + { "mm_teleporter_blue_13", "RocksDF.png" }, + { "mm_teleporter_blue_13.xpos", "12" }, + { "mm_teleporter_blue_13.ypos", "7" }, + { "mm_teleporter_blue_13.frames", "1" }, + { "mm_teleporter_blue_14", "RocksDF.png" }, + { "mm_teleporter_blue_14.xpos", "13" }, + { "mm_teleporter_blue_14.ypos", "7" }, + { "mm_teleporter_blue_14.frames", "1" }, + { "mm_teleporter_blue_15", "RocksDF.png" }, + { "mm_teleporter_blue_15.xpos", "14" }, + { "mm_teleporter_blue_15.ypos", "7" }, + { "mm_teleporter_blue_15.frames", "1" }, + { "mm_teleporter_blue_16", "RocksDF.png" }, + { "mm_teleporter_blue_16.xpos", "15" }, + { "mm_teleporter_blue_16.ypos", "7" }, + { "mm_teleporter_blue_16.frames", "1" }, { "mm_kettle", "RocksMM.png" }, { "mm_kettle.xpos", "12" }, diff --git a/src/editor.c b/src/editor.c index f99794b2..fba668d1 100644 --- a/src/editor.c +++ b/src/editor.c @@ -4425,10 +4425,10 @@ static int editor_el_mirror_magic[] = EL_MM_POLARIZER_START, EL_MM_POLARIZER_CROSS_START, - EL_MM_BEAMER_RED_START, - EL_MM_BEAMER_YELLOW_START, - EL_MM_BEAMER_GREEN_START, - EL_MM_BEAMER_BLUE_START, + EL_MM_TELEPORTER_RED_START, + EL_MM_TELEPORTER_YELLOW_START, + EL_MM_TELEPORTER_GREEN_START, + EL_MM_TELEPORTER_BLUE_START, EL_MM_PRISM, EL_MM_FUSE_ACTIVE, @@ -11297,94 +11297,94 @@ static void SetElementIntelliDraw(int x, int y, int new_element, EL_MM_MIRROR_2 }, { - EL_MM_BEAMER_5, - EL_MM_BEAMER_4, - EL_MM_BEAMER_3, - EL_MM_BEAMER_2, - EL_MM_BEAMER_1, - EL_MM_BEAMER_16, - EL_MM_BEAMER_15, - EL_MM_BEAMER_14, - EL_MM_BEAMER_13, - EL_MM_BEAMER_12, - EL_MM_BEAMER_11, - EL_MM_BEAMER_10, - EL_MM_BEAMER_9, - EL_MM_BEAMER_8, - EL_MM_BEAMER_7, - EL_MM_BEAMER_6 + EL_MM_TELEPORTER_5, + EL_MM_TELEPORTER_4, + EL_MM_TELEPORTER_3, + EL_MM_TELEPORTER_2, + EL_MM_TELEPORTER_1, + EL_MM_TELEPORTER_16, + EL_MM_TELEPORTER_15, + EL_MM_TELEPORTER_14, + EL_MM_TELEPORTER_13, + EL_MM_TELEPORTER_12, + EL_MM_TELEPORTER_11, + EL_MM_TELEPORTER_10, + EL_MM_TELEPORTER_9, + EL_MM_TELEPORTER_8, + EL_MM_TELEPORTER_7, + EL_MM_TELEPORTER_6 }, { - EL_MM_BEAMER_RED_5, - EL_MM_BEAMER_RED_4, - EL_MM_BEAMER_RED_3, - EL_MM_BEAMER_RED_2, - EL_MM_BEAMER_RED_1, - EL_MM_BEAMER_RED_16, - EL_MM_BEAMER_RED_15, - EL_MM_BEAMER_RED_14, - EL_MM_BEAMER_RED_13, - EL_MM_BEAMER_RED_12, - EL_MM_BEAMER_RED_11, - EL_MM_BEAMER_RED_10, - EL_MM_BEAMER_RED_9, - EL_MM_BEAMER_RED_8, - EL_MM_BEAMER_RED_7, - EL_MM_BEAMER_RED_6 + EL_MM_TELEPORTER_RED_5, + EL_MM_TELEPORTER_RED_4, + EL_MM_TELEPORTER_RED_3, + EL_MM_TELEPORTER_RED_2, + EL_MM_TELEPORTER_RED_1, + EL_MM_TELEPORTER_RED_16, + EL_MM_TELEPORTER_RED_15, + EL_MM_TELEPORTER_RED_14, + EL_MM_TELEPORTER_RED_13, + EL_MM_TELEPORTER_RED_12, + EL_MM_TELEPORTER_RED_11, + EL_MM_TELEPORTER_RED_10, + EL_MM_TELEPORTER_RED_9, + EL_MM_TELEPORTER_RED_8, + EL_MM_TELEPORTER_RED_7, + EL_MM_TELEPORTER_RED_6 }, { - EL_MM_BEAMER_YELLOW_5, - EL_MM_BEAMER_YELLOW_4, - EL_MM_BEAMER_YELLOW_3, - EL_MM_BEAMER_YELLOW_2, - EL_MM_BEAMER_YELLOW_1, - EL_MM_BEAMER_YELLOW_16, - EL_MM_BEAMER_YELLOW_15, - EL_MM_BEAMER_YELLOW_14, - EL_MM_BEAMER_YELLOW_13, - EL_MM_BEAMER_YELLOW_12, - EL_MM_BEAMER_YELLOW_11, - EL_MM_BEAMER_YELLOW_10, - EL_MM_BEAMER_YELLOW_9, - EL_MM_BEAMER_YELLOW_8, - EL_MM_BEAMER_YELLOW_7, - EL_MM_BEAMER_YELLOW_6 + EL_MM_TELEPORTER_YELLOW_5, + EL_MM_TELEPORTER_YELLOW_4, + EL_MM_TELEPORTER_YELLOW_3, + EL_MM_TELEPORTER_YELLOW_2, + EL_MM_TELEPORTER_YELLOW_1, + EL_MM_TELEPORTER_YELLOW_16, + EL_MM_TELEPORTER_YELLOW_15, + EL_MM_TELEPORTER_YELLOW_14, + EL_MM_TELEPORTER_YELLOW_13, + EL_MM_TELEPORTER_YELLOW_12, + EL_MM_TELEPORTER_YELLOW_11, + EL_MM_TELEPORTER_YELLOW_10, + EL_MM_TELEPORTER_YELLOW_9, + EL_MM_TELEPORTER_YELLOW_8, + EL_MM_TELEPORTER_YELLOW_7, + EL_MM_TELEPORTER_YELLOW_6 }, { - EL_MM_BEAMER_GREEN_5, - EL_MM_BEAMER_GREEN_4, - EL_MM_BEAMER_GREEN_3, - EL_MM_BEAMER_GREEN_2, - EL_MM_BEAMER_GREEN_1, - EL_MM_BEAMER_GREEN_16, - EL_MM_BEAMER_GREEN_15, - EL_MM_BEAMER_GREEN_14, - EL_MM_BEAMER_GREEN_13, - EL_MM_BEAMER_GREEN_12, - EL_MM_BEAMER_GREEN_11, - EL_MM_BEAMER_GREEN_10, - EL_MM_BEAMER_GREEN_9, - EL_MM_BEAMER_GREEN_8, - EL_MM_BEAMER_GREEN_7, - EL_MM_BEAMER_GREEN_6 + EL_MM_TELEPORTER_GREEN_5, + EL_MM_TELEPORTER_GREEN_4, + EL_MM_TELEPORTER_GREEN_3, + EL_MM_TELEPORTER_GREEN_2, + EL_MM_TELEPORTER_GREEN_1, + EL_MM_TELEPORTER_GREEN_16, + EL_MM_TELEPORTER_GREEN_15, + EL_MM_TELEPORTER_GREEN_14, + EL_MM_TELEPORTER_GREEN_13, + EL_MM_TELEPORTER_GREEN_12, + EL_MM_TELEPORTER_GREEN_11, + EL_MM_TELEPORTER_GREEN_10, + EL_MM_TELEPORTER_GREEN_9, + EL_MM_TELEPORTER_GREEN_8, + EL_MM_TELEPORTER_GREEN_7, + EL_MM_TELEPORTER_GREEN_6 }, { - EL_MM_BEAMER_BLUE_5, - EL_MM_BEAMER_BLUE_4, - EL_MM_BEAMER_BLUE_3, - EL_MM_BEAMER_BLUE_2, - EL_MM_BEAMER_BLUE_1, - EL_MM_BEAMER_BLUE_16, - EL_MM_BEAMER_BLUE_15, - EL_MM_BEAMER_BLUE_14, - EL_MM_BEAMER_BLUE_13, - EL_MM_BEAMER_BLUE_12, - EL_MM_BEAMER_BLUE_11, - EL_MM_BEAMER_BLUE_10, - EL_MM_BEAMER_BLUE_9, - EL_MM_BEAMER_BLUE_8, - EL_MM_BEAMER_BLUE_7, - EL_MM_BEAMER_BLUE_6 + EL_MM_TELEPORTER_BLUE_5, + EL_MM_TELEPORTER_BLUE_4, + EL_MM_TELEPORTER_BLUE_3, + EL_MM_TELEPORTER_BLUE_2, + EL_MM_TELEPORTER_BLUE_1, + EL_MM_TELEPORTER_BLUE_16, + EL_MM_TELEPORTER_BLUE_15, + EL_MM_TELEPORTER_BLUE_14, + EL_MM_TELEPORTER_BLUE_13, + EL_MM_TELEPORTER_BLUE_12, + EL_MM_TELEPORTER_BLUE_11, + EL_MM_TELEPORTER_BLUE_10, + EL_MM_TELEPORTER_BLUE_9, + EL_MM_TELEPORTER_BLUE_8, + EL_MM_TELEPORTER_BLUE_7, + EL_MM_TELEPORTER_BLUE_6 }, { EL_MM_POLARIZER_1, diff --git a/src/game_mm/mm_main.c b/src/game_mm/mm_main.c index 0c26ebbd..2209d092 100644 --- a/src/game_mm/mm_main.c +++ b/src/game_mm/mm_main.c @@ -193,22 +193,22 @@ char *element_info_mm[] = "amoeba wall", "wooden block", "gray ball", - "beamer (0\xb0)", - "beamer (22.5\xb0)", - "beamer (45\xb0)", /* 100 */ - "beamer (67.5\xb0)", - "beamer (90\xb0)", - "beamer (112.5\xb0)", - "beamer (135\xb0)", - "beamer (157.5\xb0)", - "beamer (180\xb0)", - "beamer (202.5\xb0)", - "beamer (225\xb0)", - "beamer (247.5\xb0)", - "beamer (270\xb0)", /* 110 */ - "beamer (292.5\xb0)", - "beamer (315\xb0)", - "beamer (337.5\xb0)", + "teleporter (0\xb0)", + "teleporter (22.5\xb0)", + "teleporter (45\xb0)", /* 100 */ + "teleporter (67.5\xb0)", + "teleporter (90\xb0)", + "teleporter (112.5\xb0)", + "teleporter (135\xb0)", + "teleporter (157.5\xb0)", + "teleporter (180\xb0)", + "teleporter (202.5\xb0)", + "teleporter (225\xb0)", + "teleporter (247.5\xb0)", + "teleporter (270\xb0)", /* 110 */ + "teleporter (292.5\xb0)", + "teleporter (315\xb0)", + "teleporter (337.5\xb0)", "fuse", "pac man (starts moving right)", "pac man (starts moving up)", @@ -241,7 +241,7 @@ char *element_info_mm[] = "reflecting stone lock", "key", "light bulb (dark)", - "ligh bulb (glowing)", + "light bulb (glowing)", "bonus ball", "reflecting stone block", "wooden lock", @@ -451,70 +451,70 @@ char *element_info_mm[] = "rotating steel polarizer (112.5\xb0)", "rotating steel polarizer (135\xb0)", "rotating steel polarizer (157.5\xb0)", - "red beamer (0\xb0)", - "red beamer (22.5\xb0)", - "red beamer (45\xb0)", - "red beamer (67.5\xb0)", - "red beamer (90\xb0)", /* 360 */ - "red beamer (112.5\xb0)", - "red beamer (135\xb0)", - "red beamer (157.5\xb0)", - "red beamer (180\xb0)", - "red beamer (202.5\xb0)", - "red beamer (225\xb0)", - "red beamer (247.5\xb0)", - "red beamer (270\xb0)", - "red beamer (292.5\xb0)", - "red beamer (315\xb0)", /* 370 */ - "red beamer (337.5\xb0)", - "yellow beamer (0\xb0)", - "yellow beamer (22.5\xb0)", - "yellow beamer (45\xb0)", - "yellow beamer (67.5\xb0)", - "yellow beamer (90\xb0)", - "yellow beamer (112.5\xb0)", - "yellow beamer (135\xb0)", - "yellow beamer (157.5\xb0)", - "yellow beamer (180\xb0)", /* 380 */ - "yellow beamer (202.5\xb0)", - "yellow beamer (225\xb0)", - "yellow beamer (247.5\xb0)", - "yellow beamer (270\xb0)", - "yellow beamer (292.5\xb0)", - "yellow beamer (315\xb0)", - "yellow beamer (337.5\xb0)", - "green beamer (0\xb0)", - "green beamer (22.5\xb0)", - "green beamer (45\xb0)", /* 390 */ - "green beamer (67.5\xb0)", - "green beamer (90\xb0)", - "green beamer (112.5\xb0)", - "green beamer (135\xb0)", - "green beamer (157.5\xb0)", - "green beamer (180\xb0)", - "green beamer (202.5\xb0)", - "green beamer (225\xb0)", - "green beamer (247.5\xb0)", - "green beamer (270\xb0)", /* 400 */ - "green beamer (292.5\xb0)", - "green beamer (315\xb0)", - "green beamer (337.5\xb0)", - "blue beamer (0\xb0)", - "blue beamer (22.5\xb0)", - "blue beamer (45\xb0)", - "blue beamer (67.5\xb0)", - "blue beamer (90\xb0)", - "blue beamer (112.5\xb0)", - "blue beamer (135\xb0)", /* 410 */ - "blue beamer (157.5\xb0)", - "blue beamer (180\xb0)", - "blue beamer (202.5\xb0)", - "blue beamer (225\xb0)", - "blue beamer (247.5\xb0)", - "blue beamer (270\xb0)", - "blue beamer (292.5\xb0)", - "blue beamer (315\xb0)", - "blue beamer (337.5\xb0)", + "red teleporter (0\xb0)", + "red teleporter (22.5\xb0)", + "red teleporter (45\xb0)", + "red teleporter (67.5\xb0)", + "red teleporter (90\xb0)", /* 360 */ + "red teleporter (112.5\xb0)", + "red teleporter (135\xb0)", + "red teleporter (157.5\xb0)", + "red teleporter (180\xb0)", + "red teleporter (202.5\xb0)", + "red teleporter (225\xb0)", + "red teleporter (247.5\xb0)", + "red teleporter (270\xb0)", + "red teleporter (292.5\xb0)", + "red teleporter (315\xb0)", /* 370 */ + "red teleporter (337.5\xb0)", + "yellow teleporter (0\xb0)", + "yellow teleporter (22.5\xb0)", + "yellow teleporter (45\xb0)", + "yellow teleporter (67.5\xb0)", + "yellow teleporter (90\xb0)", + "yellow teleporter (112.5\xb0)", + "yellow teleporter (135\xb0)", + "yellow teleporter (157.5\xb0)", + "yellow teleporter (180\xb0)", /* 380 */ + "yellow teleporter (202.5\xb0)", + "yellow teleporter (225\xb0)", + "yellow teleporter (247.5\xb0)", + "yellow teleporter (270\xb0)", + "yellow teleporter (292.5\xb0)", + "yellow teleporter (315\xb0)", + "yellow teleporter (337.5\xb0)", + "green teleporter (0\xb0)", + "green teleporter (22.5\xb0)", + "green teleporter (45\xb0)", /* 390 */ + "green teleporter (67.5\xb0)", + "green teleporter (90\xb0)", + "green teleporter (112.5\xb0)", + "green teleporter (135\xb0)", + "green teleporter (157.5\xb0)", + "green teleporter (180\xb0)", + "green teleporter (202.5\xb0)", + "green teleporter (225\xb0)", + "green teleporter (247.5\xb0)", + "green teleporter (270\xb0)", /* 400 */ + "green teleporter (292.5\xb0)", + "green teleporter (315\xb0)", + "green teleporter (337.5\xb0)", + "blue teleporter (0\xb0)", + "blue teleporter (22.5\xb0)", + "blue teleporter (45\xb0)", + "blue teleporter (67.5\xb0)", + "blue teleporter (90\xb0)", + "blue teleporter (112.5\xb0)", + "blue teleporter (135\xb0)", /* 410 */ + "blue teleporter (157.5\xb0)", + "blue teleporter (180\xb0)", + "blue teleporter (202.5\xb0)", + "blue teleporter (225\xb0)", + "blue teleporter (247.5\xb0)", + "blue teleporter (270\xb0)", + "blue teleporter (292.5\xb0)", + "blue teleporter (315\xb0)", + "blue teleporter (337.5\xb0)", "unknown", /* 420 */ /* diff --git a/src/main.c b/src/main.c index 146f060c..670f5335 100644 --- a/src/main.c +++ b/src/main.c @@ -5006,84 +5006,84 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "gray ball" }, { - "mm_beamer_1", - "mm_beamer", - "beamer (0\xb0)" + "mm_teleporter_1", + "mm_teleporter", + "teleporter (0\xb0)" }, { - "mm_beamer_2", - "mm_beamer", - "beamer (22.5\xb0)" + "mm_teleporter_2", + "mm_teleporter", + "teleporter (22.5\xb0)" }, { - "mm_beamer_3", - "mm_beamer", - "beamer (45\xb0)" + "mm_teleporter_3", + "mm_teleporter", + "teleporter (45\xb0)" }, { - "mm_beamer_4", - "mm_beamer", - "beamer (67.5\xb0)" + "mm_teleporter_4", + "mm_teleporter", + "teleporter (67.5\xb0)" }, { - "mm_beamer_5", - "mm_beamer", - "beamer (90\xb0)" + "mm_teleporter_5", + "mm_teleporter", + "teleporter (90\xb0)" }, { - "mm_beamer_6", - "mm_beamer", - "beamer (112.5\xb0)" + "mm_teleporter_6", + "mm_teleporter", + "teleporter (112.5\xb0)" }, { - "mm_beamer_7", - "mm_beamer", - "beamer (135\xb0)" + "mm_teleporter_7", + "mm_teleporter", + "teleporter (135\xb0)" }, { - "mm_beamer_8", - "mm_beamer", - "beamer (157.5\xb0)" + "mm_teleporter_8", + "mm_teleporter", + "teleporter (157.5\xb0)" }, { - "mm_beamer_9", - "mm_beamer", - "beamer (180\xb0)" + "mm_teleporter_9", + "mm_teleporter", + "teleporter (180\xb0)" }, { - "mm_beamer_10", - "mm_beamer", - "beamer (202.5\xb0)" + "mm_teleporter_10", + "mm_teleporter", + "teleporter (202.5\xb0)" }, { - "mm_beamer_11", - "mm_beamer", - "beamer (225\xb0)" + "mm_teleporter_11", + "mm_teleporter", + "teleporter (225\xb0)" }, { - "mm_beamer_12", - "mm_beamer", - "beamer (247.5\xb0)" + "mm_teleporter_12", + "mm_teleporter", + "teleporter (247.5\xb0)" }, { - "mm_beamer_13", - "mm_beamer", - "beamer (270\xb0)" + "mm_teleporter_13", + "mm_teleporter", + "teleporter (270\xb0)" }, { - "mm_beamer_14", - "mm_beamer", - "beamer (292.5\xb0)" + "mm_teleporter_14", + "mm_teleporter", + "teleporter (292.5\xb0)" }, { - "mm_beamer_15", - "mm_beamer", - "beamer (315\xb0)" + "mm_teleporter_15", + "mm_teleporter", + "teleporter (315\xb0)" }, { - "mm_beamer_16", - "mm_beamer", - "beamer (337.5\xb0)" + "mm_teleporter_16", + "mm_teleporter", + "teleporter (337.5\xb0)" }, { "mm_fuse.active", @@ -5248,7 +5248,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = { "mm_lightbulb.active", "mm_lightbulb", - "ligh bulb (on)" + "light bulb (on)" }, { "mm_lightball", @@ -5638,7 +5638,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = { "df_empty_space", "empty_space", - "empty_space" + "empty space" }, { "df_cell", @@ -5896,324 +5896,324 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "rotating steel polarizer (157.5\xb0)" }, { - "mm_beamer_red_1", - "mm_beamer", - "red beamer (0\xb0)" + "mm_teleporter_red_1", + "mm_teleporter", + "red teleporter (0\xb0)" }, { - "mm_beamer_red_2", - "mm_beamer", - "red beamer (22.5\xb0)" + "mm_teleporter_red_2", + "mm_teleporter", + "red teleporter (22.5\xb0)" }, { - "mm_beamer_red_3", - "mm_beamer", - "red beamer (45\xb0)" + "mm_teleporter_red_3", + "mm_teleporter", + "red teleporter (45\xb0)" }, { - "mm_beamer_red_4", - "mm_beamer", - "red beamer (67.5\xb0)" + "mm_teleporter_red_4", + "mm_teleporter", + "red teleporter (67.5\xb0)" }, { - "mm_beamer_red_5", - "mm_beamer", - "red beamer (90\xb0)" + "mm_teleporter_red_5", + "mm_teleporter", + "red teleporter (90\xb0)" }, { - "mm_beamer_red_6", - "mm_beamer", - "red beamer (112.5\xb0)" + "mm_teleporter_red_6", + "mm_teleporter", + "red teleporter (112.5\xb0)" }, { - "mm_beamer_red_7", - "mm_beamer", - "red beamer (135\xb0)" + "mm_teleporter_red_7", + "mm_teleporter", + "red teleporter (135\xb0)" }, { - "mm_beamer_red_8", - "mm_beamer", - "red beamer (157.5\xb0)" + "mm_teleporter_red_8", + "mm_teleporter", + "red teleporter (157.5\xb0)" }, { - "mm_beamer_red_9", - "mm_beamer", - "red beamer (180\xb0)" + "mm_teleporter_red_9", + "mm_teleporter", + "red teleporter (180\xb0)" }, { - "mm_beamer_red_10", - "mm_beamer", - "red beamer (202.5\xb0)" + "mm_teleporter_red_10", + "mm_teleporter", + "red teleporter (202.5\xb0)" }, { - "mm_beamer_red_11", - "mm_beamer", - "red beamer (225\xb0)" + "mm_teleporter_red_11", + "mm_teleporter", + "red teleporter (225\xb0)" }, { - "mm_beamer_red_12", - "mm_beamer", - "red beamer (247.5\xb0)" + "mm_teleporter_red_12", + "mm_teleporter", + "red teleporter (247.5\xb0)" }, { - "mm_beamer_red_13", - "mm_beamer", - "red beamer (270\xb0)" + "mm_teleporter_red_13", + "mm_teleporter", + "red teleporter (270\xb0)" }, { - "mm_beamer_red_14", - "mm_beamer", - "red beamer (292.5\xb0)" + "mm_teleporter_red_14", + "mm_teleporter", + "red teleporter (292.5\xb0)" }, { - "mm_beamer_red_15", - "mm_beamer", - "red beamer (315\xb0)" + "mm_teleporter_red_15", + "mm_teleporter", + "red teleporter (315\xb0)" }, { - "mm_beamer_red_16", - "mm_beamer", - "red beamer (337.5\xb0)" + "mm_teleporter_red_16", + "mm_teleporter", + "red teleporter (337.5\xb0)" }, { - "mm_beamer_yellow_1", - "mm_beamer", - "yellow beamer (0\xb0)" + "mm_teleporter_yellow_1", + "mm_teleporter", + "yellow teleporter (0\xb0)" }, { - "mm_beamer_yellow_2", - "mm_beamer", - "yellow beamer (22.5\xb0)" + "mm_teleporter_yellow_2", + "mm_teleporter", + "yellow teleporter (22.5\xb0)" }, { - "mm_beamer_yellow_3", - "mm_beamer", - "yellow beamer (45\xb0)" + "mm_teleporter_yellow_3", + "mm_teleporter", + "yellow teleporter (45\xb0)" }, { - "mm_beamer_yellow_4", - "mm_beamer", - "yellow beamer (67.5\xb0)" + "mm_teleporter_yellow_4", + "mm_teleporter", + "yellow teleporter (67.5\xb0)" }, { - "mm_beamer_yellow_5", - "mm_beamer", - "yellow beamer (90\xb0)" + "mm_teleporter_yellow_5", + "mm_teleporter", + "yellow teleporter (90\xb0)" }, { - "mm_beamer_yellow_6", - "mm_beamer", - "yellow beamer (112.5\xb0)" + "mm_teleporter_yellow_6", + "mm_teleporter", + "yellow teleporter (112.5\xb0)" }, { - "mm_beamer_yellow_7", - "mm_beamer", - "yellow beamer (135\xb0)" + "mm_teleporter_yellow_7", + "mm_teleporter", + "yellow teleporter (135\xb0)" }, { - "mm_beamer_yellow_8", - "mm_beamer", - "yellow beamer (157.5\xb0)" + "mm_teleporter_yellow_8", + "mm_teleporter", + "yellow teleporter (157.5\xb0)" }, { - "mm_beamer_yellow_9", - "mm_beamer", - "yellow beamer (180\xb0)" + "mm_teleporter_yellow_9", + "mm_teleporter", + "yellow teleporter (180\xb0)" }, { - "mm_beamer_yellow_10", - "mm_beamer", - "yellow beamer (202.5\xb0)" + "mm_teleporter_yellow_10", + "mm_teleporter", + "yellow teleporter (202.5\xb0)" }, { - "mm_beamer_yellow_11", - "mm_beamer", - "yellow beamer (225\xb0)" + "mm_teleporter_yellow_11", + "mm_teleporter", + "yellow teleporter (225\xb0)" }, { - "mm_beamer_yellow_12", - "mm_beamer", - "yellow beamer (247.5\xb0)" + "mm_teleporter_yellow_12", + "mm_teleporter", + "yellow teleporter (247.5\xb0)" }, { - "mm_beamer_yellow_13", - "mm_beamer", - "yellow beamer (270\xb0)" + "mm_teleporter_yellow_13", + "mm_teleporter", + "yellow teleporter (270\xb0)" }, { - "mm_beamer_yellow_14", - "mm_beamer", - "yellow beamer (292.5\xb0)" + "mm_teleporter_yellow_14", + "mm_teleporter", + "yellow teleporter (292.5\xb0)" }, { - "mm_beamer_yellow_15", - "mm_beamer", - "yellow beamer (315\xb0)" + "mm_teleporter_yellow_15", + "mm_teleporter", + "yellow teleporter (315\xb0)" }, { - "mm_beamer_yellow_16", - "mm_beamer", - "yellow beamer (337.5\xb0)" + "mm_teleporter_yellow_16", + "mm_teleporter", + "yellow teleporter (337.5\xb0)" }, { - "mm_beamer_green_1", - "mm_beamer", - "green beamer (0\xb0)" + "mm_teleporter_green_1", + "mm_teleporter", + "green teleporter (0\xb0)" }, { - "mm_beamer_green_2", - "mm_beamer", - "green beamer (22.5\xb0)" + "mm_teleporter_green_2", + "mm_teleporter", + "green teleporter (22.5\xb0)" }, { - "mm_beamer_green_3", - "mm_beamer", - "green beamer (45\xb0)" + "mm_teleporter_green_3", + "mm_teleporter", + "green teleporter (45\xb0)" }, { - "mm_beamer_green_4", - "mm_beamer", - "green beamer (67.5\xb0)" + "mm_teleporter_green_4", + "mm_teleporter", + "green teleporter (67.5\xb0)" }, { - "mm_beamer_green_5", - "mm_beamer", - "green beamer (90\xb0)" + "mm_teleporter_green_5", + "mm_teleporter", + "green teleporter (90\xb0)" }, { - "mm_beamer_green_6", - "mm_beamer", - "green beamer (112.5\xb0)" + "mm_teleporter_green_6", + "mm_teleporter", + "green teleporter (112.5\xb0)" }, { - "mm_beamer_green_7", - "mm_beamer", - "green beamer (135\xb0)" + "mm_teleporter_green_7", + "mm_teleporter", + "green teleporter (135\xb0)" }, { - "mm_beamer_green_8", - "mm_beamer", - "green beamer (157.5\xb0)" + "mm_teleporter_green_8", + "mm_teleporter", + "green teleporter (157.5\xb0)" }, { - "mm_beamer_green_9", - "mm_beamer", - "green beamer (180\xb0)" + "mm_teleporter_green_9", + "mm_teleporter", + "green teleporter (180\xb0)" }, { - "mm_beamer_green_10", - "mm_beamer", - "green beamer (202.5\xb0)" + "mm_teleporter_green_10", + "mm_teleporter", + "green teleporter (202.5\xb0)" }, { - "mm_beamer_green_11", - "mm_beamer", - "green beamer (225\xb0)" + "mm_teleporter_green_11", + "mm_teleporter", + "green teleporter (225\xb0)" }, { - "mm_beamer_green_12", - "mm_beamer", - "green beamer (247.5\xb0)" + "mm_teleporter_green_12", + "mm_teleporter", + "green teleporter (247.5\xb0)" }, { - "mm_beamer_green_13", - "mm_beamer", - "green beamer (270\xb0)" + "mm_teleporter_green_13", + "mm_teleporter", + "green teleporter (270\xb0)" }, { - "mm_beamer_green_14", - "mm_beamer", - "green beamer (292.5\xb0)" + "mm_teleporter_green_14", + "mm_teleporter", + "green teleporter (292.5\xb0)" }, { - "mm_beamer_green_15", - "mm_beamer", - "green beamer (315\xb0)" + "mm_teleporter_green_15", + "mm_teleporter", + "green teleporter (315\xb0)" }, { - "mm_beamer_green_16", - "mm_beamer", - "green beamer (337.5\xb0)" + "mm_teleporter_green_16", + "mm_teleporter", + "green teleporter (337.5\xb0)" }, { - "mm_beamer_blue_1", - "mm_beamer", - "blue beamer (0\xb0)" + "mm_teleporter_blue_1", + "mm_teleporter", + "blue teleporter (0\xb0)" }, { - "mm_beamer_blue_2", - "mm_beamer", - "blue beamer (22.5\xb0)" + "mm_teleporter_blue_2", + "mm_teleporter", + "blue teleporter (22.5\xb0)" }, { - "mm_beamer_blue_3", - "mm_beamer", - "blue beamer (45\xb0)" + "mm_teleporter_blue_3", + "mm_teleporter", + "blue teleporter (45\xb0)" }, { - "mm_beamer_blue_4", - "mm_beamer", - "blue beamer (67.5\xb0)" + "mm_teleporter_blue_4", + "mm_teleporter", + "blue teleporter (67.5\xb0)" }, { - "mm_beamer_blue_5", - "mm_beamer", - "blue beamer (90\xb0)" + "mm_teleporter_blue_5", + "mm_teleporter", + "blue teleporter (90\xb0)" }, { - "mm_beamer_blue_6", - "mm_beamer", - "blue beamer (112.5\xb0)" + "mm_teleporter_blue_6", + "mm_teleporter", + "blue teleporter (112.5\xb0)" }, { - "mm_beamer_blue_7", - "mm_beamer", - "blue beamer (135\xb0)" + "mm_teleporter_blue_7", + "mm_teleporter", + "blue teleporter (135\xb0)" }, { - "mm_beamer_blue_8", - "mm_beamer", - "blue beamer (157.5\xb0)" + "mm_teleporter_blue_8", + "mm_teleporter", + "blue teleporter (157.5\xb0)" }, { - "mm_beamer_blue_9", - "mm_beamer", - "blue beamer (180\xb0)" + "mm_teleporter_blue_9", + "mm_teleporter", + "blue teleporter (180\xb0)" }, { - "mm_beamer_blue_10", - "mm_beamer", - "blue beamer (202.5\xb0)" + "mm_teleporter_blue_10", + "mm_teleporter", + "blue teleporter (202.5\xb0)" }, { - "mm_beamer_blue_11", - "mm_beamer", - "blue beamer (225\xb0)" + "mm_teleporter_blue_11", + "mm_teleporter", + "blue teleporter (225\xb0)" }, { - "mm_beamer_blue_12", - "mm_beamer", - "blue beamer (247.5\xb0)" + "mm_teleporter_blue_12", + "mm_teleporter", + "blue teleporter (247.5\xb0)" }, { - "mm_beamer_blue_13", - "mm_beamer", - "blue beamer (270\xb0)" + "mm_teleporter_blue_13", + "mm_teleporter", + "blue teleporter (270\xb0)" }, { - "mm_beamer_blue_14", - "mm_beamer", - "blue beamer (292.5\xb0)" + "mm_teleporter_blue_14", + "mm_teleporter", + "blue teleporter (292.5\xb0)" }, { - "mm_beamer_blue_15", - "mm_beamer", - "blue beamer (315\xb0)" + "mm_teleporter_blue_15", + "mm_teleporter", + "blue teleporter (315\xb0)" }, { - "mm_beamer_blue_16", - "mm_beamer", - "blue beamer (337.5\xb0)" + "mm_teleporter_blue_16", + "mm_teleporter", + "blue teleporter (337.5\xb0)" }, { "mm_mcduffin", diff --git a/src/main.h b/src/main.h index a5f90d7a..d1ca675a 100644 --- a/src/main.h +++ b/src/main.h @@ -1592,24 +1592,24 @@ #define EL_MM_WALL_END EL_MM_WALL_63 #define EL_MM_WOODEN_BLOCK (EL_MM_START + 96) #define EL_MM_GRAY_BALL (EL_MM_START + 97) -#define EL_MM_BEAMER_START (EL_MM_START + 98) -#define EL_MM_BEAMER_1 (EL_MM_BEAMER_START + 0) -#define EL_MM_BEAMER_2 (EL_MM_BEAMER_START + 1) -#define EL_MM_BEAMER_3 (EL_MM_BEAMER_START + 2) -#define EL_MM_BEAMER_4 (EL_MM_BEAMER_START + 3) -#define EL_MM_BEAMER_5 (EL_MM_BEAMER_START + 4) -#define EL_MM_BEAMER_6 (EL_MM_BEAMER_START + 5) -#define EL_MM_BEAMER_7 (EL_MM_BEAMER_START + 6) -#define EL_MM_BEAMER_8 (EL_MM_BEAMER_START + 7) -#define EL_MM_BEAMER_9 (EL_MM_BEAMER_START + 8) -#define EL_MM_BEAMER_10 (EL_MM_BEAMER_START + 9) -#define EL_MM_BEAMER_11 (EL_MM_BEAMER_START + 10) -#define EL_MM_BEAMER_12 (EL_MM_BEAMER_START + 11) -#define EL_MM_BEAMER_13 (EL_MM_BEAMER_START + 12) -#define EL_MM_BEAMER_14 (EL_MM_BEAMER_START + 13) -#define EL_MM_BEAMER_15 (EL_MM_BEAMER_START + 14) -#define EL_MM_BEAMER_16 (EL_MM_BEAMER_START + 15) -#define EL_MM_BEAMER_END EL_MM_BEAMER_15 +#define EL_MM_TELEPORTER_START (EL_MM_START + 98) +#define EL_MM_TELEPORTER_1 (EL_MM_TELEPORTER_START + 0) +#define EL_MM_TELEPORTER_2 (EL_MM_TELEPORTER_START + 1) +#define EL_MM_TELEPORTER_3 (EL_MM_TELEPORTER_START + 2) +#define EL_MM_TELEPORTER_4 (EL_MM_TELEPORTER_START + 3) +#define EL_MM_TELEPORTER_5 (EL_MM_TELEPORTER_START + 4) +#define EL_MM_TELEPORTER_6 (EL_MM_TELEPORTER_START + 5) +#define EL_MM_TELEPORTER_7 (EL_MM_TELEPORTER_START + 6) +#define EL_MM_TELEPORTER_8 (EL_MM_TELEPORTER_START + 7) +#define EL_MM_TELEPORTER_9 (EL_MM_TELEPORTER_START + 8) +#define EL_MM_TELEPORTER_10 (EL_MM_TELEPORTER_START + 9) +#define EL_MM_TELEPORTER_11 (EL_MM_TELEPORTER_START + 10) +#define EL_MM_TELEPORTER_12 (EL_MM_TELEPORTER_START + 11) +#define EL_MM_TELEPORTER_13 (EL_MM_TELEPORTER_START + 12) +#define EL_MM_TELEPORTER_14 (EL_MM_TELEPORTER_START + 13) +#define EL_MM_TELEPORTER_15 (EL_MM_TELEPORTER_START + 14) +#define EL_MM_TELEPORTER_16 (EL_MM_TELEPORTER_START + 15) +#define EL_MM_TELEPORTER_END EL_MM_TELEPORTER_15 #define EL_MM_FUSE_ACTIVE (EL_MM_START + 114) #define EL_MM_PACMAN_START (EL_MM_START + 115) #define EL_MM_PACMAN_RIGHT (EL_MM_PACMAN_START + 0) @@ -1799,78 +1799,78 @@ #define EL_DF_END (EL_DF_START2 + 355) -#define EL_MM_BEAMER_RED_START (EL_DF_START2 + 356) -#define EL_MM_BEAMER_RED_1 (EL_MM_BEAMER_RED_START + 0) -#define EL_MM_BEAMER_RED_2 (EL_MM_BEAMER_RED_START + 1) -#define EL_MM_BEAMER_RED_3 (EL_MM_BEAMER_RED_START + 2) -#define EL_MM_BEAMER_RED_4 (EL_MM_BEAMER_RED_START + 3) -#define EL_MM_BEAMER_RED_5 (EL_MM_BEAMER_RED_START + 4) -#define EL_MM_BEAMER_RED_6 (EL_MM_BEAMER_RED_START + 5) -#define EL_MM_BEAMER_RED_7 (EL_MM_BEAMER_RED_START + 6) -#define EL_MM_BEAMER_RED_8 (EL_MM_BEAMER_RED_START + 7) -#define EL_MM_BEAMER_RED_9 (EL_MM_BEAMER_RED_START + 8) -#define EL_MM_BEAMER_RED_10 (EL_MM_BEAMER_RED_START + 9) -#define EL_MM_BEAMER_RED_11 (EL_MM_BEAMER_RED_START + 10) -#define EL_MM_BEAMER_RED_12 (EL_MM_BEAMER_RED_START + 11) -#define EL_MM_BEAMER_RED_13 (EL_MM_BEAMER_RED_START + 12) -#define EL_MM_BEAMER_RED_14 (EL_MM_BEAMER_RED_START + 13) -#define EL_MM_BEAMER_RED_15 (EL_MM_BEAMER_RED_START + 14) -#define EL_MM_BEAMER_RED_16 (EL_MM_BEAMER_RED_START + 15) -#define EL_MM_BEAMER_RED_END EL_MM_BEAMER_RED_16 -#define EL_MM_BEAMER_YELLOW_START (EL_DF_START2 + 372) -#define EL_MM_BEAMER_YELLOW_1 (EL_MM_BEAMER_YELLOW_START + 0) -#define EL_MM_BEAMER_YELLOW_2 (EL_MM_BEAMER_YELLOW_START + 1) -#define EL_MM_BEAMER_YELLOW_3 (EL_MM_BEAMER_YELLOW_START + 2) -#define EL_MM_BEAMER_YELLOW_4 (EL_MM_BEAMER_YELLOW_START + 3) -#define EL_MM_BEAMER_YELLOW_5 (EL_MM_BEAMER_YELLOW_START + 4) -#define EL_MM_BEAMER_YELLOW_6 (EL_MM_BEAMER_YELLOW_START + 5) -#define EL_MM_BEAMER_YELLOW_7 (EL_MM_BEAMER_YELLOW_START + 6) -#define EL_MM_BEAMER_YELLOW_8 (EL_MM_BEAMER_YELLOW_START + 7) -#define EL_MM_BEAMER_YELLOW_9 (EL_MM_BEAMER_YELLOW_START + 8) -#define EL_MM_BEAMER_YELLOW_10 (EL_MM_BEAMER_YELLOW_START + 9) -#define EL_MM_BEAMER_YELLOW_11 (EL_MM_BEAMER_YELLOW_START + 10) -#define EL_MM_BEAMER_YELLOW_12 (EL_MM_BEAMER_YELLOW_START + 11) -#define EL_MM_BEAMER_YELLOW_13 (EL_MM_BEAMER_YELLOW_START + 12) -#define EL_MM_BEAMER_YELLOW_14 (EL_MM_BEAMER_YELLOW_START + 13) -#define EL_MM_BEAMER_YELLOW_15 (EL_MM_BEAMER_YELLOW_START + 14) -#define EL_MM_BEAMER_YELLOW_16 (EL_MM_BEAMER_YELLOW_START + 15) -#define EL_MM_BEAMER_YELLOW_END EL_MM_BEAMER_YELLOW_16 -#define EL_MM_BEAMER_GREEN_START (EL_DF_START2 + 388) -#define EL_MM_BEAMER_GREEN_1 (EL_MM_BEAMER_GREEN_START + 0) -#define EL_MM_BEAMER_GREEN_2 (EL_MM_BEAMER_GREEN_START + 1) -#define EL_MM_BEAMER_GREEN_3 (EL_MM_BEAMER_GREEN_START + 2) -#define EL_MM_BEAMER_GREEN_4 (EL_MM_BEAMER_GREEN_START + 3) -#define EL_MM_BEAMER_GREEN_5 (EL_MM_BEAMER_GREEN_START + 4) -#define EL_MM_BEAMER_GREEN_6 (EL_MM_BEAMER_GREEN_START + 5) -#define EL_MM_BEAMER_GREEN_7 (EL_MM_BEAMER_GREEN_START + 6) -#define EL_MM_BEAMER_GREEN_8 (EL_MM_BEAMER_GREEN_START + 7) -#define EL_MM_BEAMER_GREEN_9 (EL_MM_BEAMER_GREEN_START + 8) -#define EL_MM_BEAMER_GREEN_10 (EL_MM_BEAMER_GREEN_START + 9) -#define EL_MM_BEAMER_GREEN_11 (EL_MM_BEAMER_GREEN_START + 10) -#define EL_MM_BEAMER_GREEN_12 (EL_MM_BEAMER_GREEN_START + 11) -#define EL_MM_BEAMER_GREEN_13 (EL_MM_BEAMER_GREEN_START + 12) -#define EL_MM_BEAMER_GREEN_14 (EL_MM_BEAMER_GREEN_START + 13) -#define EL_MM_BEAMER_GREEN_15 (EL_MM_BEAMER_GREEN_START + 14) -#define EL_MM_BEAMER_GREEN_16 (EL_MM_BEAMER_GREEN_START + 15) -#define EL_MM_BEAMER_GREEN_END EL_MM_BEAMER_GREEN_16 -#define EL_MM_BEAMER_BLUE_START (EL_DF_START2 + 404) -#define EL_MM_BEAMER_BLUE_1 (EL_MM_BEAMER_BLUE_START + 0) -#define EL_MM_BEAMER_BLUE_2 (EL_MM_BEAMER_BLUE_START + 1) -#define EL_MM_BEAMER_BLUE_3 (EL_MM_BEAMER_BLUE_START + 2) -#define EL_MM_BEAMER_BLUE_4 (EL_MM_BEAMER_BLUE_START + 3) -#define EL_MM_BEAMER_BLUE_5 (EL_MM_BEAMER_BLUE_START + 4) -#define EL_MM_BEAMER_BLUE_6 (EL_MM_BEAMER_BLUE_START + 5) -#define EL_MM_BEAMER_BLUE_7 (EL_MM_BEAMER_BLUE_START + 6) -#define EL_MM_BEAMER_BLUE_8 (EL_MM_BEAMER_BLUE_START + 7) -#define EL_MM_BEAMER_BLUE_9 (EL_MM_BEAMER_BLUE_START + 8) -#define EL_MM_BEAMER_BLUE_10 (EL_MM_BEAMER_BLUE_START + 9) -#define EL_MM_BEAMER_BLUE_11 (EL_MM_BEAMER_BLUE_START + 10) -#define EL_MM_BEAMER_BLUE_12 (EL_MM_BEAMER_BLUE_START + 11) -#define EL_MM_BEAMER_BLUE_13 (EL_MM_BEAMER_BLUE_START + 12) -#define EL_MM_BEAMER_BLUE_14 (EL_MM_BEAMER_BLUE_START + 13) -#define EL_MM_BEAMER_BLUE_15 (EL_MM_BEAMER_BLUE_START + 14) -#define EL_MM_BEAMER_BLUE_16 (EL_MM_BEAMER_BLUE_START + 15) -#define EL_MM_BEAMER_BLUE_END EL_MM_BEAMER_BLUE_16 +#define EL_MM_TELEPORTER_RED_START (EL_DF_START2 + 356) +#define EL_MM_TELEPORTER_RED_1 (EL_MM_TELEPORTER_RED_START + 0) +#define EL_MM_TELEPORTER_RED_2 (EL_MM_TELEPORTER_RED_START + 1) +#define EL_MM_TELEPORTER_RED_3 (EL_MM_TELEPORTER_RED_START + 2) +#define EL_MM_TELEPORTER_RED_4 (EL_MM_TELEPORTER_RED_START + 3) +#define EL_MM_TELEPORTER_RED_5 (EL_MM_TELEPORTER_RED_START + 4) +#define EL_MM_TELEPORTER_RED_6 (EL_MM_TELEPORTER_RED_START + 5) +#define EL_MM_TELEPORTER_RED_7 (EL_MM_TELEPORTER_RED_START + 6) +#define EL_MM_TELEPORTER_RED_8 (EL_MM_TELEPORTER_RED_START + 7) +#define EL_MM_TELEPORTER_RED_9 (EL_MM_TELEPORTER_RED_START + 8) +#define EL_MM_TELEPORTER_RED_10 (EL_MM_TELEPORTER_RED_START + 9) +#define EL_MM_TELEPORTER_RED_11 (EL_MM_TELEPORTER_RED_START + 10) +#define EL_MM_TELEPORTER_RED_12 (EL_MM_TELEPORTER_RED_START + 11) +#define EL_MM_TELEPORTER_RED_13 (EL_MM_TELEPORTER_RED_START + 12) +#define EL_MM_TELEPORTER_RED_14 (EL_MM_TELEPORTER_RED_START + 13) +#define EL_MM_TELEPORTER_RED_15 (EL_MM_TELEPORTER_RED_START + 14) +#define EL_MM_TELEPORTER_RED_16 (EL_MM_TELEPORTER_RED_START + 15) +#define EL_MM_TELEPORTER_RED_END EL_MM_TELEPORTER_RED_16 +#define EL_MM_TELEPORTER_YELLOW_START (EL_DF_START2 + 372) +#define EL_MM_TELEPORTER_YELLOW_1 (EL_MM_TELEPORTER_YELLOW_START + 0) +#define EL_MM_TELEPORTER_YELLOW_2 (EL_MM_TELEPORTER_YELLOW_START + 1) +#define EL_MM_TELEPORTER_YELLOW_3 (EL_MM_TELEPORTER_YELLOW_START + 2) +#define EL_MM_TELEPORTER_YELLOW_4 (EL_MM_TELEPORTER_YELLOW_START + 3) +#define EL_MM_TELEPORTER_YELLOW_5 (EL_MM_TELEPORTER_YELLOW_START + 4) +#define EL_MM_TELEPORTER_YELLOW_6 (EL_MM_TELEPORTER_YELLOW_START + 5) +#define EL_MM_TELEPORTER_YELLOW_7 (EL_MM_TELEPORTER_YELLOW_START + 6) +#define EL_MM_TELEPORTER_YELLOW_8 (EL_MM_TELEPORTER_YELLOW_START + 7) +#define EL_MM_TELEPORTER_YELLOW_9 (EL_MM_TELEPORTER_YELLOW_START + 8) +#define EL_MM_TELEPORTER_YELLOW_10 (EL_MM_TELEPORTER_YELLOW_START + 9) +#define EL_MM_TELEPORTER_YELLOW_11 (EL_MM_TELEPORTER_YELLOW_START + 10) +#define EL_MM_TELEPORTER_YELLOW_12 (EL_MM_TELEPORTER_YELLOW_START + 11) +#define EL_MM_TELEPORTER_YELLOW_13 (EL_MM_TELEPORTER_YELLOW_START + 12) +#define EL_MM_TELEPORTER_YELLOW_14 (EL_MM_TELEPORTER_YELLOW_START + 13) +#define EL_MM_TELEPORTER_YELLOW_15 (EL_MM_TELEPORTER_YELLOW_START + 14) +#define EL_MM_TELEPORTER_YELLOW_16 (EL_MM_TELEPORTER_YELLOW_START + 15) +#define EL_MM_TELEPORTER_YELLOW_END EL_MM_TELEPORTER_YELLOW_16 +#define EL_MM_TELEPORTER_GREEN_START (EL_DF_START2 + 388) +#define EL_MM_TELEPORTER_GREEN_1 (EL_MM_TELEPORTER_GREEN_START + 0) +#define EL_MM_TELEPORTER_GREEN_2 (EL_MM_TELEPORTER_GREEN_START + 1) +#define EL_MM_TELEPORTER_GREEN_3 (EL_MM_TELEPORTER_GREEN_START + 2) +#define EL_MM_TELEPORTER_GREEN_4 (EL_MM_TELEPORTER_GREEN_START + 3) +#define EL_MM_TELEPORTER_GREEN_5 (EL_MM_TELEPORTER_GREEN_START + 4) +#define EL_MM_TELEPORTER_GREEN_6 (EL_MM_TELEPORTER_GREEN_START + 5) +#define EL_MM_TELEPORTER_GREEN_7 (EL_MM_TELEPORTER_GREEN_START + 6) +#define EL_MM_TELEPORTER_GREEN_8 (EL_MM_TELEPORTER_GREEN_START + 7) +#define EL_MM_TELEPORTER_GREEN_9 (EL_MM_TELEPORTER_GREEN_START + 8) +#define EL_MM_TELEPORTER_GREEN_10 (EL_MM_TELEPORTER_GREEN_START + 9) +#define EL_MM_TELEPORTER_GREEN_11 (EL_MM_TELEPORTER_GREEN_START + 10) +#define EL_MM_TELEPORTER_GREEN_12 (EL_MM_TELEPORTER_GREEN_START + 11) +#define EL_MM_TELEPORTER_GREEN_13 (EL_MM_TELEPORTER_GREEN_START + 12) +#define EL_MM_TELEPORTER_GREEN_14 (EL_MM_TELEPORTER_GREEN_START + 13) +#define EL_MM_TELEPORTER_GREEN_15 (EL_MM_TELEPORTER_GREEN_START + 14) +#define EL_MM_TELEPORTER_GREEN_16 (EL_MM_TELEPORTER_GREEN_START + 15) +#define EL_MM_TELEPORTER_GREEN_END EL_MM_TELEPORTER_GREEN_16 +#define EL_MM_TELEPORTER_BLUE_START (EL_DF_START2 + 404) +#define EL_MM_TELEPORTER_BLUE_1 (EL_MM_TELEPORTER_BLUE_START + 0) +#define EL_MM_TELEPORTER_BLUE_2 (EL_MM_TELEPORTER_BLUE_START + 1) +#define EL_MM_TELEPORTER_BLUE_3 (EL_MM_TELEPORTER_BLUE_START + 2) +#define EL_MM_TELEPORTER_BLUE_4 (EL_MM_TELEPORTER_BLUE_START + 3) +#define EL_MM_TELEPORTER_BLUE_5 (EL_MM_TELEPORTER_BLUE_START + 4) +#define EL_MM_TELEPORTER_BLUE_6 (EL_MM_TELEPORTER_BLUE_START + 5) +#define EL_MM_TELEPORTER_BLUE_7 (EL_MM_TELEPORTER_BLUE_START + 6) +#define EL_MM_TELEPORTER_BLUE_8 (EL_MM_TELEPORTER_BLUE_START + 7) +#define EL_MM_TELEPORTER_BLUE_9 (EL_MM_TELEPORTER_BLUE_START + 8) +#define EL_MM_TELEPORTER_BLUE_10 (EL_MM_TELEPORTER_BLUE_START + 9) +#define EL_MM_TELEPORTER_BLUE_11 (EL_MM_TELEPORTER_BLUE_START + 10) +#define EL_MM_TELEPORTER_BLUE_12 (EL_MM_TELEPORTER_BLUE_START + 11) +#define EL_MM_TELEPORTER_BLUE_13 (EL_MM_TELEPORTER_BLUE_START + 12) +#define EL_MM_TELEPORTER_BLUE_14 (EL_MM_TELEPORTER_BLUE_START + 13) +#define EL_MM_TELEPORTER_BLUE_15 (EL_MM_TELEPORTER_BLUE_START + 14) +#define EL_MM_TELEPORTER_BLUE_16 (EL_MM_TELEPORTER_BLUE_START + 15) +#define EL_MM_TELEPORTER_BLUE_END EL_MM_TELEPORTER_BLUE_16 #define EL_MM_MCDUFFIN 1204 #define EL_MM_PACMAN 1205 -- 2.34.1