X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=5e5e998c845256443718becc8759e2b1dd569dc5;hb=216566521353a144d859e1d93d326934996d85a0;hp=1b9fd4ee5ff2fcc296ca78abd0d7197f486d98bd;hpb=42164ca7e4355ad0d1590a3539be2719c2e8c9e6;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 1b9fd4ee..5e5e998c 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -19,37 +19,41 @@ reliable default values. If that value is GFX_ARG_UNDEFINED, it will be dynamically determined, using some of the other list values. */ -struct ConfigInfo image_config_suffix[] = +struct ConfigTypeInfo 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[] = @@ -166,46 +170,19 @@ struct ConfigInfo image_config[] = { "bd_butterfly.frames", "2" }, { "bd_butterfly.anim_mode", "pingpong" }, { "bd_butterfly.delay", "4" }, - { "bd_butterfly.right", "RocksElements.pcx" }, - { "bd_butterfly.right.xpos", "4" }, - { "bd_butterfly.right.ypos", "12" }, - { "bd_butterfly.right.frames", "2" }, - { "bd_butterfly.right.anim_mode", "pingpong" }, - { "bd_butterfly.right.delay", "4" }, + { "bd_butterfly.global_sync", "true" }, { "bd_butterfly.right.EDITOR", "RocksElements.pcx" }, { "bd_butterfly.right.EDITOR.xpos", "8" }, { "bd_butterfly.right.EDITOR.ypos", "12" }, - { "bd_butterfly.right.EDITOR.frames", "1" }, - { "bd_butterfly.up", "RocksElements.pcx" }, - { "bd_butterfly.up.xpos", "4" }, - { "bd_butterfly.up.ypos", "12" }, - { "bd_butterfly.up.frames", "2" }, - { "bd_butterfly.up.anim_mode", "pingpong" }, - { "bd_butterfly.up.delay", "4" }, { "bd_butterfly.up.EDITOR", "RocksElements.pcx" }, { "bd_butterfly.up.EDITOR.xpos", "9" }, { "bd_butterfly.up.EDITOR.ypos", "12" }, - { "bd_butterfly.up.EDITOR.frames", "1" }, - { "bd_butterfly.left", "RocksElements.pcx" }, - { "bd_butterfly.left.xpos", "4" }, - { "bd_butterfly.left.ypos", "12" }, - { "bd_butterfly.left.frames", "2" }, - { "bd_butterfly.left.anim_mode", "pingpong" }, - { "bd_butterfly.left.delay", "4" }, { "bd_butterfly.left.EDITOR", "RocksElements.pcx" }, { "bd_butterfly.left.EDITOR.xpos", "10" }, { "bd_butterfly.left.EDITOR.ypos", "12" }, - { "bd_butterfly.left.EDITOR.frames", "1" }, - { "bd_butterfly.down", "RocksElements.pcx" }, - { "bd_butterfly.down.xpos", "4" }, - { "bd_butterfly.down.ypos", "12" }, - { "bd_butterfly.down.frames", "2" }, - { "bd_butterfly.down.anim_mode", "pingpong" }, - { "bd_butterfly.down.delay", "4" }, { "bd_butterfly.down.EDITOR", "RocksElements.pcx" }, { "bd_butterfly.down.EDITOR.xpos", "11" }, { "bd_butterfly.down.EDITOR.ypos", "12" }, - { "bd_butterfly.down.EDITOR.frames", "1" }, { "bd_firefly", "RocksElements.pcx" }, { "bd_firefly.xpos", "6" }, @@ -213,46 +190,19 @@ struct ConfigInfo image_config[] = { "bd_firefly.frames", "2" }, { "bd_firefly.anim_mode", "pingpong" }, { "bd_firefly.delay", "4" }, - { "bd_firefly.right", "RocksElements.pcx" }, - { "bd_firefly.right.xpos", "6" }, - { "bd_firefly.right.ypos", "12" }, - { "bd_firefly.right.frames", "2" }, - { "bd_firefly.right.anim_mode", "pingpong" }, - { "bd_firefly.right.delay", "4" }, + { "bd_firefly.global_sync", "true" }, { "bd_firefly.right.EDITOR", "RocksElements.pcx" }, { "bd_firefly.right.EDITOR.xpos", "12" }, { "bd_firefly.right.EDITOR.ypos", "12" }, - { "bd_firefly.right.EDITOR.frames", "1" }, - { "bd_firefly.up", "RocksElements.pcx" }, - { "bd_firefly.up.xpos", "6" }, - { "bd_firefly.up.ypos", "12" }, - { "bd_firefly.up.frames", "2" }, - { "bd_firefly.up.anim_mode", "pingpong" }, - { "bd_firefly.up.delay", "4" }, { "bd_firefly.up.EDITOR", "RocksElements.pcx" }, { "bd_firefly.up.EDITOR.xpos", "13" }, { "bd_firefly.up.EDITOR.ypos", "12" }, - { "bd_firefly.up.EDITOR.frames", "1" }, - { "bd_firefly.left", "RocksElements.pcx" }, - { "bd_firefly.left.xpos", "6" }, - { "bd_firefly.left.ypos", "12" }, - { "bd_firefly.left.frames", "2" }, - { "bd_firefly.left.anim_mode", "pingpong" }, - { "bd_firefly.left.delay", "4" }, { "bd_firefly.left.EDITOR", "RocksElements.pcx" }, { "bd_firefly.left.EDITOR.xpos", "14" }, { "bd_firefly.left.EDITOR.ypos", "12" }, - { "bd_firefly.left.EDITOR.frames", "1" }, - { "bd_firefly.down", "RocksElements.pcx" }, - { "bd_firefly.down.xpos", "6" }, - { "bd_firefly.down.ypos", "12" }, - { "bd_firefly.down.frames", "2" }, - { "bd_firefly.down.anim_mode", "pingpong" }, - { "bd_firefly.down.delay", "4" }, { "bd_firefly.down.EDITOR", "RocksElements.pcx" }, { "bd_firefly.down.EDITOR.xpos", "15" }, { "bd_firefly.down.EDITOR.ypos", "12" }, - { "bd_firefly.down.EDITOR.frames", "1" }, /* images for Supaplex style elements and actions */ @@ -486,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" }, @@ -529,41 +547,66 @@ struct ConfigInfo image_config[] = { "sp_sniksnak.turning_from_left.up", "RocksSP.pcx" }, { "sp_sniksnak.turning_from_left.up.xpos", "12" }, { "sp_sniksnak.turning_from_left.up.ypos", "6" }, - { "sp_sniksnak.turning_from_left.up.frames", "1" }, + { "sp_sniksnak.turning_from_left.up.frames", "2" }, + { "sp_sniksnak.turning_from_left.up.delay", "4" }, + { "sp_sniksnak.turning_from_left.up.offset", "1408" }, + { "sp_sniksnak.turning_from_left.up.anim_mode","linear" }, { "sp_sniksnak.turning_from_left.down", "RocksSP.pcx" }, { "sp_sniksnak.turning_from_left.down.xpos", "13" }, { "sp_sniksnak.turning_from_left.down.ypos", "6" }, - { "sp_sniksnak.turning_from_left.down.frames","1" }, + { "sp_sniksnak.turning_from_left.down.frames","2" }, + { "sp_sniksnak.turning_from_left.down.delay", "4" }, + { "sp_sniksnak.turning_from_left.down.offset","1504" }, + { "sp_sniksnak.turning_from_left.down.anim_mode","linear" }, { "sp_sniksnak.turning_from_right.up", "RocksSP.pcx" }, { "sp_sniksnak.turning_from_right.up.xpos", "15" }, { "sp_sniksnak.turning_from_right.up.ypos", "6" }, - { "sp_sniksnak.turning_from_right.up.frames", "1" }, + { "sp_sniksnak.turning_from_right.up.frames", "2" }, + { "sp_sniksnak.turning_from_right.up.delay", "4" }, + { "sp_sniksnak.turning_from_right.up.offset", "1312" }, + { "sp_sniksnak.turning_from_right.up.anim_mode","linear" }, { "sp_sniksnak.turning_from_right.down", "RocksSP.pcx" }, { "sp_sniksnak.turning_from_right.down.xpos", "14" }, { "sp_sniksnak.turning_from_right.down.ypos", "6" }, - { "sp_sniksnak.turning_from_right.down.frames","1" }, + { "sp_sniksnak.turning_from_right.down.frames","2" }, + { "sp_sniksnak.turning_from_right.down.delay","4" }, + { "sp_sniksnak.turning_from_right.down.offset","1472" }, + { "sp_sniksnak.turning_from_right.down.anim_mode","linear" }, { "sp_sniksnak.turning_from_up.left", "RocksSP.pcx" }, { "sp_sniksnak.turning_from_up.left.xpos", "12" }, { "sp_sniksnak.turning_from_up.left.ypos", "6" }, - { "sp_sniksnak.turning_from_up.left.frames", "1" }, + { "sp_sniksnak.turning_from_up.left.frames", "2" }, + { "sp_sniksnak.turning_from_up.left.delay", "4" }, + { "sp_sniksnak.turning_from_up.left.offset", "896" }, + { "sp_sniksnak.turning_from_up.left.anim_mode","linear" }, { "sp_sniksnak.turning_from_up.right", "RocksSP.pcx" }, { "sp_sniksnak.turning_from_up.right.xpos", "15" }, { "sp_sniksnak.turning_from_up.right.ypos", "6" }, - { "sp_sniksnak.turning_from_up.right.frames", "1" }, + { "sp_sniksnak.turning_from_up.right.frames", "2" }, + { "sp_sniksnak.turning_from_up.right.delay", "4" }, + { "sp_sniksnak.turning_from_up.right.offset", "928" }, + { "sp_sniksnak.turning_from_up.right.anim_mode","linear" }, { "sp_sniksnak.turning_from_down.left", "RocksSP.pcx" }, { "sp_sniksnak.turning_from_down.left.xpos", "13" }, { "sp_sniksnak.turning_from_down.left.ypos", "6" }, - { "sp_sniksnak.turning_from_down.left.frames","1" }, + { "sp_sniksnak.turning_from_down.left.frames","2" }, + { "sp_sniksnak.turning_from_down.left.delay", "4" }, + { "sp_sniksnak.turning_from_down.left.offset","864" }, + { "sp_sniksnak.turning_from_down.left.anim_mode","linear" }, { "sp_sniksnak.turning_from_down.right", "RocksSP.pcx" }, { "sp_sniksnak.turning_from_down.right.xpos", "14" }, { "sp_sniksnak.turning_from_down.right.ypos", "6" }, - { "sp_sniksnak.turning_from_down.right.frames","1" }, + { "sp_sniksnak.turning_from_down.right.frames","2" }, + { "sp_sniksnak.turning_from_down.right.delay","4" }, + { "sp_sniksnak.turning_from_down.right.offset","960" }, + { "sp_sniksnak.turning_from_down.right.anim_mode","linear" }, { "sp_electron", "RocksSP.pcx" }, { "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" }, @@ -650,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" }, @@ -3150,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! */ @@ -3697,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 }, @@ -3734,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 } };