From 7b3d9d0fc70c2fd6abcf54a5e638e4a5a290ec76 Mon Sep 17 00:00:00 2001 From: Skullheadx <704277@pdsb.net> Date: Wed, 6 Jul 2022 20:44:56 -0400 Subject: [PATCH] assets --- Assets/GrassBlock.png | Bin 0 -> 990 bytes Assets/LEAFS.png | Bin 0 -> 1242 bytes Assets/LEAFS1.png | Bin 0 -> 881 bytes Assets/StoneBlock.png | Bin 0 -> 1075 bytes Assets/TREEBARK.png | Bin 0 -> 892 bytes Assets/Water.png | Bin 0 -> 936 bytes Enemy.py | 2 ++ Game.py | 2 +- Weapon.py | 21 +++++++++++++++++---- 9 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 Assets/GrassBlock.png create mode 100644 Assets/LEAFS.png create mode 100644 Assets/LEAFS1.png create mode 100644 Assets/StoneBlock.png create mode 100644 Assets/TREEBARK.png create mode 100644 Assets/Water.png diff --git a/Assets/GrassBlock.png b/Assets/GrassBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..b4a37fc86d749dcf475d5976431d3897669ad34a GIT binary patch literal 990 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLTQi-V13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(LE1ke2M51&<~yw2BlEEu5kycF-wPd&{eYqL=L#mMD4_7K+4h z^VR8u$;QknEiDjbImj>IuCDGXuKBUvbD?Vw`|-aO^9e|aE}IqmxM5YKo0Xt= z@lR314_ypZ0&W7$LdIWH(iFMRe=OyfkAI(JbNct4`HTHEXYhRJJhIuxT<1~gqnEzk z&-eJtB&K>Q+NsMKzi2wrA2U6+?r}^}#DkfF%CqMw_X%__<(pt=hpWyG{!E7-2V1`^6k8N4FA#}cxC@y z&71IS@|UXUZaKz>xep%gT6?nkz*9bh4@j zm&_BEuA7$E(CnPB#pPzU-1~QL-@LtVy!KxmgU;HbZdsPMYLBs_fYbU__~`^V$!e;@6v4PEZk!N=}8DRV<7Uw5v;o2+XwOD6Z_s3%SnoqN@_ zxJ~&Y%Zs>M+t{_zr!zwgc`iLJ$d{^nNhykhjUXGYwDh)EB={o-1% zG;Iq@@*ex^wZAO4*uL6w{!4%gDd?) zLkfeC2a8qr)Ptp(2PV05vpGhpIJ!*O#$?1XN$1AqsV#5b`@PQWeQWvs=C*5Ehb1@m z=W(v+(YYODoOEtqZ{d9oHb!aP?IxP19dEptXBzEtb48D(?%^y329uWmsmF3W*R7K3 zRh@J6M9+eptvS*P3YJZGrJNbMUew?F_S*7%_STfyES@(QcqZKW##yi}^~&{V`}Wm; vZhYUG(fs85^sL)#oVOVg(m&ny{m&%0Jmup`J;9p{3=9mOu6{1-oD!MnfBbzaYLk%h%YCGFM9H%WZ^9>11j+;{(I<+S>{^OGGkXYp`!94YoO*LlSIXr{0C z^F97DsiK~WcItBGFPe_@$4rl{dmK|1@nB}4^7NVNeL~$&^``Bf5y~^QVwT0S6;e;R zE2oQ|i=J~es=4y}6MY`>ty6WbXZ9*|sxFz(#v#cY64=~o@m5Mx&8TGFhmZW$|4eqK z6onow%t~D_#nCClGVQ| z?iqho_TIdhb!}z1;Bo6}vgJg+oM2T~LZfT~~8=>*?HCx5L)u%BmW@|0{o;uRry{ zKD)*!vd3TT{O@lj=gl(b*}lDg>PpndN9`*))Me)T{9{_- z&Zl@Z&-H4}`RCkmd;k4i=ifa|ihaTMeHvP`Zg0Q(`?R#Xjn4+{&B@oVZ#w<`Fx!RA z;kx%2SGpv6|DMl!#Ua_-+s3D?=A(foL&>c4%fGgDJxaX95Hr1Fp^~2I)jd3&T7g%T zucw^n+;=W2^m9=>^YME>GFOyoZ2T>^`@OSLgRbr(Wv;0!_~hr^ym?fe;nS->pOoq* z?BR7Z?^`j!rS;8xg&Vh@vdNi$U`V-Nvy;R3o9}H zk`+!@`&F4b>mwHnwMu2Y+HQJphwQyaiB4ZPJ-o({ciV;2zTwfXTXTR+P! ztNg~cqqqHJd&BIxe(xD=>df}BX4zg~cTz}87tfOZ|N83Br;AO_XF0^qjX!1g;Q0af zkIhfq`}fxsmVJCV_x{21$@T(0Y0EGFsGa;p|BP3#>qLtreg*~x22WQ%mvv4FO#r=S BH%tHk literal 0 HcmV?d00001 diff --git a/Assets/LEAFS1.png b/Assets/LEAFS1.png new file mode 100644 index 0000000000000000000000000000000000000000..e57952fce8fbf0d3d6fb813eb6f5a85be7e3309a GIT binary patch literal 881 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLTQZ%U13aCb6$*;-(=u~X z85lGs)=sqbIP4(Nc7K_dtCs8=g+~(>T15(o7EaL;JLr_Dz2#Lx(Mx%gOpl-#8P@Af z&Gy})?BeOMvN5cVAJ~svJn4DS)$5NQ=a!C-eUIht{k}JS_j`tgp~6ef+NsN#zi2wrA2U6+?r}_6#DkfE%F}16_X%}B)tk0^MkvqJidh!RR!BYN zuADA}2M#eK|?dGHAlI04>J%>0f+V6F!K&h%f&AZ0_SP zj3)xuPs?v;c1~F1bMv*``**M3-QI5+_rH$e&W@t&e-VNa3=9mM1s;*b3=De8Ak0{? z)V_>?fq}im)7O>#89O@zk6dZXk)I3<43Z_T5hc#~xw)x%B@E6*sfi`2DGKG8B^e6t zp1uL$jeOz^42;p9E{-7@=Tn1Ddoeo-ta(`}dCfh7X_5Fr=L3uHKc8O}%o14QtI$33 z?#oR6z2}Zu9G|yt-K$k*<^13OH8U_s>|#;aB6#5HBcTJYzenpnOWkN)#BeNh<&0nR z?#D6wD6S7FzqKlvZ~haZTPJGgMVqr6xEdy{t8T}1`&i+l3&)~LR#n_kxqNHFoeQde zw_WU8&BP$P#ez}o1?$I|A7;KVXYk8$m|7!d)_HT&b~y&V8_T~kFf0{hxFQ|C^WS^k zhTm(r&Nhh{Oq?cdl)XM@Vec{DYd4Q&a(uG56wK&gb)$a5-I*8M{B(5w-MPH}U18|4 z(8BAEwsSr&+WXM%cE<6y6MnyuTCTE-bADG=ar-ON`u)X^tEGgl-}TE#>=6`V5V^Ht zU8|YjvH!m!{t5^R&dhy!cZRh-=FvO o*zYMY@hdxVI_cWJd7t?=)}LtZ)?et(z`(%Z>FVdQ&MBb@0QpLbkN^Mx literal 0 HcmV?d00001 diff --git a/Assets/StoneBlock.png b/Assets/StoneBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..7cf51fc0b4d14d68d9e1c64e62a6219a32af101a GIT binary patch literal 1075 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLTQi-V13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(LE1ke2M51&<~yw2BlEEu5kycF-wPd&{eYqL=L#mMD4_7K+4h z^VR8u$;QknEiDjbImj>IuCDGXuKBUvbD?Vw`|-aO^9e|aE}IqmxM5YKo0Xt= z@lR314_ypZ0&W7$LdIWH(iFMRe=OyfkAI(JbNct4`HTHEXYhRJJhIuxT<1~gqnEzk z&-eJtB&K>Q+NsMKzi2wrA2U6+?r}^}#DkfF%CqMw_X%__<(pt=hpWyG{!E7-2V1`^6k8N4FA#}cxC@y z&71IS@|UXUZaKz>xep%gT6?nkz*9bh4@j zm&_BEuA7$E(CnPB#pPzU-1~QL-@LtVy!KxmgU;HbZdsP^%O-}}e!^PR3lNhfP8wR|q%#L;NT#^8I|K`%8@EIaqZKa2A- zf;beHx^Pt5$SoDg)>T|Gr6~5g&3T=rElZco;Y_}ED^X&}6wCB;mP` z+%x5pgfoX>>0X`g?{%}5Nj$bWpL<(tX^>aPj&<74WxO;sm)73j``xhR^Dcpj#qZ`Y zH@tuU{`u!fuTDcV-@_8j=Pc8G7!)48w|F+E_+0FD&IW-)m9bMUSufa{w>CBEwUdWW z=Kb%VZRQr6C*J>l*kDS~oZ@@cE_c4~HDp_sxohgwpca9kQ~Taeo$|aibM5VIfB*au zaS90yEt)r-bx!g2_j5kK{<>(2kkg#+rJ;%Eo>$t<_doa3qHoUU@4tCl1eRXewQf7h zu^XG;TRwliZRwO(yWCu|*BYkXHd|}@rIw$8!GP!R_3P7vPPIE|e!W*7`+UyjD0{j7 z@4tB&g1j7#Y|GVL`n+;qoIXQ`;kwsZJv(T15(o7EaL;JLr_Dz2#Lx(Mx%gOpl-#8P@Af z&Gy})?BeOMvN5cVAJ~svJn4DS)$5NQ=a!C-eUIht{k}JS_j`tgp~6ef+NsN#zi2wrA2U6+?r}_6#DkfE%F}16_X%}B)tk0^MkvqJidh!RR!BYN zuADA}2M#eK|?dGHAlI04>J%>0f+V6F!K&h%f&AZ0_SP zj3)xuPs?v;c1~F1bMv*``**M3-QI5+_rH$e&W@t&e-VNa3=9mM1s;*b3=De8Ak0{? z)V_>?fq}im)7O>#89O_JfKIf^2^9tg2FViFh!W@g+}zZ>5(ej@)Wnk16ovB4k_-iR zPv3y>Mm}){2F5f`7sn8d^QIHM`$8OfSd`y>-?dzjTV)4x^}BlAW%W;e#7uMEPB30` zW&VA8)xWmOE^#lvF&IM4O7RcuZ2*$h^Py#fy^dH=O&PWhlz3*2d^BEm^rl zD}X`4P@}PD6C;<&JfQ;=9)gEW1i?M!AtG@Be#BQ5xQMYIF9InEe`pUHoAN!ale6SM` za(omrY4htG6$a~@It^z2KWd_c{)FF}YI$?%p8IUOx?40@Op@D~(wHRE)vj-r$q(9X z_9P*_SGaHQ&zfU1ZQv5`X`Azm-oJGVJmmqdI19i1B0ilpUXO@geCxnp?EX^ literal 0 HcmV?d00001 diff --git a/Assets/Water.png b/Assets/Water.png new file mode 100644 index 0000000000000000000000000000000000000000..1752c6cd1dabed8ac938312e80ca36c62cc11dac GIT binary patch literal 936 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLTQi-V13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(LE1ke2M51&<~yw2BlEEu5kycF-wPd&{eYqL=L#mMD4_7K+4h z^VR8u$;QknEiDjbImj>IuCDGXuKBUvbD?Vw`|-aO^9e|aE}IqmxM5YKo0Xt= z@lR314_ypZ0&W7$LdIWH(iFMRe=OyfkAI(JbNct4`HTHEXYhRJJhIuxT<1~gqnEzk z&-eJtB&K>Q+NsMKzi2wrA2U6+?r}^}#DkfF%CqMw_X%__<(pt=hpWyG{!E7-2V1`^6k8N4FA#}cxC@y z&71IS@|UXUZaKz>xep%gT6?nkz*9bh4@j zm&_BEuA7$E(CnPB#pPzU-1~QL-@LtVy!KxmgU;HbZdsPt^}OH&L-dxD2l$*#HAb3Z$Bg#P*Y zy4-tL{>r0^xEvZ7;^seJdy>a3W*WYNPj=TvUSHn|?L-fi1mfT36zToeRpn{byDid4+XaD^3V+-$k z+ut^^52|L)y|H_RUyMi7v`04{&rRt_TKRid_IwtlH%on$ro2_>j1UQ3)2;LV+x7MF z=LFv{I0`W^oVpn+&b4YCmqb(1^j}O#%4@t^H_dgq)KJaGQR>Z1eNpV}v9I!&D& z`pQg5#QW=^8oT%X{hu1%ynDBArO^7Y$s69zwRr#Y%e=2u*Pl16dDQ$W-+tfwzVh>y tH(4jV$@{iv{^vjU_rD9D>Y?_7{fvI*2KEM<$qWn(44$rjF6*2UngGc{st*7F literal 0 HcmV?d00001 diff --git a/Enemy.py b/Enemy.py index 4382fc1..3a26398 100644 --- a/Enemy.py +++ b/Enemy.py @@ -26,6 +26,8 @@ class Enemy(Actor): super().update(delta) if target is not None and self.dizzy_time == 0: self.follow_target(target,stop_dist=self.weapon.width + self.width + target.width) + if self.weapon.get_collision_rect().colliderect(target.get_collision_rect()): + self.weapon.swing() self.dizzy_time -= delta self.dizzy_time = max(0,self.dizzy_time) diff --git a/Game.py b/Game.py index 689ca77..343be76 100644 --- a/Game.py +++ b/Game.py @@ -43,4 +43,4 @@ class Game: block.draw(surf) self.player.draw(surf) - self.pet.draw(surf) + # self.pet.draw(surf) diff --git a/Weapon.py b/Weapon.py index a70c2f1..7394eec 100644 --- a/Weapon.py +++ b/Weapon.py @@ -10,19 +10,32 @@ class Melee: self.offset = pg.Vector2(offset) self.holder_width = width + self.direction = direction + + self.display = self.img + self.swing_timer = 0 def update(self, delta, pos, direction): self.position = pg.Vector2(pos) self.direction = direction + if self.direction == -1: + self.display = pg.transform.rotate(self.img, 360 * math.sin(math.radians(self.swing_timer/10))) + elif self.direction == 0: + self.display = pg.transform.rotate(self.flipped_img, -360 * math.sin(math.radians(self.swing_timer/10))) + + self.swing_timer -= delta + self.swing_timer = max(self.swing_timer, 0) + def get_collision_rect(self): if self.direction == -1: return pg.Rect(self.position - pg.Vector2(self.width,0),(self.width, self.height)) elif self.direction == 1: return pg.Rect(self.position + pg.Vector2(self.holder_width,0),(self.width, self.height)) + def swing(self): + if self.swing_timer == 0: + self.swing_timer = 1800 + def draw(self, surf): - if self.direction == -1: - surf.blit(self.img, self.get_collision_rect().topleft) - else: - surf.blit(self.flipped_img, self.get_collision_rect().topleft) + surf.blit(self.display, self.get_collision_rect().topleft) -- 2.54.0