From c6d0fd544ef8b400e8d70a955cd90910eb4a7fb0 Mon Sep 17 00:00:00 2001 From: frank <420@shampoo.ooo> Date: Wed, 16 Mar 2022 18:40:43 -0400 Subject: [PATCH] adjustements for new pad --- NS.py | 36 +++++++++++++++++++++---------- resource/pad/pad_0.png | Bin 2148 -> 2704 bytes resource/pad_mask/pad_mask_0.png | Bin 338 -> 380 bytes resource/pad_mask/pad_mask_1.png | Bin 318 -> 388 bytes resource/pad_mask/pad_mask_2.png | Bin 421 -> 552 bytes resource/pad_mask/pad_mask_3.png | Bin 392 -> 507 bytes resource/scores | 3 +++ 7 files changed, 28 insertions(+), 11 deletions(-) diff --git a/NS.py b/NS.py index 656af27..3cbf678 100644 --- a/NS.py +++ b/NS.py @@ -466,8 +466,20 @@ class LevelSelect(Animation): y = 250 indent = 10 dsr = self.get_display_surface().get_rect() - self.platforms = [Platform(self, (0, y)), Platform(self, (dsr.centerx, y)), Platform(self, (0, y))] + self.platforms = [Platform(self, (0, y)), Platform(self, (0, y)), Platform(self, (0, y))] + scale = .75 + for platform in self.platforms: + for ii, frame in enumerate(platform.view.frames): + scaled = pygame.transform.smoothscale(frame, (int(frame.get_width() * scale), int(frame.get_height() * scale))) + platform.view.frames[ii] = scaled + platform.view.get_current_frameset().measure_rect() + platform.view.update_location_size() + for corner in platform.glow_masks: + for ii, frame in enumerate(corner): + scaled = pygame.transform.smoothscale(frame, (int(frame.get_width() * scale), int(frame.get_height() * scale))) + corner[ii] = scaled self.platforms[0].view.location.left = dsr.left + indent + self.platforms[1].view.location.centerx = dsr.centerx self.platforms[2].view.location.right = dsr.right - indent self.platforms[0].set_glowing((NS.LNW, NS.LSE)) self.platforms[1].set_glowing((NS.LNW, NS.LSW)) @@ -1963,9 +1975,8 @@ class Boss(Animation): self.boss_sprites[-1].load_from_path(path.joinpath(f"{prefix}Boil"), True) self.boss_sprites[-1].add_frameset(name="hurt", switch=True) self.boss_sprites[-1].load_from_path(path.joinpath(f"{prefix}Hit"), True) - if path.joinpath(f"{prefix}Death").exists(): - self.boss_sprites[-1].add_frameset(name="death", switch=True) - self.boss_sprites[-1].load_from_path(path.joinpath(f"{prefix}Death"), True) + self.boss_sprites[-1].add_frameset(name="death", switch=True) + self.boss_sprites[-1].load_from_path(path.joinpath(f"{prefix}Death"), True) self.boss_sprites[-1].add_frameset(name="entrance", switch=True) self.boss_sprites[-1].load_from_path(path.joinpath(f"{prefix}Intro"), True) self.boss_sprites[-1].location.topleft = 207, 10 @@ -2338,10 +2349,7 @@ class Boss(Animation): self.queue = [] self.brandish_complete = True if win: - if "death" in [str(frameset) for frameset in self.level_sprite().framesets]: - self.level_sprite().set_frameset("death") - else: - self.level_sprite().set_frameset("hurt") + self.level_sprite().set_frameset("hurt") if self.get_configuration("system", "enable-level-select"): self.get_game().add_time_to_scores(self.time_elapsed, self.level_index) elif self.level_index == 2: @@ -2992,12 +3000,18 @@ class Ending(Animation): """ Add a sword to the list based on what button is pressed. Remove swords that are out of view. """ - if self.get_game().platform.get_edge_pressed() is not None: + edge = self.get_game().platform.get_edge_pressed() + if edge is not None: sprite = Sprite(self) # Add frames from Boss->Sword storage - for frame in self.get_game().boss.sword.swords[0][self.get_game().platform.get_edge_pressed()]: + for frame in self.get_game().boss.sword.swords[0][edge]: sprite.add_frame(frame) - sprite.location.center = self.slime_bag.location.center + if edge == NS.W: + sprite.location.midleft = self.slime_bag.location.midleft + elif edge == NS.E: + sprite.location.midright = self.slime_bag.location.midright + else: + sprite.location.center = self.slime_bag.location.center self.swords.append(sprite) outgoing = [] for sword in self.swords: diff --git a/resource/pad/pad_0.png b/resource/pad/pad_0.png index 02a6ce542542589b57d8dee2a7b18f5a0bb8b189..906ef082d0707577c56bd84c77812885eb4416f3 100644 GIT binary patch literal 2704 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 AhX4Qo literal 338 zcmeAS@N?(olHy`uVBq!ia0y~yU=#+jlQ`IbWbp#?44{Cdr;B4q#jUq@x&@mR1RNaC zZTvrNBa35T-EQ8LrYBERe1e#Oioqc2#59I?t*RP*9b1_UGp#yZj$hx#FEIJ!@`*X} z4ZdGgR4x`4b@08vY4>33Wg(IFBkg=gmi*erwxWcib3(((C%!qbI|H{UbN7nLnoU8~2YMQ~p*^~9uc(Ukuk0@C= z_aXt`WbOLk^WWUvZrVBceCzdmTlI`_-OSr|M^c(2cFJ{d9xdGX4CY*l=mW;$YAa=p Ti!PT6fz0uA^>bP0l+XkKDe`F- diff --git a/resource/pad_mask/pad_mask_1.png b/resource/pad_mask/pad_mask_1.png index ce39f7028a9be886f06681469b0c905e823d9a15..f9c1b8ca560c88ea513c554a6a011f892e5830e4 100644 GIT binary patch literal 388 zcmeAS@N?(olHy`uVBq!ia0y~yV9WrrYdP3}WPj&RPoRLer;B4q#jUru9fb}l@Hhm% z`0_8jEqA-mNr4A@g*8t3U)d-ER15~!R`)T~WxkVR;;nAEe)q_120q@+zx%{_^mw*Z z@1J>GutBlKfmx{+h;=VCcqjugw~4|f4lr(TVBVII_Mu-%Kr?rPBeTMV27f^&-VT$% zn)57=mI#|=9N2Iug(dM4H#;BGT4|S$qU;F;Gg}l~4wi3Mt>C$_z_EeHppi`=vyrW3 z()#Oy4GPK4YzYnWjtbwmMG4!>{}sqc_!w}B6Xw)`po?B^KP{`8;QWLYWV@%UpUXO@ GgeCxfnOt1} literal 318 zcmeAS@N?(olHy`uVBq!ia0y~yU=#+jlQ`IbWbp#?44?q3r;B4q#jUq@P6{?C2)H^P zGx|TpkdgM?Eszy=--d7P!oW`6Q;)6P9oB^UJh=CK?u>@n5orNOSe9>n-Zvv*2TO?0 zfns+b21h~RnBT0fK06Xt+yTl8h!`FWb_X*2Wq~pZTC0+pmYC@RT`8Kt?y{qLK>898Xt2mvv4FO#r#YU9SKD diff --git a/resource/pad_mask/pad_mask_2.png b/resource/pad_mask/pad_mask_2.png index 8ec0b53b0968326b07d215bc033a90bbbfd7e7a6..e82832ff66d76bf1e917c8e31e68d344e50316f3 100644 GIT binary patch literal 552 zcmeAS@N?(olHy`uVBq!ia0y~yV9WrrYdP3}WPj&RPoThiPZ!6Kid%1QIZircAi(0- z{osGRSh>7~1Z&pWlzk1Q4}xyLDP;tzryT5;)??H$yc^D8l5%|K>%C^BZVMi6F<5M? zC)DwI@$WjeTCu!1J;p6^sk@n9Y94vXy6Dr>y7>?1pKoF-_`qq>;8DGVLGYp)x6}be zjSCGP+$Ic6ya}%ND+T!%Eesbk;b7%3d2rHo0i(;U#Zn!tXK$rCGF!AB=yKbylX2jo z#s!877Y6UXG}+Ay7}=LNFe_YW5RGjpzn~y6D-EbngH=i(vylyiGsJ*|i`A6>j~EPJ zJlb(D@f>HP=Ef)wf7ZD(9u|3SO9;?VQe_x|lZ z(!yu{f~)`7xt*)^KI^IZ)JO>Bz=x4gmy4nu_td#@WST=?;U!N!bx!DhCI3y*jrOdq|O!zgCb;1GSDLC*H* zO-W|%s5y)*QVfmT<~2@x_pL5q&RqQs3yw-U0PzP7t#cO98_wySVVGHSmd|0q+VqBa zpBjISbLT{NOgti4*!F+sCvT@jwqr9t@Bxi!Y-5hg2N~Vqz^riLn(=`ahi;$?7&x|k zh^oGfo z{@H}jnX9T$;Mi?^VD??rh;3@M42-$*-mlrNZ=R$4V9k_pnQN*J84EVfYdiq7`VkKc zThyGRk{o+avfSFqX!pU?+C}nCiP*Nyj5|1gYd&Yf9svn!#ZA%;q8v9Edw~>qy85}S Ib4q9e05>Y7ga7~l literal 392 zcmeAS@N?(olHy`uVBq!ia0y~yU=#+jlQ`IbWbp#?44{C&r;B4q#jUq@E($g)h`2hI zzS*DpX9J6bTuhm_LPf<4pLN_o#l!=RvgoFzCi9Jx4tah2u+#YNYsVh`n$2emo#uWl zxWk&AZgemuDW=`jR@z_Hi781*MM2GpDMw0JkkyE-^#_%Iw{5fFCpsoQrHXr+{pe!Qd4 zE>6yl&evzz)|hS-ZhGzO>$1i)&`@yFEYCwx##hh8ADFjk=j!zmN={FXWgncqx0B&Y mZ1EcH8($77NuhKX{weK(h$#}Z@xvX