From 7b0656de0756cd8997566d9057fedc19216731dd Mon Sep 17 00:00:00 2001 From: Le_dahut Date: Mon, 9 Jun 2014 17:23:50 +0200 Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20de=20l'=C3=A9dition=20des?= =?UTF-8?q?=20mondes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WireChem.py | 78 +++++++++++++++++++++++++++++++++++----------------- dbdata | Bin 77824 -> 77824 bytes dbsrc | 2 +- 3 files changed, 54 insertions(+), 26 deletions(-) diff --git a/WireChem.py b/WireChem.py index 9d6d66e..f42320b 100644 --- a/WireChem.py +++ b/WireChem.py @@ -404,7 +404,7 @@ class menu(pyglet.window.Window): self.selected=-1 self.images=[pyglet.image.load('picture/leveler0.png'),pyglet.image.load('picture/leveler1.png'),pyglet.image.load('picture/leveler2.png'),pyglet.image.load('picture/leveler3.png'),pyglet.image.load('picture/leveler4.png')] self.colors=[[0,192,244],[235,118,118],[5,157,60],[215,33,255],[201,209,98]] - self.sizes=[(50,70),(45,45),(80,80),(80,80),(80,80)] + self.sizes=[(50,70),(50,50),(30,70),(50,60),(28,68)] #self.fond=pyglet.image.TileableTexture.create_for_image(image.load("picture/fond.png")) self.labels=[pyglet.text.Label("",font_name='vademecum',font_size=380,x=0,y=0,bold=False,italic=False,batch=self.batch,group=self.p0,color=(255, 80, 80,230))] self.fond=image.load("picture/fond.png") @@ -456,13 +456,17 @@ class menu(pyglet.window.Window): self.labels[0].color=(self.colors[world][0],self.colors[world][1],self.colors[world][2],100) self.labels[0].x=(1024-self.labels[0].content_width)/2-50 self.labels[0].y=75*self.height/768 - if 'obj' in locals(): self.labels[0].text=obj['element'] + if 'obj' in locals(): + self.labels[0].text=obj['element'] + else: + self.labels[0].text='xx' for l in range(10): if l>=len(worlds[world]): - self.levels[l].x=-150 - self.untitled[l].x=-150 - self.untitled2[l].x=-150 - self.lock[l].x=-150 + self.levels[l].x=-300 + self.untitled[l].x=-300 + self.untitled2[l].x=-300 + self.lock[l].x=-300 + self.levels[l].update(0) continue ele=worlds[world][l] self.levels[l].active=(world,l) in finished or debug==2 @@ -487,7 +491,9 @@ class menu(pyglet.window.Window): self.lock[l].y=ele['_yy']/768.0*self.height+50 if 'obj' in locals() and ele['description']==obj['description']: self.special.x=ele['_xx'] - self.special.y=ele['_yy'] + self.special.y=ele['_yy'] + if 'obj' not in locals(): + self.special.x=-300 def drawLaser(self,x1,y1,x2,y2,width,power,color,randomize): while(width > 0): @@ -530,15 +536,32 @@ class menu(pyglet.window.Window): src=(src[0]+int(self.sizes[world][0]*math.cos(angle)),src[1]+int(self.sizes[world][1]*math.sin(angle))) if world==n[0]: dest=(dest[0]-int(self.sizes[world][0]*math.cos(angle)),dest[1]-int(self.sizes[world][1]*math.sin(angle))) - if n in finished: + if n in finished or debug==2: params=(random.randint(0,8),20,self.colors[world],12) else: params=(2,20,[40,40,40],0) self.drawLaser(src[0],src[1],dest[0],dest[1],params[0],params[1],params[2],params[3]) - if debug==2: + if debug==2 and world==n[0]: + if dest[0]-src[0]!=0: + angle=math.atan(float(dest[1]-src[1])/float(dest[0]-src[0])) + else: + angle=270*3.14/180.0 + if dest[0]-src[0]<0: + angle=angle+180*3.14/180.0 self.drawLaser(dest[0],dest[1],dest[0]-int(20*math.cos(angle+30*3.14/180)),dest[1]-int(20*math.sin(angle+30*3.14/180)),params[0],params[1],params[2],params[3]) - self.drawLaser(dest[0],dest[1],dest[0]-int(20*math.cos(angle-30*3.14/180)),dest[1]-int(20*math.sin(angle-30*3.14/180)),params[0],params[1],params[2],params[3]) - + self.drawLaser(dest[0],dest[1],dest[0]-int(20*math.cos(angle-30*3.14/180)),dest[1]-int(20*math.sin(angle-30*3.14/180)),params[0],params[1],params[2],params[3]) + if world>0: + for ele in worlds[world-1]: + for n in ele['link']: + if n[0]==world: + src=(int(0),int(worlds[n[0]][n[1]]['_yy']/768.0*self.height+self.images[0].height/2)) + dest=(int(worlds[n[0]][n[1]]['_xx']+self.images[0].width/2),int(worlds[n[0]][n[1]]['_yy']/768.0*self.height+self.images[0].height/2)) + if n in finished or debug==2: + params=(random.randint(0,8),20,self.colors[world],12) + else: + params=(2,20,[40,40,40],0) + self.drawLaser(src[0],src[1],dest[0],dest[1],params[0],params[1],params[2],params[3]) + if type(self.selected) is tuple: if self.selected[0]==world: self.drawLaser(int(worlds[self.selected[0]][self.selected[1]]['_xx']+self.images[0].width/2),int(worlds[self.selected[0]][self.selected[1]]['_yy']/768.0*self.height+self.images[0].height/2),int(thex),int(they),random.randint(0,8),20,self.colors[world],12) @@ -562,6 +585,7 @@ class menu(pyglet.window.Window): def on_mouse_press_menu_1(self, state): global world if world>0: world-=1 + print len(worlds) self.update() def on_mouse_press_menu_0(self, state): @@ -638,29 +662,28 @@ class menu(pyglet.window.Window): del worlds[world][n] self.update() for ele in worlds[world]: - n=0 - while nn: - l0-=1 - if l1>n: - l1-=1 - if l0!=n and l1!=n: - ele['link'][n]=(l0,l1) - n+=1 + l=0 + while ln: element-=1 + if element!=n: + ele['link'][l]=(ele['link'][l][0],element) + l+=1 + else: + del ele['link'][l] else: - del ele['link'][n] + l+=1 return def on_mouse_drag(self,x , y, dx, dy, buttons, modifiers): - global thex,they,world + global thex,they,world,worlds if debug<2: return if type(self.selected) is tuple: thex=x they=y - if x>self.width-20: + if x>self.width-20 and world+1uLQ8qV2R!MW&rPttW+X>zOo;op`2ybdpZ`JLlfJ zdshz|su}6(-o5wxe&=`2`JMB9cc-qormnfpf6`w1;zKI;Y5PajKKxUBxFqil#F7cag#`-^M>Ks-4;P#nb~H_ju6V=XIwCJjWBmu_Vqz zIM?{X;DZn1H0m++%$NhsVs`S0;IjuK<@9~qKAM#=EWd^Fq4^y4ISYVkhfXbJ)RiKBvZ_A z(97coHTuDYU^Qqzd6F;c?mpnBm%hK!IMJ<6(SgfVwB_;=`k(0<@VJcPmmBHYkHI=*V;jpO=P!+i|N3 z(kIg!>Er1J@?NQKD^Z!^z z(-?o-{f(9BxGru8)72g8Y207ah%4;MyHn8zVz4-oilt#**q^)aZ`_MD7#_Afro%~L zcq|>ad=s~P5;xrtjxbH6j80m0zW1sAsxpp)a;n|7DmQWdV@2MB4Nv_^8J)h+Ni(mN z!JK<9c5OT-a4{@9SxJkO^4TJSih0XTLTzf5tMVym>kBEMs@p!jttJE}c zlcv$Bi!CLZj-YO(@8meB>*#eH-=C?W_i{7zHBfQs;!@+KF16IfbkNMj7Mgl^O%3zV zpGaqf0Zk9&eBawz8H7<9D3U<+fdftFNL_#g&1a(UF$((08z0d}Lrd7||9Z2Yo;X{s z{Kly+)!wWjXkkdS4-`q_mvg@0w}NWN8|nN7SCf+xHq~Op?`K99Gb38q>!!z^ZC^Hr zl7Ml#Tdl0r{NilQPqi0YkmtQuTgZL3)5f&@>`rE*L<=BKS}AvSkoI1!Q2{!2s(uMf zG($xT()FQWgB2(J$#f!Zz*ih?GnAcLZxK37Gr zKUYtS&+VYEU#y{n=Q`<&=j!QOIDhw1q3##wK*+f=6{a6Q)m+Y5tc4gNv(zSOyos@Z z3^RTlWYKFAjkNvwRgDrr@J%|}IgDF%w;A;VboKcabmsYoEA3bg($!bnO8k0m?;k&+ z8WEQRp4&I`@R10HHyP2r%*ZWp37p`MnDf!r7ka+H;V3u|jC~RQ!9#Yen!21198J_% z_lkz;UeV*+l^4FOG>Bt5Zpx*ufh@SUF92F~EyT12+IPKL!ugj;jlpZM>RW#Wa{SKtLbXnKJTP)`-JAA}Zh zYS1~lY50{-uPd$S(}io=YzTbajuAcL6Zrd$4~yY*Y#jdP7fP!H6-pCF1-tLf_`wOp#&~DX0*}t!{4}# z#|1Z?h!jLJDt*w$bsuM3QhX4O1?AKSA-V9#xT1H1?ez4cF}fpDLsO5|Q}bh!^z4+2 zEi4)57(~bH3*5CW55_)0x z@~8S2SF)ejXKobG6%-lQeSLmRVakFZHAoobHp-8=O<6zyjGhxv+yfL}mIM}7i zJzl?AnYlW9;Q+}VH;(L)C34Q$L)Q;_bN3w#yDBUz>FMG1b!?zWC_5nl$z=oI9ga8+ ztU27uBGPsEO&5zu+;5w<^r&f?S<1|q4bWS?9WYH|NxKRCc>U-u7roP4Ukk)y0z+pr zs#sWQpueXAMTG;3p6G8B;6B?k0n0Og*^h1@Um2Me+z)yHQ2vFrT;o`iO;Hbo&?uqH z=K9QnP?w8*>8q|{a({nM*0s(u zPd?IF=Gi#`+s2@73jDnXF3-)7J@@@Z2`hKAO znWzM>ZZlI!$g~t8=trNMR|KC}dt-`lpqHzFnfNrd)AUn5z=9};EVzHVvvaNuzuf65 zW#$JwJIpK>BG8`;^UF>73rLQbp%$cLr&%5))NTgkCwtbFI@Kw}HHGy(1a%5wy=kda z9(PDHx!AqP;}WNQg|LVelX$5b3Iq!#(FeXYQjzPN6*+E|VdKeewW2bFwG9F^ z#C39GNr)Tj^|>j3uUTHN1-7EJcF@+~V*19;wwT^m!<3}#J?XK54F}K9foh-s3Np&u&9FbAQ?azN%ovXU`TdL0=^nxn1=n>QgAx(>5 z0|ZeTHUDr7A)JDs<47zzdpm?rqY!A(XMN6CKGixf&u2OB=RqATgR9iOC8J z9shu5S7NLq&DWyVPKy>cdTLd}B;Ya^)`pO^hk*>S_ArKyB$H_#TL)s9EQ-CF<8lSQ zGPjWuL+0jM#CS$4034@(s_cD{2c~vdJuR(rB^(qnIAsr%pnk8%2b8 z?oE!4%IsKn7E`fGY?%YX5h}*7>Qv(-Q#hYbCXz|ns0=VUMHpbCZHmRgL>`4H5_7|q z_aF;QI6&Ov2w0wS)ba^R()>P=o8T0v_$*x5Iw;^W-d>?rZkUrcZ0&q$V|3T6h8|9; z`M5}DqP#sDWFwqZpg=gMJW#Ki=cdSlraLSji5-uPq%G62fSe!3XlyLYFqq^b7--9F z%dz=o{JLIwOSFigHK?{#b_7_GS(Kz)6gA_o8&ng*z#)hy5@W;36E>a@>Re&MB7%4T zR#-EQ4`)Y4(nG0OjAallcU}g~@kD1rqOZ0KIF~}KGnJMo0DWzv3UynKi-*J|pJPK< zGu~*FPs}H`(UClx4EENqxC%PS}aS zaFu1x+KCMv0DlqP_(c;+9{?7ldptRwHA@m+e_%hM@X1&*b0jeqw?YM7#b>w%ordk2 zOctB}i5PFFpu5OhCiC#Murbr5>Lz6;*y$WzfZO(&inni^Yj(P;s|(L*Typ2FPd5_v z=~yNMTkJT~ybFqveWy%0TaYxYaEmeCl}%(aX20RR8AY08_c%*v>|`QSfVYq&@m+#! zwj^P@e-^SG*~D>aCp53wfE7ul@s(CpYg}$oH7yAFg-X2PZdJ{<7v&*ZIKJB{3K}}X zVpet~4w+NqHp^+oovmsk&$XZ~zJj@S&z{S!hjuyC(B&1+b^GDNR$0`r$?KS{#i(AX zY6m~VJn0&dL9ibi7UplU9>Q8)Dim3Zp2&f~m|Usw(j>z6wHTLHs=9v6xKIs3mdMJ? z(H_M$r0MJ_tUgVuK)`5eQ>%H3+uBt7vbhvqO13Glib^;Qr=lmU8p5w$W?7RjD{vtT zBEOIkTg-`oZUFTMO;6%jHkR&)jo`gj3Mt4T=ktD}LpAr>4CBZ-554U=kr>V#>Dh|; z_@$tR78KLYg$bJZ6Jx4P1&t>=)RVH0a3d(~w$-BJH&>~Rt8Cd`a603;RqEI#kOG1~ zp9m~rjoqu&rv2O$_om{pG08JoyExjkp=4IBOaJ(}&9Yr7b)WJ6YSl972yR=MIkGe! zP27Plvk+QXNey_`paJdV)yW2?R@z6a6N;x|9sI#qawHjNf5{C}(0Rpc)=6t!qsfx$ z*7*Q4r?w0`3x@GmYgFUDybb{&Rux030o{iJ5#u8kbPmzFKa^V9AT@D zR~E+4)~GE@`IYg>jLzc(e8$9DwP(^y^Sr_GDqAeZ<^ghpopR@)j^S8`d?N8^wrvGd z?bqL$v}^O3%DR;|m3631tcs_}Yt=%N=5(3uFf8bS&SyNdPVL;n<7)-4 zjinwC6U?Mz6Yk1J$1+%Ob;QPEsdz#>hQ(_ss5MjGE;ul$qjbB7u7MF`UnDLUc{tc0Uk_J@2r7DK<75w8R# z)e2t8e~m(3Kh0+!Pv^AH;TGFK8N@cx?9=i~yZKBEVKK*EF+6IQ6ncj_{G|x72EC>g zS$E@7EEVO2dq;HiPy$X8*T}xRBl)fGQ)uWntulk7wS^#p$NV@=;Q%W|nK!yRRm)~G z`z7Y)1zl+G0N%K-Q?0qV4xgnTip{Rz)RN7tLi83~l03v;S4bS@o6I+^yaj;_6bZun z(Yyq4hp#rMb!+EznMJ8&wwXrX2Gx2;z6fD!WVrA}5Dk5AaV@eHitoc~aoI@G&aOzt14cT}F#rGn delta 10573 zcmb_idvIITna}Yfv1Jq6#IYT}^Kj%i#OOZsA~;Q`p(&4$&ai&~JF~y< zJNN2k#Uvd(BU`%X-tYT;@83D{!E;py&sDv2v8S?rxMJqdJ?}K!h&R{Fn>TOl`FZoi z{$zT5EJJIJxU^>_E``%syqzcTs>G{`KHx{p+fz4hf!v_C)n{S>*Qm$i%EY{W*>!rI zJLnoU0`ytaT%$qyp*5dt)TC=3+)RJ8tA7;t23%Qu@VUa7nBjMg z%HRBE`R0)O*6mXfWBXJ%m`u1`SP$T7MU9~f2LYq{9QnP^t+`MnoBl5+ACAPu9cbBe=n1-SIgVpSV=f^KR+qO&)xFv$o3OxULtsOOOPM-t3Lr5-a0UI>5ZQWdEw_PgkP?I%FQSi z{QK{h!9k`AwnoXsAerbm%&QOt<-YIt$d~@P5w9w_^FOK=dRc6MG>5~3Gxx9kdR28b zLQ^T5wk(x>C;oP&0iPQxGOkfgSMNy8&2gylnO>;T{qm6$>lz$~Ds4XLdA_$$8OKy7 zn+o0PKrD#q@X5YPx$jhKlkJOe|5(cB3&K_M$y5Cnn*MHGh*-!ZZTR89hly}GxJMYM$fbG`|f<5@F z>&w7?@K^3i_OGA4QUZIkg3Zx4WYf0p$F|fjoR8R0`G|Sv8&En+|KSF??xi6D;`JK} zhzTHGzgYsr>-Pf4%!@BIib5p+daR2ac>dU_Dn?@Fka(R)$4st0mBe03Azx9sK6ad| zRSTAjEM-SQWXF%cQq>NyK3&H`VR&`+)2%-_Rfx_G@7h;>Sn=4Fnl>_i0bZ1#$^qdp zSuWo{zIJBQw{NJDUw^J|5lK}E4gY&}ADR6x&jp1ypEq`8nXXYkTWP@cPLEOb=0$~) zXhRf%SYGaL^tIA>wKP>Ub*2P zi=!(CzscdXJ7hsWEK|5oe6z2T!fPV^io$EE?EAyFT8gp{@oiB4HvIwex9LZE!QW3z zRjpQy2Xad4ViUEuqMY;~NF}I;o?+Cw>g#i&mM=VW)6I^f$;q{Nk;7GrxiTSlCKZju z!{g99*JvX&mLGU8&9pKx7yPy<>7m)XI}lv zdL9&V>4Q=EZ)0`x;Ju6G3lARbv`57z(oTUi=r0cmBVhN$=5-qN5H%r;0F=>q^`N^L z0mBvMPdb01Uc;4W1TcihuuerMd%kv|OfqT@xhwmMVyoqIaX9Y{(9G}@xKBh)%3jx)P4;AW-R zBN>%qjJ|ZDQF|-sdmm=hw9tbzEx;~lTIj*jX`u(X3vS(izKr8`POYt6L5}0*Mu-i6 z4sj~)I72@B9e+`WmY42PP|LRH5~z3Fs|b|=RScB~m4T+}5UTG@FN=rVn+}YnlQElB z1rk(~21@yItO~y8Mn*xX!;1pqv~YHM4EzmmU>@7Vsi>K{d~=(>O{Jh_(tv~S3;@zh zB%OR;ePoItwDY+ zywUonK~XQyZLN~egzII;t|s}D@D6$J%XNI?>Rt76t=1@fAZ0D&A2lO2dHAS*fhuE< zd}7z>zEOj7%bs^JXAr5@r}<238=5@$Vk?QQ@cHB`kzT1iui*SRQlHcKpOImC`&f(A z#@q^8Bk(51J}WQa;;Un=4h4*^CRd=R&T=U=*j9lW-`c$ji#+9Ms>AQ1ZSnm$%U-M^BmETd*d2HVY3H$F1F5-Tn+P8s4j58SDVZmORgQVpLN zs!Bc-`N{DjjCB)plz0io{S*BPBN#C|(?=MQjm3meN4lXmo=N<<#F?vAHqgW(OT8ME z3fBzPOFdq6!RCEG+`LJqwk(-3w!Djt$hKv2Xq&sMz!a*ZH5><(+#X+HA$f3-3W>V6 z<_VyXIzv6fD5Q8M8_iJ6(7K8$S+Sj5Lo1l4b`cQ^rX1e-Fz2v*AyhA)2wf|G8LE@V zL(TH7&};IkI~#;1&uAU^z3=Z@>+%Jo%R?{voQj#zZX2pyIjX4EWlBb8wxH=qW-bz8 zPzh4?%zXDtH9~%LQ?vZhj@DfNC->0?wQi zS*N!WWd<#&-G4aDzNM+$MiI+%TW` zs$aw97QU-@W2;;|-5`4(t(LtT8|4=_c32m$7u9mh#ya`n#twS6!tcfX0~J2(FQ=Px zw=Nh_itrf988^r~aAjz?7SFomS4WyU!afVGmHY1D`~$N(9O^)0J{szh9__!;rW=HgK()wjy`h@n%cb`<%MqnTgV;K$gbVttXRAdI7W{Ay_7A+jfs?i1@zX-M z#bVR&0uS{fZ0-3WUDK?_2`>7FB`tn*|7JW+IV^8p^q1@ASHTPCF&f3 zv9I~#Ctx?%n1r1|7L?O}RM>H;40fFzNMdu?Ih+`j1=#s43iq%#*;8G4PeEH4>U?A; z+v3x5w&azv9y<=a8CG%Fd7*RRoYDhp0xX>fyOM6^qz7^)6-lRCmGloUbgri*OlcKl z6%E232`7??J%pQPqLPe_G=_RO{|j<7x%p2jlZtfksT|y9%7^~cxt^&UGKpMZGrF9P zEOan$WgUJRC9`$BSxyJn8tZ6#yR(_12|Jj*J38csx9$8v&vfz!T)teO$xQN!DW7_~ z6I*kZ#x%|68u1L0GQynNlguU)@w=l$F8wNn-h8`#nlf|yR8-$S6$s*7(L<}8_odYU zPG~F2WfYe>I9EYN+0~%gVHqLk7OO`Yq?lT<-);am8zl}*M{@X0Zz(!JHB{bSr`ApR zqjx$7dB2A)pfZ@KfYO(ahA|Jx)&PZ+bp_a$*DH%7QCRDvb#@?GTa*Y+?VED+-Oe?( z8a_2~f&_?}Xd)9$f1aceETsjfc^8|x;;~>ytWY$^h9c&bzl3N~Pi(U!$CT)sAsSmP zTXay*iN-=X(X59>-|}AP8auVhi@t?K=X?|N=0szmoM_%&vFO*{>smP%=vzs$%CNeN z?d%C$DksyaXq+Eh?Cd8nm-Pf4cdIA|om7?5`-XQ znnfej<aysfBs3POjbSaZfl50R)!w?paFr`sPj7V#AnRp~SnT}qMM+Z}h7;eRR9v*kD z)AP;(9U9PX$G|vcpKkpjhH;61GpP7ECvh(PZ9b?Tk6r#bA_U4i3NA zJIDq+8Z1D|D-JBwBclR=aUvPR4lQJzxmGMH3IgL`JeTu#SsdfZFa?PZ8H!+}!*|;t zXc!O(9K;p7#)>Q|$%MZUL?+Bx00LI(3oJM&;Cw~_+F0lc>(U~zxI)*gnr1Pu#!kR1 z3P#YnrCGF3lTZwZBB3Go7m^bbTn9|fRM3lK&O5=Y3;Ny3$WLsfZ;#~X-f;16LOcDwzc0Fi41G(Ms zH7mslY~FBt^lEe;1kK*)dK9GLJoFof17An>n-ff_A|CIphe0G?2(JDP;J_(St4%R zJ1hF!Pp&8hvCGA|v13Gb5^OCVrLQJ%cAT>#l}t@i`36mEX}f6t3;;WU2-2W(0zr@4 zz`;BU1`Z2wRsz;5OGL*s#w^E&=tO~OGsMTMt-A-jB4DvE8NNc+K`x zN%uL@q5A(VouXqTl1!x(Mw}GDs;ipKVEX(}(0Z>!v=30#XxN9BL}ettOED{K`0WmC zLHEEAbX|GRgD%xz_=HdMT3dx!be&RJ)MY3UHtyaXj@V`qmE|lTr5)D7F445(YOSR0 zfodQc91ivpc3#TG*!(D??drO(OLS0wV~sC&iRLZPc;#FJhZ(tn2a?Q2(l^ujR_eFf zyTvk6v94S6G|lql@npB~h)z0U;RxAukqA}H9v9ZLJz`O_l8s}9LfQY-Bf1~&73~}7 z*?a|s+~}%<`{QHTJ?n-vJ>a1<1VdD5Gb@y|U>)ohKI=%YI70t|a9J!+4^pZO%@Imc zj#+X0QZdkLcPgA2l~-qdcd6KCT(JuJVi0H`%lgbRv3eWj%!YIHb-0)tRNk zIi8Hg_o-b6cGsZo7a-g61kT4D_J%@z?^KF?dTyGD17vvG-uD!8?wnAnp(27o zD^8;^DROk8teKdxXaPhH9SH1Z>x1ROTv&2#dWBdrKplZizI9jcShP2CATq9w{z2t< zn>3ZB69>)fwR|hYrfuBwa>-mSB9tFa9+b0*Rj^29l=a~X(b>WQqSLiv+=u!^>wG&8 zpY9WF3s^e9+}J0EQPc2BAsF&w5yAZ=FzUot^YPpbS|9g`_Af9Lgrpb>Tb0WhK6>V) z;d3(OLF^2}ljKESO+>-VvivoQk1Qn@-nbGjYntfV0^gju8?%-Q}H665EZqaEn zZcwwiaA%_vDTWQIMuE4E;mHM@1b}z5TZ~L|lP`qFVVV;j;VsxHk`f9q{@G(z)=oJ4 zSIrNz733m@B>dL)ezDvkc&b`If#4NG&Tme`V%wvtN5}k`F<<&uOJ|n%>!>dGVH^U>EK$@}VAG-_N T{A8NG;Lrlz7 diff --git a/dbsrc b/dbsrc index f21c65d..ee7e4f7 100644 --- a/dbsrc +++ b/dbsrc @@ -1158,7 +1158,7 @@ del [0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0]]}]] + [0, 0, 0, 0, 0, 0, 0, 0, 0]]}],[],[],[]] art={ 196608: {'nrj': 0, 'cout': 0, 'temp': 0, 'nom': 'null', 'color': [0, 0, 0], 'text': '', 'value': 196608, 'cat': 0, 'tech': 0, 'activable': False}, 196609: {'nrj': 0, 'cout': 60, 'temp': 0.05, 'nom': 'positiver', 'color': [255, 0, 0], 'text': '+', 'value': 196609, 'cat': 1, 'tech': 2, 'activable': True},