rnd-20080616-1-src
[rocksndiamonds.git] / src / editor.c
index ff9906d457abe9c68002cc6020bf25cada810a1f..7ed2bb295cdf2e76bfe9e7d4913e28c9eaa29e16 100644 (file)
 #define GADGET_ID_RANDOM_RESTRICTED    (GADGET_ID_CHECKBUTTON_FIRST + 2)
 #define GADGET_ID_STICK_ELEMENT                (GADGET_ID_CHECKBUTTON_FIRST + 3)
 #define GADGET_ID_EM_SLIPPERY_GEMS     (GADGET_ID_CHECKBUTTON_FIRST + 4)
-#define GADGET_ID_USE_SPRING_BUG       (GADGET_ID_CHECKBUTTON_FIRST + 5)
-#define GADGET_ID_USE_TIME_ORB_BUG     (GADGET_ID_CHECKBUTTON_FIRST + 6)
-#define GADGET_ID_RANDOM_BALL_CONTENT  (GADGET_ID_CHECKBUTTON_FIRST + 7)
-#define GADGET_ID_INITIAL_BALL_STATE   (GADGET_ID_CHECKBUTTON_FIRST + 8)
-#define GADGET_ID_GROW_INTO_DIGGABLE   (GADGET_ID_CHECKBUTTON_FIRST + 9)
-#define GADGET_ID_CONTINUOUS_SNAPPING  (GADGET_ID_CHECKBUTTON_FIRST + 10)
-#define GADGET_ID_BLOCK_SNAP_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 11)
-#define GADGET_ID_BLOCK_LAST_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 12)
-#define GADGET_ID_SP_BLOCK_LAST_FIELD  (GADGET_ID_CHECKBUTTON_FIRST + 13)
-#define GADGET_ID_INSTANT_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 14)
-#define GADGET_ID_SHIFTED_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 15)
-#define GADGET_ID_USE_START_ELEMENT    (GADGET_ID_CHECKBUTTON_FIRST + 16)
-#define GADGET_ID_USE_ARTWORK_ELEMENT  (GADGET_ID_CHECKBUTTON_FIRST + 17)
-#define GADGET_ID_USE_EXPLOSION_ELEMENT        (GADGET_ID_CHECKBUTTON_FIRST + 18)
-#define GADGET_ID_INITIAL_GRAVITY      (GADGET_ID_CHECKBUTTON_FIRST + 19)
-#define GADGET_ID_USE_INITIAL_INVENTORY        (GADGET_ID_CHECKBUTTON_FIRST + 20)
-#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 21)
-#define GADGET_ID_CAN_FALL_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 22)
-#define GADGET_ID_CAN_MOVE_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 23)
-#define GADGET_ID_DONT_COLLIDE_WITH    (GADGET_ID_CHECKBUTTON_FIRST + 24)
-#define GADGET_ID_ENVELOPE_AUTOWRAP    (GADGET_ID_CHECKBUTTON_FIRST + 25)
-#define GADGET_ID_ENVELOPE_CENTERED    (GADGET_ID_CHECKBUTTON_FIRST + 26)
-#define GADGET_ID_CUSTOM_INDESTRUCTIBLE        (GADGET_ID_CHECKBUTTON_FIRST + 27)
-#define GADGET_ID_CUSTOM_CAN_EXPLODE   (GADGET_ID_CHECKBUTTON_FIRST + 28)
-#define GADGET_ID_CUSTOM_EXPLODE_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 29)
-#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 30)
-#define GADGET_ID_CUSTOM_EXPLODE_IMPACT        (GADGET_ID_CHECKBUTTON_FIRST + 31)
-#define GADGET_ID_CUSTOM_WALK_TO_OBJECT        (GADGET_ID_CHECKBUTTON_FIRST + 32)
-#define GADGET_ID_CUSTOM_DEADLY                (GADGET_ID_CHECKBUTTON_FIRST + 33)
-#define GADGET_ID_CUSTOM_CAN_MOVE      (GADGET_ID_CHECKBUTTON_FIRST + 34)
-#define GADGET_ID_CUSTOM_CAN_FALL      (GADGET_ID_CHECKBUTTON_FIRST + 35)
-#define GADGET_ID_CUSTOM_CAN_SMASH     (GADGET_ID_CHECKBUTTON_FIRST + 36)
-#define GADGET_ID_CUSTOM_SLIPPERY      (GADGET_ID_CHECKBUTTON_FIRST + 37)
-#define GADGET_ID_CUSTOM_ACCESSIBLE    (GADGET_ID_CHECKBUTTON_FIRST + 38)
-#define GADGET_ID_CUSTOM_GRAV_REACHABLE        (GADGET_ID_CHECKBUTTON_FIRST + 39)
-#define GADGET_ID_CUSTOM_USE_LAST_VALUE        (GADGET_ID_CHECKBUTTON_FIRST + 40)
-#define GADGET_ID_CUSTOM_USE_GRAPHIC   (GADGET_ID_CHECKBUTTON_FIRST + 41)
-#define GADGET_ID_CUSTOM_USE_TEMPLATE  (GADGET_ID_CHECKBUTTON_FIRST + 42)
-#define GADGET_ID_CUSTOM_CAN_CHANGE    (GADGET_ID_CHECKBUTTON_FIRST + 43)
-#define GADGET_ID_CHANGE_USE_CONTENT   (GADGET_ID_CHECKBUTTON_FIRST + 44)
-#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 45)
-#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 46)
-#define GADGET_ID_CHANGE_USE_RANDOM    (GADGET_ID_CHECKBUTTON_FIRST + 47)
-#define GADGET_ID_CHANGE_HAS_ACTION    (GADGET_ID_CHECKBUTTON_FIRST + 48)
-#define GADGET_ID_CHANGE_DELAY         (GADGET_ID_CHECKBUTTON_FIRST + 49)
-#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 50)
-#define GADGET_ID_CHANGE_BY_OTHER_ACT  (GADGET_ID_CHECKBUTTON_FIRST + 51)
+#define GADGET_ID_EM_EXPLODES_BY_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 5)
+#define GADGET_ID_USE_SPRING_BUG       (GADGET_ID_CHECKBUTTON_FIRST + 6)
+#define GADGET_ID_USE_TIME_ORB_BUG     (GADGET_ID_CHECKBUTTON_FIRST + 7)
+#define GADGET_ID_RANDOM_BALL_CONTENT  (GADGET_ID_CHECKBUTTON_FIRST + 8)
+#define GADGET_ID_INITIAL_BALL_STATE   (GADGET_ID_CHECKBUTTON_FIRST + 9)
+#define GADGET_ID_GROW_INTO_DIGGABLE   (GADGET_ID_CHECKBUTTON_FIRST + 10)
+#define GADGET_ID_CONTINUOUS_SNAPPING  (GADGET_ID_CHECKBUTTON_FIRST + 11)
+#define GADGET_ID_BLOCK_SNAP_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 12)
+#define GADGET_ID_BLOCK_LAST_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 13)
+#define GADGET_ID_SP_BLOCK_LAST_FIELD  (GADGET_ID_CHECKBUTTON_FIRST + 14)
+#define GADGET_ID_INSTANT_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 15)
+#define GADGET_ID_SHIFTED_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 16)
+#define GADGET_ID_USE_START_ELEMENT    (GADGET_ID_CHECKBUTTON_FIRST + 17)
+#define GADGET_ID_USE_ARTWORK_ELEMENT  (GADGET_ID_CHECKBUTTON_FIRST + 18)
+#define GADGET_ID_USE_EXPLOSION_ELEMENT        (GADGET_ID_CHECKBUTTON_FIRST + 19)
+#define GADGET_ID_INITIAL_GRAVITY      (GADGET_ID_CHECKBUTTON_FIRST + 20)
+#define GADGET_ID_USE_INITIAL_INVENTORY        (GADGET_ID_CHECKBUTTON_FIRST + 21)
+#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 22)
+#define GADGET_ID_CAN_FALL_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 23)
+#define GADGET_ID_CAN_MOVE_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 24)
+#define GADGET_ID_DONT_COLLIDE_WITH    (GADGET_ID_CHECKBUTTON_FIRST + 25)
+#define GADGET_ID_ENVELOPE_AUTOWRAP    (GADGET_ID_CHECKBUTTON_FIRST + 26)
+#define GADGET_ID_ENVELOPE_CENTERED    (GADGET_ID_CHECKBUTTON_FIRST + 27)
+#define GADGET_ID_CUSTOM_INDESTRUCTIBLE        (GADGET_ID_CHECKBUTTON_FIRST + 28)
+#define GADGET_ID_CUSTOM_CAN_EXPLODE   (GADGET_ID_CHECKBUTTON_FIRST + 29)
+#define GADGET_ID_CUSTOM_EXPLODE_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 30)
+#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 31)
+#define GADGET_ID_CUSTOM_EXPLODE_IMPACT        (GADGET_ID_CHECKBUTTON_FIRST + 32)
+#define GADGET_ID_CUSTOM_WALK_TO_OBJECT        (GADGET_ID_CHECKBUTTON_FIRST + 33)
+#define GADGET_ID_CUSTOM_DEADLY                (GADGET_ID_CHECKBUTTON_FIRST + 34)
+#define GADGET_ID_CUSTOM_CAN_MOVE      (GADGET_ID_CHECKBUTTON_FIRST + 35)
+#define GADGET_ID_CUSTOM_CAN_FALL      (GADGET_ID_CHECKBUTTON_FIRST + 36)
+#define GADGET_ID_CUSTOM_CAN_SMASH     (GADGET_ID_CHECKBUTTON_FIRST + 37)
+#define GADGET_ID_CUSTOM_SLIPPERY      (GADGET_ID_CHECKBUTTON_FIRST + 38)
+#define GADGET_ID_CUSTOM_ACCESSIBLE    (GADGET_ID_CHECKBUTTON_FIRST + 39)
+#define GADGET_ID_CUSTOM_GRAV_REACHABLE        (GADGET_ID_CHECKBUTTON_FIRST + 40)
+#define GADGET_ID_CUSTOM_USE_LAST_VALUE        (GADGET_ID_CHECKBUTTON_FIRST + 41)
+#define GADGET_ID_CUSTOM_USE_GRAPHIC   (GADGET_ID_CHECKBUTTON_FIRST + 42)
+#define GADGET_ID_CUSTOM_USE_TEMPLATE  (GADGET_ID_CHECKBUTTON_FIRST + 43)
+#define GADGET_ID_CUSTOM_CAN_CHANGE    (GADGET_ID_CHECKBUTTON_FIRST + 44)
+#define GADGET_ID_CHANGE_USE_CONTENT   (GADGET_ID_CHECKBUTTON_FIRST + 45)
+#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 46)
+#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 47)
+#define GADGET_ID_CHANGE_USE_RANDOM    (GADGET_ID_CHECKBUTTON_FIRST + 48)
+#define GADGET_ID_CHANGE_HAS_ACTION    (GADGET_ID_CHECKBUTTON_FIRST + 49)
+#define GADGET_ID_CHANGE_DELAY         (GADGET_ID_CHECKBUTTON_FIRST + 50)
+#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 51)
+#define GADGET_ID_CHANGE_BY_OTHER_ACT  (GADGET_ID_CHECKBUTTON_FIRST + 52)
 
 /* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST    (GADGET_ID_CHECKBUTTON_FIRST + 52)
+#define GADGET_ID_ELEMENTLIST_FIRST    (GADGET_ID_CHECKBUTTON_FIRST + 53)
 #define GADGET_ID_ELEMENTLIST_LAST     (GADGET_ID_ELEMENTLIST_FIRST +  \
                                        ED_NUM_ELEMENTLIST_BUTTONS - 1)
 
 #define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED    0
 #define ED_CHECKBUTTON_ID_STICK_ELEMENT                1
 #define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS     2
-#define ED_CHECKBUTTON_ID_USE_SPRING_BUG       3
-#define ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG     4
-#define ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT  5
-#define ED_CHECKBUTTON_ID_INITIAL_BALL_STATE   6
-#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE   7
-#define ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING  8
-#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD     9
-#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD     10
-#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD  11
-#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION   12
-#define ED_CHECKBUTTON_ID_SHIFTED_RELOCATION   13
-#define ED_CHECKBUTTON_ID_USE_START_ELEMENT    14
-#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT  15
-#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT        16
-#define ED_CHECKBUTTON_ID_INITIAL_GRAVITY      17
-#define ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY        18
-#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 19
-#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID   20
-#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID   21
-#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH    22
-#define ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP    23
-#define ED_CHECKBUTTON_ID_ENVELOPE_CENTERED    24
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC   25
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE  26
-#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE    27
-#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE        28
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE        29
-#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT        30
-#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE        31
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE      32
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL      33
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH     34
-#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY      35
-#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY                36
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE   37
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE  38
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 39
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT        40
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE    41
-#define ED_CHECKBUTTON_ID_CHANGE_DELAY         42
-#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 43
-#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT  44
-#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 45
-#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT   46
-#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 47
-#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM    48
-#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION    49
-
-#define ED_NUM_CHECKBUTTONS                    50
+#define ED_CHECKBUTTON_ID_EM_EXPLODES_BY_FIRE  3
+#define ED_CHECKBUTTON_ID_USE_SPRING_BUG       4
+#define ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG     5
+#define ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT  6
+#define ED_CHECKBUTTON_ID_INITIAL_BALL_STATE   7
+#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE   8
+#define ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING  9
+#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD     10
+#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD     11
+#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD  12
+#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION   13
+#define ED_CHECKBUTTON_ID_SHIFTED_RELOCATION   14
+#define ED_CHECKBUTTON_ID_USE_START_ELEMENT    15
+#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT  16
+#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT        17
+#define ED_CHECKBUTTON_ID_INITIAL_GRAVITY      18
+#define ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY        19
+#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 20
+#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID   21
+#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID   22
+#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH    23
+#define ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP    24
+#define ED_CHECKBUTTON_ID_ENVELOPE_CENTERED    25
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC   26
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE  27
+#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE    28
+#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE        29
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE        30
+#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT        31
+#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE        32
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE      33
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL      34
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH     35
+#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY      36
+#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY                37
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE   38
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE  39
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 40
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT        41
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE    42
+#define ED_CHECKBUTTON_ID_CHANGE_DELAY         43
+#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 44
+#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT  45
+#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 46
+#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT   47
+#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 48
+#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM    49
+#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION    50
+
+#define ED_NUM_CHECKBUTTONS                    51
 
 #define ED_CHECKBUTTON_ID_LEVEL_FIRST  ED_CHECKBUTTON_ID_RANDOM_RESTRICTED
 #define ED_CHECKBUTTON_ID_LEVEL_LAST   ED_CHECKBUTTON_ID_RANDOM_RESTRICTED
@@ -1714,6 +1716,7 @@ static struct ValueTextInfo options_action_type[] =
   { CA_HEADLINE_CE_ACTIONS,    "[CE]"                          },
   { CA_SET_CE_VALUE,           "set CE value"                  },
   { CA_SET_CE_SCORE,           "set CE score"                  },
+  { CA_SET_CE_ARTWORK,         "set CE artwork"                },
   { CA_UNDEFINED,              " "                             },
   { CA_HEADLINE_ENGINE_ACTIONS,        "[engine]"                      },
   { CA_SET_ENGINE_SCAN_MODE,   "set scan mode"                 },
@@ -1972,14 +1975,17 @@ static struct ValueTextInfo options_action_arg_scan_mode[] =
 static struct ValueTextInfo options_action_arg_inventory[] =
 {
   { CA_ARG_INVENTORY_HEADLINE, "[add]"                         },
-  { CA_ARG_ELEMENT_TARGET,     "target"                        },
-  { CA_ARG_ELEMENT_TRIGGER,    "trigger"                       },
-  { CA_ARG_ELEMENT_ACTION,     "action ->"                     },
+  { CA_ARG_ELEMENT_TARGET,     "+ target"                      },
+  { CA_ARG_ELEMENT_TRIGGER,    "+ trigger"                     },
+  { CA_ARG_ELEMENT_ACTION,     "+ action"                      },
   { CA_ARG_UNDEFINED,          " "                             },
   { CA_ARG_INVENTORY_RM_HEADLINE,"[remove]"                    },
-  { CA_ARG_INVENTORY_RM_FIRST, "first"                         },
-  { CA_ARG_INVENTORY_RM_LAST,  "last"                          },
-  { CA_ARG_INVENTORY_RM_ALL,   "all"                           },
+  { CA_ARG_INVENTORY_RM_TARGET,        "- target"                      },
+  { CA_ARG_INVENTORY_RM_TRIGGER,"- trigger"                    },
+  { CA_ARG_INVENTORY_RM_ACTION,        "- action"                      },
+  { CA_ARG_INVENTORY_RM_FIRST, "- first"                       },
+  { CA_ARG_INVENTORY_RM_LAST,  "- last"                        },
+  { CA_ARG_INVENTORY_RM_ALL,   "- all"                         },
   { CA_ARG_UNDEFINED,          " "                             },
   { CA_ARG_INVENTORY_RESET,    "reset"                         },
 
@@ -2037,6 +2043,7 @@ action_arg_options[] =
   { CA_SET_PLAYER_INVENTORY,   0,      options_action_arg_inventory,   },
   { CA_SET_CE_VALUE,           3,      options_action_arg_value,       },
   { CA_SET_CE_SCORE,           3,      options_action_arg_value,       },
+  { CA_SET_CE_ARTWORK,         1,      options_action_arg_artwork,     },
   { CA_SET_ENGINE_SCAN_MODE,   1,      options_action_arg_scan_mode,   },
 
   { -1,                                FALSE,  NULL                            }
@@ -2571,6 +2578,13 @@ static struct
     NULL,
     "slip down from certain flat walls","use EM/DC style slipping behaviour"
   },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
+    GADGET_ID_EM_EXPLODES_BY_FIRE,     GADGET_ID_NONE,
+    &level.em_explodes_by_fire,
+    NULL,
+    "explodes with chain reaction",    "use R'n'D style explosion behaviour"
+  },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(2),
     GADGET_ID_USE_SPRING_BUG,          GADGET_ID_NONE,
@@ -3100,7 +3114,7 @@ static struct
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(1),
     GADGET_ID_CUSTOM_GRAPHIC,          GADGET_ID_CUSTOM_USE_GRAPHIC,
-    &custom_element.gfx_element,       1, 1,
+    &custom_element.gfx_element_initial,1, 1,
     NULL, NULL, NULL,                  "custom graphic element"
   },
 
@@ -7166,6 +7180,8 @@ void DrawLevelEd()
   ReinitializeElementList();           /* update dynamic level element list */
   ReinitializeElementListButtons();    /* custom element may look different */
 
+  InitElementPropertiesGfxElement();
+
 #if 1
   UnmapAllGadgets();
 #else
@@ -8222,6 +8238,9 @@ static void DrawPropertiesConfig()
   if (IS_GEM(properties_element))
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS);
 
+  if (properties_element == EL_EM_DYNAMITE)
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_EM_EXPLODES_BY_FIRE);
+
   if (COULD_MOVE_INTO_ACID(properties_element) &&
       !ELEM_IS_PLAYER(properties_element) &&
       (!IS_CUSTOM_ELEMENT(properties_element) ||
@@ -8538,8 +8557,12 @@ static void DrawPropertiesWindow()
 
 static void UpdateCustomElementGraphicGadgets()
 {
+  struct ElementInfo *ei = &element_info[properties_element];
   int i;
 
+  ei->gfx_element = (ei->use_gfx_element ? ei->gfx_element_initial :
+                    properties_element);
+
   ModifyEditorElementList();
   RedrawDrawingElements();