X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=a164fdfd4e3452d41d5cdc8fa92fed903fab3df5;hb=4f06890d9e4a9d115ec6b84d21dcc20ed8b7d1cd;hp=e519b9b77c9567b881f9531326a5aa661d3a5c63;hpb=771da82fa210f0474a6a7c5e1c05a1ea257dd457;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index e519b9b7..a164fdfd 100644 --- a/src/files.c +++ b/src/files.c @@ -310,6 +310,11 @@ static struct LevelFileConfigInfo chunk_config_INFO[] = TYPE_BOOLEAN, CONF_VALUE_8_BIT(23), &li.bd_gravity_affects_all, TRUE }, + { + -1, -1, + TYPE_INTEGER, CONF_VALUE_8_BIT(24), + &li.bd_cave_random_seed_c64, 0 + }, { -1, -1, @@ -704,6 +709,67 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = &li.bd_slime_random_seed_c64, -1 }, + { + EL_BD_ACID, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_acid_eats_element, EL_BD_SAND + }, + { + EL_BD_ACID, -1, + TYPE_INTEGER, CONF_VALUE_8_BIT(1), + &li.bd_acid_spread_rate, 3 + }, + { + EL_BD_ACID, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(2), + &li.bd_acid_turns_to_element, EL_EMPTY + }, + + { + EL_BD_BITER, -1, + TYPE_INTEGER, CONF_VALUE_8_BIT(1), + &li.bd_biter_move_delay, 0 + }, + { + EL_BD_BITER, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_biter_eats_element, EL_BD_DIAMOND + }, + + { + EL_BD_BLADDER, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.bd_bladder_converts_by_element, EL_BD_VOODOO_DOLL + }, + + { + EL_BD_EXPANDABLE_WALL_ANY, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), + &li.bd_change_expanding_wall, FALSE + }, + + { + EL_BD_REPLICATOR, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), + &li.bd_replicators_active, TRUE + }, + { + EL_BD_REPLICATOR, -1, + TYPE_INTEGER, CONF_VALUE_8_BIT(2), + &li.bd_replicator_create_delay, 4 + }, + + { + EL_BD_CONVEYOR_LEFT, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), + &li.bd_conveyor_belts_active, TRUE + }, + { + EL_BD_CONVEYOR_LEFT, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(2), + &li.bd_conveyor_belts_changed, FALSE + }, + // (the following values are related to various game elements) { @@ -3984,9 +4050,28 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) cave->amoeba_2_looks_like = map_element_RND_to_BD(level->bd_amoeba_2_content_looks_like); cave->slime_predictable = level->bd_slime_is_predictable; + cave->slime_correct_random = level->bd_slime_correct_random; cave->level_slime_permeability[0] = level->bd_slime_permeability_rate * 10000; 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->acid_eats_this = map_element_RND_to_BD(level->bd_acid_eats_element); + cave->acid_spread_ratio = level->bd_acid_spread_rate * 10000; + cave->acid_turns_to = map_element_RND_to_BD(level->bd_acid_turns_to_element); + + cave->biter_delay_frame = level->bd_biter_move_delay; + cave->biter_eat = map_element_RND_to_BD(level->bd_biter_eats_element); + + cave->bladder_converts_by = map_element_RND_to_BD(level->bd_bladder_converts_by_element); + + cave->expanding_wall_changed = level->bd_change_expanding_wall; + + cave->replicators_active = level->bd_replicators_active; + cave->replicator_delay_frame = level->bd_replicator_create_delay; + + cave->conveyor_belts_active = level->bd_conveyor_belts_active; + cave->conveyor_belts_direction_changed= level->bd_conveyor_belts_changed; // level name strncpy(cave->name, level->name, sizeof(GdString)); @@ -4072,9 +4157,28 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) level->bd_amoeba_2_content_looks_like = map_element_BD_to_RND(cave->amoeba_2_looks_like); level->bd_slime_is_predictable = cave->slime_predictable; + level->bd_slime_correct_random = cave->slime_correct_random; level->bd_slime_permeability_rate = cave->level_slime_permeability[bd_level_nr] / 10000; 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_acid_eats_element = map_element_BD_to_RND(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->acid_turns_to); + + level->bd_biter_move_delay = cave->biter_delay_frame; + level->bd_biter_eats_element = map_element_BD_to_RND(cave->biter_eat); + + level->bd_bladder_converts_by_element = map_element_BD_to_RND(cave->bladder_converts_by); + + level->bd_change_expanding_wall = cave->expanding_wall_changed; + + level->bd_replicators_active = cave->replicators_active; + level->bd_replicator_create_delay = cave->replicator_delay_frame; + + level->bd_conveyor_belts_active = cave->conveyor_belts_active; + level->bd_conveyor_belts_changed = cave->conveyor_belts_direction_changed; // level name char *cave_name = getStringPrint("%s / %d", cave->name, bd_level_nr + 1);