From 92deaa2b1e4d2ac0fef297b254a76efa0beb43ec Mon Sep 17 00:00:00 2001 From: u8slvn Date: Sat, 24 Aug 2024 13:41:35 +0200 Subject: [PATCH] refactor: merge biome foreground and background image --- src/doggo/assets/landscape/00.png | Bin 0 -> 11698 bytes src/doggo/assets/landscape/00_bg.png | Bin 1602 -> 0 bytes src/doggo/assets/landscape/00_fg.png | Bin 6611 -> 0 bytes src/doggo/landscape.py | 18 +++++++++--------- src_assets/ground.aseprite | Bin 1888 -> 0 bytes tests/test_landscape.py | 4 +++- 6 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 src/doggo/assets/landscape/00.png delete mode 100644 src/doggo/assets/landscape/00_bg.png delete mode 100644 src/doggo/assets/landscape/00_fg.png delete mode 100644 src_assets/ground.aseprite diff --git a/src/doggo/assets/landscape/00.png b/src/doggo/assets/landscape/00.png new file mode 100644 index 0000000000000000000000000000000000000000..73ea6780d599177d899fa96e327b156ed3c54485 GIT binary patch literal 11698 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 literal 0 HcmV?d00001 diff --git a/src/doggo/assets/landscape/00_bg.png b/src/doggo/assets/landscape/00_bg.png deleted file mode 100644 index 3b54bc64d82e0824ac429e36f644e534e3991c02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1602 zcmeH|{Xf$Q0LQ;uB$DIKcDYKCx@Ddv?&h%)#UaBiuZ@K7#aOHuEA*htxa0DeOlf6? zSu-MgKv|t}R#dyhX!3A0lZUpQPPf0{UiSywFQ3=v_5S?!d3|25Pku;{-xh;!3;+Pw za@7BDC;&k4S|7e?qgEj|3zGq0qu$ZOK4E0M;!RI#l%wI5lRR2!NqSlkYTvgCEBa** z>h64CCkOb=3xh8DV*C-xoU*k3#7oE68-Osoc`FC(4gnAyV=|qLg=(R(Rf`rg>Fa_K3zG+1Nxpxc&|^gonzCI4hXyl+7S?tv z7LIM^!`xFyJyt8*R4I$KPOOHf774Y`NAN5)uHmC?7LS_)GJ0T&JwO^R(3);m0}L&Af(IdVGP(v*}n2w-(H?%hL2AP;aYL zeo9)#oHb?S4w={y-p%&`X_6D=l~nEch{(g#uYh9 z@yc7iUKGCoxDwGp*dK7;3_OxDmto1^s1e+htMtq#mLp$bh4-i#ds}VX6j|kL}(IbXwXS&fs52AxY1m3&ow(=gT5 z+6q?f`mAh*{ysuDDFtc81tQ`B-dr}9gdKPRn!Z|+hwI+$M%(u)JjHEvp|%deumQX*4&skBTS; z>xOkMqi92xxoXC843vQ@Hw>^xs=_OYr9OFVin9Yu$yDP5`=Ql|r#TO4`3~)}WDktv z<4x^U(g|m=JJ@$g?y@(or`4SrZ;oWOn2+zzxRZDlIo2@fR#CZ*rrY4*_UfVy+iE=v z%!1ckyPG(FZ~WY6q+y+zcVKu4s)OD8C%fdjWAI|I$Fc23w#SrX4XiBK}dCHvfBWVg&62`%zVnBIoFP9uwAxRK)XOu{m zvX$D7i{mf)$Ak$>7yOIaew#!1&mXya`Q~=bGVYU@$8+T_2UD9W0MQ#HdstR3_ptqN zd3uVi(aRengi+hEG5qG>3Ho`BpjqOr!=09QpoBN!016=XvNdN!< diff --git a/src/doggo/assets/landscape/00_fg.png b/src/doggo/assets/landscape/00_fg.png deleted file mode 100644 index f4c68135c54dca029489ecc0730bdaca7fe254db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6611 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 WWGc7HHRy>Rk8B7#Ewi@nJMurSD2wC( diff --git a/src/doggo/landscape.py b/src/doggo/landscape.py index 62158f2..d0251a1 100644 --- a/src/doggo/landscape.py +++ b/src/doggo/landscape.py @@ -9,6 +9,7 @@ from loguru import logger from doggo import ASSETS_PATH +from doggo.dog.body import SpriteSheet class Biome(IntEnum): @@ -28,11 +29,8 @@ def random(cls) -> Biome: class LandscapeLayer: """A layer of the landscape.""" - path = ASSETS_PATH.joinpath("landscape") - - 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() + def __init__(self, image: pg.Surface, topleft: tuple[int, int] = (0, 0)) -> None: + self.image = image self.rect = self.image.get_rect(topleft=topleft) def draw(self, screen: pg.Surface) -> None: @@ -43,9 +41,11 @@ def draw(self, screen: pg.Surface) -> None: class Landscape: """The landscape of the game.""" - bg_suffix = "_bg.png" - fg_suffix = "_fg.png" + path = ASSETS_PATH.joinpath("landscape") def __init__(self, biome: Biome) -> None: - self.background = LandscapeLayer(image=f"{biome:02d}{self.bg_suffix}") - self.foreground = LandscapeLayer(image=f"{biome:02d}{self.fg_suffix}") + asset_path = self.path.joinpath(f"{biome:02d}.png") + sprite_sheet = SpriteSheet(path=asset_path, columns=1, rows=2) + + self.background = LandscapeLayer(image=sprite_sheet.get_sprite((0, 1))) + self.foreground = LandscapeLayer(image=sprite_sheet.get_sprite((0, 0))) diff --git a/src_assets/ground.aseprite b/src_assets/ground.aseprite deleted file mode 100644 index 0ddd6ba3a74d2d09b959a4c6ba78c3a3146aaf0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1888 zcmcJLjWgQ`8pmT>wN&b+TCIlSdZk`=Nk}4Mg`}m6mvI8WD=!YUL`IWV~OzBsGK*{E&@z$!TwHZvTOMUS_`YJkQMMJ5Qt@2=t*^ z2NbSj1hNF_fIy(@`~AN-1Je041pQ$@{~z(;5D2urdhj##;6A`)zx6CXBY%gZ?dyY| z+@0AMf3$S*JclNtpap?$@&s$?PsHV(vYjn>IKHdZYMBkZ?DSkxTpT{oKl#sj^)Q$;D0(!ty`cD;JgU=)%%Hzqz#!o; zi%&?)1HUt&-Pd{`TvSR-q9yd)zHeR2|7^8i{P*h97w?oW;e`*)J&%EVLTA2o$o4$- zcio}@%P&n#jzV!TagOVStSeRQX;lY2D~Nh|Ep>AEDo+foL$G^$LablG>dDVF*$YHq zcah@Q-HkMNxm>$4C{(9V#q`mHwz&jqpiv_fs0QkeAh2P6J1=6TrDZgiB&sAiixxW9 z;aJ&ax;O#$T6AA{Ib1&8vpNvj|DmS$ZLB6$JkP2KE>9Z3x3aEo45hy~@SHQ=3F-0$ z^UM&g&b8%76I{7vJufYme#lyqICP-LM7W0&%(ZH zM&)s8j}zn-2`rzfDVOC&`%ckLBVcK=sF}#!iiy*0iY7li-5kN5GtKbbSx6&+i=_D$ zilt}v#gMimOv&!prkM0Trr^9iamqA9vpR~LUKGIIZJkuf6&-^=h6Jc$+UhxZwM=Q}yFq6)~-y8%Msi(Qa*MOC1 zZd?4O1N%YDNp~#mI-CFOs~M}9^?FZr-VC(Z(GXHk%a?TTZNnbt4&9QyA;|A==bcM@ zD9Ac@-bkYu+s3NeX)jV^e?*T*A=K_fOOvbYIKsEXE*?LNh`oWj!=kOGdPOAyoqqOb)(S z*r6&DKFao6F!$|-V9ju**7`QzlLn$x6h-qj)5(uVC2J~yMTFOM10&21IF^s2)#tWt zOd_=6NOU{>prRC!TSh}ll`efQOX-4hjTJH`rv-ywt_vBziQD^jYizinGVGr1iIViz z(w`fl;FkEtAU5q~EYo33Od~{FS3E_}t(4PB1Yr^1+*8lKUL@Gi3*CRbnA0h2zi*{- zSvM&1s0-q!{i43Q{t|9(qVM>2*E$2QjcbdhogBH-JNj`lrb%hV>16;v1dKwEXw8FIT(3Mu3@MSgVUb%S*U%f+2+_m|B4aGHQ^0HYx*1Bg2EW?C zV@NI&Y%~9EeyRIWN8jRjy%yp?szK;Xr$!y+-J7+O`z5QeSp)!P*JZpMj6 zZxwB_lA!JoOq-#%x^0mj%r;Bni+-D$Z9y%Y|1FB{ZX>eYqiQtMuO`F-)rs29l3( zUHRM0@P_5HxW|VGUc52N-6wsMMF2l{M=N6RY{!S3ZM8KvlK|H%KTx^u@)#!ro%sAf%go%TI!ubjEh{&jzti@En<=+dtRJ z!EgI3grWd6$M7;*3^&!>?*Y$(1NDmoy!%20_KjJovdy&6tOYn3OX0#>(hpm_o=wwl z$_c2>4K%iWe&t@i(G!UQoj_+Ahf)SODhH&Jv+<}ke1r0GN!Jz&F{?OKuDL>l@7gaS pw`C)H8F%hE$0|i+(Z{n%)T)O>aD8VjUFgZ=FYz_Hhdp6~{{|_Ahz