X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=1b6ed53ec9a2538a417cfcf2c80df75bc9ce231e;hb=84c888496c5bf6f9e649882d77400c47634e177a;hp=9d5db3f167eed1e00132329664ae3e82be7069fc;hpb=86d415d483595dc87c7b78991554744c680af740;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 9d5db3f1..1b6ed53e 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -41,6 +41,7 @@ struct ConfigTypeInfo image_config_suffix[] = { ".delay", "1", TYPE_INTEGER }, { ".anim_mode", ARG_UNDEFINED, TYPE_STRING }, { ".global_sync", "false", TYPE_BOOLEAN }, + { ".global_anim_sync", "false", TYPE_BOOLEAN }, { ".crumbled_like", ARG_UNDEFINED, TYPE_ELEMENT }, { ".diggable_like", ARG_UNDEFINED, TYPE_ELEMENT }, { ".border_size", ARG_UNDEFINED, TYPE_INTEGER }, @@ -85,6 +86,10 @@ struct ConfigTypeInfo image_config_suffix[] = { ".active_yoffset", "0", TYPE_INTEGER }, { ".pressed_xoffset", "0", TYPE_INTEGER }, { ".pressed_yoffset", "0", TYPE_INTEGER }, + { ".stacked_xfactor", "1", TYPE_INTEGER }, + { ".stacked_yfactor", "1", TYPE_INTEGER }, + { ".stacked_xoffset", "0", TYPE_INTEGER }, + { ".stacked_yoffset", "0", TYPE_INTEGER }, { NULL, NULL, 0 } }; @@ -5036,20 +5041,26 @@ struct ConfigInfo image_config[] = { "mm_teleporter_blue_16.frames", "1" }, { "mm_kettle", "RocksMM.png" }, - { "mm_kettle.xpos", "12" }, - { "mm_kettle.ypos", "1" }, + { "mm_kettle.xpos", "9" }, + { "mm_kettle.ypos", "8" }, { "mm_kettle.frames", "1" }, { "mm_kettle.exploding", "RocksMM.png" }, - { "mm_kettle.exploding.xpos", "13" }, - { "mm_kettle.exploding.ypos", "1" }, - { "mm_kettle.exploding.frames", "3" }, - { "mm_kettle.exploding.delay", "4" }, + { "mm_kettle.exploding.xpos", "10" }, + { "mm_kettle.exploding.ypos", "8" }, + { "mm_kettle.exploding.frames", "6" }, + { "mm_kettle.exploding.delay", "2" }, { "mm_kettle.exploding.anim_mode", "linear" }, { "mm_bomb", "RocksMM.png" }, { "mm_bomb.xpos", "5" }, { "mm_bomb.ypos", "2" }, { "mm_bomb.frames", "1" }, + { "mm_bomb.active", "RocksMM.png" }, + { "mm_bomb.active.xpos", "12" }, + { "mm_bomb.active.ypos", "1" }, + { "mm_bomb.active.frames", "3" }, + { "mm_bomb.active.delay", "6" }, + { "mm_bomb.active.anim_mode", "pingpong" }, { "mm_prism", "RocksMM.png" }, { "mm_prism.xpos", "0" }, @@ -5069,11 +5080,23 @@ struct ConfigInfo image_config[] = { "mm_steel_lock.xpos", "8" }, { "mm_steel_lock.ypos", "2" }, { "mm_steel_lock.frames", "1" }, + { "mm_steel_lock.exploding", "RocksMM.png" }, + { "mm_steel_lock.exploding.xpos", "4" }, + { "mm_steel_lock.exploding.ypos", "8" }, + { "mm_steel_lock.exploding.frames", "5" }, + { "mm_steel_lock.exploding.delay", "2" }, + { "mm_steel_lock.exploding.anim_mode", "linear" }, { "mm_wooden_lock", "RocksMM.png" }, { "mm_wooden_lock.xpos", "9" }, { "mm_wooden_lock.ypos", "6" }, { "mm_wooden_lock.frames", "1" }, + { "mm_wooden_lock.exploding", "RocksMM.png" }, + { "mm_wooden_lock.exploding.xpos", "4" }, + { "mm_wooden_lock.exploding.ypos", "8" }, + { "mm_wooden_lock.exploding.frames", "5" }, + { "mm_wooden_lock.exploding.delay", "2" }, + { "mm_wooden_lock.exploding.anim_mode", "linear" }, { "mm_steel_block", "RocksMM.png" }, { "mm_steel_block.xpos", "8" }, @@ -5121,6 +5144,16 @@ struct ConfigInfo image_config[] = { "mm_gray_ball.xpos", "15" }, { "mm_gray_ball.ypos", "2" }, { "mm_gray_ball.frames", "1" }, + { "mm_gray_ball.active", "RocksMM.png" }, + { "mm_gray_ball.active.xpos", "15" }, + { "mm_gray_ball.active.ypos", "1" }, + { "mm_gray_ball.active.frames", "2" }, + { "mm_gray_ball.active.delay", "20" }, + { "mm_gray_ball.active.vertical", "true" }, + { "mm_gray_ball.EDITOR", "RocksMM.png" }, + { "mm_gray_ball.EDITOR.xpos", "15" }, + { "mm_gray_ball.EDITOR.ypos", "1" }, + { "mm_gray_ball.EDITOR.frames", "1" }, { "mm_fuel_full", "RocksMM.png" }, { "mm_fuel_full.xpos", "10" }, @@ -5200,53 +5233,26 @@ struct ConfigInfo image_config[] = { "mm_pacman.eating.down.ypos", "4" }, { "mm_pacman.eating.down.frames", "1" }, - { "mm_mask_mcduffin.right", "RocksMM.png" }, - { "mm_mask_mcduffin.right.xpos", "8" }, - { "mm_mask_mcduffin.right.ypos", "8" }, - { "mm_mask_mcduffin.right.frames", "1" }, - { "mm_mask_mcduffin.up", "RocksMM.png" }, - { "mm_mask_mcduffin.up.xpos", "9" }, - { "mm_mask_mcduffin.up.ypos", "8" }, - { "mm_mask_mcduffin.up.frames", "1" }, - { "mm_mask_mcduffin.left", "RocksMM.png" }, - { "mm_mask_mcduffin.left.xpos", "10" }, - { "mm_mask_mcduffin.left.ypos", "8" }, - { "mm_mask_mcduffin.left.frames", "1" }, - { "mm_mask_mcduffin.down", "RocksMM.png" }, - { "mm_mask_mcduffin.down.xpos", "11" }, - { "mm_mask_mcduffin.down.ypos", "8" }, - { "mm_mask_mcduffin.down.frames", "1" }, - - { "mm_mask_grid_1", "RocksMM.png" }, - { "mm_mask_grid_1.xpos", "4" }, - { "mm_mask_grid_1.ypos", "8" }, - { "mm_mask_grid_1.frames", "1" }, - { "mm_mask_grid_2", "RocksMM.png" }, - { "mm_mask_grid_2.xpos", "5" }, - { "mm_mask_grid_2.ypos", "8" }, - { "mm_mask_grid_2.frames", "1" }, - { "mm_mask_grid_3", "RocksMM.png" }, - { "mm_mask_grid_3.xpos", "6" }, - { "mm_mask_grid_3.ypos", "8" }, - { "mm_mask_grid_3.frames", "1" }, - { "mm_mask_grid_4", "RocksMM.png" }, - { "mm_mask_grid_4.xpos", "7" }, - { "mm_mask_grid_4.ypos", "8" }, - { "mm_mask_grid_4.frames", "1" }, - - { "mm_mask_rectangle", "RocksMM.png" }, - { "mm_mask_rectangle.xpos", "1" }, - { "mm_mask_rectangle.ypos", "8" }, - { "mm_mask_rectangle.frames", "1" }, - - { "mm_mask_circle", "RocksMM.png" }, - { "mm_mask_circle.xpos", "0" }, - { "mm_mask_circle.ypos", "8" }, - { "mm_mask_circle.frames", "1" }, + { "mm_envelope_1", UNDEFINED_FILENAME }, + { "mm_envelope_1.clone_from", "envelope_1" }, + { "mm_envelope_1.collecting", UNDEFINED_FILENAME }, + { "mm_envelope_1.collecting.clone_from", "envelope_1.collecting" }, + { "mm_envelope_2", UNDEFINED_FILENAME }, + { "mm_envelope_2.clone_from", "envelope_2" }, + { "mm_envelope_2.collecting", UNDEFINED_FILENAME }, + { "mm_envelope_2.collecting.clone_from", "envelope_2.collecting" }, + { "mm_envelope_3", UNDEFINED_FILENAME }, + { "mm_envelope_3.clone_from", "envelope_3" }, + { "mm_envelope_3.collecting", UNDEFINED_FILENAME }, + { "mm_envelope_3.collecting.clone_from", "envelope_3.collecting" }, + { "mm_envelope_4", UNDEFINED_FILENAME }, + { "mm_envelope_4.clone_from", "envelope_4" }, + { "mm_envelope_4.collecting", UNDEFINED_FILENAME }, + { "mm_envelope_4.collecting.clone_from", "envelope_4.collecting" }, { "[mm_default].exploding", "RocksMM.png" }, - { "[mm_default].exploding.xpos", "8" }, - { "[mm_default].exploding.ypos", "4" }, + { "[mm_default].exploding.xpos", "0" }, + { "[mm_default].exploding.ypos", "8" }, { "[mm_default].exploding.frames", "8" }, { "[mm_default].exploding.delay", "2" }, { "[mm_default].exploding.anim_mode", "linear" }, @@ -5774,6 +5780,12 @@ struct ConfigInfo image_config[] = { "df_mine.xpos", "4" }, { "df_mine.ypos", "8" }, { "df_mine.frames", "1" }, + { "df_mine.active", "RocksDF.png" }, + { "df_mine.active.xpos", "3" }, + { "df_mine.active.ypos", "8" }, + { "df_mine.active.frames", "3" }, + { "df_mine.active.delay", "6" }, + { "df_mine.active.anim_mode", "pingpong" }, // (these are only defined as elements to support ".PANEL" definitions) { "graphic_1", UNDEFINED_FILENAME }, @@ -6155,6 +6167,9 @@ struct ConfigInfo image_config[] = { "menu.button_prev_score.active", UNDEFINED_FILENAME }, { "menu.button_prev_score.active.clone_from", "menu.button_up.active" }, + { "menu.button_play_tape", UNDEFINED_FILENAME }, + { "menu.button_play_tape.clone_from", "gfx.tape.button.play" }, + { "menu.button_name", UNDEFINED_FILENAME }, { "menu.button_name.clone_from", "menu.button" }, { "menu.button_name.active", UNDEFINED_FILENAME }, @@ -6200,6 +6215,13 @@ struct ConfigInfo image_config[] = { "menu.button_play_solution", UNDEFINED_FILENAME }, { "menu.button_play_solution.active", UNDEFINED_FILENAME }, + { "menu.button_levelset_info", UNDEFINED_FILENAME }, + { "menu.button_levelset_info.clone_from", "envelope_1" }, + { "menu.button_levelset_info.pressed", UNDEFINED_FILENAME }, + { "menu.button_levelset_info.pressed.clone_from", "envelope_1.collecting" }, + { "menu.button_levelset_info.active", UNDEFINED_FILENAME }, + { "menu.button_levelset_info.active.clone_from", "envelope_1" }, + { "menu.button_switch_ecs_aga", UNDEFINED_FILENAME }, { "menu.button_switch_ecs_aga.active", UNDEFINED_FILENAME }, @@ -7328,6 +7350,14 @@ struct ConfigInfo image_config[] = { "global.door", "RocksDoor.png" }, + { "global.busy_initial", "RocksBusy.png" }, + { "global.busy_initial.x", "0" }, + { "global.busy_initial.y", "0" }, + { "global.busy_initial.width", "32" }, + { "global.busy_initial.height", "32" }, + { "global.busy_initial.frames", "28" }, + { "global.busy_initial.frames_per_line", "7" }, + { "global.busy_initial.delay", "2" }, { "global.busy", "RocksBusy.png" }, { "global.busy.x", "0" }, { "global.busy.y", "0" }, @@ -7336,6 +7366,14 @@ struct ConfigInfo image_config[] = { "global.busy.frames", "28" }, { "global.busy.frames_per_line", "7" }, { "global.busy.delay", "2" }, + { "global.busy_playfield", "RocksBusy.png" }, + { "global.busy_playfield.x", "0" }, + { "global.busy_playfield.y", "0" }, + { "global.busy_playfield.width", "32" }, + { "global.busy_playfield.height", "32" }, + { "global.busy_playfield.frames", "28" }, + { "global.busy_playfield.frames_per_line", "7" }, + { "global.busy_playfield.delay", "2" }, { "global.tile_cursor", "RocksMore.png" }, { "global.tile_cursor.xpos", "10" }, @@ -7343,6 +7381,8 @@ struct ConfigInfo image_config[] = { "global.tile_cursor.frames", "1" }, { "background", UNDEFINED_FILENAME }, + { "background.LOADING_INITIAL", UNDEFINED_FILENAME }, + { "background.LOADING", UNDEFINED_FILENAME }, { "background.TITLE_INITIAL", UNDEFINED_FILENAME }, { "background.TITLE", UNDEFINED_FILENAME }, { "background.MAIN", UNDEFINED_FILENAME }, @@ -7884,10 +7924,18 @@ struct ConfigInfo image_config[] = { "border.draw_masked_when_fading", "true" }, + { "init.busy_initial.x", "-1" }, + { "init.busy_initial.y", "-1" }, + { "init.busy_initial.align", "center" }, + { "init.busy_initial.valign", "middle" }, { "init.busy.x", "-1" }, { "init.busy.y", "-1" }, { "init.busy.align", "center" }, { "init.busy.valign", "middle" }, + { "init.busy_playfield.x", "-1" }, + { "init.busy_playfield.y", "-1" }, + { "init.busy_playfield.align", "center" }, + { "init.busy_playfield.valign", "middle" }, { "menu.enter_menu.fade_mode", "none" }, { "menu.enter_menu.fade_delay", "250" }, @@ -7912,6 +7960,9 @@ struct ConfigInfo image_config[] = { "menu.enter_screen.SCORES.fade_mode", ARG_DEFAULT }, { "menu.enter_screen.SCORES.fade_delay", ARG_DEFAULT }, { "menu.enter_screen.SCORES.post_delay", ARG_DEFAULT }, + { "menu.enter_screen.SCOREINFO.fade_mode", ARG_DEFAULT }, + { "menu.enter_screen.SCOREINFO.fade_delay", ARG_DEFAULT }, + { "menu.enter_screen.SCOREINFO.post_delay", ARG_DEFAULT }, { "menu.enter_screen.EDITOR.fade_mode", ARG_DEFAULT }, { "menu.enter_screen.EDITOR.fade_delay", ARG_DEFAULT }, { "menu.enter_screen.EDITOR.post_delay", ARG_DEFAULT }, @@ -7929,6 +7980,9 @@ struct ConfigInfo image_config[] = { "menu.leave_screen.SCORES.fade_mode", ARG_DEFAULT }, { "menu.leave_screen.SCORES.fade_delay", ARG_DEFAULT }, { "menu.leave_screen.SCORES.post_delay", ARG_DEFAULT }, + { "menu.leave_screen.SCOREINFO.fade_mode", ARG_DEFAULT }, + { "menu.leave_screen.SCOREINFO.fade_delay", ARG_DEFAULT }, + { "menu.leave_screen.SCOREINFO.post_delay", ARG_DEFAULT }, { "menu.leave_screen.EDITOR.fade_mode", ARG_DEFAULT }, { "menu.leave_screen.EDITOR.fade_delay", ARG_DEFAULT }, { "menu.leave_screen.EDITOR.post_delay", ARG_DEFAULT }, @@ -8028,6 +8082,8 @@ struct ConfigInfo image_config[] = { "menu.list_size.INFO[ELEMENTS]", "-1" }, { "menu.list_size.SETUP", "-1" }, + { "menu.list_entry_size.INFO[ELEMENTS]", "-1" }, + { "menu.left_spacing.SCOREINFO", "16" }, { "menu.left_spacing.INFO", "16" }, { "menu.left_spacing.INFO[TITLE]", "16" }, @@ -8119,7 +8175,7 @@ struct ConfigInfo image_config[] = { "menu.extra_spacing.SCOREINFO", "2" }, { "menu.extra_spacing.INFO", "2" }, { "menu.extra_spacing.INFO[TITLE]", "2" }, - { "menu.extra_spacing.INFO[ELEMENTS]", "2" }, + { "menu.extra_spacing.INFO[ELEMENTS]", "4" }, { "menu.extra_spacing.INFO[MUSIC]", "2" }, { "menu.extra_spacing.INFO[CREDITS]", "2" }, { "menu.extra_spacing.INFO[PROGRAM]", "2" }, @@ -8161,6 +8217,9 @@ struct ConfigInfo image_config[] = { "main.button.play_solution.x", "-1" }, { "main.button.play_solution.y", "-1" }, + { "main.button.levelset_info.x", "-1" }, + { "main.button.levelset_info.y", "-1" }, + { "main.button.switch_ecs_aga.x", "-1" }, { "main.button.switch_ecs_aga.y", "-1" }, @@ -8352,6 +8411,9 @@ struct ConfigInfo image_config[] = { "scores.button.next_score.x", "-1" }, { "scores.button.next_score.y", "-1" }, + { "scores.button.play_tape.x", "-1" }, + { "scores.button.play_tape.y", "-1" }, + { "preview.x", "272" }, { "preview.y", "380" }, { "preview.align", "center" },