From 8d17b06def2c1983e9d997e9fe4dc424100ea6f4 Mon Sep 17 00:00:00 2001 From: KikooDX Date: Sun, 17 May 2020 14:27:46 +0200 Subject: [PATCH] Working drill. Time to rebase. --- JTMM.g3a | Bin 77368 -> 77384 bytes src/collide.c | 1 + src/main.c | 37 +++++++++++++++++-------------- up-editor/force_img/elevator.png | Bin 0 -> 164 bytes up-editor/img/elevator.png | Bin 323 -> 164 bytes up-editor/screens/5050.scr | 2 +- up-editor/tiles.lua | 2 +- 7 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 up-editor/force_img/elevator.png diff --git a/JTMM.g3a b/JTMM.g3a index f909630b254fc886a63f49fcb2a86a5d5051db84..7ffcb6620d319024b86cd96696fff2473c891cd8 100644 GIT binary patch delta 3919 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 I@IUIm0gAn>;s5{u diff --git a/src/collide.c b/src/collide.c index 0252656..73962a6 100644 --- a/src/collide.c +++ b/src/collide.c @@ -42,6 +42,7 @@ char collide_solid(int x, int y, char level[], char polarity, collide(x, y, level, '0') || collide(x, y, level, '1') || collide(x, y, level, '^') || + collide(x, y, level, 'd') || collide(x, y, level, '~')); } diff --git a/src/main.c b/src/main.c index 7dc098d..53d46d4 100644 --- a/src/main.c +++ b/src/main.c @@ -85,25 +85,28 @@ int main(void) DRAW_LEVEL(); draw_player(player_x, player_y); //drill - int drill_x = player_x; - int drill_y = player_y; - switch (last_direction) + if (keydown(KEY_ALPHA)) { - case UP: - drill_y -= 12; - break; - case DOWN: - drill_y += 12; - break; - case LEFT: - drill_x -= 12; - break; - case RIGHT: - drill_x += 12; - break; + int drill_x = player_x; + int drill_y = player_y; + switch (last_direction) + { + case UP: + drill_y -= 12; + break; + case DOWN: + drill_y += 12; + break; + case LEFT: + drill_x -= 12; + break; + case RIGHT: + drill_x += 12; + break; + } + draw_player(drill_x, drill_y); + collide_and_erase(drill_x, drill_y, level, 'd'); } - draw_player(drill_x, drill_y); - collide_and_erase(drill_x, drill_y, level, 'd'); draw_timer(step/2); dupdate(); } diff --git a/up-editor/force_img/elevator.png b/up-editor/force_img/elevator.png new file mode 100644 index 0000000000000000000000000000000000000000..6509581ab311557ff794d7919f375a04e2fadb6e GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|;yhg(Lo9le zw`|w{dES9BVUf#c0fU6|&zyOx&EyYdGjQwm-uR)nuj~h}LW;Cmb416*j`Iq~?$1Bt zc9~J`!K3VU(^nH1uQ?o9${C%rP{QGaSq_`wzkey;=1272;9+85IH{`_5psMQ&?W{? LS3j3^P60sJ%JQsage(c!@6@aFM*uDo-U3d z6?5LsG!$x95Mg~7G;N{h?AsNax2!BuiRKQr6qXH9X#V-B?Dv1J6nTSR0>4f=PPzX1 z?VRFw|8|I;U2A#j<}B+|o^!jOPC2J#u)g@6RBr9_#dEIIZaa7K?)>|f`<^m6B;<;) z=*^vL7|X!1hL`F3@+?M$4Q3oU^Y4PB1a{OeVr@8(+i>945}60xK%r=$Z2Fx8wH$w2 z4wM2_tozXN?eT?~f4M*83q;J;=9ptFemZj(gFu8dYh(T1#@TudEZ5i?Uk7gm39)QD zp9ePnj@?BjhX-ar{Xu*mT!BKmK+VQ^59(xgaW=jN+7|PW^Dm>*;;TEn?6>j(1A@WR L)z4*}Q$iB}M^S}i diff --git a/up-editor/screens/5050.scr b/up-editor/screens/5050.scr index 374c9e0..5674c74 100644 --- a/up-editor/screens/5050.scr +++ b/up-editor/screens/5050.scr @@ -1 +1 @@ -0000000000000000000000000000000000000000000000000000000.....rr..........000000000.....rr..........000000000.....rr..........000000000.....rr..........000000000..E..rr.......t..00000000011111111bbbb.....00000000000000000bbbb1111100000000.............0000000000000.............0000000000000.....T...11110000000000000..S......0000000000000000011111111100000000000000000000000000000000000000000 \ No newline at end of file +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 diff --git a/up-editor/tiles.lua b/up-editor/tiles.lua index eb3ecda..980830b 100644 --- a/up-editor/tiles.lua +++ b/up-editor/tiles.lua @@ -6,7 +6,7 @@ tiles = { love.graphics.newImage(img_path.."red_dot.png"), love.graphics.newImage(img_path.."blue_dot.png"), love.graphics.newImage(img_path.."spike.png"), - love.graphics.newImage(img_path.."elevator1.png"), + love.graphics.newImage(img_path.."elevator.png"), love.graphics.newImage(img_path.."water.png"), love.graphics.newImage(img_path.."bouncer.png"), love.graphics.newImage(img_path.."semi_solid.png"),