X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=9bd5f75154bd58ae98bc1c71d45250bdc4c221af;hb=e5a0a3097d6a6c3afea01b3deeee9b206982ec1d;hp=8e88f2b0807ff1eaaad77fba6902a49f57b7c986;hpb=ad8306cba93c058f00e21871a290302ce728d6b8;p=rocksndiamonds.git

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 8e88f2b0..9bd5f751 100644
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -141,10 +141,6 @@ element_to_graphic[] =
     EL_BD_BUTTERFLY,			-1, MV_BIT_DOWN, FALSE,
     IMG_BD_BUTTERFLY_DOWN
   },
-  {
-    EL_BD_BUTTERFLY,			ACTION_MOVING, -1, FALSE,
-    IMG_BD_BUTTERFLY_MOVING
-  },
   {
     EL_BD_FIREFLY,			-1, -1, FALSE,
     IMG_BD_FIREFLY
@@ -181,18 +177,10 @@ element_to_graphic[] =
     EL_BD_FIREFLY,			-1, MV_BIT_DOWN, FALSE,
     IMG_BD_FIREFLY_DOWN
   },
-  {
-    EL_BD_FIREFLY,			ACTION_MOVING, -1, FALSE,
-    IMG_BD_FIREFLY_MOVING
-  },
   {
     EL_SP_DEFAULT,			ACTION_EXPLODING, -1, FALSE,
     IMG_SP_DEFAULT_EXPLODING
   },
-  {
-    EL_SP_EMPTY_SPACE,			-1, -1, FALSE,
-    IMG_SP_EMPTY_SPACE
-  },
   {
     EL_SP_ZONK,				-1, -1, FALSE,
     IMG_SP_ZONK
@@ -321,10 +309,18 @@ element_to_graphic[] =
     EL_SP_EXIT_CLOSED,			-1, -1, FALSE,
     IMG_SP_EXIT_CLOSED
   },
+  {
+    EL_SP_EXIT_OPENING,			-1, -1, FALSE,
+    IMG_SP_EXIT_OPENING
+  },
   {
     EL_SP_EXIT_OPEN,			-1, -1, FALSE,
     IMG_SP_EXIT_OPEN
   },
+  {
+    EL_SP_EXIT_CLOSING,			-1, -1, FALSE,
+    IMG_SP_EXIT_CLOSING
+  },
   {
     EL_SP_DISK_ORANGE,			-1, -1, FALSE,
     IMG_SP_DISK_ORANGE
@@ -393,6 +389,38 @@ element_to_graphic[] =
     EL_SP_GRAVITY_PORT_UP,		-1, -1, FALSE,
     IMG_SP_GRAVITY_PORT_UP
   },
+  {
+    EL_SP_GRAVITY_ON_PORT_RIGHT,	-1, -1, FALSE,
+    IMG_SP_GRAVITY_ON_PORT_RIGHT
+  },
+  {
+    EL_SP_GRAVITY_ON_PORT_DOWN,		-1, -1, FALSE,
+    IMG_SP_GRAVITY_ON_PORT_DOWN
+  },
+  {
+    EL_SP_GRAVITY_ON_PORT_LEFT,		-1, -1, FALSE,
+    IMG_SP_GRAVITY_ON_PORT_LEFT
+  },
+  {
+    EL_SP_GRAVITY_ON_PORT_UP,		-1, -1, FALSE,
+    IMG_SP_GRAVITY_ON_PORT_UP
+  },
+  {
+    EL_SP_GRAVITY_OFF_PORT_RIGHT,	-1, -1, FALSE,
+    IMG_SP_GRAVITY_OFF_PORT_RIGHT
+  },
+  {
+    EL_SP_GRAVITY_OFF_PORT_DOWN,	-1, -1, FALSE,
+    IMG_SP_GRAVITY_OFF_PORT_DOWN
+  },
+  {
+    EL_SP_GRAVITY_OFF_PORT_LEFT,	-1, -1, FALSE,
+    IMG_SP_GRAVITY_OFF_PORT_LEFT
+  },
+  {
+    EL_SP_GRAVITY_OFF_PORT_UP,		-1, -1, FALSE,
+    IMG_SP_GRAVITY_OFF_PORT_UP
+  },
   {
     EL_SP_SNIKSNAK,			-1, -1, FALSE,
     IMG_SP_SNIKSNAK
@@ -413,6 +441,38 @@ element_to_graphic[] =
     EL_SP_SNIKSNAK,			-1, MV_BIT_DOWN, FALSE,
     IMG_SP_SNIKSNAK_DOWN
   },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_LEFT, MV_BIT_UP, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_LEFT_UP
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_LEFT, MV_BIT_DOWN, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_LEFT_DOWN
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_RIGHT, MV_BIT_UP, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_RIGHT_UP
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_RIGHT, MV_BIT_DOWN, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_RIGHT_DOWN
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_UP, MV_BIT_LEFT, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_UP_LEFT
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_UP, MV_BIT_RIGHT, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_UP_RIGHT
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_DOWN, MV_BIT_LEFT, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_DOWN_LEFT
+  },
+  {
+    EL_SP_SNIKSNAK,			ACTION_TURNING_FROM_DOWN, MV_BIT_RIGHT, FALSE,
+    IMG_SP_SNIKSNAK_TURNING_FROM_DOWN_RIGHT
+  },
   {
     EL_SP_ELECTRON,			-1, -1, FALSE,
     IMG_SP_ELECTRON
@@ -489,6 +549,10 @@ element_to_graphic[] =
     EL_SOKOBAN_FIELD_FULL,		-1, -1, FALSE,
     IMG_SOKOBAN_FIELD_FULL
   },
+  {
+    EL_SOKOBAN_FIELD_PLAYER,		-1, -1, FALSE,
+    IMG_SOKOBAN_FIELD_PLAYER
+  },
   {
     EL_EMPTY_SPACE,			-1, -1, FALSE,
     IMG_EMPTY_SPACE
@@ -685,6 +749,38 @@ element_to_graphic[] =
     EL_BUG,				ACTION_MOVING, MV_BIT_DOWN, FALSE,
     IMG_BUG_MOVING_DOWN
   },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_RIGHT, MV_BIT_UP, FALSE,
+    IMG_BUG_TURNING_FROM_RIGHT_UP
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_UP, MV_BIT_LEFT, FALSE,
+    IMG_BUG_TURNING_FROM_UP_LEFT
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_LEFT, MV_BIT_DOWN, FALSE,
+    IMG_BUG_TURNING_FROM_LEFT_DOWN
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_DOWN, MV_BIT_RIGHT, FALSE,
+    IMG_BUG_TURNING_FROM_DOWN_RIGHT
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_RIGHT, MV_BIT_DOWN, FALSE,
+    IMG_BUG_TURNING_FROM_RIGHT_DOWN
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_UP, MV_BIT_RIGHT, FALSE,
+    IMG_BUG_TURNING_FROM_UP_RIGHT
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_LEFT, MV_BIT_UP, FALSE,
+    IMG_BUG_TURNING_FROM_LEFT_UP
+  },
+  {
+    EL_BUG,				ACTION_TURNING_FROM_DOWN, MV_BIT_LEFT, FALSE,
+    IMG_BUG_TURNING_FROM_DOWN_LEFT
+  },
   {
     EL_SPACESHIP,			-1, -1, FALSE,
     IMG_SPACESHIP
@@ -737,6 +833,38 @@ element_to_graphic[] =
     EL_SPACESHIP,			ACTION_MOVING, MV_BIT_DOWN, FALSE,
     IMG_SPACESHIP_MOVING_DOWN
   },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_RIGHT, MV_BIT_UP, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_RIGHT_UP
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_UP, MV_BIT_LEFT, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_UP_LEFT
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_LEFT, MV_BIT_DOWN, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_LEFT_DOWN
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_DOWN, MV_BIT_RIGHT, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_DOWN_RIGHT
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_RIGHT, MV_BIT_DOWN, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_RIGHT_DOWN
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_UP, MV_BIT_RIGHT, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_UP_RIGHT
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_LEFT, MV_BIT_UP, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_LEFT_UP
+  },
+  {
+    EL_SPACESHIP,			ACTION_TURNING_FROM_DOWN, MV_BIT_LEFT, FALSE,
+    IMG_SPACESHIP_TURNING_FROM_DOWN_LEFT
+  },
   {
     EL_YAMYAM,				-1, -1, FALSE,
     IMG_YAMYAM
@@ -857,10 +985,18 @@ element_to_graphic[] =
     EL_AMOEBA_GROWING,			-1, -1, FALSE,
     IMG_AMOEBA_GROWING
   },
+  {
+    EL_AMOEBA,				ACTION_GROWING, -1, FALSE,
+    IMG_AMOEBA_GROWING
+  },
   {
     EL_AMOEBA_SHRINKING,		-1, -1, FALSE,
     IMG_AMOEBA_SHRINKING
   },
+  {
+    EL_AMOEBA,				ACTION_SHRINKING, -1, FALSE,
+    IMG_AMOEBA_SHRINKING
+  },
   {
     EL_AMOEBA_WET,			-1, -1, FALSE,
     IMG_AMOEBA_WET
@@ -869,6 +1005,10 @@ element_to_graphic[] =
     EL_AMOEBA_DROPPING,			-1, -1, FALSE,
     IMG_AMOEBA_DROPPING
   },
+  {
+    EL_AMOEBA,				ACTION_DROPPING, -1, FALSE,
+    IMG_AMOEBA_DROPPING
+  },
   {
     EL_AMOEBA_DRY,			-1, -1, FALSE,
     IMG_AMOEBA_DRY
@@ -917,18 +1057,50 @@ element_to_graphic[] =
     EL_EM_GATE_1_GRAY,			-1, -1, FALSE,
     IMG_EM_GATE_1_GRAY
   },
+  {
+    EL_EM_GATE_1_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EM_GATE_1_GRAY_ACTIVE
+  },
+  {
+    EL_EM_GATE_1_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EM_GATE_1_GRAY_ACTIVE
+  },
   {
     EL_EM_GATE_2_GRAY,			-1, -1, FALSE,
     IMG_EM_GATE_2_GRAY
   },
+  {
+    EL_EM_GATE_2_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EM_GATE_2_GRAY_ACTIVE
+  },
+  {
+    EL_EM_GATE_2_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EM_GATE_2_GRAY_ACTIVE
+  },
   {
     EL_EM_GATE_3_GRAY,			-1, -1, FALSE,
     IMG_EM_GATE_3_GRAY
   },
+  {
+    EL_EM_GATE_3_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EM_GATE_3_GRAY_ACTIVE
+  },
+  {
+    EL_EM_GATE_3_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EM_GATE_3_GRAY_ACTIVE
+  },
   {
     EL_EM_GATE_4_GRAY,			-1, -1, FALSE,
     IMG_EM_GATE_4_GRAY
   },
+  {
+    EL_EM_GATE_4_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EM_GATE_4_GRAY_ACTIVE
+  },
+  {
+    EL_EM_GATE_4_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EM_GATE_4_GRAY_ACTIVE
+  },
   {
     EL_EXIT_CLOSED,			-1, -1, FALSE,
     IMG_EXIT_CLOSED
@@ -941,6 +1113,10 @@ element_to_graphic[] =
     EL_EXIT_OPEN,			-1, -1, FALSE,
     IMG_EXIT_OPEN
   },
+  {
+    EL_EXIT_CLOSING,			-1, -1, FALSE,
+    IMG_EXIT_CLOSING
+  },
   {
     EL_BALLOON,				-1, -1, FALSE,
     IMG_BALLOON
@@ -973,6 +1149,10 @@ element_to_graphic[] =
     EL_BALLOON_SWITCH_ANY,		-1, -1, FALSE,
     IMG_BALLOON_SWITCH_ANY
   },
+  {
+    EL_BALLOON_SWITCH_NONE,		-1, -1, FALSE,
+    IMG_BALLOON_SWITCH_NONE
+  },
   {
     EL_SPRING,				-1, -1, FALSE,
     IMG_SPRING
@@ -1061,6 +1241,46 @@ element_to_graphic[] =
     EL_INVISIBLE_SAND,			ACTION_ACTIVE, -1, FALSE,
     IMG_INVISIBLE_SAND_ACTIVE
   },
+  {
+    EL_INVISIBLE_SAND,			ACTION_ACTIVE, -1, TRUE,
+    IMG_INVISIBLE_SAND_ACTIVE_CRUMBLED
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		-1, -1, TRUE,
+    IMG_INVISIBLE_SAND_ACTIVE_CRUMBLED
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_LEFT, FALSE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_LEFT
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_RIGHT, FALSE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_RIGHT
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_UP, FALSE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_UP
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_DOWN, FALSE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_DOWN
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_LEFT, TRUE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_LEFT_CRUMBLED
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_RIGHT, TRUE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_RIGHT_CRUMBLED
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_UP, TRUE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_UP_CRUMBLED
+  },
+  {
+    EL_INVISIBLE_SAND_ACTIVE,		ACTION_DIGGING, MV_BIT_DOWN, TRUE,
+    IMG_INVISIBLE_SAND_ACTIVE_DIGGING_DOWN_CRUMBLED
+  },
   {
     EL_CONVEYOR_BELT_1_MIDDLE,		-1, -1, FALSE,
     IMG_CONVEYOR_BELT_1_MIDDLE
@@ -1286,8 +1506,36 @@ element_to_graphic[] =
     IMG_TIMEGATE_SWITCH_ACTIVE
   },
   {
-    EL_ENVELOPE,			-1, -1, FALSE,
-    IMG_ENVELOPE
+    EL_ENVELOPE_1,			-1, -1, FALSE,
+    IMG_ENVELOPE_1
+  },
+  {
+    EL_ENVELOPE_1,			ACTION_COLLECTING, -1, FALSE,
+    IMG_ENVELOPE_1_COLLECTING
+  },
+  {
+    EL_ENVELOPE_2,			-1, -1, FALSE,
+    IMG_ENVELOPE_2
+  },
+  {
+    EL_ENVELOPE_2,			ACTION_COLLECTING, -1, FALSE,
+    IMG_ENVELOPE_2_COLLECTING
+  },
+  {
+    EL_ENVELOPE_3,			-1, -1, FALSE,
+    IMG_ENVELOPE_3
+  },
+  {
+    EL_ENVELOPE_3,			ACTION_COLLECTING, -1, FALSE,
+    IMG_ENVELOPE_3_COLLECTING
+  },
+  {
+    EL_ENVELOPE_4,			-1, -1, FALSE,
+    IMG_ENVELOPE_4
+  },
+  {
+    EL_ENVELOPE_4,			ACTION_COLLECTING, -1, FALSE,
+    IMG_ENVELOPE_4_COLLECTING
   },
   {
     EL_SIGN_EXCLAMATION,		-1, -1, FALSE,
@@ -1485,18 +1733,50 @@ element_to_graphic[] =
     EL_GATE_1_GRAY,			-1, -1, FALSE,
     IMG_GATE_1_GRAY
   },
+  {
+    EL_GATE_1_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_GATE_1_GRAY_ACTIVE
+  },
+  {
+    EL_GATE_1_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_GATE_1_GRAY_ACTIVE
+  },
   {
     EL_GATE_2_GRAY,			-1, -1, FALSE,
     IMG_GATE_2_GRAY
   },
+  {
+    EL_GATE_2_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_GATE_2_GRAY_ACTIVE
+  },
+  {
+    EL_GATE_2_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_GATE_2_GRAY_ACTIVE
+  },
   {
     EL_GATE_3_GRAY,			-1, -1, FALSE,
     IMG_GATE_3_GRAY
   },
+  {
+    EL_GATE_3_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_GATE_3_GRAY_ACTIVE
+  },
+  {
+    EL_GATE_3_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_GATE_3_GRAY_ACTIVE
+  },
   {
     EL_GATE_4_GRAY,			-1, -1, FALSE,
     IMG_GATE_4_GRAY
   },
+  {
+    EL_GATE_4_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_GATE_4_GRAY_ACTIVE
+  },
+  {
+    EL_GATE_4_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_GATE_4_GRAY_ACTIVE
+  },
   {
     EL_GAME_OF_LIFE,			-1, -1, FALSE,
     IMG_GAME_OF_LIFE
@@ -1542,20 +1822,20 @@ element_to_graphic[] =
     IMG_PACMAN_DOWN
   },
   {
-    EL_PACMAN,				ACTION_MOVING, MV_BIT_RIGHT, FALSE,
-    IMG_PACMAN_MOVING_RIGHT
+    EL_PACMAN,				ACTION_TURNING_FROM_RIGHT, -1, FALSE,
+    IMG_PACMAN_TURNING_FROM_RIGHT
   },
   {
-    EL_PACMAN,				ACTION_MOVING, MV_BIT_UP, FALSE,
-    IMG_PACMAN_MOVING_UP
+    EL_PACMAN,				ACTION_TURNING_FROM_UP, -1, FALSE,
+    IMG_PACMAN_TURNING_FROM_UP
   },
   {
-    EL_PACMAN,				ACTION_MOVING, MV_BIT_LEFT, FALSE,
-    IMG_PACMAN_MOVING_LEFT
+    EL_PACMAN,				ACTION_TURNING_FROM_LEFT, -1, FALSE,
+    IMG_PACMAN_TURNING_FROM_LEFT
   },
   {
-    EL_PACMAN,				ACTION_MOVING, MV_BIT_DOWN, FALSE,
-    IMG_PACMAN_MOVING_DOWN
+    EL_PACMAN,				ACTION_TURNING_FROM_DOWN, -1, FALSE,
+    IMG_PACMAN_TURNING_FROM_DOWN
   },
   {
     EL_LAMP,				-1, -1, FALSE,
@@ -2446,36 +2726,332 @@ element_to_graphic[] =
     IMG_ARROW_DOWN
   },
   {
-    EL_DOOR_WHITE,			-1, -1, FALSE,
-    IMG_CHAR_QUESTION
+    EL_UNKNOWN,				-1, -1, FALSE,
+    IMG_UNKNOWN
   },
   {
-    EL_DOOR_WHITE_GRAY,			-1, -1, FALSE,
-    IMG_CHAR_QUESTION
+    EL_TRIGGER_ELEMENT,			-1, -1, FALSE,
+    IMG_TRIGGER_ELEMENT
   },
   {
-    EL_DX_UNKNOWN_15,			-1, -1, FALSE,
-    IMG_CHAR_QUESTION
+    EL_TRIGGER_PLAYER,			-1, -1, FALSE,
+    IMG_TRIGGER_PLAYER
   },
   {
-    EL_DX_UNKNOWN_42,			-1, -1, FALSE,
-    IMG_CHAR_QUESTION
+    EL_EMC_KEY_5,			-1, -1, FALSE,
+    IMG_EMC_KEY_5
   },
   {
-    EL_EM_KEY_1_FILE,			-1, -1, FALSE,
-    IMG_EM_KEY_1
+    EL_EMC_KEY_6,			-1, -1, FALSE,
+    IMG_EMC_KEY_6
   },
   {
-    EL_EM_KEY_2_FILE,			-1, -1, FALSE,
-    IMG_EM_KEY_2
+    EL_EMC_KEY_7,			-1, -1, FALSE,
+    IMG_EMC_KEY_7
   },
   {
-    EL_EM_KEY_3_FILE,			-1, -1, FALSE,
-    IMG_EM_KEY_3
+    EL_EMC_KEY_8,			-1, -1, FALSE,
+    IMG_EMC_KEY_8
   },
   {
-    EL_EM_KEY_4_FILE,			-1, -1, FALSE,
-    IMG_EM_KEY_4
+    EL_EMC_GATE_5,			-1, -1, FALSE,
+    IMG_EMC_GATE_5
+  },
+  {
+    EL_EMC_GATE_6,			-1, -1, FALSE,
+    IMG_EMC_GATE_6
+  },
+  {
+    EL_EMC_GATE_7,			-1, -1, FALSE,
+    IMG_EMC_GATE_7
+  },
+  {
+    EL_EMC_GATE_8,			-1, -1, FALSE,
+    IMG_EMC_GATE_8
+  },
+  {
+    EL_EMC_GATE_5_GRAY,			-1, -1, FALSE,
+    IMG_EMC_GATE_5_GRAY
+  },
+  {
+    EL_EMC_GATE_5_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_GATE_5_GRAY_ACTIVE
+  },
+  {
+    EL_EMC_GATE_5_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_GATE_5_GRAY_ACTIVE
+  },
+  {
+    EL_EMC_GATE_6_GRAY,			-1, -1, FALSE,
+    IMG_EMC_GATE_6_GRAY
+  },
+  {
+    EL_EMC_GATE_6_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_GATE_6_GRAY_ACTIVE
+  },
+  {
+    EL_EMC_GATE_6_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_GATE_6_GRAY_ACTIVE
+  },
+  {
+    EL_EMC_GATE_7_GRAY,			-1, -1, FALSE,
+    IMG_EMC_GATE_7_GRAY
+  },
+  {
+    EL_EMC_GATE_7_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_GATE_7_GRAY_ACTIVE
+  },
+  {
+    EL_EMC_GATE_7_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_GATE_7_GRAY_ACTIVE
+  },
+  {
+    EL_EMC_GATE_8_GRAY,			-1, -1, FALSE,
+    IMG_EMC_GATE_8_GRAY
+  },
+  {
+    EL_EMC_GATE_8_GRAY_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_GATE_8_GRAY_ACTIVE
+  },
+  {
+    EL_EMC_GATE_8_GRAY,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_GATE_8_GRAY_ACTIVE
+  },
+  {
+    EL_EMC_ANDROID,			-1, -1, FALSE,
+    IMG_EMC_ANDROID
+  },
+  {
+    EL_EMC_GRASS,			-1, -1, FALSE,
+    IMG_EMC_GRASS
+  },
+  {
+    EL_EMC_GRASS,			-1, -1, TRUE,
+    IMG_EMC_GRASS_CRUMBLED
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_LEFT, FALSE,
+    IMG_EMC_GRASS_DIGGING_LEFT
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_RIGHT, FALSE,
+    IMG_EMC_GRASS_DIGGING_RIGHT
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_UP, FALSE,
+    IMG_EMC_GRASS_DIGGING_UP
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_DOWN, FALSE,
+    IMG_EMC_GRASS_DIGGING_DOWN
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_LEFT, TRUE,
+    IMG_EMC_GRASS_DIGGING_LEFT_CRUMBLED
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_RIGHT, TRUE,
+    IMG_EMC_GRASS_DIGGING_RIGHT_CRUMBLED
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_UP, TRUE,
+    IMG_EMC_GRASS_DIGGING_UP_CRUMBLED
+  },
+  {
+    EL_EMC_GRASS,			ACTION_DIGGING, MV_BIT_DOWN, TRUE,
+    IMG_EMC_GRASS_DIGGING_DOWN_CRUMBLED
+  },
+  {
+    EL_EMC_MAGIC_BALL,			-1, -1, FALSE,
+    IMG_EMC_MAGIC_BALL
+  },
+  {
+    EL_EMC_MAGIC_BALL_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_ACTIVE
+  },
+  {
+    EL_EMC_MAGIC_BALL,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_ACTIVE
+  },
+  {
+    EL_EMC_MAGIC_BALL,			ACTION_DROPPING, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_DROPPING
+  },
+  {
+    EL_EMC_MAGIC_BALL_SWITCH,		-1, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_SWITCH
+  },
+  {
+    EL_EMC_MAGIC_BALL_SWITCH_ACTIVE,	-1, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_SWITCH_ACTIVE
+  },
+  {
+    EL_EMC_MAGIC_BALL_SWITCH,		ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_MAGIC_BALL_SWITCH_ACTIVE
+  },
+  {
+    EL_EMC_SPRING_BUMPER,		-1, -1, FALSE,
+    IMG_EMC_SPRING_BUMPER
+  },
+  {
+    EL_EMC_SPRING_BUMPER_ACTIVE,	-1, -1, FALSE,
+    IMG_EMC_SPRING_BUMPER_ACTIVE
+  },
+  {
+    EL_EMC_SPRING_BUMPER,		ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_SPRING_BUMPER_ACTIVE
+  },
+  {
+    EL_EMC_PLANT,			-1, -1, FALSE,
+    IMG_EMC_PLANT
+  },
+  {
+    EL_EMC_PLANT,			-1, -1, TRUE,
+    IMG_EMC_PLANT_CRUMBLED
+  },
+  {
+    EL_EMC_LENSES,			-1, -1, FALSE,
+    IMG_EMC_LENSES
+  },
+  {
+    EL_EMC_MAGNIFIER,			-1, -1, FALSE,
+    IMG_EMC_MAGNIFIER
+  },
+  {
+    EL_EMC_WALL_9,			-1, -1, FALSE,
+    IMG_EMC_WALL_9
+  },
+  {
+    EL_EMC_WALL_10,			-1, -1, FALSE,
+    IMG_EMC_WALL_10
+  },
+  {
+    EL_EMC_WALL_11,			-1, -1, FALSE,
+    IMG_EMC_WALL_11
+  },
+  {
+    EL_EMC_WALL_12,			-1, -1, FALSE,
+    IMG_EMC_WALL_12
+  },
+  {
+    EL_EMC_WALL_13,			-1, -1, FALSE,
+    IMG_EMC_WALL_13
+  },
+  {
+    EL_EMC_WALL_14,			-1, -1, FALSE,
+    IMG_EMC_WALL_14
+  },
+  {
+    EL_EMC_WALL_15,			-1, -1, FALSE,
+    IMG_EMC_WALL_15
+  },
+  {
+    EL_EMC_WALL_16,			-1, -1, FALSE,
+    IMG_EMC_WALL_16
+  },
+  {
+    EL_EMC_WALL_SLIPPERY_1,		-1, -1, FALSE,
+    IMG_EMC_WALL_SLIPPERY_1
+  },
+  {
+    EL_EMC_WALL_SLIPPERY_2,		-1, -1, FALSE,
+    IMG_EMC_WALL_SLIPPERY_2
+  },
+  {
+    EL_EMC_WALL_SLIPPERY_3,		-1, -1, FALSE,
+    IMG_EMC_WALL_SLIPPERY_3
+  },
+  {
+    EL_EMC_WALL_SLIPPERY_4,		-1, -1, FALSE,
+    IMG_EMC_WALL_SLIPPERY_4
+  },
+  {
+    EL_EMC_FAKE_GRASS,			-1, -1, FALSE,
+    IMG_EMC_FAKE_GRASS
+  },
+  {
+    EL_EMC_FAKE_GRASS,			-1, -1, TRUE,
+    IMG_EMC_FAKE_GRASS_CRUMBLED
+  },
+  {
+    EL_EMC_FAKE_GRASS_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_FAKE_GRASS_ACTIVE
+  },
+  {
+    EL_EMC_FAKE_GRASS,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_FAKE_GRASS_ACTIVE
+  },
+  {
+    EL_EMC_FAKE_GRASS,			ACTION_ACTIVE, -1, TRUE,
+    IMG_EMC_FAKE_GRASS_ACTIVE_CRUMBLED
+  },
+  {
+    EL_EMC_FAKE_GRASS_ACTIVE,		-1, -1, TRUE,
+    IMG_EMC_FAKE_GRASS_ACTIVE_CRUMBLED
+  },
+  {
+    EL_EMC_FAKE_ACID,			-1, -1, FALSE,
+    IMG_EMC_FAKE_ACID
+  },
+  {
+    EL_EMC_DRIPPER,			-1, -1, FALSE,
+    IMG_EMC_DRIPPER
+  },
+  {
+    EL_EMC_DRIPPER_ACTIVE,		-1, -1, FALSE,
+    IMG_EMC_DRIPPER_ACTIVE
+  },
+  {
+    EL_EMC_DRIPPER,			ACTION_ACTIVE, -1, FALSE,
+    IMG_EMC_DRIPPER_ACTIVE
+  },
+  {
+    EL_BD_BUTTERFLY_DOWN,		-1, -1, FALSE,
+    IMG_BD_BUTTERFLY
+  },
+  {
+    EL_BD_BUTTERFLY_LEFT,		-1, -1, FALSE,
+    IMG_BD_BUTTERFLY
+  },
+  {
+    EL_BD_BUTTERFLY_RIGHT,		-1, -1, FALSE,
+    IMG_BD_BUTTERFLY
+  },
+  {
+    EL_BD_BUTTERFLY_UP,			-1, -1, FALSE,
+    IMG_BD_BUTTERFLY
+  },
+  {
+    EL_BD_FIREFLY_DOWN,			-1, -1, FALSE,
+    IMG_BD_FIREFLY
+  },
+  {
+    EL_BD_FIREFLY_LEFT,			-1, -1, FALSE,
+    IMG_BD_FIREFLY
+  },
+  {
+    EL_BD_FIREFLY_RIGHT,		-1, -1, FALSE,
+    IMG_BD_FIREFLY
+  },
+  {
+    EL_BD_FIREFLY_UP,			-1, -1, FALSE,
+    IMG_BD_FIREFLY
+  },
+  {
+    EL_DOOR_WHITE,			-1, -1, FALSE,
+    IMG_CHAR_QUESTION
+  },
+  {
+    EL_DOOR_WHITE_GRAY,			-1, -1, FALSE,
+    IMG_CHAR_QUESTION
+  },
+  {
+    EL_DX_UNKNOWN_15,			-1, -1, FALSE,
+    IMG_CHAR_QUESTION
+  },
+  {
+    EL_DX_UNKNOWN_42,			-1, -1, FALSE,
+    IMG_CHAR_QUESTION
   },
   {
     EL_KEY_WHITE,			-1, -1, FALSE,
@@ -2542,8 +3118,8 @@ element_to_graphic[] =
     IMG_CHAR_DOLLAR
   },
   {
-    EL_CHAR_PROCENT,			-1, -1, FALSE,
-    IMG_CHAR_PROCENT
+    EL_CHAR_PERCENT,			-1, -1, FALSE,
+    IMG_CHAR_PERCENT
   },
   {
     EL_CHAR_AMPERSAND,			-1, -1, FALSE,
@@ -3829,6 +4405,134 @@ element_to_graphic[] =
     EL_CUSTOM_256,			-1, -1, FALSE,
     IMG_CUSTOM_256
   },
+  {
+    EL_GROUP_1,				-1, -1, FALSE,
+    IMG_GROUP_1
+  },
+  {
+    EL_GROUP_2,				-1, -1, FALSE,
+    IMG_GROUP_2
+  },
+  {
+    EL_GROUP_3,				-1, -1, FALSE,
+    IMG_GROUP_3
+  },
+  {
+    EL_GROUP_4,				-1, -1, FALSE,
+    IMG_GROUP_4
+  },
+  {
+    EL_GROUP_5,				-1, -1, FALSE,
+    IMG_GROUP_5
+  },
+  {
+    EL_GROUP_6,				-1, -1, FALSE,
+    IMG_GROUP_6
+  },
+  {
+    EL_GROUP_7,				-1, -1, FALSE,
+    IMG_GROUP_7
+  },
+  {
+    EL_GROUP_8,				-1, -1, FALSE,
+    IMG_GROUP_8
+  },
+  {
+    EL_GROUP_9,				-1, -1, FALSE,
+    IMG_GROUP_9
+  },
+  {
+    EL_GROUP_10,			-1, -1, FALSE,
+    IMG_GROUP_10
+  },
+  {
+    EL_GROUP_11,			-1, -1, FALSE,
+    IMG_GROUP_11
+  },
+  {
+    EL_GROUP_12,			-1, -1, FALSE,
+    IMG_GROUP_12
+  },
+  {
+    EL_GROUP_13,			-1, -1, FALSE,
+    IMG_GROUP_13
+  },
+  {
+    EL_GROUP_14,			-1, -1, FALSE,
+    IMG_GROUP_14
+  },
+  {
+    EL_GROUP_15,			-1, -1, FALSE,
+    IMG_GROUP_15
+  },
+  {
+    EL_GROUP_16,			-1, -1, FALSE,
+    IMG_GROUP_16
+  },
+  {
+    EL_GROUP_17,			-1, -1, FALSE,
+    IMG_GROUP_17
+  },
+  {
+    EL_GROUP_18,			-1, -1, FALSE,
+    IMG_GROUP_18
+  },
+  {
+    EL_GROUP_19,			-1, -1, FALSE,
+    IMG_GROUP_19
+  },
+  {
+    EL_GROUP_20,			-1, -1, FALSE,
+    IMG_GROUP_20
+  },
+  {
+    EL_GROUP_21,			-1, -1, FALSE,
+    IMG_GROUP_21
+  },
+  {
+    EL_GROUP_22,			-1, -1, FALSE,
+    IMG_GROUP_22
+  },
+  {
+    EL_GROUP_23,			-1, -1, FALSE,
+    IMG_GROUP_23
+  },
+  {
+    EL_GROUP_24,			-1, -1, FALSE,
+    IMG_GROUP_24
+  },
+  {
+    EL_GROUP_25,			-1, -1, FALSE,
+    IMG_GROUP_25
+  },
+  {
+    EL_GROUP_26,			-1, -1, FALSE,
+    IMG_GROUP_26
+  },
+  {
+    EL_GROUP_27,			-1, -1, FALSE,
+    IMG_GROUP_27
+  },
+  {
+    EL_GROUP_28,			-1, -1, FALSE,
+    IMG_GROUP_28
+  },
+  {
+    EL_GROUP_29,			-1, -1, FALSE,
+    IMG_GROUP_29
+  },
+  {
+    EL_GROUP_30,			-1, -1, FALSE,
+    IMG_GROUP_30
+  },
+  {
+    EL_GROUP_31,			-1, -1, FALSE,
+    IMG_GROUP_31
+  },
+  {
+    EL_GROUP_32,			-1, -1, FALSE,
+    IMG_GROUP_32
+  },
   {
     -1,					-1, -1, FALSE,
     -1