X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=01350173d5cdd19027a675dbf7ee84b6208ad362;hb=dc51f089096a0c775d2a03d0b862a14d6ce88d51;hp=2c73309d0a1a0637b31c85689529b536b10f58a7;hpb=3a136f0791c78a64cda6cf9c8afbc70de873ddb4;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 2c73309d..01350173 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -294,8 +294,6 @@ struct ConfigInfo image_config[] = { "bd_amoeba_2", UNDEFINED_FILENAME }, { "bd_amoeba_2.clone_from", "bd_amoeba" }, - { "bd_amoeba_2.EDITOR", UNDEFINED_FILENAME }, - { "bd_amoeba_2.EDITOR.clone_from", "bd_amoeba.EDITOR" }, { "bd_butterfly", "RocksElements.png" }, { "bd_butterfly.xpos", "4" }, @@ -674,9 +672,9 @@ struct ConfigInfo image_config[] = { "bd_inbox.opening.frames", "2" }, { "bd_inbox.opening.delay", "8" }, { "bd_inbox.opening.anim_mode", "reverse" }, - { "bd_inbox.EDITOR", "RocksBD.png" }, - { "bd_inbox.EDITOR.xpos", "2" }, - { "bd_inbox.EDITOR.ypos", "3" }, + { "bd_inbox.EDITOR", "RocksBD2.png" }, + { "bd_inbox.EDITOR.xpos", "0" }, + { "bd_inbox.EDITOR.ypos", "0" }, { "bd_exit_closed", "RocksBD.png" }, { "bd_exit_closed.xpos", "8" }, @@ -735,15 +733,14 @@ struct ConfigInfo image_config[] = { "bd_flying_diamond.ypos", "3" }, { "bd_flying_diamond.frames", "4" }, { "bd_flying_diamond.delay", "4" }, - { "bd_flying_diamond.anim_mode", "reverse" }, { "bd_flying_diamond.moving", "RocksBD.png" }, { "bd_flying_diamond.moving.xpos", "3" }, - { "bd_flying_diamond.moving.ypos", "4" }, + { "bd_flying_diamond.moving.ypos", "3" }, { "bd_flying_diamond.moving.frames", "2" }, { "bd_flying_diamond.moving.delay", "4" }, { "bd_flying_diamond.flying", "RocksBD.png" }, { "bd_flying_diamond.flying.xpos", "3" }, - { "bd_flying_diamond.flying.ypos", "4" }, + { "bd_flying_diamond.flying.ypos", "3" }, { "bd_flying_diamond.flying.frames", "2" }, { "bd_flying_diamond.flying.delay", "4" }, { "bd_flying_diamond.flying.EDITOR", "RocksBD2.png" }, @@ -772,17 +769,17 @@ struct ConfigInfo image_config[] = { "bd_nut.falling.EDITOR.xpos", "5" }, { "bd_nut.falling.EDITOR.ypos", "2" }, - { "bd_bladder", "boulder_rush.png" }, - { "bd_bladder.xpos", "0" }, - { "bd_bladder.ypos", "22" }, - { "bd_bladder.frames", "1" }, - { "bd_bladder.scale_up_factor", "2" }, + { "bd_bladder", "RocksBD.png" }, + { "bd_bladder.xpos", "4" }, + { "bd_bladder.ypos", "11" }, + { "bd_bladder.frames", "4" }, + { "bd_bladder.delay", "4" }, + { "bd_bladder.anim_mode", "pingpong2" }, - { "bd_bladder_spender", "boulder_rush.png" }, - { "bd_bladder_spender.xpos", "6" }, - { "bd_bladder_spender.ypos", "0" }, + { "bd_bladder_spender", "RocksBD.png" }, + { "bd_bladder_spender.xpos", "11" }, + { "bd_bladder_spender.ypos", "10" }, { "bd_bladder_spender.frames", "1" }, - { "bd_bladder_spender.scale_up_factor", "2" }, { "bd_creature_switch", "RocksBD.png" }, { "bd_creature_switch.xpos", "9" }, @@ -813,28 +810,15 @@ struct ConfigInfo image_config[] = { "bd_biter_switch_4.ypos", "4" }, { "bd_biter_switch_4.frames", "1" }, - { "bd_replicator", "boulder_rush.png" }, - { "bd_replicator.xpos", "0" }, - { "bd_replicator.ypos", "38" }, - { "bd_replicator.frames", "1" }, - { "bd_replicator.scale_up_factor", "2" }, - { "bd_replicator.active", "boulder_rush.png" }, - { "bd_replicator.active.xpos", "0" }, - { "bd_replicator.active.ypos", "38" }, - { "bd_replicator.active.frames", "8" }, - { "bd_replicator.active.delay", "2" }, - { "bd_replicator.active.scale_up_factor", "2" }, - - { "bd_replicator_switch", "boulder_rush.png" }, - { "bd_replicator_switch.xpos", "3" }, - { "bd_replicator_switch.ypos", "36" }, - { "bd_replicator_switch.frames", "1" }, - { "bd_replicator_switch.scale_up_factor", "2" }, - { "bd_replicator_switch.active", "boulder_rush.png" }, - { "bd_replicator_switch.active.xpos", "2" }, - { "bd_replicator_switch.active.ypos", "36" }, - { "bd_replicator_switch.active.frames", "1" }, - { "bd_replicator_switch.active.scale_up_factor", "2" }, + { "bd_replicator", UNDEFINED_FILENAME }, + { "bd_replicator.clone_from", "emc_magic_ball" }, + { "bd_replicator.active", UNDEFINED_FILENAME }, + { "bd_replicator.active.clone_from", "emc_magic_ball.active" }, + + { "bd_replicator_switch", UNDEFINED_FILENAME }, + { "bd_replicator_switch.clone_from", "emc_magic_ball_switch" }, + { "bd_replicator_switch.active", UNDEFINED_FILENAME }, + { "bd_replicator_switch.active.clone_from", "emc_magic_ball_switch.active" }, { "bd_conveyor_left", "RocksDC.png" }, { "bd_conveyor_left.xpos", "0" }, @@ -881,22 +865,17 @@ struct ConfigInfo image_config[] = { "bd_conveyor_dir_switch.active.ypos", "2" }, { "bd_conveyor_dir_switch.active.frames", "1" }, - { "bd_gravity_switch", "boulder_rush.png" }, - { "bd_gravity_switch.xpos", "2" }, - { "bd_gravity_switch.ypos", "34" }, + { "bd_gravity_switch", "RocksBD.png" }, + { "bd_gravity_switch.xpos", "8" }, + { "bd_gravity_switch.ypos", "10" }, { "bd_gravity_switch.frames", "1" }, - { "bd_gravity_switch.scale_up_factor", "2" }, - { "bd_gravity_switch.active", "boulder_rush.png" }, - { "bd_gravity_switch.active.xpos", "3" }, - { "bd_gravity_switch.active.ypos", "34" }, + { "bd_gravity_switch.active", "RocksBD.png" }, + { "bd_gravity_switch.active.xpos", "9" }, + { "bd_gravity_switch.active.ypos", "10" }, { "bd_gravity_switch.active.frames", "1" }, - { "bd_gravity_switch.active.scale_up_factor", "2" }, - { "bd_acid", "boulder_rush.png" }, - { "bd_acid.xpos", "4" }, - { "bd_acid.ypos", "2" }, - { "bd_acid.frames", "1" }, - { "bd_acid.scale_up_factor", "2" }, + { "bd_acid", UNDEFINED_FILENAME }, + { "bd_acid.clone_from", "amoeba_dead" }, { "bd_box", "RocksBD.png" }, { "bd_box.xpos", "8" }, @@ -923,11 +902,35 @@ struct ConfigInfo image_config[] = { "bd_pot.ypos", "6" }, { "bd_pot.frames", "1" }, - { "bd_pneumatic_hammer", "boulder_rush.png" }, - { "bd_pneumatic_hammer.xpos", "6" }, - { "bd_pneumatic_hammer.ypos", "7" }, + { "bd_pneumatic_hammer", "RocksBD.png" }, + { "bd_pneumatic_hammer.xpos", "11" }, + { "bd_pneumatic_hammer.ypos", "9" }, { "bd_pneumatic_hammer.frames", "1" }, - { "bd_pneumatic_hammer.scale_up_factor", "2" }, + { "bd_pneumatic_hammer.hitting.left", "RocksBD.png" }, + { "bd_pneumatic_hammer.hitting.left.xpos", "4" }, + { "bd_pneumatic_hammer.hitting.left.ypos", "12" }, + { "bd_pneumatic_hammer.hitting.left.frames", "2" }, + { "bd_pneumatic_hammer.hitting.left.delay", "4" }, + { "bd_pneumatic_hammer.hitting.left.offset", "64" }, + { "bd_pneumatic_hammer.hitting.right", "RocksBD.png" }, + { "bd_pneumatic_hammer.hitting.right.xpos", "1" }, + { "bd_pneumatic_hammer.hitting.right.ypos", "12" }, + { "bd_pneumatic_hammer.hitting.right.frames", "2" }, + { "bd_pneumatic_hammer.hitting.right.delay", "4" }, + { "bd_pneumatic_hammer.hitting.right.offset", "64" }, + + { "bd_player.hitting.left", "RocksBD.png" }, + { "bd_player.hitting.left.xpos", "5" }, + { "bd_player.hitting.left.ypos", "12" }, + { "bd_player.hitting.left.frames", "2" }, + { "bd_player.hitting.left.delay", "4" }, + { "bd_player.hitting.left.offset", "64" }, + { "bd_player.hitting.right", "RocksBD.png" }, + { "bd_player.hitting.right.xpos", "0" }, + { "bd_player.hitting.right.ypos", "12" }, + { "bd_player.hitting.right.frames", "2" }, + { "bd_player.hitting.right.delay", "4" }, + { "bd_player.hitting.right.offset", "64" }, { "bd_teleporter", "RocksBD.png" }, { "bd_teleporter.xpos", "2" }, @@ -977,17 +980,17 @@ struct ConfigInfo image_config[] = { "bd_sweet.ypos", "6" }, { "bd_sweet.frames", "1" }, - { "bd_voodoo_doll", "boulder_rush.png" }, - { "bd_voodoo_doll.xpos", "7" }, - { "bd_voodoo_doll.ypos", "0" }, + { "bd_voodoo_doll", "RocksBD.png" }, + { "bd_voodoo_doll.xpos", "11" }, + { "bd_voodoo_doll.ypos", "7" }, { "bd_voodoo_doll.frames", "1" }, - { "bd_voodoo_doll.scale_up_factor", "2" }, - { "bd_slime", "boulder_rush.png" }, + { "bd_slime", "RocksBD.png" }, { "bd_slime.xpos", "0" }, - { "bd_slime.ypos", "25" }, - { "bd_slime.frames", "1" }, - { "bd_slime.scale_up_factor", "2" }, + { "bd_slime.ypos", "11" }, + { "bd_slime.frames", "4" }, + { "bd_slime.delay", "4" }, + { "bd_slime.anim_mode", "pingpong2" }, { "bd_waiting_rock", UNDEFINED_FILENAME }, { "bd_waiting_rock.clone_from", "bd_rock" }, @@ -1042,6 +1045,28 @@ struct ConfigInfo image_config[] = { "bd_cow.down.EDITOR.xpos", "5" }, { "bd_cow.down.EDITOR.ypos", "4" }, + { "bd_cow_enclosed_1.EDITOR", "RocksBD2.png" }, + { "bd_cow_enclosed_1.EDITOR.xpos", "3" }, + { "bd_cow_enclosed_1.EDITOR.ypos", "4" }, + { "bd_cow_enclosed_2.EDITOR", "RocksBD2.png" }, + { "bd_cow_enclosed_2.EDITOR.xpos", "3" }, + { "bd_cow_enclosed_2.EDITOR.ypos", "4" }, + { "bd_cow_enclosed_3.EDITOR", "RocksBD2.png" }, + { "bd_cow_enclosed_3.EDITOR.xpos", "3" }, + { "bd_cow_enclosed_3.EDITOR.ypos", "4" }, + { "bd_cow_enclosed_4.EDITOR", "RocksBD2.png" }, + { "bd_cow_enclosed_4.EDITOR.xpos", "3" }, + { "bd_cow_enclosed_4.EDITOR.ypos", "4" }, + { "bd_cow_enclosed_5.EDITOR", "RocksBD2.png" }, + { "bd_cow_enclosed_5.EDITOR.xpos", "3" }, + { "bd_cow_enclosed_5.EDITOR.ypos", "4" }, + { "bd_cow_enclosed_6.EDITOR", "RocksBD2.png" }, + { "bd_cow_enclosed_6.EDITOR.xpos", "3" }, + { "bd_cow_enclosed_6.EDITOR.ypos", "4" }, + { "bd_cow_enclosed_7.EDITOR", "RocksBD2.png" }, + { "bd_cow_enclosed_7.EDITOR.xpos", "3" }, + { "bd_cow_enclosed_7.EDITOR.ypos", "4" }, + { "bd_stonefly", "RocksBD.png" }, { "bd_stonefly.xpos", "0" }, { "bd_stonefly.ypos", "1" }, @@ -9101,6 +9126,8 @@ struct ConfigInfo image_config[] = { "menu.draw_yoffset.SETUP[SHORTCUTS_4]", "0" }, { "menu.draw_xoffset.SETUP[SHORTCUTS_5]", "0" }, { "menu.draw_yoffset.SETUP[SHORTCUTS_5]", "0" }, + { "menu.draw_xoffset.SETUP[SHORTCUTS_6]", "0" }, + { "menu.draw_yoffset.SETUP[SHORTCUTS_6]", "0" }, { "menu.draw_xoffset.SETUP[CHOOSE_ARTWORK]", "0" }, { "menu.draw_yoffset.SETUP[CHOOSE_ARTWORK]", "0" }, { "menu.draw_xoffset.SETUP[CHOOSE_OTHER]", "0" },