X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=3bd3223f096da4b3e149e708c5e4cd29b7a89e50;hb=86b0ea5594dc5a9db7ac5d71fa2b7487a4fc1f9d;hp=9fa20b787f5b844e015311bd468436632ead9597;hpb=c145af8280c5ad22978e42621bbe5c0f3a8ada3c;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 9fa20b78..3bd3223f 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -37,6 +37,8 @@ struct ConfigInfo image_config_suffix[] = { ".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 }, { ".step_offset", "4", TYPE_INTEGER }, { ".step_delay", "1", TYPE_INTEGER }, { ".direction", ARG_UNDEFINED, TYPE_STRING }, @@ -67,10 +69,6 @@ struct ConfigInfo image_config[] = { "bd_rock.EDITOR", "RocksDC.pcx" }, { "bd_rock.EDITOR.xpos", "14" }, { "bd_rock.EDITOR.ypos", "14" }, - { "bd_rock.falling", "RocksDC.pcx" }, - { "bd_rock.falling.xpos", "12" }, - { "bd_rock.falling.ypos", "10" }, - { "bd_rock.falling.frames", "1" }, { "bd_rock.moving.left", "RocksDC.pcx" }, { "bd_rock.moving.left.xpos", "12" }, { "bd_rock.moving.left.ypos", "10" }, @@ -83,6 +81,18 @@ struct ConfigInfo image_config[] = { "bd_rock.moving.right.frames", "4" }, { "bd_rock.moving.right.start_frame", "1" }, { "bd_rock.moving.right.delay", "2" }, + { "bd_rock.pushing.left", "RocksDC.pcx" }, + { "bd_rock.pushing.left.xpos", "12" }, + { "bd_rock.pushing.left.ypos", "10" }, + { "bd_rock.pushing.left.frames", "4" }, + { "bd_rock.pushing.left.delay", "2" }, + { "bd_rock.pushing.left.anim_mode", "reverse" }, + { "bd_rock.pushing.right", "RocksDC.pcx" }, + { "bd_rock.pushing.right.xpos", "12" }, + { "bd_rock.pushing.right.ypos", "10" }, + { "bd_rock.pushing.right.frames", "4" }, + { "bd_rock.pushing.right.start_frame", "1" }, + { "bd_rock.pushing.right.delay", "2" }, { "bd_diamond", "RocksElements.pcx" }, { "bd_diamond.xpos", "0" }, @@ -208,6 +218,13 @@ struct ConfigInfo image_config[] = /* images for Supaplex style elements and actions */ + { "[sp_default].exploding", "RocksSP.pcx" }, + { "[sp_default].exploding.xpos", "8" }, + { "[sp_default].exploding.ypos", "3" }, + { "[sp_default].exploding.frames", "8" }, + { "[sp_default].exploding.delay", "3" }, + { "[sp_default].exploding.anim_mode", "linear" }, + { "sp_empty_space", "RocksSP.pcx" }, { "sp_empty_space.xpos", "0" }, { "sp_empty_space.ypos", "0" }, @@ -217,10 +234,6 @@ struct ConfigInfo image_config[] = { "sp_zonk.xpos", "1" }, { "sp_zonk.ypos", "0" }, { "sp_zonk.frames", "1" }, - { "sp_zonk.falling", "RocksSP.pcx" }, - { "sp_zonk.falling.xpos", "1" }, - { "sp_zonk.falling.ypos", "0" }, - { "sp_zonk.falling.frames", "1" }, { "sp_zonk.moving.left", "RocksSP.pcx" }, { "sp_zonk.moving.left.xpos", "0" }, { "sp_zonk.moving.left.ypos", "6" }, @@ -233,6 +246,18 @@ struct ConfigInfo image_config[] = { "sp_zonk.moving.right.frames", "4" }, { "sp_zonk.moving.right.start_frame", "1" }, { "sp_zonk.moving.right.delay", "2" }, + { "sp_zonk.pushing.left", "RocksSP.pcx" }, + { "sp_zonk.pushing.left.xpos", "0" }, + { "sp_zonk.pushing.left.ypos", "6" }, + { "sp_zonk.pushing.left.frames", "4" }, + { "sp_zonk.pushing.left.delay", "2" }, + { "sp_zonk.pushing.left.anim_mode", "reverse" }, + { "sp_zonk.pushing.right", "RocksSP.pcx" }, + { "sp_zonk.pushing.right.xpos", "0" }, + { "sp_zonk.pushing.right.ypos", "6" }, + { "sp_zonk.pushing.right.frames", "4" }, + { "sp_zonk.pushing.right.start_frame", "1" }, + { "sp_zonk.pushing.right.delay", "2" }, { "sp_base", "RocksSP.pcx" }, { "sp_base.xpos", "2" }, @@ -316,10 +341,6 @@ struct ConfigInfo image_config[] = { "sp_infotron.EDITOR", "RocksSP.pcx" }, { "sp_infotron.EDITOR.xpos", "8" }, { "sp_infotron.EDITOR.ypos", "11" }, - { "sp_infotron.falling", "RocksSP.pcx" }, - { "sp_infotron.falling.xpos", "4" }, - { "sp_infotron.falling.ypos", "0" }, - { "sp_infotron.falling.frames", "1" }, { "sp_chip_single", "RocksSP.pcx" }, { "sp_chip_single.xpos", "5" }, @@ -376,23 +397,11 @@ struct ConfigInfo image_config[] = { "sp_disk_orange.xpos", "0" }, { "sp_disk_orange.ypos", "1" }, { "sp_disk_orange.frames", "1" }, - { "sp_disk_orange.falling", "RocksSP.pcx" }, - { "sp_disk_orange.falling.xpos", "0" }, - { "sp_disk_orange.falling.ypos", "1" }, - { "sp_disk_orange.falling.frames", "1" }, - { "sp_disk_orange.pushing", "RocksSP.pcx" }, - { "sp_disk_orange.pushing.xpos", "0" }, - { "sp_disk_orange.pushing.ypos", "1" }, - { "sp_disk_orange.pushing.frames", "1" }, { "sp_disk_yellow", "RocksSP.pcx" }, { "sp_disk_yellow.xpos", "2" }, { "sp_disk_yellow.ypos", "2" }, { "sp_disk_yellow.frames", "1" }, - { "sp_disk_yellow.pushing", "RocksSP.pcx" }, - { "sp_disk_yellow.pushing.xpos", "2" }, - { "sp_disk_yellow.pushing.ypos", "2" }, - { "sp_disk_yellow.pushing.frames", "1" }, { "sp_disk_red", "RocksSP.pcx" }, { "sp_disk_red.xpos", "4" }, @@ -485,6 +494,12 @@ struct ConfigInfo image_config[] = { "sp_electron.EDITOR", "RocksSP.pcx" }, { "sp_electron.EDITOR.xpos", "10" }, { "sp_electron.EDITOR.ypos", "11" }, + { "sp_electron.exploding", "RocksSP.pcx" }, + { "sp_electron.exploding.xpos", "8" }, + { "sp_electron.exploding.ypos", "4" }, + { "sp_electron.exploding.frames", "8" }, + { "sp_electron.exploding.delay", "3" }, + { "sp_electron.exploding.anim_mode", "linear" }, { "sp_terminal", "RocksSP.pcx" }, { "sp_terminal.xpos", "0" }, @@ -542,19 +557,6 @@ struct ConfigInfo image_config[] = { "sp_hardware_base_6.ypos", "4" }, { "sp_hardware_base_6.frames", "1" }, - { "sp_explosion", "RocksSP.pcx" }, - { "sp_explosion.xpos", "8" }, - { "sp_explosion.ypos", "3" }, - { "sp_explosion.frames", "8" }, - { "sp_explosion.delay", "3" }, - { "sp_explosion.anim_mode", "linear" }, - { "sp_explosion_infotron", "RocksSP.pcx" }, - { "sp_explosion_infotron.xpos", "8" }, - { "sp_explosion_infotron.ypos", "4" }, - { "sp_explosion_infotron.frames", "8" }, - { "sp_explosion.delay", "3" }, - { "sp_explosion.anim_mode", "linear" }, - /* images for Sokoban style elements and actions */ { "sokoban_object", "RocksElements.pcx" }, @@ -582,10 +584,14 @@ struct ConfigInfo image_config[] = { "empty_space.ypos", "0" }, { "empty_space.frames", "1" }, - { "sand", "RocksMore.pcx" }, + { "sand", "RocksElements.pcx" }, { "sand.xpos", "0" }, - { "sand.ypos", "2" }, + { "sand.ypos", "0" }, { "sand.frames", "1" }, + { "sand.CRUMBLED", "RocksElements.pcx" }, + { "sand.CRUMBLED.xpos", "1" }, + { "sand.CRUMBLED.ypos", "0" }, + { "sand.CRUMBLED.frames", "1" }, { "sand.digging.left", "RocksMore.pcx" }, { "sand.digging.left.xpos", "6" }, { "sand.digging.left.ypos", "3" }, @@ -610,43 +616,40 @@ struct ConfigInfo image_config[] = { "sand.digging.down.frames", "3" }, { "sand.digging.down.delay", "2" }, { "sand.digging.down.anim_mode", "linear" }, - { "sand_crumbled", "RocksMore.pcx" }, - { "sand_crumbled.xpos", "1" }, - { "sand_crumbled.ypos", "2" }, - { "sand_crumbled.frames", "1" }, - { "sand_crumbled.digging.left", "RocksMore.pcx" }, - { "sand_crumbled.digging.left.xpos", "6" }, - { "sand_crumbled.digging.left.ypos", "0" }, - { "sand_crumbled.digging.left.frames", "3" }, - { "sand_crumbled.digging.left.delay", "2" }, - { "sand_crumbled.digging.left.anim_mode", "linear" }, - { "sand_crumbled.digging.right", "RocksMore.pcx" }, - { "sand_crumbled.digging.right.xpos", "9" }, - { "sand_crumbled.digging.right.ypos", "0" }, - { "sand_crumbled.digging.right.frames", "3" }, - { "sand_crumbled.digging.right.delay", "2" }, - { "sand_crumbled.digging.right.anim_mode", "linear" }, - { "sand_crumbled.digging.up", "RocksMore.pcx" }, - { "sand_crumbled.digging.up.xpos", "0" }, - { "sand_crumbled.digging.up.ypos", "0" }, - { "sand_crumbled.digging.up.frames", "3" }, - { "sand_crumbled.digging.up.delay", "2" }, - { "sand_crumbled.digging.up.anim_mode", "linear" }, - { "sand_crumbled.digging.down", "RocksMore.pcx" }, - { "sand_crumbled.digging.down.xpos", "3" }, - { "sand_crumbled.digging.down.ypos", "0" }, - { "sand_crumbled.digging.down.frames", "3" }, - { "sand_crumbled.digging.down.delay", "2" }, - { "sand_crumbled.digging.down.anim_mode", "linear" }, + { "sand.digging.left.CRUMBLED", "RocksMore.pcx" }, + { "sand.digging.left.CRUMBLED.xpos", "6" }, + { "sand.digging.left.CRUMBLED.ypos", "0" }, + { "sand.digging.left.CRUMBLED.frames", "3" }, + { "sand.digging.left.CRUMBLED.delay", "2" }, + { "sand.digging.left.CRUMBLED.anim_mode", "linear" }, + { "sand.digging.right.CRUMBLED", "RocksMore.pcx" }, + { "sand.digging.right.CRUMBLED.xpos", "9" }, + { "sand.digging.right.CRUMBLED.ypos", "0" }, + { "sand.digging.right.CRUMBLED.frames", "3" }, + { "sand.digging.right.CRUMBLED.delay", "2" }, + { "sand.digging.right.CRUMBLED.anim_mode", "linear" }, + { "sand.digging.up.CRUMBLED", "RocksMore.pcx" }, + { "sand.digging.up.CRUMBLED.xpos", "0" }, + { "sand.digging.up.CRUMBLED.ypos", "0" }, + { "sand.digging.up.CRUMBLED.frames", "3" }, + { "sand.digging.up.CRUMBLED.delay", "2" }, + { "sand.digging.up.CRUMBLED.anim_mode", "linear" }, + { "sand.digging.down.CRUMBLED", "RocksMore.pcx" }, + { "sand.digging.down.CRUMBLED.xpos", "3" }, + { "sand.digging.down.CRUMBLED.ypos", "0" }, + { "sand.digging.down.CRUMBLED.frames", "3" }, + { "sand.digging.down.CRUMBLED.delay", "2" }, + { "sand.digging.down.CRUMBLED.anim_mode", "linear" }, { "wall", "RocksElements.pcx" }, { "wall.xpos", "5" }, { "wall.ypos", "0" }, { "wall.frames", "1" }, - { "wall_crumbled", "RocksElements.pcx" }, - { "wall_crumbled.xpos", "6" }, - { "wall_crumbled.ypos", "0" }, - { "wall_crumbled.frames", "1" }, + + { "wall_slippery", "RocksElements.pcx" }, + { "wall_slippery.xpos", "6" }, + { "wall_slippery.ypos", "0" }, + { "wall_slippery.frames", "1" }, { "steelwall", "RocksElements.pcx" }, { "steelwall.xpos", "4" }, @@ -657,10 +660,6 @@ struct ConfigInfo image_config[] = { "rock.xpos", "12" }, { "rock.ypos", "0" }, { "rock.frames", "1" }, - { "rock.falling", "RocksElements.pcx" }, - { "rock.falling.xpos", "12" }, - { "rock.falling.ypos", "0" }, - { "rock.falling.frames", "1" }, { "rock.moving.left", "RocksElements.pcx" }, { "rock.moving.left.xpos", "12" }, { "rock.moving.left.ypos", "0" }, @@ -673,6 +672,18 @@ struct ConfigInfo image_config[] = { "rock.moving.right.frames", "4" }, { "rock.moving.right.start_frame", "1" }, { "rock.moving.right.delay", "2" }, + { "rock.pushing.left", "RocksElements.pcx" }, + { "rock.pushing.left.xpos", "12" }, + { "rock.pushing.left.ypos", "0" }, + { "rock.pushing.left.frames", "4" }, + { "rock.pushing.left.delay", "2" }, + { "rock.pushing.left.anim_mode", "reverse" }, + { "rock.pushing.right", "RocksElements.pcx" }, + { "rock.pushing.right.xpos", "12" }, + { "rock.pushing.right.ypos", "0" }, + { "rock.pushing.right.frames", "4" }, + { "rock.pushing.right.start_frame", "1" }, + { "rock.pushing.right.delay", "2" }, { "emerald", "RocksElements.pcx" }, { "emerald.xpos", "8" }, @@ -725,18 +736,6 @@ struct ConfigInfo image_config[] = { "nut.xpos", "12" }, { "nut.ypos", "1" }, { "nut.frames", "1" }, - { "nut.falling", "RocksElements.pcx" }, - { "nut.falling.xpos", "12" }, - { "nut.falling.ypos", "1" }, - { "nut.falling.frames", "1" }, - { "nut.moving.left", "RocksElements.pcx" }, - { "nut.moving.left.xpos", "12" }, - { "nut.moving.left.ypos", "1" }, - { "nut.moving.left.frames", "1" }, - { "nut.moving.right", "RocksElements.pcx" }, - { "nut.moving.right.xpos", "12" }, - { "nut.moving.right.ypos", "1" }, - { "nut.moving.right.frames", "1" }, { "nut.breaking", "RocksElements.pcx" }, { "nut.breaking.xpos", "13" }, { "nut.breaking.ypos", "1" }, @@ -1137,7 +1136,12 @@ struct ConfigInfo image_config[] = { "balloon.moving.frames", "4" }, { "balloon.moving.anim_mode", "pingpong" }, { "balloon.moving.delay", "2" }, - + { "balloon.pushing", "RocksDC.pcx" }, + { "balloon.pushing.xpos", "12" }, + { "balloon.pushing.ypos", "7" }, + { "balloon.pushing.frames", "4" }, + { "balloon.pushing.anim_mode", "pingpong" }, + { "balloon.pushing.delay", "2" }, { "balloon_switch_left", "RocksDC.pcx" }, { "balloon_switch_left.xpos", "8" }, { "balloon_switch_left.ypos", "7" }, @@ -1163,10 +1167,6 @@ struct ConfigInfo image_config[] = { "spring.xpos", "8" }, { "spring.ypos", "13" }, { "spring.frames", "1" }, - { "spring.moving", "RocksDC.pcx" }, - { "spring.moving.xpos", "8" }, - { "spring.moving.ypos", "13" }, - { "spring.moving.frames", "1" }, { "emc_steelwall_1", "RocksDC.pcx" }, { "emc_steelwall_1.xpos", "14" }, @@ -1462,11 +1462,12 @@ struct ConfigInfo image_config[] = { "landmine.xpos", "7" }, { "landmine.ypos", "14" }, { "landmine.frames", "1" }, + { "landmine.crumbled_like", "sand" }, - { "steelwall_slanted", "RocksDC.pcx" }, - { "steelwall_slanted.xpos", "5" }, - { "steelwall_slanted.ypos", "15" }, - { "steelwall_slanted.frames", "1" }, + { "steelwall_slippery", "RocksDC.pcx" }, + { "steelwall_slippery.xpos", "5" }, + { "steelwall_slippery.ypos", "15" }, + { "steelwall_slippery.frames", "1" }, { "extra_time", "RocksDC.pcx" }, { "extra_time.xpos", "8" }, @@ -1625,12 +1626,15 @@ struct ConfigInfo image_config[] = { "trap.xpos", "12" }, { "trap.ypos", "8" }, { "trap.frames", "1" }, + { "trap.crumbled_like", "sand" }, + { "trap.diggable_like", "sand" }, { "trap.active", "RocksDC.pcx" }, { "trap.active.xpos", "12" }, { "trap.active.ypos", "8" }, { "trap.active.frames", "4" }, { "trap.active.delay", "4" }, { "trap.active.anim_mode", "pingpong2" }, + { "trap.active.crumbled_like", "sand" }, { "dx_supabomb", "RocksDC.pcx" }, { "dx_supabomb.xpos", "15" }, @@ -1921,30 +1925,50 @@ struct ConfigInfo image_config[] = { "dark_yamyam.frames", "4" }, { "dark_yamyam.anim_mode", "pingpong2" }, + { "dynabomb", "RocksElements.pcx" }, + { "dynabomb.xpos", "12" }, + { "dynabomb.ypos", "11" }, + { "dynabomb.frames", "1" }, { "dynabomb.active", "RocksElements.pcx" }, { "dynabomb.active.xpos", "12" }, { "dynabomb.active.ypos", "11" }, { "dynabomb.active.frames", "4" }, { "dynabomb.active.delay", "6" }, { "dynabomb.active.anim_mode", "pingpong" }, + { "dynabomb_player_1", "RocksElements.pcx" }, + { "dynabomb_player_1.xpos", "12" }, + { "dynabomb_player_1.ypos", "11" }, + { "dynabomb_player_1.frames", "1" }, { "dynabomb_player_1.active", "RocksElements.pcx" }, { "dynabomb_player_1.active.xpos", "12" }, { "dynabomb_player_1.active.ypos", "11" }, { "dynabomb_player_1.active.frames", "4" }, { "dynabomb_player_1.active.delay", "6" }, { "dynabomb_player_1.active.anim_mode", "pingpong" }, + { "dynabomb_player_2", "RocksElements.pcx" }, + { "dynabomb_player_2.xpos", "12" }, + { "dynabomb_player_2.ypos", "11" }, + { "dynabomb_player_2.frames", "1" }, { "dynabomb_player_2.active", "RocksElements.pcx" }, { "dynabomb_player_2.active.xpos", "12" }, { "dynabomb_player_2.active.ypos", "11" }, { "dynabomb_player_2.active.frames", "4" }, { "dynabomb_player_2.active.delay", "6" }, { "dynabomb_player_2.active.anim_mode", "pingpong" }, + { "dynabomb_player_3", "RocksElements.pcx" }, + { "dynabomb_player_3.xpos", "12" }, + { "dynabomb_player_3.ypos", "11" }, + { "dynabomb_player_3.frames", "1" }, { "dynabomb_player_3.active", "RocksElements.pcx" }, { "dynabomb_player_3.active.xpos", "12" }, { "dynabomb_player_3.active.ypos", "11" }, { "dynabomb_player_3.active.frames", "4" }, { "dynabomb_player_3.active.delay", "6" }, { "dynabomb_player_3.active.anim_mode", "pingpong" }, + { "dynabomb_player_4", "RocksElements.pcx" }, + { "dynabomb_player_4.xpos", "12" }, + { "dynabomb_player_4.ypos", "11" }, + { "dynabomb_player_4.frames", "1" }, { "dynabomb_player_4.active", "RocksElements.pcx" }, { "dynabomb_player_4.active.xpos", "12" }, { "dynabomb_player_4.active.ypos", "11" }, @@ -2191,13 +2215,8 @@ struct ConfigInfo image_config[] = { "satellite.xpos", "8" }, { "satellite.ypos", "9" }, { "satellite.frames", "8" }, - { "satellite.moving.delay", "2" }, - { "satellite.moving", "RocksHeroes.pcx" }, - { "satellite.moving.xpos", "8" }, - { "satellite.moving.ypos", "9" }, - { "satellite.moving.frames", "8" }, - { "satellite.moving.delay", "2" }, - { "satellite.moving.global_sync", "true" }, + { "satellite.delay", "2" }, + { "satellite.global_sync", "true" }, { "flames_1_left", "RocksHeroes.pcx" }, { "flames_1_left.xpos", "8" }, @@ -2798,12 +2817,12 @@ struct ConfigInfo image_config[] = { "player_4.snapping.right.ypos", "10" }, { "player_4.snapping.right.frames", "1" }, - { "explosion", "RocksElements.pcx" }, - { "explosion.xpos", "0" }, - { "explosion.ypos", "4" }, - { "explosion.frames", "8" }, - { "explosion.delay", "2" }, - { "explosion.anim_mode", "linear" }, + { "[default].exploding", "RocksElements.pcx" }, + { "[default].exploding.xpos", "0" }, + { "[default].exploding.ypos", "4" }, + { "[default].exploding.frames", "8" }, + { "[default].exploding.delay", "2" }, + { "[default].exploding.anim_mode", "linear" }, { "twinkle_blue", "RocksHeroes.pcx" }, { "twinkle_blue.xpos", "9" }, @@ -3244,6 +3263,11 @@ struct ConfigInfo image_config[] = { "font.text_1.PREVIEW.y", "160" }, { "font.text_1.PREVIEW.width", "16" }, { "font.text_1.PREVIEW.height", "16" }, + { "font.text_1.PLAYING", "RocksFontEM.pcx" }, + { "font.text_1.PLAYING.x", "0" }, + { "font.text_1.PLAYING.y", "160" }, + { "font.text_1.PLAYING.width", "16" }, + { "font.text_1.PLAYING.height", "16" }, { "font.text_1.SCORES", "RocksFontMedium.pcx" }, { "font.text_1.SCORES.x", "0" }, { "font.text_1.SCORES.y", "480" }, @@ -3445,7 +3469,12 @@ struct ConfigInfo image_config[] = { "menu.draw_xoffset.SETUP", "0" }, { "menu.draw_yoffset.SETUP", "0" }, + { "menu.scrollbar_xoffset", "0" }, + { "menu.list_size", "-1" }, + { "menu.list_size.LEVELS", "-1" }, + { "menu.list_size.SCORES", "-1" }, + { "menu.list_size.INFO", "-1" }, { "door.step_offset", "2" }, { "door.step_delay", "10" },