diff --git a/src/Drum.py b/src/Drum.py index 588b8a645..03b31e196 100644 --- a/src/Drum.py +++ b/src/Drum.py @@ -452,13 +452,12 @@ def renderNote(self, length, sustain, color, flat = False, tailOnly = False, isT if self.twoDnote == True: - if self.notedisappear == True:#Notes keep on going when missed - notecol = (1,1,1,1)#capo - else: - if flat:#Notes disappear when missed - notecol = (.1,.1,.1,1) - else: - notecol = (1,1,1,1) + if self.notedisappear ==0:#Notes keep on going when missed + notecol = (1,1,1)#capo + elif self.notedisappear == 1:#Notes disappear when missed + notecol = (.1,.1,.1) + elif self.notedisappear == 2: #Notes Turn Red when missed + notecol = (1,0,0,1) tailOnly = True @@ -842,27 +841,37 @@ def renderOpenNotes(self, visibility, song, pos): isTappable = False - if self.notedisappear == True:#Notes keep on going when missed - if event.played or event.hopod: + if self.notedisappear == 0:#Notes keep on going when missed + if event.played or event.hopod:#if the note isnt missed tailOnly = True length += z z = 0 if length <= 0: continue - if z < 0 and not (event.played or event.hopod): + if z < 0 and not (event.played or event.hopod):#if the note is missed color = (.6, .6, .6, .5 * visibility * f) - flat = False - else:#Notes disappear when missed - if z < 0: - if event.played or event.hopod: + flat = False + elif self.notedisappear == 1:#Notes disappear when missed + if z < 0:#if note past frets + if event.played or event.hopod:#if note was hit tailOnly = True length += z z = 0 if length <= 0: continue - else: + else:#note missed color = (.6, .6, .6, .5 * visibility * f) flat = False + if self.notedisappear == 2:#turn red when missed + if event.played or event.hopod: #if the note isnt missed + tailOnly = True + length += z + z = 0 + if length <= 0: + continue + if z < 0 and not (event.played or event.hopod): #if the note is missed + color = (1, 0, 0, 1)#turn note red + flat = False sustain = False @@ -1003,27 +1012,37 @@ def renderNotes(self, visibility, song, pos): isTappable = False - if self.notedisappear == True:#Notes keep on going when missed - if event.played or event.hopod: + if self.notedisappear == 0:#Notes keep on going when missed + if event.played or event.hopod:#if the note isnt missed tailOnly = True length += z z = 0 if length <= 0: continue - if z < 0 and not (event.played or event.hopod): + if z < 0 and not (event.played or event.hopod):#if the note is missed color = (.6, .6, .6, .5 * visibility * f) - flat = False - else:#Notes disappear when missed - if z < 0: - if event.played or event.hopod: + flat = False + elif self.notedisappear == 1:#Notes disappear when missed + if z < 0:#if note past frets + if event.played or event.hopod:#if note was hit tailOnly = True length += z z = 0 if length <= 0: continue - else: + else:#note missed color = (.6, .6, .6, .5 * visibility * f) flat = False + if self.notedisappear == 2:#turn red when missed + if event.played or event.hopod: #if the note isnt missed + tailOnly = True + length += z + z = 0 + if length <= 0: + continue + if z < 0 and not (event.played or event.hopod): #if the note is missed + color = (1, 0, 0, 1)#turn note red + flat = False sustain = False diff --git a/src/GameEngine.py b/src/GameEngine.py index eacd4fb3f..f2270e728 100644 --- a/src/GameEngine.py +++ b/src/GameEngine.py @@ -150,7 +150,7 @@ def sortOptionsByKey(dict): Config.define("performance", "game_priority", int, 2, text = _("Process Priority"), options = sortOptionsByKey({0: _("Idle"), 1: _("Low"), 2: _("Normal"), 3:_("Above Normal"), 4:_("High"), 5:_("Realtime")}), tipText = _("Change this to increase the priority of the FoFiX process. Don't change this unless you know what you're doing. DO NOT set this to Realtime. Ever.")) Config.define("performance", "restrict_to_first_processor", bool, False, text=_("Restrict to First Core (Win32 Only)"), options={False: _("No"), True: _("Yes")}, tipText=_("Choose whether to restrict the game to running on only the first processor core on the system. Only has an effect under Windows.")) #stump Config.define("performance", "use_psyco", bool, False, text=_("Use Psyco"), options={False: _("No"), True: _("Yes")}, tipText = _("Enable or disable the Psyco specializing compiler. Tests have indicated the game runs faster with it off.")) #stump -Config.define("game", "notedisappear", bool, False, text = _("Missed Notes"), options = {False: _("Disappear"), True: _("Keep on going")}, tipText = _("When you miss a note, this sets whether they disappear from the fretboard or scroll off the bottom of the screen.")) +Config.define("game", "notedisappear", int, 1, text = _("Missed Notes"), options = {0: _("Disappear"), 1: _("Keep on going"), 2: _("Turn Red")}, tipText = _("When you miss a note, this sets whether they disappear from the fretboard, scroll off the bottom of the screen or turn red")) #akedrou - Quickset (based on Fablaculp's Performance Autoset) Config.define("quickset", "performance", int, 0, text = _("Performance"), options = sortOptionsByKey({0: _("Manual"), 1: _("Pure Speed"), 2: _("Fast"), 3: _("Quality (Recommended)"), 4: _("Max Quality (Slow)")}), tipText = _("Set the performance of your game. You can fine-tune in the advanced menus.")) diff --git a/src/Guitar.py b/src/Guitar.py index 7b6818c34..88aa7dd87 100644 --- a/src/Guitar.py +++ b/src/Guitar.py @@ -431,15 +431,15 @@ def renderNote(self, length, sustain, kill, color, flat = False, tailOnly = Fals return + if self.twoDnote == True: #myfingershurt: this should be retrieved once at init, not repeatedly in-game whenever tails are rendered. - if self.notedisappear == True:#Notes keep on going when missed + if self.notedisappear ==0:#Notes keep on going when missed notecol = (1,1,1)#capo - else: - if flat:#Notes disappear when missed - notecol = (.1,.1,.1) - else: - notecol = (1,1,1) + elif self.notedisappear == 1:#Notes disappear when missed + notecol = (.1,.1,.1) + elif self.notedisappear == 2: #Notes Turn Red when missed + notecol = (1,0,0,1) tailOnly = True if self.theme < 2: @@ -836,27 +836,37 @@ def renderNotes(self, visibility, song, pos, killswitch): # Clip the played notes to the origin #myfingershurt: this should be loaded once at init, not every render... - if self.notedisappear == True:#Notes keep on going when missed - if event.played or event.hopod: + if self.notedisappear == 0:#Notes keep on going when missed + if event.played or event.hopod:#if the note isnt missed tailOnly = True length += z z = 0 if length <= 0: continue - if z < 0 and not (event.played or event.hopod): + if z < 0 and not (event.played or event.hopod):#if the note is missed color = (.6, .6, .6, .5 * visibility * f) flat = False - else:#Notes disappear when missed - if z < 0: - if event.played or event.hopod: + elif self.notedisappear == 1:#Notes disappear when missed + if z < 0:#if note past frets + if event.played or event.hopod:#if note was hit tailOnly = True length += z z = 0 if length <= 0: continue - else: + else:#note missed color = (.6, .6, .6, .5 * visibility * f) - flat = False + flat = False + if self.notedisappear == 2:#turn red when missed + if event.played or event.hopod: #if the note isnt missed + tailOnly = True + length += z + z = 0 + if length <= 0: + continue + if z < 0 and not (event.played or event.hopod): #if the note is missed + color = (1, 0, 0, 1)#turn note red + flat = False big = False self.bigMax = 0 @@ -1000,27 +1010,37 @@ def renderTails(self, visibility, song, pos, killswitch): # Clip the played notes to the origin #myfingershurt: this should be loaded once at init, not every render... - if self.notedisappear == True:#Notes keep on going when missed - if event.played or event.hopod: + if self.notedisappear == 0:#Notes keep on going when missed + if event.played or event.hopod:#if the note isnt missed tailOnly = True length += z z = 0 if length <= 0: continue - if z < 0 and not (event.played or event.hopod): + if z < 0 and not (event.played or event.hopod):#if the note is missed color = (.6, .6, .6, .5 * visibility * f) flat = False - else:#Notes disappear when missed - if z < 0: - if event.played or event.hopod: + elif self.notedisappear == 1:#Notes disappear when missed + if z < 0:#if note past frets + if event.played or event.hopod:#if note was hit tailOnly = True length += z z = 0 if length <= 0: continue - else: + else:#note missed color = (.6, .6, .6, .5 * visibility * f) - flat = False + flat = False + if self.notedisappear == 2:#turn red when missed + if event.played or event.hopod: #if the note isnt missed + tailOnly = True + length += z + z = 0 + if length <= 0: + continue + if z < 0 and not (event.played or event.hopod): #if the note is missed + color = (1, 0, 0, 1)#turn note red + flat = False big = False self.bigMax = 0