|
@@ -56,13 +56,13 @@
|
56
|
56
|
|
57
|
57
|
#define MAX_TRAVEL 128
|
58
|
58
|
|
59
|
|
-#define GRAVITY_RANGE (32 << POS_SCALE_OBJS)
|
|
59
|
+#define GRAVITY_RANGE (24 << POS_SCALE_OBJS)
|
60
|
60
|
#define GRAVITY_SHIFT (POS_SCALE_OBJS + 4)
|
61
|
61
|
#define DAMAGE_RANGE (16 << POS_SCALE_OBJS)
|
62
|
62
|
#define DAMAGE_INC 5
|
63
|
63
|
|
64
|
64
|
#define PICKUP_SMALL_RANGE (10 << POS_SCALE_OBJS)
|
65
|
|
-#define PICKUP_LARGE_RANGE (16 << POS_SCALE_OBJS)
|
|
65
|
+#define PICKUP_LARGE_RANGE (18 << POS_SCALE_OBJS)
|
66
|
66
|
#define SHOT_RANGE (10 << POS_SCALE_OBJS)
|
67
|
67
|
|
68
|
68
|
#define SCORE_SMALL 5
|
|
@@ -172,7 +172,7 @@ int16_t obj_act(int16_t *spd_off_x, int16_t *spd_off_y, int32_t *score) NONBANKE
|
172
|
172
|
}
|
173
|
173
|
|
174
|
174
|
if ((abs(objs[i].off_x) <= PICKUP_LARGE_RANGE) && (abs(objs[i].off_y) <= PICKUP_LARGE_RANGE)) {
|
175
|
|
- damage -= 1;
|
|
175
|
+ damage -= HEALTH_MAX;
|
176
|
176
|
}
|
177
|
177
|
break;
|
178
|
178
|
|