-1
};
- static int ep_collectible[] =
+ static int ep_collectible_only[] =
{
EL_BD_DIAMOND,
EL_EMERALD,
} element_properties[] =
{
{ ep_diggable, EP_DIGGABLE },
- { ep_collectible, EP_COLLECTIBLE },
+ { ep_collectible_only, EP_COLLECTIBLE_ONLY },
{ ep_dont_run_into, EP_DONT_RUN_INTO },
{ ep_dont_collide_with, EP_DONT_COLLIDE_WITH },
{ ep_dont_touch, EP_DONT_TOUCH },
static int no_wall_properties[] =
{
EP_DIGGABLE,
- EP_COLLECTIBLE,
+ EP_COLLECTIBLE_ONLY,
EP_DONT_RUN_INTO,
EP_DONT_COLLIDE_WITH,
EP_CAN_MOVE,
SET_PROPERTY(i, EP_ACCESSIBLE, (IS_WALKABLE(i) ||
IS_PASSABLE(i)));
+ /* ---------- COLLECTIBLE ---------------------------------------------- */
+ SET_PROPERTY(i, EP_COLLECTIBLE, (IS_COLLECTIBLE_ONLY(i) ||
+ IS_DROPPABLE(i)));
+
/* ---------- SNAPPABLE ------------------------------------------------ */
SET_PROPERTY(i, EP_SNAPPABLE, (IS_DIGGABLE(i) ||
IS_COLLECTIBLE(i) ||
CAN_EXPLODE_SMASHED(i) ||
CAN_EXPLODE_IMPACT(i)));
+ /* ---------- CAN_EXPLODE_3X3 ------------------------------------------ */
+ SET_PROPERTY(i, EP_CAN_EXPLODE_3X3, !CAN_EXPLODE_1X1(i));
+
/* ---------- CAN_BE_CRUMBLED ------------------------------------------ */
SET_PROPERTY(i, EP_CAN_BE_CRUMBLED,
element_info[i].crumbled[ACTION_DEFAULT] != IMG_EMPTY);