X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=a150f89146217d1842a5ab5c32157be031638d14;hb=2a0c267efdb892885b57233886fa32763833be5c;hp=78c47b9fe8a81cbbd8f0ae8d1d7804819d361576;hpb=d8abc11b7cbbc1e0e5411070c40325014b95e0e0;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 78c47b9f..a150f891 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,
@@ -628,6 +633,11 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
     TYPE_BOOLEAN,			CONF_VALUE_8_BIT(5),
     &li.bd_push_mega_rock_with_sweet,	FALSE
   },
+  {
+    EL_BD_PLAYER,			-1,
+    TYPE_INTEGER,			CONF_VALUE_8_BIT(6),
+    &li.bd_snap_element,		EL_EMPTY
+  },
 
   {
     EL_BD_DIAMOND,			-1,
@@ -652,6 +662,53 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
     &li.bd_clock_extra_time,		30
   },
 
+  {
+    EL_BD_VOODOO_DOLL,			-1,
+    TYPE_BOOLEAN,			CONF_VALUE_8_BIT(1),
+    &li.bd_voodoo_collects_diamonds,	FALSE
+  },
+  {
+    EL_BD_VOODOO_DOLL,			-1,
+    TYPE_BOOLEAN,			CONF_VALUE_8_BIT(2),
+    &li.bd_voodoo_hurt_kills_player,	FALSE
+  },
+  {
+    EL_BD_VOODOO_DOLL,			-1,
+    TYPE_BOOLEAN,			CONF_VALUE_8_BIT(3),
+    &li.bd_voodoo_dies_by_rock,		FALSE
+  },
+  {
+    EL_BD_VOODOO_DOLL,			-1,
+    TYPE_BOOLEAN,			CONF_VALUE_8_BIT(4),
+    &li.bd_voodoo_vanish_by_explosion,	TRUE
+  },
+  {
+    EL_BD_VOODOO_DOLL,			-1,
+    TYPE_INTEGER,			CONF_VALUE_8_BIT(5),
+    &li.bd_voodoo_penalty_time,		30
+  },
+
+  {
+    EL_BD_SLIME,			-1,
+    TYPE_BOOLEAN,			CONF_VALUE_8_BIT(1),
+    &li.bd_slime_is_predictable,	TRUE
+  },
+  {
+    EL_BD_SLIME,			-1,
+    TYPE_INTEGER,			CONF_VALUE_8_BIT(2),
+    &li.bd_slime_permeability_rate,	100
+  },
+  {
+    EL_BD_SLIME,			-1,
+    TYPE_INTEGER,			CONF_VALUE_8_BIT(3),
+    &li.bd_slime_permeability_bits_c64,	0
+  },
+  {
+    EL_BD_SLIME,			-1,
+    TYPE_INTEGER,			CONF_VALUE_32_BIT(1),
+    &li.bd_slime_random_seed_c64,	-1
+  },
+
   // (the following values are related to various game elements)
 
   {
@@ -3900,9 +3957,15 @@ 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(level->bd_snap_element);
 
   // element properties
   cave->level_bonus_time[0]		= level->bd_clock_extra_time;
+  cave->voodoo_collects_diamonds	= level->bd_voodoo_collects_diamonds;
+  cave->voodoo_any_hurt_kills_player	= level->bd_voodoo_hurt_kills_player;
+  cave->voodoo_dies_by_stone		= level->bd_voodoo_dies_by_rock;
+  cave->voodoo_disappear_in_explosion	= level->bd_voodoo_vanish_by_explosion;
+  cave->level_penalty_time[0]		= level->bd_voodoo_penalty_time;
   cave->level_magic_wall_time[0]	= level->time_magic_wall;
   cave->magic_timer_wait_for_hatching	= level->bd_magic_wall_wait_hatching;
   cave->magic_wall_stops_amoeba		= level->bd_magic_wall_stops_amoeba;
@@ -3925,6 +3988,13 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level)
   cave->amoeba_2_explosion_effect   = map_element_RND_to_BD(level->bd_amoeba_2_content_exploding);
   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;
+
   // level name
   strncpy(cave->name, level->name, sizeof(GdString));
   cave->name[sizeof(GdString) - 1] = '\0';
@@ -3977,21 +4047,27 @@ 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->snap_element);
 
   // element properties
-  level->bd_clock_extra_time		= cave->level_bonus_time[0];
+  level->bd_clock_extra_time		= cave->level_bonus_time[bd_level_nr];
+  level->bd_voodoo_collects_diamonds	= cave->voodoo_collects_diamonds;
+  level->bd_voodoo_hurt_kills_player	= cave->voodoo_any_hurt_kills_player;
+  level->bd_voodoo_dies_by_rock		= cave->voodoo_dies_by_stone;
+  level->bd_voodoo_vanish_by_explosion	= cave->voodoo_disappear_in_explosion;
+  level->bd_voodoo_penalty_time		= cave->level_penalty_time[bd_level_nr];
   level->time_magic_wall		= cave->level_magic_wall_time[bd_level_nr];
   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_amoeba_wait_for_hatching	= cave->amoeba_timer_wait_for_hatching;
   level->bd_amoeba_start_immediately	= cave->amoeba_timer_started_immediately;
   level->bd_amoeba_2_explode_by_amoeba	= cave->amoeba_2_explodes_by_amoeba;
-  level->bd_amoeba_threshold_too_big	= cave->level_amoeba_threshold[0];
-  level->bd_amoeba_slow_growth_time	= cave->level_amoeba_time[0];
+  level->bd_amoeba_threshold_too_big	= cave->level_amoeba_threshold[bd_level_nr];
+  level->bd_amoeba_slow_growth_time	= cave->level_amoeba_time[bd_level_nr];
   level->bd_amoeba_slow_growth_rate	= cave->amoeba_growth_prob      / 10000;
   level->bd_amoeba_fast_growth_rate	= cave->amoeba_fast_growth_prob / 10000;
-  level->bd_amoeba_2_threshold_too_big	= cave->level_amoeba_2_threshold[0];
-  level->bd_amoeba_2_slow_growth_time	= cave->level_amoeba_2_time[0];
+  level->bd_amoeba_2_threshold_too_big	= cave->level_amoeba_2_threshold[bd_level_nr];
+  level->bd_amoeba_2_slow_growth_time	= cave->level_amoeba_2_time[bd_level_nr];
   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;
 
@@ -4002,6 +4078,13 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level)
   level->bd_amoeba_2_content_exploding	= map_element_BD_to_RND(cave->amoeba_2_explosion_effect);
   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 name
   char *cave_name = getStringPrint("%s / %d", cave->name, bd_level_nr + 1);