X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=38f682eaff5cc4317f111c64f1c6f104dbb1c00c;hb=c42862bb754d7a8b1ff476887669650845f7570e;hp=74ef40841d4376de60d9ebf8a4d4d3e189984f38;hpb=73dd81c85be90e466493bcc6f45c402d29bc7f20;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 74ef4084..38f682ea 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -27,10 +27,15 @@ struct ConfigTypeInfo image_config_suffix[] = { ".ypos", ARG_UNDEFINED, TYPE_INTEGER }, { ".width", ARG_UNDEFINED, TYPE_INTEGER }, { ".height", ARG_UNDEFINED, TYPE_INTEGER }, - { ".offset", ARG_UNDEFINED, TYPE_INTEGER }, { ".vertical", "false", TYPE_BOOLEAN }, + { ".offset", ARG_UNDEFINED, TYPE_INTEGER }, { ".xoffset", ARG_UNDEFINED, TYPE_INTEGER }, { ".yoffset", ARG_UNDEFINED, TYPE_INTEGER }, + { ".2nd_movement_tile", "false", TYPE_BOOLEAN }, + { ".2nd_vertical", ARG_UNDEFINED, TYPE_BOOLEAN }, + { ".2nd_offset", ARG_UNDEFINED, TYPE_INTEGER }, + { ".2nd_xoffset", ARG_UNDEFINED, TYPE_INTEGER }, + { ".2nd_yoffset", ARG_UNDEFINED, TYPE_INTEGER }, { ".frames", ARG_UNDEFINED, TYPE_INTEGER }, { ".frames_per_line", ARG_UNDEFINED, TYPE_INTEGER }, { ".start_frame", ARG_UNDEFINED, TYPE_INTEGER }, @@ -3227,10 +3232,73 @@ struct ConfigInfo image_config[] = { "balloon_switch_none.frames", "1" }, { "balloon_switch_none.scale_up_factor", "2" }, + { "em_gate_5", "emc_object.pcx" }, + { "em_gate_5.xpos", "24" }, + { "em_gate_5.ypos", "6" }, + { "em_gate_5.frames", "1" }, + { "em_gate_5.scale_up_factor", "2" }, + { "em_gate_5_gray", "emc_object.pcx" }, + { "em_gate_5_gray.xpos", "25" }, + { "em_gate_5_gray.ypos", "18" }, + { "em_gate_5_gray.frames", "1" }, + { "em_gate_5_gray.scale_up_factor", "2" }, + { "em_gate_6", "emc_object.pcx" }, + { "em_gate_6.xpos", "24" }, + { "em_gate_6.ypos", "7" }, + { "em_gate_6.frames", "1" }, + { "em_gate_6.scale_up_factor", "2" }, + { "em_gate_6_gray", "emc_object.pcx" }, + { "em_gate_6_gray.xpos", "25" }, + { "em_gate_6_gray.ypos", "18" }, + { "em_gate_6_gray.frames", "1" }, + { "em_gate_6_gray.scale_up_factor", "2" }, + { "em_gate_7", "emc_object.pcx" }, + { "em_gate_7.xpos", "24" }, + { "em_gate_7.ypos", "8" }, + { "em_gate_7.frames", "1" }, + { "em_gate_7.scale_up_factor", "2" }, + { "em_gate_7_gray", "emc_object.pcx" }, + { "em_gate_7_gray.xpos", "25" }, + { "em_gate_7_gray.ypos", "18" }, + { "em_gate_7_gray.frames", "1" }, + { "em_gate_7_gray.scale_up_factor", "2" }, + { "em_gate_8", "emc_object.pcx" }, + { "em_gate_8.xpos", "24" }, + { "em_gate_8.ypos", "9" }, + { "em_gate_8.frames", "1" }, + { "em_gate_8.scale_up_factor", "2" }, + { "em_gate_8_gray", "emc_object.pcx" }, + { "em_gate_8_gray.xpos", "25" }, + { "em_gate_8_gray.ypos", "18" }, + { "em_gate_8_gray.frames", "1" }, + { "em_gate_8_gray.scale_up_factor", "2" }, + + { "em_key_5", "emc_object.pcx" }, + { "em_key_5.xpos", "24" }, + { "em_key_5.ypos", "14" }, + { "em_key_5.frames", "1" }, + { "em_key_5.scale_up_factor", "2" }, + { "em_key_6", "emc_object.pcx" }, + { "em_key_6.xpos", "24" }, + { "em_key_6.ypos", "15" }, + { "em_key_6.frames", "1" }, + { "em_key_6.scale_up_factor", "2" }, + { "em_key_7", "emc_object.pcx" }, + { "em_key_7.xpos", "24" }, + { "em_key_7.ypos", "16" }, + { "em_key_7.frames", "1" }, + { "em_key_7.scale_up_factor", "2" }, + { "em_key_8", "emc_object.pcx" }, + { "em_key_8.xpos", "24" }, + { "em_key_8.ypos", "17" }, + { "em_key_8.frames", "1" }, + { "em_key_8.scale_up_factor", "2" }, + { "emc_android", "emc_object.pcx" }, { "emc_android.xpos", "7" }, { "emc_android.ypos", "13" }, - { "emc_android.frames", "1" }, + { "emc_android.frames", "8" }, + { "emc_android.vertical", "true" }, { "emc_android.scale_up_factor", "2" }, { "emc_grass", "emc_object.pcx" }, @@ -3238,11 +3306,40 @@ struct ConfigInfo image_config[] = { "emc_grass.ypos", "5" }, { "emc_grass.frames", "1" }, { "emc_grass.scale_up_factor", "2" }, + { "emc_grass.digging.left", "emc_object.pcx" }, + { "emc_grass.digging.left.xpos", "20" }, + { "emc_grass.digging.left.ypos", "27" }, + { "emc_grass.digging.left.frames", "7" }, + { "emc_grass.digging.left.vertical", "true" }, + { "emc_grass.digging.left.anim_mode", "linear,reverse" }, + { "emc_grass.digging.left.scale_up_factor", "2" }, + { "emc_grass.digging.right", "emc_object.pcx" }, + { "emc_grass.digging.right.xpos", "20" }, + { "emc_grass.digging.right.ypos", "13" }, + { "emc_grass.digging.right.frames", "7" }, + { "emc_grass.digging.right.vertical", "true" }, + { "emc_grass.digging.right.anim_mode", "linear,reverse" }, + { "emc_grass.digging.right.scale_up_factor", "2" }, + { "emc_grass.digging.up", "emc_object.pcx" }, + { "emc_grass.digging.up.xpos", "20" }, + { "emc_grass.digging.up.ypos", "6" }, + { "emc_grass.digging.up.frames", "7" }, + { "emc_grass.digging.up.vertical", "true" }, + { "emc_grass.digging.up.anim_mode", "linear,reverse" }, + { "emc_grass.digging.up.scale_up_factor", "2" }, + { "emc_grass.digging.down", "emc_object.pcx" }, + { "emc_grass.digging.down.xpos", "20" }, + { "emc_grass.digging.down.ypos", "20" }, + { "emc_grass.digging.down.frames", "7" }, + { "emc_grass.digging.down.vertical", "true" }, + { "emc_grass.digging.down.anim_mode", "linear,reverse" }, + { "emc_grass.digging.down.scale_up_factor", "2" }, { "emc_magic_ball", "emc_object.pcx" }, { "emc_magic_ball.xpos", "22" }, { "emc_magic_ball.ypos", "18" }, - { "emc_magic_ball.frames", "1" }, + { "emc_magic_ball.frames", "16" }, + { "emc_magic_ball.vertical", "true" }, { "emc_magic_ball.scale_up_factor", "2" }, { "emc_magic_ball_switch", "emc_object.pcx" }, @@ -3251,73 +3348,11 @@ struct ConfigInfo image_config[] = { "emc_magic_ball_switch.frames", "1" }, { "emc_magic_ball_switch.scale_up_factor", "2" }, - { "emc_gate_5", "emc_object.pcx" }, - { "emc_gate_5.xpos", "24" }, - { "emc_gate_5.ypos", "6" }, - { "emc_gate_5.frames", "1" }, - { "emc_gate_5.scale_up_factor", "2" }, - { "emc_gate_5_gray", "emc_object.pcx" }, - { "emc_gate_5_gray.xpos", "25" }, - { "emc_gate_5_gray.ypos", "18" }, - { "emc_gate_5_gray.frames", "1" }, - { "emc_gate_5_gray.scale_up_factor", "2" }, - { "emc_gate_6", "emc_object.pcx" }, - { "emc_gate_6.xpos", "24" }, - { "emc_gate_6.ypos", "7" }, - { "emc_gate_6.frames", "1" }, - { "emc_gate_6.scale_up_factor", "2" }, - { "emc_gate_6_gray", "emc_object.pcx" }, - { "emc_gate_6_gray.xpos", "25" }, - { "emc_gate_6_gray.ypos", "18" }, - { "emc_gate_6_gray.frames", "1" }, - { "emc_gate_6_gray.scale_up_factor", "2" }, - { "emc_gate_7", "emc_object.pcx" }, - { "emc_gate_7.xpos", "24" }, - { "emc_gate_7.ypos", "8" }, - { "emc_gate_7.frames", "1" }, - { "emc_gate_7.scale_up_factor", "2" }, - { "emc_gate_7_gray", "emc_object.pcx" }, - { "emc_gate_7_gray.xpos", "25" }, - { "emc_gate_7_gray.ypos", "18" }, - { "emc_gate_7_gray.frames", "1" }, - { "emc_gate_7_gray.scale_up_factor", "2" }, - { "emc_gate_8", "emc_object.pcx" }, - { "emc_gate_8.xpos", "24" }, - { "emc_gate_8.ypos", "9" }, - { "emc_gate_8.frames", "1" }, - { "emc_gate_8.scale_up_factor", "2" }, - { "emc_gate_8_gray", "emc_object.pcx" }, - { "emc_gate_8_gray.xpos", "25" }, - { "emc_gate_8_gray.ypos", "18" }, - { "emc_gate_8_gray.frames", "1" }, - { "emc_gate_8_gray.scale_up_factor", "2" }, - - { "emc_key_5", "emc_object.pcx" }, - { "emc_key_5.xpos", "24" }, - { "emc_key_5.ypos", "14" }, - { "emc_key_5.frames", "1" }, - { "emc_key_5.scale_up_factor", "2" }, - { "emc_key_6", "emc_object.pcx" }, - { "emc_key_6.xpos", "24" }, - { "emc_key_6.ypos", "15" }, - { "emc_key_6.frames", "1" }, - { "emc_key_6.scale_up_factor", "2" }, - { "emc_key_7", "emc_object.pcx" }, - { "emc_key_7.xpos", "24" }, - { "emc_key_7.ypos", "16" }, - { "emc_key_7.frames", "1" }, - { "emc_key_7.scale_up_factor", "2" }, - { "emc_key_8", "emc_object.pcx" }, - { "emc_key_8.xpos", "24" }, - { "emc_key_8.ypos", "17" }, - { "emc_key_8.frames", "1" }, - { "emc_key_8.scale_up_factor", "2" }, - - { "emc_bumper", "emc_object.pcx" }, - { "emc_bumper.xpos", "25" }, - { "emc_bumper.ypos", "3" }, - { "emc_bumper.frames", "1" }, - { "emc_bumper.scale_up_factor", "2" }, + { "emc_spring_bumper", "emc_object.pcx" }, + { "emc_spring_bumper.xpos", "25" }, + { "emc_spring_bumper.ypos", "3" }, + { "emc_spring_bumper.frames", "1" }, + { "emc_spring_bumper.scale_up_factor", "2" }, { "emc_plant", "emc_object.pcx" }, { "emc_plant.xpos", "25" }, @@ -3399,6 +3434,18 @@ struct ConfigInfo image_config[] = { "emc_wall_slippery_4.frames", "1" }, { "emc_wall_slippery_4.scale_up_factor", "2" }, + { "emc_fake_grass", "emc_object.pcx" }, + { "emc_fake_grass.xpos", "20" }, + { "emc_fake_grass.ypos", "5" }, + { "emc_fake_grass.frames", "1" }, + { "emc_fake_grass.scale_up_factor", "2" }, + + { "emc_dripper", "emc_object.pcx" }, + { "emc_dripper.xpos", "25" }, + { "emc_dripper.ypos", "15" }, + { "emc_dripper.frames", "1" }, + { "emc_dripper.scale_up_factor", "2" }, + #include "conf_chr.c" /* include auto-generated data structure definitions */ #include "conf_cus.c" /* include auto-generated data structure definitions */ #include "conf_grp.c" /* include auto-generated data structure definitions */