From 228c2560ce5285057783683fe384e367c1225590 Mon Sep 17 00:00:00 2001
From: KikooDX <kikoodissident@gmail.com>
Date: Thu, 14 May 2020 17:23:09 +0200
Subject: [PATCH] Teleporter first shot

---
 JTMM.g3a                                     | Bin 74704 -> 76032 bytes
 assets-cg/img/teleporter_0.png               | Bin 0 -> 222 bytes
 assets-cg/img/teleporter_1.png               | Bin 0 -> 222 bytes
 include/draw.h                               |   2 +-
 src/draw.c                                   |  16 +++++++++++--
 src/main.c                                   |  24 ++++++++++++++++++-
 texturepacks/default/teleporter_0.png        | Bin 0 -> 222 bytes
 texturepacks/default/teleporter_1.png        | Bin 0 -> 222 bytes
 texturepacks/programmer-art/teleporter_0.png | Bin 0 -> 222 bytes
 texturepacks/programmer-art/teleporter_1.png | Bin 0 -> 222 bytes
 up-editor/img/teleporter_0.png               | Bin 0 -> 222 bytes
 up-editor/img/teleporter_1.png               | Bin 0 -> 222 bytes
 up-editor/screens/5050.scr                   |   2 +-
 up-editor/screens/5062.scr                   |   2 +-
 up-editor/tiles.lua                          |   4 +++-
 15 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 assets-cg/img/teleporter_0.png
 create mode 100644 assets-cg/img/teleporter_1.png
 create mode 100644 texturepacks/default/teleporter_0.png
 create mode 100644 texturepacks/default/teleporter_1.png
 create mode 100644 texturepacks/programmer-art/teleporter_0.png
 create mode 100644 texturepacks/programmer-art/teleporter_1.png
 create mode 100644 up-editor/img/teleporter_0.png
 create mode 100644 up-editor/img/teleporter_1.png

diff --git a/JTMM.g3a b/JTMM.g3a
index 34f465ba2142ee3028c68ea45407ddaac2a3f05f..44f5fc694d319b1be3b3eb967b1628542f69c103 100644
GIT binary patch
delta 5771
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
IhW{`BH$epx`v3p{

delta 4565
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

diff --git a/assets-cg/img/teleporter_0.png b/assets-cg/img/teleporter_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cedf237e3b26c90b5221820449b9b89e0e679fd
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|W_Y?dhFJ8j
zoxD-7L4n6L-ljS_T0DVyc{#KAhOMPcYaTiJeDV7u+VW?<JjVr&PQFhYpQqksm~pv<
zXYuUY)h-RGcY*A6rg^PZ-q%)%Nu57F&wFBaqV9B+{Pjwo+`?Rx?gme~-t;U)_XVqK
z%6g81@(--j9a1i?j@z|H#-`Kd`{(n<RZ4-O*4M78oHFpTJQc@XHf6Sbu(2P9W~G0^
TTDRRmH!^s-`njxgN@xNANuE@+

literal 0
HcmV?d00001

diff --git a/assets-cg/img/teleporter_1.png b/assets-cg/img/teleporter_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cedf237e3b26c90b5221820449b9b89e0e679fd
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|W_Y?dhFJ8j
zoxD-7L4n6L-ljS_T0DVyc{#KAhOMPcYaTiJeDV7u+VW?<JjVr&PQFhYpQqksm~pv<
zXYuUY)h-RGcY*A6rg^PZ-q%)%Nu57F&wFBaqV9B+{Pjwo+`?Rx?gme~-t;U)_XVqK
z%6g81@(--j9a1i?j@z|H#-`Kd`{(n<RZ4-O*4M78oHFpTJQc@XHf6Sbu(2P9W~G0^
TTDRRmH!^s-`njxgN@xNANuE@+

literal 0
HcmV?d00001

diff --git a/include/draw.h b/include/draw.h
index af932aa..19f85dc 100644
--- a/include/draw.h
+++ b/include/draw.h
@@ -1,6 +1,6 @@
 void draw_player(int x, int y);
 void draw_level(char level[], unsigned int step, char polarity, int *start_x,
-	int *start_y);
+	int *start_y, int tp_positions[]);
 void erase_tile(int x, int y, char level[]);
 void draw_timer(unsigned int step); //coucou Lephé'
 void just_breathe();
diff --git a/src/draw.c b/src/draw.c
index 9483cc5..edd61b1 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -20,7 +20,9 @@ extern image_t img_red_dot; //off red bloc texture, 16x16
 extern image_t img_exit; //exit texture, 16x16
 extern image_t img_water; //water texture, 16x16
 extern image_t img_semi_solid; //semi solid texture, 16x16
-//animated textures
+extern image_t img_teleporter_0; //teleporter 0 texture, 16x16
+extern image_t img_teleporter_1; //teleporter 1 texture, 16x16
+//animated textures (elevator)
 extern image_t img_elevator1, img_elevator2, img_elevator3, img_elevator4;
 extern image_t img_elevator5, img_elevator6, img_elevator7, img_elevator8;
 extern image_t img_elevator9, img_elevator10, img_elevator11, img_elevator12;
@@ -37,7 +39,7 @@ void draw_player(int x, int y)
 }
 
 void draw_level(char level[], unsigned int step, char polarity, int *start_x,
-int *start_y)
+int *start_y, int tp_positions[])
 {
 	dclear(BG_COLOR);
 	unsigned int i = 0;
@@ -88,6 +90,16 @@ int *start_y)
 			case 'w': //water
 				dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_water);
 				break;
+			case 't': //teleporter 0
+				dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_teleporter_0);
+				tp_positions[0] = x + 2;
+				tp_positions[1] = y + 2;
+				break;
+			case 'T': //teleporter 1
+				dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_teleporter_1);
+				tp_positions[2] = x + 2;
+				tp_positions[3] = y + 2;
+				break;
 		}
 		x += 16;
 		if (x == 16*LEVEL_WIDTH)
diff --git a/src/main.c b/src/main.c
index 3c19c76..7d88e0e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,7 +18,7 @@
 #define GRAV 0.4
 #define JUMP_SCALE 8
 #define JUMP_REDUCTION -0.41
-#define DRAW_LEVEL() draw_level(level, step, polarity, &start_x, &start_y)
+#define DRAW_LEVEL() draw_level(level, step, polarity, &start_x, &start_y, tp_positions)
 
 void dupdate(); //gint function
 //test if jump pressed
@@ -57,6 +57,8 @@ int main(void)
 	char enable_up_key = 0;
 	char game_loop = 1;
 	char exit_buffer = 0;
+	char tp_buffer = 0;
+	int tp_positions[4] = { 0, 0, 0, 0 };
 	set_level(level_id, level);
 	DRAW_LEVEL();
 	player_x = start_x;
@@ -199,6 +201,26 @@ int main(void)
 				}
 			}
 		}
+		//teleporter
+		if (collide(player_x, player_y, level, 't'))
+		{
+			if (!tp_buffer)
+			{
+				player_x = tp_positions[2];
+				player_y = tp_positions[3];
+			}
+			tp_buffer = 1;
+		}
+		else if (collide(player_x, player_y, level, 'T'))
+		{
+			if (!tp_buffer)
+			{
+				player_x = tp_positions[0];
+				player_y = tp_positions[1];
+			}
+			tp_buffer = 1;
+		}
+		else tp_buffer = 0;
 		//spike collision and death
 		if (collide_spike(player_x, player_y, level))
 		{
diff --git a/texturepacks/default/teleporter_0.png b/texturepacks/default/teleporter_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cedf237e3b26c90b5221820449b9b89e0e679fd
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|W_Y?dhFJ8j
zoxD-7L4n6L-ljS_T0DVyc{#KAhOMPcYaTiJeDV7u+VW?<JjVr&PQFhYpQqksm~pv<
zXYuUY)h-RGcY*A6rg^PZ-q%)%Nu57F&wFBaqV9B+{Pjwo+`?Rx?gme~-t;U)_XVqK
z%6g81@(--j9a1i?j@z|H#-`Kd`{(n<RZ4-O*4M78oHFpTJQc@XHf6Sbu(2P9W~G0^
TTDRRmH!^s-`njxgN@xNANuE@+

literal 0
HcmV?d00001

diff --git a/texturepacks/default/teleporter_1.png b/texturepacks/default/teleporter_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cedf237e3b26c90b5221820449b9b89e0e679fd
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|W_Y?dhFJ8j
zoxD-7L4n6L-ljS_T0DVyc{#KAhOMPcYaTiJeDV7u+VW?<JjVr&PQFhYpQqksm~pv<
zXYuUY)h-RGcY*A6rg^PZ-q%)%Nu57F&wFBaqV9B+{Pjwo+`?Rx?gme~-t;U)_XVqK
z%6g81@(--j9a1i?j@z|H#-`Kd`{(n<RZ4-O*4M78oHFpTJQc@XHf6Sbu(2P9W~G0^
TTDRRmH!^s-`njxgN@xNANuE@+

literal 0
HcmV?d00001

diff --git a/texturepacks/programmer-art/teleporter_0.png b/texturepacks/programmer-art/teleporter_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cedf237e3b26c90b5221820449b9b89e0e679fd
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|W_Y?dhFJ8j
zoxD-7L4n6L-ljS_T0DVyc{#KAhOMPcYaTiJeDV7u+VW?<JjVr&PQFhYpQqksm~pv<
zXYuUY)h-RGcY*A6rg^PZ-q%)%Nu57F&wFBaqV9B+{Pjwo+`?Rx?gme~-t;U)_XVqK
z%6g81@(--j9a1i?j@z|H#-`Kd`{(n<RZ4-O*4M78oHFpTJQc@XHf6Sbu(2P9W~G0^
TTDRRmH!^s-`njxgN@xNANuE@+

literal 0
HcmV?d00001

diff --git a/texturepacks/programmer-art/teleporter_1.png b/texturepacks/programmer-art/teleporter_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cedf237e3b26c90b5221820449b9b89e0e679fd
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|W_Y?dhFJ8j
zoxD-7L4n6L-ljS_T0DVyc{#KAhOMPcYaTiJeDV7u+VW?<JjVr&PQFhYpQqksm~pv<
zXYuUY)h-RGcY*A6rg^PZ-q%)%Nu57F&wFBaqV9B+{Pjwo+`?Rx?gme~-t;U)_XVqK
z%6g81@(--j9a1i?j@z|H#-`Kd`{(n<RZ4-O*4M78oHFpTJQc@XHf6Sbu(2P9W~G0^
TTDRRmH!^s-`njxgN@xNANuE@+

literal 0
HcmV?d00001

diff --git a/up-editor/img/teleporter_0.png b/up-editor/img/teleporter_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cedf237e3b26c90b5221820449b9b89e0e679fd
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|W_Y?dhFJ8j
zoxD-7L4n6L-ljS_T0DVyc{#KAhOMPcYaTiJeDV7u+VW?<JjVr&PQFhYpQqksm~pv<
zXYuUY)h-RGcY*A6rg^PZ-q%)%Nu57F&wFBaqV9B+{Pjwo+`?Rx?gme~-t;U)_XVqK
z%6g81@(--j9a1i?j@z|H#-`Kd`{(n<RZ4-O*4M78oHFpTJQc@XHf6Sbu(2P9W~G0^
TTDRRmH!^s-`njxgN@xNANuE@+

literal 0
HcmV?d00001

diff --git a/up-editor/img/teleporter_1.png b/up-editor/img/teleporter_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cedf237e3b26c90b5221820449b9b89e0e679fd
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|W_Y?dhFJ8j
zoxD-7L4n6L-ljS_T0DVyc{#KAhOMPcYaTiJeDV7u+VW?<JjVr&PQFhYpQqksm~pv<
zXYuUY)h-RGcY*A6rg^PZ-q%)%Nu57F&wFBaqV9B+{Pjwo+`?Rx?gme~-t;U)_XVqK
z%6g81@(--j9a1i?j@z|H#-`Kd`{(n<RZ4-O*4M78oHFpTJQc@XHf6Sbu(2P9W~G0^
TTDRRmH!^s-`njxgN@xNANuE@+

literal 0
HcmV?d00001

diff --git a/up-editor/screens/5050.scr b/up-editor/screens/5050.scr
index a2b767b..374c9e0 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..........00000000011111111bbbb.....00000000000000000bbbb1111100000000.............0000000000000.............0000000000000.........11110000000000000..S......0000000000000000011111111100000000000000000000000000000000000000000
\ No newline at end of file
+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
diff --git a/up-editor/screens/5062.scr b/up-editor/screens/5062.scr
index dffbde9..0c0bf66 100644
--- a/up-editor/screens/5062.scr
+++ b/up-editor/screens/5062.scr
@@ -1 +1 @@
-000000000000000000000000000000000000000000000000000000......................0000......................0000..//..//..//..//..//..0000......................0000......................0000..//..//..//..//..//..0000......................0000......................0000..//..//..//..//..//..0000......................0000.S..................E.000011111111111111111111110000000000000000000000000000
\ No newline at end of file
+000000000000000000000000000000000000000000000000000000...................T..0000......................0000..//..//..//..//..//..0000......................0000......................0000..//..//..//..//..//..0000......................0000......................0000..//..//..//..//..//..0000...t..................0000.S..................E.000011111111111111111111110000000000000000000000000000
\ No newline at end of file
diff --git a/up-editor/tiles.lua b/up-editor/tiles.lua
index 90ad7a3..1776e54 100644
--- a/up-editor/tiles.lua
+++ b/up-editor/tiles.lua
@@ -10,9 +10,11 @@ tiles = {
   love.graphics.newImage(img_path.."water.png"),
   love.graphics.newImage(img_path.."bouncer.png"),
   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.."spawn.png"),
   love.graphics.newImage(img_path.."exit.png"),
 }
-tiles_char = { '0', '1', 'r', 'b', 'v', '^', 'w', '*', '/', 'S', 'E' }
+tiles_char = { '0', '1', 'r', 'b', 'v', '^', 'w', '*', '/', 't', 'T' ,'S', 'E' }
 
 selected_tile = 1