GuitarScene: remove some log settings

Remove settings "log_starpower_misses" and "log_lyric_events". Begin to remove "log_marker_notes" setting.
fofix · Jun 14, 2019 · 87812aa · 87812aa
1 parent a1c179c
commit 87812aa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/fofix/core/ConfigDefs.py b/fofix/core/ConfigDefs.py
@@ -215,9 +215,7 @@ def sortOptionsByKey(dict):
 Config.define("game",   "log_loadings",          int, 0,    text = _("Log Loadings"), options = {0: _("No"), 1: _("Yes")}, tipText = _("Logs resource loads. This is unnecessary information in bug reports; please leave it disabled unless you are certain it is relevant."))
 Config.define("game",   "log_sections",          int, 0,    text = _("Log MIDI Sections"), options = {0: _("No"), 1: _("Yes")}, tipText = _("Logs MIDI sections. This is unnecessary information in bug reports; please leave it disabled unless you are certain it is relevant."))
 Config.define("game",   "log_marker_notes",          int, 0,    text = _("Log Marker Notes"), options = {0: _("No"), 1: _("Yes")}, tipText = _("Logs MIDI marker notes (solo, SP, etc). This is unnecessary information in bug reports; please leave it disabled unless you are certain it is relevant."))
-Config.define("game",   "log_starpower_misses",          int, 0,    text = _("Log SP Misses"), options = {0: _("No"), 1: _("Yes")}, tipText = _("Logs SP phrase misses. This is unnecessary information."))
 Config.define("log",   "log_unedited_midis",          int, 0,    text = _("Log Unedited MIDIs"), options = {0: _("No"), 1: _("Yes")}, tipText = _("Logs when notes-unedited.mid is used. This is unnecessary information."))
-Config.define("log",   "log_lyric_events",          int, 0,    text = _("Log Lyric Events"), options = {0: _("No"), 1: _("Yes")}, tipText = _("Logs MIDI lyric events. This is unnecessary information in bug reports; please leave it disabled unless you are certain it is relevant."))
 Config.define("log",   "log_tempo_events",          int, 0,    text = _("Log Tempo Events"), options = {0: _("No"), 1: _("Yes")}, tipText = _("Logs MIDI tempo events. This is unnecessary information in bug reports; please leave it disabled unless you are certain it is relevant."))
 Config.define("log",   "log_image_not_found",       int, 0,    text = _("Log Missing Images"), options = {0: _("No"), 1:_("Only on single images"), 2:_("Always")}, tipText = _("Logs when files loaded are not found. 'Only on single images' skips logging when directories are loaded."))
 

diff --git a/fofix/core/Settings.py b/fofix/core/Settings.py
@@ -882,9 +882,7 @@ def __init__(self, engine):
           ConfigChoice(engine, engine.config, "game", "log_loadings", autoApply = True),#myfingershurt
           ConfigChoice(engine, engine.config, "game", "log_sections", autoApply = True),#myfingershurt
           ConfigChoice(engine, engine.config, "game", "log_marker_notes", autoApply = True),#myfingershurt
-          ConfigChoice(engine, engine.config, "game", "log_starpower_misses", autoApply = True),#myfingershurt
           ConfigChoice(engine, engine.config, "log",   "log_unedited_midis", autoApply = True),#myfingershurt
-          ConfigChoice(engine, engine.config, "log",   "log_lyric_events", autoApply = True),#myfingershurt
           ConfigChoice(engine, engine.config, "log",   "log_tempo_events", autoApply = True),#myfingershurt
           ConfigChoice(engine, engine.config, "log",   "log_image_not_found", autoApply = True),
         ]

diff --git a/fofix/game/guitarscene/GuitarScene.py b/fofix/game/guitarscene/GuitarScene.py
@@ -992,16 +992,13 @@ def __init__(self, engine, libraryName, songName):
         self.missPausesAnim = self.engine.config.get("game", "miss_pauses_anim")
         self.starpowerMode = self.engine.config.get("game", "starpower_mode")
         self.useMidiSoloMarkers = False
-        self.logMarkerNotes = self.engine.config.get("game", "log_marker_notes")
-        self.logStarpowerMisses = self.engine.config.get("game", "log_starpower_misses")
         self.soloFrameMode = self.engine.config.get("game", "solo_frame")
         self.whammyEffect = self.engine.config.get("audio", "whammy_effect")
         shaders.var["whammy"] = self.whammyEffect
         self.bigRockEndings = self.engine.config.get("game", "big_rock_endings")
         self.showFreestyleActive = self.engine.config.get("debug", "show_freestyle_active")
         self.showBpm = self.engine.config.get("debug", "show_bpm")
 
-        self.logLyricEvents = self.engine.config.get("log", "log_lyric_events")
         self.vbpmLogicType = self.engine.config.get("debug", "use_new_vbpm_beta")
 
         # switch to midi lyric mode option
@@ -1330,10 +1327,10 @@ def __init__(self, engine, libraryName, songName):
                                             if (guitar.isDrum and not oneLastSpNoteMarked) or (not guitar.isDrum):
                                                 spEvent.finalStar = True
                                                 oneLastSpNoteMarked = True
-                                if self.logMarkerNotes == 1:
-                                    log.debug("GuitarScene: P%d overdrive / starpower phrase marked between %f and %f" % (i+1, time, time+event.length))
-                                    if lastSpNoteTime == 0:
-                                        log.warning("This starpower phrase doesn't appear to have any finalStar notes marked... probably will not reward starpower!")
+                                # Marker notes logs
+                                log.debug("GuitarScene: P%d overdrive / starpower phrase marked between %f and %f" % (i+1, time, time+event.length))
+                                if lastSpNoteTime == 0:
+                                    log.warning("This starpower phrase doesn't appear to have any finalStar notes marked... probably will not reward starpower!")
                     self.midiSP = True
                     unisonCheck.extend(self.spTimes[i])
 
@@ -1562,16 +1559,16 @@ def __init__(self, engine, libraryName, songName):
 
             # test unpacking / decoding the lyrical lines:
             for midiLyricSubList in self.midiLyricLineEvents:
-                if self.logLyricEvents == 1:
-                    log.debug("...New MIDI lyric line:")
+                # Lyric events log
+                log.debug("... New MIDI lyric line:")
                 for lyricTuple in midiLyricSubList:
                     time, event = lyricTuple
-                    if self.logLyricEvents == 1:
-                        log.debug("MIDI Line-by-line lyric unpack test - time, event = " + str(time) + ", " + event.text)
+                    # Lyric events log
+                    log.debug("MIDI Line-by-line lyric unpack test - time, event = " + str(time) + ", " + event.text)
 
             for lineStartTime, midiLyricSimpleLineText in self.midiLyricLines:
-                if self.logLyricEvents == 1:
-                    log.debug("MIDI Line-by-line simple lyric line starting at time: " + str(lineStartTime) + ", " + midiLyricSimpleLineText)
+                # Lyric events log
+                log.debug("MIDI Line-by-line simple lyric line starting at time: " + str(lineStartTime) + ", " + midiLyricSimpleLineText)
 
         self.numMidiLyricLines = len(self.midiLyricLines)
 
@@ -3022,8 +3019,8 @@ def run(self, ticks):
                             if self.coOpType:
                                 self.coOpScoreCard.notesMissed += 1
                             if theNote.star or theNote.finalStar:
-                                if self.logStarpowerMisses == 1:
-                                    log.debug("SP Miss: run(), note: %d, gameTime: %s" % (theNote.number, self.timeLeft))
+                                # Starpower misses log
+                                log.debug("SP Miss: run(), note: %d, gameTime: %s" % (theNote.number, self.timeLeft))
                                 self.starNotesMissed[i] = True
                                 if self.unisonActive:
                                     self.inUnison[i] = False