X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=391aae986ad2e72c54fe0658f92050c002db2756;hb=83d91d3f8821255e649663935445873c5b11dce1;hp=2837433467cc8e95e2005bfa87e06a5fd6f496a0;hpb=ddb2715ae847d9fd5b10e49e2ad814c12ce389f8;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 28374334..391aae98 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -565,6 +565,8 @@ enum
   GADGET_ID_BD_AMOEBA_2_CONTENT_LOOKS_LIKE,
   GADGET_ID_BD_ACID_EATS_ELEMENT,
   GADGET_ID_BD_ACID_TURNS_TO_ELEMENT,
+  GADGET_ID_BD_BITER_EATS_ELEMENT,
+  GADGET_ID_BD_BLADDER_CONVERTS_BY_ELEMENT,
   GADGET_ID_START_ELEMENT,
   GADGET_ID_ARTWORK_ELEMENT,
   GADGET_ID_EXPLOSION_ELEMENT,
@@ -727,6 +729,7 @@ enum
   GADGET_ID_BD_VOODOO_DIES_BY_ROCK,
   GADGET_ID_BD_VOODOO_VANISH_BY_EXPLOSION,
   GADGET_ID_BD_SLIME_IS_PREDICTABLE,
+  GADGET_ID_BD_CHANGE_EXPANDING_WALL,
   GADGET_ID_ENVELOPE_AUTOWRAP,
   GADGET_ID_ENVELOPE_CENTERED,
   GADGET_ID_MM_LASER_RED,
@@ -1072,6 +1075,7 @@ enum
   ED_CHECKBUTTON_ID_BD_VOODOO_DIES_BY_ROCK,
   ED_CHECKBUTTON_ID_BD_VOODOO_VANISH_BY_EXPLOSION,
   ED_CHECKBUTTON_ID_BD_SLIME_IS_PREDICTABLE,
+  ED_CHECKBUTTON_ID_BD_CHANGE_EXPANDING_WALL,
   ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP,
   ED_CHECKBUTTON_ID_ENVELOPE_CENTERED,
   ED_CHECKBUTTON_ID_MM_LASER_RED,
@@ -1176,6 +1180,8 @@ enum
   ED_DRAWING_ID_BD_AMOEBA_2_CONTENT_LOOKS_LIKE,
   ED_DRAWING_ID_BD_ACID_EATS_ELEMENT,
   ED_DRAWING_ID_BD_ACID_TURNS_TO_ELEMENT,
+  ED_DRAWING_ID_BD_BITER_EATS_ELEMENT,
+  ED_DRAWING_ID_BD_BLADDER_CONVERTS_BY_ELEMENT,
   ED_DRAWING_ID_START_ELEMENT,
   ED_DRAWING_ID_ARTWORK_ELEMENT,
   ED_DRAWING_ID_EXPLOSION_ELEMENT,
@@ -3806,6 +3812,14 @@ static struct
     NULL, NULL,
     "Slime is predictable",		"Use predictable random numbers"
   },
+  {
+    ED_CHECKBUTTON_ID_BD_CHANGE_EXPANDING_WALL,
+    ED_ELEMENT_SETTINGS_XPOS(0),	ED_ELEMENT_SETTINGS_YPOS(0),
+    GADGET_ID_BD_CHANGE_EXPANDING_WALL, GADGET_ID_NONE,
+    &level.bd_change_expanding_wall,
+    NULL, NULL,
+    "Change direction",			"Switch horizontal/vertical direction"
+  },
   {
     ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP,
     ED_ELEMENT_SETTINGS_XPOS(0),	ED_ELEMENT_SETTINGS_YPOS(1),
@@ -4357,6 +4371,22 @@ static struct
     &level.bd_acid_turns_to_element,	1, 1,
     "Can leave behind:", NULL, NULL, NULL,	"Turns to this element after spreading"
   },
+  {
+    ED_DRAWING_ID_BD_BITER_EATS_ELEMENT,
+    ED_AREA_1X1_SETTINGS_XPOS(0),	ED_AREA_1X1_SETTINGS_YPOS(2),
+    ED_AREA_1X1_SETTINGS_XOFF,		ED_AREA_1X1_SETTINGS_YOFF,
+    GADGET_ID_BD_BITER_EATS_ELEMENT,	GADGET_ID_NONE,
+    &level.bd_biter_eats_element,	1, 1,
+    "Can eat:", NULL, NULL, NULL,	"Eats this element when moving"
+  },
+  {
+    ED_DRAWING_ID_BD_BLADDER_CONVERTS_BY_ELEMENT,
+    ED_AREA_1X1_SETTINGS_XPOS(0),	ED_AREA_1X1_SETTINGS_YPOS(1),
+    ED_AREA_1X1_SETTINGS_XOFF,		ED_AREA_1X1_SETTINGS_YOFF,
+    GADGET_ID_BD_BLADDER_CONVERTS_BY_ELEMENT, GADGET_ID_NONE,
+    &level.bd_bladder_converts_by_element,	1, 1,
+    "Turns to clock by touching:", NULL, NULL, NULL,	"Turns to clock by touching element"
+  },
 
   // ---------- level start element -------------------------------------------
 
@@ -10876,6 +10906,7 @@ static void DrawPropertiesInfo(void)
 #define TEXT_PERMEABILITY_BITS	"slime permeability bits"
 #define TEXT_RANDOM_SEED	"slime random number seed"
 #define TEXT_ACID_SPREAD_RATE	"Spread rate (percent)"
+#define TEXT_BITER_MOVE_DELAY	"Move delay (BD frames)"
 
 static struct
 {
@@ -11000,6 +11031,16 @@ static struct
 				-1, 65535							},
   { EL_BD_ACID,			&level.bd_acid_spread_rate,		TEXT_ACID_SPREAD_RATE,
 				0, 100								},
+  { EL_BD_BITER,		&level.bd_biter_move_delay,		TEXT_BITER_MOVE_DELAY,
+				0, 3								},
+  { EL_BD_BITER_RIGHT,		&level.bd_biter_move_delay,		TEXT_BITER_MOVE_DELAY,
+				0, 3								},
+  { EL_BD_BITER_UP,		&level.bd_biter_move_delay,		TEXT_BITER_MOVE_DELAY,
+				0, 3								},
+  { EL_BD_BITER_LEFT,		&level.bd_biter_move_delay,		TEXT_BITER_MOVE_DELAY,
+				0, 3								},
+  { EL_BD_BITER_DOWN,		&level.bd_biter_move_delay,		TEXT_BITER_MOVE_DELAY,
+				0, 3								},
   { EL_EXTRA_TIME,		&level.extra_time,			TEXT_TIME_BONUS		},
   { EL_TIME_ORB_FULL,		&level.time_orb_time,			TEXT_TIME_BONUS		},
   { EL_GAME_OF_LIFE,		&level.game_of_life[0],			TEXT_GAME_OF_LIFE_1,0,8	},
@@ -11052,6 +11093,7 @@ static boolean checkPropertiesConfig(int element)
       IS_DF_LASER(element) ||
       IS_PLAYER_ELEMENT(element) ||
       IS_BD_PLAYER_ELEMENT(element) ||
+      IS_BD_EXPANDABLE_WALL(properties_element) ||
       IS_SOKOBAN_OBJECT_OR_FIELD(element) ||
       HAS_EDITOR_CONTENT(element) ||
       CAN_GROW(element) ||
@@ -11238,6 +11280,14 @@ static void DrawPropertiesConfig(void)
       MapDrawingArea(ED_DRAWING_ID_BD_ACID_EATS_ELEMENT);
       MapDrawingArea(ED_DRAWING_ID_BD_ACID_TURNS_TO_ELEMENT);
     }
+    else if (IS_BD_BITER(properties_element))
+    {
+      MapDrawingArea(ED_DRAWING_ID_BD_BITER_EATS_ELEMENT);
+    }
+    else if (properties_element == EL_BD_BLADDER)
+    {
+      MapDrawingArea(ED_DRAWING_ID_BD_BLADDER_CONVERTS_BY_ELEMENT);
+    }
     else if (properties_element == EL_YAMYAM ||
 	     properties_element == EL_YAMYAM_LEFT ||
 	     properties_element == EL_YAMYAM_RIGHT ||
@@ -11401,6 +11451,11 @@ static void DrawPropertiesConfig(void)
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_MAGIC_WALL_STOPS_AMOEBA);
   }
 
+  if (IS_BD_EXPANDABLE_WALL(properties_element))
+  {
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_CHANGE_EXPANDING_WALL);
+  }
+
   // special case: slippery walls option for gems only available in R'n'D game engine
   if (IS_GEM(properties_element) && level.game_engine_type == GAME_ENGINE_TYPE_RND)
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS);