X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=74ef40841d4376de60d9ebf8a4d4d3e189984f38;hb=73dd81c85be90e466493bcc6f45c402d29bc7f20;hp=67bc7ca05e8dae8de41cdbe840e6af2ac3efa85a;hpb=e022833f95e7c9a16e6f122e42b6e3c67fc685e9;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 67bc7ca0..74ef4084 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -19,37 +19,42 @@ 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 }, + { ".scale_up_factor", ARG_UNDEFINED, TYPE_INTEGER }, + + { NULL, NULL, 0 } }; struct ConfigInfo image_config[] = @@ -166,46 +171,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 +191,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 +437,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 +548,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 +694,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" }, @@ -889,7 +941,7 @@ struct ConfigInfo image_config[] = { "bug.moving.down.delay", "4" }, { "bug.moving.down.offset", "128" }, { "bug.turning_from_right.up", "RocksMore.pcx" }, - { "bug.turning_from_right.up.xpos", "1" }, + { "bug.turning_from_right.up.xpos", "0" }, { "bug.turning_from_right.up.ypos", "6" }, { "bug.turning_from_right.up.frames", "4" }, { "bug.turning_from_right.up.delay", "2" }, @@ -925,13 +977,13 @@ struct ConfigInfo image_config[] = { "bug.turning_from_up.right.delay", "2" }, { "bug.turning_from_up.right.anim_mode", "linear" }, { "bug.turning_from_left.up", "RocksMore.pcx" }, - { "bug.turning_from_left.up.xpos", "12" }, + { "bug.turning_from_left.up.xpos", "13" }, { "bug.turning_from_left.up.ypos", "6" }, { "bug.turning_from_left.up.frames", "4" }, { "bug.turning_from_left.up.delay", "2" }, { "bug.turning_from_left.up.anim_mode", "linear" }, { "bug.turning_from_down.left", "RocksMore.pcx" }, - { "bug.turning_from_down.left.xpos", "8" }, + { "bug.turning_from_down.left.xpos", "9" }, { "bug.turning_from_down.left.ypos", "6" }, { "bug.turning_from_down.left.frames", "4" }, { "bug.turning_from_down.left.delay", "2" }, @@ -983,7 +1035,7 @@ struct ConfigInfo image_config[] = { "spaceship.moving.down.delay", "4" }, { "spaceship.moving.down.offset", "128" }, { "spaceship.turning_from_right.up", "RocksMore.pcx" }, - { "spaceship.turning_from_right.up.xpos", "1" }, + { "spaceship.turning_from_right.up.xpos", "0" }, { "spaceship.turning_from_right.up.ypos", "5" }, { "spaceship.turning_from_right.up.frames", "4" }, { "spaceship.turning_from_right.up.delay", "2" }, @@ -1019,13 +1071,13 @@ struct ConfigInfo image_config[] = { "spaceship.turning_from_up.right.delay", "2" }, { "spaceship.turning_from_up.right.anim_mode","linear" }, { "spaceship.turning_from_left.up", "RocksMore.pcx" }, - { "spaceship.turning_from_left.up.xpos", "12" }, + { "spaceship.turning_from_left.up.xpos", "13" }, { "spaceship.turning_from_left.up.ypos", "5" }, { "spaceship.turning_from_left.up.frames", "4" }, { "spaceship.turning_from_left.up.delay", "2" }, { "spaceship.turning_from_left.up.anim_mode", "linear" }, { "spaceship.turning_from_down.left", "RocksMore.pcx" }, - { "spaceship.turning_from_down.left.xpos", "8" }, + { "spaceship.turning_from_down.left.xpos", "9" }, { "spaceship.turning_from_down.left.ypos", "5" }, { "spaceship.turning_from_down.left.frames", "4" }, { "spaceship.turning_from_down.left.delay", "2" }, @@ -1347,18 +1399,21 @@ struct ConfigInfo image_config[] = { "emc_steelwall_1.xpos", "14" }, { "emc_steelwall_1.ypos", "0" }, { "emc_steelwall_1.frames", "1" }, - { "emc_steelwall_2", "RocksDC.pcx" }, - { "emc_steelwall_2.xpos", "14" }, - { "emc_steelwall_2.ypos", "0" }, + { "emc_steelwall_2", "emc_object.pcx" }, + { "emc_steelwall_2.xpos", "25" }, + { "emc_steelwall_2.ypos", "20" }, { "emc_steelwall_2.frames", "1" }, - { "emc_steelwall_3", "RocksDC.pcx" }, - { "emc_steelwall_3.xpos", "14" }, - { "emc_steelwall_3.ypos", "0" }, + { "emc_steelwall_2.scale_up_factor", "2" }, + { "emc_steelwall_3", "emc_object.pcx" }, + { "emc_steelwall_3.xpos", "25" }, + { "emc_steelwall_3.ypos", "21" }, { "emc_steelwall_3.frames", "1" }, - { "emc_steelwall_4", "RocksDC.pcx" }, - { "emc_steelwall_4.xpos", "14" }, - { "emc_steelwall_4.ypos", "0" }, + { "emc_steelwall_3.scale_up_factor", "2" }, + { "emc_steelwall_4", "emc_object.pcx" }, + { "emc_steelwall_4.xpos", "25" }, + { "emc_steelwall_4.ypos", "22" }, { "emc_steelwall_4.frames", "1" }, + { "emc_steelwall_4.scale_up_factor", "2" }, { "emc_wall_1", "RocksDC.pcx" }, { "emc_wall_1.xpos", "13" }, @@ -1388,10 +1443,11 @@ struct ConfigInfo image_config[] = { "emc_wall_7.xpos", "15" }, { "emc_wall_7.ypos", "2" }, { "emc_wall_7.frames", "1" }, - { "emc_wall_8", "RocksDC.pcx" }, - { "emc_wall_8.xpos", "14" }, - { "emc_wall_8.ypos", "1" }, + { "emc_wall_8", "emc_object.pcx" }, + { "emc_wall_8.xpos", "25" }, + { "emc_wall_8.ypos", "31" }, { "emc_wall_8.frames", "1" }, + { "emc_wall_8.scale_up_factor", "2" }, /* images for Diamond Caves style elements and actions */ @@ -3150,12 +3206,214 @@ 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" }, + + { "balloon_switch_none", "emc_object.pcx" }, + { "balloon_switch_none.xpos", "24" }, + { "balloon_switch_none.ypos", "23" }, + { "balloon_switch_none.frames", "1" }, + { "balloon_switch_none.scale_up_factor", "2" }, + + { "emc_android", "emc_object.pcx" }, + { "emc_android.xpos", "7" }, + { "emc_android.ypos", "13" }, + { "emc_android.frames", "1" }, + { "emc_android.scale_up_factor", "2" }, + + { "emc_grass", "emc_object.pcx" }, + { "emc_grass.xpos", "20" }, + { "emc_grass.ypos", "5" }, + { "emc_grass.frames", "1" }, + { "emc_grass.scale_up_factor", "2" }, + + { "emc_magic_ball", "emc_object.pcx" }, + { "emc_magic_ball.xpos", "22" }, + { "emc_magic_ball.ypos", "18" }, + { "emc_magic_ball.frames", "1" }, + { "emc_magic_ball.scale_up_factor", "2" }, + + { "emc_magic_ball_switch", "emc_object.pcx" }, + { "emc_magic_ball_switch.xpos", "25" }, + { "emc_magic_ball_switch.ypos", "10" }, + { "emc_magic_ball_switch.frames", "1" }, + { "emc_magic_ball_switch.scale_up_factor", "2" }, + + { "emc_gate_5", "emc_object.pcx" }, + { "emc_gate_5.xpos", "24" }, + { "emc_gate_5.ypos", "6" }, + { "emc_gate_5.frames", "1" }, + { "emc_gate_5.scale_up_factor", "2" }, + { "emc_gate_5_gray", "emc_object.pcx" }, + { "emc_gate_5_gray.xpos", "25" }, + { "emc_gate_5_gray.ypos", "18" }, + { "emc_gate_5_gray.frames", "1" }, + { "emc_gate_5_gray.scale_up_factor", "2" }, + { "emc_gate_6", "emc_object.pcx" }, + { "emc_gate_6.xpos", "24" }, + { "emc_gate_6.ypos", "7" }, + { "emc_gate_6.frames", "1" }, + { "emc_gate_6.scale_up_factor", "2" }, + { "emc_gate_6_gray", "emc_object.pcx" }, + { "emc_gate_6_gray.xpos", "25" }, + { "emc_gate_6_gray.ypos", "18" }, + { "emc_gate_6_gray.frames", "1" }, + { "emc_gate_6_gray.scale_up_factor", "2" }, + { "emc_gate_7", "emc_object.pcx" }, + { "emc_gate_7.xpos", "24" }, + { "emc_gate_7.ypos", "8" }, + { "emc_gate_7.frames", "1" }, + { "emc_gate_7.scale_up_factor", "2" }, + { "emc_gate_7_gray", "emc_object.pcx" }, + { "emc_gate_7_gray.xpos", "25" }, + { "emc_gate_7_gray.ypos", "18" }, + { "emc_gate_7_gray.frames", "1" }, + { "emc_gate_7_gray.scale_up_factor", "2" }, + { "emc_gate_8", "emc_object.pcx" }, + { "emc_gate_8.xpos", "24" }, + { "emc_gate_8.ypos", "9" }, + { "emc_gate_8.frames", "1" }, + { "emc_gate_8.scale_up_factor", "2" }, + { "emc_gate_8_gray", "emc_object.pcx" }, + { "emc_gate_8_gray.xpos", "25" }, + { "emc_gate_8_gray.ypos", "18" }, + { "emc_gate_8_gray.frames", "1" }, + { "emc_gate_8_gray.scale_up_factor", "2" }, + + { "emc_key_5", "emc_object.pcx" }, + { "emc_key_5.xpos", "24" }, + { "emc_key_5.ypos", "14" }, + { "emc_key_5.frames", "1" }, + { "emc_key_5.scale_up_factor", "2" }, + { "emc_key_6", "emc_object.pcx" }, + { "emc_key_6.xpos", "24" }, + { "emc_key_6.ypos", "15" }, + { "emc_key_6.frames", "1" }, + { "emc_key_6.scale_up_factor", "2" }, + { "emc_key_7", "emc_object.pcx" }, + { "emc_key_7.xpos", "24" }, + { "emc_key_7.ypos", "16" }, + { "emc_key_7.frames", "1" }, + { "emc_key_7.scale_up_factor", "2" }, + { "emc_key_8", "emc_object.pcx" }, + { "emc_key_8.xpos", "24" }, + { "emc_key_8.ypos", "17" }, + { "emc_key_8.frames", "1" }, + { "emc_key_8.scale_up_factor", "2" }, + + { "emc_bumper", "emc_object.pcx" }, + { "emc_bumper.xpos", "25" }, + { "emc_bumper.ypos", "3" }, + { "emc_bumper.frames", "1" }, + { "emc_bumper.scale_up_factor", "2" }, + + { "emc_plant", "emc_object.pcx" }, + { "emc_plant.xpos", "25" }, + { "emc_plant.ypos", "12" }, + { "emc_plant.frames", "1" }, + { "emc_plant.scale_up_factor", "2" }, + + { "emc_lenses", "emc_object.pcx" }, + { "emc_lenses.xpos", "25" }, + { "emc_lenses.ypos", "13" }, + { "emc_lenses.frames", "1" }, + { "emc_lenses.scale_up_factor", "2" }, + + { "emc_magnifier", "emc_object.pcx" }, + { "emc_magnifier.xpos", "25" }, + { "emc_magnifier.ypos", "14" }, + { "emc_magnifier.frames", "1" }, + { "emc_magnifier.scale_up_factor", "2" }, + + { "emc_wall_9", "emc_object.pcx" }, + { "emc_wall_9.xpos", "26" }, + { "emc_wall_9.ypos", "4" }, + { "emc_wall_9.frames", "1" }, + { "emc_wall_9.scale_up_factor", "2" }, + { "emc_wall_10", "emc_object.pcx" }, + { "emc_wall_10.xpos", "26" }, + { "emc_wall_10.ypos", "5" }, + { "emc_wall_10.frames", "1" }, + { "emc_wall_10.scale_up_factor", "2" }, + { "emc_wall_11", "emc_object.pcx" }, + { "emc_wall_11.xpos", "26" }, + { "emc_wall_11.ypos", "9" }, + { "emc_wall_11.frames", "1" }, + { "emc_wall_11.scale_up_factor", "2" }, + { "emc_wall_12", "emc_object.pcx" }, + { "emc_wall_12.xpos", "26" }, + { "emc_wall_12.ypos", "10" }, + { "emc_wall_12.frames", "1" }, + { "emc_wall_12.scale_up_factor", "2" }, + { "emc_wall_13", "emc_object.pcx" }, + { "emc_wall_13.xpos", "25" }, + { "emc_wall_13.ypos", "23" }, + { "emc_wall_13.frames", "1" }, + { "emc_wall_13.scale_up_factor", "2" }, + { "emc_wall_14", "emc_object.pcx" }, + { "emc_wall_14.xpos", "25" }, + { "emc_wall_14.ypos", "24" }, + { "emc_wall_14.frames", "1" }, + { "emc_wall_14.scale_up_factor", "2" }, + { "emc_wall_15", "emc_object.pcx" }, + { "emc_wall_15.xpos", "25" }, + { "emc_wall_15.ypos", "25" }, + { "emc_wall_15.frames", "1" }, + { "emc_wall_15.scale_up_factor", "2" }, + { "emc_wall_16", "emc_object.pcx" }, + { "emc_wall_16.xpos", "25" }, + { "emc_wall_16.ypos", "26" }, + { "emc_wall_16.frames", "1" }, + { "emc_wall_16.scale_up_factor", "2" }, + + { "emc_wall_slippery_1", "emc_object.pcx" }, + { "emc_wall_slippery_1.xpos", "25" }, + { "emc_wall_slippery_1.ypos", "27" }, + { "emc_wall_slippery_1.frames", "1" }, + { "emc_wall_slippery_1.scale_up_factor", "2" }, + { "emc_wall_slippery_2", "emc_object.pcx" }, + { "emc_wall_slippery_2.xpos", "25" }, + { "emc_wall_slippery_2.ypos", "28" }, + { "emc_wall_slippery_2.frames", "1" }, + { "emc_wall_slippery_2.scale_up_factor", "2" }, + { "emc_wall_slippery_3", "emc_object.pcx" }, + { "emc_wall_slippery_3.xpos", "25" }, + { "emc_wall_slippery_3.ypos", "29" }, + { "emc_wall_slippery_3.frames", "1" }, + { "emc_wall_slippery_3.scale_up_factor", "2" }, + { "emc_wall_slippery_4", "emc_object.pcx" }, + { "emc_wall_slippery_4.xpos", "25" }, + { "emc_wall_slippery_4.ypos", "30" }, + { "emc_wall_slippery_4.frames", "1" }, + { "emc_wall_slippery_4.scale_up_factor", "2" }, + #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! */ + /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */ + + { "emc_object", "emc_object.pcx" }, + { "emc_object.scale_up_factor", "2" }, + + { "emc_sprite", "emc_sprite.pcx" }, + { "emc_sprite.scale_up_factor", "2" }, + { "toon_1", "RocksToons.pcx" }, { "toon_1.x", "2" }, { "toon_1.y", "72" }, @@ -3697,6 +3955,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 +3993,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 } };