From b00262807cbc57691e6c7c2ef8d0b59ef4956600 Mon Sep 17 00:00:00 2001
From: Massena <massena.fezard@yahoo.fr>
Date: Tue, 20 Apr 2021 15:00:16 +0200
Subject: [PATCH] brr brr conveyors go nyooom

---
 CMakeLists.txt                    |   4 +++
 assets-cg/img/conveyor_d.png      | Bin 0 -> 224 bytes
 assets-cg/img/conveyor_l.png      | Bin 0 -> 199 bytes
 assets-cg/img/conveyor_r.png      | Bin 0 -> 181 bytes
 assets-cg/img/conveyor_u.png      | Bin 0 -> 228 bytes
 assets-cg/img/fxconv-metadata.txt |  18 ++++++++++-
 include/main.h                    |  10 ++++--
 levels/level3.kble                | Bin 262 -> 262 bytes
 levels/tileset.png                | Bin 335 -> 432 bytes
 src/levels.c                      |  21 ++++++++++++-
 src/main.c                        |  50 ++++++++++++++++++++++++++++--
 11 files changed, 97 insertions(+), 6 deletions(-)
 create mode 100644 assets-cg/img/conveyor_d.png
 create mode 100644 assets-cg/img/conveyor_l.png
 create mode 100644 assets-cg/img/conveyor_r.png
 create mode 100644 assets-cg/img/conveyor_u.png

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eabb342..1faeda8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,10 @@ set(ASSETS_cg
   assets-cg/img/end.png
   assets-cg/img/door.png
   assets-cg/img/key.png
+  assets-cg/img/conveyor_u.png
+  assets-cg/img/conveyor_r.png
+  assets-cg/img/conveyor_d.png
+  assets-cg/img/conveyor_l.png
   # ...
 )
 
diff --git a/assets-cg/img/conveyor_d.png b/assets-cg/img/conveyor_d.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b85b89861c94b685b20e4381264f32fbb223df7
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^9ze{)!3HD`s{FPEQjEnx?oJHr&dIz4a%OqDIEHw1
zzMbyP*Py_|8hu!_+KaDKd-AWKjEfn6O2R_qdJj4(cXMQBt=%p4oLB0~n%^tF&TzJv
z@i}2d^<RT_6QxB@pPa3c6PuXZ?rbe}qH@MD)}j--$Cf(sx%O7KJrK6aj=6GRp5op*
z_g?9B-pw*yg}PPC>Jww6o&>yjWSsLPE)~dJaNn{2N0!7+&Btu@Ou@%;YcDCZi?;Tf
V%cd)`PXxM>!PC{xWt~$(695aSRiyv`

literal 0
HcmV?d00001

diff --git a/assets-cg/img/conveyor_l.png b/assets-cg/img/conveyor_l.png
new file mode 100644
index 0000000000000000000000000000000000000000..a20cd6c6ce77f213f8b945a64d2c871adc143ffa
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^9ze{)!3HD`s{FPEQjEnx?oJHr&dIz4avD8d978-h
z-%fMnI-tPA68^FK-+#?-0o+2nd|7h&?^<^9F+OJV*%~G>>+XvsXXQTc|HQyB^TeXy
zwy*14T=s?w89r2X;4ISo5vi1Bt9rtbw<w@l#^~J4-LrqU-MC|X{#xu?!$sdYE4?Nh
y{=vU%S7!YBnV(l2PnfrM_pM}`d+wY?77Q;+b)-MMNO}x(41=eupUXO@geCw<5KdYE

literal 0
HcmV?d00001

diff --git a/assets-cg/img/conveyor_r.png b/assets-cg/img/conveyor_r.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bda3256815a00f741a9e6ff76a59a4296721e20
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^9ze{)!3HD`s{FPEQjEnx?oJHr&dIz4a`HW0978-h
z-%c~+YcSwpmOUc=`IL>2SXWcV(=<lTnqccY0jIr^-}N=~*6PG7F);*uwd%2XX8&kw
zxt_}}+i9~d{76ye`gb(AnIk=_RqgJb>9)_LFU*}AJWt9cz=4I;<$}JOjcLb*Wt+`j
dwwS&2Ec;lZC7P@AaWT+p22WQ%mvv4FO#rU6Ki~iW

literal 0
HcmV?d00001

diff --git a/assets-cg/img/conveyor_u.png b/assets-cg/img/conveyor_u.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea647ebdfd5af4d48ba80b523840f97365a43903
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^9ze{)!3HD`s{FPEQjEnx?oJHr&dIz4a^`uuIEHw1
zzMbaC*Py_|5`9>_QnmkxFlUa}?id@7=WLN(k8Uj38pdeVBg#Bm#^{>sPL4bE;r^~J
zQQ4=Te5tEF=h|b%FT79E)URT;YVpH)24%ek7Di1glHbi{V-<PWo3Q`OO2G`ZY?j;7
z{?#u&$z%pN7(T1ZZJBI*eW@ekX2)=e#0UQjfue#Ij?dMqQjV-}zO&iR^w7zNHQyB4
Z#Eqql<+jdzPzrP@gQu&X%Q~loCIDX8R0{wA

literal 0
HcmV?d00001

diff --git a/assets-cg/img/fxconv-metadata.txt b/assets-cg/img/fxconv-metadata.txt
index e66bf67..2a63c86 100644
--- a/assets-cg/img/fxconv-metadata.txt
+++ b/assets-cg/img/fxconv-metadata.txt
@@ -20,4 +20,20 @@ door.png:
 
 key.png:
   type: bopti-image
-  name: img_key
\ No newline at end of file
+  name: img_key
+
+conveyor_u.png:
+  type: bopti-image
+  name: img_conveyor_u
+
+conveyor_r.png:
+  type: bopti-image
+  name: img_conveyor_r
+
+conveyor_d.png:
+  type: bopti-image
+  name: img_conveyor_d
+
+conveyor_l.png:
+  type: bopti-image
+  name: img_conveyor_l
\ No newline at end of file
diff --git a/include/main.h b/include/main.h
index 1b552bd..94759ef 100644
--- a/include/main.h
+++ b/include/main.h
@@ -1,19 +1,25 @@
 #pragma once
 
-#define LEVEL_NB 2
+#define LEVEL_NB 3
 #define LEVEL_SIZE 16
 #define TILE_SIZE 12
 #define PLAYER_SIZE 10
 
-/* struct for a pair of values */
+/* struct for a pair of int values */
 typedef struct Vec2 {
 	int x, y;
 } Vec2;
 
+/* struct for a pair of float values */
+typedef struct FVec2 {
+	float x, y;
+} FVec2;
+
 /* struct for player's data */
 typedef struct Player {
 	Vec2 pos;
 	Vec2 spawn;
+	FVec2 frac;
 } Player;
 
 /* used for tiles */
diff --git a/levels/level3.kble b/levels/level3.kble
index 924eff01b0b1c3f8ae3783eb39f24fda8bcac19d..130e9518fc5a64f79011aef52aa9470d4d411ada 100644
GIT binary patch
literal 262
zcmZXNOA^2!2t(0QKCZm~X&Yde)@c^tBLr#CragZ$h$X5SOx1d3_275l#acJagIT#x
uCX33!$P<kmr4LTH=sp-jaYWk(v*R>)Wnf}G|6i@*CiL)Uv2gSXe(M9JG6hip

literal 262
zcmZusK@Na03}RY)-v3`K1sh!^2U5x)9R?=mu>nM6F+kHp^S^e71A*vD6(n-eY8qO}
g7g3(L7R{BS?Nh6oy3Qgz6~EZ;dp?j+j~x8+4Z9ZsQvd(}

diff --git a/levels/tileset.png b/levels/tileset.png
index afdba74f0d5465365b1fa8c9cc4f7859f757cac4..cda60692d677ba9f02cb8a9f7544b2d6041dae72 100644
GIT binary patch
delta 419
zcmV;U0bKsi0<Z&+7k?lK1^@s62wu2200001b5ch_0Itp)=>Px$YDq*vR7i=fmCbF#
zFbstsjjoWRfiB<?0@&RkBXofb(+<!PGC~Bj8)Sh1K6VK8(9kCJOF1SGK%u1XJ&{sE
z*de_4K9wgTA}i$mHY>>2&{GM{(QSd}a+?K!)p0o9O<-%71%G5otmQEaq)K8flew0q
zC|%Q+7SMcx?=P{bx6hyKo@Mdx?Nzxr4EJS@!Se|o0C?PAK-0&!2Y~DOsDwG+rQl&s
z!c!*+;WDS1d>HN|oij{2XRs8MuGu+9^%kXSF2!s6Rg+VtVi9=~DLhSUE>)@y&<*8C
zH8~XI?_pVFu7Bwr<gRH-0Qf)A^AF8A4If9vY!hHu04a$qgYcM9!zxa5^OS-|BH`u+
z5%mtP=Oa~}Tjw6p_J=c$6uHicJ=Up*mMfLqu#6?}sU|z;&8|Zu*+r!}=e+t<qAP-G
zx!lPjfpGIqa3E-M_Q)II0MHc|H-K`n0yh2>*aak{@f<PP1uW4h@&{vU>N6ZVk+1*&
N002ovPDHLkV1gkTyM_P&

delta 321
zcmV-H0lxmQ1J44G7k?QD1^@s6D=Y3@00001b5ch_0Itp)=>Px$2}wjjR7i={Rk0C+
zFbsTgS%H$fEWij9WCKRX0t}N3kP#SxBH4fixTDMvP9=~W0fv|&UzrF0OE3E%M1XV7
zSv(ODg^FCeL5V!_jF!Y1$sX}JZnpt2RqU^$8SF){fs7<Ho_}BiE0WNdg0o!0(lI@4
z5gIDEtobhLa(~V489#n^XH`X-_v1Sj9x6Bh;C0r3%G=WcKwB5enEAvK_c<wUb>fRl
zP7OKDdy<v2n5>+IrJ<~vD`%{pA}e!gzP4Wt*@}uyWGB+NEGN#2DgpFB8P<?}Lw@#S
zk=&+xFn3HX13JL&=>IUb;I|p8J+j1Ony7ow)&<2L%;7&Ab<yUc`UQs%`EYyy!}p6U
TULsz+00000NkvXXu0mjfLF0;2

diff --git a/src/levels.c b/src/levels.c
index 1001129..8ed49a6 100644
--- a/src/levels.c
+++ b/src/levels.c
@@ -37,5 +37,24 @@ const tile_t level[LEVEL_NB][LEVEL_SIZE][LEVEL_SIZE] = {
         2, 0, 6, 0, 0, 4, 0, 0, 0, 0, 4, 0, 0, 6, 0, 2,
         2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2,
         2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
-  }
+  },
+
+    {
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+        2, 2, 8, 8, 8, 8, 4, 6, 8, 8, 8, 8, 8, 8, 2, 2,
+        2, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 2,
+        2, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 2,
+        2, 7, 7, 7, 7, 2, 2, 2, 2, 2, 2, 8, 9, 9, 9, 2,
+        2, 4, 7, 4, 2, 2, 2, 2, 2, 2, 2, 2, 9, 9, 9, 2,
+        2, 6, 7, 6, 2, 2, 2, 2, 2, 2, 2, 2, 9, 9, 9, 2,
+        2, 7, 7, 7, 0, 0, 1, 2, 2, 2, 2, 2, 9, 9, 9, 2,
+        2, 7, 7, 7, 2, 2, 2, 2, 2, 3, 0, 5, 9, 9, 9, 2,
+        2, 7, 7, 7, 2, 2, 2, 2, 2, 2, 2, 2, 6, 9, 6, 2,
+        2, 7, 7, 7, 2, 2, 2, 2, 2, 2, 2, 2, 4, 9, 4, 2,
+        2, 7, 7, 7, 10, 2, 2, 2, 2, 2, 2, 9, 9, 9, 9, 2,
+        2, 7, 7, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 9, 9, 2,
+        2, 7, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 9, 2,
+        2, 2, 10, 10, 10, 10, 10, 10, 6, 4, 10, 10, 10, 10, 2, 2,
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+    }
 };
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 61dda78..c491fc9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -85,6 +85,10 @@ int main(void) {
 	extern bopti_image_t img_end;
 	extern bopti_image_t img_door;
 	extern bopti_image_t img_key;
+	extern bopti_image_t img_conveyor_u;
+	extern bopti_image_t img_conveyor_r;
+	extern bopti_image_t img_conveyor_d;
+	extern bopti_image_t img_conveyor_l;
 
 	extern tile_t level[LEVEL_NB][LEVEL_SIZE][LEVEL_SIZE];
 
@@ -96,7 +100,8 @@ int main(void) {
 	/* player */
 	Player player = {
 		.pos = {0, 0},
-		.spawn = {0, 0}
+		.spawn = {0, 0},
+		.frac = {0, 0}
 	};
 	
 	memcpy(curr_level, level[lvl], sizeof(level[lvl]));
@@ -133,12 +138,32 @@ int main(void) {
 						dsubimage(m * TILE_SIZE, n * TILE_SIZE, &img_key,
 							((timer / 30) % 4) * 12, 0, 12, 12, 0);
 						break;
+
+					case 7:
+						/* key ring */
+						dsubimage(m * TILE_SIZE, n * TILE_SIZE, &img_conveyor_u,
+							((timer / 15) % 6) * 12, 0, 12, 12, 0);
+						break;
+					case 8:
+						/* key ring */
+						dsubimage(m * TILE_SIZE, n * TILE_SIZE, &img_conveyor_r,
+							((timer / 15) % 6) * 12, 0, 12, 12, 0);
+						break;
+					case 9:
+						/* key ring */
+						dsubimage(m * TILE_SIZE, n * TILE_SIZE, &img_conveyor_d,
+							((timer / 15) % 6) * 12, 0, 12, 12, 0);
+						break;
+					case 10:
+						/* key ring */
+						dsubimage(m * TILE_SIZE, n * TILE_SIZE, &img_conveyor_l,
+							((timer / 15) % 6) * 12, 0, 12, 12, 0);
+						break;
 				}
 			}
 		}
 
 		dprint(0, 0, C_BLACK, "%d", lvl);
-
 		/* drawing the player */
 		dimage(player.pos.x, player.pos.y, &img_player);
 
@@ -150,16 +175,37 @@ int main(void) {
 		};
 		clearevents();
 
+		/* conveyors */
+		if(collide(player.pos, 0, 7, curr_level)) { player.frac.y -= 0.5; }
+		if(collide(player.pos, 0, 8, curr_level)) { player.frac.x += 0.5; }
+		if(collide(player.pos, 0, 9, curr_level)) { player.frac.y += 0.5; }
+		if(collide(player.pos, 0, 10, curr_level)) { player.frac.x -= 0.5; }
+
+		/* little accelerations (like conveyors) */
+		const int ifrac_x = player.frac.x;
+		player.frac.x -= ifrac_x;
+		mov.x += ifrac_x;
+
+		const int ifrac_y = player.frac.y;
+		player.frac.y -= ifrac_y;
+		mov.y += ifrac_y;
+
 		/* trying to move the player >w< */
 		if(!collide((Vec2){player.pos.x + mov.x, player.pos.y}, 0, 2, curr_level) &&
 			!collide((Vec2){player.pos.x + mov.x, player.pos.y}, 1, 5, curr_level)) {
 			player.pos.x += mov.x;
 		}
+		else {
+			player.frac = (FVec2){ 0, 0 };
+		}
 
 		if(!collide((Vec2){player.pos.x, player.pos.y + mov.y}, 0, 2, curr_level) &&
 			!collide((Vec2){player.pos.x, player.pos.y + mov.y}, 1, 5, curr_level)) {
 			player.pos.y += mov.y;
 		}
+		else {
+			player.frac = (FVec2){ 0, 0 };
+		}
 
 		/* d i e */
 		if(collide(player.pos, 2, 4, curr_level)) {