From 2019416980e156d56aeda428ff40944eb19af8f6 Mon Sep 17 00:00:00 2001 From: "theo@manjaro" Date: Tue, 6 Jul 2021 21:14:27 +0200 Subject: [PATCH] Ajout de plateformes semi-solides --- gamedata/maps/TulipFields/base.png | Bin 14878 -> 16114 bytes gamedata/maps/TulipFields/map.json | 171 ++++++++++++++--------------- gamedata/objects/combat/player.py | 9 +- gamedata/objects/combat/tileset.py | 6 +- 4 files changed, 97 insertions(+), 89 deletions(-) diff --git a/gamedata/maps/TulipFields/base.png b/gamedata/maps/TulipFields/base.png index d1cc1b8f2859b99fdf8b52ab3812b3d9bc88aa8f..e501926289db96b0c65a3bf0272f6760d3f96257 100644 GIT binary patch delta 12533 zcmVaB^>EX>4U6ba`-PAZ2)IW&i+q+O3>vR$Mu@ zh5u_5H3ap|aMZ5#X7Gkz-&O<|3>chQb|&C(#J$pKb|dN9?EnA2WB$Xh7F;zkm6}`5 zmS3^O<~u)B`}j5PS7+n>`tr*?zrK6jw3om3ycGBz9)E29`G5N6b$)iwKey*i+{^o4 zF7)z)>->~{{YCH3*T?(U$Mb@|{(hn72!eau*{;D*v&ndeS`5L_~B{zPq-o`>amj)Wjy}dOrcY1l@<flzG5X@yPp0)OlUoMnyZZR5 zJW7AQBRpRJb)o$F{aspLUU%uY*Td`W{ksv>m$&%GU%b4&t@rQd{3fgCta{GAZ#J>V z%$)OcQZG}yKk>$)Xx)!xei!~v{9Nwu#_wvoon(3$JAdh@!5^CQb-x_%^p1-; zKJoh7y#2$!`TgNS=cs3#Q!v{jR*dTgoM9+)`pUaVh&#`il2LO*>|O)?_LmYH$Y8o* zu3Wd<@qf6)NbXl{1?5@YpZFc^qsLrX&kGPD?wuHn3uM4%7m~})7VnF5#Icf}&d6y% zKb)D)rQ{c*^f81?a_9o?&1Z_c@Ab()UIsl$L<*U%tR$$DtQZsJQzB5?VoxE(lu}M5 z)znhYA*;i3E?F?#ODM6Vl1nMIw9;#+v8I}9seiS$+M92|0Mn__kFB=WdgrE{D|bHK zc}MTVk1*m$BabrbXroWcXU3Uko@LhAW?y~SyeI<{ zw0~F5Y;`euWp2`(I?v zD0RPO?ql9Q$=VVb%$u>>h2{p;2HLOnHPTL%SKaQQ$>MXa?c{eS;slDotVP6Dk2~tG zF8&bPHj)X|rL}z?%kAQ08kNF5M1;7v-G5drf!mj!8Cdr1rDbK3p%yp4|xhp7{`<f-X4-zaoa=zw0>gY`i@C;%k|uvX5`XKa`O=GllHJXE>e{90`e!$=`KSRrCs#jrehca4-$$ z>c}T&?`Vxf6~HK}rg;KwK;dNqOfPhLC08OBQnxuZO4F3u=?3a6x_Uy>MPl0#TJ~w| zL?ut__^-rcsj3=JBdAQWaIqHXolOEP(8m zgG6p6YSpHtLIbNnk3)sDz<;bSK zN4{jrmE<$-#QhnKUsM{nu_9PIiIE?+IA8)aa07zea4uB>n#_}^BaNuG5ySE$5nS$= z1$&wMMQX((i~=}QNTeN&;X&;L!B{|iOLaLW#PtVP*tu>{kRkZf7k_~Q;<8GhlD8b} zLcfLWD&3SK6%!U0B8zQq(2NSDX824^0AtRh1u8El6!Ge`-ipByMnnY|LQzSOO92r~ z@Glsbf+g*WLtKby5POsK zU>vlUx@SX7@i@CFMfBRxC4Ybd6(L!uB(6DtjKX0Q z9^y;Ve*C2=M1Aebyb_b{)bvKfFXu_KbTwS2L4tQcFvSNxr2_N#wmeKvcQQY3k8yrs z1m-E7>a`@jt?K&}h=`6T+Clg%k$3c61=cH+=%Fqki)zlN#%1HC`v>)&S4V(=i=MV& zs0aKy4N!+pD}Uh%gv*P+kH?57s%bPR5- zG;~Sta}lzD-mo=NL7AMKE%ZZUw1KKc5C3a0ER<%p$FM$U3eS z?FDSla>mHu3Z&qPQ|N^jZhauUI+ubhAcW;>FWzMEag{vRF3}a(6}4`EqvAA0bb5)ESGSS1Eh!W{vo z^nVK#viF*>W-1m|U1WluLNp-6K%NBRRz6&bSQ$HmCkyt=6bq#3laY`d*cvYOATNv% z)2SW8=8B*}*~f3RZIEVxO+j#U$Apg&x1)NLZOqUSED!1}d&v(d)`Hq0mjnj>-N+LZ zM}wTTRPnXoF<&d5zY{#>YsK?J!Q zU(DP5apHe5Z}X>#M^pzc3|WIp!5SlksJgKGz|hcBlMX%v0wyj7(JECUH&nFpNzqtg zij8@CeHH#7b%_u#|8=#SKk56mA%Bcq^9rd!WZW7`&-~(I03{OHOIr??+A?*!D=ybo z&()kHG=WPAyMpbBv!8+i&4fbw3-C?dY5i>yEGsV--O!4bBp!8ev=~Uxd~Tb*CGwcZ zyLNzqMcQD(nLkl$_#|eU_#qtC20#IBnQ*2@Z2l40S46hKrUP;h71=9mTYm&ulpr3^ zx*E()A1W@ts<={MoHjk+mZKJmC^YcXlTjOEs^Ttg-^ZqWAl}pw632u^KqOpoChlMG z5$2dm#Lxo$;3)`Mr4flQ+B{-4h7DloAT|%$`HFRnXa{*zzZ(wz#E}9Jcgcey42Uf^ zFH-IezqaLQ0pnTAMCu3B+JBIqIh6`YXps_0QCh`Me-?Tg1J)zujJDcYIwQGdur18#k4meAXz^Z$ zSxR0EH#V^WTNbSm)dMJN2@h|I;^U2c#O2JwnDMl{ z2K8Vc9Xfb7Y&0U7Y$2d=5@=qn?j&cakubGCfJ!-gYa&D>Kh|xk>6Hi~!>G2bmvT-s zAOrMsLPRkpWO|v*lYj7eieV6Cijt6rsu(qGd2EBmBAvW~W58PS4jen7`K|y}f5-RN z9-*?A&5$4ON4rSxpkP6}Xz$N>vfsX=URMI5qCCNv=yFuhjwYijLL4VIP=b;q7LmGvY-`#M2I5YTf|gp>oBS99{v|%aDP*az1IQLW37_T8z6Fx zfSqvHn1%6N zv^^IsvvC8)qpk=uDDGv8scXc1J9QOcJnUN5B%UZhE$WemFax3tr-z5a52KssFoU^B z=xgmMRZH$5gMYxRA{o|##+Olf9~AR3Dny>)!lRW5Nv;R(xQGvv%eyg2Iv=^dvF3hb z*Ae^_q_?_G5l~kD^N@UqhY4TA4PR+D5t~04WwRnw{=~=i=*?(tS6Xoqlvv8C!Hg9;xKZ?nl zkkGy>nSk64K;+gc>MDL?Ka;1Fa>Xa3aEKd;LeQusA!RH@aUQwjXi_Q=IQmC z%d^d9K!4Ob*R+-tEsckn1{SrBl0K1_<|i_%)=!s=-mMs!k4r`t1{rZ{F$G1;1sa&w z39xo3m@rBmsO-=-cjO)tpV68Kn6HMmfxpl0cU2jU-hnS1x}!g|gbNqqD%^P}BrSz^ zni0>wvYU4i**sT~|7H={1KI8@oDlIuR}mxMjDOR9izW%z;GCs222$j#MT{{;lod8k zm4=}PoZc*?V~!CMIJtwOFc1WyVj&)(;1CbZ&UNYPjk}8*@}=Qn@&m$lZQLR(5ZTzA zi0;hrF`xy!8&4~3ifk?fUhLtaCU=lcj3|I?wFC!1!tpYtTBxBlW`dq*6~=%fpg0UO zNq>NfR%!@c@wQUI10j+S%8|C$@+ahvh+NK5%Q!oqT9tU$_DMZ)?$DPh(bww+g!0S= z7K=)_uU?FYMi?|L%#ZDohc9Fw0tIulE#P^THm6GrqPG!QWK9Ndrjq26{bqp%$bjyL zECxv=;1%vi!@`{;A6h^o2G@sOQVds&$?PvG*%!0M7MB z4E&M;uR=hEe%(EYp1}{q1O8x{15)DAHsb?)f_539HLs;8bQCIz`D`uAqv94B#D9yR z1aS?W^35Y?fx_~$8H^*}%~ax)9ViIF@UdP4_uCoS2vq)2(dDC~3;_i-wRr|CjI9+2 z9FVN{jzYQPACm5z{!7xWxiCKOCukls{J{hh>NUd~gKKmx5TM&}J(!Ay7{+B6dR&eT zC?E2i2{O=)lQwUWyyKujnBAzLa9dE$tTcHm}L6y}??+#lz`e3ghOM^5=%%p)zOq4p5R?d!hjb#@+QGj@={y z4Ll~MMyt);W?T!p9#5cS8MZeahSDw*zJLZ36~|%64h7?|xT^NYq!i6c+N91RZhJPdPW)>d+=8NkJhfYivzrSP9lAGt<`9uHE@o83T=JLq#K#|d$o!#+g7&YdOboK@ zBfaXC6v}94#4|e0fm&6dC)i&2Y*=;Q=lH0g3e6R!PFee?4nfm_xun;J3dpRcf%av)XCQIyhyD}rC9@l zLcA4W$^Ah7p^abfPV;=`5ESXA1?DIUcZIwr$+tZ)6M5b zT?-BAuN;{9%7PV2DV+#-pWNo?68i<4U5@M%JfgK~0)L11EWp$-NCXh#u`wi_Pyn2~ zLs~FGPK9845C*-8_tz0wbT(YZTcX_L29VKDz>q;otPK+WL&nu+la@&}B3M13?g&-T zLiRq?TavoPivv{vn4J;Xx1q-R(6;lV7BnBk;1^nO7Y!tZTdNRWZYvb1m>UES3z+}W zp13zZ+Hc}yORf>%cl-d76UOQf`2KWq5Zd{C9+9tV^=nccSRLGqRD74 z-CM9jXJ&}Q#JB5sA==rdp>A=N3+W65MsI5U{#_V!nuh|dM!gHdN+M3W8+%tAWB|Vo z9etoDu#n9nkdp057ygl{c{g=#grHvUi*jGLy^!Dw^-K3_Tb`zO!RyUv zK7T&Hrnc|Zb~21;KnfgrPy%a zzYgk#rq!-hJle;gnUKO84?bMY-r=cdz4%kh`dURaJ=#U)P z;T$~XbQZEuv6N3=TKHXBtE20vQ>ht>@qerNn;!+>2lF?-2LN$<#@#-{9ns~K-m@0) z3*kh+SIH;R->A)7?>OTj1Qa1@EgR<*pNq*>`tXazp1QUJ19;Dju5N?nfk zC#NZ2_1&9eq~?=zq`!`lD(D*v+keo209ui581T^S5RZkdwYBe-10^su4k7b*vuirP za^l^!AXO9Be2l1Ub?r?2gghK6yUZp#sR9WMrnm}CU_ zcc7^MI6reIsQER;+ePGxo~zN}yP~qB{;7I^U3(z7bxI16i~h!X0MRMX-hU{}X|xyj zaUb|^wt?&27&qUZ2>5Dad}_gzPa@X<2y5CsK|Rr$NR)9O?m$O&^!{MN2&&CE$JDV8 ziyjfX%K6QL6M(`1Hrl5r(r@n>lSXk#j-vp;_|~+4h#3#yDIWKp{J@MMlO&JM$k+!u zNCzRGipazO8-8|J=I!_G&wqDIf99_JeYW%m+2cYBI9lNMod`H`R_AkdS|)=Ctu$0b z@j&2CD1Q{$X%ktkV<~h^i3uL#6`ejOYBOa}Kzn3hyt_dF+Jla%5qjQ$VlL6#{knsJ z1dO`QXj<+MBcmHJZZw{ae%xn9MuQ-9AbV9fh=@U`6nD{z@Y%*AeScATlL4VAY1zkd zgH2l``(c^j>+j~XzaZ;6u7ILH%nkNK2GLFd2kQDgs)rUt!GSgz6uD2a80-`nuXS>* zU+eVvM9yo=@4y@(X_J-uPAIy)tdtcWjeTTI58g5{JY{h0 z6;=U;>cOIP?dsuts4{Ir=~OnjgRAgplC5{)tDrU=YKi^|i=$(6*&WD`ej+WWk;U@Z znM>NuI*zGB_UI3qZ#BJd#V%WNkg+X6#|#nBc70T>S#=C%nc9FUi=GO)*o0}r!Ehhc z6R+UUJ(tC2A%D^nuKm6kOi3<^xNB- z_xHVH#w|M3{6slU?CH_k>9^s=W+7DWrXZX?wG0P8pMS2i=R&EaZ7^^wCmiIXA)JK>0haKD4nyXR_qjJf{KE<%5aA<@%*Ugdufz;E(S;2wZ=z9 zyPdULO@9sIiuc`~i>UXyGBKTg-IE)=YOgZhXC_VtM5k(CrpqEnE8BX0blI}G4eI`? zHQ1=&qxnkE9Rxdc_%^{)D84c6CT>dy>u3anO_9GFI)zQ7>O)!sa09~Y40NipNc+8- zT;II0qK2uO(r94Gk{94gdd|SS~^CjP)J?1a*`fDfd&)9b480X zh!|#)AU;ddSBf<(R9FXxX<8t?!5svU$#*RiA=aGM${TV4ZUWTq)&(R23nSQo@u-Ct zZM>-^RCPU=PO6SJ7YNC@F6s#(KnIY(mRG2g^n;KRo$fwy1NmvspK%1r_k<#7 zwBS-Nu4(6xk1-I7DMvI3u5HGBB&x-L6PsaRv|Q+VBt=_B+9Sgo@v#8;QUs_mdt#U; z(UVyZ?e(Pt7nrdjp_rGBR&A}u4Syjxkdw|sj1y9ZJ|Zxc03#F=&hsAU6S_)*=rCc` zxi@Ts{>1@$Ob?&eKL{ z`CurV4nUYn54$0z1)WEWAi1GVa3r=MwMk0Mv3eb;NcT}N%d5hrR(7UfD=-$zZs(V69%C-29bm?gngmQIUIR0^b59zJ^L@I}>G zkaVAHLaE0l*Q$ky(6*Bo^zvC!vCU*mF+tM%t3U@uHYs&Pw43NoEZJmgq?xjmcVP>CnC&t75|1fFj|gH%oDBT(e*a^>wro$)Kr@iJ?FuMH6&J+JqLr^XxhQ(#gDB4=!ZeQ=;XRMW)Iw8e>h(R zCEnwiNV;C`wm*ACjX$%tPVd$sx}}2t&JUSEFMHbg~RA z?{!(NL~L`UZO5U9`K*4%76ptj?XJ@tM|-V&)S(s^(|-d|EG8;kr$AZKP^I>7-AwCXVw*BgM=m@<9>5La@0>8WNgdXW= zc7Hd6P?S}J*Tcf-P(4t+^-q7?$JTpKxf=HC;RvKr2c`H z#}UBtX29k#Vm++;@~Ayc6b@=1eWR6k9gid?UYpZy+#DepJ1SFcUCwnP`sZezbCB42 z&ceRT1JuZ*EEld;(sD$8`kZJBu<^B4#Z6-okn`B$ii~Z-q6$a6a+rN z{1e3JS*_Gq>z@3Df1$j#vdndwqex;AOAsMIMh#_D zU?EDYMv93v?I%3^BaUArmrSlQ7&#VDg$l{>ga5(rZq35UyLkcxo`EZ^?XNa~nNQN|Z7p&H3~U1z*KJMS11@)f;U`@(Bu5I+^cM=i`x$*x z4j8%xE&A5n-dg)OeE>4lRq6&fI0VLvl)dip?%vMc{yo#`?+3!0a>q*Ya|-|f4gIs$ zAc_JcV_{@4VK_E2EoL`3F)cJOGdV3dGGb&cHZU?|H!)>mW@TY9lY}Fv3^h47I5smi zH8VLiF|#-%Tmh4@BwQq9G%ztXV=y%>VKy~pEi^ebH7#N`W;HD_IAt<2H8o>pWi&XG zF(pe1HdHb&IyE;sG&8e?C2j~0?xL}10000sP)t-sb7f?bE;9u1ax0pXH!eB|1`;_d zpp2lolX)&Ef161}K~#9!?Olm><0=fz@ggUtlj-~apM9W(MSz!tr1mtN*EDzRQ0pQD zXvw?WcD8}rG!03s;Vy6e5+1SjeRy5Q-IMKdyI!4K?v;KP@pX2hS=qq7kdVtbh}rin zVb3tZa?jfdm{~?AU1&vYUuGd-0FZafnB~Oh4ZlbCf8+@kUFf-qfNS`90xSa}t%zB| z_<7I+Es01E*<0Q9Wr8jnIi80R2t4L?o5G>D>$l(%aMySH}yWpGJAh<}x_ z5I}-=hpIhJJiM0rv0S62ZgJr`XDW1#RkTCNQ*aq(=r6v;zwPP}md$jNp{O zODUqRf8YiL*nzULk%aDNp06c5yWdb26s9TzsNEzni5Z?g#r7^I&D#k;la0cKmunH* zr%mLHK`?>(I{pKlhGf^t1Z>e}NGv@O(1SoXMcia^W+M>LVi}YnldT);aE1Z( zV2W%Wii<)|GWzs3wiUPpZko=3MlcXSiz5k%9J=KaS;FPB83FEbNenM=q|gBmfdIeb zf0@`SU>8Dwn>xW9(D22JcbEbRmfL!n0%#B*+9=`vq3;3#OvbYW;Ftj_EZ{Dlgx6Tq zgtVPaA~WY6bMneS{jn0!5WzYDK$~Gt00fK3TW8CO%o1owfZw^2F$e}h;{nAR{6^PL zc(j!KD_JYuP4+Wh0(^P+r2$-go^F7|gHXy-e0z!Xezf;>^B7oMm;1Cg9 za49DJwOI!1r`g2d53&)8aDjlNzb;t@>f1rFc^X%(VB=L_jQ}!gfdG#ytH6l}0N(Ia z&hznXn9@B?#R#VT@yfPN0I%^He|IG_81>g^8QgNdANc5#;_@=6{Q=?pUONtpb4cTY z5ls4PwH2PG)${!@d51`Zi#8zY?@@n%;L`BN{WT(h5A@0TKE;#r2M8_`5c=EU4}j#9 zz__UYQGZR0AgGPM_HoK-Iraw#E*ZhNzwQ2jG4TfoF4=&%zh?dbh^ITKf9X%x6Mul< z(oQh$?@@n%;F1l9`)lV9h^<}~$Nm7qrB$GXKR|FfvI_kR`~kAI!BD}AgGC*%RA&L>dUJBf00d|$`=JqC7k`~(4Me192d{sNs(psq6k7~T%+ zd5HH1+_O`(a$K(9Hv51yzQ2ewe}T>?P}eybG>Px)c)uqA^90{a0I2x>u!@zxK<5*v z>oo9`_Qh5%iT8WVMxg31sNg0>a8Fx`9hLsw$v37gjrV(uf1BKHdy;IUeZZ}8+weF0 z6)cC|CETp-t{1qi;HuOs^#XldQ?LOyBVcd6znAL<3@NKnD;3D{XL zAotgB9>~~NFCh2#72KSFz4Zcee+}0N*jg{(@29P9hMNCU%`1Chm!jGjr9Ut zUjRNuNaOYdf9$Il@b_16IhaiXZ>bmX_mfL3$IYj}o_YZ}COIspD212f80+-{QGG!j zH`M^A#Kro6yk3A@B2-@hzJ6dz`~{VG{`&EjokE;A&M!VtTuB*gq5(9pYxM%&9}vff zpAN{Q)8VAMyi)fEU?-eg1&( zLg8_Jy+XhSe*lae3zJBSH+o13m0gW5Az+U`Ad3Hc0^;ix0t)AUjlp|_ppWtccuqJ= z_$m$9;rcC1ETmpX@a_5SOZu60X*`Nd=Q1l zX`}cmef35z2i{Clc>IKe8z$SkH-756}wR(Xz z3qd7Q`h^5suI>eYuGcaa0(@}fB{m>9z@SO+a~lCWn$!c->IGU1Kh*=k_zop_kbru< zKpXw9*9#nhfN7~-palo8Trcp$1So&ND{MgG4>%qHsXw4O0hvGGm`1Q#FL1ik;3GC5 zfA$BQo`Ag{_~-lqy9xN$`~eRT@B{vU%hRpt6nMWs;BW-I+aGW&0)D_Ba3})O`hnj^ zKwMw&Hh;jerodu8Ks$dxyaXPKfVF&pCJLZ@;s+vNOFlr8tpFT%3asV>v>_nQ2RIl3 zYxw{Td}1me;As1R#e9GU8=)*8;7B%Le>ETA=`BDZAK+j{a48?4!Tc}e100BecehKU z_95UyzzGSsG;ALNeggr9+b<=+m@n7nc{ab2022TD<&qf+O7I&9xLN64b3|km{PP4j z`K|2NufKo)A`j+w5nyg#P6KSS1W@0e_)m; zX0@7MLx5cXD6{j661o}O&A&-Nw$(9L8FbVDF5|R2g8$4vNPsc!b1?^o^V!h|&q z+yXekZ>#}d=OMs2vCS~q2R2S{f7|c{Od>xGzAHgW2*4$PwgB^&3_rH>5a6Qi?)z7) z8u)5KD`;%U4LM864VlgXOMx4Gr}ST_0hYUSX@FG$=WKTxZ=`_qKHl#U0Vb4KQ8V#2 zms#7!c8CwgjpChbF-4KYuNq zQ+YFp^cexY|8i1IfSU#L4EWzHYVhAlw!+2<|NZ?vkQFfgOQ`x)CS~&r39$5lxANTuwzb6aG!3jX+|DL{w;f_jdye&6(l?G;Rah0AL&7Y#&*` zAdP|K+a{|73@0Q2HJ383?suqYK$rti*a-&tX$G8)0CoH=ABRoWNAhztfBVhZ2zXEX z5bz=3gmHnEM12VO5bz=3L%@fC^AhkvYCi;g2>1~2A>c#6FK+(>k$$+lzoW3d00000 LNkvXXu0mjfI%u&W delta 11434 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 Eg5>&#yZ`_I diff --git a/gamedata/maps/TulipFields/map.json b/gamedata/maps/TulipFields/map.json index 69537d4..aed4443 100644 --- a/gamedata/maps/TulipFields/map.json +++ b/gamedata/maps/TulipFields/map.json @@ -74,8 +74,8 @@ [-1], [-1], [-1], - [12, 6], - [13, 6], + [-1], + [-1], [-1], [-1], [-1], @@ -113,8 +113,8 @@ [-1], [-1], [-1], - [12, 7], - [13, 7], + [-1], + [-1], [-1], [-1], [-1], @@ -147,18 +147,18 @@ [-1], [-1], [-1], - [0, 0], - [1, 0], - [1, 0], - [1, 0], - [1, 0], - [1, 0], - [1, 0], - [1, 0], - [1, 0], - [1, 0], - [1, 0], - [2, 0], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1], [-1], [-1], @@ -186,18 +186,18 @@ [-1], [-1], [-1], - [5, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [3, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1], [-1], [-1], @@ -223,22 +223,22 @@ [-1], [-1], [-1], - [0, 0], - [1, 0], - [5, 2], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [3, 2], - [1, 0], - [2, 0], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [0, 4], + [1, 4], + [1, 4], + [2, 4], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1], [-1], [-1], @@ -262,22 +262,22 @@ [-1], [-1], [-1], - [0, 1], - [1, 1], - [1, 1], - [1, 1], - [3, 0], - [1, 2], - [1, 2], - [1, 2], - [1, 2], - [1, 2], - [1, 2], - [5, 0], - [1, 1], - [1, 1], - [1, 1], - [2, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1], [-1], [-1], @@ -301,22 +301,22 @@ [-1], [-1], [-1], - [0, 2], - [1, 2], - [1, 2], - [1, 2], - [2, 2], [-1], [-1], [-1], [-1], [-1], [-1], - [0, 2], - [1, 2], - [1, 2], - [1, 2], - [2, 2], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1], [-1], [-1], @@ -342,18 +342,18 @@ [-1], [-1], [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], + [0, 4], + [1, 4], + [1, 4], + [1, 4], + [1, 4], + [1, 4], + [1, 4], + [1, 4], + [1, 4], + [1, 4], + [1, 4], + [2, 4], [-1], [-1], [-1], @@ -693,9 +693,6 @@ "gridCellsX": 37, "gridCellsY": 17, "entities": [ - {"name": "Solid", "id": 12, "_eid": "17026310", "x": 208, "y": 48, "width": 192, "height": 64, "originX": 0, "originY": 0}, - {"name": "Solid", "id": 13, "_eid": "17026310", "x": 176, "y": 80, "width": 80, "height": 48, "originX": 0, "originY": 0}, - {"name": "Solid", "id": 14, "_eid": "17026310", "x": 352, "y": 80, "width": 80, "height": 48, "originX": 0, "originY": 0}, {"name": "Solid", "id": 15, "_eid": "17026310", "x": 480, "y": 144, "width": 112, "height": 64, "originX": 0, "originY": 0}, {"name": "Solid", "id": 16, "_eid": "17026310", "x": 384, "y": 192, "width": 64, "height": 64, "originX": 0, "originY": 0}, {"name": "Solid", "id": 17, "_eid": "17026310", "x": 448, "y": 192, "width": 64, "height": 48, "originX": 0, "originY": 0}, @@ -703,7 +700,9 @@ {"name": "Solid", "id": 19, "_eid": "17026310", "x": 0, "y": 144, "width": 112, "height": 64, "originX": 0, "originY": 0}, {"name": "Solid", "id": 20, "_eid": "17026310", "x": 144, "y": 192, "width": 80, "height": 64, "originX": 0, "originY": 0}, {"name": "Solid", "id": 21, "_eid": "17026310", "x": 80, "y": 192, "width": 64, "height": 48, "originX": 0, "originY": 0}, - {"name": "Solid", "id": 22, "_eid": "17026310", "x": 32, "y": 208, "width": 48, "height": 16, "originX": 0, "originY": 0} + {"name": "Solid", "id": 22, "_eid": "17026310", "x": 32, "y": 208, "width": 48, "height": 16, "originX": 0, "originY": 0}, + {"name": "SemiSolid", "id": 23, "_eid": "59763689", "x": 208, "y": 128, "width": 192, "height": 16, "originX": 0, "originY": 0}, + {"name": "SemiSolid", "id": 24, "_eid": "59763689", "x": 272, "y": 80, "width": 64, "height": 16, "originX": 0, "originY": 0} ] }, { diff --git a/gamedata/objects/combat/player.py b/gamedata/objects/combat/player.py index 36abf5e..a540cc2 100644 --- a/gamedata/objects/combat/player.py +++ b/gamedata/objects/combat/player.py @@ -14,6 +14,7 @@ class Player(BaseObject): super().__init__(x,y,game,self.sprite.get_width(),self.sprite.get_height()) self.collisionrects = tileset.rects + self.semirects = tileset.semirects self.tilew = tileset.solidtilew self.tileh = tileset.solidtileh @@ -37,7 +38,7 @@ class Player(BaseObject): self.onground = False if self.checkcollisions(0,1): self.onground = True - self.vertical=0 + self.vertical=min(0,self.vertical) else: self.vertical+=self.gravity*self.game.dt self.vertical = min(self.maxgravity,self.vertical) @@ -114,6 +115,12 @@ class Player(BaseObject): if temprect.colliderect(rect): result = rect break + if not result: + for rect in self.semirects: + if self.rect.bottom<=rect.top: + if temprect.colliderect(rect): + result = rect + break return result def draw(self): diff --git a/gamedata/objects/combat/tileset.py b/gamedata/objects/combat/tileset.py index 94664b7..4fc9b10 100644 --- a/gamedata/objects/combat/tileset.py +++ b/gamedata/objects/combat/tileset.py @@ -25,6 +25,7 @@ class TilesetRenderer(BaseObject): json = level["data"] name = level["name"] self.rects = [] + self.semirects = [] self.layers = [] self.spawns = [[self.game.DISPLAY_WIDTH//2,self.game.DISPLAY_HEIGHT//2]] # Valeur par défaut if "layers" in json.keys() and type(json["layers"]).__name__=="list": @@ -79,9 +80,10 @@ class TilesetRenderer(BaseObject): w = entity["width"] if "height" in entity.keys(): h = entity["height"] - self.rects.append(self.game.pygame.Rect(x,y,w,h)) + lists = {"Solid":self.rects,"SemiSolid":self.semirects} + lists[entity["name"]].append(self.game.pygame.Rect(x,y,w,h)) except: - self.game.log("Erreur",name,"Propriétés invalides") + self.game.log("Erreur",name,entity,"Propriétés invalides") else: self.game.log("Erreur",name,"Il manque les collisions, Entity Layer nommé Solids")