X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=e8a4d64563d91239dddd5737d6762645046c8fe4;hb=784245c2e4dd32b84cff6c6044380c7801cb5513;hp=98b8375c478d79cce2130c2ea7a5fc7a69934f87;hpb=f5665efaa42ea2570819237740046ff1360c4ef6;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index 98b8375c..e8a4d645 100644 --- a/src/editor.c +++ b/src/editor.c @@ -429,7 +429,7 @@ #define GADGET_ID_TIME_OR_STEPS (GADGET_ID_SELECTBOX_FIRST + 0) #define GADGET_ID_CUSTOM_WALK_TO_ACTION (GADGET_ID_SELECTBOX_FIRST + 1) -#define GADGET_ID_CUSTOM_CONSISTENCY (GADGET_ID_SELECTBOX_FIRST + 2) +#define GADGET_ID_CUSTOM_EXPLOSION_TYPE (GADGET_ID_SELECTBOX_FIRST + 2) #define GADGET_ID_CUSTOM_DEADLINESS (GADGET_ID_SELECTBOX_FIRST + 3) #define GADGET_ID_CUSTOM_MOVE_PATTERN (GADGET_ID_SELECTBOX_FIRST + 4) #define GADGET_ID_CUSTOM_MOVE_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 5) @@ -507,30 +507,32 @@ #define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 13) #define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 14) #define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 15) -#define GADGET_ID_CUSTOM_EXPLODE_RESULT (GADGET_ID_CHECKBUTTON_FIRST + 16) -#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 17) -#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 18) -#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 19) -#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 20) -#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 21) -#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 22) -#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 23) -#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 24) -#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 25) -#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 26) -#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 27) -#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 28) -#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 29) -#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 30) -#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 31) -#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 32) -#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 33) -#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 34) -#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 35) -#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 36) +#define GADGET_ID_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 16) +#define GADGET_ID_CUSTOM_CAN_EXPLODE (GADGET_ID_CHECKBUTTON_FIRST + 17) +#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 18) +#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 19) +#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 20) +#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 21) +#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 22) +#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 23) +#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 24) +#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 25) +#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 26) +#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 27) +#define GADGET_ID_CUSTOM_GRAV_REACHABLE (GADGET_ID_CHECKBUTTON_FIRST + 28) +#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 29) +#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 30) +#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 31) +#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 32) +#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 33) +#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 34) +#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 35) +#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 36) +#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 37) +#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 38) /* gadgets for buttons in element list */ -#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 37) +#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 39) #define GADGET_ID_ELEMENTLIST_LAST (GADGET_ID_ELEMENTLIST_FIRST + \ ED_NUM_ELEMENTLIST_BUTTONS - 1) @@ -574,8 +576,8 @@ #define ED_COUNTER_ID_LEVEL_LAST ED_COUNTER_ID_LEVEL_RANDOM #define ED_COUNTER_ID_CUSTOM1_FIRST ED_COUNTER_ID_CUSTOM_SCORE -#define ED_COUNTER_ID_CUSTOM1_LAST ED_COUNTER_ID_MOVE_DELAY_RND -#define ED_COUNTER_ID_CUSTOM2_FIRST ED_COUNTER_ID_EXPLOSION_DELAY +#define ED_COUNTER_ID_CUSTOM1_LAST ED_COUNTER_ID_DROP_DELAY_RND +#define ED_COUNTER_ID_CUSTOM2_FIRST ED_COUNTER_ID_MOVE_DELAY_FIX #define ED_COUNTER_ID_CUSTOM2_LAST ED_COUNTER_ID_IGNITION_DELAY #define ED_COUNTER_ID_CUSTOM_FIRST ED_COUNTER_ID_CUSTOM1_FIRST #define ED_COUNTER_ID_CUSTOM_LAST ED_COUNTER_ID_CUSTOM2_LAST @@ -638,7 +640,7 @@ #define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS 10 #define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE 11 #define ED_SELECTBOX_ID_CUSTOM_DEADLINESS 12 -#define ED_SELECTBOX_ID_CUSTOM_CONSISTENCY 13 +#define ED_SELECTBOX_ID_CUSTOM_EXPLOSION_TYPE 13 #define ED_SELECTBOX_ID_CHANGE_TIME_UNITS 14 #define ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION 15 #define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION 16 @@ -655,9 +657,9 @@ #define ED_SELECTBOX_ID_LEVEL_LAST ED_SELECTBOX_ID_TIME_OR_STEPS #define ED_SELECTBOX_ID_CUSTOM1_FIRST ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE -#define ED_SELECTBOX_ID_CUSTOM1_LAST ED_SELECTBOX_ID_CUSTOM_MOVE_LEAVE_TYPE -#define ED_SELECTBOX_ID_CUSTOM2_FIRST ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS -#define ED_SELECTBOX_ID_CUSTOM2_LAST ED_SELECTBOX_ID_CUSTOM_CONSISTENCY +#define ED_SELECTBOX_ID_CUSTOM1_LAST ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION +#define ED_SELECTBOX_ID_CUSTOM2_FIRST ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN +#define ED_SELECTBOX_ID_CUSTOM2_LAST ED_SELECTBOX_ID_CUSTOM_EXPLOSION_TYPE #define ED_SELECTBOX_ID_CUSTOM_FIRST ED_SELECTBOX_ID_CUSTOM1_FIRST #define ED_SELECTBOX_ID_CUSTOM_LAST ED_SELECTBOX_ID_CUSTOM2_LAST @@ -711,33 +713,35 @@ #define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 14 #define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 15 #define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 16 -#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 17 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 18 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 19 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 20 -#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 21 -#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 22 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_RESULT 23 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 24 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 25 -#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 26 -#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 27 -#define ED_CHECKBUTTON_ID_CHANGE_DELAY 28 -#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 29 -#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 30 -#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 31 -#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 32 -#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 33 -#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 34 - -#define ED_NUM_CHECKBUTTONS 35 +#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE 17 +#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 18 +#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE 19 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 20 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 21 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 22 +#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 23 +#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 24 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE 25 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 26 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 27 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 28 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 29 +#define ED_CHECKBUTTON_ID_CHANGE_DELAY 30 +#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 31 +#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 32 +#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 33 +#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 34 +#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 35 +#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 36 + +#define ED_NUM_CHECKBUTTONS 37 #define ED_CHECKBUTTON_ID_LEVEL_FIRST ED_CHECKBUTTON_ID_DOUBLE_SPEED #define ED_CHECKBUTTON_ID_LEVEL_LAST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED #define ED_CHECKBUTTON_ID_CUSTOM1_FIRST ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC -#define ED_CHECKBUTTON_ID_CUSTOM1_LAST ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE -#define ED_CHECKBUTTON_ID_CUSTOM2_FIRST ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL +#define ED_CHECKBUTTON_ID_CUSTOM1_LAST ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE +#define ED_CHECKBUTTON_ID_CUSTOM2_FIRST ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE #define ED_CHECKBUTTON_ID_CUSTOM2_LAST ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT #define ED_CHECKBUTTON_ID_CUSTOM_FIRST ED_CHECKBUTTON_ID_CUSTOM1_FIRST #define ED_CHECKBUTTON_ID_CUSTOM_LAST ED_CHECKBUTTON_ID_CUSTOM2_LAST @@ -1037,8 +1041,11 @@ static struct &custom_element.drop_delay_random, NULL, "+random", NULL }, + + /* ---------- element settings: configure 2 (custom elements) ------------ */ + { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(13), + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(5), 0, 999, GADGET_ID_MOVE_DELAY_FIX_DOWN, GADGET_ID_MOVE_DELAY_FIX_UP, GADGET_ID_MOVE_DELAY_FIX_TEXT, GADGET_ID_NONE, @@ -1046,18 +1053,15 @@ static struct NULL, "move delay", NULL }, { - -1, ED_SETTINGS_YPOS(13), + -1, ED_SETTINGS_YPOS(5), 0, 999, GADGET_ID_MOVE_DELAY_RND_DOWN, GADGET_ID_MOVE_DELAY_RND_UP, GADGET_ID_MOVE_DELAY_RND_TEXT, GADGET_ID_MOVE_DELAY_FIX_UP, &custom_element.move_delay_random, NULL, "+random", NULL }, - - /* ---------- element settings: configure 2 (custom elements) ------------ */ - { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(4), + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(12), 0, 255, GADGET_ID_EXPLOSION_DELAY_DOWN, GADGET_ID_EXPLOSION_DELAY_UP, GADGET_ID_EXPLOSION_DELAY_TEXT, GADGET_ID_NONE, @@ -1065,7 +1069,7 @@ static struct NULL, "explosion delay", NULL }, { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(5), + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(13), 0, 255, GADGET_ID_IGNITION_DELAY_DOWN, GADGET_ID_IGNITION_DELAY_UP, GADGET_ID_IGNITION_DELAY_TEXT, GADGET_ID_NONE, @@ -1221,6 +1225,7 @@ static struct ValueTextInfo options_walk_to_action[] = { EP_DIGGABLE, "diggable" }, { EP_COLLECTIBLE_ONLY, "collectible" }, { EP_DROPPABLE, "collectible & droppable" }, + { EP_THROWABLE, "collectible & throwable" }, { EP_PUSHABLE, "pushable" }, { -1, NULL } @@ -1244,10 +1249,10 @@ static struct ValueTextInfo options_move_pattern[] = { MV_TURNING_LEFT_RIGHT, "turning left, right" }, { MV_TURNING_RIGHT_LEFT, "turning right, left" }, { MV_TURNING_RANDOM, "turning random" }, - { MV_WHEN_PUSHED, "when pushed" }, - { MV_WHEN_DROPPED, "when dropped" }, { MV_MAZE_RUNNER, "maze runner style" }, { MV_MAZE_HUNTER, "maze hunter style" }, + { MV_WHEN_PUSHED, "when pushed" }, + { MV_WHEN_DROPPED, "when dropped/thrown" }, { -1, NULL } }; @@ -1318,12 +1323,14 @@ static struct ValueTextInfo options_deadliness[] = { -1, NULL } }; -static struct ValueTextInfo options_consistency[] = +static struct ValueTextInfo options_explosion_type[] = { - { EP_CAN_EXPLODE_3X3, "can explode 3x3" }, - { EP_CAN_EXPLODE_CROSS, "can explode 3+3" }, - { EP_CAN_EXPLODE_1X1, "can explode 1x1" }, + { EXPLODES_3X3, "3x3" }, + { EXPLODES_CROSS, "3+3" }, + { EXPLODES_1X1, "1x1" }, +#if 0 { EP_INDESTRUCTIBLE, "indestructible" }, +#endif { -1, NULL } }; @@ -1338,18 +1345,21 @@ static struct ValueTextInfo options_time_units[] = static struct ValueTextInfo options_change_direct_action[] = { - { CE_TOUCHED_BY_PLAYER, "touched by player ..." }, - { CE_PRESSED_BY_PLAYER, "pressed by player ..." }, - { CE_PUSHED_BY_PLAYER, "pushed by player ..." }, - { CE_ENTERED_BY_PLAYER, "entered by player ..." }, - { CE_LEFT_BY_PLAYER, "left by player ..." }, - { CE_DROPPED_BY_PLAYER, "dropped by player" }, - { CE_SWITCHED, "switched ..." }, + { CE_TOUCHED_BY_PLAYER, "touched by player" }, + { CE_PRESSED_BY_PLAYER, "pressed by player" }, + { CE_PUSHED_BY_PLAYER, "pushed by player" }, + { CE_ENTERED_BY_PLAYER, "entered by player" }, + { CE_LEFT_BY_PLAYER, "left by player" }, + { CE_DROPPED_BY_PLAYER, "dropped/thrown by player" }, + { CE_SWITCHED, "switched" }, #if 1 - { CE_HITTING_SOMETHING, "hitting something ..." }, - { CE_HIT_BY_SOMETHING, "hit by something ..." }, + { CE_HITTING_SOMETHING, "hitting something" }, + { CE_HIT_BY_SOMETHING, "hit by something" }, #else - { CE_HITTING_SOMETHING, "collision ..." }, + { CE_HITTING_SOMETHING, "collision" }, +#endif +#if 1 + { CE_BLOCKED, "blocked" }, #endif { CE_IMPACT, "impact (on something)" }, { CE_SMASHED, "smashed (from above)" }, @@ -1359,20 +1369,20 @@ static struct ValueTextInfo options_change_direct_action[] = static struct ValueTextInfo options_change_other_action[] = { - { CE_OTHER_GETS_TOUCHED, "player touches ..." }, - { CE_OTHER_GETS_PRESSED, "player presses ..." }, - { CE_OTHER_GETS_PUSHED, "player pushes ..." }, - { CE_OTHER_GETS_ENTERED, "player enters ..." }, - { CE_OTHER_GETS_LEFT, "player leaves ..." }, + { CE_OTHER_GETS_TOUCHED, "player touches" }, + { CE_OTHER_GETS_PRESSED, "player presses" }, + { CE_OTHER_GETS_PUSHED, "player pushes" }, + { CE_OTHER_GETS_ENTERED, "player enters" }, + { CE_OTHER_GETS_LEFT, "player leaves" }, { CE_OTHER_GETS_DIGGED, "player digs" }, { CE_OTHER_GETS_COLLECTED, "player collects" }, - { CE_OTHER_GETS_DROPPED, "player drops" }, - { CE_OTHER_IS_TOUCHING, "touching ..." }, + { CE_OTHER_GETS_DROPPED, "player drops/throws" }, + { CE_OTHER_IS_TOUCHING, "touching" }, #if 1 - { CE_OTHER_IS_HITTING, "hitting ..." }, - { CE_OTHER_GETS_HIT, "hit by ..." }, + { CE_OTHER_IS_HITTING, "hitting" }, + { CE_OTHER_GETS_HIT, "hit by" }, #endif - { CE_OTHER_IS_SWITCHING, "switch of ..." }, + { CE_OTHER_IS_SWITCHING, "switch of" }, { CE_OTHER_IS_CHANGING, "change by page of" }, { CE_OTHER_IS_EXPLODING, "explosion of" }, @@ -1445,7 +1455,10 @@ static struct ValueTextInfo options_change_trigger_page[] = static struct ValueTextInfo options_change_replace_when[] = { { CP_WHEN_EMPTY, "empty" }, + { CP_WHEN_WALKABLE, "walkable" }, { CP_WHEN_DIGGABLE, "diggable" }, + { CP_WHEN_COLLECTIBLE, "collectible" }, + { CP_WHEN_REMOVABLE, "removable" }, { CP_WHEN_DESTRUCTIBLE, "destructible" }, { -1, NULL } @@ -1532,16 +1545,19 @@ static struct &custom_element.walk_to_action, NULL, NULL, "diggable/collectible/pushable" }, + + /* ---------- element settings: configure 2 (custom elements) ----------- */ + { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(9), + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(1), GADGET_ID_CUSTOM_MOVE_PATTERN, GADGET_ID_NONE, -1, options_move_pattern, &custom_element.move_pattern, - "can move", NULL, "element move direction" + "can move", NULL, "element move pattern" }, { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(10), + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(2), GADGET_ID_CUSTOM_MOVE_DIRECTION, GADGET_ID_NONE, -1, options_move_direction, @@ -1549,7 +1565,7 @@ static struct "starts moving", NULL, "initial element move direction" }, { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(12), + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(4), GADGET_ID_CUSTOM_MOVE_STEPSIZE, GADGET_ID_NONE, -1, options_move_stepsize, @@ -1557,7 +1573,7 @@ static struct "move/fall speed", NULL, "speed of element movement" }, { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(11), + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(3), GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE, GADGET_ID_NONE, -1, options_move_leave_type, @@ -1565,7 +1581,7 @@ static struct "can dig: can", ":", "leave behind or change element" }, { - -1, ED_SETTINGS_YPOS(13), + -1, ED_SETTINGS_YPOS(7), GADGET_ID_CUSTOM_SMASH_TARGETS, GADGET_ID_CUSTOM_CAN_SMASH, -1, options_smash_targets, @@ -1573,18 +1589,15 @@ static struct "can smash", NULL, "elements that can be smashed" }, { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(14), + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(8), GADGET_ID_CUSTOM_SLIPPERY_TYPE, GADGET_ID_NONE, -1, options_slippery_type, &custom_element.slippery_type, "slippery", NULL, "where other elements fall down" }, - - /* ---------- element settings: configure 2 (custom elements) ----------- */ - { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(1), + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(9), GADGET_ID_CUSTOM_DEADLINESS, GADGET_ID_NONE, -1, options_deadliness, @@ -1592,12 +1605,12 @@ static struct "deadly when", NULL, "deadliness of element" }, { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(2), - GADGET_ID_CUSTOM_CONSISTENCY, GADGET_ID_NONE, + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(10), + GADGET_ID_CUSTOM_EXPLOSION_TYPE, GADGET_ID_NONE, -1, - options_consistency, - &custom_element.consistency, - NULL, NULL, "consistency/destructibility" + options_explosion_type, + &custom_element.explosion_type, + "can explode", NULL, "explosion type" }, /* ---------- element settings: advanced (custom elements) --------------- */ @@ -1632,7 +1645,7 @@ static struct -1, options_change_trigger_side, &custom_element_change.trigger_side, - "... at", "side", "element side that causes change" + "at", "side", "element side that causes change" }, { ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(7), @@ -2026,7 +2039,11 @@ static struct ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(1), GADGET_ID_CUSTOM_USE_GRAPHIC, GADGET_ID_NONE, &custom_element.use_gfx_element, - NULL, "use graphic of element:", "use graphic for custom element" +#if 0 + NULL, "use graphic/sound of element:", "use existing graphic and sound" +#else + NULL, "use graphic of element:", "use existing element graphic" +#endif }, { ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(2), @@ -2040,6 +2057,12 @@ static struct &custom_element_properties[EP_ACCESSIBLE], NULL, NULL, "player can walk to or pass this field" }, + { + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(10), + GADGET_ID_CUSTOM_GRAV_REACHABLE, GADGET_ID_NONE, + &custom_element_properties[EP_GRAVITY_REACHABLE], + NULL, "reachable despite gravity", "player can walk/dig despite gravity" + }, { ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(5), GADGET_ID_CUSTOM_WALK_TO_OBJECT, GADGET_ID_NONE, @@ -2048,59 +2071,65 @@ static struct }, { ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(9), + GADGET_ID_CUSTOM_INDESTRUCTIBLE, GADGET_ID_NONE, + &custom_element_properties[EP_INDESTRUCTIBLE], + NULL, "indestructible", "element is indestructible" + }, + + /* ---------- element settings: configure 2 (custom elements) ----------- */ + + { + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(1), GADGET_ID_CUSTOM_CAN_MOVE, GADGET_ID_NONE, &custom_element_properties[EP_CAN_MOVE], - NULL, NULL, "element can move in some direction" + NULL, NULL, "element can move with some pattern" }, { - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(13), + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(7), GADGET_ID_CUSTOM_CAN_FALL, GADGET_ID_NONE, &custom_element_properties[EP_CAN_FALL], NULL, "can fall", "element can fall down" }, { - -1, ED_SETTINGS_YPOS(13), + -1, ED_SETTINGS_YPOS(7), GADGET_ID_CUSTOM_CAN_SMASH, GADGET_ID_CUSTOM_CAN_FALL, &custom_element_properties[EP_CAN_SMASH], " ", NULL, "element can smash other elements" }, { - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(14), + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(8), GADGET_ID_CUSTOM_SLIPPERY, GADGET_ID_NONE, &custom_element_properties[EP_SLIPPERY], NULL, NULL, "other elements can fall down from it" }, - - /* ---------- element settings: configure 2 (custom elements) ----------- */ - { - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(1), + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(9), GADGET_ID_CUSTOM_DEADLY, GADGET_ID_NONE, &custom_element_properties[EP_DEADLY], NULL, NULL, "element can kill the player" }, { - ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(2), - GADGET_ID_CUSTOM_EXPLODE_RESULT, GADGET_ID_NONE, - &custom_element_properties[EP_EXPLODE_RESULT], - NULL, NULL, "set consistency/destructibility" + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(10), + GADGET_ID_CUSTOM_CAN_EXPLODE, GADGET_ID_NONE, + &custom_element_properties[EP_CAN_EXPLODE], + NULL, NULL, "element can explode" }, { - ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(3), + ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(11), GADGET_ID_CUSTOM_EXPLODE_FIRE, GADGET_ID_NONE, - &custom_element.can_explode_by_fire, + &custom_element_properties[EP_EXPLODES_BY_FIRE], NULL, "by fire", "element can explode by fire/explosion" }, { - -1, ED_SETTINGS_YPOS(3), + -1, ED_SETTINGS_YPOS(11), GADGET_ID_CUSTOM_EXPLODE_SMASH, GADGET_ID_CUSTOM_EXPLODE_FIRE, - &custom_element.can_explode_smashed, + &custom_element_properties[EP_EXPLODES_SMASHED], " ", "smashed", "element can explode when smashed" }, { - -1, ED_SETTINGS_YPOS(3), + -1, ED_SETTINGS_YPOS(11), GADGET_ID_CUSTOM_EXPLODE_IMPACT, GADGET_ID_CUSTOM_EXPLODE_SMASH, - &custom_element.can_explode_impact, + &custom_element_properties[EP_EXPLODES_IMPACT], " ", "impact", "element can explode on impact" }, @@ -2234,6 +2263,8 @@ static struct "content:", NULL, NULL }, + /* ---------- element settings: configure 1 (custom elements) ----------- */ + /* ---------- custom graphic --------------------------------------------- */ { @@ -2243,10 +2274,12 @@ static struct NULL, NULL, NULL }, + /* ---------- element settings: configure 2 (custom elements) ----------- */ + /* ---------- custom content (when exploding) ---------------------------- */ { - -1, ED_AREA_3X3_SETTINGS_YPOS(2), + -1, ED_AREA_3X3_SETTINGS_YPOS(10), 3, 3, GADGET_ID_CUSTOM_CONTENT, GADGET_ID_NONE, /* align three rows */ "content:", NULL, NULL @@ -2255,18 +2288,20 @@ static struct /* ---------- custom enter and leave element (when moving) --------------- */ { - ED_AREA_1X1_SETTINGS_XPOS(1), ED_AREA_1X1_SETTINGS_YPOS(11), + ED_AREA_1X1_SETTINGS_XPOS(1), ED_AREA_1X1_SETTINGS_YPOS(3), 1, 1, GADGET_ID_CUSTOM_MOVE_ENTER, GADGET_ID_NONE, "can dig:", " ", NULL }, { - -1, ED_AREA_1X1_SETTINGS_YPOS(11), + -1, ED_AREA_1X1_SETTINGS_YPOS(3), 1, 1, GADGET_ID_CUSTOM_MOVE_LEAVE, GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE, NULL, NULL, NULL }, + /* ---------- element settings: advanced (custom elements) --------------- */ + /* ---------- custom change target --------------------------------------- */ { @@ -5324,13 +5359,15 @@ static void MapCheckbuttonGadget(int id) int xoffset_left = getTextWidthForGadget(checkbutton_info[id].text_left); int xoffset_right = ED_GADGET_TEXT_DISTANCE; int yoffset = ED_BORDER_SIZE; - int x_left = gi->x - xoffset_left; - int x_right = gi->x + gi->width + xoffset_right; - int y; /* set after gadget position was modified */ + int x_left, x_right, y; /* set after gadget position was modified */ - /* set position for gadgets with dynamically determined vertical position */ + /* set position for gadgets with dynamically determined position */ + if (checkbutton_info[id].x != -1) /* do not change dynamic positions */ + ModifyGadget(gi, GDI_X, SX + checkbutton_info[id].x, GDI_END); ModifyGadget(gi, GDI_Y, SY + checkbutton_info[id].y, GDI_END); + x_left = gi->x - xoffset_left; + x_right = gi->x + gi->width + xoffset_right; y = gi->y + yoffset; if (checkbutton_info[id].text_left) @@ -5618,6 +5655,7 @@ static void copy_custom_element_settings(int element_from, int element_to) for (x = 0; x < 3; x++) ei_to->content[x][y] = ei_from->content[x][y]; + ei_to->explosion_type = ei_from->explosion_type; ei_to->explosion_delay = ei_from->explosion_delay; ei_to->ignition_delay = ei_from->ignition_delay; @@ -5806,12 +5844,14 @@ static void CopyCustomElementPropertiesToEditor(int element) (IS_DIGGABLE(element) ? EP_DIGGABLE : IS_COLLECTIBLE_ONLY(element) ? EP_COLLECTIBLE_ONLY : IS_DROPPABLE(element) ? EP_DROPPABLE : + IS_THROWABLE(element) ? EP_THROWABLE : IS_PUSHABLE(element) ? EP_PUSHABLE : custom_element.walk_to_action); custom_element_properties[EP_WALK_TO_OBJECT] = (IS_DIGGABLE(element) || IS_COLLECTIBLE_ONLY(element) || IS_DROPPABLE(element) || + IS_THROWABLE(element) || IS_PUSHABLE(element)); /* set smash targets selectbox help value */ @@ -5836,26 +5876,42 @@ static void CopyCustomElementPropertiesToEditor(int element) DONT_COLLIDE_WITH(element) || DONT_RUN_INTO(element)); - /* set consistency selectbox help value */ - custom_element.consistency = - (IS_INDESTRUCTIBLE(element) ? EP_INDESTRUCTIBLE : +#if 0 + /* set explosion type selectbox help value */ + custom_element.explosion_type = + ( +#if 0 + IS_INDESTRUCTIBLE(element) ? EP_INDESTRUCTIBLE : +#endif CAN_EXPLODE_1X1(element) ? EP_CAN_EXPLODE_1X1 : CAN_EXPLODE_3X3(element) ? EP_CAN_EXPLODE_3X3 : CAN_EXPLODE_CROSS(element) ? EP_CAN_EXPLODE_CROSS : - custom_element.consistency); - custom_element_properties[EP_EXPLODE_RESULT] = - (IS_INDESTRUCTIBLE(element) || + custom_element.explosion_type); + custom_element_properties[EP_CAN_EXPLODE_AT_ALL] = + ( +#if 0 + IS_INDESTRUCTIBLE(element) || +#endif CAN_EXPLODE_1X1(element) || CAN_EXPLODE_3X3(element) || CAN_EXPLODE_CROSS(element)); +#endif +#if 0 /* special case: sub-settings dependent from main setting */ +#if 0 + custom_element.can_explode_by_fire = CAN_EXPLODE_BY_FIRE(element); + custom_element.can_explode_smashed = CAN_EXPLODE_SMASHED(element); + custom_element.can_explode_impact = CAN_EXPLODE_IMPACT(element); +#else if (CAN_EXPLODE_BY_FIRE(element)) custom_element.can_explode_by_fire = TRUE; if (CAN_EXPLODE_SMASHED(element)) custom_element.can_explode_smashed = TRUE; if (CAN_EXPLODE_IMPACT(element)) custom_element.can_explode_impact = TRUE; +#endif +#endif /* ---------- element settings: advanced (custom elements) --------------- */ @@ -5870,6 +5926,7 @@ static void CopyCustomElementPropertiesToEditor(int element) HAS_CHANGE_EVENT(element, CE_SWITCHED) ? CE_SWITCHED : HAS_CHANGE_EVENT(element, CE_HITTING_SOMETHING) ? CE_HITTING_SOMETHING : HAS_CHANGE_EVENT(element, CE_HIT_BY_SOMETHING) ? CE_HIT_BY_SOMETHING : + HAS_CHANGE_EVENT(element, CE_BLOCKED) ? CE_BLOCKED : HAS_CHANGE_EVENT(element, CE_IMPACT) ? CE_IMPACT : HAS_CHANGE_EVENT(element, CE_SMASHED) ? CE_SMASHED : custom_element_change.direct_action); @@ -5936,6 +5993,9 @@ static void CopyCustomElementPropertiesToGame(int element) { int i; int access_type_and_layer; +#if 0 + boolean can_explode; +#endif /* mark that this custom element has been modified */ custom_element.modified_settings = TRUE; @@ -5981,6 +6041,7 @@ static void CopyCustomElementPropertiesToGame(int element) custom_element_properties[EP_DIGGABLE] = FALSE; custom_element_properties[EP_COLLECTIBLE_ONLY] = FALSE; custom_element_properties[EP_DROPPABLE] = FALSE; + custom_element_properties[EP_THROWABLE] = FALSE; custom_element_properties[EP_PUSHABLE] = FALSE; custom_element_properties[custom_element.walk_to_action] = custom_element_properties[EP_WALK_TO_OBJECT]; @@ -5999,18 +6060,34 @@ static void CopyCustomElementPropertiesToGame(int element) custom_element_properties[custom_element.deadliness] = custom_element_properties[EP_DEADLY]; - /* set consistency property from checkbox and selectbox */ +#if 0 + /* set explosion type property from checkbox and selectbox */ +#if 0 custom_element_properties[EP_INDESTRUCTIBLE] = FALSE; +#endif custom_element_properties[EP_CAN_EXPLODE_1X1] = FALSE; custom_element_properties[EP_CAN_EXPLODE_3X3] = FALSE; custom_element_properties[EP_CAN_EXPLODE_CROSS] = FALSE; custom_element_properties[EP_CAN_EXPLODE_BY_FIRE] = FALSE; custom_element_properties[EP_CAN_EXPLODE_SMASHED] = FALSE; custom_element_properties[EP_CAN_EXPLODE_IMPACT] = FALSE; - custom_element_properties[custom_element.consistency] = - custom_element_properties[EP_EXPLODE_RESULT]; + custom_element_properties[custom_element.explosion_type] = + custom_element_properties[EP_CAN_EXPLODE_AT_ALL]; +#endif +#if 0 /* special case: sub-settings dependent from main setting */ +#if 0 + can_explode = (custom_element_properties[EP_CAN_EXPLODE_1X1] || + custom_element_properties[EP_CAN_EXPLODE_3X3] || + custom_element_properties[EP_CAN_EXPLODE_CROSS]); + custom_element_properties[EP_CAN_EXPLODE_BY_FIRE] = + (can_explode && custom_element.can_explode_by_fire); + custom_element_properties[EP_CAN_EXPLODE_SMASHED] = + (can_explode && custom_element.can_explode_smashed); + custom_element_properties[EP_CAN_EXPLODE_IMPACT] = + (can_explode && custom_element.can_explode_impact); +#else if (custom_element_properties[EP_CAN_EXPLODE_1X1] || custom_element_properties[EP_CAN_EXPLODE_3X3] || custom_element_properties[EP_CAN_EXPLODE_CROSS]) @@ -6022,6 +6099,8 @@ static void CopyCustomElementPropertiesToGame(int element) custom_element_properties[EP_CAN_EXPLODE_IMPACT] = custom_element.can_explode_impact; } +#endif +#endif /* ---------- element settings: advanced (custom elements) --------------- */ @@ -6035,6 +6114,7 @@ static void CopyCustomElementPropertiesToGame(int element) custom_element_change_events[CE_SWITCHED] = FALSE; custom_element_change_events[CE_HITTING_SOMETHING] = FALSE; custom_element_change_events[CE_HIT_BY_SOMETHING] = FALSE; + custom_element_change_events[CE_BLOCKED] = FALSE; custom_element_change_events[CE_IMPACT] = FALSE; custom_element_change_events[CE_SMASHED] = FALSE; custom_element_change_events[custom_element_change.direct_action] = @@ -6156,7 +6236,7 @@ void DrawLevelEd() redraw_mask |= REDRAW_ALL; - ReinitializeElementListButtons(); /* only needed after setup changes */ + ReinitializeElementListButtons(); /* custom element may look different */ #if 0 ModifyEditorElementList(); /* may be needed for custom elements */ #endif @@ -6434,7 +6514,7 @@ static void DrawCustomContentArea() int id = ED_DRAWING_ID_CUSTOM_CONTENT; struct GadgetInfo *gi = level_editor_gadget[drawingarea_info[id].gadget_id]; int x1 = right_gadget_border[GADGET_ID_CUSTOM_DEADLINESS]; - int x2 = right_gadget_border[GADGET_ID_CUSTOM_CONSISTENCY]; + int x2 = right_gadget_border[GADGET_ID_CUSTOM_EXPLOSION_TYPE]; int x3 = right_gadget_border[GADGET_ID_CUSTOM_EXPLODE_IMPACT]; int xoffset = ED_DRAWINGAREA_TEXT_DISTANCE; @@ -6748,14 +6828,16 @@ static void DrawPropertiesInfo() { EP_PASSABLE_OVER, "- player can pass over it" }, { EP_PASSABLE_INSIDE, "- player can pass through it" }, { EP_PASSABLE_UNDER, "- player can pass under it" }, + { EP_PROTECTED, "- player is protected by it" }, { EP_DIGGABLE, "- can be digged away" }, { EP_COLLECTIBLE, "- can be collected" }, { EP_DROPPABLE, "- can be dropped after collecting" }, + { EP_THROWABLE, "- can be thrown after collecting" }, { EP_PUSHABLE, "- can be pushed" }, - { EP_CAN_MOVE, "- can move" }, { EP_CAN_FALL, "- can fall" }, + { EP_CAN_MOVE, "- can move" }, { EP_CAN_SMASH_PLAYER, "- can smash player" }, #if 0 @@ -6763,7 +6845,7 @@ static void DrawPropertiesInfo() #endif { EP_CAN_SMASH_EVERYTHING, "- can smash everything smashable" }, - { EP_SLIPPERY, "- slippery for falling objects" }, + { EP_SLIPPERY, "- slippery for falling elements" }, { EP_EM_SLIPPERY_WALL, "- slippery for some gems (EM style)" }, { EP_DONT_RUN_INTO, "- deadly when running into" }, @@ -6780,6 +6862,7 @@ static void DrawPropertiesInfo() /* pre-defined properties */ { EP_CAN_PASS_MAGIC_WALL, "- can pass magic walls" }, + { EP_SWITCHABLE, "- can be switched" }, { EP_HAS_CONTENT, "- can contain other elements" }, { -1, NULL } @@ -7028,6 +7111,8 @@ static void DrawPropertiesConfig() edit_mode_properties == ED_MODE_PROPERTIES_CONFIG_2)) { /* set position for checkbutton for "can move into acid" */ + checkbutton_info[ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID].x = + ED_SETTINGS_XPOS(IS_CUSTOM_ELEMENT(properties_element) ? 1 : 0); checkbutton_info[ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID].y = ED_SETTINGS_YPOS(IS_CUSTOM_ELEMENT(properties_element) ? 6 : HAS_CONTENT(properties_element) ? 1 : 0); @@ -7095,8 +7180,6 @@ static void DrawPropertiesConfig() /* draw drawing area gadgets */ MapDrawingArea(ED_DRAWING_ID_CUSTOM_GRAPHIC); - MapDrawingArea(ED_DRAWING_ID_CUSTOM_MOVE_ENTER); - MapDrawingArea(ED_DRAWING_ID_CUSTOM_MOVE_LEAVE); } else if (edit_mode_properties == ED_MODE_PROPERTIES_CONFIG_2) { @@ -7116,6 +7199,8 @@ static void DrawPropertiesConfig() MapSelectboxGadget(i); /* draw drawing area gadgets */ + MapDrawingArea(ED_DRAWING_ID_CUSTOM_MOVE_ENTER); + MapDrawingArea(ED_DRAWING_ID_CUSTOM_MOVE_LEAVE); DrawCustomContentArea(); } } @@ -8984,7 +9069,15 @@ void HandleLevelEditorKeyInput(Key key) { RequestExitLevelEditor(setup.ask_on_escape); } - else + else if (edit_mode == ED_MODE_INFO) + { + HandleControlButtons(level_editor_gadget[GADGET_ID_INFO]); + } + else if (edit_mode == ED_MODE_PROPERTIES) + { + HandleControlButtons(level_editor_gadget[GADGET_ID_PROPERTIES]); + } + else /* should never happen */ { DrawDrawingWindow(); edit_mode = ED_MODE_DRAWING; @@ -9308,9 +9401,6 @@ void RequestExitLevelEditor(boolean ask_if_level_has_changed) else { CloseDoor(DOOR_CLOSE_1); - BlitBitmap(bitmap_db_door, bitmap_db_door, - DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE,DYSIZE, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); - OpenDoor(DOOR_OPEN_1); + OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK); } }