X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=a0c0564cb99a1e2215169e8ec59b2a23186a8c00;hb=8016176ff827829c33231df9a8902e543b7131f3;hp=6831c11216db58821ab43076a440c926ff0536b6;hpb=a01344664ab4dd77130e4610fdfdd3c105e6f81d;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 6831c112..a0c0564c 100644 --- a/src/files.c +++ b/src/files.c @@ -307,12 +307,7 @@ static struct LevelFileConfigInfo chunk_config_INFO[] = }, { -1, -1, - TYPE_BOOLEAN, CONF_VALUE_8_BIT(23), - &li.bd_gravity_affects_all, TRUE - }, - { - -1, -1, - TYPE_INTEGER, CONF_VALUE_8_BIT(24), + TYPE_INTEGER, CONF_VALUE_8_BIT(23), &li.bd_cave_random_seed_c64, 0 }, @@ -639,11 +634,98 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = &li.bd_snap_element, EL_EMPTY }, + { + EL_BD_SAND, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_sand_looks_like, EL_BD_SAND + }, + + { + EL_BD_ROCK, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_rock_turns_to_on_falling, EL_BD_ROCK_FALLING + }, + { + EL_BD_ROCK, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(2), + &li.bd_rock_turns_to_on_impact, EL_BD_ROCK + }, + { EL_BD_DIAMOND, -1, TYPE_INTEGER, CONF_VALUE_16_BIT(1), &li.score[SC_DIAMOND_EXTRA], 20 }, + { + EL_BD_DIAMOND, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(2), + &li.bd_diamond_turns_to_on_falling, EL_BD_DIAMOND_FALLING + }, + { + EL_BD_DIAMOND, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(3), + &li.bd_diamond_turns_to_on_impact, EL_BD_DIAMOND + }, + + { + EL_BD_FIREFLY, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_firefly_explodes_to, EL_BD_EXPLODING_1 + }, + + { + EL_BD_FIREFLY_2, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_firefly_2_explodes_to, EL_BD_EXPLODING_1 + }, + + { + EL_BD_BUTTERFLY, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_butterfly_explodes_to, EL_BD_DIAMOND_GROWING_1 + }, + + { + EL_BD_BUTTERFLY_2, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_butterfly_2_explodes_to, EL_BD_DIAMOND_GROWING_1 + }, + + { + EL_BD_STONEFLY, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_stonefly_explodes_to, EL_BD_ROCK_GROWING_1 + }, + + { + EL_BD_DRAGONFLY, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_dragonfly_explodes_to, EL_BD_EXPLODING_1 + }, + + { + EL_BD_DIAMOND_GROWING_5, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_diamond_birth_turns_to, EL_BD_DIAMOND + }, + + { + EL_BD_BOMB_EXPLODING_4, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_bomb_explosion_turns_to, EL_BD_WALL + }, + + { + EL_BD_NITRO_PACK_EXPLODING_4, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_nitro_explosion_turns_to, EL_EMPTY + }, + + { + EL_BD_EXPLODING_5, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_explosion_turns_to, EL_EMPTY + }, { EL_BD_MAGIC_WALL, -1, @@ -812,6 +894,11 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), &li.bd_change_expanding_wall, FALSE }, + { + EL_BD_EXPANDABLE_WALL_ANY, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_expanding_wall_looks_like, EL_BD_WALL + }, { EL_BD_REPLICATOR, -1, @@ -863,6 +950,54 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = &li.bd_hammer_walls_reappear_delay, 100 }, + { + EL_BD_SKELETON, -1, + TYPE_INTEGER, CONF_VALUE_8_BIT(1), + &li.bd_num_skeletons_needed_for_pot, 5 + }, + { + EL_BD_SKELETON, -1, + TYPE_INTEGER, CONF_VALUE_8_BIT(2), + &li.bd_skeleton_worth_num_diamonds, 0 + }, + + { + EL_BD_CREATURE_SWITCH, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), + &li.bd_creatures_start_backwards, FALSE + }, + { + EL_BD_CREATURE_SWITCH, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(2), + &li.bd_creatures_turn_on_hatching, FALSE + }, + { + EL_BD_CREATURE_SWITCH, -1, + TYPE_INTEGER, CONF_VALUE_16_BIT(1), + &li.bd_creatures_auto_turn_delay, 0 + }, + + { + EL_BD_GRAVITY_SWITCH, -1, + TYPE_INTEGER, CONF_VALUE_8_BIT(1), + &li.bd_gravity_direction, GD_MV_DOWN + }, + { + EL_BD_GRAVITY_SWITCH, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(2), + &li.bd_gravity_switch_active, FALSE + }, + { + EL_BD_GRAVITY_SWITCH, -1, + TYPE_INTEGER, CONF_VALUE_8_BIT(3), + &li.bd_gravity_switch_delay, 10 + }, + { + EL_BD_GRAVITY_SWITCH, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(4), + &li.bd_gravity_affects_all, TRUE + }, + // (the following values are related to various game elements) { @@ -4066,6 +4201,9 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level, // functions for loading BD level // ---------------------------------------------------------------------------- +#define LEVEL_TO_CAVE(e) (map_element_RND_to_BD_cave(e)) +#define CAVE_TO_LEVEL(e) (map_element_BD_to_RND_cave(e)) + static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) { struct LevelInfo_BD *level_bd = level->native_bd_level; @@ -4103,7 +4241,6 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) cave->lineshift = level->bd_line_shifting_borders; cave->border_scan_first_and_last = level->bd_scan_first_and_last_row; cave->short_explosions = level->bd_short_explosions; - cave->gravity_affects_all = level->bd_gravity_affects_all; // player properties cave->diagonal_movements = level->bd_diagonal_movements; @@ -4111,7 +4248,7 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) cave->pushing_stone_prob = level->bd_pushing_prob * 10000; cave->pushing_stone_prob_sweet = level->bd_pushing_prob_with_sweet * 10000; cave->mega_stones_pushable_with_sweet = level->bd_push_mega_rock_with_sweet; - cave->snap_element = map_element_RND_to_BD_cave(level->bd_snap_element); + cave->snap_element = LEVEL_TO_CAVE(level->bd_snap_element); // element properties cave->level_bonus_time[0] = level->bd_clock_extra_time; @@ -4124,13 +4261,13 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) cave->magic_timer_wait_for_hatching = level->bd_magic_wall_wait_hatching; cave->magic_wall_stops_amoeba = level->bd_magic_wall_stops_amoeba; - cave->magic_diamond_to = map_element_RND_to_BD_cave(level->bd_magic_wall_diamond_to); - cave->magic_stone_to = map_element_RND_to_BD_cave(level->bd_magic_wall_rock_to); - cave->magic_mega_stone_to = map_element_RND_to_BD_cave(level->bd_magic_wall_mega_rock_to); - cave->magic_nut_to = map_element_RND_to_BD_cave(level->bd_magic_wall_nut_to); - cave->magic_nitro_pack_to = map_element_RND_to_BD_cave(level->bd_magic_wall_nitro_pack_to); - cave->magic_flying_diamond_to = map_element_RND_to_BD_cave(level->bd_magic_wall_flying_diamond_to); - cave->magic_flying_stone_to = map_element_RND_to_BD_cave(level->bd_magic_wall_flying_rock_to); + cave->magic_diamond_to = LEVEL_TO_CAVE(level->bd_magic_wall_diamond_to); + cave->magic_stone_to = LEVEL_TO_CAVE(level->bd_magic_wall_rock_to); + cave->magic_mega_stone_to = LEVEL_TO_CAVE(level->bd_magic_wall_mega_rock_to); + cave->magic_nut_to = LEVEL_TO_CAVE(level->bd_magic_wall_nut_to); + cave->magic_nitro_pack_to = LEVEL_TO_CAVE(level->bd_magic_wall_nitro_pack_to); + cave->magic_flying_diamond_to = LEVEL_TO_CAVE(level->bd_magic_wall_flying_diamond_to); + cave->magic_flying_stone_to = LEVEL_TO_CAVE(level->bd_magic_wall_flying_rock_to); cave->amoeba_timer_wait_for_hatching = level->bd_amoeba_wait_for_hatching; cave->amoeba_timer_started_immediately= level->bd_amoeba_start_immediately; @@ -4144,12 +4281,12 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) cave->amoeba_2_growth_prob = level->bd_amoeba_2_slow_growth_rate * 10000; cave->amoeba_2_fast_growth_prob = level->bd_amoeba_2_fast_growth_rate * 10000; - cave->amoeba_too_big_effect = map_element_RND_to_BD_cave(level->bd_amoeba_content_too_big); - cave->amoeba_enclosed_effect = map_element_RND_to_BD_cave(level->bd_amoeba_content_enclosed); - cave->amoeba_2_too_big_effect = map_element_RND_to_BD_cave(level->bd_amoeba_2_content_too_big); - cave->amoeba_2_enclosed_effect = map_element_RND_to_BD_cave(level->bd_amoeba_2_content_enclosed); - cave->amoeba_2_explosion_effect = map_element_RND_to_BD_cave(level->bd_amoeba_2_content_exploding); - cave->amoeba_2_looks_like = map_element_RND_to_BD_cave(level->bd_amoeba_2_content_looks_like); + cave->amoeba_too_big_effect = LEVEL_TO_CAVE(level->bd_amoeba_content_too_big); + cave->amoeba_enclosed_effect = LEVEL_TO_CAVE(level->bd_amoeba_content_enclosed); + cave->amoeba_2_too_big_effect = LEVEL_TO_CAVE(level->bd_amoeba_2_content_too_big); + cave->amoeba_2_enclosed_effect = LEVEL_TO_CAVE(level->bd_amoeba_2_content_enclosed); + cave->amoeba_2_explosion_effect = LEVEL_TO_CAVE(level->bd_amoeba_2_content_exploding); + cave->amoeba_2_looks_like = LEVEL_TO_CAVE(level->bd_amoeba_2_content_looks_like); cave->slime_predictable = level->bd_slime_is_predictable; cave->slime_correct_random = level->bd_slime_correct_random; @@ -4157,21 +4294,21 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) cave->level_slime_permeability_c64[0] = level->bd_slime_permeability_bits_c64; cave->level_slime_seed_c64[0] = level->bd_slime_random_seed_c64; cave->level_rand[0] = level->bd_cave_random_seed_c64; - cave->slime_eats_1 = map_element_RND_to_BD_cave(level->bd_slime_eats_element_1); - cave->slime_converts_1 = map_element_RND_to_BD_cave(level->bd_slime_converts_to_element_1); - cave->slime_eats_2 = map_element_RND_to_BD_cave(level->bd_slime_eats_element_2); - cave->slime_converts_2 = map_element_RND_to_BD_cave(level->bd_slime_converts_to_element_2); - cave->slime_eats_3 = map_element_RND_to_BD_cave(level->bd_slime_eats_element_3); - cave->slime_converts_3 = map_element_RND_to_BD_cave(level->bd_slime_converts_to_element_3); - - cave->acid_eats_this = map_element_RND_to_BD_cave(level->bd_acid_eats_element); + cave->slime_eats_1 = LEVEL_TO_CAVE(level->bd_slime_eats_element_1); + cave->slime_converts_1 = LEVEL_TO_CAVE(level->bd_slime_converts_to_element_1); + cave->slime_eats_2 = LEVEL_TO_CAVE(level->bd_slime_eats_element_2); + cave->slime_converts_2 = LEVEL_TO_CAVE(level->bd_slime_converts_to_element_2); + cave->slime_eats_3 = LEVEL_TO_CAVE(level->bd_slime_eats_element_3); + cave->slime_converts_3 = LEVEL_TO_CAVE(level->bd_slime_converts_to_element_3); + + cave->acid_eats_this = LEVEL_TO_CAVE(level->bd_acid_eats_element); cave->acid_spread_ratio = level->bd_acid_spread_rate * 10000; - cave->acid_turns_to = map_element_RND_to_BD_cave(level->bd_acid_turns_to_element); + cave->acid_turns_to = LEVEL_TO_CAVE(level->bd_acid_turns_to_element); cave->biter_delay_frame = level->bd_biter_move_delay; - cave->biter_eat = map_element_RND_to_BD_cave(level->bd_biter_eats_element); + cave->biter_eat = LEVEL_TO_CAVE(level->bd_biter_eats_element); - cave->bladder_converts_by = map_element_RND_to_BD_cave(level->bd_bladder_converts_by_element); + cave->bladder_converts_by = LEVEL_TO_CAVE(level->bd_bladder_converts_by_element); cave->expanding_wall_changed = level->bd_change_expanding_wall; @@ -4183,12 +4320,44 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) cave->water_does_not_flow_down = level->bd_water_cannot_flow_down; - cave->nut_turns_to_when_crushed = map_element_RND_to_BD_cave(level->bd_nut_content); + cave->nut_turns_to_when_crushed = LEVEL_TO_CAVE(level->bd_nut_content); cave->pneumatic_hammer_frame = level->bd_hammer_walls_break_delay; cave->hammered_walls_reappear = level->bd_hammer_walls_reappear; cave->hammered_wall_reappear_frame = level->bd_hammer_walls_reappear_delay; + cave->skeletons_needed_for_pot = level->bd_num_skeletons_needed_for_pot; + cave->skeletons_worth_diamonds = level->bd_skeleton_worth_num_diamonds; + + cave->expanding_wall_looks_like = LEVEL_TO_CAVE(level->bd_expanding_wall_looks_like); + cave->dirt_looks_like = LEVEL_TO_CAVE(level->bd_sand_looks_like); + + cave->creatures_backwards = level->bd_creatures_start_backwards; + cave->creatures_direction_auto_change_on_start = level->bd_creatures_turn_on_hatching; + cave->creatures_direction_auto_change_time = level->bd_creatures_auto_turn_delay; + + cave->gravity = level->bd_gravity_direction; + cave->gravity_switch_active = level->bd_gravity_switch_active; + cave->gravity_change_time = level->bd_gravity_switch_delay; + cave->gravity_affects_all = level->bd_gravity_affects_all; + + cave->stone_falling_effect = LEVEL_TO_CAVE(level->bd_rock_turns_to_on_falling); + cave->stone_bouncing_effect = LEVEL_TO_CAVE(level->bd_rock_turns_to_on_impact); + cave->diamond_falling_effect = LEVEL_TO_CAVE(level->bd_diamond_turns_to_on_falling); + cave->diamond_bouncing_effect = LEVEL_TO_CAVE(level->bd_diamond_turns_to_on_impact); + + cave->firefly_explode_to = LEVEL_TO_CAVE(level->bd_firefly_explodes_to); + cave->alt_firefly_explode_to = LEVEL_TO_CAVE(level->bd_firefly_2_explodes_to); + cave->butterfly_explode_to = LEVEL_TO_CAVE(level->bd_butterfly_explodes_to); + cave->alt_butterfly_explode_to = LEVEL_TO_CAVE(level->bd_butterfly_2_explodes_to); + cave->stonefly_explode_to = LEVEL_TO_CAVE(level->bd_stonefly_explodes_to); + cave->dragonfly_explode_to = LEVEL_TO_CAVE(level->bd_dragonfly_explodes_to); + + cave->diamond_birth_effect = LEVEL_TO_CAVE(level->bd_diamond_birth_turns_to); + cave->bomb_explosion_effect = LEVEL_TO_CAVE(level->bd_bomb_explosion_turns_to); + cave->nitro_explosion_effect = LEVEL_TO_CAVE(level->bd_nitro_explosion_turns_to); + cave->explosion_effect = LEVEL_TO_CAVE(level->bd_explosion_turns_to); + // level name strncpy(cave->name, level->name, sizeof(GdString)); cave->name[sizeof(GdString) - 1] = '\0'; @@ -4196,7 +4365,7 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) // playfield elements for (x = 0; x < cave->w; x++) for (y = 0; y < cave->h; y++) - cave->map[y][x] = map_element_RND_to_BD_cave(level->field[x][y]); + cave->map[y][x] = LEVEL_TO_CAVE(level->field[x][y]); } static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) @@ -4233,7 +4402,6 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) level->bd_line_shifting_borders = cave->lineshift; level->bd_scan_first_and_last_row = cave->border_scan_first_and_last; level->bd_short_explosions = cave->short_explosions; - level->bd_gravity_affects_all = cave->gravity_affects_all; // player properties level->bd_diagonal_movements = cave->diagonal_movements; @@ -4241,7 +4409,7 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) level->bd_pushing_prob = cave->pushing_stone_prob / 10000; level->bd_pushing_prob_with_sweet = cave->pushing_stone_prob_sweet / 10000; level->bd_push_mega_rock_with_sweet = cave->mega_stones_pushable_with_sweet; - level->bd_snap_element = map_element_BD_to_RND_cave(cave->snap_element); + level->bd_snap_element = CAVE_TO_LEVEL(cave->snap_element); // element properties level->bd_clock_extra_time = cave->level_bonus_time[bd_level_nr]; @@ -4254,13 +4422,13 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) level->bd_magic_wall_wait_hatching = cave->magic_timer_wait_for_hatching; level->bd_magic_wall_stops_amoeba = cave->magic_wall_stops_amoeba; - level->bd_magic_wall_diamond_to = map_element_BD_to_RND_cave(cave->magic_diamond_to); - level->bd_magic_wall_rock_to = map_element_BD_to_RND_cave(cave->magic_stone_to); - level->bd_magic_wall_mega_rock_to = map_element_BD_to_RND_cave(cave->magic_mega_stone_to); - level->bd_magic_wall_nut_to = map_element_BD_to_RND_cave(cave->magic_nut_to); - level->bd_magic_wall_nitro_pack_to = map_element_BD_to_RND_cave(cave->magic_nitro_pack_to); - level->bd_magic_wall_flying_diamond_to= map_element_BD_to_RND_cave(cave->magic_flying_diamond_to); - level->bd_magic_wall_flying_rock_to = map_element_BD_to_RND_cave(cave->magic_flying_stone_to); + level->bd_magic_wall_diamond_to = CAVE_TO_LEVEL(cave->magic_diamond_to); + level->bd_magic_wall_rock_to = CAVE_TO_LEVEL(cave->magic_stone_to); + level->bd_magic_wall_mega_rock_to = CAVE_TO_LEVEL(cave->magic_mega_stone_to); + level->bd_magic_wall_nut_to = CAVE_TO_LEVEL(cave->magic_nut_to); + level->bd_magic_wall_nitro_pack_to = CAVE_TO_LEVEL(cave->magic_nitro_pack_to); + level->bd_magic_wall_flying_diamond_to= CAVE_TO_LEVEL(cave->magic_flying_diamond_to); + level->bd_magic_wall_flying_rock_to = CAVE_TO_LEVEL(cave->magic_flying_stone_to); level->bd_amoeba_wait_for_hatching = cave->amoeba_timer_wait_for_hatching; level->bd_amoeba_start_immediately = cave->amoeba_timer_started_immediately; @@ -4274,12 +4442,12 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) level->bd_amoeba_2_slow_growth_rate = cave->amoeba_2_growth_prob / 10000; level->bd_amoeba_2_fast_growth_rate = cave->amoeba_2_fast_growth_prob / 10000; - level->bd_amoeba_content_too_big = map_element_BD_to_RND_cave(cave->amoeba_too_big_effect); - level->bd_amoeba_content_enclosed = map_element_BD_to_RND_cave(cave->amoeba_enclosed_effect); - level->bd_amoeba_2_content_too_big = map_element_BD_to_RND_cave(cave->amoeba_2_too_big_effect); - level->bd_amoeba_2_content_enclosed = map_element_BD_to_RND_cave(cave->amoeba_2_enclosed_effect); - level->bd_amoeba_2_content_exploding = map_element_BD_to_RND_cave(cave->amoeba_2_explosion_effect); - level->bd_amoeba_2_content_looks_like = map_element_BD_to_RND_cave(cave->amoeba_2_looks_like); + level->bd_amoeba_content_too_big = CAVE_TO_LEVEL(cave->amoeba_too_big_effect); + level->bd_amoeba_content_enclosed = CAVE_TO_LEVEL(cave->amoeba_enclosed_effect); + level->bd_amoeba_2_content_too_big = CAVE_TO_LEVEL(cave->amoeba_2_too_big_effect); + level->bd_amoeba_2_content_enclosed = CAVE_TO_LEVEL(cave->amoeba_2_enclosed_effect); + level->bd_amoeba_2_content_exploding = CAVE_TO_LEVEL(cave->amoeba_2_explosion_effect); + level->bd_amoeba_2_content_looks_like = CAVE_TO_LEVEL(cave->amoeba_2_looks_like); level->bd_slime_is_predictable = cave->slime_predictable; level->bd_slime_correct_random = cave->slime_correct_random; @@ -4287,21 +4455,21 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) level->bd_slime_permeability_bits_c64 = cave->level_slime_permeability_c64[bd_level_nr]; level->bd_slime_random_seed_c64 = cave->level_slime_seed_c64[bd_level_nr]; level->bd_cave_random_seed_c64 = cave->level_rand[bd_level_nr]; - level->bd_slime_eats_element_1 = map_element_BD_to_RND_cave(cave->slime_eats_1); - level->bd_slime_converts_to_element_1 = map_element_BD_to_RND_cave(cave->slime_converts_1); - level->bd_slime_eats_element_2 = map_element_BD_to_RND_cave(cave->slime_eats_2); - level->bd_slime_converts_to_element_2 = map_element_BD_to_RND_cave(cave->slime_converts_2); - level->bd_slime_eats_element_3 = map_element_BD_to_RND_cave(cave->slime_eats_3); - level->bd_slime_converts_to_element_3 = map_element_BD_to_RND_cave(cave->slime_converts_3); - - level->bd_acid_eats_element = map_element_BD_to_RND_cave(cave->acid_eats_this); + level->bd_slime_eats_element_1 = CAVE_TO_LEVEL(cave->slime_eats_1); + level->bd_slime_converts_to_element_1 = CAVE_TO_LEVEL(cave->slime_converts_1); + level->bd_slime_eats_element_2 = CAVE_TO_LEVEL(cave->slime_eats_2); + level->bd_slime_converts_to_element_2 = CAVE_TO_LEVEL(cave->slime_converts_2); + level->bd_slime_eats_element_3 = CAVE_TO_LEVEL(cave->slime_eats_3); + level->bd_slime_converts_to_element_3 = CAVE_TO_LEVEL(cave->slime_converts_3); + + level->bd_acid_eats_element = CAVE_TO_LEVEL(cave->acid_eats_this); level->bd_acid_spread_rate = cave->acid_spread_ratio / 10000; - level->bd_acid_turns_to_element = map_element_BD_to_RND_cave(cave->acid_turns_to); + level->bd_acid_turns_to_element = CAVE_TO_LEVEL(cave->acid_turns_to); level->bd_biter_move_delay = cave->biter_delay_frame; - level->bd_biter_eats_element = map_element_BD_to_RND_cave(cave->biter_eat); + level->bd_biter_eats_element = CAVE_TO_LEVEL(cave->biter_eat); - level->bd_bladder_converts_by_element = map_element_BD_to_RND_cave(cave->bladder_converts_by); + level->bd_bladder_converts_by_element = CAVE_TO_LEVEL(cave->bladder_converts_by); level->bd_change_expanding_wall = cave->expanding_wall_changed; @@ -4313,12 +4481,44 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) level->bd_water_cannot_flow_down = cave->water_does_not_flow_down; - level->bd_nut_content = map_element_BD_to_RND_cave(cave->nut_turns_to_when_crushed); + level->bd_nut_content = CAVE_TO_LEVEL(cave->nut_turns_to_when_crushed); level->bd_hammer_walls_break_delay = cave->pneumatic_hammer_frame; level->bd_hammer_walls_reappear = cave->hammered_walls_reappear; level->bd_hammer_walls_reappear_delay = cave->hammered_wall_reappear_frame; + level->bd_num_skeletons_needed_for_pot= cave->skeletons_needed_for_pot; + level->bd_skeleton_worth_num_diamonds = cave->skeletons_worth_diamonds; + + level->bd_expanding_wall_looks_like = CAVE_TO_LEVEL(cave->expanding_wall_looks_like); + level->bd_sand_looks_like = CAVE_TO_LEVEL(cave->dirt_looks_like); + + level->bd_creatures_start_backwards = cave->creatures_backwards; + level->bd_creatures_turn_on_hatching = cave->creatures_direction_auto_change_on_start; + level->bd_creatures_auto_turn_delay = cave->creatures_direction_auto_change_time; + + level->bd_gravity_direction = cave->gravity; + level->bd_gravity_switch_active = cave->gravity_switch_active; + level->bd_gravity_switch_delay = cave->gravity_change_time; + level->bd_gravity_affects_all = cave->gravity_affects_all; + + level->bd_rock_turns_to_on_falling = CAVE_TO_LEVEL(cave->stone_falling_effect); + level->bd_rock_turns_to_on_impact = CAVE_TO_LEVEL(cave->stone_bouncing_effect); + level->bd_diamond_turns_to_on_falling = CAVE_TO_LEVEL(cave->diamond_falling_effect); + level->bd_diamond_turns_to_on_impact = CAVE_TO_LEVEL(cave->diamond_bouncing_effect); + + level->bd_firefly_explodes_to = CAVE_TO_LEVEL(cave->firefly_explode_to); + level->bd_firefly_2_explodes_to = CAVE_TO_LEVEL(cave->alt_firefly_explode_to); + level->bd_butterfly_explodes_to = CAVE_TO_LEVEL(cave->butterfly_explode_to); + level->bd_butterfly_2_explodes_to = CAVE_TO_LEVEL(cave->alt_butterfly_explode_to); + level->bd_stonefly_explodes_to = CAVE_TO_LEVEL(cave->stonefly_explode_to); + level->bd_dragonfly_explodes_to = CAVE_TO_LEVEL(cave->dragonfly_explode_to); + + level->bd_diamond_birth_turns_to = CAVE_TO_LEVEL(cave->diamond_birth_effect); + level->bd_bomb_explosion_turns_to = CAVE_TO_LEVEL(cave->bomb_explosion_effect); + level->bd_nitro_explosion_turns_to = CAVE_TO_LEVEL(cave->nitro_explosion_effect); + level->bd_explosion_turns_to = CAVE_TO_LEVEL(cave->explosion_effect); + // level name char *cave_name = getStringPrint("%s / %d", cave->name, bd_level_nr + 1); @@ -4328,7 +4528,7 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) // playfield elements for (x = 0; x < level->fieldx; x++) for (y = 0; y < level->fieldy; y++) - level->field[x][y] = map_element_BD_to_RND_cave(cave->map[y][x]); + level->field[x][y] = CAVE_TO_LEVEL(cave->map[y][x]); checked_free(cave_name); }