From 990c8a1ec4be3fabc4e5155f77f50aac7022367b Mon Sep 17 00:00:00 2001 From: EKNr1 Date: Sat, 18 Nov 2023 12:47:54 +0100 Subject: [PATCH 1/6] Added Icon. --- textures/icon.png | Bin 0 -> 1961 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 textures/icon.png diff --git a/textures/icon.png b/textures/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..787f1b91c2c8e8f3215ac85dbb7ab3d93f7f56ba GIT binary patch literal 1961 zcmV;a2UhrrP)1&h5S~4(5dkWEfU5vk-xcZn4p$g*ae09&d=KHul`B6) zQsf16g#{ORhjb})wSiOyl0tw28{ieo;SPs0$oPVY>as2aLAA9n6EQ=t5S_REQ01@u8Zm0kL;UQR! zE2!b>WCrIqTWp`z>}6etKL7i3QcEIXC-KrQErL_7p?$)#u3=f%@c!YU!b@sw(QG7v z??)VOLTJq6I{tqQj7fw<;BFmXq+Q?sgB8$(4*+m}vxRqW-()*OH=^}5LH7`mU~DoB zC4w&a+eO-Vz~ryb4gnx&Zq6h|_q;%(@t74515xi*rUGsWK>B|O`Z~n0Xkjw*RPf1n zn-#b{V8b$$)1sIteKx+jE2_};@XhQevS&V~9=xPxX?T7h7Cc%h6 zl6b3NvL>e=e*gf$@1GwqrjV>a=+Ar1ifX_|vhnawoMFbK60DS%Sb80SOZ|GzZ29aR1qW=YLTYUHq04*8lCAka9 zDsXLQSM)528FD0;wlx6Y>p2)!BE%AzF92r8%~ir?Rh%>>1Nfp*rj8IH7x{ZsT+6Rc zX5j*OLL}HBEUqDT2^LGB2%foxNYY3K_d$*UxLe2se&W#QH(Pgg0`Ttb8~FO|XSgv@ z66jhmI|kT(8GS%gjF6B3Edig9KmZ{o2#dX}>&OM5u#pr9N`m`O8&fSoKy`kzbpTtf zMlgk)*yc-?A%rzNy4cx7N<>H}D!BtjfSm9-kPPUn0UE(08IT0`pElvX_xpVWSAl;g zZW;E3WIZLJ_%|kbq69C@7(%n}8DF;O}|!!Ka2#2yxv- za<6_JalMfc9g0SSc1&|bNCQMfo&?s3Q~<57KmGV4vI_qm9E8t*-QNexa5{_x!5Zud zF#(P)#I*x}cztQ%tq_w@qIenfB1G0AsMdg?2MGeu&oArRQSAq42!I$!fB>2)?87~T zHKhJs3a06I^F`W*ufISLciZ;Wwc2PaC`s19!;@fepydg{D@wc>Ed=!{t4h|uZ&_RW zv*fkuyYL2rZx`JF5@JW$0%B^L?_3a?nWKcTk|7ADhZTr~TJqao8`ErS`vtW%G}Xq4 zh{Cf4LouoA9>mm$z>(7|$Npk_wXKvk8r(xtTF+|pd;#tjp!#hU{tr;9t3cm@wC}sS z*e8=H69KD;0I_KrR^qgrWOl;mh!~kbNkmgPqE*IZU!j=S3)-9tF|#&;kXoWy%E$hm zLD=I3iz7oduV_k>2htqdC0gPGD~z($VvNvV>3+1>^F^!Wj09#O#*kCW*mZ~)5}a!o zn+TFXgBIuZ)I;M;?wkl4tyO06X@c_HhzOwUuZSez#47L2>>aikA*Urd?UE{FEsD&KwA)}l_p+b` zA!Z3-BY>_HJpxe}sg6*Ik-8Q6iK}r%3Ay&Bz8JBK&(J*rk5aawxi&8RVw-L!!J;)K zDRq$y_N)N|E9=DcT}ktix1?Q{V3F28ggGQ_5!x6eKC%Rafeg3MJm=>kroU|LvX8fXSIkdMHF}3(ydP z5*m+|7wQ@G9eN|)b7+5BaJy&%S%GNQxT&8-pe&c}l#bxD6WBlL|spcnHv#gw_^(owC>}FwkE;x1GNZ3 znrIS2$vIhU;rY_;qksyy@)QUgJ)9#u$FP%P-5U$g_7=v1eec4Tg%u%*H49Z^NjaMw zys_+=Gf>AlkZ0=m_nn%E)hRIHa2OnDbe+8a|p zn36-^m(P;`J0EYWH&~;BOHqHRHE?_ro-z@7Lp)F_`|2@;Flp;M>B;Q~E-AbW_-)2> v!HaoO0x=DKsRTg0xEF?DLFOx7@x1XrPL%ZQ-69hO00000NkvXXu0mjfbpwO( literal 0 HcmV?d00001 From b61d5406d4c8537c0e9390938cf1d1a7a995e2d5 Mon Sep 17 00:00:00 2001 From: EKNr1 Date: Sat, 18 Nov 2023 13:01:55 +0100 Subject: [PATCH 2/6] Added the icon to the window. --- cowyeet.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cowyeet.py b/cowyeet.py index 8860e02..3844f60 100644 --- a/cowyeet.py +++ b/cowyeet.py @@ -84,6 +84,7 @@ stone_block_texture = load_block_texture("textures/terrain/stone_01.png") dirt_block_texture = load_block_texture("textures/terrain/dirt_01.png") grass_block_texture = load_block_texture("textures/terrain/grass_01.png") rock_block_texture = load_block_texture("textures/terrain/rock_01.png") +icon_texture = load_texture("textures/icon.png") # coordinate calculations @@ -142,8 +143,7 @@ def load_level(lvl): lvl_width, lvl_height = level_data.level_size - level_surface = pygame.Surface((lvl_width * 40 * settings["level_size_multiplier"], lvl_height * 40 * settings["level_size_multiplier"])) - level_surface.fill(summer_sky) + level_surface = pygame.Surface((lvl_width * 40 * settings["level_size_multiplier"], lvl_height * 40 * settings["level_size_multiplier"]), pygame.SRCALPHA, 32) x = 0 y = 0 @@ -180,7 +180,6 @@ def blit_block(block, position: tuple): level_surface.blit(texture_not_found, position) - def main_menu_page(): buttons[start_button].blit() @@ -192,6 +191,7 @@ def level_selector_page(): def ingame_page(): + screen.fill(summer_sky) screen.blit(level_surface, (0, screen.get_height() - level_surface.get_height())) @@ -277,6 +277,7 @@ def loop(): screen = pygame.display.set_mode(settings["win_size"], flags=pygame.RESIZABLE) window_size_reload(settings["win_size"]) +pygame.display.set_icon(icon_texture) screen.fill(nero) pygame.display.update() From c78b73976a481358db5a7c6673599745719de283 Mon Sep 17 00:00:00 2001 From: EKNr1 Date: Sun, 19 Nov 2023 14:31:16 +0100 Subject: [PATCH 3/6] Added big icon to main menu, Added small icon. --- cowyeet.py | 6 +++++- textures/icon.png | Bin 1961 -> 913 bytes textures/icon_full.png | Bin 0 -> 1961 bytes 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 textures/icon_full.png diff --git a/cowyeet.py b/cowyeet.py index 3844f60..517cc70 100644 --- a/cowyeet.py +++ b/cowyeet.py @@ -80,11 +80,14 @@ def load_block_texture(path: str): return pygame.transform.scale(texture, (40 * settings["level_size_multiplier"], 40 * settings["level_size_multiplier"])) +icon_texture = load_texture("textures/icon.png") +full_icon_texture = load_texture("textures/icon_full.png") +full_icon_texture = pygame.transform.scale(full_icon_texture, (260, 90)) stone_block_texture = load_block_texture("textures/terrain/stone_01.png") dirt_block_texture = load_block_texture("textures/terrain/dirt_01.png") grass_block_texture = load_block_texture("textures/terrain/grass_01.png") rock_block_texture = load_block_texture("textures/terrain/rock_01.png") -icon_texture = load_texture("textures/icon.png") + # coordinate calculations @@ -181,6 +184,7 @@ def blit_block(block, position: tuple): def main_menu_page(): + screen.blit(full_icon_texture, (center_x(full_icon_texture.get_width()), 128)) buttons[start_button].blit() diff --git a/textures/icon.png b/textures/icon.png index 787f1b91c2c8e8f3215ac85dbb7ab3d93f7f56ba..afc07d9aba29a4db5665900c59c4b404b4057cd3 100644 GIT binary patch literal 913 zcmV;C18)3@P)Nkl-uyid&*3XDNyF9udtSm(3u6b+rNd$?=j1a(B9xrPr+j z0!iVQjE4*|S8qqtAgh?bpB6w~YMZQbPhoXHl z8lrVXW~m5?U;>iSCgSgMJ&}JC5!GN<3*tnsZ$e}+HIv5BlRRA>rjIWH?vCVQb+rm) z%ogQ2z^)+^A+SbWZITPB5?RU;LtWZ*LM7EjOGi%T8UnHkeM@%ZJ&VwQgplOC_b8|`%lfHrkfe;OQI#=4pbKr*868=04jvupB$buml^E)?FzoWe_+2| zSz>|W5_r4&#vXQWWy)wljQL^P4MzhcXd|48OYm{UVV6BVAaX6sAiyk)p}YpX-Jv+_ zvRv8U%(R%200$%Ef}2RUKbcT@iI$8@HY@$kNg@U->A3bIOP)01?e3c2ZIPv|kwP*? zp60ZVU^uu>YvesLxzH?93~?tJn6W_h$XL+yvRrErnW-QGy;on{F*2muj)Ae#Z=tm; zb3)wHM5{d!DX2AR_sa2}YG$kC%;#~fMXlnU*CGddV`H6!B! zwoe4WWfh6%q3r-dL_oO;cWQ*K9imw+`OunI?P8yq9eZ@VP;=_QK+ zOCJ}sfhrjboCra?g%u>;K4{i7EdT(y1uRk`mXiDIu}J{f`;j0uixvg|dal+}C}xdR n7dsSQ-{~$u9l@W(6x)OU5UMm=MrfJ$00000NkvXXu0mjf0C}FO literal 1961 zcmV;a2UhrrP)1&h5S~4(5dkWEfU5vk-xcZn4p$g*ae09&d=KHul`B6) zQsf16g#{ORhjb})wSiOyl0tw28{ieo;SPs0$oPVY>as2aLAA9n6EQ=t5S_REQ01@u8Zm0kL;UQR! zE2!b>WCrIqTWp`z>}6etKL7i3QcEIXC-KrQErL_7p?$)#u3=f%@c!YU!b@sw(QG7v z??)VOLTJq6I{tqQj7fw<;BFmXq+Q?sgB8$(4*+m}vxRqW-()*OH=^}5LH7`mU~DoB zC4w&a+eO-Vz~ryb4gnx&Zq6h|_q;%(@t74515xi*rUGsWK>B|O`Z~n0Xkjw*RPf1n zn-#b{V8b$$)1sIteKx+jE2_};@XhQevS&V~9=xPxX?T7h7Cc%h6 zl6b3NvL>e=e*gf$@1GwqrjV>a=+Ar1ifX_|vhnawoMFbK60DS%Sb80SOZ|GzZ29aR1qW=YLTYUHq04*8lCAka9 zDsXLQSM)528FD0;wlx6Y>p2)!BE%AzF92r8%~ir?Rh%>>1Nfp*rj8IH7x{ZsT+6Rc zX5j*OLL}HBEUqDT2^LGB2%foxNYY3K_d$*UxLe2se&W#QH(Pgg0`Ttb8~FO|XSgv@ z66jhmI|kT(8GS%gjF6B3Edig9KmZ{o2#dX}>&OM5u#pr9N`m`O8&fSoKy`kzbpTtf zMlgk)*yc-?A%rzNy4cx7N<>H}D!BtjfSm9-kPPUn0UE(08IT0`pElvX_xpVWSAl;g zZW;E3WIZLJ_%|kbq69C@7(%n}8DF;O}|!!Ka2#2yxv- za<6_JalMfc9g0SSc1&|bNCQMfo&?s3Q~<57KmGV4vI_qm9E8t*-QNexa5{_x!5Zud zF#(P)#I*x}cztQ%tq_w@qIenfB1G0AsMdg?2MGeu&oArRQSAq42!I$!fB>2)?87~T zHKhJs3a06I^F`W*ufISLciZ;Wwc2PaC`s19!;@fepydg{D@wc>Ed=!{t4h|uZ&_RW zv*fkuyYL2rZx`JF5@JW$0%B^L?_3a?nWKcTk|7ADhZTr~TJqao8`ErS`vtW%G}Xq4 zh{Cf4LouoA9>mm$z>(7|$Npk_wXKvk8r(xtTF+|pd;#tjp!#hU{tr;9t3cm@wC}sS z*e8=H69KD;0I_KrR^qgrWOl;mh!~kbNkmgPqE*IZU!j=S3)-9tF|#&;kXoWy%E$hm zLD=I3iz7oduV_k>2htqdC0gPGD~z($VvNvV>3+1>^F^!Wj09#O#*kCW*mZ~)5}a!o zn+TFXgBIuZ)I;M;?wkl4tyO06X@c_HhzOwUuZSez#47L2>>aikA*Urd?UE{FEsD&KwA)}l_p+b` zA!Z3-BY>_HJpxe}sg6*Ik-8Q6iK}r%3Ay&Bz8JBK&(J*rk5aawxi&8RVw-L!!J;)K zDRq$y_N)N|E9=DcT}ktix1?Q{V3F28ggGQ_5!x6eKC%Rafeg3MJm=>kroU|LvX8fXSIkdMHF}3(ydP z5*m+|7wQ@G9eN|)b7+5BaJy&%S%GNQxT&8-pe&c}l#bxD6WBlL|spcnHv#gw_^(owC>}FwkE;x1GNZ3 znrIS2$vIhU;rY_;qksyy@)QUgJ)9#u$FP%P-5U$g_7=v1eec4Tg%u%*H49Z^NjaMw zys_+=Gf>AlkZ0=m_nn%E)hRIHa2OnDbe+8a|p zn36-^m(P;`J0EYWH&~;BOHqHRHE?_ro-z@7Lp)F_`|2@;Flp;M>B;Q~E-AbW_-)2> v!HaoO0x=DKsRTg0xEF?DLFOx7@x1XrPL%ZQ-69hO00000NkvXXu0mjfbpwO( diff --git a/textures/icon_full.png b/textures/icon_full.png new file mode 100644 index 0000000000000000000000000000000000000000..787f1b91c2c8e8f3215ac85dbb7ab3d93f7f56ba GIT binary patch literal 1961 zcmV;a2UhrrP)1&h5S~4(5dkWEfU5vk-xcZn4p$g*ae09&d=KHul`B6) zQsf16g#{ORhjb})wSiOyl0tw28{ieo;SPs0$oPVY>as2aLAA9n6EQ=t5S_REQ01@u8Zm0kL;UQR! zE2!b>WCrIqTWp`z>}6etKL7i3QcEIXC-KrQErL_7p?$)#u3=f%@c!YU!b@sw(QG7v z??)VOLTJq6I{tqQj7fw<;BFmXq+Q?sgB8$(4*+m}vxRqW-()*OH=^}5LH7`mU~DoB zC4w&a+eO-Vz~ryb4gnx&Zq6h|_q;%(@t74515xi*rUGsWK>B|O`Z~n0Xkjw*RPf1n zn-#b{V8b$$)1sIteKx+jE2_};@XhQevS&V~9=xPxX?T7h7Cc%h6 zl6b3NvL>e=e*gf$@1GwqrjV>a=+Ar1ifX_|vhnawoMFbK60DS%Sb80SOZ|GzZ29aR1qW=YLTYUHq04*8lCAka9 zDsXLQSM)528FD0;wlx6Y>p2)!BE%AzF92r8%~ir?Rh%>>1Nfp*rj8IH7x{ZsT+6Rc zX5j*OLL}HBEUqDT2^LGB2%foxNYY3K_d$*UxLe2se&W#QH(Pgg0`Ttb8~FO|XSgv@ z66jhmI|kT(8GS%gjF6B3Edig9KmZ{o2#dX}>&OM5u#pr9N`m`O8&fSoKy`kzbpTtf zMlgk)*yc-?A%rzNy4cx7N<>H}D!BtjfSm9-kPPUn0UE(08IT0`pElvX_xpVWSAl;g zZW;E3WIZLJ_%|kbq69C@7(%n}8DF;O}|!!Ka2#2yxv- za<6_JalMfc9g0SSc1&|bNCQMfo&?s3Q~<57KmGV4vI_qm9E8t*-QNexa5{_x!5Zud zF#(P)#I*x}cztQ%tq_w@qIenfB1G0AsMdg?2MGeu&oArRQSAq42!I$!fB>2)?87~T zHKhJs3a06I^F`W*ufISLciZ;Wwc2PaC`s19!;@fepydg{D@wc>Ed=!{t4h|uZ&_RW zv*fkuyYL2rZx`JF5@JW$0%B^L?_3a?nWKcTk|7ADhZTr~TJqao8`ErS`vtW%G}Xq4 zh{Cf4LouoA9>mm$z>(7|$Npk_wXKvk8r(xtTF+|pd;#tjp!#hU{tr;9t3cm@wC}sS z*e8=H69KD;0I_KrR^qgrWOl;mh!~kbNkmgPqE*IZU!j=S3)-9tF|#&;kXoWy%E$hm zLD=I3iz7oduV_k>2htqdC0gPGD~z($VvNvV>3+1>^F^!Wj09#O#*kCW*mZ~)5}a!o zn+TFXgBIuZ)I;M;?wkl4tyO06X@c_HhzOwUuZSez#47L2>>aikA*Urd?UE{FEsD&KwA)}l_p+b` zA!Z3-BY>_HJpxe}sg6*Ik-8Q6iK}r%3Ay&Bz8JBK&(J*rk5aawxi&8RVw-L!!J;)K zDRq$y_N)N|E9=DcT}ktix1?Q{V3F28ggGQ_5!x6eKC%Rafeg3MJm=>kroU|LvX8fXSIkdMHF}3(ydP z5*m+|7wQ@G9eN|)b7+5BaJy&%S%GNQxT&8-pe&c}l#bxD6WBlL|spcnHv#gw_^(owC>}FwkE;x1GNZ3 znrIS2$vIhU;rY_;qksyy@)QUgJ)9#u$FP%P-5U$g_7=v1eec4Tg%u%*H49Z^NjaMw zys_+=Gf>AlkZ0=m_nn%E)hRIHa2OnDbe+8a|p zn36-^m(P;`J0EYWH&~;BOHqHRHE?_ro-z@7Lp)F_`|2@;Flp;M>B;Q~E-AbW_-)2> v!HaoO0x=DKsRTg0xEF?DLFOx7@x1XrPL%ZQ-69hO00000NkvXXu0mjfbpwO( literal 0 HcmV?d00001 From 842be84d1f82e00b5fbe3185130ea5308a717c99 Mon Sep 17 00:00:00 2001 From: EKNr1 Date: Sun, 19 Nov 2023 14:33:39 +0100 Subject: [PATCH 4/6] Removed one debug print. --- cowyeet.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cowyeet.py b/cowyeet.py index 517cc70..e723522 100644 --- a/cowyeet.py +++ b/cowyeet.py @@ -157,7 +157,6 @@ def load_level(lvl): for block in row: rx = x * 40 * settings["level_size_multiplier"] ry = y * 40 * settings["level_size_multiplier"] - print(block) blit_block(block, (rx, ry)) x += 1 From f45c7cf98e3f2c5ac92763760d048eafe4dfa065 Mon Sep 17 00:00:00 2001 From: EKNr1 Date: Sun, 19 Nov 2023 16:02:56 +0100 Subject: [PATCH 5/6] Added some catapult textures. --- textures/catapult/arm.png | Bin 868 -> 6943 bytes textures/catapult/frame.png | Bin 0 -> 963 bytes textures/gimp/catapult/arm.xcf | Bin 2358 -> 2894 bytes textures/gimp/catapult/frame.xcf | Bin 0 -> 3159 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 textures/catapult/frame.png create mode 100644 textures/gimp/catapult/frame.xcf diff --git a/textures/catapult/arm.png b/textures/catapult/arm.png index c43cea8671b8b8ae607cb18be3affda9a644210c..cade2486cee366870b4d8c36e3d3961859e175aa 100644 GIT binary patch literal 6943 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 IW?m=$0~YH#bpQYW delta 765 zcmVEX>4Tx04R}tkv&MmKp2MKrb+0Yt2!cN#t}afBE>hxm zNufoIcO3Wd-uJ%TeFq5jGE>ctaX{59BNdN{ne3_)dxJaL#j3Jp2QWKS?f`TqQ7aET94vlH&*egWtV1^OF;9QZNQ|zS#E1 zFc8=U8a3PgKDO<~3E+PQuC$iFQU_)}Nw2lE$Pv)D4P0EeGarywHsaJ^`;NTD#DNy#h#}d1{+WYozO|ySLj)row*a}XG zlWG|<2n!T21=C0VT9c$1D1SRiL_t(o!|j+c4udcZMSrR&uoQ{0XXx1bAE9H<01^XI zx)7Fjs9dGNNhuh*#0SX3&Uf@bK%y?^)8leJJ+QKL>~H`miV_l~Ie^sRREHR#t_rjdE^ygQQ?=C(aEZ*ncJ)PtQqR8MK|< zM_t!jqw=0)NQPuchGa;FWXRtjI_A6DPR@6!ZxN16-WqG9xClof$hWD^4U0iKm9RM2 zqKoH(C}*~dqQug;ec-;D3^#$+X2}0YxULL(D|;s&>WYnpM!3}JYc9scIv|0N0OrDG zFQeZn!RIcjiv7ItM^Y1h00&Efewu9x7Ix*2RR01A5AapkTTH?%E%2&5=y&!4jgvcU vI}0VTZ2k&_3KfHJFS#!WCHZ`C$^?KXQpmoI=5Gpg00000NkvXXu0mjfp3-JM diff --git a/textures/catapult/frame.png b/textures/catapult/frame.png new file mode 100644 index 0000000000000000000000000000000000000000..a271ffae6579f16b37e2174ba707d1449aa0b1a4 GIT binary patch literal 963 zcmV;!13dhRP)EX>4Tx04R}tkv&MmKpe$iQ>CI+hjtKgh)|s@h>AFB6^c+H)C#RSm|Xe=O&XFG z7e~Rh;NZt%)xpJCR|i)?5c~jfb#YR3krMxx6k5c1aNLh~_a1le0HI!Dn$f_we!cF3PjK&;2=i)vUz;pGZ8*46{PKK|H-# zF*xrNhgm^ZiO-40Ou8WPBi9v|-#F(T7IZL1yduQB95q&z6mk{8 z$gzMjG{}x0{11M2Yvm><+@xR(=zOv5j}aiS3p8rB{e5iPjT6BC3|#3gf4L6Ke3D*k zX^|tKe;c^CZfVLMaJd5vJQ=bnJCdKKkjnw@XY@@OAao0KuerT7_i_3Fq^PUJ4RCM> zjOHnO-Q(R|?Y;ebrrF;QIm~j9D{)9600006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=L-`L0T*L^yFmZ|02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00EmxL_t(&-rZR-ZiFxp^q>=_LZXP2ydh=&{{%|jK%^8W zQQ>Qn%92?O*uZ-2YzM+-c04<*4U}MfeSZA9*ZnX;3JW9&(7IXNH)a+i1QH~;1axh! zlv3(By%vO|CgUL`MN7aQAt|GhRD(^NCa-m~@{fN}8g5crH;dJ`zOZ#am1k6`R6vyw z5_Vh)b%0w1cBSnqTSBNO&};jwJC;)&;PwKWi2HeT%YX(g7vCHlWPnozG_igd5%c*B znJ+sc_EbOt$2L?kbBhsiWz}L@Y;JWRl?o)3$4*4b+D-L-l%RqXSWt=zxN)I06>woh zi7Md0i;`7vCw7#sg1gj#qw@l{;|pzmav*^2VtqNeIbdsW$V55D8La&<0$VER+FE`8 zOsj1(-73GowOJ4liq&@%Xw0mzR}Q|3eJ?n3=yGRV#cIsFUmDbCd|T&SO5_UGei-rC zGCm(UTZ~E@=N(w9t45S-#9}@CukoB-s%z_2?MeNA;KF*?Vjnqiu6vDGtcQxQwMJRZ lv5&Zd6=%(;q|Pz~>mSh?{GqceXfOZ(002ovPDHLkV1lZao#6lg literal 0 HcmV?d00001 diff --git a/textures/gimp/catapult/arm.xcf b/textures/gimp/catapult/arm.xcf index a4f4657498983d7bae857bf48ad218adbf9b457f..9b83dd4425340b516dcf850734bb3efdde5dc829 100644 GIT binary patch delta 955 zcma))KX21O7{=||v{9&_rlnvO94{VDc2b*&5IJrkDpFOXRD{wZv7C~Ndy@ajIZ(HJ z1gK7|42*~^5+8xFGZPCF5@JG#&D=R|@jw;Mdi?s{dw#yV_wM7h)AiR4<4yLx%OnWG z8k1aTy@(4eUKa!joE%v96+9T2Ng9uEfXoPnhz$x7)8(CRS1Sfscg4qHV&V|`$n;Y@ zqusY&nXbMbbi0@Kh+BA>nzKX3EPSZeb7Qb%RqO(uSUdH6Jo`TJ~)=f6xpEIbvL ze>&~4h=v>}#&w$$KlJsct&O1(oUHwDxwpo5^hHBeDH6Oo6@wYEAcOIJ(MCv+-Hh+sDXy>)YWty55bkCA$ zv!-FilYa<{(mWwepmLp{wkV}_l4#8pEGl#d!OWscjb)N3Sd^zp!J=4^2em~=9+M+=t&N=TCc diff --git a/textures/gimp/catapult/frame.xcf b/textures/gimp/catapult/frame.xcf new file mode 100644 index 0000000000000000000000000000000000000000..85246acb81e15c78e11a38eceaf1fffeee71c8cd GIT binary patch literal 3159 zcmb7`-EI>{6vt=R>zFuB38evzfZ7|HI?*VIcmWAZZQUZ&A`7Xn5Q1Z@<^#o{z!kme zEA$(%y7>&M%hn~L!b z))c|`1-pbr5tqx@g$Ja>7@uGXwv1hITKXhD!xo1uy|I0;w>Q{7B34rT_`%^|>uB(_ z^>TFdto7}q$KOk3$+nL6wuXa^;o<11o+wLRJ&wl)b~hk?@@FZM@At-aCi?r3jtG&mf~ zq=TKE@!+U+`_^5V^<NHM$COT)}ZwA_v;-86-&wcY?-!PBsyI85Fw5i`XSdW})NN3tBr+`dwo6km zQ^IUbol1@tS^iXM_%>;O;`B7@S4c>Ax0~2vGtksjHJk8i=N8JWRN+RGhZ#y&vGbJ>@Cpl?h`BQN=0zUJu zSXQ}BoEWLvI{}~T13tUg<4#X0mjga?Rx|>iIaf>rKA!_V*9d%00iQ1epO?Vr>cHm| z@cA34t!1lpDzQSm%!)hz~>b3`7-c%34A8$BnJ5K69atsRZRSOkI8W_;@hOX ziPKZltB{cHPA9R&W}vC5s+sU=I!>c@oaP$%bXsjsQw@ANP226lH1O#Y3AL7M ztbvcZ4T_XRz^C7)GzBvy)W9b>T4ecCaW(=z{jOM6xlNpCcMq+B&-DSH-Rp7MR?6jo zPoEWYflr?+76m?^13uRXd`F~J=N_B3F%JL#1@-@rlzWT!mE+b znx|=?6AgUDSF^7U_<{)dB$8<$0DM6NeC6E&4SeMm0}XuaFw($hJ@D~CYudt>-&eK# zo|@0^Vt3R+zNs$ex74NFsO5Z3UCmdi=hSliikizS_zJ#>=WAoN{5tV6rqNfiE9h(3 zW%Lbf37uk#=$lv_-NtI@bu3YJ?o-br^+x^9oxaSgL``h|KfbOmu+oKm!FisAnF+gC z=l`1GKYf-pL>t8)USq7*ir)jRMNe~@?Xg47V{$f<;mAD@AO(NW z@&~y$RQpE$1x09IssI20 literal 0 HcmV?d00001 From e0c8405e4b87c2cb20ec336ce4185cf06704aef5 Mon Sep 17 00:00:00 2001 From: EKNr1 Date: Sun, 19 Nov 2023 17:02:17 +0100 Subject: [PATCH 6/6] Added the catapult frame to the game. --- cowyeet.py | 8 ++++++++ data/levels/1.py | 1 + 2 files changed, 9 insertions(+) diff --git a/cowyeet.py b/cowyeet.py index e723522..8f5f0fc 100644 --- a/cowyeet.py +++ b/cowyeet.py @@ -83,6 +83,8 @@ def load_block_texture(path: str): icon_texture = load_texture("textures/icon.png") full_icon_texture = load_texture("textures/icon_full.png") full_icon_texture = pygame.transform.scale(full_icon_texture, (260, 90)) +catapult_frame_texture = load_texture("textures/catapult/frame.png") +catapult_frame_texture = pygame.transform.scale(catapult_frame_texture, (66 * 5 * settings["level_size_multiplier"], 31 * 5 * settings["level_size_multiplier"])) stone_block_texture = load_block_texture("textures/terrain/stone_01.png") dirt_block_texture = load_block_texture("textures/terrain/dirt_01.png") grass_block_texture = load_block_texture("textures/terrain/grass_01.png") @@ -197,6 +199,12 @@ def ingame_page(): screen.fill(summer_sky) screen.blit(level_surface, (0, screen.get_height() - level_surface.get_height())) + cx, cy = level_data.catapult_pos + cx = cx * 40 * settings["level_size_multiplier"] + cy = screen.get_height() - level_surface.get_height() + cy * 40 * settings["level_size_multiplier"] - catapult_frame_texture.get_height() + + screen.blit(catapult_frame_texture, (cx, cy)) + def page_selector(): if page == "main_menu": diff --git a/data/levels/1.py b/data/levels/1.py index c93f3ab..dbeb046 100644 --- a/data/levels/1.py +++ b/data/levels/1.py @@ -3,6 +3,7 @@ import numpy level_size = (64, 32) +catapult_pos = (3, 28) data_list = [ [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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],