From e061f6c9b2530270a2ea03cfc1cde5898394cca8 Mon Sep 17 00:00:00 2001 From: u8slvn Date: Tue, 20 Aug 2024 09:50:12 +0200 Subject: [PATCH] refactor: landscape topleft standardization --- src/doggo/assets/landscape/00_fg.png | Bin 2284 -> 6611 bytes src/doggo/landscape.py | 11 +++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/doggo/assets/landscape/00_fg.png b/src/doggo/assets/landscape/00_fg.png index 7086e8515ada1968af98777de44edb3b20cedc8c..f4c68135c54dca029489ecc0730bdaca7fe254db 100644 GIT binary patch literal 6611 zcmeHKdpMK-`(HXZR8)+)W$y+xxlSulx1B@7Mdj-`De;w%=*B zQc6(@0)ecwv9{a|fh^h!j>!_sz~5TFD**mg?00l!?IvqAVGR~q{@P#@6eQ=dTsmCGd7Vchn;i&UQYN#C zBCbwQ&>THvbAu2iUOCI6z^HqUdByHpk)G`>^4<`fNGdWfPWNYa3QZa*uLD8eZZ?WS3{?Xg=_qHf z?lVT>4(aL8oBPNOV~@phTnD@hBi)+qPg72*M(`XSnD^#B3XQz`N9J9j>E!bArL;}u z>?6V#WGLO4ym+;3@(u{S?uyhrI)`LGwClw{2x6MYu_x>%`(1HBJME^ zDc@B@wvLv&-j9?&Jgzr&(*(s@{wcGNpFbWn1tH%~f3NiR?W(m%2VqfVu|+$7_Q1{d zPMKR(!6oO*)8xUz3!#Dq=4xk)CoyQcL^8u0(B;ws!ODX`Ow74~M3O(if_VcJD%})5 zQd|m$QOTxo7kxXFU7!WvOSRq~4D8vz(~-2_pM)dB&CR4txOk9&2C#@QE-ir0#B)vI z^SpR)EHWeEuz3i}-xTg@XAiSr1OqUvE>;(XAaJQ67`T}f%p{oXgWqkr?JEU%XA1Xa zu>$c(B!|P%<>=`$f+Nk=O3|ticK^#pU#hgfbQRUe?ouDeI5*=?CkKC3=&%uo{gm`T(mx(%pg(8 z`1v7#1+YW_i$mz)$XEn8G(;GA`(P1h1AR0R2VijC-g-Y!+0dCRBAoC2MJD05F@kACa673qA_YJO(kb&3BEj)n z>}^cp7~KWvyv06%$npUlz#gE|$qWwjAFv~p2JB%GMS7wQF<7)7&d9(}U*8B+;2)4P z5X=N?QN)Ty>FOEG&xke#52gc3OB7WqNHA{)v%y;g14I@h*pa~qFolakfQdZ6PuqbF zMJBR{mP8f+lAF_HCd$S#Q2u23G#pGVKNW+;fMkK7Hr_r1)hY+ z??>TRy}(%ilh@aM_)jhYgZ*CQm-PKD*KfIgNr7Ji|E{jza{ZD5zXbkWUH@-#N&WLO z1<=7KAP)GdbY4ez4t&j8=Dowp67og#xz10E11*w))^1D)WVx*9y9jb6aV=;RXW7^h z#QP-V#C4Py4J!_VurM3TEsoq4L4s+F2SNTsdS*eQwm2{`gMCwtYT{=u&u`h8WZb<(NbYg2v2f^!koHN=JD8cs*A*-9N2StJTT=wDDQzn0Q)uN9Up93o^zb0}}_vhWXjq zC99K9*4U_wT#IpOm62Xkso373ceFx1iF0<1)`;VQBt_(ogGyCyt1NBaNOr_0cRO^w z>y4}7Ya490|G*q!#0VeMh;>d0Rm|r$$<5;Gy4#tPCdL;O;%^ygdA+&++^CqjI)c?x z=Qm_)qGb+rz3rZv6Z%G>g-n+qpX~gCJB7{_948&8;hIu`X?Tr+{D-y~JvqIQ5=P3X zV}pD%iO|NUIhMFh+XlHDr_4v3fgU;&e%K&%DBt-!f6;^Kp^Hswz3S;=kJL_ZPVl{O zDA@qUC5>A%dgpyz8eKMVpsrf?9k083aowkm2{!JPx4l|xDL9g`c4q;nPWpBJ^!Ow< ze|F!Yt5B%Y9*4u9nlulO8=P5VK6u~hUG7!j)#u4$F;}Ej7+SZ(qPML}tJW)hRuxe# z#~r*_bz!^G5PPq3ikR|b1~Y79c>ALasbkegbzbv&r`kH(@RJkOk+;`0PmbGOyNqgv zI4kEKyR(&eG=1Pga<3!vso7XEAb5AwY;ZG;^U~AG@P0I>&TGtKQ;YMfWbfEbyIyUW z7~T#Q-&C+G$+Y9kc)1m_VPiGENuzM+(rdG;l5OsIPMD434WKfB8v ziccD;zUHhPUz1|ujK1;YQc?NMR;7Li{X#9a>kJ>zPetERiksAN^*^})Kuh&hGb9PSjmA8IT+BbeOmJe|{ zO-cWI#fQn}h``zdphA`R^|o$!x`Ir=4BGcndb{(S7KOcVGuBAZ$lzKUVEhX|; z=ge5^Ax}5-)gwLX6CdlJg(=)v@xE^0{GQwcVX4BT+Yy7sie5m<=qz3^Q@rydfyZo5 z%5Kuxf6Y~6PuB;YtLgQp6aeqMFYO?v;$n%S1(b$2>(TotX(+y0LA zpZxR2GoKvDi`-r8W!#DT@c#Xo-ESMSG_|6cGu68i7!RiY<^^|P-_|6Qs;sqMn#a!I ztFMU<&AvM15l}$*+;m{n#XDqhHg0y-Z7ap|WNA3TBz$VJ;_zMmS&am?rIunb^Yw+L z1@|&@?Fv$3yf;_GPjzIs#z5J-<44j};{(P?6&uHP$hY#iyAr035WCHu-PUSKPPsNz z1z+<@$2onSt@HV`B>Wk7tAlADrwXSYy?DA!S13$vkJUkLsWSq9M!G02k7rPamnfy6) z!{1{gA$Q%zZ$+?Q5uJ}CBbGZ=rC$tpN^9wF#=p>p!XU{8#eL6qiUPy5)Afh*NwJw zUgd;X@*8p}#x1y$pQ2o7Cwa$j_w1$wH`Y1Ku+z5);%XTy(>HSC1l)o%quyQXZY`-_ zCLAbmkWADvacauIm(#sj#@7b`Uy8fCBqi^?Q>9b$u}<6fk`=Yp~>OM3=?stJ`$5S-UQ7LD zM|BOY8`ZTt;3vt9qWE_y^i*xR^xFQCO9}pk(PK_lFFzB6&PB3kopM9GB5q0FVAjf4 z*lohBYtqEQpphW9)0lkU8pIq?w^27koFH0Bm WWGc7HHRy>Rk8B7#Ewi@nJMurSD2wC( literal 2284 zcmVPx-rb$FWRCt{2TRm@8M-ZK7SxVvBqKP5{g^?&CMIjXU2T(>l2}I-Kz4m|K{JT-!roLu1B;s z>xaO((a(_{YJBzkN)GQweede6e51y9#wh(A9XogRJUH4N&6)45M*HsANXh27%noIuIB0a7MmUbsFYo7aIN57sBsJwrt(zV6{-bMS4n4imwze|;<0MLoBc zZ{>O@i%BIaj>;Dpml@`JtB|B4e^#>9&yLDZ898vAA1*e{%m&?6oZ(os1?E~6-&L_h zIk?aH-fC?Q?-^skb>lS@Ja*W(kv!G3MfOmrIM8)f@rL$sa#w|CcJ1k-Gv6F00dL3! zIdCkJG8^F8y^m|kv9c;4FfrH}IA1w1BWyMdBU(d|b|lN8lDi5lvvF{-ZoZBRM)yRpG+U5`jM8 zgy+3PU7<>9&QS$LZY)>DG3ww1kA87P<8a68PE{o9KYQ|c!ej!F9I}K!qQKy)x}|8HN|)?+Oj>9U4*IME#qOlLkIo)_ z9rS}5gFsS?iba+@X1YV*?n)I0MYgZsyd3`f_{E1%W`-=eP$t?ZlcV;R9f6UYGGxiA zl9}gJdPnjW`}1M%ReYO`3mxaXL&aNU^C*v1Oeh)78`*f}-%b;N$O?0W%M=8hw?@1^ zI1Ap$z-E?`Wz_9B?k_(N!R$Xr$?Nl&e7IwuLUgJKAef}PMqVLq2t|!Y>U28YyImf5WiE=sPlBpebR1h$)mB0Mk zX4V~WvY-=g-@0=lV0mt2CZH+k<2}B6e*!;kjO2EUtm{%i*~r(x zqM@#Dsz;x0e7X*c{kbid<1RG1l8JJrD-Y$GUBo%dcO9Ilun4gZ87J`fj(yY~J>IL+ z(iEs7!rvWLhpk9g*&x$@_S=)+&yY-=kXXUv7axW$g5mS{N+H`Q&&BcTcR1b+z+DYj z*+@R`6ZQAGxCaF;Qk`+GFCVY{+d3(or{RaXGGX5`x}2N`a2 z-aG2VIxz6$z&=#IQ)A4=MU(f4^QOi-!*ffWeodLu7=vbV?@HKocD(jogj;K7I$zPG#jq5wZ{4Alfu7k%&)D{SxVd-=h;uR+QaOoyJXp$=8XOb>+ffR_B55K@|@y z8rA-0ckldA{tpyYf*^r>b$262VabOXsbig>}_0(f(m0MAxk(~-zM(5sEH4&-<=k=AZl)o8npV8x5 zh7N(c;O-jAnVmqvaU9Ii!-Au_GPx|O>W|2-LCmz?YQJVW7%>6V@xKEMDD-Jn%@I*7 zbRHnOC#MVK^3)=ZeB&e|}E9Q~z9pgDP4)TO%4jmG~kua`4e|`TU@DWrA}$-~f*j zrbB|!vAsh+)iJNKSNEQ-ON3FfMt@Qky^uSm6z(ZUUbDFHMppowV4WE56z8aW?2wtd zmdT16>swv>C{kq^oxA-Gsu=68!`*k(u~tA*%{un%MC&@Fcf4lfI}Py(d~e$$52OhtgVQX zW%3mOKfXEmu2bC?NAaHN?x-GK9i8JjAAQyPMfE3QN>?sGD5J_N))RG6sA8BV^t8*T@6Ll>JrqnmvB_;H=YXM|V=4pvczCUI4S8$X>dY;iGPak^QMl z2bhf2!<^aqUM}N&vvEh#^+on7-3iDlS-X!SD6=}AMudcODw5%~lQPvSwA8+&+Ts4J@v|L%3t7Q`}!9$Uk}F(EK~;o0000 None: + def __init__(self, image: str, topleft: tuple[int, int] = (0, 0)) -> None: image_path = self.path.joinpath(image) self.image = pg.image.load(image_path).convert_alpha() self.rect = self.image.get_rect(topleft=topleft) @@ -48,9 +47,5 @@ class Landscape: fg_suffix = "_fg.png" def __init__(self, biome: Biome) -> None: - self.background = LandscapeLayer( - topleft=(0, 0), image=f"{biome:02d}{self.bg_suffix}" - ) - self.foreground = LandscapeLayer( - topleft=(0, config.WORLD_GROUND), image=f"{biome:02d}{self.fg_suffix}" - ) + self.background = LandscapeLayer(image=f"{biome:02d}{self.bg_suffix}") + self.foreground = LandscapeLayer(image=f"{biome:02d}{self.fg_suffix}")