rnd-20030628-1-src
[rocksndiamonds.git] / src / editor.c
index 6e7edd102c187170e5800fb5d01c0fa95ad8b071..bfec772db3a0f9b5e91ffde7d4976d4765b42090 100644 (file)
                                         n * ED_COUNTER_YDISTANCE - 2)
 
 /* values for element content drawing areas */
+/* amoeba content */
 #define ED_AREA_ELEM_CONTENT_XPOS      ( 2 * MINI_TILEX)
 #define ED_AREA_ELEM_CONTENT_YPOS      (22 * MINI_TILEY)
 
+/* custom change target */
 #define ED_AREA_ELEM_CONTENT2_XPOS     (20 * MINI_TILEX)
 #define ED_AREA_ELEM_CONTENT2_YPOS     (ED_SETTINGS_YPOS(2) + \
                                         ED_GADGET_DISTANCE)
-
+/* optional custom graphic */
 #define ED_AREA_ELEM_CONTENT3_XPOS     (24 * MINI_TILEX)
 #define ED_AREA_ELEM_CONTENT3_YPOS     (ED_SETTINGS_YPOS(1) + \
                                         ED_GADGET_DISTANCE)
-
-#if 1
+/* custom element content */
 #define ED_AREA_ELEM_CONTENT4_XPOS     (29 * MINI_TILEX)
 #define ED_AREA_ELEM_CONTENT4_YPOS     (ED_SETTINGS_YPOS(2) + \
                                         ED_GADGET_DISTANCE - MINI_TILEY)
-#else
-#define ED_AREA_ELEM_CONTENT4_XPOS     (17 * MINI_TILEX)
-#define ED_AREA_ELEM_CONTENT4_YPOS     (ED_SETTINGS_YPOS(11) + \
-                                        ED_GADGET_DISTANCE - MINI_TILEY)
-#endif
+/* custom change trigger element */
+#define ED_AREA_ELEM_CONTENT5_XPOS     (30 * MINI_TILEX + MINI_TILEX / 2)
+#define ED_AREA_ELEM_CONTENT5_YPOS     (ED_SETTINGS_YPOS(7) + \
+                                        ED_GADGET_DISTANCE)
 
 /* values for random placement background drawing area */
 #define ED_AREA_RANDOM_BACKGROUND_XPOS (29 * MINI_TILEX)
 #define GADGET_ID_AMOEBA_CONTENT       (GADGET_ID_DRAWING_AREA_FIRST + 9)
 #define GADGET_ID_CUSTOM_GRAPHIC       (GADGET_ID_DRAWING_AREA_FIRST + 10)
 #define GADGET_ID_CUSTOM_CONTENT       (GADGET_ID_DRAWING_AREA_FIRST + 11)
-#define GADGET_ID_CUSTOM_CHANGED       (GADGET_ID_DRAWING_AREA_FIRST + 12)
-#define GADGET_ID_RANDOM_BACKGROUND    (GADGET_ID_DRAWING_AREA_FIRST + 13)
+#define GADGET_ID_CUSTOM_CHANGE_TARGET (GADGET_ID_DRAWING_AREA_FIRST + 12)
+#define GADGET_ID_CUSTOM_CHANGE_TRIGGER        (GADGET_ID_DRAWING_AREA_FIRST + 13)
+#define GADGET_ID_RANDOM_BACKGROUND    (GADGET_ID_DRAWING_AREA_FIRST + 14)
 
 /* text input identifiers */
-#define GADGET_ID_TEXT_INPUT_FIRST     (GADGET_ID_DRAWING_AREA_FIRST + 14)
+#define GADGET_ID_TEXT_INPUT_FIRST     (GADGET_ID_DRAWING_AREA_FIRST + 15)
 
 #define GADGET_ID_LEVEL_NAME           (GADGET_ID_TEXT_INPUT_FIRST + 0)
 #define GADGET_ID_LEVEL_AUTHOR         (GADGET_ID_TEXT_INPUT_FIRST + 1)
 #define GADGET_ID_CUSTOM_WALKABLE_LAYER        (GADGET_ID_SELECTBOX_FIRST + 7)
 #define GADGET_ID_CHANGE_TIME_UNITS    (GADGET_ID_SELECTBOX_FIRST + 8)
 #define GADGET_ID_CHANGE_PLAYER_ACTION (GADGET_ID_SELECTBOX_FIRST + 9)
-#define GADGET_ID_CHANGE_CAUSE         (GADGET_ID_SELECTBOX_FIRST + 10)
+#define GADGET_ID_CHANGE_IMPACT_ACTION (GADGET_ID_SELECTBOX_FIRST + 10)
+#define GADGET_ID_CHANGE_OTHER_ACTION  (GADGET_ID_SELECTBOX_FIRST + 11)
 
 /* textbutton identifiers */
-#define GADGET_ID_TEXTBUTTON_FIRST     (GADGET_ID_SELECTBOX_FIRST + 11)
+#define GADGET_ID_TEXTBUTTON_FIRST     (GADGET_ID_SELECTBOX_FIRST + 12)
 
 #define GADGET_ID_PROPERTIES_INFO      (GADGET_ID_TEXTBUTTON_FIRST + 0)
 #define GADGET_ID_PROPERTIES_CONFIG    (GADGET_ID_TEXTBUTTON_FIRST + 1)
 #define GADGET_ID_CUSTOM_CAN_CHANGE    (GADGET_ID_CHECKBUTTON_FIRST + 20)
 #define GADGET_ID_CHANGE_DELAY         (GADGET_ID_CHECKBUTTON_FIRST + 21)
 #define GADGET_ID_CHANGE_BY_PLAYER     (GADGET_ID_CHECKBUTTON_FIRST + 22)
+#define GADGET_ID_CHANGE_IMPACT_SMASHED        (GADGET_ID_CHECKBUTTON_FIRST + 23)
+#define GADGET_ID_CHANGE_BY_OTHER      (GADGET_ID_CHECKBUTTON_FIRST + 24)
 
 /* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST    (GADGET_ID_CHECKBUTTON_FIRST + 23)
+#define GADGET_ID_ELEMENTLIST_FIRST    (GADGET_ID_CHECKBUTTON_FIRST + 25)
 #define GADGET_ID_ELEMENTLIST_LAST     (GADGET_ID_ELEMENTLIST_FIRST +  \
                                        ED_NUM_ELEMENTLIST_BUTTONS - 1)
 
 #define ED_SELECTBOX_ID_CUSTOM_WALKABLE_LAYER  7
 #define ED_SELECTBOX_ID_CHANGE_TIME_UNITS      8
 #define ED_SELECTBOX_ID_CHANGE_PLAYER_ACTION   9
-#define ED_SELECTBOX_ID_CHANGE_CAUSE           10
+#define ED_SELECTBOX_ID_CHANGE_IMPACT_ACTION   10
+#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION    11
 
-#define ED_NUM_SELECTBOX                       11
+#define ED_NUM_SELECTBOX                       12
 
 #define ED_SELECTBOX_ID_CUSTOM_FIRST   ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION
 #define ED_SELECTBOX_ID_CUSTOM_LAST    ED_SELECTBOX_ID_CUSTOM_WALKABLE_LAYER
 
 #define ED_SELECTBOX_ID_CHANGE_FIRST   ED_SELECTBOX_ID_CHANGE_TIME_UNITS
-#define ED_SELECTBOX_ID_CHANGE_LAST    ED_SELECTBOX_ID_CHANGE_CAUSE
+#define ED_SELECTBOX_ID_CHANGE_LAST    ED_SELECTBOX_ID_CHANGE_OTHER_ACTION
 
 /* values for textbutton gadgets */
 #define ED_TEXTBUTTON_ID_PROPERTIES_INFO       0
 #define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE    18
 #define ED_CHECKBUTTON_ID_CHANGE_DELAY         19
 #define ED_CHECKBUTTON_ID_CHANGE_BY_PLAYER     20
+#define ED_CHECKBUTTON_ID_CHANGE_IMPACT_SMASHED        21
+#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER      22
 
-#define ED_NUM_CHECKBUTTONS                    21
+#define ED_NUM_CHECKBUTTONS                    23
 
 #define ED_CHECKBUTTON_ID_LEVEL_FIRST  ED_CHECKBUTTON_ID_DOUBLE_SPEED
 #define ED_CHECKBUTTON_ID_LEVEL_LAST   ED_CHECKBUTTON_ID_RANDOM_RESTRICTED
 #define ED_CHECKBUTTON_ID_CUSTOM_LAST  ED_CHECKBUTTON_ID_CUSTOM_WALKABLE
 
 #define ED_CHECKBUTTON_ID_CHANGE_FIRST ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC
-#define ED_CHECKBUTTON_ID_CHANGE_LAST  ED_CHECKBUTTON_ID_CHANGE_BY_PLAYER
+#define ED_CHECKBUTTON_ID_CHANGE_LAST  ED_CHECKBUTTON_ID_CHANGE_BY_OTHER
 
 /* values for radiobutton gadgets */
 #define ED_RADIOBUTTON_ID_PERCENTAGE   0
@@ -842,6 +849,8 @@ static struct ValueTextInfo options_move_pattern[] =
   { MV_AWAY_FROM_PLAYER,       "away from player"              },
   { MV_ALONG_LEFT_SIDE,                "along left side"               },
   { MV_ALONG_RIGHT_SIDE,       "along right side"              },
+  { MV_TURNING_LEFT,           "turning left"                  },
+  { MV_TURNING_RIGHT,          "turning right"                 },
   { -1,                                NULL                            }
 };
 
@@ -884,9 +893,9 @@ static int value_deadliness = 0;
 
 static struct ValueTextInfo options_smash_targets[] =
 {
-  { EP_CAN_SMASH_FRIENDS,      "friends"                       },
+  { EP_CAN_SMASH_PLAYER,       "player"                        },
   { EP_CAN_SMASH_ENEMIES,      "enemies"                       },
-  { EP_CAN_SMASH_EXPLOSIVES,   "explosives"                    },
+  { EP_CAN_SMASH_EVERYTHING,   "everything"                    },
   { -1,                                NULL                            }
 };
 static int value_smash_targets = 0;
@@ -909,22 +918,30 @@ static struct ValueTextInfo options_time_units[] =
 
 static struct ValueTextInfo options_change_player_action[] =
 {
-  { CE_PRESSED_BY_PLAYER,      "pressed"                       },
   { CE_TOUCHED_BY_PLAYER,      "touched"                       },
+  { CE_PRESSED_BY_PLAYER,      "pressed"                       },
+  { CE_PUSHED_BY_PLAYER,       "pushed"                        },
   { -1,                                NULL                            }
 };
 static int value_change_player_action = 0;
 
-static struct ValueTextInfo options_change_cause[] =
+static struct ValueTextInfo options_change_impact_action[] =
+{
+  { CE_IMPACT,                 "on impact"                     },
+  { CE_SMASHED,                        "when smashed"                  },
+  { -1,                                NULL                            }
+};
+static int value_change_impact_action = 0;
+
+static struct ValueTextInfo options_change_other_action[] =
 {
-  { 1,                         "specified delay"               },
-  { 2,                         "impact (active)"               },
-  { 3,                         "impact (passive)"              },
-  { 4,                         "touched by player"             },
-  { 5,                         "pressed by player"             },
+  { CE_OTHER_COLLECTING,       "collecting"                    },
+  { CE_OTHER_PUSHING,          "pushing"                       },
+  { CE_OTHER_CHANGING,         "change of"                     },
+  { CE_OTHER_EXPLODING,                "explosion of"                  },
   { -1,                                NULL                            }
 };
-static int value_change_cause = 0;
+static int value_change_other_action = 0;
 
 static struct
 {
@@ -1017,12 +1034,20 @@ static struct
     NULL, "by player", "type of player contact"
   },
   {
-    ED_SETTINGS_XPOS(0),               ED_SETTINGS_YPOS(10),
-    GADGET_ID_CHANGE_CAUSE,
+    ED_SETTINGS_XPOS(2),               ED_SETTINGS_YPOS(6),
+    GADGET_ID_CHANGE_IMPACT_ACTION,
+    -1,
+    options_change_impact_action,
+    &value_change_impact_action,
+    NULL, NULL, "change after impact or smash"
+  },
+  {
+    ED_SETTINGS_XPOS(2),               ED_SETTINGS_YPOS(7),
+    GADGET_ID_CHANGE_OTHER_ACTION,
     -1,
-    options_change_cause,
-    &value_change_cause,
-    "test:", NULL, "test-selectbox entry"
+    options_change_other_action,
+    &value_change_other_action,
+    NULL, "other element:", "type of other element action"
   },
 };
 
@@ -1298,6 +1323,18 @@ static struct
     &custom_element_change_events[CE_BY_PLAYER],
     NULL,                              "element changes by player contact"
   },
+  {
+    ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(6),
+    GADGET_ID_CHANGE_IMPACT_SMASHED,
+    &custom_element_change_events[CE_IMPACT_SMASHED],
+    NULL,                              "element changes by impact or smash"
+  },
+  {
+    ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(7),
+    GADGET_ID_CHANGE_BY_OTHER,
+    &custom_element_change_events[CE_BY_OTHER],
+    NULL,                              "element changes by other element"
+  },
 };
 
 
@@ -2729,7 +2766,7 @@ static void CreateDrawingAreas()
   level_editor_gadget[id] = gi;
 
   /* ... one for each custom element change target element ... */
-  id = GADGET_ID_CUSTOM_CHANGED;
+  id = GADGET_ID_CUSTOM_CHANGE_TARGET;
   gi = CreateGadget(GDI_CUSTOM_ID, id,
                    GDI_X, SX + ED_AREA_ELEM_CONTENT2_XPOS,
                    GDI_Y, SY + ED_AREA_ELEM_CONTENT2_YPOS,
@@ -2747,8 +2784,26 @@ static void CreateDrawingAreas()
 
   level_editor_gadget[id] = gi;
 
-  /* ... and one for random placement background restrictions */
+  /* ... one for each custom element change trigger element ... */
+  id = GADGET_ID_CUSTOM_CHANGE_TRIGGER;
+  gi = CreateGadget(GDI_CUSTOM_ID, id,
+                   GDI_X, SX + ED_AREA_ELEM_CONTENT5_XPOS,
+                   GDI_Y, SY + ED_AREA_ELEM_CONTENT5_YPOS,
+                   GDI_WIDTH, MINI_TILEX,
+                   GDI_HEIGHT, MINI_TILEY,
+                   GDI_TYPE, GD_TYPE_DRAWING_AREA,
+                   GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
+                   GDI_EVENT_MASK, event_mask,
+                   GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
+                   GDI_CALLBACK_ACTION, HandleDrawingAreas,
+                   GDI_END);
+
+  if (gi == NULL)
+    Error(ERR_EXIT, "cannot create gadget");
 
+  level_editor_gadget[id] = gi;
+
+  /* ... and one for random placement background restrictions */
   id = GADGET_ID_RANDOM_BACKGROUND;
   gi = CreateGadget(GDI_CUSTOM_ID, id,
                    GDI_X, SX + ED_AREA_RANDOM_BACKGROUND_XPOS,
@@ -3447,14 +3502,14 @@ static void CopyCustomElementPropertiesToEditor(int element)
 
   /* set smash targets selectbox help value */
   value_smash_targets =
-    (CAN_SMASH_EXPLOSIVES(element) ? EP_CAN_SMASH_EXPLOSIVES :
+    (CAN_SMASH_EVERYTHING(element) ? EP_CAN_SMASH_EVERYTHING :
      CAN_SMASH_ENEMIES(element) ? EP_CAN_SMASH_ENEMIES :
-     CAN_SMASH_FRIENDS(element) ? EP_CAN_SMASH_FRIENDS :
-     EP_CAN_SMASH_FRIENDS);
+     CAN_SMASH_PLAYER(element) ? EP_CAN_SMASH_PLAYER :
+     EP_CAN_SMASH_PLAYER);
   custom_element_properties[EP_CAN_SMASH] =
-    (CAN_SMASH_EXPLOSIVES(element) ||
+    (CAN_SMASH_EVERYTHING(element) ||
      CAN_SMASH_ENEMIES(element) ||
-     CAN_SMASH_FRIENDS(element));
+     CAN_SMASH_PLAYER(element));
 
   /* set walkable layer selectbox help value */
   value_walkable_layer =
@@ -3469,9 +3524,24 @@ static void CopyCustomElementPropertiesToEditor(int element)
 
   /* set change by player selectbox help value */
   value_change_player_action =
-    (HAS_CHANGE_EVENT(element, CE_TOUCHED_BY_PLAYER) ? CE_TOUCHED_BY_PLAYER :
+    (HAS_CHANGE_EVENT(element, CE_PUSHED_BY_PLAYER) ? CE_PUSHED_BY_PLAYER :
      HAS_CHANGE_EVENT(element, CE_PRESSED_BY_PLAYER) ? CE_PRESSED_BY_PLAYER :
+     HAS_CHANGE_EVENT(element, CE_TOUCHED_BY_PLAYER) ? CE_TOUCHED_BY_PLAYER :
      CE_PRESSED_BY_PLAYER);
+
+  /* set change by impact/smash selectbox help value */
+  value_change_impact_action =
+    (HAS_CHANGE_EVENT(element, CE_SMASHED) ? CE_SMASHED :
+     HAS_CHANGE_EVENT(element, CE_IMPACT) ? CE_IMPACT :
+     CE_IMPACT);
+
+  /* set change by other element action selectbox help value */
+  value_change_other_action =
+    (HAS_CHANGE_EVENT(element, CE_OTHER_EXPLODING) ? CE_OTHER_EXPLODING :
+     HAS_CHANGE_EVENT(element, CE_OTHER_CHANGING) ? CE_OTHER_CHANGING :
+     HAS_CHANGE_EVENT(element, CE_OTHER_PUSHING) ? CE_OTHER_PUSHING :
+     HAS_CHANGE_EVENT(element, CE_OTHER_COLLECTING) ? CE_OTHER_COLLECTING :
+     CE_OTHER_COLLECTING);
 }
 
 static void CopyCustomElementPropertiesToGame(int element)
@@ -3501,9 +3571,9 @@ static void CopyCustomElementPropertiesToGame(int element)
     custom_element_properties[EP_DEADLY];
 
   /* set smash property from checkbox and selectbox */
-  custom_element_properties[EP_CAN_SMASH_FRIENDS] = FALSE;
+  custom_element_properties[EP_CAN_SMASH_PLAYER] = FALSE;
   custom_element_properties[EP_CAN_SMASH_ENEMIES] = FALSE;
-  custom_element_properties[EP_CAN_SMASH_EXPLOSIVES] = FALSE;
+  custom_element_properties[EP_CAN_SMASH_EVERYTHING] = FALSE;
   custom_element_properties[value_smash_targets] =
     custom_element_properties[EP_CAN_SMASH];
 
@@ -3515,9 +3585,25 @@ static void CopyCustomElementPropertiesToGame(int element)
     custom_element_properties[EP_WALKABLE];
 
   /* set player change event from checkbox and selectbox */
-  custom_element.change.events &= ~CE_PRESSED_BY_PLAYER;
-  custom_element.change.events &= ~CE_TOUCHED_BY_PLAYER;
-  custom_element.change.events |= value_change_player_action;
+  custom_element_change_events[CE_TOUCHED_BY_PLAYER] = FALSE;
+  custom_element_change_events[CE_PRESSED_BY_PLAYER] = FALSE;
+  custom_element_change_events[CE_PUSHED_BY_PLAYER] = FALSE;
+  custom_element_change_events[value_change_player_action] =
+    custom_element_change_events[CE_BY_PLAYER];
+
+  /* set player change event from checkbox and selectbox */
+  custom_element_change_events[CE_IMPACT] = FALSE;
+  custom_element_change_events[CE_SMASHED] = FALSE;
+  custom_element_change_events[value_change_impact_action] =
+    custom_element_change_events[CE_IMPACT_SMASHED];
+
+  /* set other element action change event from checkbox and selectbox */
+  custom_element_change_events[CE_OTHER_COLLECTING] = FALSE;
+  custom_element_change_events[CE_OTHER_PUSHING] = FALSE;
+  custom_element_change_events[CE_OTHER_CHANGING] = FALSE;
+  custom_element_change_events[CE_OTHER_EXPLODING] = FALSE;
+  custom_element_change_events[value_change_other_action] =
+    custom_element_change_events[CE_BY_OTHER];
 
   for (i=0; i < NUM_ELEMENT_PROPERTIES; i++)
     SET_PROPERTY(element, i, custom_element_properties[i]);
@@ -3936,9 +4022,9 @@ static void DrawCustomContentArea()
   MapDrawingArea(GADGET_ID_CUSTOM_CONTENT);
 }
 
-static void DrawCustomChangedArea()
+static void DrawCustomChangeTargetArea()
 {
-  struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_CHANGED];
+  struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_CHANGE_TARGET];
   int xpos = ED_AREA_ELEM_CONTENT2_XPOS;
   int ypos = ED_AREA_ELEM_CONTENT2_YPOS;
   int area_sx = SX + xpos;
@@ -3956,7 +4042,30 @@ static void DrawCustomChangedArea()
   DrawMiniGraphicExt(drawto, gi->x, gi->y,
                     el2edimg(custom_element.change.successor));
 
-  MapDrawingArea(GADGET_ID_CUSTOM_CHANGED);
+  MapDrawingArea(GADGET_ID_CUSTOM_CHANGE_TARGET);
+}
+
+static void DrawCustomChangeTriggerArea()
+{
+  struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_CHANGE_TRIGGER];
+  int xpos = ED_AREA_ELEM_CONTENT5_XPOS;
+  int ypos = ED_AREA_ELEM_CONTENT5_YPOS;
+  int area_sx = SX + xpos;
+  int area_sy = SY + ypos;
+
+  if (!IS_CUSTOM_ELEMENT(properties_element))
+  {
+    /* this should never happen */
+    Error(ERR_WARN, "element %d is no custom element", properties_element);
+
+    return;
+  }
+
+  DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE);
+  DrawMiniGraphicExt(drawto, gi->x, gi->y,
+                    el2edimg(custom_element.change.trigger));
+
+  MapDrawingArea(GADGET_ID_CUSTOM_CHANGE_TRIGGER);
 }
 
 static void DrawElementContentAreas()
@@ -4253,9 +4362,9 @@ static void DrawPropertiesInfo()
 #if 0
     { EP_CAN_SMASH,            "- can smash"                           },
 #endif
-    { EP_CAN_SMASH_FRIENDS,    "- can smash player and friends"        },
+    { EP_CAN_SMASH_PLAYER,     "- can smash player"                    },
     { EP_CAN_SMASH_ENEMIES,    "- can smash good and bad guys"         },
-    { EP_CAN_SMASH_EXPLOSIVES, "- can smash everything smashable"      },
+    { EP_CAN_SMASH_EVERYTHING, "- can smash everything smashable"      },
     { EP_CAN_EXPLODE,          "- can explode"                         },
     { EP_CAN_EXPLODE_BY_FIRE,  "  - by fire or explosions"             },
     { EP_CAN_EXPLODE_SMASHED,  "  - when smashed"                      },
@@ -4520,7 +4629,8 @@ static void DrawPropertiesAdvanced()
 
   /* draw drawing area gadgets */
   DrawCustomGraphicElementArea();
-  DrawCustomChangedArea();
+  DrawCustomChangeTargetArea();
+  DrawCustomChangeTriggerArea();
 }
 
 static void DrawElementName(int x, int y, int element)
@@ -5362,11 +5472,16 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
          custom_element.content[sx][sy] = new_element;
          element_info[properties_element] = custom_element;
        }
-       else if (id == GADGET_ID_CUSTOM_CHANGED)
+       else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET)
        {
          custom_element.change.successor = new_element;
          element_info[properties_element] = custom_element;
        }
+       else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
+       {
+         custom_element.change.trigger = new_element;
+         element_info[properties_element] = custom_element;
+       }
        else if (id == GADGET_ID_RANDOM_BACKGROUND)
          random_placement_background_element = new_element;
        else if (id >= GADGET_ID_ELEMENT_CONTENT_0 &&
@@ -5477,8 +5592,10 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        PickDrawingElement(button, custom_element.gfx_element);
       else if (id == GADGET_ID_CUSTOM_CONTENT)
        PickDrawingElement(button, custom_element.content[sx][sy]);
-      else if (id == GADGET_ID_CUSTOM_CHANGED)
+      else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET)
        PickDrawingElement(button, custom_element.change.successor);
+      else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
+       PickDrawingElement(button, custom_element.change.trigger);
       else if (id == GADGET_ID_RANDOM_BACKGROUND)
        PickDrawingElement(button, random_placement_background_element);
       else if (id >= GADGET_ID_ELEMENT_CONTENT_0 &&
@@ -6207,9 +6324,12 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
     else if (id == GADGET_ID_CUSTOM_CONTENT)
       DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
                "%s", getElementInfoText(custom_element.content[sx][sy]));
-    else if (id == GADGET_ID_CUSTOM_CHANGED)
+    else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET)
       DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
                "%s", getElementInfoText(custom_element.change.successor));
+    else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
+      DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+               "%s", getElementInfoText(custom_element.change.trigger));
     else if (id == GADGET_ID_RANDOM_BACKGROUND)
       DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
                "%s", getElementInfoText(random_placement_background_element));
@@ -6233,9 +6353,12 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
     else if (id == GADGET_ID_CUSTOM_CONTENT)
       DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
                "Custom element content position: %d, %d", sx, sy);
-    else if (id == GADGET_ID_CUSTOM_CHANGED)
+    else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET)
       DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
                "New element after change");
+    else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
+      DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+               "Other element triggering change");
     else if (id == GADGET_ID_RANDOM_BACKGROUND)
       DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
                "Random placement background");