X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=092ecac0a95f408d2e826fa488f9c2c780fd22d3;hb=d977aa4beacc35d96b0b39e6194307ff9bb459c7;hp=721f4afe78e8e660381d31edddf6c5801051bdae;hpb=dc9fe7359bd0b8dea49f46b9fb2e59f006200a63;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index 721f4afe..092ecac0 100644 --- a/src/editor.c +++ b/src/editor.c @@ -557,16 +557,30 @@ enum GADGET_ID_ANDROID_CONTENT, GADGET_ID_AMOEBA_CONTENT, GADGET_ID_BD_SNAP_ELEMENT, + GADGET_ID_BD_MAGIC_WALL_DIAMOND_TO, + GADGET_ID_BD_MAGIC_WALL_ROCK_TO, + GADGET_ID_BD_MAGIC_WALL_MEGA_ROCK_TO, + GADGET_ID_BD_MAGIC_WALL_NUT_TO, + GADGET_ID_BD_MAGIC_WALL_NITRO_PACK_TO, + GADGET_ID_BD_MAGIC_WALL_FLYING_DIAMOND_TO, + GADGET_ID_BD_MAGIC_WALL_FLYING_ROCK_TO, GADGET_ID_BD_AMOEBA_CONTENT_TOO_BIG, GADGET_ID_BD_AMOEBA_CONTENT_ENCLOSED, GADGET_ID_BD_AMOEBA_2_CONTENT_TOO_BIG, GADGET_ID_BD_AMOEBA_2_CONTENT_ENCLOSED, GADGET_ID_BD_AMOEBA_2_CONTENT_EXPLODING, GADGET_ID_BD_AMOEBA_2_CONTENT_LOOKS_LIKE, + GADGET_ID_BD_SLIME_EATS_ELEMENT_1, + GADGET_ID_BD_SLIME_CONVERTS_TO_ELEMENT_1, + GADGET_ID_BD_SLIME_EATS_ELEMENT_2, + GADGET_ID_BD_SLIME_CONVERTS_TO_ELEMENT_2, + GADGET_ID_BD_SLIME_EATS_ELEMENT_3, + GADGET_ID_BD_SLIME_CONVERTS_TO_ELEMENT_3, 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_BD_NUT_CONTENT, GADGET_ID_START_ELEMENT, GADGET_ID_ARTWORK_ELEMENT, GADGET_ID_EXPLOSION_ELEMENT, @@ -734,6 +748,7 @@ enum GADGET_ID_BD_CONVEYOR_BELTS_ACTIVE, GADGET_ID_BD_CONVEYOR_BELTS_CHANGED, GADGET_ID_BD_WATER_CANNOT_FLOW_DOWN, + GADGET_ID_BD_HAMMER_WALLS_REAPPEAR, GADGET_ID_ENVELOPE_AUTOWRAP, GADGET_ID_ENVELOPE_CENTERED, GADGET_ID_MM_LASER_RED, @@ -1084,6 +1099,7 @@ enum ED_CHECKBUTTON_ID_BD_CONVEYOR_BELTS_ACTIVE, ED_CHECKBUTTON_ID_BD_CONVEYOR_BELTS_CHANGED, ED_CHECKBUTTON_ID_BD_WATER_CANNOT_FLOW_DOWN, + ED_CHECKBUTTON_ID_BD_HAMMER_WALLS_REAPPEAR, ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP, ED_CHECKBUTTON_ID_ENVELOPE_CENTERED, ED_CHECKBUTTON_ID_MM_LASER_RED, @@ -1180,16 +1196,30 @@ enum ED_DRAWING_ID_ANDROID_CONTENT, ED_DRAWING_ID_AMOEBA_CONTENT, ED_DRAWING_ID_BD_SNAP_ELEMENT, + ED_DRAWING_ID_BD_MAGIC_WALL_DIAMOND_TO, + ED_DRAWING_ID_BD_MAGIC_WALL_ROCK_TO, + ED_DRAWING_ID_BD_MAGIC_WALL_MEGA_ROCK_TO, + ED_DRAWING_ID_BD_MAGIC_WALL_NUT_TO, + ED_DRAWING_ID_BD_MAGIC_WALL_NITRO_PACK_TO, + ED_DRAWING_ID_BD_MAGIC_WALL_FLYING_DIAMOND_TO, + ED_DRAWING_ID_BD_MAGIC_WALL_FLYING_ROCK_TO, ED_DRAWING_ID_BD_AMOEBA_CONTENT_TOO_BIG, ED_DRAWING_ID_BD_AMOEBA_CONTENT_ENCLOSED, ED_DRAWING_ID_BD_AMOEBA_2_CONTENT_TOO_BIG, ED_DRAWING_ID_BD_AMOEBA_2_CONTENT_ENCLOSED, ED_DRAWING_ID_BD_AMOEBA_2_CONTENT_EXPLODING, ED_DRAWING_ID_BD_AMOEBA_2_CONTENT_LOOKS_LIKE, + ED_DRAWING_ID_BD_SLIME_EATS_ELEMENT_1, + ED_DRAWING_ID_BD_SLIME_CONVERTS_TO_ELEMENT_1, + ED_DRAWING_ID_BD_SLIME_EATS_ELEMENT_2, + ED_DRAWING_ID_BD_SLIME_CONVERTS_TO_ELEMENT_2, + ED_DRAWING_ID_BD_SLIME_EATS_ELEMENT_3, + ED_DRAWING_ID_BD_SLIME_CONVERTS_TO_ELEMENT_3, 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_BD_NUT_CONTENT, ED_DRAWING_ID_START_ELEMENT, ED_DRAWING_ID_ARTWORK_ELEMENT, ED_DRAWING_ID_EXPLOSION_ELEMENT, @@ -3742,7 +3772,7 @@ static struct }, { ED_CHECKBUTTON_ID_BD_MAGIC_WALL_WAIT_HATCHING, - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(1), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(2), GADGET_ID_BD_MAGIC_WALL_WAIT_HATCHING, GADGET_ID_NONE, &level.bd_magic_wall_wait_hatching, NULL, NULL, @@ -3750,7 +3780,7 @@ static struct }, { ED_CHECKBUTTON_ID_BD_MAGIC_WALL_STOPS_AMOEBA, - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(2), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(3), GADGET_ID_BD_MAGIC_WALL_STOPS_AMOEBA, GADGET_ID_NONE, &level.bd_magic_wall_stops_amoeba, NULL, NULL, @@ -3814,7 +3844,7 @@ static struct }, { ED_CHECKBUTTON_ID_BD_SLIME_IS_PREDICTABLE, - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(0), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(1), GADGET_ID_BD_SLIME_IS_PREDICTABLE, GADGET_ID_NONE, &level.bd_slime_is_predictable, NULL, NULL, @@ -3860,6 +3890,14 @@ static struct NULL, NULL, "Does not flow downwards", "Water can only flow up, left and right" }, + { + ED_CHECKBUTTON_ID_BD_HAMMER_WALLS_REAPPEAR, + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(1), + GADGET_ID_BD_HAMMER_WALLS_REAPPEAR, GADGET_ID_NONE, + &level.bd_hammer_walls_reappear, + NULL, NULL, + "Hammered walls reappear", "Hammered walls reappear after delay" + }, { ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP, ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(1), @@ -4342,6 +4380,65 @@ static struct "Snap element:", NULL, NULL, NULL, "Element created when snapping" }, + // ---------- BD magic wall elements ---------------------------------------- + + { + ED_DRAWING_ID_BD_MAGIC_WALL_DIAMOND_TO, + ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(4), + ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, + GADGET_ID_BD_MAGIC_WALL_DIAMOND_TO, GADGET_ID_NONE, + &level.bd_magic_wall_diamond_to, 1, 1, + "Changes diamonds to:", NULL, NULL, NULL, "Element to turn diamonds to" + }, + { + ED_DRAWING_ID_BD_MAGIC_WALL_ROCK_TO, + ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(5), + ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, + GADGET_ID_BD_MAGIC_WALL_ROCK_TO, GADGET_ID_NONE, + &level.bd_magic_wall_rock_to, 1, 1, + "Changes rocks to:", NULL, NULL, NULL, "Element to turn rocks to" + }, + { + ED_DRAWING_ID_BD_MAGIC_WALL_MEGA_ROCK_TO, + ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(6), + ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, + GADGET_ID_BD_MAGIC_WALL_MEGA_ROCK_TO, GADGET_ID_NONE, + &level.bd_magic_wall_mega_rock_to, 1, 1, + "Changes mega rocks to:", NULL, NULL, NULL, "Element to turn mega rocks to" + }, + { + ED_DRAWING_ID_BD_MAGIC_WALL_NUT_TO, + ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(7), + ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, + GADGET_ID_BD_MAGIC_WALL_NUT_TO, GADGET_ID_NONE, + &level.bd_magic_wall_nut_to, 1, 1, + "Changes nuts to:", NULL, NULL, NULL, "Element to turn nuts to" + }, + { + ED_DRAWING_ID_BD_MAGIC_WALL_NITRO_PACK_TO, + ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(8), + ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, + GADGET_ID_BD_MAGIC_WALL_NITRO_PACK_TO, GADGET_ID_NONE, + &level.bd_magic_wall_nitro_pack_to, 1, 1, + "Changes nitro packs to:", NULL, NULL, NULL, "Element to turn nitro packs to" + }, + { + ED_DRAWING_ID_BD_MAGIC_WALL_FLYING_DIAMOND_TO, + ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(9), + ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, + GADGET_ID_BD_MAGIC_WALL_FLYING_DIAMOND_TO, GADGET_ID_NONE, + &level.bd_magic_wall_flying_diamond_to, 1, 1, + "Changes flying diamonds to:", NULL, NULL, NULL, "Element to turn flying diamonds to" + }, + { + ED_DRAWING_ID_BD_MAGIC_WALL_FLYING_ROCK_TO, + ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(10), + ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, + GADGET_ID_BD_MAGIC_WALL_FLYING_ROCK_TO, GADGET_ID_NONE, + &level.bd_magic_wall_flying_rock_to, 1, 1, + "Changes flying rocks to:", NULL, NULL, NULL, "Element to turn flying rocks to" + }, + // ---------- BD amoeba content --------------------------------------------- { @@ -4395,6 +4492,54 @@ static struct &level.bd_amoeba_2_content_looks_like, 1, 1, "Use graphic of element:", NULL, NULL, NULL, "BD amoeba 2 looks like this element" }, + { + ED_DRAWING_ID_BD_SLIME_EATS_ELEMENT_1, + ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(5), + ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, + GADGET_ID_BD_SLIME_EATS_ELEMENT_1, GADGET_ID_NONE, + &level.bd_slime_eats_element_1, 1, 1, + "Can eat:", NULL, NULL, NULL, "Element that can be eaten" + }, + { + ED_DRAWING_ID_BD_SLIME_CONVERTS_TO_ELEMENT_1, + ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(5), + ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, + GADGET_ID_BD_SLIME_CONVERTS_TO_ELEMENT_1, GADGET_ID_BD_SLIME_EATS_ELEMENT_1, + &level.bd_slime_converts_to_element_1, 1, 1, + " and convert to:", NULL, NULL, NULL, "Eaten element is converted to" + }, + { + ED_DRAWING_ID_BD_SLIME_EATS_ELEMENT_2, + ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(6), + ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, + GADGET_ID_BD_SLIME_EATS_ELEMENT_2, GADGET_ID_NONE, + &level.bd_slime_eats_element_2, 1, 1, + "Can eat:", NULL, NULL, NULL, "Element that can be eaten" + }, + { + ED_DRAWING_ID_BD_SLIME_CONVERTS_TO_ELEMENT_2, + ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(6), + ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, + GADGET_ID_BD_SLIME_CONVERTS_TO_ELEMENT_2, GADGET_ID_BD_SLIME_EATS_ELEMENT_2, + &level.bd_slime_converts_to_element_2, 1, 1, + " and convert to:", NULL, NULL, NULL, "Eaten element is converted to" + }, + { + ED_DRAWING_ID_BD_SLIME_EATS_ELEMENT_3, + ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(7), + ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, + GADGET_ID_BD_SLIME_EATS_ELEMENT_3, GADGET_ID_NONE, + &level.bd_slime_eats_element_3, 1, 1, + "Can eat:", NULL, NULL, NULL, "Element that can be eaten" + }, + { + ED_DRAWING_ID_BD_SLIME_CONVERTS_TO_ELEMENT_3, + ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(7), + ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, + GADGET_ID_BD_SLIME_CONVERTS_TO_ELEMENT_3, GADGET_ID_BD_SLIME_EATS_ELEMENT_3, + &level.bd_slime_converts_to_element_3, 1, 1, + " and convert to:", NULL, NULL, NULL, "Eaten element is converted to" + }, { ED_DRAWING_ID_BD_ACID_EATS_ELEMENT, ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(1), @@ -4427,6 +4572,14 @@ static struct &level.bd_bladder_converts_by_element, 1, 1, "Turns to clock by touching:", NULL, NULL, NULL, "Turns to clock by touching element" }, + { + ED_DRAWING_ID_BD_NUT_CONTENT, + 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_NUT_CONTENT, GADGET_ID_NONE, + &level.bd_nut_content, 1, 1, + "When breaking, changes to:", NULL, NULL, NULL, "Element created when breaking nut" + }, // ---------- level start element ------------------------------------------- @@ -4674,6 +4827,7 @@ static boolean getDrawModeHiRes(void); static int getTabulatorBarWidth(void); static int getTabulatorBarHeight(void); static Pixel getTabulatorBarColor(void); +static void getEditorGraphicAndFrame(int, int *, int *, boolean); static int numHiresTiles(int); static int num_editor_gadgets = 0; // dynamically determined @@ -4939,10 +5093,10 @@ static int editor_el_boulderdash_effects[] = EL_BD_MEGA_ROCK_FALLING, EL_BD_FLYING_DIAMOND_FLYING, - EL_BD_FLYING_ROCK_FLYING, EL_BD_FALLING_WALL_FALLING, EL_BD_NITRO_PACK_FALLING, EL_BD_NUT_FALLING, + EL_BD_FLYING_ROCK_FLYING, EL_BD_PLAYER_GROWING_1, EL_BD_PLAYER_GROWING_2, @@ -7318,11 +7472,21 @@ static void DrawDrawingArea(int id) int tilesize = ED_DRAWINGAREA_TILE_SIZE; for (x = 0; x < area_xsize; x++) + { for (y = 0; y < area_ysize; y++) + { + int element = value[x * area_ysize + y]; + int graphic; + int frame; + + getEditorGraphicAndFrame(element, &graphic, &frame, TRUE); + DrawSizedGraphicExt(drawto, gi->x + x * tilesize, gi->y + y * tilesize, - el2edimg(value[x * area_ysize + y]), 0, tilesize); + graphic, frame, tilesize); + } + } } static void ScrollEditorLevel(int from_x, int from_y, int scroll) @@ -7356,10 +7520,47 @@ static void ScrollEditorLevel(int from_x, int from_y, int scroll) BackToFront(); } +static void getEditorGraphicAndFrame(int element, int *graphic, int *frame, boolean use_editor_gfx) +{ + if (use_editor_gfx) + { + *graphic = el2edimg(element); + *frame = 0; + } + else + { + *graphic = el2img(element); + *frame = (ANIM_MODE(*graphic) == ANIM_CE_VALUE ? + custom_element.ce_value_fixed_initial : + ANIM_MODE(*graphic) == ANIM_CE_SCORE ? + custom_element.collect_score_initial : FrameCounter); + } + + if (*graphic == IMG_UNKNOWN) + { + // no graphic defined -- if BD style, try to get runtime ("effect") element graphics + // (normal BD style elements have graphics, but runtime ("effects") elements do not) + int element_bd = map_element_RND_to_BD_cave(element); + + if (element_bd != O_UNKNOWN) + { + struct GraphicInfo_BD *g_bd = &graphic_info_bd_object[element_bd][0]; + + *graphic = g_bd->graphic; + *frame = g_bd->frame; + } + } +} + static void getEditorGraphicSource(int element, int tile_size, Bitmap **bitmap, int *x, int *y) { - getSizedGraphicSource(el2edimg(element), 0, tile_size, bitmap, x, y); + int graphic; + int frame; + + getEditorGraphicAndFrame(element, &graphic, &frame, TRUE); + + getSizedGraphicSource(graphic, frame, tile_size, bitmap, x, y); } static void CreateControlButtons(void) @@ -11065,37 +11266,39 @@ static void DrawPropertiesInfo(void) PrintInfoText(no_description_text, font1_nr, xpos, ypos - line1_height); } -#define TEXT_COLLECTING "Score for collecting" -#define TEXT_COLLECTING_EXTRA "Score for extra diamonds" -#define TEXT_SMASHING "Score for smashing" -#define TEXT_SLURPING "Score for slurping robot" -#define TEXT_CRACKING "Score for cracking" -#define TEXT_AMOEBA_SPEED "Speed of amoeba growth" -#define TEXT_AMOEBA_THRESHOED "Size for turning to rocks" -#define TEXT_AMOEBA_SLOW_TIME "Slow growth time (seconds)" -#define TEXT_AMOEBA_SLOW_RATE "Slow growth rate (percent)" -#define TEXT_AMOEBA_FAST_RATE "Fast growth rate (percent)" -#define TEXT_DURATION "Duration when activated" -#define TEXT_DELAY_ON "Delay before activating" -#define TEXT_DELAY_OFF "Delay before deactivating" -#define TEXT_DELAY_CHANGING "Delay before changing" -#define TEXT_DELAY_EXPLODING "Delay before exploding" -#define TEXT_DELAY_MOVING "Delay before moving" -#define TEXT_BALL_DELAY "Element generation delay" -#define TEXT_MOVE_SPEED "Speed of android moving" -#define TEXT_CLONE_SPEED "Speed of android cloning" -#define TEXT_GAME_OF_LIFE_1 "Min neighbours to survive" -#define TEXT_GAME_OF_LIFE_2 "Max neighbours to survive" -#define TEXT_GAME_OF_LIFE_3 "Min neighbours to create" -#define TEXT_GAME_OF_LIFE_4 "Max neighbours to create" -#define TEXT_TIME_BONUS "Extra time to solve level" -#define TEXT_TIME_PENALTY "Time penalty if destroyed" -#define TEXT_PERMEABILITY_RATE "slime permeability rate" -#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)" -#define TEXT_REPLICATION_DELAY "Create delay (BD frames)" +#define TEXT_COLLECTING "Score for collecting" +#define TEXT_COLLECTING_EXTRA "Score for extra diamonds" +#define TEXT_SMASHING "Score for smashing" +#define TEXT_SLURPING "Score for slurping robot" +#define TEXT_CRACKING "Score for cracking" +#define TEXT_AMOEBA_SPEED "Speed of amoeba growth" +#define TEXT_AMOEBA_THRESHOED "Size for turning to rocks" +#define TEXT_AMOEBA_SLOW_TIME "Slow growth time (seconds)" +#define TEXT_AMOEBA_SLOW_RATE "Slow growth rate (percent)" +#define TEXT_AMOEBA_FAST_RATE "Fast growth rate (percent)" +#define TEXT_DURATION "Duration when activated" +#define TEXT_DELAY_ON "Delay before activating" +#define TEXT_DELAY_OFF "Delay before deactivating" +#define TEXT_DELAY_CHANGING "Delay before changing" +#define TEXT_DELAY_EXPLODING "Delay before exploding" +#define TEXT_DELAY_MOVING "Delay before moving" +#define TEXT_BALL_DELAY "Element generation delay" +#define TEXT_MOVE_SPEED "Speed of android moving" +#define TEXT_CLONE_SPEED "Speed of android cloning" +#define TEXT_GAME_OF_LIFE_1 "Min neighbours to survive" +#define TEXT_GAME_OF_LIFE_2 "Max neighbours to survive" +#define TEXT_GAME_OF_LIFE_3 "Min neighbours to create" +#define TEXT_GAME_OF_LIFE_4 "Max neighbours to create" +#define TEXT_TIME_BONUS "Extra time to solve level" +#define TEXT_TIME_PENALTY "Time penalty if destroyed" +#define TEXT_PERMEABILITY_RATE "slime permeability rate" +#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)" +#define TEXT_REPLICATION_DELAY "Create delay (BD frames)" +#define TEXT_HAMMER_BREAK_DELAY "Delay for breaking walls" +#define TEXT_HAMMER_REAPPEAR_DELAY "Delay for reappearing walls" static struct { @@ -11232,6 +11435,10 @@ static struct 0, 3 }, { EL_BD_REPLICATOR, &level.bd_replicator_create_delay, TEXT_REPLICATION_DELAY, 0, 100 }, + { EL_BD_PNEUMATIC_HAMMER, &level.bd_hammer_walls_break_delay, TEXT_HAMMER_BREAK_DELAY, + 1, 100 }, + { EL_BD_PNEUMATIC_HAMMER, &level.bd_hammer_walls_reappear_delay, TEXT_HAMMER_REAPPEAR_DELAY, + 1, 200 }, { 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 }, @@ -11423,11 +11630,19 @@ static void DrawPropertiesConfig(void) (properties_element == EL_EMC_MAGIC_BALL ? 2 : 0) + num_element_counters); + // special case: set magic wall counter for BD game engine separately + if (properties_element == EL_BD_MAGIC_WALL && level.game_engine_type == GAME_ENGINE_TYPE_BD) + counterbutton_info[counter_id].y = ED_ELEMENT_SETTINGS_YPOS(1); + // special case: set amoeba counters for BD game engine separately if ((properties_element == EL_BD_AMOEBA && level.game_engine_type == GAME_ENGINE_TYPE_BD) || (properties_element == EL_BD_AMOEBA_2)) counterbutton_info[counter_id].y = ED_ELEMENT_SETTINGS_YPOS(3 + num_element_counters); + // special case: set position for delay counter for reappearing hammered walls + if (properties_element == EL_BD_PNEUMATIC_HAMMER && num_element_counters > 0) + counterbutton_info[counter_id].y += 1; + counterbutton_info[counter_id].value = elements_with_counter[i].value; counterbutton_info[counter_id].text_right = elements_with_counter[i].text; counterbutton_info[counter_id].min_value = elements_with_counter[i].min_value; @@ -11444,6 +11659,23 @@ static void DrawPropertiesConfig(void) break; } + if (properties_element == EL_BD_MAGIC_WALL && level.game_engine_type == GAME_ENGINE_TYPE_BD) + { + // draw stickybutton gadget + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_STICK_ELEMENT); + + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_MAGIC_WALL_WAIT_HATCHING); + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_MAGIC_WALL_STOPS_AMOEBA); + + MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_DIAMOND_TO); + MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_ROCK_TO); + MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_MEGA_ROCK_TO); + MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_NUT_TO); + MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_NITRO_PACK_TO); + MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_FLYING_DIAMOND_TO); + MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_FLYING_ROCK_TO); + } + if (HAS_EDITOR_CONTENT(properties_element)) { // draw stickybutton gadget @@ -11638,12 +11870,13 @@ static void DrawPropertiesConfig(void) if (properties_element == EL_BD_SLIME) { MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_SLIME_IS_PREDICTABLE); - } - if (properties_element == EL_BD_MAGIC_WALL) - { - MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_MAGIC_WALL_WAIT_HATCHING); - MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_MAGIC_WALL_STOPS_AMOEBA); + MapDrawingArea(ED_DRAWING_ID_BD_SLIME_EATS_ELEMENT_1); + MapDrawingArea(ED_DRAWING_ID_BD_SLIME_CONVERTS_TO_ELEMENT_1); + MapDrawingArea(ED_DRAWING_ID_BD_SLIME_EATS_ELEMENT_2); + MapDrawingArea(ED_DRAWING_ID_BD_SLIME_CONVERTS_TO_ELEMENT_2); + MapDrawingArea(ED_DRAWING_ID_BD_SLIME_EATS_ELEMENT_3); + MapDrawingArea(ED_DRAWING_ID_BD_SLIME_CONVERTS_TO_ELEMENT_3); } if (IS_BD_EXPANDABLE_WALL(properties_element)) @@ -11668,6 +11901,16 @@ static void DrawPropertiesConfig(void) MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_WATER_CANNOT_FLOW_DOWN); } + if (properties_element == EL_BD_PNEUMATIC_HAMMER) + { + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_HAMMER_WALLS_REAPPEAR); + } + + if (properties_element == EL_BD_NUT) + { + MapDrawingArea(ED_DRAWING_ID_BD_NUT_CONTENT); + } + // 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); @@ -11950,11 +12193,10 @@ static void DrawPropertiesChange(void) static void DrawEditorElementAnimation(int x, int y) { - int graphic = el2img(properties_element); - int frame = (ANIM_MODE(graphic) == ANIM_CE_VALUE ? - custom_element.ce_value_fixed_initial : - ANIM_MODE(graphic) == ANIM_CE_SCORE ? - custom_element.collect_score_initial : FrameCounter); + int graphic; + int frame; + + getEditorGraphicAndFrame(properties_element, &graphic, &frame, FALSE); DrawFixedGraphicAnimationExt(drawto, x, y, graphic, frame, NO_MASKING); }