X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=62bdab0e6b827bcab7f6064e5c66f425adb41425;hp=b810bce8c3e7ffdbbd01160f8706ce8ff70b16da;hb=HEAD;hpb=4de7503bef2712180fe8c86a89a0a7c281a5fe96 diff --git a/src/conf_gfx.c b/src/conf_gfx.c index b810bce8..62bdab0e 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -82,10 +82,15 @@ struct ConfigTypeInfo image_config_suffix[] = { ".sort_priority", ARG_UNDEFINED, TYPE_INTEGER }, { ".class", ARG_UNDEFINED, TYPE_STRING }, { ".style", ARG_UNDEFINED, TYPE_STRING }, + { ".alpha", ARG_UNDEFINED, TYPE_INTEGER }, { ".active_xoffset", "0", TYPE_INTEGER }, { ".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 } }; @@ -5051,6 +5056,12 @@ struct ConfigInfo image_config[] = { "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" }, @@ -5134,6 +5145,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" }, @@ -5213,6 +5234,23 @@ struct ConfigInfo image_config[] = { "mm_pacman.eating.down.ypos", "4" }, { "mm_pacman.eating.down.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", "0" }, { "[mm_default].exploding.ypos", "8" }, @@ -5743,6 +5781,94 @@ 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" }, + + { "df_mirror_fixed_1", "RocksDF.png" }, + { "df_mirror_fixed_1.xpos", "0" }, + { "df_mirror_fixed_1.ypos", "10" }, + { "df_mirror_fixed_1.frames", "1" }, + { "df_mirror_fixed_2", "RocksDF.png" }, + { "df_mirror_fixed_2.xpos", "1" }, + { "df_mirror_fixed_2.ypos", "10" }, + { "df_mirror_fixed_2.frames", "1" }, + { "df_mirror_fixed_3", "RocksDF.png" }, + { "df_mirror_fixed_3.xpos", "2" }, + { "df_mirror_fixed_3.ypos", "10" }, + { "df_mirror_fixed_3.frames", "1" }, + { "df_mirror_fixed_4", "RocksDF.png" }, + { "df_mirror_fixed_4.xpos", "3" }, + { "df_mirror_fixed_4.ypos", "10" }, + { "df_mirror_fixed_4.frames", "1" }, + { "df_mirror_fixed_5", "RocksDF.png" }, + { "df_mirror_fixed_5.xpos", "4" }, + { "df_mirror_fixed_5.ypos", "10" }, + { "df_mirror_fixed_5.frames", "1" }, + { "df_mirror_fixed_6", "RocksDF.png" }, + { "df_mirror_fixed_6.xpos", "5" }, + { "df_mirror_fixed_6.ypos", "10" }, + { "df_mirror_fixed_6.frames", "1" }, + { "df_mirror_fixed_7", "RocksDF.png" }, + { "df_mirror_fixed_7.xpos", "6" }, + { "df_mirror_fixed_7.ypos", "10" }, + { "df_mirror_fixed_7.frames", "1" }, + { "df_mirror_fixed_8", "RocksDF.png" }, + { "df_mirror_fixed_8.xpos", "7" }, + { "df_mirror_fixed_8.ypos", "10" }, + { "df_mirror_fixed_8.frames", "1" }, + { "df_mirror_fixed_9", "RocksDF.png" }, + { "df_mirror_fixed_9.xpos", "8" }, + { "df_mirror_fixed_9.ypos", "10" }, + { "df_mirror_fixed_9.frames", "1" }, + { "df_mirror_fixed_10", "RocksDF.png" }, + { "df_mirror_fixed_10.xpos", "9" }, + { "df_mirror_fixed_10.ypos", "10" }, + { "df_mirror_fixed_10.frames", "1" }, + { "df_mirror_fixed_11", "RocksDF.png" }, + { "df_mirror_fixed_11.xpos", "10" }, + { "df_mirror_fixed_11.ypos", "10" }, + { "df_mirror_fixed_11.frames", "1" }, + { "df_mirror_fixed_12", "RocksDF.png" }, + { "df_mirror_fixed_12.xpos", "11" }, + { "df_mirror_fixed_12.ypos", "10" }, + { "df_mirror_fixed_12.frames", "1" }, + { "df_mirror_fixed_13", "RocksDF.png" }, + { "df_mirror_fixed_13.xpos", "12" }, + { "df_mirror_fixed_13.ypos", "10" }, + { "df_mirror_fixed_13.frames", "1" }, + { "df_mirror_fixed_14", "RocksDF.png" }, + { "df_mirror_fixed_14.xpos", "13" }, + { "df_mirror_fixed_14.ypos", "10" }, + { "df_mirror_fixed_14.frames", "1" }, + { "df_mirror_fixed_15", "RocksDF.png" }, + { "df_mirror_fixed_15.xpos", "14" }, + { "df_mirror_fixed_15.ypos", "10" }, + { "df_mirror_fixed_15.frames", "1" }, + { "df_mirror_fixed_16", "RocksDF.png" }, + { "df_mirror_fixed_16.xpos", "15" }, + { "df_mirror_fixed_16.ypos", "10" }, + { "df_mirror_fixed_16.frames", "1" }, + + { "df_slope_1", "RocksDF.png" }, + { "df_slope_1.xpos", "0" }, + { "df_slope_1.ypos", "11" }, + { "df_slope_1.frames", "1" }, + { "df_slope_2", "RocksDF.png" }, + { "df_slope_2.xpos", "1" }, + { "df_slope_2.ypos", "11" }, + { "df_slope_2.frames", "1" }, + { "df_slope_3", "RocksDF.png" }, + { "df_slope_3.xpos", "2" }, + { "df_slope_3.ypos", "11" }, + { "df_slope_3.frames", "1" }, + { "df_slope_4", "RocksDF.png" }, + { "df_slope_4.xpos", "3" }, + { "df_slope_4.ypos", "11" }, + { "df_slope_4.frames", "1" }, // (these are only defined as elements to support ".PANEL" definitions) { "graphic_1", UNDEFINED_FILENAME }, @@ -6174,8 +6300,10 @@ struct ConfigInfo image_config[] = { "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.collecting" }, + { "menu.button_levelset_info.active.clone_from", "envelope_1" }, { "menu.button_switch_ecs_aga", UNDEFINED_FILENAME }, { "menu.button_switch_ecs_aga.active", UNDEFINED_FILENAME }, @@ -6292,6 +6420,13 @@ struct ConfigInfo image_config[] = { "gfx.game.button.load.height", "30" }, { "gfx.game.button.load.pressed_xoffset", "-100" }, + { "gfx.game.button.restart", "RocksDoor2.png" }, + { "gfx.game.button.restart.x", "200" }, + { "gfx.game.button.restart.y", "50" }, + { "gfx.game.button.restart.width", "30" }, + { "gfx.game.button.restart.height", "30" }, + { "gfx.game.button.restart.pressed_xoffset", "30" }, + { "gfx.game.button.sound_music", "RocksDoor.png" }, { "gfx.game.button.sound_music.x", "305" }, { "gfx.game.button.sound_music.y", "245" }, @@ -6317,6 +6452,7 @@ struct ConfigInfo image_config[] = { "gfx.game.button.panel_stop", UNDEFINED_FILENAME }, { "gfx.game.button.panel_pause", UNDEFINED_FILENAME }, { "gfx.game.button.panel_play", UNDEFINED_FILENAME }, + { "gfx.game.button.panel_restart", UNDEFINED_FILENAME }, { "gfx.game.button.panel_sound_music", UNDEFINED_FILENAME }, { "gfx.game.button.panel_sound_loops", UNDEFINED_FILENAME }, @@ -6336,6 +6472,13 @@ struct ConfigInfo image_config[] = { "gfx.game.button.touch_pause.pressed_xoffset", "-200" }, { "gfx.game.button.touch_pause.active_yoffset", "60" }, + { "gfx.game.button.touch_restart", "RocksTouch.png" }, + { "gfx.game.button.touch_restart.x", "210" }, + { "gfx.game.button.touch_restart.y", "240" }, + { "gfx.game.button.touch_restart.width", "60" }, + { "gfx.game.button.touch_restart.height", "60" }, + { "gfx.game.button.touch_restart.pressed_xoffset", "-200" }, + { "gfx.tape.button.eject", "RocksDoor.png" }, { "gfx.tape.button.eject.x", "305" }, { "gfx.tape.button.eject.y", "357" }, @@ -6730,6 +6873,8 @@ struct ConfigInfo image_config[] = { "font.request.y", "210" }, { "font.request.width", "14" }, { "font.request.height", "14" }, + { "font.request_narrow", UNDEFINED_FILENAME }, + { "font.request_narrow.clone_from", "font.text_1.DOOR" }, { "font.input_1", "RocksFontSmall.png" }, { "font.input_1.x", "0" }, @@ -8037,6 +8182,10 @@ struct ConfigInfo image_config[] = { "menu.list_size.INFO[ELEMENTS]", "-1" }, { "menu.list_size.SETUP", "-1" }, + { "menu.list_entry_size.INFO[ELEMENTS]", "-1" }, + + { "menu.tile_size.INFO[ELEMENTS]", "-1" }, + { "menu.left_spacing.SCOREINFO", "16" }, { "menu.left_spacing.INFO", "16" }, { "menu.left_spacing.INFO[TITLE]", "16" }, @@ -8048,6 +8197,8 @@ struct ConfigInfo image_config[] = { "menu.left_spacing.INFO[LEVELSET]", "16" }, { "menu.left_spacing.SETUP[INPUT]", "16" }, + { "menu.middle_spacing.INFO[ELEMENTS]", "16" }, + { "menu.right_spacing.SCOREINFO", "16" }, { "menu.right_spacing.INFO", "16" }, { "menu.right_spacing.INFO[TITLE]", "16" }, @@ -8128,7 +8279,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" }, @@ -9597,6 +9748,8 @@ struct ConfigInfo image_config[] = { "game.button.pause2.y", "-1" }, { "game.button.load.x", "-1" }, { "game.button.load.y", "-1" }, + { "game.button.restart.x", "-1" }, + { "game.button.restart.y", "-1" }, { "game.button.sound_music.x", "5" }, { "game.button.sound_music.y", "245" }, { "game.button.sound_loops.x", "35" }, @@ -9610,6 +9763,8 @@ struct ConfigInfo image_config[] = { "game.button.panel_pause.y", "-1" }, { "game.button.panel_play.x", "-1" }, { "game.button.panel_play.y", "-1" }, + { "game.button.panel_restart.x", "-1" }, + { "game.button.panel_restart.y", "-1" }, { "game.button.panel_sound_music.x", "-1" }, { "game.button.panel_sound_music.y", "-1" }, { "game.button.panel_sound_loops.x", "-1" }, @@ -9621,6 +9776,8 @@ struct ConfigInfo image_config[] = { "game.button.touch_stop.y", "0" }, { "game.button.touch_pause.x", "-60" }, { "game.button.touch_pause.y", "0" }, + { "game.button.touch_restart.x", "-1" }, + { "game.button.touch_restart.y", "-1" }, { "tape.button.eject.x", "5" }, { "tape.button.eject.y", "77" }, @@ -9936,15 +10093,17 @@ struct ConfigInfo image_config[] = { "request.anim_mode", "default" }, { "request.align", "center" }, { "request.valign", "middle" }, - { "request.draw_order", "0" }, { "request.autowrap", "false" }, { "request.centered", "true" }, { "request.wrap_single_words", "true" }, + { "request.draw_order", "-1" }, { "global.use_envelope_request", "false" }, { "game.graphics_engine_version", "-1" }, { "game.forced_scroll_delay_value", "-1" }, + { "game.forced_scroll_x", ARG_UNDEFINED }, + { "game.forced_scroll_y", ARG_UNDEFINED }, { "game.use_native_emc_graphics_engine", "false" }, { "game.use_native_sp_graphics_engine", "true" }, { "game.use_masked_pushing", "false" },