X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=2a4700546c28d3b07816007ffd1dc0c841b9960f;hb=eecbe2a298826a3c32ca78b81b77491702ced84c;hp=d141e16a962ad3bc9112eb3d4ba598ca872148f5;hpb=33bfa6789748737979047e8c8616f5c786b39958;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index d141e16a..2a470054 100644 --- a/src/editor.c +++ b/src/editor.c @@ -354,60 +354,72 @@ #define GADGET_ID_ELEMENT_VALUE2_DOWN (GADGET_ID_COUNTER_FIRST + 24) #define GADGET_ID_ELEMENT_VALUE2_TEXT (GADGET_ID_COUNTER_FIRST + 25) #define GADGET_ID_ELEMENT_VALUE2_UP (GADGET_ID_COUNTER_FIRST + 26) -#define GADGET_ID_YAMYAM_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 27) -#define GADGET_ID_YAMYAM_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 28) -#define GADGET_ID_YAMYAM_CONTENT_UP (GADGET_ID_COUNTER_FIRST + 29) -#define GADGET_ID_ENVELOPE_XSIZE_DOWN (GADGET_ID_COUNTER_FIRST + 30) -#define GADGET_ID_ENVELOPE_XSIZE_TEXT (GADGET_ID_COUNTER_FIRST + 31) -#define GADGET_ID_ENVELOPE_XSIZE_UP (GADGET_ID_COUNTER_FIRST + 32) -#define GADGET_ID_ENVELOPE_YSIZE_DOWN (GADGET_ID_COUNTER_FIRST + 33) -#define GADGET_ID_ENVELOPE_YSIZE_TEXT (GADGET_ID_COUNTER_FIRST + 34) -#define GADGET_ID_ENVELOPE_YSIZE_UP (GADGET_ID_COUNTER_FIRST + 35) -#define GADGET_ID_CUSTOM_SCORE_DOWN (GADGET_ID_COUNTER_FIRST + 36) -#define GADGET_ID_CUSTOM_SCORE_TEXT (GADGET_ID_COUNTER_FIRST + 37) -#define GADGET_ID_CUSTOM_SCORE_UP (GADGET_ID_COUNTER_FIRST + 38) -#define GADGET_ID_CUSTOM_GEMCOUNT_DOWN (GADGET_ID_COUNTER_FIRST + 39) -#define GADGET_ID_CUSTOM_GEMCOUNT_TEXT (GADGET_ID_COUNTER_FIRST + 40) -#define GADGET_ID_CUSTOM_GEMCOUNT_UP (GADGET_ID_COUNTER_FIRST + 41) -#define GADGET_ID_PUSH_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 42) -#define GADGET_ID_PUSH_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 43) -#define GADGET_ID_PUSH_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 44) -#define GADGET_ID_PUSH_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 45) -#define GADGET_ID_PUSH_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 46) -#define GADGET_ID_PUSH_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 47) -#define GADGET_ID_DROP_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 48) -#define GADGET_ID_DROP_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 49) -#define GADGET_ID_DROP_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 50) -#define GADGET_ID_DROP_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 51) -#define GADGET_ID_DROP_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 52) -#define GADGET_ID_DROP_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 53) -#define GADGET_ID_MOVE_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 54) -#define GADGET_ID_MOVE_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 55) -#define GADGET_ID_MOVE_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 56) -#define GADGET_ID_MOVE_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 57) -#define GADGET_ID_MOVE_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 58) -#define GADGET_ID_MOVE_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 59) -#define GADGET_ID_EXPLOSION_DELAY_DOWN (GADGET_ID_COUNTER_FIRST + 60) -#define GADGET_ID_EXPLOSION_DELAY_TEXT (GADGET_ID_COUNTER_FIRST + 61) -#define GADGET_ID_EXPLOSION_DELAY_UP (GADGET_ID_COUNTER_FIRST + 62) -#define GADGET_ID_IGNITION_DELAY_DOWN (GADGET_ID_COUNTER_FIRST + 63) -#define GADGET_ID_IGNITION_DELAY_TEXT (GADGET_ID_COUNTER_FIRST + 64) -#define GADGET_ID_IGNITION_DELAY_UP (GADGET_ID_COUNTER_FIRST + 65) -#define GADGET_ID_CHANGE_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 66) -#define GADGET_ID_CHANGE_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 67) -#define GADGET_ID_CHANGE_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 68) -#define GADGET_ID_CHANGE_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 69) -#define GADGET_ID_CHANGE_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 70) -#define GADGET_ID_CHANGE_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 71) -#define GADGET_ID_CHANGE_CONT_RND_DOWN (GADGET_ID_COUNTER_FIRST + 72) -#define GADGET_ID_CHANGE_CONT_RND_TEXT (GADGET_ID_COUNTER_FIRST + 73) -#define GADGET_ID_CHANGE_CONT_RND_UP (GADGET_ID_COUNTER_FIRST + 74) -#define GADGET_ID_GROUP_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 75) -#define GADGET_ID_GROUP_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 76) -#define GADGET_ID_GROUP_CONTENT_UP (GADGET_ID_COUNTER_FIRST + 77) +#define GADGET_ID_ELEMENT_VALUE3_DOWN (GADGET_ID_COUNTER_FIRST + 27) +#define GADGET_ID_ELEMENT_VALUE3_TEXT (GADGET_ID_COUNTER_FIRST + 28) +#define GADGET_ID_ELEMENT_VALUE3_UP (GADGET_ID_COUNTER_FIRST + 29) +#define GADGET_ID_ELEMENT_VALUE4_DOWN (GADGET_ID_COUNTER_FIRST + 30) +#define GADGET_ID_ELEMENT_VALUE4_TEXT (GADGET_ID_COUNTER_FIRST + 31) +#define GADGET_ID_ELEMENT_VALUE4_UP (GADGET_ID_COUNTER_FIRST + 32) +#define GADGET_ID_YAMYAM_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 33) +#define GADGET_ID_YAMYAM_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 34) +#define GADGET_ID_YAMYAM_CONTENT_UP (GADGET_ID_COUNTER_FIRST + 35) +#define GADGET_ID_ENVELOPE_XSIZE_DOWN (GADGET_ID_COUNTER_FIRST + 36) +#define GADGET_ID_ENVELOPE_XSIZE_TEXT (GADGET_ID_COUNTER_FIRST + 37) +#define GADGET_ID_ENVELOPE_XSIZE_UP (GADGET_ID_COUNTER_FIRST + 38) +#define GADGET_ID_ENVELOPE_YSIZE_DOWN (GADGET_ID_COUNTER_FIRST + 39) +#define GADGET_ID_ENVELOPE_YSIZE_TEXT (GADGET_ID_COUNTER_FIRST + 40) +#define GADGET_ID_ENVELOPE_YSIZE_UP (GADGET_ID_COUNTER_FIRST + 41) +#define GADGET_ID_CUSTOM_SCORE_DOWN (GADGET_ID_COUNTER_FIRST + 42) +#define GADGET_ID_CUSTOM_SCORE_TEXT (GADGET_ID_COUNTER_FIRST + 43) +#define GADGET_ID_CUSTOM_SCORE_UP (GADGET_ID_COUNTER_FIRST + 44) +#define GADGET_ID_CUSTOM_GEMCOUNT_DOWN (GADGET_ID_COUNTER_FIRST + 45) +#define GADGET_ID_CUSTOM_GEMCOUNT_TEXT (GADGET_ID_COUNTER_FIRST + 46) +#define GADGET_ID_CUSTOM_GEMCOUNT_UP (GADGET_ID_COUNTER_FIRST + 47) +#define GADGET_ID_CUSTOM_VALUE_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 48) +#define GADGET_ID_CUSTOM_VALUE_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 49) +#define GADGET_ID_CUSTOM_VALUE_FIX_UP (GADGET_ID_COUNTER_FIRST + 50) +#define GADGET_ID_CUSTOM_VALUE_RND_DOWN (GADGET_ID_COUNTER_FIRST + 51) +#define GADGET_ID_CUSTOM_VALUE_RND_TEXT (GADGET_ID_COUNTER_FIRST + 52) +#define GADGET_ID_CUSTOM_VALUE_RND_UP (GADGET_ID_COUNTER_FIRST + 53) +#define GADGET_ID_PUSH_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 54) +#define GADGET_ID_PUSH_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 55) +#define GADGET_ID_PUSH_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 56) +#define GADGET_ID_PUSH_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 57) +#define GADGET_ID_PUSH_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 58) +#define GADGET_ID_PUSH_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 59) +#define GADGET_ID_DROP_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 60) +#define GADGET_ID_DROP_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 61) +#define GADGET_ID_DROP_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 62) +#define GADGET_ID_DROP_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 63) +#define GADGET_ID_DROP_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 64) +#define GADGET_ID_DROP_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 65) +#define GADGET_ID_MOVE_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 66) +#define GADGET_ID_MOVE_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 67) +#define GADGET_ID_MOVE_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 68) +#define GADGET_ID_MOVE_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 69) +#define GADGET_ID_MOVE_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 70) +#define GADGET_ID_MOVE_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 71) +#define GADGET_ID_EXPLOSION_DELAY_DOWN (GADGET_ID_COUNTER_FIRST + 72) +#define GADGET_ID_EXPLOSION_DELAY_TEXT (GADGET_ID_COUNTER_FIRST + 73) +#define GADGET_ID_EXPLOSION_DELAY_UP (GADGET_ID_COUNTER_FIRST + 74) +#define GADGET_ID_IGNITION_DELAY_DOWN (GADGET_ID_COUNTER_FIRST + 75) +#define GADGET_ID_IGNITION_DELAY_TEXT (GADGET_ID_COUNTER_FIRST + 76) +#define GADGET_ID_IGNITION_DELAY_UP (GADGET_ID_COUNTER_FIRST + 77) +#define GADGET_ID_CHANGE_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 78) +#define GADGET_ID_CHANGE_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 79) +#define GADGET_ID_CHANGE_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 80) +#define GADGET_ID_CHANGE_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 81) +#define GADGET_ID_CHANGE_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 82) +#define GADGET_ID_CHANGE_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 83) +#define GADGET_ID_CHANGE_CONT_RND_DOWN (GADGET_ID_COUNTER_FIRST + 84) +#define GADGET_ID_CHANGE_CONT_RND_TEXT (GADGET_ID_COUNTER_FIRST + 85) +#define GADGET_ID_CHANGE_CONT_RND_UP (GADGET_ID_COUNTER_FIRST + 86) +#define GADGET_ID_GROUP_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 87) +#define GADGET_ID_GROUP_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 88) +#define GADGET_ID_GROUP_CONTENT_UP (GADGET_ID_COUNTER_FIRST + 89) /* drawing area identifiers */ -#define GADGET_ID_DRAWING_AREA_FIRST (GADGET_ID_COUNTER_FIRST + 78) +#define GADGET_ID_DRAWING_AREA_FIRST (GADGET_ID_COUNTER_FIRST + 90) #define GADGET_ID_DRAWING_LEVEL (GADGET_ID_DRAWING_AREA_FIRST + 0) #define GADGET_ID_YAMYAM_CONTENT_0 (GADGET_ID_DRAWING_AREA_FIRST + 1) @@ -427,18 +439,19 @@ #define GADGET_ID_MAGIC_BALL_CONTENT_6 (GADGET_ID_DRAWING_AREA_FIRST + 15) #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_CUSTOM_GRAPHIC (GADGET_ID_DRAWING_AREA_FIRST + 18) -#define GADGET_ID_CUSTOM_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 19) -#define GADGET_ID_CUSTOM_MOVE_ENTER (GADGET_ID_DRAWING_AREA_FIRST + 20) -#define GADGET_ID_CUSTOM_MOVE_LEAVE (GADGET_ID_DRAWING_AREA_FIRST + 21) -#define GADGET_ID_CUSTOM_CHANGE_TARGET (GADGET_ID_DRAWING_AREA_FIRST + 22) -#define GADGET_ID_CUSTOM_CHANGE_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 23) -#define GADGET_ID_CUSTOM_CHANGE_TRIGGER (GADGET_ID_DRAWING_AREA_FIRST + 24) -#define GADGET_ID_GROUP_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 25) -#define GADGET_ID_RANDOM_BACKGROUND (GADGET_ID_DRAWING_AREA_FIRST + 26) +#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) /* text input identifiers */ -#define GADGET_ID_TEXT_INPUT_FIRST (GADGET_ID_DRAWING_AREA_FIRST + 27) +#define GADGET_ID_TEXT_INPUT_FIRST (GADGET_ID_DRAWING_AREA_FIRST + 28) #define GADGET_ID_LEVEL_NAME (GADGET_ID_TEXT_INPUT_FIRST + 0) #define GADGET_ID_LEVEL_AUTHOR (GADGET_ID_TEXT_INPUT_FIRST + 1) @@ -454,34 +467,35 @@ #define GADGET_ID_TIME_OR_STEPS (GADGET_ID_SELECTBOX_FIRST + 0) #define GADGET_ID_GAME_ENGINE_TYPE (GADGET_ID_SELECTBOX_FIRST + 1) -#define GADGET_ID_CUSTOM_WALK_TO_ACTION (GADGET_ID_SELECTBOX_FIRST + 2) -#define GADGET_ID_CUSTOM_EXPLOSION_TYPE (GADGET_ID_SELECTBOX_FIRST + 3) -#define GADGET_ID_CUSTOM_DEADLINESS (GADGET_ID_SELECTBOX_FIRST + 4) -#define GADGET_ID_CUSTOM_MOVE_PATTERN (GADGET_ID_SELECTBOX_FIRST + 5) -#define GADGET_ID_CUSTOM_MOVE_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 6) -#define GADGET_ID_CUSTOM_MOVE_STEPSIZE (GADGET_ID_SELECTBOX_FIRST + 7) -#define GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE (GADGET_ID_SELECTBOX_FIRST + 8) -#define GADGET_ID_CUSTOM_SMASH_TARGETS (GADGET_ID_SELECTBOX_FIRST + 9) -#define GADGET_ID_CUSTOM_SLIPPERY_TYPE (GADGET_ID_SELECTBOX_FIRST + 10) -#define GADGET_ID_CUSTOM_ACCESS_TYPE (GADGET_ID_SELECTBOX_FIRST + 11) -#define GADGET_ID_CUSTOM_ACCESS_LAYER (GADGET_ID_SELECTBOX_FIRST + 12) -#define GADGET_ID_CUSTOM_ACCESS_PROTECTED (GADGET_ID_SELECTBOX_FIRST + 13) -#define GADGET_ID_CUSTOM_ACCESS_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 14) -#define GADGET_ID_CHANGE_TIME_UNITS (GADGET_ID_SELECTBOX_FIRST + 15) -#define GADGET_ID_CHANGE_DIRECT_ACTION (GADGET_ID_SELECTBOX_FIRST + 16) -#define GADGET_ID_CHANGE_OTHER_ACTION (GADGET_ID_SELECTBOX_FIRST + 17) -#define GADGET_ID_CHANGE_SIDE (GADGET_ID_SELECTBOX_FIRST + 18) -#define GADGET_ID_CHANGE_PLAYER (GADGET_ID_SELECTBOX_FIRST + 19) -#define GADGET_ID_CHANGE_PAGE (GADGET_ID_SELECTBOX_FIRST + 20) -#define GADGET_ID_CHANGE_REPLACE_WHEN (GADGET_ID_SELECTBOX_FIRST + 21) -#define GADGET_ID_ACTION_TYPE (GADGET_ID_SELECTBOX_FIRST + 22) -#define GADGET_ID_ACTION_MODE (GADGET_ID_SELECTBOX_FIRST + 23) -#define GADGET_ID_ACTION_ARG (GADGET_ID_SELECTBOX_FIRST + 24) -#define GADGET_ID_SELECT_CHANGE_PAGE (GADGET_ID_SELECTBOX_FIRST + 25) -#define GADGET_ID_GROUP_CHOICE_MODE (GADGET_ID_SELECTBOX_FIRST + 26) +#define GADGET_ID_WIND_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 2) +#define GADGET_ID_CUSTOM_WALK_TO_ACTION (GADGET_ID_SELECTBOX_FIRST + 3) +#define GADGET_ID_CUSTOM_EXPLOSION_TYPE (GADGET_ID_SELECTBOX_FIRST + 4) +#define GADGET_ID_CUSTOM_DEADLINESS (GADGET_ID_SELECTBOX_FIRST + 5) +#define GADGET_ID_CUSTOM_MOVE_PATTERN (GADGET_ID_SELECTBOX_FIRST + 6) +#define GADGET_ID_CUSTOM_MOVE_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 7) +#define GADGET_ID_CUSTOM_MOVE_STEPSIZE (GADGET_ID_SELECTBOX_FIRST + 8) +#define GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE (GADGET_ID_SELECTBOX_FIRST + 9) +#define GADGET_ID_CUSTOM_SMASH_TARGETS (GADGET_ID_SELECTBOX_FIRST + 10) +#define GADGET_ID_CUSTOM_SLIPPERY_TYPE (GADGET_ID_SELECTBOX_FIRST + 11) +#define GADGET_ID_CUSTOM_ACCESS_TYPE (GADGET_ID_SELECTBOX_FIRST + 12) +#define GADGET_ID_CUSTOM_ACCESS_LAYER (GADGET_ID_SELECTBOX_FIRST + 13) +#define GADGET_ID_CUSTOM_ACCESS_PROTECTED (GADGET_ID_SELECTBOX_FIRST + 14) +#define GADGET_ID_CUSTOM_ACCESS_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 15) +#define GADGET_ID_CHANGE_TIME_UNITS (GADGET_ID_SELECTBOX_FIRST + 16) +#define GADGET_ID_CHANGE_DIRECT_ACTION (GADGET_ID_SELECTBOX_FIRST + 17) +#define GADGET_ID_CHANGE_OTHER_ACTION (GADGET_ID_SELECTBOX_FIRST + 18) +#define GADGET_ID_CHANGE_SIDE (GADGET_ID_SELECTBOX_FIRST + 19) +#define GADGET_ID_CHANGE_PLAYER (GADGET_ID_SELECTBOX_FIRST + 20) +#define GADGET_ID_CHANGE_PAGE (GADGET_ID_SELECTBOX_FIRST + 21) +#define GADGET_ID_CHANGE_REPLACE_WHEN (GADGET_ID_SELECTBOX_FIRST + 22) +#define GADGET_ID_ACTION_TYPE (GADGET_ID_SELECTBOX_FIRST + 23) +#define GADGET_ID_ACTION_MODE (GADGET_ID_SELECTBOX_FIRST + 24) +#define GADGET_ID_ACTION_ARG (GADGET_ID_SELECTBOX_FIRST + 25) +#define GADGET_ID_SELECT_CHANGE_PAGE (GADGET_ID_SELECTBOX_FIRST + 26) +#define GADGET_ID_GROUP_CHOICE_MODE (GADGET_ID_SELECTBOX_FIRST + 27) /* textbutton identifiers */ -#define GADGET_ID_TEXTBUTTON_FIRST (GADGET_ID_SELECTBOX_FIRST + 27) +#define GADGET_ID_TEXTBUTTON_FIRST (GADGET_ID_SELECTBOX_FIRST + 28) #define GADGET_ID_PROPERTIES_INFO (GADGET_ID_TEXTBUTTON_FIRST + 0) #define GADGET_ID_PROPERTIES_CONFIG (GADGET_ID_TEXTBUTTON_FIRST + 1) @@ -527,42 +541,46 @@ #define GADGET_ID_STICK_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 4) #define GADGET_ID_EM_SLIPPERY_GEMS (GADGET_ID_CHECKBUTTON_FIRST + 5) #define GADGET_ID_USE_SPRING_BUG (GADGET_ID_CHECKBUTTON_FIRST + 6) -#define GADGET_ID_GROW_INTO_DIGGABLE (GADGET_ID_CHECKBUTTON_FIRST + 7) -#define GADGET_ID_DOUBLE_SPEED (GADGET_ID_CHECKBUTTON_FIRST + 8) -#define GADGET_ID_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 9) -#define GADGET_ID_SP_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 10) -#define GADGET_ID_INSTANT_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 11) -#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 12) -#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_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_HAS_ACTION (GADGET_ID_CHECKBUTTON_FIRST + 36) -#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 37) -#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 38) -#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 39) +#define GADGET_ID_USE_TIME_ORB_BUG (GADGET_ID_CHECKBUTTON_FIRST + 7) +#define GADGET_ID_GROW_INTO_DIGGABLE (GADGET_ID_CHECKBUTTON_FIRST + 8) +#define GADGET_ID_DOUBLE_SPEED (GADGET_ID_CHECKBUTTON_FIRST + 9) +#define GADGET_ID_BLOCK_SNAP_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 10) +#define GADGET_ID_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 11) +#define GADGET_ID_SP_BLOCK_LAST_FIELD (GADGET_ID_CHECKBUTTON_FIRST + 12) +#define GADGET_ID_INSTANT_RELOCATION (GADGET_ID_CHECKBUTTON_FIRST + 13) +#define GADGET_ID_USE_START_ELEMENT (GADGET_ID_CHECKBUTTON_FIRST + 14) +#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 15) +#define GADGET_ID_CAN_FALL_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 16) +#define GADGET_ID_CAN_MOVE_INTO_ACID (GADGET_ID_CHECKBUTTON_FIRST + 17) +#define GADGET_ID_DONT_COLLIDE_WITH (GADGET_ID_CHECKBUTTON_FIRST + 18) +#define GADGET_ID_CUSTOM_INDESTRUCTIBLE (GADGET_ID_CHECKBUTTON_FIRST + 19) +#define GADGET_ID_CUSTOM_CAN_EXPLODE (GADGET_ID_CHECKBUTTON_FIRST + 20) +#define GADGET_ID_CUSTOM_EXPLODE_FIRE (GADGET_ID_CHECKBUTTON_FIRST + 21) +#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 22) +#define GADGET_ID_CUSTOM_EXPLODE_IMPACT (GADGET_ID_CHECKBUTTON_FIRST + 23) +#define GADGET_ID_CUSTOM_WALK_TO_OBJECT (GADGET_ID_CHECKBUTTON_FIRST + 24) +#define GADGET_ID_CUSTOM_DEADLY (GADGET_ID_CHECKBUTTON_FIRST + 25) +#define GADGET_ID_CUSTOM_CAN_MOVE (GADGET_ID_CHECKBUTTON_FIRST + 26) +#define GADGET_ID_CUSTOM_CAN_FALL (GADGET_ID_CHECKBUTTON_FIRST + 27) +#define GADGET_ID_CUSTOM_CAN_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 28) +#define GADGET_ID_CUSTOM_SLIPPERY (GADGET_ID_CHECKBUTTON_FIRST + 29) +#define GADGET_ID_CUSTOM_ACCESSIBLE (GADGET_ID_CHECKBUTTON_FIRST + 30) +#define GADGET_ID_CUSTOM_GRAV_REACHABLE (GADGET_ID_CHECKBUTTON_FIRST + 31) +#define GADGET_ID_CUSTOM_USE_LAST_VALUE (GADGET_ID_CHECKBUTTON_FIRST + 32) +#define GADGET_ID_CUSTOM_USE_GRAPHIC (GADGET_ID_CHECKBUTTON_FIRST + 33) +#define GADGET_ID_CUSTOM_USE_TEMPLATE (GADGET_ID_CHECKBUTTON_FIRST + 34) +#define GADGET_ID_CUSTOM_CAN_CHANGE (GADGET_ID_CHECKBUTTON_FIRST + 35) +#define GADGET_ID_CHANGE_USE_CONTENT (GADGET_ID_CHECKBUTTON_FIRST + 36) +#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 37) +#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 38) +#define GADGET_ID_CHANGE_USE_RANDOM (GADGET_ID_CHECKBUTTON_FIRST + 39) +#define GADGET_ID_CHANGE_HAS_ACTION (GADGET_ID_CHECKBUTTON_FIRST + 40) +#define GADGET_ID_CHANGE_DELAY (GADGET_ID_CHECKBUTTON_FIRST + 41) +#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 42) +#define GADGET_ID_CHANGE_BY_OTHER_ACT (GADGET_ID_CHECKBUTTON_FIRST + 43) /* gadgets for buttons in element list */ -#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 40) +#define GADGET_ID_ELEMENTLIST_FIRST (GADGET_ID_CHECKBUTTON_FIRST + 44) #define GADGET_ID_ELEMENTLIST_LAST (GADGET_ID_ELEMENTLIST_FIRST + \ ED_NUM_ELEMENTLIST_BUTTONS - 1) @@ -583,25 +601,29 @@ #define ED_COUNTER_ID_LEVEL_RANDOM 6 #define ED_COUNTER_ID_ELEMENT_VALUE1 7 #define ED_COUNTER_ID_ELEMENT_VALUE2 8 -#define ED_COUNTER_ID_YAMYAM_CONTENT 9 -#define ED_COUNTER_ID_ENVELOPE_XSIZE 10 -#define ED_COUNTER_ID_ENVELOPE_YSIZE 11 -#define ED_COUNTER_ID_CUSTOM_SCORE 12 -#define ED_COUNTER_ID_CUSTOM_GEMCOUNT 13 -#define ED_COUNTER_ID_PUSH_DELAY_FIX 14 -#define ED_COUNTER_ID_PUSH_DELAY_RND 15 -#define ED_COUNTER_ID_DROP_DELAY_FIX 16 -#define ED_COUNTER_ID_DROP_DELAY_RND 17 -#define ED_COUNTER_ID_MOVE_DELAY_FIX 18 -#define ED_COUNTER_ID_MOVE_DELAY_RND 19 -#define ED_COUNTER_ID_EXPLOSION_DELAY 20 -#define ED_COUNTER_ID_IGNITION_DELAY 21 -#define ED_COUNTER_ID_GROUP_CONTENT 22 -#define ED_COUNTER_ID_CHANGE_DELAY_FIX 23 -#define ED_COUNTER_ID_CHANGE_DELAY_RND 24 -#define ED_COUNTER_ID_CHANGE_CONT_RND 25 - -#define ED_NUM_COUNTERBUTTONS 26 +#define ED_COUNTER_ID_ELEMENT_VALUE3 9 +#define ED_COUNTER_ID_ELEMENT_VALUE4 10 +#define ED_COUNTER_ID_YAMYAM_CONTENT 11 +#define ED_COUNTER_ID_ENVELOPE_XSIZE 12 +#define ED_COUNTER_ID_ENVELOPE_YSIZE 13 +#define ED_COUNTER_ID_CUSTOM_SCORE 14 +#define ED_COUNTER_ID_CUSTOM_GEMCOUNT 15 +#define ED_COUNTER_ID_CUSTOM_VALUE_FIX 16 +#define ED_COUNTER_ID_CUSTOM_VALUE_RND 17 +#define ED_COUNTER_ID_PUSH_DELAY_FIX 18 +#define ED_COUNTER_ID_PUSH_DELAY_RND 19 +#define ED_COUNTER_ID_DROP_DELAY_FIX 20 +#define ED_COUNTER_ID_DROP_DELAY_RND 21 +#define ED_COUNTER_ID_MOVE_DELAY_FIX 22 +#define ED_COUNTER_ID_MOVE_DELAY_RND 23 +#define ED_COUNTER_ID_EXPLOSION_DELAY 24 +#define ED_COUNTER_ID_IGNITION_DELAY 25 +#define ED_COUNTER_ID_GROUP_CONTENT 26 +#define ED_COUNTER_ID_CHANGE_DELAY_FIX 27 +#define ED_COUNTER_ID_CHANGE_DELAY_RND 28 +#define ED_COUNTER_ID_CHANGE_CONT_RND 29 + +#define ED_NUM_COUNTERBUTTONS 30 #define ED_COUNTER_ID_LEVEL_FIRST ED_COUNTER_ID_LEVEL_XSIZE #define ED_COUNTER_ID_LEVEL_LAST ED_COUNTER_ID_LEVEL_RANDOM @@ -660,36 +682,37 @@ /* values for selectbox gadgets */ #define ED_SELECTBOX_ID_TIME_OR_STEPS 0 #define ED_SELECTBOX_ID_GAME_ENGINE_TYPE 1 -#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE 2 -#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER 3 -#define ED_SELECTBOX_ID_CUSTOM_ACCESS_PROTECTED 4 -#define ED_SELECTBOX_ID_CUSTOM_ACCESS_DIRECTION 5 -#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION 6 -#define ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN 7 -#define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION 8 -#define ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE 9 -#define ED_SELECTBOX_ID_CUSTOM_MOVE_LEAVE_TYPE 10 -#define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS 11 -#define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE 12 -#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS 13 -#define ED_SELECTBOX_ID_CUSTOM_EXPLOSION_TYPE 14 -#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS 15 -#define ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION 16 -#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION 17 -#define ED_SELECTBOX_ID_CHANGE_SIDE 18 -#define ED_SELECTBOX_ID_CHANGE_PLAYER 19 -#define ED_SELECTBOX_ID_CHANGE_PAGE 20 -#define ED_SELECTBOX_ID_CHANGE_REPLACE_WHEN 21 -#define ED_SELECTBOX_ID_ACTION_TYPE 22 -#define ED_SELECTBOX_ID_ACTION_MODE 23 -#define ED_SELECTBOX_ID_ACTION_ARG 24 -#define ED_SELECTBOX_ID_SELECT_CHANGE_PAGE 25 -#define ED_SELECTBOX_ID_GROUP_CHOICE_MODE 26 - -#define ED_NUM_SELECTBOX 27 +#define ED_SELECTBOX_ID_WIND_DIRECTION 2 +#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE 3 +#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER 4 +#define ED_SELECTBOX_ID_CUSTOM_ACCESS_PROTECTED 5 +#define ED_SELECTBOX_ID_CUSTOM_ACCESS_DIRECTION 6 +#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION 7 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN 8 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION 9 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE 10 +#define ED_SELECTBOX_ID_CUSTOM_MOVE_LEAVE_TYPE 11 +#define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS 12 +#define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE 13 +#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS 14 +#define ED_SELECTBOX_ID_CUSTOM_EXPLOSION_TYPE 15 +#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS 16 +#define ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION 17 +#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION 18 +#define ED_SELECTBOX_ID_CHANGE_SIDE 19 +#define ED_SELECTBOX_ID_CHANGE_PLAYER 20 +#define ED_SELECTBOX_ID_CHANGE_PAGE 21 +#define ED_SELECTBOX_ID_CHANGE_REPLACE_WHEN 22 +#define ED_SELECTBOX_ID_ACTION_TYPE 23 +#define ED_SELECTBOX_ID_ACTION_MODE 24 +#define ED_SELECTBOX_ID_ACTION_ARG 25 +#define ED_SELECTBOX_ID_SELECT_CHANGE_PAGE 26 +#define ED_SELECTBOX_ID_GROUP_CHOICE_MODE 27 + +#define ED_NUM_SELECTBOX 28 #define ED_SELECTBOX_ID_LEVEL_FIRST ED_SELECTBOX_ID_TIME_OR_STEPS -#define ED_SELECTBOX_ID_LEVEL_LAST ED_SELECTBOX_ID_GAME_ENGINE_TYPE +#define ED_SELECTBOX_ID_LEVEL_LAST ED_SELECTBOX_ID_WIND_DIRECTION #define ED_SELECTBOX_ID_CUSTOM1_FIRST ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE #define ED_SELECTBOX_ID_CUSTOM1_LAST ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION @@ -736,41 +759,45 @@ #define ED_CHECKBUTTON_ID_STICK_ELEMENT 2 #define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS 3 #define ED_CHECKBUTTON_ID_USE_SPRING_BUG 4 -#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE 5 -#define ED_CHECKBUTTON_ID_DOUBLE_SPEED 6 -#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD 7 -#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD 8 -#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION 9 -#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 10 -#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 11 -#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 12 -#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 13 -#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_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_CHECKBUTTON_ID_CHANGE_HAS_ACTION 37 - -#define ED_NUM_CHECKBUTTONS 38 +#define ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG 5 +#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE 6 +#define ED_CHECKBUTTON_ID_DOUBLE_SPEED 7 +#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD 8 +#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD 9 +#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD 10 +#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION 11 +#define ED_CHECKBUTTON_ID_USE_START_ELEMENT 12 +#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 13 +#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID 14 +#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID 15 +#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH 16 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC 17 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE 18 +#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE 19 +#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE 20 +#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE 21 +#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT 22 +#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE 23 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE 24 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL 25 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH 26 +#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY 27 +#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY 28 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE 29 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE 30 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 31 +#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT 32 +#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE 33 +#define ED_CHECKBUTTON_ID_CHANGE_DELAY 34 +#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 35 +#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT 36 +#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 37 +#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT 38 +#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 39 +#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM 40 +#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION 41 + +#define ED_NUM_CHECKBUTTONS 42 #define ED_CHECKBUTTON_ID_LEVEL_FIRST ED_CHECKBUTTON_ID_INITIAL_GRAVITY #define ED_CHECKBUTTON_ID_LEVEL_LAST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED @@ -813,17 +840,18 @@ #define ED_DRAWING_ID_MAGIC_BALL_CONTENT_6 15 #define ED_DRAWING_ID_MAGIC_BALL_CONTENT_7 16 #define ED_DRAWING_ID_AMOEBA_CONTENT 17 -#define ED_DRAWING_ID_CUSTOM_GRAPHIC 18 -#define ED_DRAWING_ID_CUSTOM_CONTENT 19 -#define ED_DRAWING_ID_CUSTOM_MOVE_ENTER 20 -#define ED_DRAWING_ID_CUSTOM_MOVE_LEAVE 21 -#define ED_DRAWING_ID_CUSTOM_CHANGE_TARGET 22 -#define ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT 23 -#define ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER 24 -#define ED_DRAWING_ID_GROUP_CONTENT 25 -#define ED_DRAWING_ID_RANDOM_BACKGROUND 26 +#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_NUM_DRAWING_AREAS 27 +#define ED_NUM_DRAWING_AREAS 28 /* @@ -995,7 +1023,7 @@ static struct GADGET_ID_LEVEL_TIMESCORE_DOWN, GADGET_ID_LEVEL_TIMESCORE_UP, GADGET_ID_LEVEL_TIMESCORE_TEXT, GADGET_ID_NONE, &level.score[SC_TIME_BONUS], - "score for each 10 sec/steps left:", NULL, NULL + "score for each second/step left:", NULL, NULL }, { ED_LEVEL_SETTINGS_XPOS(0), ED_COUNTER2_YPOS(8), @@ -1024,6 +1052,22 @@ static struct NULL, /* will be set when used */ NULL, NULL, NULL }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(2), + MIN_SCORE, MAX_SCORE, + GADGET_ID_ELEMENT_VALUE3_DOWN, GADGET_ID_ELEMENT_VALUE3_UP, + GADGET_ID_ELEMENT_VALUE3_TEXT, GADGET_ID_NONE, + NULL, /* will be set when used */ + NULL, NULL, NULL + }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(3), + MIN_SCORE, MAX_SCORE, + GADGET_ID_ELEMENT_VALUE4_DOWN, GADGET_ID_ELEMENT_VALUE4_UP, + GADGET_ID_ELEMENT_VALUE4_TEXT, GADGET_ID_NONE, + NULL, /* will be set when used */ + NULL, NULL, NULL + }, { ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(3), MIN_ELEMENT_CONTENTS, MAX_ELEMENT_CONTENTS, @@ -1057,7 +1101,7 @@ static struct GADGET_ID_CUSTOM_SCORE_DOWN, GADGET_ID_CUSTOM_SCORE_UP, GADGET_ID_CUSTOM_SCORE_TEXT, GADGET_ID_NONE, &custom_element.collect_score_initial, - NULL, "score", " " + NULL, "CE score", " " }, { -1, ED_ELEMENT_SETTINGS_YPOS(6), @@ -1065,7 +1109,23 @@ static struct GADGET_ID_CUSTOM_GEMCOUNT_DOWN, GADGET_ID_CUSTOM_GEMCOUNT_UP, GADGET_ID_CUSTOM_GEMCOUNT_TEXT, GADGET_ID_CUSTOM_SCORE_UP, &custom_element.collect_count_initial, - NULL, "count", NULL + NULL, "CE count", NULL + }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(12), + 0, 9999, + GADGET_ID_CUSTOM_VALUE_FIX_DOWN, GADGET_ID_CUSTOM_VALUE_FIX_UP, + GADGET_ID_CUSTOM_VALUE_FIX_TEXT, GADGET_ID_NONE, + &custom_element.ce_value_fixed_initial, + NULL, "CE value", NULL + }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(12), + 0, 9999, + GADGET_ID_CUSTOM_VALUE_RND_DOWN, GADGET_ID_CUSTOM_VALUE_RND_UP, + GADGET_ID_CUSTOM_VALUE_RND_TEXT, GADGET_ID_CUSTOM_VALUE_FIX_UP, + &custom_element.ce_value_random_initial, + NULL, "+random", NULL }, { ED_ELEMENT_SETTINGS_XPOS(1), ED_ELEMENT_SETTINGS_YPOS(7), @@ -1154,7 +1214,7 @@ static struct GADGET_ID_CHANGE_DELAY_FIX_DOWN, GADGET_ID_CHANGE_DELAY_FIX_UP, GADGET_ID_CHANGE_DELAY_FIX_TEXT, GADGET_ID_NONE, &custom_element_change.delay_fixed, - NULL, "delay", NULL, + NULL, "CE delay", NULL, }, { -1, ED_ELEMENT_SETTINGS_YPOS(2), @@ -1240,6 +1300,17 @@ static struct ValueTextInfo options_game_engine_type[] = { -1, NULL } }; +static struct ValueTextInfo options_wind_direction[] = +{ + { MV_START_NONE, "none" }, + { MV_START_LEFT, "left" }, + { MV_START_RIGHT, "right" }, + { MV_START_UP, "up" }, + { MV_START_DOWN, "down" }, + + { -1, NULL } +}; + static struct ValueTextInfo options_access_type[] = { { EP_WALKABLE, "walkable" }, @@ -1267,7 +1338,7 @@ static struct ValueTextInfo options_access_protected[] = static struct ValueTextInfo options_access_direction[] = { - { MV_NO_DIRECTIONS, "no direction" }, + { MV_NO_DIRECTION, "no direction" }, { MV_LEFT, "left" }, { MV_RIGHT, "right" }, { MV_UP, "up" }, @@ -1307,6 +1378,7 @@ static struct ValueTextInfo options_move_pattern[] = { MV_HORIZONTAL, "horizontal" }, { MV_VERTICAL, "vertical" }, { MV_ALL_DIRECTIONS, "all directions" }, + { MV_WIND_DIRECTION, "wind direction" }, { MV_TOWARDS_PLAYER, "towards player" }, { MV_AWAY_FROM_PLAYER, "away from player" }, { MV_ALONG_LEFT_SIDE, "along left side" }, @@ -1422,7 +1494,7 @@ static struct ValueTextInfo options_change_direct_action[] = #endif { CE_IMPACT, "impact (on something)" }, { CE_SMASHED, "smashed (from above)" }, - { CE_COUNT_AT_ZERO, "CE count at zero" }, + { CE_VALUE_GETS_ZERO, "CE value gets 0" }, { -1, NULL } }; @@ -1443,7 +1515,7 @@ static struct ValueTextInfo options_change_other_action[] = { CE_SWITCH_OF_X, "switch of" }, { CE_CHANGE_OF_X, "change by page of" }, { CE_EXPLOSION_OF_X, "explosion of" }, - { CE_COUNT_AT_ZERO_OF_X, "CE count at zero of" }, + { CE_VALUE_GETS_ZERO_OF_X, "CE value gets 0 of" }, { -1, NULL } }; @@ -1526,33 +1598,56 @@ static struct ValueTextInfo options_change_replace_when[] = static struct ValueTextInfo options_action_type[] = { { CA_NO_ACTION, "no action" }, - { CA_EXIT_PLAYER, "exit player" }, - { CA_KILL_PLAYER, "kill player" }, + { CA_UNDEFINED, " " }, + { CA_HEADLINE_LEVEL_ACTIONS, "[level actions]" }, { CA_RESTART_LEVEL, "restart level" }, { CA_SHOW_ENVELOPE, "show envelope" }, - { CA_ADD_KEY, "add key" }, - { CA_DEL_KEY, "remove key" }, - { CA_SET_PLAYER_SPEED, "set player speed" }, - { CA_SET_GEMS, "set gems" }, - { CA_SET_TIME, "set time" }, - { CA_SET_SCORE, "set score" }, + { CA_SET_LEVEL_TIME, "set time" }, + { CA_SET_LEVEL_SCORE, "set score" }, + { CA_SET_LEVEL_GEMS, "set needed gems" }, + { CA_SET_LEVEL_GRAVITY, "set gravity" }, + { CA_SET_LEVEL_WIND, "set wind dir." }, + { CA_UNDEFINED, " " }, + { CA_HEADLINE_PLAYER_ACTIONS, "[player actions]" }, + { CA_MOVE_PLAYER, "move player" }, + { CA_EXIT_PLAYER, "exit player" }, + { CA_KILL_PLAYER, "kill player" }, + { CA_SET_PLAYER_KEYS, "set keys" }, + { CA_SET_PLAYER_SPEED, "set speed" }, + { CA_SET_PLAYER_SHIELD, "set shield" }, + { CA_SET_PLAYER_ARTWORK, "set artwork" }, + { CA_UNDEFINED, " " }, + { CA_HEADLINE_CE_ACTIONS, "[CE actions]" }, { CA_SET_CE_SCORE, "set CE score" }, - { CA_SET_CE_COUNT, "set CE count" }, -#if 0 - { CA_SET_DYNABOMB_NUMBER, "set bomb number" }, - { CA_SET_DYNABOMB_SIZE, "set bomb size" }, - { CA_SET_DYNABOMB_POWER, "set bomb power" }, -#endif - { CA_TOGGLE_PLAYER_GRAVITY, "toggle gravity" }, - { CA_ENABLE_PLAYER_GRAVITY, "enable gravity" }, - { CA_DISABLE_PLAYER_GRAVITY, "disable gravity" }, + { CA_SET_CE_VALUE, "set CE value" }, { -1, NULL } }; -static struct ValueTextInfo options_action_mode[] = +static struct ValueTextInfo options_action_mode_none[] = +{ + { CA_ARG_UNDEFINED, " " }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_mode_assign[] = +{ + { CA_MODE_SET, "=" }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_mode_add_remove[] = +{ + { CA_MODE_ADD, "+" }, + { CA_MODE_SUBTRACT, "-" }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_mode_calculate[] = { - { CA_MODE_UNDEFINED, " " }, { CA_MODE_SET, "=" }, { CA_MODE_ADD, "+" }, { CA_MODE_SUBTRACT, "-" }, @@ -1563,7 +1658,14 @@ static struct ValueTextInfo options_action_mode[] = { -1, NULL } }; -static struct ValueTextInfo options_action_arg[] = +static struct ValueTextInfo options_action_arg_none[] = +{ + { CA_ARG_UNDEFINED, " " }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_arg_player[] = { { CA_ARG_PLAYER_HEADLINE, "[player]" }, { CA_ARG_PLAYER_1, "1" }, @@ -1572,7 +1674,12 @@ static struct ValueTextInfo options_action_arg[] = { CA_ARG_PLAYER_4, "4" }, { CA_ARG_PLAYER_ANY, "any" }, { CA_ARG_PLAYER_TRIGGER, "trigger" }, - { CA_ARG_UNDEFINED, " " }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_arg_number[] = +{ { CA_ARG_NUMBER_HEADLINE, "[number]" }, { CA_ARG_0, "0" }, { CA_ARG_1, "1" }, @@ -1586,11 +1693,52 @@ static struct ValueTextInfo options_action_arg[] = { CA_ARG_UNDEFINED, " " }, { CA_ARG_NUMBER_MIN, "min" }, { CA_ARG_NUMBER_MAX, "max" }, - { CA_ARG_NUMBER_NORMAL, "normal" }, + { CA_ARG_UNDEFINED, " " }, { CA_ARG_NUMBER_RESET, "reset" }, - { CA_ARG_NUMBER_CE_SCORE, "CE score" }, - { CA_ARG_NUMBER_CE_COUNT, "CE count" }, + { CA_ARG_UNDEFINED, " " }, { CA_ARG_NUMBER_CE_DELAY, "CE delay" }, + { CA_ARG_NUMBER_CE_SCORE, "CE score" }, + { CA_ARG_NUMBER_CE_VALUE, "CE value" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_NUMBER_LEVEL_TIME, "time" }, + { CA_ARG_NUMBER_LEVEL_GEMS, "gems" }, + { CA_ARG_NUMBER_LEVEL_SCORE, "score" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_ELEMENT_HEADLINE, "[CE value" }, + { CA_ARG_ELEMENT_HEADLINE, " of" }, + { CA_ARG_ELEMENT_HEADLINE, " element]" }, + { CA_ARG_ELEMENT_TARGET, "target" }, + { CA_ARG_ELEMENT_TRIGGER, "trigger" }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_arg_envelope[] = +{ + { CA_ARG_NUMBER_HEADLINE, "[number]" }, + { CA_ARG_1, "1" }, + { CA_ARG_2, "2" }, + { CA_ARG_3, "3" }, + { CA_ARG_4, "4" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_ELEMENT_HEADLINE, "[element]" }, + { CA_ARG_ELEMENT_TARGET, "target" }, + { CA_ARG_ELEMENT_TRIGGER, "trigger" }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_arg_key[] = +{ + { CA_ARG_NUMBER_HEADLINE, "[number]" }, + { CA_ARG_1, "1" }, + { CA_ARG_2, "2" }, + { CA_ARG_3, "3" }, + { CA_ARG_4, "4" }, + { CA_ARG_5, "5" }, + { CA_ARG_6, "6" }, + { CA_ARG_7, "7" }, + { CA_ARG_8, "8" }, { CA_ARG_UNDEFINED, " " }, { CA_ARG_ELEMENT_HEADLINE, "[element]" }, { CA_ARG_ELEMENT_TARGET, "target" }, @@ -1599,6 +1747,68 @@ static struct ValueTextInfo options_action_arg[] = { -1, NULL } }; +static struct ValueTextInfo options_action_arg_speed[] = +{ + { CA_ARG_SPEED_HEADLINE, "[speed]" }, + { CA_ARG_SPEED_NOT_MOVING, "frozen" }, + { CA_ARG_SPEED_VERY_SLOW, "very slow" }, + { CA_ARG_SPEED_SLOW, "slow" }, + { CA_ARG_SPEED_NORMAL, "normal" }, + { CA_ARG_SPEED_FAST, "fast" }, + { CA_ARG_SPEED_VERY_FAST, "very fast" }, + { CA_ARG_SPEED_EVEN_FASTER, "ultrafast" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_SPEED_SLOWER, "slower" }, + { CA_ARG_SPEED_FASTER, "faster" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_SPEED_RESET, "reset" }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_arg_shield[] = +{ + { CA_ARG_SHIELD_HEADLINE, "[shield]" }, + { CA_ARG_SHIELD_OFF, "off" }, + { CA_ARG_SHIELD_NORMAL, "normal" }, + { CA_ARG_SHIELD_DEADLY, "deadly" }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_arg_artwork[] = +{ + { CA_ARG_ELEMENT_HEADLINE, "[element]" }, + { CA_ARG_ELEMENT_TARGET, "target" }, + { CA_ARG_ELEMENT_TRIGGER, "trigger" }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_arg_gravity[] = +{ + { CA_ARG_GRAVITY_HEADLINE, "[gravity]" }, + { CA_ARG_GRAVITY_ON, "on" }, + { CA_ARG_GRAVITY_OFF, "off" }, + { CA_ARG_GRAVITY_TOGGLE, "toggle" }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_arg_direction[] = +{ + { CA_ARG_DIRECTION_HEADLINE, "[dir.]" }, + { CA_ARG_DIRECTION_NONE, "none" }, + { CA_ARG_DIRECTION_LEFT, "left" }, + { CA_ARG_DIRECTION_RIGHT, "right" }, + { CA_ARG_DIRECTION_UP, "up" }, + { CA_ARG_DIRECTION_DOWN, "down" }, + { CA_ARG_DIRECTION_TRIGGER, "trigger" }, + { CA_ARG_DIRECTION_TRIGGER_BACK, "-trigger" }, + + { -1, NULL } +}; + static char options_change_page_strings[MAX_CHANGE_PAGES][10]; static struct ValueTextInfo options_change_page[MAX_CHANGE_PAGES + 1] = { @@ -1616,6 +1826,43 @@ static struct ValueTextInfo options_group_choice_mode[] = { -1, NULL } }; +static struct ValueTextInfo *action_arg_modes[] = +{ + options_action_mode_none, + options_action_mode_assign, + options_action_mode_add_remove, + options_action_mode_calculate, +}; + +static struct +{ + int value; + int mode; + struct ValueTextInfo *options; +} +action_arg_options[] = +{ + { CA_NO_ACTION, 0, options_action_arg_none, }, + { CA_EXIT_PLAYER, 0, options_action_arg_player, }, + { CA_KILL_PLAYER, 0, options_action_arg_player, }, + { CA_MOVE_PLAYER, 0, options_action_arg_direction, }, + { CA_RESTART_LEVEL, 0, options_action_arg_none, }, + { CA_SHOW_ENVELOPE, 0, options_action_arg_envelope, }, + { CA_SET_LEVEL_TIME, 3, options_action_arg_number, }, + { CA_SET_LEVEL_GEMS, 3, options_action_arg_number, }, + { CA_SET_LEVEL_SCORE, 3, options_action_arg_number, }, + { CA_SET_LEVEL_GRAVITY, 1, options_action_arg_gravity, }, + { CA_SET_LEVEL_WIND, 1, options_action_arg_direction, }, + { CA_SET_PLAYER_KEYS, 2, options_action_arg_key, }, + { CA_SET_PLAYER_SPEED, 1, options_action_arg_speed, }, + { CA_SET_PLAYER_SHIELD, 1, options_action_arg_shield, }, + { 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, }, + + { -1, FALSE, NULL } +}; + static struct { int x, y; @@ -1645,8 +1892,18 @@ static struct &level.game_engine_type, "game engine:", NULL, "game engine" }, + { + ED_LEVEL_SETTINGS_XPOS(0), ED_LEVEL_SETTINGS_YPOS(12), + GADGET_ID_WIND_DIRECTION, GADGET_ID_NONE, + -1, + options_wind_direction, + &level.wind_direction_initial, + "initial wind direction:", NULL, "initial wind direction" + }, - /* ---------- element settings: configure 1 (custom elements) ----------- */ + /* ---------- element settings: configure (several elements) ------------- */ + + /* ---------- element settings: configure 1 (custom elements) ------------ */ { ED_ELEMENT_SETTINGS_XPOS(1), ED_ELEMENT_SETTINGS_YPOS(3), @@ -1689,7 +1946,7 @@ static struct NULL, NULL, "diggable/collectible/pushable" }, - /* ---------- element settings: configure 2 (custom elements) ----------- */ + /* ---------- element settings: configure 2 (custom elements) ------------ */ { ED_ELEMENT_SETTINGS_XPOS(1), ED_ELEMENT_SETTINGS_YPOS(1), @@ -1788,7 +2045,7 @@ static struct -1, options_change_trigger_side, &custom_element_change.trigger_side, - "at", "side", "element side that causes change" + "at", "side", "element side triggering change" }, { ED_ELEMENT_SETTINGS_XPOS(2), ED_ELEMENT_SETTINGS_YPOS(7), @@ -1826,7 +2083,7 @@ static struct -1, ED_ELEMENT_SETTINGS_YPOS(13), GADGET_ID_ACTION_MODE, GADGET_ID_ACTION_TYPE, -1, - options_action_mode, + options_action_mode_none, &custom_element_change.action_mode, NULL, NULL, "action operator" }, @@ -1834,7 +2091,7 @@ static struct -1, ED_ELEMENT_SETTINGS_YPOS(13), GADGET_ID_ACTION_ARG, GADGET_ID_ACTION_MODE, -1, - options_action_arg, + options_action_arg_none, &custom_element_change.action_arg, NULL, NULL, "action parameter" }, @@ -2117,6 +2374,13 @@ static struct NULL, "use spring pushing bug", "use odd spring pushing behaviour" }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(1), + GADGET_ID_USE_TIME_ORB_BUG, GADGET_ID_NONE, + &level.use_time_orb_bug, + NULL, + "use time orb bug", "use odd time orb behaviour" + }, { ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(0), GADGET_ID_GROW_INTO_DIGGABLE, GADGET_ID_NONE, @@ -2131,6 +2395,13 @@ static struct NULL, "double speed movement", "set initial movement speed of player" }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(5), + GADGET_ID_BLOCK_SNAP_FIELD, GADGET_ID_NONE, + &level.block_snap_field, + NULL, + "block snap field when snapping", "use snapping delay to show animation" + }, { ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(1), GADGET_ID_BLOCK_LAST_FIELD, GADGET_ID_NONE, @@ -2152,6 +2423,13 @@ static struct NULL, "no scrolling when relocating", "player gets relocated without delay" }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(6), + 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), GADGET_ID_CAN_PASS_TO_WALKABLE, GADGET_ID_NONE, @@ -2213,6 +2491,12 @@ static struct &custom_element_properties[EP_GRAVITY_REACHABLE], NULL, "reachable despite gravity", "player can walk/dig despite gravity" }, + { + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(13), + GADGET_ID_CUSTOM_USE_LAST_VALUE, GADGET_ID_NONE, + &custom_element.use_last_ce_value, + NULL, "use last CE value after change", "use last CE value after change" + }, { ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(5), GADGET_ID_CUSTOM_WALK_TO_OBJECT, GADGET_ID_NONE, @@ -2344,130 +2628,140 @@ static struct static struct { int x, y; - int area_xsize, area_ysize; int gadget_id; int gadget_id_align; - char *text_left, *text_right, *text_below; + int *value; + int area_xsize, area_ysize; + char *text_left, *text_right, *text_below, *infotext; } drawingarea_info[ED_NUM_DRAWING_AREAS] = { /* ---------- level playfield content ------------------------------------ */ { - 0, 0, - MAX_ED_FIELDX, MAX_ED_FIELDY, + 0, 0, GADGET_ID_DRAWING_LEVEL, GADGET_ID_NONE, - NULL, NULL, NULL + NULL, MAX_ED_FIELDX, MAX_ED_FIELDY, + NULL, NULL, NULL, NULL }, /* ---------- yam yam content -------------------------------------------- */ { ED_AREA_YAMYAM_CONTENT_XPOS(0), ED_AREA_YAMYAM_CONTENT_YPOS(0), - 3, 3, GADGET_ID_YAMYAM_CONTENT_0, GADGET_ID_NONE, - NULL, NULL, "1" + &level.yamyam_content[0].e[0][0], 3, 3, + NULL, NULL, "1", NULL }, { ED_AREA_YAMYAM_CONTENT_XPOS(1), ED_AREA_YAMYAM_CONTENT_YPOS(1), - 3, 3, GADGET_ID_YAMYAM_CONTENT_1, GADGET_ID_NONE, - NULL, NULL, "2" + &level.yamyam_content[1].e[0][0], 3, 3, + NULL, NULL, "2", NULL }, { ED_AREA_YAMYAM_CONTENT_XPOS(2), ED_AREA_YAMYAM_CONTENT_YPOS(2), - 3, 3, GADGET_ID_YAMYAM_CONTENT_2, GADGET_ID_NONE, - NULL, NULL, "3" + &level.yamyam_content[2].e[0][0], 3, 3, + NULL, NULL, "3", NULL }, { ED_AREA_YAMYAM_CONTENT_XPOS(3), ED_AREA_YAMYAM_CONTENT_YPOS(3), - 3, 3, GADGET_ID_YAMYAM_CONTENT_3, GADGET_ID_NONE, - NULL, NULL, "4" + &level.yamyam_content[3].e[0][0], 3, 3, + NULL, NULL, "4", NULL }, { ED_AREA_YAMYAM_CONTENT_XPOS(4), ED_AREA_YAMYAM_CONTENT_YPOS(4), - 3, 3, GADGET_ID_YAMYAM_CONTENT_4, GADGET_ID_NONE, - NULL, NULL, "5" + &level.yamyam_content[4].e[0][0], 3, 3, + NULL, NULL, "5", NULL }, { ED_AREA_YAMYAM_CONTENT_XPOS(5), ED_AREA_YAMYAM_CONTENT_YPOS(5), - 3, 3, GADGET_ID_YAMYAM_CONTENT_5, GADGET_ID_NONE, - NULL, NULL, "6" + &level.yamyam_content[5].e[0][0], 3, 3, + NULL, NULL, "6", NULL }, { ED_AREA_YAMYAM_CONTENT_XPOS(6), ED_AREA_YAMYAM_CONTENT_YPOS(6), - 3, 3, GADGET_ID_YAMYAM_CONTENT_6, GADGET_ID_NONE, - NULL, NULL, "7" + &level.yamyam_content[6].e[0][0], 3, 3, + NULL, NULL, "7", NULL }, { ED_AREA_YAMYAM_CONTENT_XPOS(7), ED_AREA_YAMYAM_CONTENT_YPOS(7), - 3, 3, GADGET_ID_YAMYAM_CONTENT_7, GADGET_ID_NONE, - NULL, NULL, "8" + &level.yamyam_content[7].e[0][0], 3, 3, + NULL, NULL, "8", NULL }, /* ---------- magic ball content ----------------------------------------- */ { ED_AREA_MAGIC_BALL_CONTENT_XPOS(0), ED_AREA_MAGIC_BALL_CONTENT_YPOS(0), - 3, 3, GADGET_ID_MAGIC_BALL_CONTENT_0, GADGET_ID_NONE, - NULL, NULL, "1" + &level.ball_content[0].e[0][0], 3, 3, + NULL, NULL, "1", NULL }, { ED_AREA_MAGIC_BALL_CONTENT_XPOS(1), ED_AREA_MAGIC_BALL_CONTENT_YPOS(1), - 3, 3, GADGET_ID_MAGIC_BALL_CONTENT_1, GADGET_ID_NONE, - NULL, NULL, "2" + &level.ball_content[1].e[0][0], 3, 3, + NULL, NULL, "2", NULL }, { ED_AREA_MAGIC_BALL_CONTENT_XPOS(2), ED_AREA_MAGIC_BALL_CONTENT_YPOS(2), - 3, 3, GADGET_ID_MAGIC_BALL_CONTENT_2, GADGET_ID_NONE, - NULL, NULL, "3" + &level.ball_content[2].e[0][0], 3, 3, + NULL, NULL, "3", NULL }, { ED_AREA_MAGIC_BALL_CONTENT_XPOS(3), ED_AREA_MAGIC_BALL_CONTENT_YPOS(3), - 3, 3, GADGET_ID_MAGIC_BALL_CONTENT_3, GADGET_ID_NONE, - NULL, NULL, "4" + &level.ball_content[3].e[0][0], 3, 3, + NULL, NULL, "4", NULL }, { ED_AREA_MAGIC_BALL_CONTENT_XPOS(4), ED_AREA_MAGIC_BALL_CONTENT_YPOS(4), - 3, 3, GADGET_ID_MAGIC_BALL_CONTENT_4, GADGET_ID_NONE, - NULL, NULL, "5" + &level.ball_content[4].e[0][0], 3, 3, + NULL, NULL, "5", NULL }, { ED_AREA_MAGIC_BALL_CONTENT_XPOS(5), ED_AREA_MAGIC_BALL_CONTENT_YPOS(5), - 3, 3, GADGET_ID_MAGIC_BALL_CONTENT_5, GADGET_ID_NONE, - NULL, NULL, "6" + &level.ball_content[5].e[0][0], 3, 3, + NULL, NULL, "6", NULL }, { ED_AREA_MAGIC_BALL_CONTENT_XPOS(6), ED_AREA_MAGIC_BALL_CONTENT_YPOS(6), - 3, 3, GADGET_ID_MAGIC_BALL_CONTENT_6, GADGET_ID_NONE, - NULL, NULL, "7" + &level.ball_content[6].e[0][0], 3, 3, + NULL, NULL, "7", NULL }, { ED_AREA_MAGIC_BALL_CONTENT_XPOS(7), ED_AREA_MAGIC_BALL_CONTENT_YPOS(7), - 3, 3, GADGET_ID_MAGIC_BALL_CONTENT_7, GADGET_ID_NONE, - NULL, NULL, "8" + &level.ball_content[7].e[0][0], 3, 3, + NULL, NULL, "8", NULL }, /* ---------- amoeba content --------------------------------------------- */ { ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(3), - 1, 1, GADGET_ID_AMOEBA_CONTENT, GADGET_ID_NONE, - "content:", NULL, NULL + &level.amoeba_content, 1, 1, + "content:", NULL, NULL, "amoeba content" + }, + + /* ---------- level start element ---------------------------------------- */ + + { + -1, ED_AREA_1X1_SETTINGS_YPOS(6), + GADGET_ID_START_ELEMENT, GADGET_ID_USE_START_ELEMENT, + &level.start_element[0], 1, 1, + NULL, NULL, NULL, "level start element" }, /* ---------- element settings: configure 1 (custom elements) ----------- */ @@ -2476,9 +2770,9 @@ static struct { -1, ED_AREA_1X1_SETTINGS_YPOS(1), - 1, 1, GADGET_ID_CUSTOM_GRAPHIC, GADGET_ID_CUSTOM_USE_GRAPHIC, - NULL, NULL, NULL + &custom_element.gfx_element, 1, 1, + NULL, NULL, NULL, "custom graphic element" }, /* ---------- element settings: configure 2 (custom elements) ----------- */ @@ -2487,24 +2781,24 @@ static struct { -1, ED_AREA_3X3_SETTINGS_YPOS(10), - 3, 3, GADGET_ID_CUSTOM_CONTENT, GADGET_ID_NONE, /* align three rows */ - "content:", NULL, NULL + &custom_element.content.e[0][0], 3, 3, + "content:", NULL, NULL, NULL }, /* ---------- custom enter and leave element (when moving) --------------- */ { 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 + &custom_element.move_enter_element, 1, 1, + "can dig:", " ", NULL, "element that can be digged/collected" }, { -1, ED_AREA_1X1_SETTINGS_YPOS(3), - 1, 1, GADGET_ID_CUSTOM_MOVE_LEAVE, GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE, - NULL, NULL, NULL + &custom_element.move_leave_element, 1, 1, + NULL, NULL, NULL, "element that will be left behind" }, /* ---------- element settings: advanced (custom elements) --------------- */ @@ -2513,45 +2807,45 @@ static struct { -1, ED_AREA_1X1_SETTINGS_YPOS(1), - 1, 1, GADGET_ID_CUSTOM_CHANGE_TARGET, GADGET_ID_CUSTOM_CAN_CHANGE, - NULL, "after/when:", NULL + &custom_element_change.target_element, 1, 1, + NULL, "after/when:", NULL, "new target element after change" }, /* ---------- custom change content (extended change target) ------------- */ { -1, ED_AREA_3X3_SETTINGS_YPOS(10), - 3, 3, GADGET_ID_CUSTOM_CHANGE_CONTENT, GADGET_ID_NONE, /* align three rows */ - NULL, NULL, NULL + &custom_element_change.target_content.e[0][0], 3, 3, + NULL, NULL, NULL, "new extended elements after change" }, /* ---------- custom change trigger (element causing change) ------------- */ { -1, ED_AREA_1X1_SETTINGS_YPOS(5), - 1, 1, GADGET_ID_CUSTOM_CHANGE_TRIGGER, GADGET_ID_CHANGE_OTHER_ACTION, - NULL, NULL, NULL + &custom_element_change.trigger_element, 1, 1, + NULL, NULL, NULL, "other element triggering change" }, /* ---------- group element content -------------------------------------- */ { ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(4), - MAX_ELEMENTS_IN_GROUP, 1, GADGET_ID_GROUP_CONTENT, GADGET_ID_NONE, - "content:", NULL, NULL + &group_element_info.element[0], MAX_ELEMENTS_IN_GROUP, 1, + "content:", NULL, NULL, NULL }, /* ---------- random background (for random painting) -------------------- */ { -1, ED_ELEMENT_SETTINGS_YPOS(14), - 1, 1, GADGET_ID_RANDOM_BACKGROUND, GADGET_ID_RANDOM_RESTRICTED, - NULL, NULL, NULL + &random_placement_background_element, 1, 1, + NULL, NULL, NULL, "random placement background" }, }; @@ -2582,9 +2876,10 @@ static int new_element3 = EL_SAND; #define BUTTON_STEPSIZE(button) ((button) == 1 ? 1 : (button) == 2 ? 5 : 10) /* forward declaration for internal use */ -static void ModifyEditorCounter(int, int); +static void ModifyEditorCounterValue(int, int); static void ModifyEditorCounterLimits(int, int, int); -static void ModifyEditorSelectbox(int, int); +static void ModifyEditorSelectboxValue(int, int); +static void ModifyEditorSelectboxOptions(int, struct ValueTextInfo *); static void ModifyEditorDrawingArea(int, int, int); static void ModifyEditorElementList(); static void RedrawDrawingElements(); @@ -4157,64 +4452,16 @@ static void DrawDrawingArea(int id) struct GadgetInfo *gi = level_editor_gadget[drawingarea_info[id].gadget_id]; int x, y; - if (id == ED_DRAWING_ID_RANDOM_BACKGROUND) - DrawMiniGraphicExt(drawto, gi->x, gi->y, - el2edimg(random_placement_background_element)); - else if (id == ED_DRAWING_ID_AMOEBA_CONTENT) - DrawMiniGraphicExt(drawto, gi->x, gi->y, el2edimg(level.amoeba_content)); - else if (id == ED_DRAWING_ID_CUSTOM_GRAPHIC) - DrawMiniGraphicExt(drawto, gi->x, gi->y, - el2edimg(custom_element.gfx_element)); - else if (id == ED_DRAWING_ID_CUSTOM_CONTENT) - for (y = 0; y < 3; y++) - for (x = 0; x < 3; x++) - DrawMiniGraphicExt(drawto, - gi->x + x * MINI_TILEX, gi->y + y * MINI_TILEY, - el2edimg(custom_element.content[x][y])); - else if (id == ED_DRAWING_ID_CUSTOM_MOVE_ENTER) - DrawMiniGraphicExt(drawto, gi->x, gi->y, - el2edimg(custom_element.move_enter_element)); - else if (id == ED_DRAWING_ID_CUSTOM_MOVE_LEAVE) - DrawMiniGraphicExt(drawto, gi->x, gi->y, - el2edimg(custom_element.move_leave_element)); - else if (id == ED_DRAWING_ID_CUSTOM_CHANGE_TARGET) - DrawMiniGraphicExt(drawto, gi->x, gi->y, - el2edimg(custom_element_change.target_element)); - else if (id == ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT) - for (y = 0; y < 3; y++) - for (x = 0; x < 3; x++) - DrawMiniGraphicExt(drawto, - gi->x + x * MINI_TILEX, gi->y + y * MINI_TILEY, - el2edimg(custom_element_change.target_content[x][y])); - else if (id == ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER) - DrawMiniGraphicExt(drawto, gi->x, gi->y, - el2edimg(custom_element_change.trigger_element)); - else if (id == ED_DRAWING_ID_GROUP_CONTENT) - for (x = 0; x < group_element_info.num_elements; x++) - DrawMiniGraphicExt(drawto, gi->x + x * MINI_TILEX, gi->y, - el2edimg(group_element_info.element[x])); - else if (id >= ED_DRAWING_ID_YAMYAM_CONTENT_0 && - id <= ED_DRAWING_ID_YAMYAM_CONTENT_7) - { - int nr = id - ED_DRAWING_ID_YAMYAM_CONTENT_0; + int *value = drawingarea_info[id].value; + int area_xsize = drawingarea_info[id].area_xsize; + int area_ysize = drawingarea_info[id].area_ysize; - for (y = 0; y < 3; y++) - for (x = 0; x < 3; x++) - DrawMiniGraphicExt(drawto, - gi->x + x * MINI_TILEX, gi->y + y * MINI_TILEY, - el2edimg(level.yamyam_content[nr][x][y])); - } - else if (id >= ED_DRAWING_ID_MAGIC_BALL_CONTENT_0 && - id <= ED_DRAWING_ID_MAGIC_BALL_CONTENT_7) - { - int nr = id - ED_DRAWING_ID_MAGIC_BALL_CONTENT_0; - - for (y = 0; y < 3; y++) - for (x = 0; x < 3; x++) - DrawMiniGraphicExt(drawto, - gi->x + x * MINI_TILEX, gi->y + y * MINI_TILEY, - el2edimg(level.ball_content[nr][x][y])); - } + for (x = 0; x < area_xsize; x++) + for (y = 0; y < area_ysize; y++) + DrawMiniGraphicExt(drawto, + gi->x + x * MINI_TILEX, + gi->y + y * MINI_TILEY, + el2edimg(value[x * area_ysize + y])); } static void ScrollMiniLevel(int from_x, int from_y, int scroll) @@ -5256,20 +5503,34 @@ static void MapCounterButtons(int id) int yoffset_above = MINI_TILEX + ED_GADGET_DISTANCE; int yoffset = ED_BORDER_SIZE; int x_left = gi_down->x - xoffset_left; +#if 1 + int x_right; /* set after gadget position was modified */ +#else int x_right = gi_up->x + gi_up->width + xoffset_right; +#endif int y_above = gi_down->y - yoffset_above; int x = gi_down->x; int y; /* set after gadget position was modified */ - /* set position for "value1/value2" counter gadgets (score in most cases) */ - if (id == ED_COUNTER_ID_ELEMENT_VALUE1 || - id == ED_COUNTER_ID_ELEMENT_VALUE2) + /* counter limits must be changed first to prevent value truncation */ + ModifyEditorCounterLimits(id, counterbutton_info[id].min_value, + counterbutton_info[id].max_value); + + /* right text position might have changed after setting position above */ + x_right = gi_up->x + gi_up->width + xoffset_right; + + ModifyEditorCounterValue(id, *counterbutton_info[id].value); + + /* set position for "value[1,2,3,4]" counter gadgets (score in most cases) */ + if (id >= ED_COUNTER_ID_ELEMENT_VALUE1 && + id <= ED_COUNTER_ID_ELEMENT_VALUE4) { ModifyGadget(gi_down, GDI_Y, SY + counterbutton_info[id].y, GDI_END); ModifyGadget(gi_text, GDI_Y, SY + counterbutton_info[id].y, GDI_END); ModifyGadget(gi_up, GDI_Y, SY + counterbutton_info[id].y, GDI_END); } + /* vertical position might have changed after setting position above */ y = gi_up->y + yoffset; if (counterbutton_info[id].text_above) @@ -5281,8 +5542,6 @@ static void MapCounterButtons(int id) if (counterbutton_info[id].text_right) DrawText(x_right, y, counterbutton_info[id].text_right, FONT_TEXT_1); - ModifyEditorCounter(id, *counterbutton_info[id].value); - MapGadget(gi_down); MapGadget(gi_text); MapGadget(gi_up); @@ -5306,9 +5565,8 @@ static void MapControlButtons() /* map buttons to select level */ counter_id = ED_COUNTER_ID_SELECT_LEVEL; - ModifyEditorCounterLimits(counter_id, - leveldir_current->first_level, - leveldir_current->last_level); + counterbutton_info[counter_id].min_value = leveldir_current->first_level; + counterbutton_info[counter_id].max_value = leveldir_current->last_level; MapCounterButtons(counter_id); } @@ -5393,7 +5651,7 @@ static void MapSelectboxGadget(int id) if (selectbox_info[id].text_right) DrawText(x_right, y, selectbox_info[id].text_right, FONT_TEXT_1); - ModifyEditorSelectbox(id, *selectbox_info[id].value); + ModifyEditorSelectboxValue(id, *selectbox_info[id].value); MapGadget(gi); } @@ -5694,6 +5952,30 @@ static int setSelectboxValue(int selectbox_id, int new_value) return new_index_value; } +static void setSelectboxSpecialActionOptions() +{ + int i; + + /* change action mode and arg selectbox according to action type selectbox */ + 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; + + ModifyEditorSelectboxOptions(ED_SELECTBOX_ID_ACTION_MODE, + action_arg_modes[mode]); + ModifyEditorSelectboxValue(ED_SELECTBOX_ID_ACTION_MODE, + custom_element_change.action_mode); + + ModifyEditorSelectboxOptions(ED_SELECTBOX_ID_ACTION_ARG, + action_arg_options[i].options); + ModifyEditorSelectboxValue(ED_SELECTBOX_ID_ACTION_ARG, + custom_element_change.action_arg); + } + } +} + static void copy_custom_element_settings(int element_from, int element_to) { struct ElementInfo *ei_from = &element_info[element_from]; @@ -5718,6 +6000,10 @@ static void copy_custom_element_settings(int element_from, int element_to) ei_to->collect_score_initial = ei_from->collect_score_initial; ei_to->collect_count_initial = ei_from->collect_count_initial; + ei_to->ce_value_fixed_initial = ei_from->ce_value_fixed_initial; + ei_to->ce_value_random_initial = ei_from->ce_value_random_initial; + ei_to->use_last_ce_value = ei_from->use_last_ce_value; + ei_to->push_delay_fixed = ei_from->push_delay_fixed; ei_to->push_delay_random = ei_from->push_delay_random; ei_to->drop_delay_fixed = ei_from->drop_delay_fixed; @@ -5737,7 +6023,7 @@ static void copy_custom_element_settings(int element_from, int element_to) for (y = 0; y < 3; y++) for (x = 0; x < 3; x++) - ei_to->content[x][y] = ei_from->content[x][y]; + ei_to->content.e[x][y] = ei_from->content.e[x][y]; ei_to->explosion_type = ei_from->explosion_type; ei_to->explosion_delay = ei_from->explosion_delay; @@ -5772,8 +6058,8 @@ static void replace_custom_element_in_settings(int element_from, for (y = 0; y < 3; y++) for (x = 0; x < 3; x++) - if (ei->content[x][y] == element_from) - ei->content[x][y] = element_to; + if (ei->content.e[x][y] == element_from) + ei->content.e[x][y] = element_to; for (j = 0; j < ei->num_change_pages; j++) { @@ -5787,8 +6073,8 @@ static void replace_custom_element_in_settings(int element_from, for (y = 0; y < 3; y++) for (x = 0; x < 3; x++) - if (change->target_content[x][y] == element_from) - change->target_content[x][y] = element_to; + if (change->target_content.e[x][y] == element_from) + change->target_content.e[x][y] = element_to; } if (ei->group != NULL) /* group or internal */ @@ -5898,6 +6184,9 @@ static void CopyCustomElementPropertiesToEditor(int element) custom_element = element_info[element]; custom_element_change = *element_info[element].change; + /* needed to initially set selectbox options for special action options */ + setSelectboxSpecialActionOptions(); + /* needed to initially set selectbox value variables to reliable defaults */ for (i = 0; i < ED_NUM_SELECTBOX; i++) setSelectboxValue(i, *selectbox_info[i].value); @@ -5980,7 +6269,7 @@ static void CopyCustomElementPropertiesToEditor(int element) HAS_CHANGE_EVENT(element, CE_BLOCKED) ? CE_BLOCKED : HAS_CHANGE_EVENT(element, CE_IMPACT) ? CE_IMPACT : HAS_CHANGE_EVENT(element, CE_SMASHED) ? CE_SMASHED : - HAS_CHANGE_EVENT(element, CE_COUNT_AT_ZERO) ? CE_COUNT_AT_ZERO : + HAS_CHANGE_EVENT(element, CE_VALUE_GETS_ZERO) ? CE_VALUE_GETS_ZERO : custom_element_change.direct_action); /* set "change by other element action" selectbox help value */ @@ -5999,7 +6288,7 @@ static void CopyCustomElementPropertiesToEditor(int element) 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_COUNT_AT_ZERO_OF_X) ? CE_COUNT_AT_ZERO_OF_X : + HAS_CHANGE_EVENT(element, CE_VALUE_GETS_ZERO_OF_X) ? CE_VALUE_GETS_ZERO_OF_X : custom_element_change.other_action); } @@ -6114,7 +6403,7 @@ static void CopyCustomElementPropertiesToGame(int element) 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[CE_COUNT_AT_ZERO] = FALSE; + custom_element_change_events[CE_VALUE_GETS_ZERO] = FALSE; custom_element_change_events[custom_element_change.direct_action] = custom_element_change_events[CE_BY_DIRECT_ACTION]; @@ -6133,7 +6422,7 @@ static void CopyCustomElementPropertiesToGame(int element) 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_COUNT_AT_ZERO_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]; @@ -6333,7 +6622,7 @@ static void AdjustEditorScrollbar(int id) GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END); } -static void ModifyEditorCounter(int counter_id, int new_value) +static void ModifyEditorCounterValue(int counter_id, int new_value) { int *counter_value = counterbutton_info[counter_id].value; int gadget_id = counterbutton_info[counter_id].gadget_id_text; @@ -6351,9 +6640,19 @@ static void ModifyEditorCounterLimits(int counter_id, int min, int max) struct GadgetInfo *gi = level_editor_gadget[gadget_id]; ModifyGadget(gi, GDI_NUMBER_MIN, min, GDI_NUMBER_MAX, max, GDI_END); + + if (counter_id >= ED_COUNTER_ID_ELEMENT_VALUE1 && + counter_id <= ED_COUNTER_ID_ELEMENT_VALUE4) + { + int gadget_id_up = counterbutton_info[counter_id].gadget_id_up; + struct GadgetInfo *gi_up = level_editor_gadget[gadget_id_up]; + + ModifyGadget(gi, GDI_TEXT_SIZE, (max < 10 ? 1 : 3), GDI_END); + ModifyGadget(gi_up, GDI_X, gi->x + gi->width + ED_GADGET_DISTANCE,GDI_END); + } } -static void ModifyEditorSelectbox(int selectbox_id, int new_value) +static void ModifyEditorSelectboxValue(int selectbox_id, int new_value) { int gadget_id = selectbox_info[selectbox_id].gadget_id; struct GadgetInfo *gi = level_editor_gadget[gadget_id]; @@ -6362,6 +6661,19 @@ static void ModifyEditorSelectbox(int selectbox_id, int new_value) ModifyGadget(gi, GDI_SELECTBOX_INDEX, new_index_value, GDI_END); } +static void ModifyEditorSelectboxOptions(int selectbox_id, + struct ValueTextInfo *options) +{ + int gadget_id = selectbox_info[selectbox_id].gadget_id; + struct GadgetInfo *gi = level_editor_gadget[gadget_id]; + + selectbox_info[selectbox_id].options = options; + + /* set index to zero -- list may be shorter now (correct later, if needed) */ + ModifyGadget(gi, GDI_SELECTBOX_INDEX, 0, + GDI_SELECTBOX_OPTIONS, options, GDI_END); +} + static void ModifyEditorDrawingArea(int drawingarea_id, int xsize, int ysize) { int gadget_id = drawingarea_info[drawingarea_id].gadget_id; @@ -6558,7 +6870,7 @@ static void DrawMagicBallContentAreas() int y = SY + ED_AREA_MAGIC_BALL_CONTENT_YPOS(0) + ED_BORDER_AREA_YSIZE; int i; - for (i = 0; i < NUM_MAGIC_BALL_CONTENTS; i++) + for (i = 0; i < MAX_ELEMENT_CONTENTS; i++) MapDrawingArea(ED_DRAWING_ID_MAGIC_BALL_CONTENT_0 + i); DrawText(x, y + 0 * MINI_TILEY, "generated", FONT_TEXT_1); @@ -6851,6 +7163,11 @@ static void DrawPropertiesInfo() #define TEXT_BALL_DELAY "Element generation delay" #define TEXT_MOVE_SPEED "Speed of android moving" #define TEXT_CLONE_SPEED "Speed of android cloning" +#define TEXT_GAME_OF_LIFE_1 "Min neighbours to survive" +#define TEXT_GAME_OF_LIFE_2 "Max neighbours to survive" +#define TEXT_GAME_OF_LIFE_3 "Min neighbours to create" +#define TEXT_GAME_OF_LIFE_4 "Max neighbours to create" +#define TEXT_TIME_BONUS "Extra time to solve level" static struct { @@ -6905,7 +7222,7 @@ static struct { EL_DYNABOMB_INCREASE_POWER, &level.score[SC_DYNAMITE],TEXT_COLLECTING }, { EL_SHIELD_NORMAL, &level.score[SC_SHIELD], TEXT_COLLECTING }, { EL_SHIELD_DEADLY, &level.score[SC_SHIELD], TEXT_COLLECTING }, - { EL_EXTRA_TIME, &level.score[SC_TIME_BONUS], TEXT_COLLECTING }, + { EL_EXTRA_TIME, &level.extra_time_score, TEXT_COLLECTING }, { EL_KEY_1, &level.score[SC_KEY], TEXT_COLLECTING }, { EL_KEY_2, &level.score[SC_KEY], TEXT_COLLECTING }, { EL_KEY_3, &level.score[SC_KEY], TEXT_COLLECTING }, @@ -6923,8 +7240,26 @@ static struct { EL_AMOEBA_FULL, &level.amoeba_speed, TEXT_AMOEBA_SPEED }, { EL_BD_AMOEBA, &level.amoeba_speed, TEXT_AMOEBA_SPEED }, { EL_MAGIC_WALL, &level.time_magic_wall, TEXT_DURATION }, + { EL_BD_MAGIC_WALL, &level.time_magic_wall, TEXT_DURATION }, { EL_ROBOT_WHEEL, &level.time_wheel, TEXT_DURATION }, +#if 1 + { EL_TIMEGATE_SWITCH, &level.time_timegate, TEXT_DURATION }, + { EL_LIGHT_SWITCH_ACTIVE, &level.time_light, TEXT_DURATION }, + { EL_SHIELD_NORMAL, &level.shield_normal_time, TEXT_DURATION }, + { EL_SHIELD_DEADLY, &level.shield_deadly_time, TEXT_DURATION }, + { EL_EXTRA_TIME, &level.extra_time, TEXT_TIME_BONUS }, + { EL_TIME_ORB_FULL, &level.time_orb_time, TEXT_TIME_BONUS }, + { EL_GAME_OF_LIFE, &level.game_of_life[0], TEXT_GAME_OF_LIFE_1 }, + { EL_GAME_OF_LIFE, &level.game_of_life[1], TEXT_GAME_OF_LIFE_2 }, + { EL_GAME_OF_LIFE, &level.game_of_life[2], TEXT_GAME_OF_LIFE_3 }, + { EL_GAME_OF_LIFE, &level.game_of_life[3], TEXT_GAME_OF_LIFE_4 }, + { EL_BIOMAZE, &level.biomaze[0], TEXT_GAME_OF_LIFE_1 }, + { EL_BIOMAZE, &level.biomaze[1], TEXT_GAME_OF_LIFE_2 }, + { EL_BIOMAZE, &level.biomaze[2], TEXT_GAME_OF_LIFE_3 }, + { EL_BIOMAZE, &level.biomaze[3], TEXT_GAME_OF_LIFE_4 }, +#endif + #if 1 { EL_EMC_ANDROID, &level.android_move_time, TEXT_MOVE_SPEED }, { EL_EMC_ANDROID, &level.android_clone_time, TEXT_CLONE_SPEED }, @@ -6963,7 +7298,7 @@ static boolean checkPropertiesConfig(int element) static void DrawPropertiesConfig() { - int max_num_element_counters = 2; + int max_num_element_counters = 4; int num_element_counters = 0; int i; @@ -6991,9 +7326,18 @@ static void DrawPropertiesConfig() counterbutton_info[counter_id].value = elements_with_counter[i].value; counterbutton_info[counter_id].text_right= elements_with_counter[i].text; - /* !!! CHANGE THIS FOR CERTAIN ELEMENTS !!! */ - counterbutton_info[counter_id].min_value = MIN_SCORE; - counterbutton_info[counter_id].max_value = MAX_SCORE; + if (properties_element == EL_GAME_OF_LIFE || + properties_element == EL_BIOMAZE) + { + counterbutton_info[counter_id].min_value = 0; /* min neighbours */ + counterbutton_info[counter_id].max_value = 8; /* max neighbours */ + } + else + { + /* !!! CHANGE THIS FOR CERTAIN ELEMENTS !!! */ + counterbutton_info[counter_id].min_value = MIN_SCORE; + counterbutton_info[counter_id].max_value = MAX_SCORE; + } MapCounterButtons(counter_id); @@ -7019,13 +7363,27 @@ static void DrawPropertiesConfig() if (ELEM_IS_PLAYER(properties_element)) { + int player_nr = GET_PLAYER_NR(properties_element); + + /* this property can be set for every player individually */ + drawingarea_info[ED_DRAWING_ID_START_ELEMENT].value = + &level.start_element[player_nr]; + + /* this property can be set for every player individually */ + checkbutton_info[ED_CHECKBUTTON_ID_USE_START_ELEMENT].value = + &level.use_start_element[player_nr]; + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID); MapCheckbuttonGadget(properties_element == EL_SP_MURPHY ? ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD : ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD); + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_INSTANT_RELOCATION); + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_START_ELEMENT); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_DOUBLE_SPEED); + + MapDrawingArea(ED_DRAWING_ID_START_ELEMENT); } if (IS_GEM(properties_element)) @@ -7052,6 +7410,14 @@ static void DrawPropertiesConfig() if (properties_element == EL_SPRING) MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_SPRING_BUG); + if (properties_element == EL_TIME_ORB_FULL) + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG); + +#if 0 + if (properties_element == EL_BALLOON) + MapSelectboxGadget(ED_SELECTBOX_ID_WIND_DIRECTION); +#endif + if (CAN_GROW(properties_element)) { checkbutton_info[ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE].y = @@ -7176,6 +7542,9 @@ static void DrawPropertiesChange() { int i; + /* needed to initially set selectbox options for special action options */ + setSelectboxSpecialActionOptions(); + /* draw stickybutton gadget */ MapCheckbuttonGadget(ED_CHECKBUTTON_ID_STICK_ELEMENT); @@ -8098,6 +8467,9 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) } else { + int type_id = gi->custom_type_id; + int pos = sx * drawingarea_info[type_id].area_ysize + sy; + if (item_xsize == MINI_TILEX && item_ysize == MINI_TILEY) DrawMiniGraphicExt(drawto, gi->x + sx * MINI_TILEX, @@ -8109,71 +8481,19 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) gi->y + sy * TILEY, el2img(new_element), 0); - if (id == GADGET_ID_AMOEBA_CONTENT) - level.amoeba_content = new_element; - else if (id == GADGET_ID_CUSTOM_GRAPHIC) - { + if (id == GADGET_ID_CUSTOM_GRAPHIC) new_element = GFX_ELEMENT(new_element); - custom_element.gfx_element = new_element; - CopyElementPropertiesToGame(properties_element); - - UpdateCustomElementGraphicGadgets(); + drawingarea_info[type_id].value[pos] = new_element; - FrameCounter = 0; /* restart animation frame counter */ - } - else if (id == GADGET_ID_CUSTOM_CONTENT) - { - custom_element.content[sx][sy] = new_element; + CopyElementPropertiesToGame(properties_element); - CopyCustomElementPropertiesToGame(properties_element); - } - else if (id == GADGET_ID_CUSTOM_MOVE_ENTER) + if (id == GADGET_ID_CUSTOM_GRAPHIC) { - custom_element.move_enter_element = new_element; - - CopyCustomElementPropertiesToGame(properties_element); - } - else if (id == GADGET_ID_CUSTOM_MOVE_LEAVE) - { - custom_element.move_leave_element = new_element; - - CopyCustomElementPropertiesToGame(properties_element); - } - else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET) - { - custom_element_change.target_element = new_element; - - CopyCustomElementPropertiesToGame(properties_element); - } - else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT) - { - custom_element_change.target_content[sx][sy] = new_element; - - CopyCustomElementPropertiesToGame(properties_element); - } - else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER) - { - custom_element_change.trigger_element = new_element; - - CopyCustomElementPropertiesToGame(properties_element); - } - else if (id == GADGET_ID_GROUP_CONTENT) - { - group_element_info.element[sx] = new_element; + UpdateCustomElementGraphicGadgets(); - CopyGroupElementPropertiesToGame(properties_element); + FrameCounter = 0; /* restart animation frame counter */ } - else if (id == GADGET_ID_RANDOM_BACKGROUND) - random_placement_background_element = new_element; - else if (id >= GADGET_ID_YAMYAM_CONTENT_0 && - id <= GADGET_ID_YAMYAM_CONTENT_7) - level.yamyam_content[id - GADGET_ID_YAMYAM_CONTENT_0][sx][sy] = - new_element; - else if (id >= GADGET_ID_MAGIC_BALL_CONTENT_0 && - id <= GADGET_ID_MAGIC_BALL_CONTENT_7) - level.ball_content[id - GADGET_ID_MAGIC_BALL_CONTENT_0][sx][sy] = - new_element; } break; @@ -8272,39 +8592,12 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) MB_LEFTBUTTON); else if (draw_level) PickDrawingElement(button, Feld[lx][ly]); - else if (id == GADGET_ID_AMOEBA_CONTENT) - PickDrawingElement(button, level.amoeba_content); - else if (id == GADGET_ID_CUSTOM_GRAPHIC) - PickDrawingElement(button, custom_element.gfx_element); - else if (id == GADGET_ID_CUSTOM_CONTENT) - PickDrawingElement(button, custom_element.content[sx][sy]); - else if (id == GADGET_ID_CUSTOM_MOVE_ENTER) - PickDrawingElement(button, custom_element.move_enter_element); - else if (id == GADGET_ID_CUSTOM_MOVE_LEAVE) - PickDrawingElement(button, custom_element.move_leave_element); - else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET) - PickDrawingElement(button, custom_element_change.target_element); - else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT) - PickDrawingElement(button, custom_element_change.target_content[sx][sy]); - else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER) - PickDrawingElement(button, custom_element_change.trigger_element); - else if (id == GADGET_ID_GROUP_CONTENT) - PickDrawingElement(button, group_element_info.element[sx]); - else if (id == GADGET_ID_RANDOM_BACKGROUND) - PickDrawingElement(button, random_placement_background_element); - else if (id >= GADGET_ID_YAMYAM_CONTENT_0 && - id <= GADGET_ID_YAMYAM_CONTENT_7) - { - int i = id - GADGET_ID_YAMYAM_CONTENT_0; - - PickDrawingElement(button, level.yamyam_content[i][sx][sy]); - } - else if (id >= GADGET_ID_MAGIC_BALL_CONTENT_0 && - id <= GADGET_ID_MAGIC_BALL_CONTENT_7) + else { - int i = id - GADGET_ID_MAGIC_BALL_CONTENT_0; + int type_id = gi->custom_type_id; + int pos = sx * drawingarea_info[type_id].area_ysize + sy; - PickDrawingElement(button, level.ball_content[i][sx][sy]); + PickDrawingElement(button, drawingarea_info[type_id].value[pos]); } break; @@ -8336,7 +8629,7 @@ static void HandleCounterButtons(struct GadgetInfo *gi) REQ_ASK)) { if (gadget_id == counterbutton_info[counter_id].gadget_id_text) - ModifyEditorCounter(counter_id, *counter_value); + ModifyEditorCounterValue(counter_id, *counter_value); return; } @@ -8345,7 +8638,7 @@ static void HandleCounterButtons(struct GadgetInfo *gi) if (gadget_id == counterbutton_info[counter_id].gadget_id_text) *counter_value = gi->textinput.number_value; else - ModifyEditorCounter(counter_id, *counter_value + step); + ModifyEditorCounterValue(counter_id, *counter_value + step); if (counter_id == ED_COUNTER_ID_SELECT_LEVEL) { @@ -8420,9 +8713,10 @@ static void HandleTextAreaGadgets(struct GadgetInfo *gi) static void HandleSelectboxGadgets(struct GadgetInfo *gi) { int type_id = gi->custom_type_id; + int value_old = *selectbox_info[type_id].value; + int value_new = selectbox_info[type_id].options[gi->selectbox.index].value; - *selectbox_info[type_id].value = - selectbox_info[type_id].options[gi->selectbox.index].value; + *selectbox_info[type_id].value = value_new; if (type_id == ED_SELECTBOX_ID_SELECT_CHANGE_PAGE) { @@ -8436,6 +8730,18 @@ static void HandleSelectboxGadgets(struct GadgetInfo *gi) type_id <= ED_SELECTBOX_ID_CHANGE_LAST) || (type_id == ED_SELECTBOX_ID_GROUP_CHOICE_MODE)) { + if (type_id == ED_SELECTBOX_ID_ACTION_TYPE) + { + /* when changing action type, reset action mode and action arg */ + if (value_old != value_new) + { + custom_element_change.action_mode = -1; + custom_element_change.action_arg = -1; + } + + DrawPropertiesChange(); + } + CopyElementPropertiesToGame(properties_element); level.changed = TRUE; @@ -9142,6 +9448,7 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) { static int start_lx, start_ly; int id = gi->custom_id; + int type_id = gi->custom_type_id; int sx = gi->event.x; int sy = gi->event.y; int lx = sx + level_xpos; @@ -9260,67 +9567,27 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) } else if (actual_drawing_function == GADGET_ID_PICK_ELEMENT) { - int element = EL_EMPTY; - - if (id == GADGET_ID_AMOEBA_CONTENT) - element = level.amoeba_content; - else if (id == GADGET_ID_CUSTOM_GRAPHIC) - element = custom_element.gfx_element; - else if (id == GADGET_ID_CUSTOM_CONTENT) - element = custom_element.content[sx][sy]; - else if (id == GADGET_ID_CUSTOM_MOVE_ENTER) - element = custom_element.move_enter_element; - else if (id == GADGET_ID_CUSTOM_MOVE_LEAVE) - element = custom_element.move_leave_element; - else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET) - element = custom_element_change.target_element; - else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT) - element = custom_element_change.target_content[sx][sy]; - else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER) - element = custom_element_change.trigger_element; - else if (id == GADGET_ID_GROUP_CONTENT) - element = group_element_info.element[sx]; - else if (id == GADGET_ID_RANDOM_BACKGROUND) - element = random_placement_background_element; - else if (id >= GADGET_ID_YAMYAM_CONTENT_0 && - id <= GADGET_ID_YAMYAM_CONTENT_7) - element = level.yamyam_content[id - GADGET_ID_YAMYAM_CONTENT_0][sx][sy]; - else if (id >= GADGET_ID_MAGIC_BALL_CONTENT_0 && - id <= GADGET_ID_MAGIC_BALL_CONTENT_7) - element = level.ball_content[id -GADGET_ID_MAGIC_BALL_CONTENT_0][sx][sy]; + int pos = sx * drawingarea_info[type_id].area_ysize + sy; + int element = drawingarea_info[type_id].value[pos]; strncpy(infotext, getElementInfoText(element), max_infotext_len); } else { - if (id == GADGET_ID_AMOEBA_CONTENT) - strcpy(infotext, "Amoeba content"); - else if (id == GADGET_ID_CUSTOM_GRAPHIC) - strcpy(infotext, "Custom graphic element"); - else if (id == GADGET_ID_CUSTOM_CONTENT) - sprintf(infotext, "Custom element content position: %d, %d", sx, sy); - else if (id == GADGET_ID_CUSTOM_MOVE_ENTER) - strcpy(infotext, "Element that can be digged/collected"); - else if (id == GADGET_ID_CUSTOM_MOVE_LEAVE) - strcpy(infotext, "Element that will be left behind"); - else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET) - strcpy(infotext, "New element after change"); - else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT) - strcpy(infotext, "New extended elements after change"); - else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER) - strcpy(infotext, "Other element triggering change"); + if (id == GADGET_ID_CUSTOM_CONTENT) + sprintf(infotext, "custom element content position: %d, %d", sx, sy); else if (id == GADGET_ID_GROUP_CONTENT) - sprintf(infotext, "Group element position: %d", sx + 1); - else if (id == GADGET_ID_RANDOM_BACKGROUND) - strcpy(infotext, "Random placement background"); + sprintf(infotext, "group element position: %d", sx + 1); else if (id >= GADGET_ID_YAMYAM_CONTENT_0 && id <= GADGET_ID_YAMYAM_CONTENT_7) - sprintf(infotext, "Content area %d position: %d, %d", + sprintf(infotext, "content area %d position: %d, %d", id - GADGET_ID_YAMYAM_CONTENT_0 + 1, sx, sy); else if (id >= GADGET_ID_MAGIC_BALL_CONTENT_0 && id <= GADGET_ID_MAGIC_BALL_CONTENT_7) - sprintf(infotext, "Content area %d position: %d, %d", + sprintf(infotext, "content area %d position: %d, %d", id - GADGET_ID_MAGIC_BALL_CONTENT_0 + 1, sx, sy); + else if (drawingarea_info[type_id].infotext != NULL) + strcpy(infotext, drawingarea_info[type_id].infotext); } infotext[max_infotext_len] = '\0';