X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=ada412c6c52b19b6b7dc0028bf31427fb30fa4fa;hb=c5b6de1f19f2c87f70b208794375b284e035cb80;hp=36d9ddbfd2f9696df101577ec8dbfc2137f97770;hpb=3607ef8e4000754063935d908053d564de92c0a2;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 36d9ddbf..ada412c6 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -21,35 +21,39 @@ struct ConfigInfo image_config_suffix[] = { - { ".x", ARG_UNDEFINED, TYPE_INTEGER }, - { ".y", ARG_UNDEFINED, TYPE_INTEGER }, - { ".xpos", ARG_UNDEFINED, TYPE_INTEGER }, - { ".ypos", ARG_UNDEFINED, TYPE_INTEGER }, - { ".width", ARG_UNDEFINED, TYPE_INTEGER }, - { ".height", ARG_UNDEFINED, TYPE_INTEGER }, - { ".offset", ARG_UNDEFINED, TYPE_INTEGER }, - { ".vertical", "false", TYPE_BOOLEAN }, - { ".xoffset", ARG_UNDEFINED, TYPE_INTEGER }, - { ".yoffset", ARG_UNDEFINED, TYPE_INTEGER }, - { ".frames", ARG_UNDEFINED, TYPE_INTEGER }, - { ".frames_per_line", ARG_UNDEFINED, TYPE_INTEGER }, - { ".start_frame", ARG_UNDEFINED, TYPE_INTEGER }, - { ".delay", "1", TYPE_INTEGER }, - { ".anim_mode", ARG_UNDEFINED, TYPE_STRING }, - { ".global_sync", "false", TYPE_BOOLEAN }, - { ".crumbled_like", ARG_UNDEFINED, TYPE_TOKEN }, - { ".diggable_like", ARG_UNDEFINED, TYPE_TOKEN }, - { ".border_size", ARG_UNDEFINED, TYPE_INTEGER }, - { ".step_offset", "4", TYPE_INTEGER }, - { ".step_delay", "1", TYPE_INTEGER }, - { ".direction", ARG_UNDEFINED, TYPE_STRING }, - { ".position", ARG_UNDEFINED, TYPE_STRING }, - { ".draw_xoffset", "0", TYPE_INTEGER }, - { ".draw_yoffset", "0", TYPE_INTEGER }, - { ".draw_masked", "false", TYPE_BOOLEAN }, - { ".name", ARG_UNDEFINED, TYPE_STRING }, - - { NULL, NULL, 0 } + { ".x", ARG_UNDEFINED, TYPE_INTEGER }, + { ".y", ARG_UNDEFINED, TYPE_INTEGER }, + { ".xpos", ARG_UNDEFINED, TYPE_INTEGER }, + { ".ypos", ARG_UNDEFINED, TYPE_INTEGER }, + { ".width", ARG_UNDEFINED, TYPE_INTEGER }, + { ".height", ARG_UNDEFINED, TYPE_INTEGER }, + { ".offset", ARG_UNDEFINED, TYPE_INTEGER }, + { ".vertical", "false", TYPE_BOOLEAN }, + { ".xoffset", ARG_UNDEFINED, TYPE_INTEGER }, + { ".yoffset", ARG_UNDEFINED, TYPE_INTEGER }, + { ".frames", ARG_UNDEFINED, TYPE_INTEGER }, + { ".frames_per_line", ARG_UNDEFINED, TYPE_INTEGER }, + { ".start_frame", ARG_UNDEFINED, TYPE_INTEGER }, + { ".delay", "1", TYPE_INTEGER }, + { ".anim_mode", ARG_UNDEFINED, TYPE_STRING }, + { ".global_sync", "false", TYPE_BOOLEAN }, + { ".crumbled_like", ARG_UNDEFINED, TYPE_TOKEN }, + { ".diggable_like", ARG_UNDEFINED, TYPE_TOKEN }, + { ".border_size", ARG_UNDEFINED, TYPE_INTEGER }, + { ".step_offset", "4", TYPE_INTEGER }, + { ".step_delay", "1", TYPE_INTEGER }, + { ".direction", ARG_UNDEFINED, TYPE_STRING }, + { ".position", ARG_UNDEFINED, TYPE_STRING }, + { ".draw_xoffset", "0", TYPE_INTEGER }, + { ".draw_yoffset", "0", TYPE_INTEGER }, + { ".draw_masked", "false", TYPE_BOOLEAN }, + { ".anim_delay_fixed", ARG_UNDEFINED, TYPE_INTEGER }, + { ".anim_delay_random", ARG_UNDEFINED, TYPE_INTEGER }, + { ".post_delay_fixed", ARG_UNDEFINED, TYPE_INTEGER }, + { ".post_delay_random", ARG_UNDEFINED, TYPE_INTEGER }, + { ".name", ARG_UNDEFINED, TYPE_STRING }, + + { NULL, NULL, 0 } }; struct ConfigInfo image_config[] = @@ -432,21 +436,89 @@ struct ConfigInfo image_config[] = { "sp_port_any.ypos", "2" }, { "sp_port_any.frames", "1" }, { "sp_gravity_port_right", "RocksSP.pcx" }, - { "sp_gravity_port_right.xpos", "5" }, + { "sp_gravity_port_right.xpos", "1" }, { "sp_gravity_port_right.ypos", "1" }, { "sp_gravity_port_right.frames", "1" }, + { "sp_gravity_port_right.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_port_right.EDITOR.xpos", "5" }, + { "sp_gravity_port_right.EDITOR.ypos", "1" }, { "sp_gravity_port_down", "RocksSP.pcx" }, - { "sp_gravity_port_down.xpos", "6" }, + { "sp_gravity_port_down.xpos", "2" }, { "sp_gravity_port_down.ypos", "1" }, { "sp_gravity_port_down.frames", "1" }, + { "sp_gravity_port_down.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_port_down.EDITOR.xpos", "6" }, + { "sp_gravity_port_down.EDITOR.ypos", "1" }, { "sp_gravity_port_left", "RocksSP.pcx" }, - { "sp_gravity_port_left.xpos", "7" }, + { "sp_gravity_port_left.xpos", "3" }, { "sp_gravity_port_left.ypos", "1" }, { "sp_gravity_port_left.frames", "1" }, + { "sp_gravity_port_left.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_port_left.EDITOR.xpos", "7" }, + { "sp_gravity_port_left.EDITOR.ypos", "1" }, { "sp_gravity_port_up", "RocksSP.pcx" }, - { "sp_gravity_port_up.xpos", "0" }, - { "sp_gravity_port_up.ypos", "2" }, + { "sp_gravity_port_up.xpos", "4" }, + { "sp_gravity_port_up.ypos", "1" }, { "sp_gravity_port_up.frames", "1" }, + { "sp_gravity_port_up.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_port_up.EDITOR.xpos", "0" }, + { "sp_gravity_port_up.EDITOR.ypos", "2" }, + { "sp_gravity_on_port_right", "RocksSP.pcx" }, + { "sp_gravity_on_port_right.xpos", "1" }, + { "sp_gravity_on_port_right.ypos", "1" }, + { "sp_gravity_on_port_right.frames", "1" }, + { "sp_gravity_on_port_right.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_on_port_right.EDITOR.xpos", "5" }, + { "sp_gravity_on_port_right.EDITOR.ypos", "1" }, + { "sp_gravity_on_port_down", "RocksSP.pcx" }, + { "sp_gravity_on_port_down.xpos", "2" }, + { "sp_gravity_on_port_down.ypos", "1" }, + { "sp_gravity_on_port_down.frames", "1" }, + { "sp_gravity_on_port_down.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_on_port_down.EDITOR.xpos", "6" }, + { "sp_gravity_on_port_down.EDITOR.ypos", "1" }, + { "sp_gravity_on_port_left", "RocksSP.pcx" }, + { "sp_gravity_on_port_left.xpos", "3" }, + { "sp_gravity_on_port_left.ypos", "1" }, + { "sp_gravity_on_port_left.frames", "1" }, + { "sp_gravity_on_port_left.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_on_port_left.EDITOR.xpos", "7" }, + { "sp_gravity_on_port_left.EDITOR.ypos", "1" }, + { "sp_gravity_on_port_up", "RocksSP.pcx" }, + { "sp_gravity_on_port_up.xpos", "4" }, + { "sp_gravity_on_port_up.ypos", "1" }, + { "sp_gravity_on_port_up.frames", "1" }, + { "sp_gravity_on_port_up.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_on_port_up.EDITOR.xpos", "0" }, + { "sp_gravity_on_port_up.EDITOR.ypos", "2" }, + { "sp_gravity_off_port_right", "RocksSP.pcx" }, + { "sp_gravity_off_port_right.xpos", "1" }, + { "sp_gravity_off_port_right.ypos", "1" }, + { "sp_gravity_off_port_right.frames", "1" }, + { "sp_gravity_off_port_right.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_off_port_right.EDITOR.xpos", "5" }, + { "sp_gravity_off_port_right.EDITOR.ypos", "1" }, + { "sp_gravity_off_port_down", "RocksSP.pcx" }, + { "sp_gravity_off_port_down.xpos", "2" }, + { "sp_gravity_off_port_down.ypos", "1" }, + { "sp_gravity_off_port_down.frames", "1" }, + { "sp_gravity_off_port_down.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_off_port_down.EDITOR.xpos", "6" }, + { "sp_gravity_off_port_down.EDITOR.ypos", "1" }, + { "sp_gravity_off_port_left", "RocksSP.pcx" }, + { "sp_gravity_off_port_left.xpos", "3" }, + { "sp_gravity_off_port_left.ypos", "1" }, + { "sp_gravity_off_port_left.frames", "1" }, + { "sp_gravity_off_port_left.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_off_port_left.EDITOR.xpos", "7" }, + { "sp_gravity_off_port_left.EDITOR.ypos", "1" }, + { "sp_gravity_off_port_up", "RocksSP.pcx" }, + { "sp_gravity_off_port_up.xpos", "4" }, + { "sp_gravity_off_port_up.ypos", "1" }, + { "sp_gravity_off_port_up.frames", "1" }, + { "sp_gravity_off_port_up.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_off_port_up.EDITOR.xpos", "0" }, + { "sp_gravity_off_port_up.EDITOR.ypos", "2" }, { "sp_sniksnak", "RocksSP.pcx" }, { "sp_sniksnak.xpos", "1" }, @@ -533,7 +605,8 @@ struct ConfigInfo image_config[] = { "sp_electron.xpos", "8" }, { "sp_electron.ypos", "10" }, { "sp_electron.frames", "8" }, - { "sp_electron.delay", "2" }, + { "sp_electron.delay", "4" }, + { "sp_electron.global_sync", "true" }, { "sp_electron.EDITOR", "RocksSP.pcx" }, { "sp_electron.EDITOR.xpos", "10" }, { "sp_electron.EDITOR.ypos", "11" }, @@ -620,6 +693,14 @@ struct ConfigInfo image_config[] = { "sokoban_field_full.ypos", "7" }, { "sokoban_field_full.frames", "1" }, + { "sokoban_field_player", "RocksHeroes.pcx" }, + { "sokoban_field_player.xpos", "0" }, + { "sokoban_field_player.ypos", "15" }, + { "sokoban_field_player.frames", "1" }, + { "sokoban_field_player.EDITOR", "RocksHeroes.pcx" }, + { "sokoban_field_player.EDITOR.xpos", "1" }, + { "sokoban_field_player.EDITOR.ypos", "15" }, + /* images for Emerald Mine style elements and actions */ { "empty_space", "RocksSP.pcx" }, @@ -3120,8 +3201,24 @@ struct ConfigInfo image_config[] = { "arrow_down.ypos", "8" }, { "arrow_down.frames", "1" }, + { "unknown", "RocksFontEM.pcx" }, + { "unknown.xpos", "15" }, + { "unknown.ypos", "1" }, + { "unknown.frames", "1" }, + + { "trigger_element", "RocksDC.pcx" }, + { "trigger_element.xpos", "15" }, + { "trigger_element.ypos", "14" }, + { "trigger_element.frames", "1" }, + + { "trigger_player", "RocksDC.pcx" }, + { "trigger_player.xpos", "15" }, + { "trigger_player.ypos", "13" }, + { "trigger_player.frames", "1" }, + #include "conf_chr.c" /* include auto-generated data structure definitions */ #include "conf_cus.c" /* include auto-generated data structure definitions */ +#include "conf_grp.c" /* include auto-generated data structure definitions */ /* images not associated to game elements (used for menu screens etc.) */ /* keyword to stop parser: "NO_MORE_ELEMENT_IMAGES" <-- do not change! */ @@ -3667,6 +3764,7 @@ struct ConfigInfo image_config[] = { "background.SCORES", UNDEFINED_FILENAME }, { "background.EDITOR", UNDEFINED_FILENAME }, { "background.INFO", UNDEFINED_FILENAME }, + { "background.INFO[ELEMENTS]", UNDEFINED_FILENAME }, { "background.SETUP", UNDEFINED_FILENAME }, { "background.DOOR", UNDEFINED_FILENAME }, @@ -3704,5 +3802,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" }, + { NULL, NULL } };