X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=b9e97c3008da0e9ca4c0ff7a20a3cc98f3164484;hb=b640b9d7647df4cbba0e530f6f4bcece384048e4;hp=7967bac637b556c77ea75ae5bdefc5b2b8c996ea;hpb=e5a0a3097d6a6c3afea01b3deeee9b206982ec1d;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 7967bac6..b9e97c30 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -310,6 +310,16 @@ struct ConfigInfo image_config[] =
   { "sp_base.xpos",				"2"			},
   { "sp_base.ypos",				"0"			},
   { "sp_base.frames",				"1"			},
+  { "sp_base.digging",				"RocksSP.pcx"		},
+  { "sp_base.digging.xpos",			"2"			},
+  { "sp_base.digging.ypos",			"0"			},
+  { "sp_base.digging.frames",			"1"			},
+  { "sp_base.digging.anim_mode",		"opaque_player"		},
+  { "sp_base.snapping",				"RocksSP.pcx"		},
+  { "sp_base.snapping.xpos",			"8"			},
+  { "sp_base.snapping.ypos",			"2"			},
+  { "sp_base.snapping.frames",			"7"			},
+  { "sp_base.snapping.anim_mode",		"linear"		},
 
   { "sp_murphy",				"RocksSP.pcx"		},
   { "sp_murphy.xpos",				"3"			},
@@ -375,6 +385,32 @@ struct ConfigInfo image_config[] =
   { "sp_murphy.snapping.down.xpos",		"15"			},
   { "sp_murphy.snapping.down.ypos",		"0"			},
   { "sp_murphy.snapping.down.frames",		"1"			},
+  { "sp_murphy.boring",				"RocksSP.pcx"		},
+  { "sp_murphy.boring.xpos",			"11"			},
+  { "sp_murphy.boring.ypos",			"12"			},
+  { "sp_murphy.boring.frames",			"1"			},
+  { "sp_murphy.boring[1]",			"RocksSP.pcx"		},
+  { "sp_murphy.boring[1].xpos",			"0"			},
+  { "sp_murphy.boring[1].ypos",			"12"			},
+  { "sp_murphy.boring[1].frames",		"12"			},
+  { "sp_murphy.boring[1].delay",		"10"			},
+  { "sp_murphy.boring[1].anim_mode",		"linear"		},
+  { "sp_murphy.boring[1].anim_delay_fixed",	"120"			},
+  { "sp_murphy.boring[1].anim_delay_random",	"0"			},
+  { "sp_murphy.boring[1].post_delay_fixed",	"500"			},
+  { "sp_murphy.boring[1].post_delay_random",	"500"			},
+  { "sp_murphy.sleeping.left",			"RocksSP.pcx"		},
+  { "sp_murphy.sleeping.left.xpos",		"4"			},
+  { "sp_murphy.sleeping.left.ypos",		"9"			},
+  { "sp_murphy.sleeping.left.frames",		"3"			},
+  { "sp_murphy.sleeping.left.delay",		"100"			},
+  { "sp_murphy.sleeping.left.anim_mode",	"linear,reverse"	},
+  { "sp_murphy.sleeping.right",			"RocksSP.pcx"		},
+  { "sp_murphy.sleeping.right.xpos",		"13"			},
+  { "sp_murphy.sleeping.right.ypos",		"12"			},
+  { "sp_murphy.sleeping.right.frames",		"3"			},
+  { "sp_murphy.sleeping.right.delay",		"100"			},
+  { "sp_murphy.sleeping.right.anim_mode",	"linear"		},
 
   { "sp_murphy_clone",				"RocksSP.pcx"		},
   { "sp_murphy_clone.xpos",			"3"			},
@@ -388,6 +424,11 @@ struct ConfigInfo image_config[] =
   { "sp_infotron.EDITOR",			"RocksSP.pcx"		},
   { "sp_infotron.EDITOR.xpos",			"8"			},
   { "sp_infotron.EDITOR.ypos",			"11"			},
+  { "sp_infotron.collecting",			"RocksSP.pcx"		},
+  { "sp_infotron.collecting.xpos",		"8"			},
+  { "sp_infotron.collecting.ypos",		"7"			},
+  { "sp_infotron.collecting.frames",		"8"			},
+  { "sp_infotron.collecting.anim_mode",		"linear"		},
 
   { "sp_chip_single",				"RocksSP.pcx"		},
   { "sp_chip_single.xpos",			"5"			},
@@ -466,6 +507,7 @@ struct ConfigInfo image_config[] =
   { "sp_disk_red.collecting.xpos",		"8"			},
   { "sp_disk_red.collecting.ypos",		"5"			},
   { "sp_disk_red.collecting.frames",		"8"			},
+  { "sp_disk_red.collecting.anim_mode",		"linear"		},
   { "sp_disk_red.active",			"RocksSP.pcx"		},
   { "sp_disk_red.active.xpos",			"4"			},
   { "sp_disk_red.active.ypos",			"2"			},
@@ -948,6 +990,20 @@ struct ConfigInfo image_config[] =
   { "dynamite.active.EDITOR.xpos",		"1"			},
   { "dynamite.active.EDITOR.ypos",		"14"			},
 
+  { "em_dynamite",				"RocksEMC.pcx"		},
+  { "em_dynamite.xpos",				"0"			},
+  { "em_dynamite.ypos",				"15"			},
+  { "em_dynamite.frames",			"1"			},
+  { "em_dynamite.active",			"RocksEMC.pcx"		},
+  { "em_dynamite.active.xpos",			"1"			},
+  { "em_dynamite.active.ypos",			"15"			},
+  { "em_dynamite.active.frames",		"4"			},
+  { "em_dynamite.active.delay",			"8"			},
+  { "em_dynamite.active.anim_mode",		"linear"		},
+  { "em_dynamite.active.EDITOR",		"RocksEMC.pcx"		},
+  { "em_dynamite.active.EDITOR.xpos",		"2"			},
+  { "em_dynamite.active.EDITOR.ypos",		"15"			},
+
   { "wall_emerald",				"RocksElements.pcx"	},
   { "wall_emerald.xpos",			"4"			},
   { "wall_emerald.ypos",			"8"			},
@@ -1151,6 +1207,38 @@ struct ConfigInfo image_config[] =
   { "yamyam.ypos",				"5"			},
   { "yamyam.frames",				"4"			},
   { "yamyam.anim_mode",				"pingpong2"		},
+  { "yamyam.left",				"RocksElements.pcx"	},
+  { "yamyam.left.xpos",				"0"			},
+  { "yamyam.left.ypos",				"5"			},
+  { "yamyam.left.frames",			"4"			},
+  { "yamyam.left.anim_mode",			"pingpong2"		},
+  { "yamyam.left.EDITOR",			"RocksEMC.pcx"		},
+  { "yamyam.left.EDITOR.xpos",			"7"			},
+  { "yamyam.left.EDITOR.ypos",			"15"			},
+  { "yamyam.right",				"RocksElements.pcx"	},
+  { "yamyam.right.xpos",			"0"			},
+  { "yamyam.right.ypos",			"5"			},
+  { "yamyam.right.frames",			"4"			},
+  { "yamyam.right.anim_mode",			"pingpong2"		},
+  { "yamyam.right.EDITOR",			"RocksEMC.pcx"		},
+  { "yamyam.right.EDITOR.xpos",			"8"			},
+  { "yamyam.right.EDITOR.ypos",			"15"			},
+  { "yamyam.up",				"RocksElements.pcx"	},
+  { "yamyam.up.xpos",				"0"			},
+  { "yamyam.up.ypos",				"5"			},
+  { "yamyam.up.frames",				"4"			},
+  { "yamyam.up.anim_mode",			"pingpong2"		},
+  { "yamyam.up.EDITOR",				"RocksEMC.pcx"		},
+  { "yamyam.up.EDITOR.xpos",			"5"			},
+  { "yamyam.up.EDITOR.ypos",			"15"			},
+  { "yamyam.down",				"RocksElements.pcx"	},
+  { "yamyam.down.xpos",				"0"			},
+  { "yamyam.down.ypos",				"5"			},
+  { "yamyam.down.frames",			"4"			},
+  { "yamyam.down.anim_mode",			"pingpong2"		},
+  { "yamyam.down.EDITOR",			"RocksEMC.pcx"		},
+  { "yamyam.down.EDITOR.xpos",			"6"			},
+  { "yamyam.down.EDITOR.ypos",			"15"			},
   { "yamyam.moving",				"RocksElements.pcx"	},
   { "yamyam.moving.xpos",			"0"			},
   { "yamyam.moving.ypos",			"5"			},
@@ -3368,6 +3456,26 @@ struct ConfigInfo image_config[] =
   { "trigger_player.ypos",			"13"			},
   { "trigger_player.frames",			"1"			},
 
+  { "trigger_ce_value",				"RocksDC.pcx"		},
+  { "trigger_ce_value.xpos",			"15"			},
+  { "trigger_ce_value.ypos",			"11"			},
+  { "trigger_ce_value.frames",			"1"			},
+
+  { "trigger_ce_score",				"RocksDC.pcx"		},
+  { "trigger_ce_score.xpos",			"15"			},
+  { "trigger_ce_score.ypos",			"12"			},
+  { "trigger_ce_score.frames",			"1"			},
+
+  { "current_ce_value",				"RocksDC.pcx"		},
+  { "current_ce_value.xpos",			"14"			},
+  { "current_ce_value.ypos",			"11"			},
+  { "current_ce_value.frames",			"1"			},
+
+  { "current_ce_score",				"RocksDC.pcx"		},
+  { "current_ce_score.xpos",			"14"			},
+  { "current_ce_score.ypos",			"12"			},
+  { "current_ce_score.frames",			"1"			},
+
   { "emc_key_5",				"RocksEMC.pcx"		},
   { "emc_key_5.xpos",				"0"			},
   { "emc_key_5.ypos",				"5"			},
@@ -3452,6 +3560,54 @@ struct ConfigInfo image_config[] =
   { "emc_android.frames",			"8"			},
   { "emc_android.delay",			"2"			},
 
+  { "emc_android.shrinking.upleft",		"RocksEMC.pcx"		},
+  { "emc_android.shrinking.upleft.xpos",	"1"			},
+  { "emc_android.shrinking.upleft.ypos",	"11"			},
+  { "emc_android.shrinking.upleft.frames",	"8"			},
+  { "emc_android.shrinking.upleft.anim_mode",	"linear"		},
+
+  { "emc_android.growing.downright",		"RocksEMC.pcx"		},
+  { "emc_android.growing.downright.xpos",	"0"			},
+  { "emc_android.growing.downright.ypos",	"11"			},
+  { "emc_android.growing.downright.frames",	"8"			},
+  { "emc_android.growing.downright.anim_mode",	"linear,reverse"	},
+
+  { "emc_android.shrinking.downleft",		"RocksEMC.pcx"		},
+  { "emc_android.shrinking.downleft.xpos",	"1"			},
+  { "emc_android.shrinking.downleft.ypos",	"12"			},
+  { "emc_android.shrinking.downleft.frames",	"8"			},
+  { "emc_android.shrinking.downleft.anim_mode",	"linear"		},
+
+  { "emc_android.growing.upright",		"RocksEMC.pcx"		},
+  { "emc_android.growing.upright.xpos",		"0"			},
+  { "emc_android.growing.upright.ypos",		"12"			},
+  { "emc_android.growing.upright.frames",	"8"			},
+  { "emc_android.growing.upright.anim_mode",	"linear,reverse"	},
+
+  { "emc_android.shrinking.upright",		"RocksEMC.pcx"		},
+  { "emc_android.shrinking.upright.xpos",	"1"			},
+  { "emc_android.shrinking.upright.ypos",	"13"			},
+  { "emc_android.shrinking.upright.frames",	"8"			},
+  { "emc_android.shrinking.upright.anim_mode",	"linear"		},
+
+  { "emc_android.growing.downleft",		"RocksEMC.pcx"		},
+  { "emc_android.growing.downleft.xpos",	"0"			},
+  { "emc_android.growing.downleft.ypos",	"13"			},
+  { "emc_android.growing.downleft.frames",	"8"			},
+  { "emc_android.growing.downleft.anim_mode",	"linear,reverse"	},
+
+  { "emc_android.shrinking.downright",		"RocksEMC.pcx"		},
+  { "emc_android.shrinking.downright.xpos",	"1"			},
+  { "emc_android.shrinking.downright.ypos",	"14"			},
+  { "emc_android.shrinking.downright.frames",	"8"			},
+  { "emc_android.shrinking.downright.anim_mode","linear"		},
+
+  { "emc_android.growing.upleft",		"RocksEMC.pcx"		},
+  { "emc_android.growing.upleft.xpos",		"0"			},
+  { "emc_android.growing.upleft.ypos",		"14"			},
+  { "emc_android.growing.upleft.frames",	"8"			},
+  { "emc_android.growing.upleft.anim_mode",	"linear,reverse"	},
+
   { "emc_grass",				"RocksEMC.pcx"		},
   { "emc_grass.xpos",				"0"			},
   { "emc_grass.ypos",				"4"			},
@@ -3629,6 +3785,10 @@ struct ConfigInfo image_config[] =
   { "emc_fake_grass.active.CRUMBLED.xpos",	"3"			},
   { "emc_fake_grass.active.CRUMBLED.ypos",	"4"			},
   { "emc_fake_grass.active.CRUMBLED.frames",	"1"			},
+  { "emc_fake_grass.EDITOR",			"RocksEMC.pcx"		},
+  { "emc_fake_grass.EDITOR.xpos",		"2"			},
+  { "emc_fake_grass.EDITOR.ypos",		"4"			},
+  { "emc_fake_grass.EDITOR.frames",		"1"			},
 
   { "emc_fake_acid",				"RocksElements.pcx"	},
   { "emc_fake_acid.xpos",			"12"			},
@@ -3660,13 +3820,13 @@ struct ConfigInfo image_config[] =
   /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */
 
   /* (for testing, change filename back to "emc_object dot pcx") */
-  { "emc_object",				"emc_object.pcx"	},
+  { "emc_object",				"emc_objects.pcx"	},
 #if 0
   { "emc_object.scale_up_factor",		"2"			},
 #endif
 
   /* (for testing, change filename back to "emc_sprite dot pcx") */
-  { "emc_sprite",				"emc_sprite.pcx"	},
+  { "emc_sprite",				"emc_players.pcx"	},
 #if 0
   { "emc_sprite.scale_up_factor",		"2"			},
 #endif
@@ -3922,6 +4082,15 @@ struct ConfigInfo image_config[] =
   { "menu.button_leave_menu.active",		"RocksDC.pcx"		},
   { "menu.button_leave_menu.active.clone_from",	"menu.button_left.active" },
 
+  { "menu.button_next_level",			"RocksDC.pcx"		},
+  { "menu.button_next_level.clone_from",	"menu.button_right"	},
+  { "menu.button_next_level.active",		"RocksDC.pcx"		},
+  { "menu.button_next_level.active.clone_from",	"menu.button_right.active" },
+  { "menu.button_last_level",			"RocksDC.pcx"		},
+  { "menu.button_last_level.clone_from",	"menu.button_left"	},
+  { "menu.button_last_level.active",		"RocksDC.pcx"		},
+  { "menu.button_last_level.active.clone_from",	"menu.button_left.active" },
+
   { "menu.scrollbar",				"RocksDC.pcx"		},
   { "menu.scrollbar.xpos",			"8"			},
   { "menu.scrollbar.ypos",			"10"			},
@@ -4273,10 +4442,10 @@ struct ConfigInfo image_config[] =
   { "door_2.step_delay",			"10"			},
   { "door_2.anim_mode",				"default"		},
 
-  { "[player].boring_delay_fixed",		"-1"			},
-  { "[player].boring_delay_random",		"-1"			},
-  { "[player].sleeping_delay_fixed",		"-1"			},
-  { "[player].sleeping_delay_random",		"-1"			},
+  { "[player].boring_delay_fixed",		"1000"			},
+  { "[player].boring_delay_random",		"1000"			},
+  { "[player].sleeping_delay_fixed",		"2000"			},
+  { "[player].sleeping_delay_random",		"2000"			},
 
   { NULL,					NULL			}
 };