variable hurt and ending screen timeout

This commit is contained in:
frank 2022-03-16 18:55:06 -04:00
parent c6d0fd544e
commit 77555b8ec9
3 changed files with 484 additions and 4 deletions

9
NS.py
View File

@ -161,7 +161,8 @@ class NS(Game, Animation):
{ {
"int": ["timer-max-time", "timer-start-level-1", "timer-start-level-2", "timer-start-level-3", "timer-addition-level-1", "int": ["timer-max-time", "timer-start-level-1", "timer-start-level-2", "timer-start-level-3", "timer-addition-level-1",
"timer-addition-level-2", "timer-addition-level-3", "sword-delay", "attract-gif-length", "attract-board-length", "timer-addition-level-2", "timer-addition-level-3", "sword-delay", "attract-gif-length", "attract-board-length",
"attract-reset-countdown", "level-select-reset-countdown", "level-select-press-length"], "attract-reset-countdown", "level-select-reset-countdown", "level-select-press-length", "ending-timeout",
"lizard-hurt-length"],
"float": "timer-warning-start" "float": "timer-warning-start"
}, },
"boss": "boss":
@ -1777,7 +1778,7 @@ class Chemtrails(Sprite):
Show hurt animation and trigger it to end after a delay Show hurt animation and trigger it to end after a delay
""" """
self.set_frameset("hurt") self.set_frameset("hurt")
self.play(self.cancel_hurt, delay=1000, play_once=True) self.play(self.cancel_hurt, delay=self.get_configuration("time", "lizard-hurt-length"), play_once=True)
def cancel_hurt(self): def cancel_hurt(self):
""" """
@ -2349,7 +2350,7 @@ class Boss(Animation):
self.queue = [] self.queue = []
self.brandish_complete = True self.brandish_complete = True
if win: if win:
self.level_sprite().set_frameset("hurt") self.level_sprite().set_frameset("death")
if self.get_configuration("system", "enable-level-select"): if self.get_configuration("system", "enable-level-select"):
self.get_game().add_time_to_scores(self.time_elapsed, self.level_index) self.get_game().add_time_to_scores(self.time_elapsed, self.level_index)
elif self.level_index == 2: elif self.level_index == 2:
@ -2956,7 +2957,7 @@ class Ending(Animation):
dialogue.set_avatar(self.tony_avatar) dialogue.set_avatar(self.tony_avatar)
dialogue.set_name("???") dialogue.set_name("???")
dialogue.show_text("") dialogue.show_text("")
self.play(self.start_wipe, delay=20000, play_once=True) self.play(self.start_wipe, delay=self.get_configuration("time", "ending-timeout"), play_once=True)
self.get_audio().play_bgm("end") self.get_audio().play_bgm("end")
self.slime_bag.activate() self.slime_bag.activate()
self.play(self.append_sword) self.play(self.append_sword)

2
config
View File

@ -76,6 +76,8 @@ attract-board-length = 3600
attract-reset-countdown = 30000 attract-reset-countdown = 30000
level-select-reset-countdown = 30000 level-select-reset-countdown = 30000
level-select-press-length = 2000 level-select-press-length = 2000
ending-timeout = 22000
lizard-hurt-length = 2000
[bgm] [bgm]
title = resource/bgm/title.ogg, .65 title = resource/bgm/title.ogg, .65

View File

@ -1,28 +1,505 @@
10202 0 10202 0
10202 0
10202 0
10202 0
10202 0
10202 0
10202 0
10202 0
10202 0
10202 0
10202 0
10202 0
10202 0
10202 0
10202 0
10202 0
10202 0
10202 0
10317 0 10317 0
10317 0
10317 0
10317 0
10317 0
10317 0
10317 0
10317 0
10317 0
10317 0
10317 0
10317 0
10317 0
10317 0
10317 0
10317 0
10317 0
10317 0
10403 0
10403 0
10403 0
10403 0
10403 0
10403 0
10403 0
10403 0
10403 0
10403 0
10403 0
10403 0
10403 0
10403 0
10403 0
10403 0
10403 0
10403 0 10403 0
10411 0 10411 0
10411 0
10411 0
10411 0
10411 0
10411 0
10411 0
10411 0
10411 0
10411 0
10411 0
10411 0
10411 0
10411 0
10411 0
10411 0
10411 0
10411 0
10417 0
10417 0
10417 0
10417 0
10417 0
10417 0
10417 0
10417 0
10417 0
10417 0
10417 0
10417 0
10417 0
10417 0
10417 0
10417 0
10417 0
10417 0 10417 0
10434 0 10434 0
10434 0
10434 0
10434 0
10434 0
10434 0
10434 0
10434 0
10434 0
10434 0
10434 0
10434 0
10434 0
10434 0
10434 0
10434 0
10434 0
10434 0
16483 0
16483 0
16483 0
16483 0
16483 0
16483 0
16483 0
16483 0
16483 0
16483 0
16483 0
16483 0
16483 0
16483 0
16483 0
16483 0
16483 0
16483 0 16483 0
21640 0 21640 0
21640 0
21640 0
21640 0
21640 0
21640 0
21640 0
21640 0
21640 0
21640 0
21640 0
21640 0
21640 0
21640 0
21640 0
21640 0
21640 0
21640 0
24404 0
24404 0
24404 0
24404 0
24404 0
24404 0
24404 0
24404 0
24404 0
24404 0
24404 0
24404 0
24404 0
24404 0
24404 0
24404 0
24404 0
24404 0 24404 0
33896 0 33896 0
33896 0
33896 0
33896 0
33896 0
33896 0
33896 0
33896 0
33896 0
33896 0
33896 0
33896 0
33896 0
33896 0
33896 0
33896 0
33896 0
33896 0
59424 0
59424 0
59424 0
59424 0
59424 0
59424 0
59424 0
59424 0
59424 0
59424 0
59424 0
59424 0
59424 0
59424 0
59424 0
59424 0
59424 0
59424 0 59424 0
64471 0 64471 0
64471 0
64471 0
64471 0
64471 0
64471 0
64471 0
64471 0
64471 0
64471 0
64471 0
64471 0
64471 0
64471 0
64471 0
64471 0
64471 0
64471 0
10329 1
10329 1
10329 1
10329 1
10329 1
10329 1
10329 1
10329 1
10329 1
10329 1
10329 1
10329 1
10329 1
10329 1
10329 1
10329 1
10329 1
10329 1 10329 1
10718 1 10718 1
10718 1
10718 1
10718 1
10718 1
10718 1
10718 1
10718 1
10718 1
10718 1
10718 1
10718 1
10718 1
10718 1
10718 1
10718 1
10718 1
10718 1
18586 1
18586 1
18586 1
18586 1
18586 1
18586 1
18586 1
18586 1
18586 1
18586 1
18586 1
18586 1
18586 1
18586 1
18586 1
18586 1
18586 1
18586 1 18586 1
21561 1 21561 1
21561 1
21561 1
21561 1
21561 1
21561 1
21561 1
21561 1
21561 1
21561 1
21561 1
21561 1
21561 1
21561 1
21561 1
21561 1
21561 1
21561 1
33442 1
33442 1
33442 1
33442 1
33442 1
33442 1
33442 1
33442 1
33442 1
33442 1
33442 1
33442 1
33442 1
33442 1
33442 1
33442 1
33442 1
33442 1 33442 1
68561 1 68561 1
68561 1
68561 1
68561 1
68561 1
68561 1
68561 1
68561 1
68561 1
68561 1
68561 1
68561 1
68561 1
68561 1
68561 1
68561 1
68561 1
68561 1
71763 1
71763 1
71763 1
71763 1
71763 1
71763 1
71763 1
71763 1
71763 1
71763 1
71763 1
71763 1
71763 1
71763 1
71763 1
71763 1
71763 1
71763 1 71763 1
95630 1 95630 1
95630 1
95630 1
95630 1
95630 1
95630 1
95630 1
95630 1
95630 1
95630 1
95630 1
95630 1
95630 1
95630 1
95630 1
95630 1
95630 1
95630 1
9474 2
9474 2
9474 2
9474 2
9474 2
9474 2
9474 2
9474 2
9474 2
9474 2
9474 2
9474 2
9474 2
9474 2
9474 2
9474 2
9474 2
9474 2 9474 2
10286 2 10286 2
10286 2
10286 2
10286 2
10286 2
10286 2
10286 2
10286 2
10286 2
10286 2
10286 2
10286 2
10286 2
10286 2
10286 2
10286 2
10286 2
10286 2
10433 2
10433 2
10433 2
10433 2
10433 2
10433 2
10433 2
10433 2
10433 2
10433 2
10433 2
10433 2
10433 2
10433 2
10433 2
10433 2
10433 2
10433 2 10433 2
10589 2 10589 2
10589 2
10589 2
10589 2
10589 2
10589 2
10589 2
10589 2
10589 2
10589 2
10589 2
10589 2
10589 2
10589 2
10589 2
10589 2
10589 2
10589 2
73798 2 73798 2
73798 2
73798 2
73798 2
73798 2
73798 2
73798 2
73798 2
73798 2
73798 2
73798 2
73798 2
73798 2
73798 2
73798 2
73798 2
73798 2
73798 2
74841 2
75161 2
75161 2
75161 2
75161 2
75161 2
75161 2
75161 2
75161 2
75161 2
75161 2
75161 2
75161 2
75161 2
75161 2
75161 2
75161 2
75161 2
75161 2 75161 2
86762 2 86762 2
86762 2
86762 2
86762 2
86762 2
86762 2
86762 2
86762 2
86762 2
86762 2
86762 2
86762 2
86762 2
86762 2
86762 2
86762 2
86762 2
86762 2
96171 2
96171 2
96171 2
96171 2
96171 2
96171 2
96171 2
96171 2
96171 2
96171 2
96171 2
96171 2
96171 2
96171 2
96171 2
96171 2
96171 2
96171 2 96171 2