From 9f074a70abc048abd2f049084d4f255ca3e15cef Mon Sep 17 00:00:00 2001 From: Frank DeMarco Date: Thu, 21 Jun 2018 15:17:22 -0400 Subject: [PATCH] opacity --- NS.py | 45 +++++++++++++++++++++++++++++++++++++++++--- lib/pgfw | 2 +- resource/Spoopy.png | Bin 7823 -> 7873 bytes resource/Sword.png | Bin 4682 -> 1646 bytes resource/scores | 5 +++++ 5 files changed, 48 insertions(+), 4 deletions(-) diff --git a/NS.py b/NS.py index 9b8efe7..7313c14 100644 --- a/NS.py +++ b/NS.py @@ -746,6 +746,20 @@ class Platform(GameChild): elif edge == NS.W: return NS.E + def get_color_pair_from_edge(self, edge): + if edge == NS.N: + return self.lights[NS.LNW].color, self.lights[NS.LNE].color + elif edge == NS.NE: + return self.lights[NS.LNE].color, self.lights[NS.LSW].color + elif edge == NS.E: + return self.lights[NS.LNE].color, self.lights[NS.LSE].color + elif edge == NS.NW: + return self.lights[NS.LNW].color, self.lights[NS.LSE].color + elif edge == NS.S: + return self.lights[NS.LSW].color, self.lights[NS.LSE].color + elif edge == NS.W: + return self.lights[NS.LNW].color, self.lights[NS.LSW].color + def set_glowing(self, selected): for ii, light in enumerate(self.lights): light.glow_index = 0 @@ -1424,8 +1438,8 @@ class Sword(Animation): sprite.hide() def brandish(self): - position = self.parent.unbrandished.pop(0) sprite = self.sprites[self.next_index] + sprite.sword_position = position = self.parent.unbrandished.pop(0) self.next_index += 1 sprite.unhide() dsr = self.get_display_surface().get_rect() @@ -1468,8 +1482,33 @@ class Sword(Animation): def update(self): Animation.update(self) - for sprite in reversed(self.sprites): - sprite.update() + display_count = 0 + displayed_positions = [] + displayed_sprites = [] + for sprite in self.sprites: + if not sprite.is_hidden(): + if sprite.sword_position not in displayed_positions: + display_count += 1 + displayed_positions.append(sprite.sword_position) + displayed_sprites.append(sprite) + display_index = 0 + for sprite in reversed(displayed_sprites): + display_index += 1 + alpha = int(float(display_index) / display_count * 255) + frame = sprite.get_current_frame() + surface = frame.copy() + rect = surface.get_rect() + colors = self.get_game().platform.get_color_pair_from_edge(sprite.sword_position) + color_a = colors[0].r, colors[0].g, colors[0].b, alpha + color_b = colors[1].r, colors[1].g, colors[1].b, alpha + if sprite.sword_position == NS.N or sprite.sword_position == NS.S: + surface.fill(color_a, (0, 0, rect.w / 2, rect.h), BLEND_RGBA_MULT) + surface.fill(color_b, (rect.centerx, 0, rect.w / 2, rect.h), BLEND_RGBA_MULT) + else: + surface.fill(color_a, (0, 0, rect.w, rect.h / 2), BLEND_RGBA_MULT) + surface.fill(color_b, (0, rect.centery, rect.w, rect.h / 2), BLEND_RGBA_MULT) + self.get_display_surface().blit(surface, sprite.location.topleft) + # sprite.update() class Health(GameChild): diff --git a/lib/pgfw b/lib/pgfw index ff096ec..2077dab 160000 --- a/lib/pgfw +++ b/lib/pgfw @@ -1 +1 @@ -Subproject commit ff096eca52dc95a9eabfd9f25ba7c4e9415e4389 +Subproject commit 2077dabde65be3bbbc165bba8d349ca2d2f9a9c6 diff --git a/resource/Spoopy.png b/resource/Spoopy.png index 1cbd9dc7e36c48553a320284362b382405c54356..9c52204399a8962e6c1c32d20e3c47342ee70718 100644 GIT binary patch literal 7873 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 literal 7823 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 diff --git a/resource/Sword.png b/resource/Sword.png index 8fe1cd396641d0e03263caf967c1f93b6ed56d69..a2af45af4b5150371976399d07a6f612e7f5679e 100644 GIT binary patch delta 1630 zcmXw3eK?bA9L|yLS}a#_R6dT1$tvs63e&V?&UxpWQq(D5ok}cU#hSH_y-|@<`PfFM z8Q#jMglafaBTBx)yenf1M?SVS3$;U$I_UKLet+H9ecku-{I2`=wAj8g%CG?uTL8}; zeoVPGHz>x>-!!?OC|x^z^TIyiTJ-Q!yJt|U9Xl`}rphtX4W}!Vv5?!(8h$ZEp@LVj z6RlCUULHw^Oiz^K``@u-N~^}8n6T9$S1oXjYtIYAxP^_3o+?yci!Z5=MHiL4M2dRL z6B-zM&mFE*ettcIKuzxa+xy`&o zl#-W;w@gnNJY6HH`~^cTb0u0SMgFWn_$5DX?@9Lnm6)^iu50}2_As=Vk;-o}lQRyk z%MbWK7`{c{3*SeNq&57(kX*_3i7c^l_z>K(Z<;Lmq^*h^y9ds8YZONmZn1u>q5`eO zi>UNZqfl7209lQbq&yNJ%~eZw?mFcf@>f>Zn0&I(nY*XOi>9z4Prt%E4%yIMW+vep z%)I)66;j8pILj6usy#?bUoncL`(K|j9o=uJ>P(tFt|xvpkB@Dfr`s&hs}604ikA@m z?tvi=P|iG5?JJzoN^9(6ZtDGn*<|L^5_Gnef(2=%!WbCr8J}PSiS(k-)bsUi%~IKEr;+D5?5+}1tyvF zk@hwM!rq)>x9g2DyQ(g zW4T^5-h8X;{Q2YabA*~{yi!8BHo6APeZ%4*s&7aDSYlRY^)}Q|gVALaq&ftrO0Qwt09)Oby$iOA6u)*C!n^8_+0IZ$x8AtbvaV3oQ$v_G%w4#=XRlg*ZiM`>- z%lwOZ|KY3$AKsn^Wfs;@Go@y}0QE$G$Qcc=Dd>wF$0_`>V- z{Tgd1nbt^5g1x$TeRg!6mvRkNY8TX45qr z&eG@Z@wz82w`tSZ8+7-J zpD3*DOWKcDeQ_h`6?@z~A=mb(1#(I2_Z`C;$_-}jw|dN_31>BZ0IXx%2l=bA7S=TI zp7mVpzcodge1l$8>9+uRcTHzglCrhbsTQn|$Az;VcmeCdzQX=6SM02B4%=GElQuKl zdiU7~hXQ#Fi-_?(tDc0ecu*A7E?dsJ-TLXE$JgHBZIt=^n>sRx(s&3y#!%JQGl*0AnhS6Dk*2IzHLagm*R;vn4>_NGx=t&u2%wI|-6Hha{T=zu zsOc(gM2>wz+vG%KEJ3KdnfJ9)b7|D;W9Us?>Q+$p-qS}SQ=G5KBQq85SlS)x)a~)I z1fLFyIZYbx`Sq)}Ma6}@(fi9*2_t E0}mHE-T(jq literal 4682 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 diff --git a/resource/scores b/resource/scores index 33e4231..d3ede15 100644 --- a/resource/scores +++ b/resource/scores @@ -8,3 +8,8 @@ 5999999 5999999 5999999 +163063 +143896 +177012 +126061 +157603