X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=bb4e5e213174e29bfef66198f9aa54ccc83cc586;hb=c74431d906f186706e3176cb0dd76d40e3414c2f;hp=8a76857bd7e2f66496c17186f98919b382a28065;hpb=e0826aa063b692928c1fb971d883fe004a548a15;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 8a76857b..bb4e5e21 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -162,23 +162,21 @@ struct ConfigInfo image_config[] = { "bd_player_glued.EDITOR.xpos", "1" }, { "bd_player_glued.EDITOR.ypos", "0" }, - { "bd_player_with_bomb", "boulder_rush.png" }, - { "bd_player_with_bomb.xpos", "3" }, - { "bd_player_with_bomb.ypos", "4" }, + { "bd_player_with_bomb", "RocksBD.png" }, + { "bd_player_with_bomb.xpos", "8" }, + { "bd_player_with_bomb.ypos", "7" }, { "bd_player_with_bomb.frames", "1" }, - { "bd_player_with_bomb.scale_up_factor", "2" }, - { "bd_player_with_rocket_launcher", "boulder_rush.png" }, - { "bd_player_with_rocket_launcher.xpos", "1" }, - { "bd_player_with_rocket_launcher.ypos", "46" }, + { "bd_player_with_rocket_launcher", "RocksBD.png" }, + { "bd_player_with_rocket_launcher.xpos", "10" }, + { "bd_player_with_rocket_launcher.ypos", "7" }, { "bd_player_with_rocket_launcher.frames", "1" }, - { "bd_player_with_rocket_launcher.scale_up_factor", "2" }, - { "bd_player_stirring", "boulder_rush.png" }, - { "bd_player_stirring.xpos", "3" }, - { "bd_player_stirring.ypos", "4" }, - { "bd_player_stirring.frames", "1" }, - { "bd_player_stirring.scale_up_factor", "2" }, + { "bd_player_stirring", "RocksBD.png" }, + { "bd_player_stirring.xpos", "8" }, + { "bd_player_stirring.ypos", "8" }, + { "bd_player_stirring.frames", "4" }, + { "bd_player_stirring.delay", "4" }, { "bd_wall", "RocksDC.png" }, { "bd_wall.xpos", "12" }, @@ -774,28 +772,26 @@ 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", "8" }, + { "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", "boulder_rush.png" }, - { "bd_creature_switch.xpos", "2" }, - { "bd_creature_switch.ypos", "2" }, + { "bd_creature_switch", "RocksBD.png" }, + { "bd_creature_switch.xpos", "9" }, + { "bd_creature_switch.ypos", "9" }, { "bd_creature_switch.frames", "1" }, - { "bd_creature_switch.scale_up_factor", "2" }, - { "bd_creature_switch.active", "boulder_rush.png" }, - { "bd_creature_switch.active.xpos", "3" }, - { "bd_creature_switch.active.ypos", "2" }, + { "bd_creature_switch.active", "RocksBD.png" }, + { "bd_creature_switch.active.xpos", "10" }, + { "bd_creature_switch.active.ypos", "9" }, { "bd_creature_switch.active.frames", "1" }, - { "bd_creature_switch.active.scale_up_factor", "2" }, { "bd_biter_switch_1", "RocksBD.png" }, { "bd_biter_switch_1.xpos", "4" }, @@ -817,36 +813,23 @@ 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" }, { "bd_conveyor_left.ypos", "3" }, { "bd_conveyor_left.frames", "1" }, { "bd_conveyor_left.EDITOR", "RocksBD2.png" }, - { "bd_conveyor_left.EDITOR.xpos", "3" }, - { "bd_conveyor_left.EDITOR.ypos", "4" }, + { "bd_conveyor_left.EDITOR.xpos", "6" }, + { "bd_conveyor_left.EDITOR.ypos", "3" }, { "bd_conveyor_left.active", "RocksDC.png" }, { "bd_conveyor_left.active.xpos", "0" }, { "bd_conveyor_left.active.ypos", "3" }, @@ -858,8 +841,8 @@ struct ConfigInfo image_config[] = { "bd_conveyor_right.ypos", "3" }, { "bd_conveyor_right.frames", "1" }, { "bd_conveyor_right.EDITOR", "RocksBD2.png" }, - { "bd_conveyor_right.EDITOR.xpos", "4" }, - { "bd_conveyor_right.EDITOR.ypos", "4" }, + { "bd_conveyor_right.EDITOR.xpos", "7" }, + { "bd_conveyor_right.EDITOR.ypos", "3" }, { "bd_conveyor_right.active", "RocksDC.png" }, { "bd_conveyor_right.active.xpos", "0" }, { "bd_conveyor_right.active.ypos", "3" }, @@ -885,16 +868,14 @@ 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" }, @@ -902,11 +883,10 @@ struct ConfigInfo image_config[] = { "bd_acid.frames", "1" }, { "bd_acid.scale_up_factor", "2" }, - { "bd_box", "boulder_rush.png" }, - { "bd_box.xpos", "5" }, - { "bd_box.ypos", "2" }, + { "bd_box", "RocksBD.png" }, + { "bd_box.xpos", "8" }, + { "bd_box.ypos", "9" }, { "bd_box.frames", "1" }, - { "bd_box.scale_up_factor", "2" }, { "bd_time_penalty", "RocksBD.png" }, { "bd_time_penalty.xpos", "3" }, @@ -923,11 +903,10 @@ struct ConfigInfo image_config[] = { "bd_clock.ypos", "6" }, { "bd_clock.frames", "1" }, - { "bd_pot", "boulder_rush.png" }, - { "bd_pot.xpos", "7" }, - { "bd_pot.ypos", "7" }, + { "bd_pot", "RocksBD.png" }, + { "bd_pot.xpos", "6" }, + { "bd_pot.ypos", "6" }, { "bd_pot.frames", "1" }, - { "bd_pot.scale_up_factor", "2" }, { "bd_pneumatic_hammer", "boulder_rush.png" }, { "bd_pneumatic_hammer.xpos", "6" }, @@ -940,17 +919,16 @@ struct ConfigInfo image_config[] = { "bd_teleporter.ypos", "6" }, { "bd_teleporter.frames", "1" }, - { "bd_skeleton", "boulder_rush.png" }, - { "bd_skeleton.xpos", "1" }, - { "bd_skeleton.ypos", "34" }, + { "bd_skeleton", "RocksBD.png" }, + { "bd_skeleton.xpos", "7" }, + { "bd_skeleton.ypos", "6" }, { "bd_skeleton.frames", "1" }, - { "bd_skeleton.scale_up_factor", "2" }, - { "bd_water", "boulder_rush.png" }, + { "bd_water", "RocksBD.png" }, { "bd_water.xpos", "0" }, - { "bd_water.ypos", "12" }, - { "bd_water.frames", "1" }, - { "bd_water.scale_up_factor", "2" }, + { "bd_water.ypos", "9" }, + { "bd_water.frames", "8" }, + { "bd_water.delay", "2" }, { "bd_key_1", UNDEFINED_FILENAME }, { "bd_key_1.clone_from", "key_2" }, @@ -990,11 +968,12 @@ struct ConfigInfo image_config[] = { "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" }, @@ -1005,54 +984,49 @@ struct ConfigInfo image_config[] = { "bd_chasing_rock", UNDEFINED_FILENAME }, { "bd_chasing_rock.clone_from", "bd_rock" }, - { "bd_ghost", "boulder_rush.png" }, + { "bd_ghost", "RocksBD.png" }, { "bd_ghost.xpos", "0" }, - { "bd_ghost.ypos", "20" }, - { "bd_ghost.frames", "1" }, - { "bd_ghost.scale_up_factor", "2" }, - - { "bd_cow", "boulder_rush.png" }, - { "bd_cow.xpos", "0" }, - { "bd_cow.ypos", "11" }, - { "bd_cow.frames", "8" }, + { "bd_ghost.ypos", "10" }, + { "bd_ghost.frames", "8" }, + { "bd_ghost.delay", "2" }, + + { "bd_cow", "RocksBD.png" }, + { "bd_cow.xpos", "4" }, + { "bd_cow.ypos", "8" }, + { "bd_cow.frames", "4" }, { "bd_cow.delay", "2" }, - { "bd_cow.scale_up_factor", "2" }, - { "bd_cow.left", "boulder_rush.png" }, - { "bd_cow.left.xpos", "0" }, - { "bd_cow.left.ypos", "11" }, - { "bd_cow.left.frames", "8" }, + { "bd_cow.left", "RocksBD.png" }, + { "bd_cow.left.xpos", "4" }, + { "bd_cow.left.ypos", "8" }, + { "bd_cow.left.frames", "4" }, { "bd_cow.left.delay", "2" }, - { "bd_cow.left.scale_up_factor", "2" }, - { "bd_cow.left.EDITOR", "boulder_rush.png" }, - { "bd_cow.left.EDITOR.xpos", "0" }, - { "bd_cow.left.EDITOR.ypos", "11" }, - { "bd_cow.up", "boulder_rush.png" }, - { "bd_cow.up.xpos", "0" }, - { "bd_cow.up.ypos", "11" }, - { "bd_cow.up.frames", "8" }, + { "bd_cow.left.EDITOR", "RocksBD2.png" }, + { "bd_cow.left.EDITOR.xpos", "6" }, + { "bd_cow.left.EDITOR.ypos", "4" }, + { "bd_cow.up", "RocksBD.png" }, + { "bd_cow.up.xpos", "4" }, + { "bd_cow.up.ypos", "8" }, + { "bd_cow.up.frames", "4" }, { "bd_cow.up.delay", "2" }, - { "bd_cow.up.scale_up_factor", "2" }, - { "bd_cow.up.EDITOR", "boulder_rush.png" }, - { "bd_cow.up.EDITOR.xpos", "0" }, - { "bd_cow.up.EDITOR.ypos", "11" }, - { "bd_cow.right", "boulder_rush.png" }, - { "bd_cow.right.xpos", "0" }, - { "bd_cow.right.ypos", "11" }, - { "bd_cow.right.frames", "8" }, + { "bd_cow.up.EDITOR", "RocksBD2.png" }, + { "bd_cow.up.EDITOR.xpos", "4" }, + { "bd_cow.up.EDITOR.ypos", "4" }, + { "bd_cow.right", "RocksBD.png" }, + { "bd_cow.right.xpos", "4" }, + { "bd_cow.right.ypos", "8" }, + { "bd_cow.right.frames", "4" }, { "bd_cow.right.delay", "2" }, - { "bd_cow.right.scale_up_factor", "2" }, - { "bd_cow.right.EDITOR", "boulder_rush.png" }, - { "bd_cow.right.EDITOR.xpos", "0" }, - { "bd_cow.right.EDITOR.ypos", "11" }, - { "bd_cow.down", "boulder_rush.png" }, - { "bd_cow.down.xpos", "0" }, - { "bd_cow.down.ypos", "11" }, - { "bd_cow.down.frames", "8" }, + { "bd_cow.right.EDITOR", "RocksBD2.png" }, + { "bd_cow.right.EDITOR.xpos", "7" }, + { "bd_cow.right.EDITOR.ypos", "4" }, + { "bd_cow.down", "RocksBD.png" }, + { "bd_cow.down.xpos", "4" }, + { "bd_cow.down.ypos", "8" }, + { "bd_cow.down.frames", "4" }, { "bd_cow.down.delay", "2" }, - { "bd_cow.down.scale_up_factor", "2" }, - { "bd_cow.down.EDITOR", "boulder_rush.png" }, - { "bd_cow.down.EDITOR.xpos", "0" }, - { "bd_cow.down.EDITOR.ypos", "11" }, + { "bd_cow.down.EDITOR", "RocksBD2.png" }, + { "bd_cow.down.EDITOR.xpos", "5" }, + { "bd_cow.down.EDITOR.ypos", "4" }, { "bd_stonefly", "RocksBD.png" }, { "bd_stonefly.xpos", "0" }, @@ -1192,17 +1166,21 @@ struct ConfigInfo image_config[] = { "bd_dragonfly.down.EDITOR.xpos", "11" }, { "bd_dragonfly.down.EDITOR.ypos", "1" }, - { "bd_bomb", "boulder_rush.png" }, + { "bd_bomb", "RocksBD.png" }, { "bd_bomb.xpos", "0" }, - { "bd_bomb.ypos", "6" }, + { "bd_bomb.ypos", "7" }, { "bd_bomb.frames", "1" }, - { "bd_bomb.scale_up_factor", "2" }, - - { "bd_rocket_launcher", "boulder_rush.png" }, - { "bd_rocket_launcher.xpos", "0" }, - { "bd_rocket_launcher.ypos", "46" }, + { "bd_bomb.active", "RocksBD.png" }, + { "bd_bomb.active.xpos", "1" }, + { "bd_bomb.active.ypos", "7" }, + { "bd_bomb.active.frames", "7" }, + { "bd_bomb.active.delay", "8" }, + { "bd_bomb.active.anim_mode", "linear" }, + + { "bd_rocket_launcher", "RocksBD.png" }, + { "bd_rocket_launcher.xpos", "9" }, + { "bd_rocket_launcher.ypos", "7" }, { "bd_rocket_launcher.frames", "1" }, - { "bd_rocket_launcher.scale_up_factor", "2" }, { "bd_rocket", "RocksBD.png" }, { "bd_rocket.xpos", "9" }, @@ -1236,12 +1214,11 @@ struct ConfigInfo image_config[] = { "bd_nitro_pack.exploding.EDITOR.xpos", "6" }, { "bd_nitro_pack.exploding.EDITOR.ypos", "2" }, - { "bd_fake_bonus", "boulder_rush.png" }, + { "bd_fake_bonus", "RocksBD.png" }, { "bd_fake_bonus.xpos", "0" }, - { "bd_fake_bonus.ypos", "15" }, - { "bd_fake_bonus.frames", "8" }, + { "bd_fake_bonus.ypos", "8" }, + { "bd_fake_bonus.frames", "4" }, { "bd_fake_bonus.delay", "2" }, - { "bd_fake_bonus.scale_up_factor", "2" }, { "bd_covered", "RocksBD.png" }, { "bd_covered.xpos", "8" },