From c63cd15cc5d90521a2268721d12f271fd1cba150 Mon Sep 17 00:00:00 2001 From: KikooDX Date: Thu, 21 May 2020 17:21:30 +0200 Subject: [PATCH] [main.c+JTMM.g3a] The whole horizontal speed system now works. Also, ice --- JTMM.g3a | Bin 78288 -> 78624 bytes src/main.c | 19 ++++++++----------- up-editor/screens/5050.scr | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/JTMM.g3a b/JTMM.g3a index 969e39c4c99fd7036633bd7b4c2cfa85007d7f69..e85347087c12d1b59b2eb9f6e1254c5516619b87 100644 GIT binary patch delta 5396 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 -MAX_HSPD) + { + hspd += ACCELERATION * friction * move; } - else if (hspd > 0) + if (hspd > 0) { if (friction != 0.2) hspd -= DECELERATION * friction; else hspd -= DECELERATION / 4 * friction; @@ -165,7 +161,7 @@ int main(void) else hspd += DECELERATION / 4 * friction; if (hspd > 0) hspd = 0; } - trunc_hspd = hspd * direction; + trunc_hspd = hspd; if (1) //glue was here { if (!collide_solid(player_x + trunc_hspd, player_y, level, polarity, 0)) @@ -342,6 +338,7 @@ int main(void) player_x = start_x; player_y = start_y; polarity = 0; + drill_toggle = 0; vspd = 0; } } diff --git a/up-editor/screens/5050.scr b/up-editor/screens/5050.scr index 5674c74..6bb7485 100644 --- a/up-editor/screens/5050.scr +++ b/up-editor/screens/5050.scr @@ -1 +1 @@ -0000000000000000000000000000000000000000000000000000000.....rr.dddd.....000000000.....rr.dddd.....000000000.....rr.dddd.....000000000.....rr.dddd.....000000000..E..rr.dddd..t..00000000011111111bbbb.....00000000000000000bbbb1111100000000.........dddd0000000000000.........dddd0000000000000.....T...11110000000000000..S......0000000000000000011111111100000000000000000000000000000000000000000 \ No newline at end of file +0000000000000000000000000000000000000000000000000000000.....rr..........000000000.....rr..........000000000.....rr..........000000000.....rr..........000000000..E..rr.......t..00000000011111111bbbb.....00000000000000000bbbb~~~~~00000000.........dddd0000000000000.........dddd0000000000000.....T...11110000000000000..S......0000000000000000011111111100000000000000000000000000000000000000000 \ No newline at end of file