From a75eb5143f696ad3050db8c5477f89cffaff8961 Mon Sep 17 00:00:00 2001 From: KikooDX Date: Mon, 18 May 2020 19:08:38 +0200 Subject: [PATCH] [main.c+JTMM.g3a] Drill speed boost when hitting a wall --- JTMM.g3a | Bin 78272 -> 78288 bytes src/main.c | 16 ++++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/JTMM.g3a b/JTMM.g3a index 876230a01d6551697e48930058418dae2cdf5b4a..969e39c4c99fd7036633bd7b4c2cfa85007d7f69 100644 GIT binary patch delta 4547 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 MIr7OG#p`eX8xPF~vj6}9 delta 4531 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 diff --git a/src/main.c b/src/main.c index 4efc885..cff2349 100644 --- a/src/main.c +++ b/src/main.c @@ -10,7 +10,8 @@ #include "menu.h" #include "shared_define.h" -#define MAX_HSPD 2.5 +#define MAX_HSPD 2.0 +#define DRILL_HSPD 4.5 #define ACCELERATION 1.0 #define DECELERATION 0.5 #define MIN_VSPD -12.0 @@ -152,7 +153,6 @@ int main(void) if (hspd < MAX_HSPD) { hspd += ACCELERATION * friction; - if (hspd > MAX_HSPD) hspd = MAX_HSPD; } direction = move; } @@ -295,11 +295,15 @@ int main(void) break; } collide_and_erase(drill_x, drill_y, level, 'd'); - if ((selected_direction == UP || selected_direction == DOWN) && - (collide_spike(drill_x, drill_y, level) || collide_solid(drill_x, drill_y, level, polarity, 0))) + if (collide_spike(drill_x, drill_y, level) || collide_solid(drill_x, drill_y, level, polarity, 0)) { - vspd = -vspd; - drill_toggle = 0; + if (selected_direction == UP || selected_direction == DOWN) + { + vspd = -vspd; + drill_toggle = 0; + } + else if (selected_direction == LEFT) hspd = DRILL_HSPD; + else /*direction is RIGHT*/ hspd = -DRILL_HSPD; } } //spike collision and death