From 5802b1f12dcaa611e27ad50f86e405cdbbdf187e Mon Sep 17 00:00:00 2001 From: Frank DeMarco Date: Mon, 9 Jul 2018 22:59:35 -0400 Subject: [PATCH] hourglass --- NS.py | 8 ++++---- resource/Hourglass.png | Bin 0 -> 1002 bytes 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 resource/Hourglass.png diff --git a/NS.py b/NS.py index 0a22c93..1a2fd2e 100644 --- a/NS.py +++ b/NS.py @@ -883,7 +883,6 @@ class Light(Animation): get_hsla_color(int(color.hsla[0]), int(color.hsla[1]), int(color.hsla[2]), int(ratio * 100)), True, shifted, 5) ds.blit(intermediate, (0, 0)) - # aapolygon(ds, shifted, color) def in_orientation(self, orientation): if self.position == NS.LNW: @@ -1015,10 +1014,10 @@ class Timer(GameChild): self.background.location.topright = self.get_display_surface().get_rect().topright self.bar = load(self.get_resource("HUD_bar.png")).convert_alpha() self.bar = flip(self.bar, True, False) - self.label = Sprite(self) - self.label.load_from_path(self.get_resource("Timer_label.png"), True) + self.hourglass = Sprite(self) + self.hourglass.load_from_path(self.get_resource("Hourglass.png"), True) dsr = self.get_display_surface().get_rect() - self.label.location.topright = dsr.right - 2, 5 + self.hourglass.location.midright = dsr.right, self.TOP + self.SIZE / 2 def reset(self): self.time_remaining = self.get_configuration("time", "timer-start-time") @@ -1030,6 +1029,7 @@ class Timer(GameChild): self.time_remaining -= self.get_game().time_filter.get_last_frame_duration() def update(self): + self.hourglass.update() if self.time_remaining > 5500: hue = 120 elif self.time_remaining > 3000: diff --git a/resource/Hourglass.png b/resource/Hourglass.png new file mode 100644 index 0000000000000000000000000000000000000000..01e6ed8cdf569b858bb2fbcb435af9832705db47 GIT binary patch literal 1002 zcmV>KH;8`3Z@%;7}#~8KCXg_xi3IY8b2q61>S>ynF9EIeGV<`&cTK z`j|0x3)f^sw8^BDbBwXKt`T%zZES3OpsMO$Mx#+38ykC9r_-^{&d%v@ILt2s(ChVV zVq)SQgTau~-QE4e{{DVk2(bYGa{vec4G#|!5m8T152a(-ysfQ`h=``9rq0Ia7=W7q zOaSuA%gcY-*x1O`G%Z+MTzn@Mi^*(EqtWQsCX?w_U0t2@dc92m{si#!eBFrC=_Dee zR4VmhHb5c7n?yv5i;Dzc`fQG!t1Y+LY?~`9E4oxF^$TNcgfaGdhGy(A#%dX3Z#OkH zVP~`Z@u4a6Zp6+^KOm9Luw_v)J0&T3uRN zLP<$UK{^?a$A#H!j@j+@>W+>MjE|4s0r2Bx#?8IDx=Kxg3r*96 z(P;c?b93`aB9Wk~s;W<~tl?NJ)<;A%I5-#u04Zf65C|Ch`}=o^h@#Qx;FSQ~ZnwfY z-_8(L8ki|8)diK-&0lfMW@q=Kp^n#IceS> z9UXGMRzaFR0y#`L}atsIDpc#OaVMsR#tYzIVaBf?{2qSxe$euCK38ol5y( zRzOYDZb~WT&dv_Cx3{lLDM!-o@pu-65MQRxeSLk)Uayykh&boZEFJaSz<P9~FE>0EVn^_CFgpW5c;=H&GBbWLq-EfhuR1Mu^|7Ru4l(ertEd4c2OV?$+S zrQhLje73#4eLIUd9=Tku4?G@Ewbg2sob!s@+}v#dU{cD@0n`96GsY^y;V?p>P(W2x zaf$cW<>%+WWU*L4L^}Wu0Id8!zo|~ATLWMKUDn{D={5P> Y-`guPwIv{%2LJ#707*qoM6N<$f=!^|D*ylh literal 0 HcmV?d00001