From b92d895a03de179c78ca59f3a85cc49966fbbf87 Mon Sep 17 00:00:00 2001
From: Tituya <tituya02@gmail.com>
Date: Fri, 28 Aug 2020 20:17:16 +0200
Subject: [PATCH] =?UTF-8?q?petite=20update=20temps=20+=20=C3=A9diteur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AST3.g3a                | Bin 195000 -> 195000 bytes
 editor/AST3generator.py |   8 +++++++-
 editor/README.md        |   2 +-
 src/main.c              |   2 +-
 src/times.c             |   4 ++--
 times.lvl               |  22 +++++++++++-----------
 6 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/AST3.g3a b/AST3.g3a
index f8f15701ebaea79cca120858c1d9c2d7bf72665e..dc0b8f08e4f31acb6f9fc629787f947a77c782b6 100644
GIT binary patch
delta 594
zcmV-Y0<HbH^9#813y>lLSNgFeBLM?BG&i@=%>i-^v%C&tVgcN<AaPd+0c^8)d2a;)
zRFmj_D*<ei6n`%P#FIpSPXTz7lz%Tv+%JaUSTC070WYRyUN5%k058Tb)@?&C=H&lR
zB9Xe+VLuoThGFy2U~yO<W*=VV0G6>Y5<m+dk<nb^Kr{Sg13?QD0%G%WOkk6f4uBRC
zjRIgWppJ+Ghy#rQ;Q}KN(NB{$fFCJHK?`?a;Xq{bG5p&`UKd#y(MCZFbZp}QA3Wy)
zA3x(jGyD^A;sKX#lYW31e_Y`JQuz=TQ2=rQA1QGG5D;J!$N`A~po{<s(KBT8K?`(j
zQu-n&jRR$q(J(;^WaH5<WaCrzWs^Y*W-wCz(Jdk<j{;Qr;6McaK??v0VbUQOk7-l>
zQvM<+i)Y#<*C*B|l`u*R<W<)u<pb6xN(<z8*Cypd)+9;`<PX;*V%8#+B1#M79@it*
zBb6SM9!d)U3DF|w08;zq03Q<J03Q)A644*lACwY73m+q(J^%@g0aErNfUj`?2>=_f
zoZvtMEH}*o&;Yam(*T13A^}POFb|XfFh=kIFi6w@FeFrye1S^=va`s60|fz8v&@DQ
z1Odde;ED$U0adf;i?ad&`;(lGKLOm6+>V0*+_PYhD+U25lZ=&Av)q+YRy(_eA3+Q#
z_CUFrnm}Pku0UlTxIqc)g+SL_DM0kh%|RLKg+Reau0Y3JDM2iH;Xtf<;XwtNnn3Pm
gW|Oh)6_fDz29s{~27`(0hl%U~w~6cmEe!%!`sm#4G5`Po

delta 598
zcmWlXT}V@59LC@OIcklQy0$VS^4K<UqIS+m@}j`^U}R}wPOAwzrfpL6;U+-_;*^oO
zOi%G{_I2ZhbQdN^a)jMz#BKyn#aZ+LXH8RRfiN6dvO3=Vc;NZnJWnLWL{iKH6V=)`
zZ7~B~U1gh<7ojItn#;S?393}=ySNj)Qt$2VY;cgZ{&Mh=J$??N<b=Nw`bfynHK^Q>
z>fpvbPVV^{;$Cs@IOTdR_hb2Aqv_#Xth1&t4s2I`K}TxI<#UYBu+A0488E{R%Iyh!
zWXnwpjFIY0^_+19NZvq!L8M&#Fa%-Z{xBV<%zF78IXb|Wofeo|t~hq5Y+GOIocme}
z<vM}6c`bq1<Ey~dY^#jE@9?Ob^bhR!x5trvQ(w@8dVnqSfnM)2Mz@_~NGDghQ`=4Z
zACq;I_7K@7Fz$rRyA#c64-uFy-ky;Uo2(+$vZ>;%jKCmW$NNKt;??GiJ!7(tT=`rY
zvntlGt)5vvA1hs<l~Rp*HL6ugG|G>abSdVrS;L~3MX`k05L>TFWb-Pr|6M_>A&%JH
zoIx&DibF<$Va*d5=|(AgIu0iNlo#pHfvIOIrYou!VF}Hk4=4a8sMm5nKZN*`>xe(~
z5%CrW=^bo<m(troTAN3T4jHo`Dt*1T1E5)29+4>6B#*~xKqa5X0@|8wVtEc!kl}EP
zq=wI4IQFI}BJ8rJ@oTXSdx|3X^2UOo`*{a{^G@Q8c~LkxFXAXdINFpHDm8xLofNX4
iJjLr93uOA&Ub6l>hulc#1cJ%C!6eKElT>A{cBTIu8SR_^

diff --git a/editor/AST3generator.py b/editor/AST3generator.py
index 59c019b..705e973 100644
--- a/editor/AST3generator.py
+++ b/editor/AST3generator.py
@@ -126,7 +126,9 @@ font = pygame.font.SysFont('arial',25,True)
 #Defini la suite des blocs pendant les changements (cliquer sur un 1 va donner un 2...)
 suite=["0","1","d","s","e","k","3","K","a","c","m","t","l","b","B","i","S","h"]
 
+lvm = open(f"include/define.h","r")
 id_level = 0
+id_level_max = int(''.join(list(filter(str.isdigit, lvm.readline()))))
 gravityid = 6
 disa = 10
 app = 13
@@ -161,7 +163,7 @@ while securite==False:
         elif event.type == pygame.KEYDOWN:
             carac= event.dict['unicode']
             if carac == "d":
-                id_level+=1
+                if id_level_max>id_level: id_level+=1
                 load(id_level)
                 place()
             if carac == "q":
@@ -187,6 +189,10 @@ while securite==False:
             if carac == "a":
                 lock=""
                 place()
+            if carac == "n":
+            	newgrille()
+            	write()
+            	place()
             if event.key == pygame.K_LSHIFT:
                 if gravityid=="7":
                     gravityid="6"
diff --git a/editor/README.md b/editor/README.md
index 10d7fe6..85201c4 100644
--- a/editor/README.md
+++ b/editor/README.md
@@ -15,7 +15,7 @@ Pour ouvrir (python + pygame):
 - F baisser temps avant disparition blocs -
 - SHIFT changer le sens de la gravité par défaut (gravité affichée en haut à gauche)
 - A supprime le bloc bloqué dans la main. 
-
+- N pour reset la pièce en entier
 
 Click gauche : tourner parmis les blocs dans le sens horaire
 Click droit : tourner parmis les blocs dans le sens anti-horaire
diff --git a/src/main.c b/src/main.c
index 92d39d6..ccac8a6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -54,7 +54,7 @@ void game(int *id_level, char mode, char *type)
 	
 	float vspd = 1.0;
 	float hspd = 0;
-	if(*id_level==10 && *type==1) *type = 2;
+	if(*id_level==10 && *type!=3) *type = 2;
 	else if(*type!=3) *type = 1;
 	extern bopti_image_t img_speedrun;
 	set_level(*id_level, level, &start_x, &start_y, &gravity, &appear, &disappear);
diff --git a/src/times.c b/src/times.c
index c5a6e76..9763ad6 100644
--- a/src/times.c
+++ b/src/times.c
@@ -8,7 +8,7 @@ void check_medal(unsigned int frame_level, int id_level, int x, int y)
 {
 float time=1.0;
 float framefloat = frame_level;
-float level_time[] = {5.91,8.76,5.83,3.58,3.64,8.62,6.92,7.68,9.86,6.25,6.26,10.86,5.42,8.35,7.53};
+float level_time[] = {5.86,8.76,5.80,3.52,3.58,8.62,6.73,7.65,9.62,6.04,6.23,10.78,5.39,8.35,7.45};
 time = level_time[id_level-1];
 
 if(frame_level/FPS < (unsigned int)time || (frame_level/FPS <= (unsigned int)time && 
@@ -25,7 +25,7 @@ void draw_time(int id_level)
 {
 dclear(C_WHITE);
 float time=1.0;
-float level_time[] = {5.91,8.76,5.83,3.58,3.64,8.62,6.92,7.68,9.86,6.25,6.26,10.86,5.42,8.35,7.53};
+float level_time[] = {5.86,8.76,5.80,3.52,3.58,8.62,6.73,7.65,9.62,6.04,6.23,10.78,5.39,8.35,7.45};
 time = level_time[id_level-1];
 
 dsubimage(172,90,&img_medals,36,0,12,12,DIMAGE_NONE);
diff --git a/times.lvl b/times.lvl
index dcc79b1..618de9e 100644
--- a/times.lvl
+++ b/times.lvl
@@ -1,15 +1,15 @@
-5.91
+5.86
 8.76
-5.83
+5.80
+3.52
 3.58
-3.64
 8.62
-6.92
-7.68
-9.86
-6.25
-6.26
-10.86
-5.42
+6.73
+7.65
+9.62
+6.04
+6.23
+10.78
+5.39
 8.35
-7.53
+7.45