diff --git a/JTMM.g3a b/JTMM.g3a index 0c1aadf..f909630 100644 Binary files a/JTMM.g3a and b/JTMM.g3a differ diff --git a/assets-cg/img/dust.png b/assets-cg/img/dust.png new file mode 100644 index 0000000..53b6f13 Binary files /dev/null and b/assets-cg/img/dust.png differ diff --git a/src/draw.c b/src/draw.c index 674c78d..12cc740 100644 --- a/src/draw.c +++ b/src/draw.c @@ -23,6 +23,7 @@ extern image_t img_semi_solid; //semi solid texture, 16x16 extern image_t img_teleporter_0; //teleporter 0 texture, 16x16 extern image_t img_teleporter_1; //teleporter 1 texture, 16x16 extern image_t img_elevator; //elevator texture, 16x16 +extern image_t img_dust; //dust texture, 16x16 void draw_anim_speed(int x, int y, image_t *image, int step, int speed) { @@ -79,6 +80,9 @@ int *start_y, int tp_positions[]) break; case '^': draw_anim_speed(x, y, &img_elevator, step, 2); //half speed + break; + case 'd': + draw_anim(x, y, &img_dust, step); break; case 'S': erase_tile(x, y, level); diff --git a/src/main.c b/src/main.c index ee2e10a..709495b 100644 --- a/src/main.c +++ b/src/main.c @@ -103,6 +103,7 @@ int main(void) break; } draw_player(drill_x, drill_y); + collide_and_erase(drill_x, drill_y, level, 'd'); draw_timer(step/2); dupdate(); } diff --git a/texturepacks/programmer-art/dust.png b/texturepacks/programmer-art/dust.png new file mode 100644 index 0000000..53b6f13 Binary files /dev/null and b/texturepacks/programmer-art/dust.png differ diff --git a/up-editor/img/dust.png b/up-editor/img/dust.png new file mode 100644 index 0000000..53b6f13 Binary files /dev/null and b/up-editor/img/dust.png differ diff --git a/up-editor/img/elevator.png b/up-editor/img/elevator.png index 449d458..ada442e 100644 Binary files a/up-editor/img/elevator.png and b/up-editor/img/elevator.png differ diff --git a/up-editor/img/elevator1.png b/up-editor/img/elevator1.png deleted file mode 100644 index 9b5f74f..0000000 Binary files a/up-editor/img/elevator1.png and /dev/null differ diff --git a/up-editor/img/elevator10.png b/up-editor/img/elevator10.png deleted file mode 100644 index 9e41871..0000000 Binary files a/up-editor/img/elevator10.png and /dev/null differ diff --git a/up-editor/img/elevator11.png b/up-editor/img/elevator11.png deleted file mode 100644 index 730dbc6..0000000 Binary files a/up-editor/img/elevator11.png and /dev/null differ diff --git a/up-editor/img/elevator12.png b/up-editor/img/elevator12.png deleted file mode 100644 index efbd7be..0000000 Binary files a/up-editor/img/elevator12.png and /dev/null differ diff --git a/up-editor/img/elevator13.png b/up-editor/img/elevator13.png deleted file mode 100644 index 3f13933..0000000 Binary files a/up-editor/img/elevator13.png and /dev/null differ diff --git a/up-editor/img/elevator14.png b/up-editor/img/elevator14.png deleted file mode 100644 index a0b1411..0000000 Binary files a/up-editor/img/elevator14.png and /dev/null differ diff --git a/up-editor/img/elevator15.png b/up-editor/img/elevator15.png deleted file mode 100644 index 3a77e45..0000000 Binary files a/up-editor/img/elevator15.png and /dev/null differ diff --git a/up-editor/img/elevator16.png b/up-editor/img/elevator16.png deleted file mode 100644 index b2b4d06..0000000 Binary files a/up-editor/img/elevator16.png and /dev/null differ diff --git a/up-editor/img/elevator2.png b/up-editor/img/elevator2.png deleted file mode 100644 index 57a6603..0000000 Binary files a/up-editor/img/elevator2.png and /dev/null differ diff --git a/up-editor/img/elevator3.png b/up-editor/img/elevator3.png deleted file mode 100644 index ef67512..0000000 Binary files a/up-editor/img/elevator3.png and /dev/null differ diff --git a/up-editor/img/elevator4.png b/up-editor/img/elevator4.png deleted file mode 100644 index f2178f1..0000000 Binary files a/up-editor/img/elevator4.png and /dev/null differ diff --git a/up-editor/img/elevator5.png b/up-editor/img/elevator5.png deleted file mode 100644 index 49ec82b..0000000 Binary files a/up-editor/img/elevator5.png and /dev/null differ diff --git a/up-editor/img/elevator6.png b/up-editor/img/elevator6.png deleted file mode 100644 index 8a75c06..0000000 Binary files a/up-editor/img/elevator6.png and /dev/null differ diff --git a/up-editor/img/elevator7.png b/up-editor/img/elevator7.png deleted file mode 100644 index 6417a80..0000000 Binary files a/up-editor/img/elevator7.png and /dev/null differ diff --git a/up-editor/img/elevator8.png b/up-editor/img/elevator8.png deleted file mode 100644 index 8a75d8a..0000000 Binary files a/up-editor/img/elevator8.png and /dev/null differ diff --git a/up-editor/img/elevator9.png b/up-editor/img/elevator9.png deleted file mode 100644 index 847d00e..0000000 Binary files a/up-editor/img/elevator9.png and /dev/null differ diff --git a/up-editor/tiles.lua b/up-editor/tiles.lua index 1776e54..eb3ecda 100644 --- a/up-editor/tiles.lua +++ b/up-editor/tiles.lua @@ -12,9 +12,11 @@ tiles = { love.graphics.newImage(img_path.."semi_solid.png"), love.graphics.newImage(img_path.."teleporter_0.png"), love.graphics.newImage(img_path.."teleporter_1.png"), + love.graphics.newImage(img_path.."dust.png"), love.graphics.newImage(img_path.."spawn.png"), love.graphics.newImage(img_path.."exit.png"), } -tiles_char = { '0', '1', 'r', 'b', 'v', '^', 'w', '*', '/', 't', 'T' ,'S', 'E' } +tiles_char = { '0', '1', 'r', 'b', 'v', '^', 'w', '*', '/', 't', 'T', 'd', 'S', +'E' } selected_tile = 1