diff --git a/JTMM.g3a b/JTMM.g3a index f909630..7ffcb66 100644 Binary files a/JTMM.g3a and b/JTMM.g3a differ 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 0000000..6509581 Binary files /dev/null and b/up-editor/force_img/elevator.png differ diff --git a/up-editor/img/elevator.png b/up-editor/img/elevator.png index ada442e..6509581 100644 Binary files a/up-editor/img/elevator.png and b/up-editor/img/elevator.png differ 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"),