From 9c41e416db004e55818a310e9f3f2dfa885756ce Mon Sep 17 00:00:00 2001
From: KikooDX <kikoodissident@gmail.com>
Date: Thu, 21 May 2020 18:19:04 +0200
Subject: [PATCH] A lot of stuff.

---
 JTMM.g3a                              | Bin 78720 -> 79128 bytes
 assets-cg/img/drill.png               | Bin 0 -> 151 bytes
 include/draw.h                        |   2 ++
 include/shared_define.h               |   2 +-
 src/draw.c                            |  12 ++++++++++++
 src/main.c                            |   4 ++--
 texturepacks/programmer-art/drill.png | Bin 0 -> 151 bytes
 7 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 assets-cg/img/drill.png
 create mode 100644 texturepacks/programmer-art/drill.png

diff --git a/JTMM.g3a b/JTMM.g3a
index a1ab3827e7890fd1e408129ce6dc2992cd6717b2..5ea8a64766282637934db167aef879881e305441 100644
GIT binary patch
delta 3613
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

delta 3208
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
F>3{hW2nGNE

diff --git a/assets-cg/img/drill.png b/assets-cg/img/drill.png
new file mode 100644
index 0000000000000000000000000000000000000000..8087e2b246edbd34ea5571003de30540787e882a
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k#^NA%Cx&(BWL^R}fu1goAsQ2t
zQyiH71Ht(QRs$m=qeC}aL>6Z!xrDD-lhL*4!@IwiHD*bC)I7GVvvWdHiKW_{RRs)I
vSq|SMtQ<Hs+1P}dMUN?JKH|u9GLvB7e5K8IEVZcwXgGtXtDnm{r-UW|Q(7^2

literal 0
HcmV?d00001

diff --git a/include/draw.h b/include/draw.h
index e97eedb..90c4532 100644
--- a/include/draw.h
+++ b/include/draw.h
@@ -2,7 +2,9 @@
 
 void draw_anim_speed(int x, int y, image_t *image, int step, int speed);
 void draw_anim(int x, int y, image_t *image, int step);
+void draw_anim_drill(int x, int y, image_t *image, int step);
 void draw_player(int x, int y);
+void draw_drill(int x, int y, int direction, int step);
 void draw_level(char level[], unsigned int step, char polarity, int *start_x,
 	int *start_y, int tp_positions[]);
 void erase_tile(int x, int y, char level[]);
diff --git a/include/shared_define.h b/include/shared_define.h
index 897ca14..849dce1 100644
--- a/include/shared_define.h
+++ b/include/shared_define.h
@@ -2,4 +2,4 @@
 #define PLAYER_W 11
 #define LEVEL_WIDTH 28
 #define LAST_LEVEL 5062
-#define FPS 60
+#define FPS 50
diff --git a/src/draw.c b/src/draw.c
index 0bd5027..f6a3a9c 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -8,6 +8,7 @@
 #define DRAW_OFFSET_X -27
 
 extern image_t img_player; //player texture, 12x12 (NOT ANIMATED)
+extern image_t img_drill; //drill texture, 12x12 (animated)
 extern image_t img_solid_0; //solid texture, 16x16
 extern image_t img_solid_1; //solid texture, 16x16
 extern image_t img_spike; //spike texture, 16x16
@@ -35,11 +36,22 @@ void draw_anim(int x, int y, image_t *image, int step)
 	draw_anim_speed(x, y, image, step, 1);
 }
 
+void draw_anim_drill(int x, int y, image_t *image, int step)
+{
+	dsubimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, image,
+		(step % (image->width / 12)) * 12, 0, 12, 12, DIMAGE_NONE);
+}
+
 void draw_player(int x, int y)
 {
 	dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_player);
 }
 
+void draw_drill(int x, int y, int direction, int step)
+{
+	draw_anim_drill(x, y, &img_drill, step);
+}
+
 void draw_level(char level[], unsigned int step, char polarity, int *start_x,
 int *start_y, int tp_positions[])
 {
diff --git a/src/main.c b/src/main.c
index 86cc71b..3b1cbf0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,7 +11,7 @@
 #include "shared_define.h"
 
 #define MAX_HSPD 2.5
-#define DRILL_HSPD 5.0
+#define DRILL_HSPD 4.0
 #define ACCELERATION 1.0
 #define DECELERATION 0.5
 #define LOCK_MOMENTUM 5
@@ -86,7 +86,7 @@ int main(void)
 			DRAW_LEVEL();
 			draw_player(player_x, player_y);
 			//drill
-			if (drill_toggle) draw_player(drill_x, drill_y);
+			if (drill_toggle) draw_drill(drill_x, drill_y, selected_direction, step);
 			draw_timer(step/2);
 			dupdate();
 		}
diff --git a/texturepacks/programmer-art/drill.png b/texturepacks/programmer-art/drill.png
new file mode 100644
index 0000000000000000000000000000000000000000..8087e2b246edbd34ea5571003de30540787e882a
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k#^NA%Cx&(BWL^R}fu1goAsQ2t
zQyiH71Ht(QRs$m=qeC}aL>6Z!xrDD-lhL*4!@IwiHD*bC)I7GVvvWdHiKW_{RRs)I
vSq|SMtQ<Hs+1P}dMUN?JKH|u9GLvB7e5K8IEVZcwXgGtXtDnm{r-UW|Q(7^2

literal 0
HcmV?d00001