X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=fe1c0301fa921dfe7f2371c3d95533a8a39fd1b2;hb=a69eb334eb2efcbd1d0dcf26ccfd2e350b419697;hp=2f5154c1d3d444f17d8a8f98fea6da3af95bab6d;hpb=3bf51f147946d7080ed973f7d1fca2971e5009d2;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index 2f5154c1..fe1c0301 100644 --- a/src/editor.c +++ b/src/editor.c @@ -443,18 +443,20 @@ #define GADGET_ID_MAGIC_BALL_CONTENT_7 (GADGET_ID_DRAWING_AREA_FIRST + 16) #define GADGET_ID_AMOEBA_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 17) #define GADGET_ID_START_ELEMENT (GADGET_ID_DRAWING_AREA_FIRST + 18) -#define GADGET_ID_CUSTOM_GRAPHIC (GADGET_ID_DRAWING_AREA_FIRST + 19) -#define GADGET_ID_CUSTOM_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 20) -#define GADGET_ID_CUSTOM_MOVE_ENTER (GADGET_ID_DRAWING_AREA_FIRST + 21) -#define GADGET_ID_CUSTOM_MOVE_LEAVE (GADGET_ID_DRAWING_AREA_FIRST + 22) -#define GADGET_ID_CUSTOM_CHANGE_TARGET (GADGET_ID_DRAWING_AREA_FIRST + 23) -#define GADGET_ID_CUSTOM_CHANGE_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 24) -#define GADGET_ID_CUSTOM_CHANGE_TRIGGER (GADGET_ID_DRAWING_AREA_FIRST + 25) -#define GADGET_ID_GROUP_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 26) -#define GADGET_ID_RANDOM_BACKGROUND (GADGET_ID_DRAWING_AREA_FIRST + 27) +#define GADGET_ID_ARTWORK_ELEMENT (GADGET_ID_DRAWING_AREA_FIRST + 19) +#define GADGET_ID_EXPLOSION_ELEMENT (GADGET_ID_DRAWING_AREA_FIRST + 20) +#define GADGET_ID_CUSTOM_GRAPHIC (GADGET_ID_DRAWING_AREA_FIRST + 21) +#define GADGET_ID_CUSTOM_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 22) +#define GADGET_ID_CUSTOM_MOVE_ENTER (GADGET_ID_DRAWING_AREA_FIRST + 23) +#define GADGET_ID_CUSTOM_MOVE_LEAVE (GADGET_ID_DRAWING_AREA_FIRST + 24) +#define GADGET_ID_CUSTOM_CHANGE_TARGET (GADGET_ID_DRAWING_AREA_FIRST + 25) +#define GADGET_ID_CUSTOM_CHANGE_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 26) +#define GADGET_ID_CUSTOM_CHANGE_TRIGGER (GADGET_ID_DRAWING_AREA_FIRST + 27) +#define GADGET_ID_GROUP_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 28) +#define GADGET_ID_RANDOM_BACKGROUND (GADGET_ID_DRAWING_AREA_FIRST + 29) /* text input identifiers */ -#define GADGET_ID_TEXT_INPUT_FIRST (GADGET_ID_DRAWING_AREA_FIRST + 28) +#define GADGET_ID_TEXT_INPUT_FIRST (GADGET_ID_DRAWING_AREA_FIRST + 30) #define GADGET_ID_LEVEL_NAME (GADGET_ID_TEXT_INPUT_FIRST + 0) #define GADGET_ID_LEVEL_AUTHOR (GADGET_ID_TEXT_INPUT_FIRST + 1) @@ -554,38 +556,40 @@ #define GADGET_ID_SP_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 14) #define GADGET_ID_INSTANT_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 15) #define GADGET_ID_USE_START_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 16) -#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 17) -#define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 18) -#define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 19) -#define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 20) -#define GADGET_ID_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 21) -#define GADGET_ID_CUSTOM_CAN_EXPLODE (GADGET_ID_CHECKBUTTON_FIRST + 22) -#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 23) -#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 24) -#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 25) -#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 26) -#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 27) -#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 28) -#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 29) -#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 30) -#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 31) -#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 32) -#define GADGET_ID_CUSTOM_GRAV_REACHABLE (GADGET_ID_CHECKBUTTON_FIRST + 33) -#define GADGET_ID_CUSTOM_USE_LAST_VALUE (GADGET_ID_CHECKBUTTON_FIRST + 34) -#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 35) -#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 36) -#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 37) -#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 38) -#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 39) -#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 40) -#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 41) -#define GADGET_ID_CHANGE_HAS_ACTION (GADGET_ID_CHECKBUTTON_FIRST + 42) -#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 43) -#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 44) -#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 45) +#define GADGET_ID_USE_ARTWORK_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 17) +#define GADGET_ID_USE_EXPLOSION_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 18) +#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 19) +#define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 20) +#define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 21) +#define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 22) +#define GADGET_ID_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 23) +#define GADGET_ID_CUSTOM_CAN_EXPLODE (GADGET_ID_CHECKBUTTON_FIRST + 24) +#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 25) +#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 26) +#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 27) +#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 28) +#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 29) +#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 30) +#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 31) +#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 32) +#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 33) +#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 34) +#define GADGET_ID_CUSTOM_GRAV_REACHABLE (GADGET_ID_CHECKBUTTON_FIRST + 35) +#define GADGET_ID_CUSTOM_USE_LAST_VALUE (GADGET_ID_CHECKBUTTON_FIRST + 36) +#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 37) +#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 38) +#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 39) +#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 40) +#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 41) +#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 42) +#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 43) +#define GADGET_ID_CHANGE_HAS_ACTION (GADGET_ID_CHECKBUTTON_FIRST + 44) +#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 45) +#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 46) +#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 47) /* gadgets for buttons in element list */ -#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 46) +#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 48) #define GADGET_ID_ELEMENTLIST_LAST (GADGET_ID_ELEMENTLIST_FIRST + \ ED_NUM_ELEMENTLIST_BUTTONS - 1) @@ -775,37 +779,39 @@ #define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD 12 #define ED_CHECKBUTTON_ID_INSTANT_RELOCATION 13 #define ED_CHECKBUTTON_ID_USE_START_ELEMENT 14 -#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 15 -#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 16 -#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 17 -#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 18 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 19 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 20 -#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 21 -#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE 22 -#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE 23 -#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 24 -#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE 25 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 26 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 27 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 28 -#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 29 -#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 30 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE 31 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 32 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 33 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 34 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 35 -#define ED_CHECKBUTTON_ID_CHANGE_DELAY 36 -#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 37 -#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 38 -#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 39 -#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 40 -#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 41 -#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 42 -#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION 43 - -#define ED_NUM_CHECKBUTTONS 44 +#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT 15 +#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT 16 +#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 17 +#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 18 +#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 19 +#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 20 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 21 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 22 +#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 23 +#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE 24 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE 25 +#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 26 +#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE 27 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 28 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 29 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 30 +#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 31 +#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 32 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE 33 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 34 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 35 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 36 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 37 +#define ED_CHECKBUTTON_ID_CHANGE_DELAY 38 +#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 39 +#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 40 +#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 41 +#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 42 +#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 43 +#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 44 +#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION 45 + +#define ED_NUM_CHECKBUTTONS 46 #define ED_CHECKBUTTON_ID_LEVEL_FIRST ED_CHECKBUTTON_ID_INITIAL_GRAVITY #define ED_CHECKBUTTON_ID_LEVEL_LAST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED @@ -849,17 +855,19 @@ #define ED_DRAWING_ID_MAGIC_BALL_CONTENT_7 16 #define ED_DRAWING_ID_AMOEBA_CONTENT 17 #define ED_DRAWING_ID_START_ELEMENT 18 -#define ED_DRAWING_ID_CUSTOM_GRAPHIC 19 -#define ED_DRAWING_ID_CUSTOM_CONTENT 20 -#define ED_DRAWING_ID_CUSTOM_MOVE_ENTER 21 -#define ED_DRAWING_ID_CUSTOM_MOVE_LEAVE 22 -#define ED_DRAWING_ID_CUSTOM_CHANGE_TARGET 23 -#define ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT 24 -#define ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER 25 -#define ED_DRAWING_ID_GROUP_CONTENT 26 -#define ED_DRAWING_ID_RANDOM_BACKGROUND 27 +#define ED_DRAWING_ID_ARTWORK_ELEMENT 19 +#define ED_DRAWING_ID_EXPLOSION_ELEMENT 20 +#define ED_DRAWING_ID_CUSTOM_GRAPHIC 21 +#define ED_DRAWING_ID_CUSTOM_CONTENT 22 +#define ED_DRAWING_ID_CUSTOM_MOVE_ENTER 23 +#define ED_DRAWING_ID_CUSTOM_MOVE_LEAVE 24 +#define ED_DRAWING_ID_CUSTOM_CHANGE_TARGET 25 +#define ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT 26 +#define ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER 27 +#define ED_DRAWING_ID_GROUP_CONTENT 28 +#define ED_DRAWING_ID_RANDOM_BACKGROUND 29 -#define ED_NUM_DRAWING_AREAS 28 +#define ED_NUM_DRAWING_AREAS 30 /* @@ -1531,11 +1539,13 @@ static struct ValueTextInfo options_change_other_action[] = { CE_PLAYER_DROPS_X, "player drops/throws" }, { CE_TOUCHING_X, "touching" }, { CE_HITTING_X, "hitting" }, + { CE_DIGGING_X, "digging" }, { CE_HIT_BY_X, "hit by" }, { CE_SWITCH_OF_X, "switch of" }, { CE_CHANGE_OF_X, "change by page of" }, { CE_EXPLOSION_OF_X, "explosion of" }, { CE_MOVE_OF_X, "move of" }, + { CE_CREATION_OF_X, "creation of" }, { CE_VALUE_GETS_ZERO_OF_X, "CE value gets 0 of" }, { -1, NULL } @@ -1641,6 +1651,9 @@ static struct ValueTextInfo options_action_type[] = { CA_HEADLINE_CE_ACTIONS, "[CE actions]" }, { CA_SET_CE_SCORE, "set CE score" }, { CA_SET_CE_VALUE, "set CE value" }, + { CA_UNDEFINED, " " }, + { CA_HEADLINE_ENGINE_ACTIONS, "[engine actions]" }, + { CA_SET_ENGINE_SCAN_MODE, "set scan mode" }, { -1, NULL } }; @@ -1832,6 +1845,15 @@ static struct ValueTextInfo options_action_arg_direction[] = { -1, NULL } }; +static struct ValueTextInfo options_action_arg_scan_mode[] = +{ + { CA_ARG_SCAN_MODE_HEADLINE, "[mode]" }, + { CA_ARG_SCAN_MODE_NORMAL, "normal" }, + { CA_ARG_SCAN_MODE_REVERSE, "reverse" }, + + { -1, NULL } +}; + static char options_change_page_strings[MAX_CHANGE_PAGES][10]; static struct ValueTextInfo options_change_page[MAX_CHANGE_PAGES + 1] = { @@ -1882,6 +1904,7 @@ action_arg_options[] = { CA_SET_PLAYER_ARTWORK, 1, options_action_arg_artwork, }, { CA_SET_CE_SCORE, 3, options_action_arg_number, }, { CA_SET_CE_VALUE, 3, options_action_arg_number, }, + { CA_SET_ENGINE_SCAN_MODE, 1, options_action_arg_scan_mode, }, { -1, FALSE, NULL } }; @@ -2426,56 +2449,70 @@ static struct "can grow into anything diggable", "grow into more than just sand" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(4), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(5), GADGET_ID_DOUBLE_SPEED, GADGET_ID_NONE, &level.double_speed, NULL, "double speed movement", "set initial movement speed of player" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(5), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(6), GADGET_ID_BLOCK_SNAP_FIELD, GADGET_ID_NONE, &level.block_snap_field, NULL, "block snapped field when snapping", "use snapping delay to show animation" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(1), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(2), GADGET_ID_BLOCK_LAST_FIELD, GADGET_ID_NONE, &level.block_last_field, NULL, "block last field when moving", "player blocks last field when moving" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(1), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(2), GADGET_ID_SP_BLOCK_LAST_FIELD, GADGET_ID_NONE, &level.sp_block_last_field, NULL, "block last field when moving", "player blocks last field when moving" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(2), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(3), GADGET_ID_INSTANT_RELOCATION, GADGET_ID_NONE, &level.instant_relocation, NULL, "no scrolling when relocating", "player gets relocated without delay" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(6), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(7), GADGET_ID_USE_START_ELEMENT, GADGET_ID_NONE, &level.use_start_element[0], NULL, "use level start element:", "start level at this element's position" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(3), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(8), + GADGET_ID_USE_ARTWORK_ELEMENT, GADGET_ID_NONE, + &level.use_artwork_element[0], + NULL, + "use artwork from element:", "use player artwork from other element" + }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(9), + GADGET_ID_USE_EXPLOSION_ELEMENT, GADGET_ID_NONE, + &level.use_explosion_element[0], + NULL, + "use explosion from element:", "use explosion properties from element" + }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(4), GADGET_ID_CAN_PASS_TO_WALKABLE, GADGET_ID_NONE, &level.can_pass_to_walkable, NULL, "can pass to walkable element", "player can pass to empty or walkable" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(0), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(1), GADGET_ID_CAN_FALL_INTO_ACID, GADGET_ID_NONE, &custom_element_properties[EP_CAN_MOVE_INTO_ACID], NULL, @@ -2795,12 +2832,30 @@ static struct /* ---------- level start element ---------------------------------------- */ { - -1, ED_AREA_1X1_SETTINGS_YPOS(6), + -1, ED_AREA_1X1_SETTINGS_YPOS(7), GADGET_ID_START_ELEMENT, GADGET_ID_USE_START_ELEMENT, &level.start_element[0], 1, 1, NULL, NULL, NULL, "level start element" }, + /* ---------- player artwork element ------------------------------------- */ + + { + -1, ED_AREA_1X1_SETTINGS_YPOS(8), + GADGET_ID_ARTWORK_ELEMENT, GADGET_ID_USE_ARTWORK_ELEMENT, + &level.artwork_element[0], 1, 1, + NULL, NULL, NULL, "element for player artwork" + }, + + /* ---------- player explosion element ----------------------------------- */ + + { + -1, ED_AREA_1X1_SETTINGS_YPOS(9), + GADGET_ID_EXPLOSION_ELEMENT, GADGET_ID_USE_EXPLOSION_ELEMENT, + &level.explosion_element[0], 1, 1, + NULL, NULL, NULL, "element for player explosion" + }, + /* ---------- element settings: configure 1 (custom elements) ----------- */ /* ---------- custom graphic --------------------------------------------- */ @@ -3199,18 +3254,10 @@ static int editor_el_emerald_mine_club[] = EL_EMC_WALL_11, EL_EMC_WALL_12, -#if RELEASE_3_1_2 - EL_EMPTY, -#else EL_EMC_ANDROID, -#endif EL_BALLOON, EL_BALLOON_SWITCH_ANY, -#if RELEASE_3_1_2 - EL_EMPTY, -#else EL_BALLOON_SWITCH_NONE, -#endif EL_BALLOON_SWITCH_LEFT, EL_BALLOON_SWITCH_RIGHT, @@ -3219,38 +3266,18 @@ static int editor_el_emerald_mine_club[] = EL_EMC_GRASS, EL_EMC_PLANT, -#if RELEASE_3_1_2 - EL_EMPTY, - EL_EMPTY, -#else EL_EMC_LENSES, EL_EMC_MAGNIFIER, -#endif -#if RELEASE_3_1_2 - EL_EMPTY, - EL_EMPTY, -#else EL_EMC_MAGIC_BALL, EL_EMC_MAGIC_BALL_SWITCH, -#endif EL_SPRING, -#if RELEASE_3_1_2 - EL_EMPTY, -#else EL_EMC_SPRING_BUMPER, -#endif - -#if RELEASE_3_1_2 - EL_EMPTY, -#else #if 0 EL_EMC_DRIPPER, #else EL_EMPTY, -#endif - #endif EL_EMC_FAKE_GRASS, EL_EMPTY, @@ -4666,6 +4693,10 @@ static void DrawElementBorder(int dest_x, int dest_y, int width, int height, int src_x, src_y; int num_mini_tilex = width / MINI_TILEX + 1; int num_mini_tiley = height / MINI_TILEY + 1; + int from_x = dest_x - MINI_TILEX / 2; + int from_y = dest_y - MINI_TILEY / 2; + int to_x = from_x + num_mini_tilex * MINI_TILEX - 1; + int to_y = from_y + num_mini_tiley * MINI_TILEY - 1; int x, y; getMiniGraphicSource(border_graphic, &src_bitmap, &src_x, &src_y); @@ -4673,10 +4704,14 @@ static void DrawElementBorder(int dest_x, int dest_y, int width, int height, for (y = 0; y < num_mini_tiley; y++) for (x = 0; x < num_mini_tilex; x++) BlitBitmap(src_bitmap, drawto, src_x, src_y, MINI_TILEX, MINI_TILEY, - dest_x - MINI_TILEX / 2 + x * MINI_TILEX, - dest_y - MINI_TILEY / 2 + y * MINI_TILEY); + from_x + x * MINI_TILEX, from_y + y * MINI_TILEY); ClearRectangle(drawto, dest_x - 1, dest_y - 1, width + 2, height + 2); + + DrawSimpleBlackLine(drawto, from_x, from_y, to_x, from_y); + DrawSimpleBlackLine(drawto, to_x, from_y, to_x, to_y); + DrawSimpleBlackLine(drawto, to_x, to_y, from_x, to_y); + DrawSimpleBlackLine(drawto, from_x, to_y, from_x, from_y); } static void DrawDrawingArea(int id) @@ -6185,6 +6220,32 @@ static int setSelectboxValue(int selectbox_id, int new_value) return new_index_value; } +static void setSelectboxSpecialActionVariablesIfNeeded() +{ + int i; + + /* change action mode and arg variables according to action type variable */ + for (i = 0; action_arg_options[i].value != -1; i++) + { + if (action_arg_options[i].value == custom_element_change.action_type) + { + int mode = action_arg_options[i].mode; + + /* only change if corresponding selectbox has changed */ + if (selectbox_info[ED_SELECTBOX_ID_ACTION_MODE].options != + action_arg_modes[mode]) + custom_element_change.action_mode = -1; + + /* only change if corresponding selectbox has changed */ + if (selectbox_info[ED_SELECTBOX_ID_ACTION_ARG].options != + action_arg_options[i].options) + custom_element_change.action_arg = -1; + + break; + } + } +} + static void setSelectboxSpecialActionOptions() { int i; @@ -6205,6 +6266,7 @@ static void setSelectboxSpecialActionOptions() action_arg_options[i].options); ModifyEditorSelectboxValue(ED_SELECTBOX_ID_ACTION_ARG, custom_element_change.action_arg); + break; } } } @@ -6521,11 +6583,13 @@ static void CopyCustomElementPropertiesToEditor(int element) HAS_CHANGE_EVENT(element, CE_PLAYER_DROPS_X) ? CE_PLAYER_DROPS_X : HAS_CHANGE_EVENT(element, CE_TOUCHING_X) ? CE_TOUCHING_X : HAS_CHANGE_EVENT(element, CE_HITTING_X) ? CE_HITTING_X : + HAS_CHANGE_EVENT(element, CE_DIGGING_X) ? CE_DIGGING_X : HAS_CHANGE_EVENT(element, CE_HIT_BY_X) ? CE_HIT_BY_X : HAS_CHANGE_EVENT(element, CE_SWITCH_OF_X) ? CE_SWITCH_OF_X : HAS_CHANGE_EVENT(element, CE_CHANGE_OF_X) ? CE_CHANGE_OF_X : HAS_CHANGE_EVENT(element, CE_EXPLOSION_OF_X) ? CE_EXPLOSION_OF_X : HAS_CHANGE_EVENT(element, CE_MOVE_OF_X) ? CE_MOVE_OF_X : + HAS_CHANGE_EVENT(element, CE_CREATION_OF_X) ? CE_CREATION_OF_X : HAS_CHANGE_EVENT(element, CE_VALUE_GETS_ZERO_OF_X) ? CE_VALUE_GETS_ZERO_OF_X : custom_element_change.other_action); } @@ -6660,11 +6724,13 @@ static void CopyCustomElementPropertiesToGame(int element) custom_element_change_events[CE_PLAYER_DROPS_X] = FALSE; custom_element_change_events[CE_TOUCHING_X] = FALSE; custom_element_change_events[CE_HITTING_X] = FALSE; + custom_element_change_events[CE_DIGGING_X] = FALSE; custom_element_change_events[CE_HIT_BY_X] = FALSE; custom_element_change_events[CE_SWITCH_OF_X] = FALSE; custom_element_change_events[CE_CHANGE_OF_X] = FALSE; custom_element_change_events[CE_EXPLOSION_OF_X] = FALSE; custom_element_change_events[CE_MOVE_OF_X] = FALSE; + custom_element_change_events[CE_CREATION_OF_X] = FALSE; custom_element_change_events[CE_VALUE_GETS_ZERO_OF_X] = FALSE; custom_element_change_events[custom_element_change.other_action] = custom_element_change_events[CE_BY_OTHER_ACTION]; @@ -7666,13 +7732,21 @@ static void DrawPropertiesConfig() { int player_nr = GET_PLAYER_NR(properties_element); - /* this property can be set for every player individually */ + /* these properties can be set for every player individually */ drawingarea_info[ED_DRAWING_ID_START_ELEMENT].value = &level.start_element[player_nr]; + drawingarea_info[ED_DRAWING_ID_ARTWORK_ELEMENT].value = + &level.artwork_element[player_nr]; + drawingarea_info[ED_DRAWING_ID_EXPLOSION_ELEMENT].value = + &level.explosion_element[player_nr]; - /* this property can be set for every player individually */ + /* these properties can be set for every player individually */ checkbutton_info[ED_CHECKBUTTON_ID_USE_START_ELEMENT].value = &level.use_start_element[player_nr]; + checkbutton_info[ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT].value = + &level.use_artwork_element[player_nr]; + checkbutton_info[ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT].value = + &level.use_explosion_element[player_nr]; MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID); MapCheckbuttonGadget(properties_element == EL_SP_MURPHY ? @@ -7681,10 +7755,14 @@ static void DrawPropertiesConfig() MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_INSTANT_RELOCATION); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_START_ELEMENT); + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT); + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_DOUBLE_SPEED); MapDrawingArea(ED_DRAWING_ID_START_ELEMENT); + MapDrawingArea(ED_DRAWING_ID_ARTWORK_ELEMENT); + MapDrawingArea(ED_DRAWING_ID_EXPLOSION_ELEMENT); } if (IS_GEM(properties_element)) @@ -7878,7 +7956,18 @@ static void DrawPropertiesChange() DrawPropertiesChangeDrawingAreas(); } -static void DrawElementName(int x, int y, int element) +static void DrawEditorElementAnimation(int x, int y) +{ + int graphic = el2img(properties_element); + int frame = (ANIM_MODE(graphic) == ANIM_CE_VALUE ? + custom_element.ce_value_fixed_initial : + ANIM_MODE(graphic) == ANIM_CE_SCORE ? + custom_element.collect_score_initial : FrameCounter); + + DrawGraphicAnimationExt(drawto, x, y, graphic, frame, NO_MASKING); +} + +static void DrawEditorElementName(int x, int y, int element) { char *element_name = getElementInfoText(element); int font_nr = FONT_TEXT_1; @@ -7959,18 +8048,30 @@ static void DrawPropertiesWindow() "Element Settings", FONT_TITLE_1); #endif +#if 1 + FrameCounter = 0; /* restart animation frame counter */ +#endif + DrawElementBorder(SX + xstart * MINI_TILEX, SY + ystart * MINI_TILEY + MINI_TILEY / 2, TILEX, TILEY, FALSE); +#if 1 + DrawEditorElementAnimation(SX + xstart * MINI_TILEX, + SY + ystart * MINI_TILEY + MINI_TILEY / 2); +#else DrawGraphicAnimationExt(drawto, SX + xstart * MINI_TILEX, SY + ystart * MINI_TILEY + MINI_TILEY / 2, el2img(properties_element), -1, NO_MASKING); +#endif +#if 0 FrameCounter = 0; /* restart animation frame counter */ +#endif - DrawElementName((xstart + 3) * MINI_TILEX + 1, (ystart + 1) * MINI_TILEY + 1, - properties_element); + DrawEditorElementName((xstart + 3) * MINI_TILEX + 1, + (ystart + 1) * MINI_TILEY + 1, + properties_element); DrawPropertiesTabulatorGadgets(); @@ -9041,11 +9142,15 @@ static void HandleSelectboxGadgets(struct GadgetInfo *gi) { if (type_id == ED_SELECTBOX_ID_ACTION_TYPE) { - /* when changing action type, reset action mode and action arg */ + /* when changing action type, also check action mode and action arg */ if (value_old != value_new) { +#if 1 + setSelectboxSpecialActionVariablesIfNeeded(); +#else custom_element_change.action_mode = -1; custom_element_change.action_arg = -1; +#endif } DrawPropertiesChange(); @@ -9719,10 +9824,15 @@ void HandleLevelEditorIdle() if (!DelayReached(&action_delay, action_delay_value)) return; +#if 1 + DrawEditorElementAnimation(SX + xpos * TILEX, + SY + ypos * TILEY + MINI_TILEY / 2); +#else DrawGraphicAnimationExt(drawto, SX + xpos * TILEX, SY + ypos * TILEY + MINI_TILEY / 2, el2img(properties_element), -1, NO_MASKING); +#endif MarkTileDirty(xpos, ypos); MarkTileDirty(xpos, ypos + 1);