From 387890a0699ffeb68b1d91b807cc996054c67e65 Mon Sep 17 00:00:00 2001 From: Arthur 'Grizzly' Grisel-Davy Date: Wed, 29 Apr 2020 11:18:34 -0400 Subject: [PATCH] solve #6, add background to map --- asset/asset.svg | 102 +++++++++++++++++++++++------- main.py | 2 +- maps/map1_back.png | Bin 0 -> 38524 bytes maps/{map_1.png => map1_wall.png} | Bin models.py | 13 ++-- 5 files changed, 87 insertions(+), 30 deletions(-) create mode 100644 maps/map1_back.png rename maps/{map_1.png => map1_wall.png} (100%) diff --git a/asset/asset.svg b/asset/asset.svg index 59acdb9..555d914 100644 --- a/asset/asset.svg +++ b/asset/asset.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.7727083" - inkscape:cx="-995.66764" - inkscape:cy="192.7389" + inkscape:zoom="0.11079427" + inkscape:cx="-1017.0394" + inkscape:cy="-2198.0564" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -57,9 +57,55 @@ + id="layer2" + inkscape:label="back" + style="display:inline"> + + + + + + + + + + id="g5223" + style=""> + inkscape:export-ydpi="96" + style=""> + inkscape:export-ydpi="96" + style=""> + inkscape:export-ydpi="96" + style=""> + inkscape:export-ydpi="96" + style=""> + transform="rotate(45,-267.71741,255.73419)" + style=""> + inkscape:export-ydpi="96" + style=""> + transform="rotate(-135,-231.7835,215.81778)" + style=""> + inkscape:export-ydpi="96" + style=""> @@ -678,14 +733,14 @@ inkscape:export-ydpi="96" /> + inkscape:export-ydpi="96" + style=""> bP+;N zK&2^NO6VXR0z{;QP~XOLG&|>xJKlKX-T&V6{+B&QU}R^NxxV?$x#n7X@3{lj?kLh9 zU_StXK z`=Oz`8J-TDJnncy*HHs*?&xyg{vpK0#YO0m4a~vpzU@OHxV=UE!ew>{cwFx3+>kTu7O<50N_VKfdh#_eNi902g>FPyI^9hl&Q38$a1V zB?FZVR5JXD0M!<#wm`Lo|6yBr^)QX@rxJiLv%aD0%Q1I{3w7|2+RkbDq9U|{yu62t zq9c4Z5X;4p`gu~+!SWRHKB!Liz}ITE&COmuyTwT3mJNf>df4QU_$mc*eMp>w`cb~bkDse(Ohn?#q2PDL{?zwgsFngLtn>oELOeq9N6 zZKYhEli)}iuU*@YP7Iz|%q(9x2n(ke5KF23>|IYn685-8Y6N{R^6NmC|3 z6CFr3zLFkmp*>4I+wP$ZFci4oQa2od{-mfMAi&?7QDJ*p?4qIZ8)#y1=GnbxypwU74jJBLl5FuOMW}dbd7;5y?45p>*VbaL!R8Sp`8Zo zbbo=}Ef4tg@KJrjkh%k6WJMynNI1udqRQ!&?irsrSlZp+7Pi)C8~cz`*F9i)q4cQp zFt~2^ADraYAu6-$B$ybkn+OkT!R9@jAKo1UdXWPS-$P@?46OHl9+xu1vn618gT*e5 zZ;8S>R!Dmzo6PebNZnw{2CdBP%O~#;UfYq6O%f2g%4D(5~rD6 zTZx|-J|HDj>FGQJjHJlLMPV2fs^rDv8qYz|M_Z+Y{c|Pw4v|5WS))-JZtr?Iam#-v zfWE>ectg(VjQGM(WzLpKu00=^xXf8C%=Sf2MHqYu7vmi2cK=1fo-@4rTCps{8}$}r zH4ciYXC|vy_PR&tI@ISwe#!0(NPi=0sSTM*Fy0MZ=A2dY7FNxPDrk%;^ieZlr3XC^f8d_&! zvimYosD3tbv|Y}_UA^${idC4fpGUi$4eKWiF_jEs#-jS!ZZM5WD2(Mw2-OF|F-KBy zep8+co8h7bTO)ZrUc-6%3%|-YEkz$Bi&O2<lQn=Z_+yVj8$YU@T*_$i;VY7ASgDjc=+2-u-lrHl?*{ z#!cNuS<%|m1I8_~3UzX6UIECCS+IC-b&7(l3QGeG>Is?11}3J(Z2+D!^u?*ZE>Rs* zbJMJoQ}3;KDN0{k8fs9tR&Ho-?>H{QxRB_O8qB@$vg)7Dc8ZDH-ayMUWQHkAZ1%wtT&p`E!a9= z&NTbqq|0Td4B|NxEPKk{+}lqX|aF8iW<7<{@{G@`>{+bC~Mp35eUa=tcM46;J6 znr3#saS-sUGqrkb-vaoPGWhK4jFdB`t|n*F>oQV2G*myus;N?fdTBV6Gxf;_dKs6I z&Ui7Ld&#oc+<<8@d)3-7ZnV<{RlnBOv$KP>LAcC$Eu%{DsYJz0ADV-m!4xk4SC&FF zeEgWCn~3@8^pv#J+=VHu+vxj&gJ}UnxuL&Go%XLE^F?|I*)R;a;`(}4!d+M5h3iSt ztu-H#+%AhR41RukJlW{eIVhP_5J<3&pw)1L2vmeiv1;{h(^A7TWmV<+>W{$=c`J{- zjEiz%`2?S;Z{LvIiK3&f8DD%}x_(g_4my`1B=%t6Yc??4)n^@7zvAsStC06fwz3Ml z*1lAE$(Wzcm@*g!7+s#Qaz{dlp$?!O+wx;4b8)Y4T?9oZ_u`X`8DlXIRU1dZY|1d z-nMdev)~LX)AdRXb$QO6y4KOTFF4ruNjGH-fsc~>vgtQenfQ(2!6QoNZJBKBd+faZe_?>ZagX;1sCAEub1 zUfR3a`Fuzln=&2gOzYW^aj9RZUsVMBj|)^3fcrWd-PpP>%x=43rqpY@PmqWioAF4| zJS%7wRXg2Ze6nS0d3n_6tb`4>t`HdIE6n#ksjw7kh}wN4neBesdvPq#c#qUHj95xQ zsT)Zl#GvB1`gzYPLBcTW7UP26GG}l*Cevk+(8QEk?cqzwDXqRJqSV@2X#24$k@9h( z#BhNa_f8|D;-g=$el&HozW3m{dQj04t=Ti*X$(f#9Zt~yy426GtVoFRm1FFsoRwd{)=oVWwCq6GY{M)zB*}73MBVO- zB_d|kYWBoM4hbUcro)mRZ(ezG=x=7U8^O7k-8E9%e4~cZ$JH|Q*-<6wXqVdduIVxywJ1ZvsG}vHEP*=EWsJ-4n*b)p}0gj)@b93qqUF4 z$|Y9nP){mMiDnzAFtgTA^mM_LJoE)h$m_c(&UsqGcR!jI=3}!nKCVkOwYzrgmw%|4 zWR#Z6FFsc;SUgxEy3RAiVU6#L5XiS4TWDUaF-D%s5-n8M41QfiI+Zv%wsVh+zqi)w z&+Y3RJ3=Lzrb`L^yB}WJt((fB$~Ds~;W6AvDEl-{!Fj>uiZ%2mqpqSApKf=P0ArP92y<|LrhHC*}Aarq^d^yYEfj zN6FBvqRws3N@@L2)8aTu`ZsEnYV7Ha8JVU?!>Ni#4p{pi9_^NAo6C83#;<&D zdbu;r%)x!k^jyJ54lx}$bIkO_k=euOpg)Q`V!t#g4SHw3Dsqsna!87m!l7lW2yWXx zsx|aP&eeKjCV#eIYP)Y%; zt#J-qS5_p??10Y?DIkywt%7ckT3b2>W%rnf$Vd%k$@nvL4R0e-qR#7mo_CmhVD4TX zm7}i{F^o;cFlJ=HdNq)*u~XZcM4K%G1fnBD+TjGbwI&BvDTuVCV~Umxkpb6G-4|C0 zgLUm;l$wpy$x1{NZxMvbU#E*B)6!+PV%HbV=w?Tj@^M=w$jp60g)QXJ;|g4_Z=M#y zn%y3#J%5ZnFEzVc6W@K~u-&EmCdqXR*bG!oS$grjTP3&KWS5QcUa|!0*BHDR4%@x> z@HtJ)X^UPAYo;^rwvO&YyOg51c<`%Qd}3&s6#aFl$W5Ar162%?BgS&e$G%*5TK=ROASwM2K){8e z`yd?EWymO}o-q_Vw|awI=Yl|EIRa9B?UHnRR)U8=?170j+NPIxbo#l((Cc6x8MSzA zV{PK#s&Dy&+HVxlIRGM9c1+7>J0GIQwQIr7+c|#f)LenOm9C>I)hbHhS@CiedHtXZ z?^pQ#;7ntBGyUUU0EqQrySlm1}2*LVOqDij3nq0KByQF-??a`j8h`B1bQRv*R}+1Up! z!}(CfDk@sT5&qePhJ$F2jr8(f@DKrrvgA2K3qdkLEcnME?uh}ZS1odEH*J9$AHg*? zfiBxRf39el?&`e%cbv>m}3igEda^GfRxyGs;MHpM-qoxa73^3w%r$h&yIly@TE zsHHb}Or>OPkT5wF@4*c@WzqNr#5 ztCaVR8#QEBL7FUfn>tLvaPm8~f5|u$E$&_%}^_b4iv}a(D?yEkk^O z`}2h(ybxPs^X*x&i{{(|Z?d`>4Z553LB$Bbv>NjuU)#4+l5d;CWAo*nT*B%BbyLpfvHReVL@dw84N0ue`4{^**yFy5`=2E zAT0hp?Dnhi>b&mms7#(#t(X4WK(0U&Np?3OR0aSRu!$2j{cNnN9^QTv$ItQwA_>&2{f2q#lI~G*u z@Fyjx&fz-_)X3pG3{>Ypbq;^}h3|j=q0ZqU%VXA`_X7M7m%5nx6A9|F@jDLG1@dBx(@+mLn&7ah&f2syTh3PLKsBHQR z2r4Ch070e14!f1 zC&?ey@ZU8_=9n{jr+GoQkB>R69x&;@ql&8cPu=Pj{UHZ%0~OOrI>J!bR_o&C+gK=V z&s#jfxDKakQD{LfQ_U-b?^iP3O)mWN@EPm{J#z$sY_t8Vww2z-K_OA=Tf|3|E!;GZ z2R|;plQfubP6R#U6TDx_mFP794MD~?&mFIh8Z>wj22YY}p(rz#0~by>URmJcQsu%suj7w21?ghoX}3cOiNO)u3QEDvuOxqDN2`S-QMgbN~z??s+M zlVdEE51IZh{iH7WgseR0MV=!(y0Jz_O8L506&({q^+$GF9 zW&`w8C}jUJ8;aD$)yWhIQvNF+oqq6YhUSf?z?~MYjE+a{``$DeU3#14=kFf}21JQ> z+@#h6r(&GlD|M1?xk453)mltsJ1!lp_-BWpj!RuwZ}6RP|BVCr+oR_fKQBXcvlhdK z)e9Y#R9YcXy%utttM0>VB;d=>!<+xO`}AbCj7peyT1-4aGh+;QY<)26%NKTbD|e7a z&W8qb=D242`DcB?4gRbRfh=Rcq=Ux`IdtG3`g}Y{XzD{2WHA0cZgC}#hpJmL7F6Am zvG_+kcF=J3RN;?%0lfdIiA2blQJ)0>VexNgOuGRB`SA7yvbok^2jc{e|@1=RJ5xP=`r8uZZtpSe18E0 z5jFu9#6SClR2O;?d&ZnTBoMn&=QFJE*~Z<=FZkVnZh>ShmsKcwGqJ&Hlnidz&SQwS z38fG8owQ4`P?vj_b8g676f=~8OKH}-7$k=N0AIfj(6K5Qxho&GZRY~ldw|Xgx-Frk z_CYNePMb@1;IAekJQ7io;xOdM7-Th#G zo-g#m{CWBe#p%=^rw>t_e$rb;TL1iVxO1CF?yf*F;dM*8%0aI>VWgZEbJ9-B#T-1U z3M#81a5^ui#gD!$x}`}Iwlj~0;oZ<4{k~TFS z>O-rj&hpGVqk%j?ADi*`^?8nXBic6<`51M7&ollqQU>Td3G5xJd7*%&&^WD7lsGiA zDnQa(790$C|FWKRj&n>uF0m82TNO-|>OH0JnNEyC)?>ip-SIicd6JhQxfQJNkzatK zyrYnPK#CmlND}Mc@jwkEhPQ&_sy2gWL&7AW8OUY|+*R^vbj3fYFp?{I8x@;%=vtSJ zuyn2WZfVt{#Gn~+fs)=d;0ecj%C2R4#tARRhRZ0adf7c-mwabqo0v5@8JE~4_m}6{ zC4co5Fm0=U>nV7YgGG$VVvz;2Fv(nS!5{tf}`@5vy)x&K;37GK8dae^KU*ZC06u0IqG zk*AjcXS-e>M5&lL5kr|*q6ARdFhXKhW@fqoO&i53Zg1sWi1vIhX<@zTA%|774&ikN zb_bKy+na7da~Pbk-}?kk3bHRAtfBV?Q;=f@U}-G_fJ}%_fRu@380qa3XieULZ&6I9 zo9nrx?J{^leXIkS+W{ZcaGKNYh=Azs12;9zWD!NK%Na%#u7@!q)0`N z{xNs@CH+&Sj#sc3LYWbgw=fNPg77|m{kx~aQ{>g3*B}yNxew7TvbH`I9d1jVlCsB6 z{NnQ^P|ovDX|DY3@{K%rGJ-$?!DNO&j)12J2;>yluRL;OYzr0cyuo zsHx-vFSDrTM0Frkmr0!@DAKx6CyD>lNrL~(QC?Q_$!sWSYaGI(vC_p2(SAE~F2Zj6 zYuPa=H<3EOyqYHT%$cJHfEQj3cODKE3@varb8&>v2QF~n6zlz30?L&mGeE7Fq#d!Z z_BeXLx75|~!ku{;?&zV)ul=@T7}hCPQ#+fJ>G^kRNlz^JcvHNz%$A2LPuh4rRxN^0 z8>}B9T{DnD@*gPkbbLG)RGw20N~;dB@_9<@RX@@3VR2Tj>Tm?#m{MPrqzum!_=~`I zv=*ixa^p>j%pOV%(tZpH!L)L{JRLd$e7vSw9!dinQ;auo-HH6od&!Yi^`~&D<-vT< zuMV`f2~uc+E2rzXi8JGkYmp7|kFg#e1FLBjsRig6zGxoc2T9UE0dcERNS}@9NqRS3 zg-{}ygO=eZq=fBl2jj69kLPdUgGD?|UvK)e@wP0;9giO34BEi1S~@PfAf`WSwDN3J z2k`OoCNiNtmUG!o`8%Enag0 z^P!cc;mS>I^^K)6&jwItUWhFA4^9IY1y#m+yqs626;ahVHUu%e@o;>S4N$;+b6LNz z1Ys+9$E;R(W}~J(Sk|*Q8{RoR^s*8%TKBi$`__fPjrNULRxShdsEP^h5Kav66f*9_ zwx|rUBpxD<(ff8*{wn0@=j@$t*P239gdf2jJd|?!huE?!`codQWStpb5|O>k%7!|0 zex~W5Kiz0%)jBaIA?7#t)^aWc|1fC4)t^p|kCX!{I|K0MoZE0*BC2O8ts-S=l7lzm zVOe*3}G}r z_oy|LxDc{|UC$imu&d;Y2<%yGTPP*q!)_E8TtsLN3v!&Z7XpbfvtR19oA0%nj}|D_ zs*}tGQ^78^3CQ)24G)wyf|du0PA+T(`}56S(*3}+Trhc@iF(GfebRrO=G_-RyPCGwnp&9?l{WQ4GUx7X|j3kYg`yQJi=17|f zjo77hMWTE?eL|z`6c?gGLVG+CwD$!0e8gU@gVkcnY;8@g9q%HCm5A$$i$=gt>$8=3 zeaU;6w1mRyOGM3|2lbMr*l<;aL;B(|QmuhHOvYw9gez>|ZgGW&P2b^!`0{APo#Fyn zcNd#8ALK!`G~-Lyr{w+{m?_G2q(rD0z`VKT^?l8QN`29}t#u0mt5I(3Alb8SHC%0G=Q%FyZmno+ zQ9C(Z`Vw|)W1Y}*q?s%CVIqiQ-c|tqg{Or>S@tpfSV0j1bd@G(reKs1O z9_rJ7c?(qTHIUg~?2%2@+SAlbbms37mAM6FMKa~ZdHHRpK*cm80G(fwlhR-A^V14t zc`JL|fIzR- z>-0NbAcT=BdW8rs&~fP;#3V{09BX8l_dwTZ$* zT)hfNKQc_-c>kT`bo1QdAsx*I5qIZP2YdsR(<_O_lFnYYHdrTFKgrzWCHWfc&PQg` zZDlFlNqsK7`-UW$E4YU_`nh|wR)^)t%~jvl)S0JAzAL>h!>1w7bwTPPH(S`D=PL`o zy}rk!4Gh}8Vlgc4CtrQOvmj&SShI*CWtK^P9dBIx#F!M^z;^c1aZp>pw3KY#B_Spc z)6rLlscx>@>JhNE4^9A6zEYozj1-4&m|o`vgwt8nb}L?K2)WSJVK*XY{M#7V1)keA zhwknUqt5bn(P-1y9*Vgy{=#ni<)&jjOC9UtCBoiRy**v1qgH6OQkQ| zOAjPV0@2NMJadurv((Wspxbv^>dDA<$6gGbU81frmdXML}o6ylaK_ItuR zmzIzq{FZXKhON z6r021C=toRxHZAtj(u4;?QsW+JkM~stm?5(ZSB~U+2;E$-HsA*g*%2JW2!tMN^qmK z`6;d~L%U%dPw1qW;KMSw)TgcA>y~>QiyZTW@Ub8e&)rznPb%Az>EhmVHnR*P)`D@* znqDdMHF)8%rJOVKD6Dv8zRJb=WOSGrpbY<=4fF(xwBWGhD@mNql&sj%tXyeo2N>;% zn<^X=1z!3{>T#UvZV-Ra=z_tI%-aN*MKP=V=r!>pgS!gR1Z5r|e4#t+(APu~uC!H&wNjUIbnuv8!^V;o+_ zHpRLdIbN4bI>sHmCFd!-u+f*wQdXr4bC*fUJIMi9h+a#h_1eOo{^A)y^7lb&uLIMK(ChK%#^aC2AofY^EB`+T46A-Q|pT}s$pN#leGn-d@ ztjaa_{1iIJ&@c+T1kg_T9w0ed>+$Fl`pa@efd!0?CSXVh758O9uU&E}ikf;MCb&C6 zMHPY(;01!(P^fXGO!u<0rjuV{yturXl7?Puli=hh_o2Jb@kI9zL(LDRKs&Fys~FqC z2J!BCfvR=OOXw(xS7#J}AjM^;cWbd)f+uVPyKVVk_Tobs55Qf$O+ae`;llZikjDsd z=gXBIqz|C}b4;!=#&4isdRZa`HXS*Uuw217Byi3OyopZ`cIQGrEO>rh?aq zUN~ZMm7wXd|7LDxu9Wz2nV3SWAu2XogQd)Duz1LIBt8k%H3%Cb>YZk8_gJC_Ui(Yx z{Q9hAcxBDHVBTk<{=~%R&+Y864Vkg`;XVyh-)_ujHg?x8v<`9a#&!)kA>5$5v6E9S z`eQdDuc7_Dtv*hDvzwcu8?DJ_RD9X6Hj>&Y_F!zX-X_>EY(DVJC^|$`7{ijk)xX1n zKwft+8(0)T9_Annlndi*FT zmpIHR!!yK1-yEvMaWNcl<$yIlc;QBR5Mo%#9xf~oh~qe1Dl0x@XEyN0!T}IG8wv`M zuh?H>SmTO_78q?(g4dF+TL7k1`5HQpfSGj+0xzu`{Jvn}A5JiCsIB%9wVRwM*&wrBC{f~6JA=o_i)nQ_An8ypR6D`Sts{8vU+4hVyt> z?BYy=;JDX@9zp{FyumhX!5Z3LjKu_LfF{(hc6R|EXp&~7*Uv5p)2G}B5POx^2ciZ9 zVjxVt;z5xsn0k$edQ}U2Q5*7)xQ@5B^B=QhQxh$I_mtE`i{D|OW?}tv-u#CqTKqYw zQ}d_&2?aH|;&&XV$rZoDKuxar9fp6Ib2tKjSeb6ZLEo|4&8-`E