X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2g.c;h=25057950e00e4e147512cb04881e4d8d9c163b97;hb=37a06df577bbfd00f4b361f92cacb0d97036ba93;hp=0378ba4938301b9b669724dee9d10484aea2752b;hpb=3f0d03011f43b41c9c5a9c9b83a1dda41e46e721;p=rocksndiamonds.git diff --git a/src/conf_e2g.c b/src/conf_e2g.c index 0378ba49..25057950 100644 --- a/src/conf_e2g.c +++ b/src/conf_e2g.c @@ -109,10 +109,74 @@ element_to_graphic[] = EL_BD_BUTTERFLY, -1, -1, FALSE, IMG_BD_BUTTERFLY }, + { + EL_BD_BUTTERFLY_RIGHT, -1, -1, FALSE, + IMG_BD_BUTTERFLY_RIGHT + }, + { + EL_BD_BUTTERFLY, -1, MV_BIT_RIGHT, FALSE, + IMG_BD_BUTTERFLY_RIGHT + }, + { + EL_BD_BUTTERFLY_UP, -1, -1, FALSE, + IMG_BD_BUTTERFLY_UP + }, + { + EL_BD_BUTTERFLY, -1, MV_BIT_UP, FALSE, + IMG_BD_BUTTERFLY_UP + }, + { + EL_BD_BUTTERFLY_LEFT, -1, -1, FALSE, + IMG_BD_BUTTERFLY_LEFT + }, + { + EL_BD_BUTTERFLY, -1, MV_BIT_LEFT, FALSE, + IMG_BD_BUTTERFLY_LEFT + }, + { + EL_BD_BUTTERFLY_DOWN, -1, -1, FALSE, + IMG_BD_BUTTERFLY_DOWN + }, + { + EL_BD_BUTTERFLY, -1, MV_BIT_DOWN, FALSE, + IMG_BD_BUTTERFLY_DOWN + }, { EL_BD_FIREFLY, -1, -1, FALSE, IMG_BD_FIREFLY }, + { + EL_BD_FIREFLY_RIGHT, -1, -1, FALSE, + IMG_BD_FIREFLY_RIGHT + }, + { + EL_BD_FIREFLY, -1, MV_BIT_RIGHT, FALSE, + IMG_BD_FIREFLY_RIGHT + }, + { + EL_BD_FIREFLY_UP, -1, -1, FALSE, + IMG_BD_FIREFLY_UP + }, + { + EL_BD_FIREFLY, -1, MV_BIT_UP, FALSE, + IMG_BD_FIREFLY_UP + }, + { + EL_BD_FIREFLY_LEFT, -1, -1, FALSE, + IMG_BD_FIREFLY_LEFT + }, + { + EL_BD_FIREFLY, -1, MV_BIT_LEFT, FALSE, + IMG_BD_FIREFLY_LEFT + }, + { + EL_BD_FIREFLY_DOWN, -1, -1, FALSE, + IMG_BD_FIREFLY_DOWN + }, + { + EL_BD_FIREFLY, -1, MV_BIT_DOWN, FALSE, + IMG_BD_FIREFLY_DOWN + }, { EL_SP_DEFAULT, ACTION_EXPLODING, -1, FALSE, IMG_SP_DEFAULT_EXPLODING @@ -993,18 +1057,50 @@ element_to_graphic[] = EL_EM_GATE_1_GRAY, -1, -1, FALSE, IMG_EM_GATE_1_GRAY }, + { + EL_EM_GATE_1_GRAY_ACTIVE, -1, -1, FALSE, + IMG_EM_GATE_1_GRAY_ACTIVE + }, + { + EL_EM_GATE_1_GRAY, ACTION_ACTIVE, -1, FALSE, + IMG_EM_GATE_1_GRAY_ACTIVE + }, { EL_EM_GATE_2_GRAY, -1, -1, FALSE, IMG_EM_GATE_2_GRAY }, + { + EL_EM_GATE_2_GRAY_ACTIVE, -1, -1, FALSE, + IMG_EM_GATE_2_GRAY_ACTIVE + }, + { + EL_EM_GATE_2_GRAY, ACTION_ACTIVE, -1, FALSE, + IMG_EM_GATE_2_GRAY_ACTIVE + }, { EL_EM_GATE_3_GRAY, -1, -1, FALSE, IMG_EM_GATE_3_GRAY }, + { + EL_EM_GATE_3_GRAY_ACTIVE, -1, -1, FALSE, + IMG_EM_GATE_3_GRAY_ACTIVE + }, + { + EL_EM_GATE_3_GRAY, ACTION_ACTIVE, -1, FALSE, + IMG_EM_GATE_3_GRAY_ACTIVE + }, { EL_EM_GATE_4_GRAY, -1, -1, FALSE, IMG_EM_GATE_4_GRAY }, + { + EL_EM_GATE_4_GRAY_ACTIVE, -1, -1, FALSE, + IMG_EM_GATE_4_GRAY_ACTIVE + }, + { + EL_EM_GATE_4_GRAY, ACTION_ACTIVE, -1, FALSE, + IMG_EM_GATE_4_GRAY_ACTIVE + }, { EL_EXIT_CLOSED, -1, -1, FALSE, IMG_EXIT_CLOSED @@ -1145,6 +1241,46 @@ element_to_graphic[] = EL_INVISIBLE_SAND, ACTION_ACTIVE, -1, FALSE, IMG_INVISIBLE_SAND_ACTIVE }, + { + EL_INVISIBLE_SAND, ACTION_ACTIVE, -1, TRUE, + IMG_INVISIBLE_SAND_ACTIVE_CRUMBLED + }, + { + EL_INVISIBLE_SAND_ACTIVE, -1, -1, TRUE, + IMG_INVISIBLE_SAND_ACTIVE_CRUMBLED + }, + { + EL_INVISIBLE_SAND_ACTIVE, ACTION_DIGGING, MV_BIT_LEFT, FALSE, + IMG_INVISIBLE_SAND_ACTIVE_DIGGING_LEFT + }, + { + EL_INVISIBLE_SAND_ACTIVE, ACTION_DIGGING, MV_BIT_RIGHT, FALSE, + IMG_INVISIBLE_SAND_ACTIVE_DIGGING_RIGHT + }, + { + EL_INVISIBLE_SAND_ACTIVE, ACTION_DIGGING, MV_BIT_UP, FALSE, + IMG_INVISIBLE_SAND_ACTIVE_DIGGING_UP + }, + { + EL_INVISIBLE_SAND_ACTIVE, ACTION_DIGGING, MV_BIT_DOWN, FALSE, + IMG_INVISIBLE_SAND_ACTIVE_DIGGING_DOWN + }, + { + EL_INVISIBLE_SAND_ACTIVE, ACTION_DIGGING, MV_BIT_LEFT, TRUE, + IMG_INVISIBLE_SAND_ACTIVE_DIGGING_LEFT_CRUMBLED + }, + { + EL_INVISIBLE_SAND_ACTIVE, ACTION_DIGGING, MV_BIT_RIGHT, TRUE, + IMG_INVISIBLE_SAND_ACTIVE_DIGGING_RIGHT_CRUMBLED + }, + { + EL_INVISIBLE_SAND_ACTIVE, ACTION_DIGGING, MV_BIT_UP, TRUE, + IMG_INVISIBLE_SAND_ACTIVE_DIGGING_UP_CRUMBLED + }, + { + EL_INVISIBLE_SAND_ACTIVE, ACTION_DIGGING, MV_BIT_DOWN, TRUE, + IMG_INVISIBLE_SAND_ACTIVE_DIGGING_DOWN_CRUMBLED + }, { EL_CONVEYOR_BELT_1_MIDDLE, -1, -1, FALSE, IMG_CONVEYOR_BELT_1_MIDDLE @@ -1597,18 +1733,50 @@ element_to_graphic[] = EL_GATE_1_GRAY, -1, -1, FALSE, IMG_GATE_1_GRAY }, + { + EL_GATE_1_GRAY_ACTIVE, -1, -1, FALSE, + IMG_GATE_1_GRAY_ACTIVE + }, + { + EL_GATE_1_GRAY, ACTION_ACTIVE, -1, FALSE, + IMG_GATE_1_GRAY_ACTIVE + }, { EL_GATE_2_GRAY, -1, -1, FALSE, IMG_GATE_2_GRAY }, + { + EL_GATE_2_GRAY_ACTIVE, -1, -1, FALSE, + IMG_GATE_2_GRAY_ACTIVE + }, + { + EL_GATE_2_GRAY, ACTION_ACTIVE, -1, FALSE, + IMG_GATE_2_GRAY_ACTIVE + }, { EL_GATE_3_GRAY, -1, -1, FALSE, IMG_GATE_3_GRAY }, + { + EL_GATE_3_GRAY_ACTIVE, -1, -1, FALSE, + IMG_GATE_3_GRAY_ACTIVE + }, + { + EL_GATE_3_GRAY, ACTION_ACTIVE, -1, FALSE, + IMG_GATE_3_GRAY_ACTIVE + }, { EL_GATE_4_GRAY, -1, -1, FALSE, IMG_GATE_4_GRAY }, + { + EL_GATE_4_GRAY_ACTIVE, -1, -1, FALSE, + IMG_GATE_4_GRAY_ACTIVE + }, + { + EL_GATE_4_GRAY, ACTION_ACTIVE, -1, FALSE, + IMG_GATE_4_GRAY_ACTIVE + }, { EL_GAME_OF_LIFE, -1, -1, FALSE, IMG_GAME_OF_LIFE @@ -2570,52 +2738,84 @@ element_to_graphic[] = IMG_TRIGGER_PLAYER }, { - EL_EM_KEY_5, -1, -1, FALSE, - IMG_EM_KEY_5 + EL_EMC_KEY_5, -1, -1, FALSE, + IMG_EMC_KEY_5 + }, + { + EL_EMC_KEY_6, -1, -1, FALSE, + IMG_EMC_KEY_6 }, { - EL_EM_KEY_6, -1, -1, FALSE, - IMG_EM_KEY_6 + EL_EMC_KEY_7, -1, -1, FALSE, + IMG_EMC_KEY_7 }, { - EL_EM_KEY_7, -1, -1, FALSE, - IMG_EM_KEY_7 + EL_EMC_KEY_8, -1, -1, FALSE, + IMG_EMC_KEY_8 }, { - EL_EM_KEY_8, -1, -1, FALSE, - IMG_EM_KEY_8 + EL_EMC_GATE_5, -1, -1, FALSE, + IMG_EMC_GATE_5 }, { - EL_EM_GATE_5, -1, -1, FALSE, - IMG_EM_GATE_5 + EL_EMC_GATE_6, -1, -1, FALSE, + IMG_EMC_GATE_6 }, { - EL_EM_GATE_5_GRAY, -1, -1, FALSE, - IMG_EM_GATE_5_GRAY + EL_EMC_GATE_7, -1, -1, FALSE, + IMG_EMC_GATE_7 }, { - EL_EM_GATE_6, -1, -1, FALSE, - IMG_EM_GATE_6 + EL_EMC_GATE_8, -1, -1, FALSE, + IMG_EMC_GATE_8 }, { - EL_EM_GATE_6_GRAY, -1, -1, FALSE, - IMG_EM_GATE_6_GRAY + EL_EMC_GATE_5_GRAY, -1, -1, FALSE, + IMG_EMC_GATE_5_GRAY }, { - EL_EM_GATE_7, -1, -1, FALSE, - IMG_EM_GATE_7 + EL_EMC_GATE_5_GRAY_ACTIVE, -1, -1, FALSE, + IMG_EMC_GATE_5_GRAY_ACTIVE }, { - EL_EM_GATE_7_GRAY, -1, -1, FALSE, - IMG_EM_GATE_7_GRAY + EL_EMC_GATE_5_GRAY, ACTION_ACTIVE, -1, FALSE, + IMG_EMC_GATE_5_GRAY_ACTIVE }, { - EL_EM_GATE_8, -1, -1, FALSE, - IMG_EM_GATE_8 + EL_EMC_GATE_6_GRAY, -1, -1, FALSE, + IMG_EMC_GATE_6_GRAY }, { - EL_EM_GATE_8_GRAY, -1, -1, FALSE, - IMG_EM_GATE_8_GRAY + EL_EMC_GATE_6_GRAY_ACTIVE, -1, -1, FALSE, + IMG_EMC_GATE_6_GRAY_ACTIVE + }, + { + EL_EMC_GATE_6_GRAY, ACTION_ACTIVE, -1, FALSE, + IMG_EMC_GATE_6_GRAY_ACTIVE + }, + { + EL_EMC_GATE_7_GRAY, -1, -1, FALSE, + IMG_EMC_GATE_7_GRAY + }, + { + EL_EMC_GATE_7_GRAY_ACTIVE, -1, -1, FALSE, + IMG_EMC_GATE_7_GRAY_ACTIVE + }, + { + EL_EMC_GATE_7_GRAY, ACTION_ACTIVE, -1, FALSE, + IMG_EMC_GATE_7_GRAY_ACTIVE + }, + { + EL_EMC_GATE_8_GRAY, -1, -1, FALSE, + IMG_EMC_GATE_8_GRAY + }, + { + EL_EMC_GATE_8_GRAY_ACTIVE, -1, -1, FALSE, + IMG_EMC_GATE_8_GRAY_ACTIVE + }, + { + EL_EMC_GATE_8_GRAY, ACTION_ACTIVE, -1, FALSE, + IMG_EMC_GATE_8_GRAY_ACTIVE }, { EL_EMC_ANDROID, -1, -1, FALSE, @@ -2673,6 +2873,10 @@ element_to_graphic[] = EL_EMC_MAGIC_BALL, ACTION_ACTIVE, -1, FALSE, IMG_EMC_MAGIC_BALL_ACTIVE }, + { + EL_EMC_MAGIC_BALL, ACTION_DROPPING, -1, FALSE, + IMG_EMC_MAGIC_BALL_DROPPING + }, { EL_EMC_MAGIC_BALL_SWITCH, -1, -1, FALSE, IMG_EMC_MAGIC_BALL_SWITCH @@ -2761,10 +2965,42 @@ element_to_graphic[] = EL_EMC_FAKE_GRASS, -1, -1, FALSE, IMG_EMC_FAKE_GRASS }, + { + EL_EMC_FAKE_GRASS, -1, -1, TRUE, + IMG_EMC_FAKE_GRASS_CRUMBLED + }, + { + EL_EMC_FAKE_GRASS_ACTIVE, -1, -1, FALSE, + IMG_EMC_FAKE_GRASS_ACTIVE + }, + { + EL_EMC_FAKE_GRASS, ACTION_ACTIVE, -1, FALSE, + IMG_EMC_FAKE_GRASS_ACTIVE + }, + { + EL_EMC_FAKE_GRASS, ACTION_ACTIVE, -1, TRUE, + IMG_EMC_FAKE_GRASS_ACTIVE_CRUMBLED + }, + { + EL_EMC_FAKE_GRASS_ACTIVE, -1, -1, TRUE, + IMG_EMC_FAKE_GRASS_ACTIVE_CRUMBLED + }, + { + EL_EMC_FAKE_ACID, -1, -1, FALSE, + IMG_EMC_FAKE_ACID + }, { EL_EMC_DRIPPER, -1, -1, FALSE, IMG_EMC_DRIPPER }, + { + EL_EMC_DRIPPER_ACTIVE, -1, -1, FALSE, + IMG_EMC_DRIPPER_ACTIVE + }, + { + EL_EMC_DRIPPER, ACTION_ACTIVE, -1, FALSE, + IMG_EMC_DRIPPER_ACTIVE + }, { EL_BD_BUTTERFLY_DOWN, -1, -1, FALSE, IMG_BD_BUTTERFLY @@ -2878,8 +3114,8 @@ element_to_graphic[] = IMG_CHAR_DOLLAR }, { - EL_CHAR_PROCENT, -1, -1, FALSE, - IMG_CHAR_PROCENT + EL_CHAR_PERCENT, -1, -1, FALSE, + IMG_CHAR_PERCENT }, { EL_CHAR_AMPERSAND, -1, -1, FALSE,