From 1d72fc05a256fdaa2979fc55eb89b9a64ce09ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E5=A4=96=E4=B9=8B=E7=A5=9E?= Date: Thu, 5 May 2022 09:17:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B5=B7=E8=98=91=E8=8F=87?= =?UTF-8?q?=E5=AD=90=E5=BC=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/data/entity/plant.json | 1 + .../BulletSeaShroom/BulletSeaShroom_0.png | Bin 0 -> 1037 bytes .../BulletSeaShroom/BulletSeaShroom_1.png | Bin 0 -> 1095 bytes .../BulletSeaShroom/BulletSeaShroom_2.png | Bin 0 -> 1294 bytes .../BulletSeaShroom/BulletSeaShroom_3.png | Bin 0 -> 1266 bytes .../BulletSeaShroom/BulletSeaShroom_4.png | Bin 0 -> 1079 bytes .../BulletSeaShroomExplode_0.gif | Bin 0 -> 1295 bytes source/component/plant.py | 6 ++++-- source/constants.py | 1 + 9 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_0.png create mode 100644 resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_1.png create mode 100644 resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_2.png create mode 100644 resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_3.png create mode 100644 resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_4.png create mode 100644 resources/graphics/Bullets/BulletSeaShroomExplode/BulletSeaShroomExplode_0.gif diff --git a/resources/data/entity/plant.json b/resources/data/entity/plant.json index a790f7c..a88c34f 100644 --- a/resources/data/entity/plant.json +++ b/resources/data/entity/plant.json @@ -6,6 +6,7 @@ "PuffShroom":{"x":0, "y":28, "width":35, "height":38}, "PuffShroomSleep":{"x":1, "y":0, "width":39, "height":65}, "BulletMushRoom":{"x":0, "y":1, "width":55, "height":21}, + "BulletSeaShroom":{"x":0, "y":1, "width":55, "height":21}, "PotatoMine":{"x":0, "y":0, "width":75, "height":55}, "Squash":{"x":10, "y":140, "width":80, "height":86}, "SquashAim":{"x":10, "y":140, "width":80, "height":86}, diff --git a/resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_0.png b/resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_0.png new file mode 100644 index 0000000000000000000000000000000000000000..59be1dab793f90ccdb59d79a14ec20630a9bd271 GIT binary patch literal 1037 zcmV+o1oHcdP)_s%9)007AXVAc74h>Ryk#OI6e zH7ASCvv)7W;JaE9E-T#i=jTr|$zCg`L3tYb~ksu4HL0 zC~Q7ft}T2qZ`y)M{XYsK(k!c~RQUO)>OAig0JKBHD!@XrA#O1bOG*)f|K-7f^&MIqkGd zK6WH@J2h$`E~iB>kSHhHfR`+(;*Np&b%FVH(K^R>|29WLa*CL4U`u9B7M*b~`52Oq z+jRlj@k|w)jNeybKj7X>;z($|o01=Zh6t+)O9pW{?CgZ;Gk>0JWp|Z+Mt`GU`{DfrthNA{rcsXmB8+!GVYd2O=6Ah-mN^r5buaC4z|H00000NkvXX Hu0mjfa2w$> literal 0 HcmV?d00001 diff --git a/resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_1.png b/resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_1.png new file mode 100644 index 0000000000000000000000000000000000000000..3bafde339780cf77dd4b73c047a33f2203a04137 GIT binary patch literal 1095 zcmV-N1i1T&P)kC0bL;p(u3Dpe{16^pC(CGHXK84O&?bSvNj zM1Ty4g$e>0Kq)9v)F0aG%h`9{FVR%hmW0k z1=m>MrO1k+%hNQ-9-lgJ3s5*4lRxadF}l0q=7gBtxtziOj_cJL5xIHO|5s<@3XTo}em=rciGz;EPR&tgRu6VzH z`oq?Y_RWuW$PfP_#*<`4(Xk+?a1FJ7tAn8xRJaBxJlW^-G!5*w=+k>DLVFklHX_8N z0E&i*Sn4bR5Zxtu9g{9|Q6WGfm{y4H5^OgKcohx%)zj`=vZB!b07Jn8FcM*!6((b1 zQnUHWN@A1fHJD;+xR?;`-FAx_HF8+Uf&p?dTgP|-H{GWq*e!8{O%my%>SjyN#e~Sy zG%$C4Usl+cl@%ct0>sVPb5bL*FDn2zD#A<@8ZyMaDWkd1Ud;>1ilT#JaOh;gDgreU z()@6r_Ai0BvFW@oE5t%L!4AdofJlGj7E6b+k^s-Q%|$Z;+(NW904>JI>9z8#HfsEX z;h_2!XSemP%B5{e4@;J#24V2ud#^7;zb zN1P%ig_sn!_hPYi8cbdJZTIU)^s5O0!1{{OUS|PbZ@j+3JQuh=VhL~Sq=~2Cd3^w` zD1>pD=6S(g7+B5>j*ImXM{o<`@J0RJtq(q~n-M+Rdx7mHSu{3F{W#z#h^wGcg87brwms9unR~rL|f|u>k7g;__C6=t(yN+ zUFzc4NGrlOdki;ZMbRyF0DG5S@I(rXpJ=BCG_F@MOber7bTH#P&VT>Q&w*LI`Rp76 z5k7yiM`O0%pXmmDj7(N< zv%ki?=Q28&IVOZT5HWmBF}?@f*!{(_@A)prTHLL3vTMZjH=?`b8f*Ec_=VusR$i(< z>+2VsA>0aHA@Vd0sFjea)hEBNtUgRRdN7lxX<#b+YZbuY?Hd0z{sDELd{4GtD^~yj N002ovPDHLkV1gmI{y+c# literal 0 HcmV?d00001 diff --git a/resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_2.png b/resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_2.png new file mode 100644 index 0000000000000000000000000000000000000000..42f89020ecfc502599028be4afdc24e4bca5c576 GIT binary patch literal 1294 zcmV+p1@ZccP)k$OG+R^hPt1?51|RO3QvA?8q}C%{SkB^Sw!Mb#q(ee;^q91;&Icf)_)?BF}50 z5X=?iGfUIp!*W%>zn=fl_q@8ftzZ4f2Rs)ama7^77yu}=pNr+HX0EWv^Jj&xw3G1` zd0xx+uVGY0Eb_btg#Z9n1g44ojd*81H3N-Gy2@DOc`d48t{`K1*wfd=)y-`^8WDDt zDeRE|06d96yAlAPssi8&0N_o$>2Lce>OF@vH$S%hyKTlNqC)~tBKte-${rbnCVU#m z#9b2IF=QO#omCdlCu7_k;gG758&?Cd$QASt9md`-NKZCLcfUVX5{7`Wx8&274zuuI4pZoglTaOHP zYaUM#lJx;>elsgBswf{eSZ_+)tv9{C-4(C4?M|`Yl-RN|Dssbv&3ypi_}t{Bh73{X zsD_F(n~c6I?JfbB)!%Au@4HDbWi zQHW{?>nGF~QFOTlmvxFl5{!v*JqKWR0eA9NEwb8P=wJicsi175;KchxPZ z<0-hb9)g_3JDLc$jEV(T8L z2!xDN^9FMTF1ag^CBi8^nezd9I(FDWxMYB< zVM4g{>l3l&yo0I=)80vt-DmVHwmneY)4^>=F!8o8JV>*bkWPWT%OcO~?0Oz7maCc^ zYfeR*L+m*vU{=4G4^fEsd*(k%njDdFm zS0{(Y&~pLfK+&k=qIx%-cmUmf1AkzLONw{|#`8-6wX3vag@=XiJ)`Tzg`07*qoM6N<$ Ef-b^pKL7v# literal 0 HcmV?d00001 diff --git a/resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_3.png b/resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_3.png new file mode 100644 index 0000000000000000000000000000000000000000..91843a0244e786582921cc15f3a28a7012972592 GIT binary patch literal 1266 zcmV|tOR#t_3AWUwGQ zG)#f^&_61*@0DyUxeYg)fapnrWeOTfTLH6~- zW4*VLS)Lm_@o6Fe2{m>ka`SEFlE! zT)7qj;pByFoy4tnYFjph4^+qX!()BYH!#5Xz5FZdXYQRHs7~U}6VoqW&s=rvNZSm6 zqZq6R98Ca9peJ8j_Cn|+hMs)2YK(UF@m{nT?DfeWwnH_zfu=77c=83)G{$1}H&nr` zRg>~nbng1Z8}XFGIn&NlNcMVv3h#K>gfp^t$m$SStkw%HBHkP z(U|?@r79c=W73`ga0zf}R00?!x^eDHgx>-IlzfVkPi<%0&aNQ4(MgQ-rD)Z!&n8%( zP1?Os(taRZ%1sRI$xBi;Y+PoV8s&s=L>YCxvWvZflUbhEZZ9tR)Jz^m6|suUU;5Q; z$yZ1nBsY6PyJG=r+bw{cJF9h!JR#q;|IZiC@#-;YUSn#NuYF5BD(KC@)5;K=ZV zxN=p3(9Y-QSvF#>Ou}W`G;J+OmOSSw>$3?K%e8+#gdl&An5J=Sm)ZxO2)WV(n8^zQ z`ttaBmW}3FHUd|e-&~Cd=q5Db3Xuq^VnThp0VwW1K;teVevH+7oO3r0a$m3uG8OMT zFSvpizLxIG5|Pz4D@NvC>e*5>yo*&MtcoU5COf&ubZX`gRh)C}FYE{fe+? z?Fdd46yy{G0wo|^r! zSOWN~*(G)a#W06(zZc6jHd+rpf$o=>e*p6=^LLEU48R0Sc_vUr0`Sl7MGTiFfAFzE z3q_Tv0F%FnqyE15)Ld925;Az~Mh5;w{MQdQZ#&Cm!PZ;jzZ`!(;t_|0mC<<`KUejzm}-iLf{lVR0nF c;z)$Wzun6&3OXL1qyPW_07*qoM6N<$f+&<&AOHXW literal 0 HcmV?d00001 diff --git a/resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_4.png b/resources/graphics/Bullets/BulletSeaShroom/BulletSeaShroom_4.png new file mode 100644 index 0000000000000000000000000000000000000000..769bb62378262059f65d76e5d560d3c22e73308b GIT binary patch literal 1079 zcmV-71jze|P)C8*;YbQq>_#5)!8c07WX(diK6vgYbw4wAa)c zp=>EePt%=oXv6 z>WQfq{m{|mUfLTpCKI7ULVAKrE<)eI$4~D&8ic(N|CqDQNthQJ0+hwb*+QHaCaJaeS}oE2JA@1cDX=tA zGVd&bVOL}#y6-2U(I7z6Q#iL_q~^9>Vhrxc>;yRn%~-CUlkpa*Xg92nko%9id| z0&nbDYBDNaL1_I;Zamh<>>I9$o4dEExLEVnob-ef+(%JO%wVFcochnOJsfLn56Ald x{v(fR-rjHlLG`=fMnr=f5e;rcG`JDb;6DwgD(4qo5s?4@002ovPDHLkV1fV|@jL(k literal 0 HcmV?d00001 diff --git a/resources/graphics/Bullets/BulletSeaShroomExplode/BulletSeaShroomExplode_0.gif b/resources/graphics/Bullets/BulletSeaShroomExplode/BulletSeaShroomExplode_0.gif new file mode 100644 index 0000000000000000000000000000000000000000..3b888ccf12a3a02fce714b3fe172e809f1659308 GIT binary patch literal 1295 zcmZ?wbhEHbG-1$VXlDR{;_a)ukL=lWMGA9Bda*_L8wkXl!ET;gJb2*tqz3KQnJfj)j6_ z1FNubmyN;3hK4SM*Y+iYQnPb8& znFCi=UhQCEdLYuU;K0@O%;I_u2@8@NnF5(JSWaJSXkcMtDX>}b;Efk^7Po|kK!W=1 zPL>Qdy;p)y<0o)TJa#to$A{yr6|H6>53X)}db&fddj*>{xti74Q7$gA1gYA+TAR!YI?nOS=s-%2Mu4lxkJ|TH+*jT!1eL@ zMK5jxl?Tq%Q%xKq+1tJbmlc>^6RJ&U4ZGCLv+DV^fNa@g;USW4ELT%%Yt<56(&uiy zf55NREK816ie+TONfP@@*{}RN{YX|=2F>mfuBoa XVnm`u7Y7sunqRE1-a8}Cfx#L80j}Dn literal 0 HcmV?d00001 diff --git a/source/component/plant.py b/source/component/plant.py index b0ae5f8..cc593e1 100755 --- a/source/component/plant.py +++ b/source/component/plant.py @@ -78,6 +78,8 @@ class Bullet(pg.sprite.Sprite): explode_name = 'BulletMushRoomExplode' elif self.name == c.BULLET_PEA_ICE: explode_name = 'PeaIceExplode' + elif self.name == c.BULLET_SEASHROOM: + explode_name = 'BulletSeaShroomExplode' else: explode_name = 'PeaNormalExplode' @@ -1214,8 +1216,8 @@ class SeaShroom(Plant): def attacking(self): if (self.current_time - self.shoot_timer) > 1400: - self.bullet_group.add(Bullet(self.rect.right, self.rect.y + 10, self.rect.y + 10, - c.BULLET_MUSHROOM, c.BULLET_DAMAGE_NORMAL, effect=False)) + self.bullet_group.add(Bullet(self.rect.right, self.rect.y + 50, self.rect.y + 50, + c.BULLET_SEASHROOM, c.BULLET_DAMAGE_NORMAL, effect=False)) self.shoot_timer = self.current_time def canAttack(self, zombie): diff --git a/source/constants.py b/source/constants.py index 96c8844..eb967c2 100755 --- a/source/constants.py +++ b/source/constants.py @@ -256,6 +256,7 @@ BULLET_PEA = 'PeaNormal' BULLET_PEA_ICE = 'PeaIce' BULLET_FIREBALL = 'Fireball' BULLET_MUSHROOM = 'BulletMushRoom' +BULLET_SEASHROOM = 'BulletSeaShroom' # 子弹伤害 BULLET_DAMAGE_NORMAL = 20 BULLET_DAMAGE_FIREBALL_BODY = 27 # 这是火球本体的伤害,注意不是40,本体(27) + 溅射(13)才是40