Continue remove the GH2 sloppy hopo mode.

fofix · Oct 26, 2015 · a4b1d44 · a4b1d44
1 parent 16d5896
commit a4b1d44
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/fofix/game/Scorekeeper.py b/fofix/game/Scorekeeper.py
@@ -40,7 +40,7 @@
                   _("Effects Saved SP"), _("All Tapping"), _("HOPO Frequency: Most"), _("HOPO Frequency: Even More"), \
                   _("HOPO Frequency: More"), _("HOPO Frequency: Less"), _("HOPO Frequency: Least"), _("HOPO Disabled!"), \
                   _("Hit Window: Tightest!"), _("Hit Window: Tight!"), _("Hit Window: Wider"), _("Hit Window: Widest"), \
-                  _("Two Note Chords"), _("No Fail Mode"), "Scalable Cheat", _("Sloppy Mode!")]
+                  _("Two Note Chords"), _("No Fail Mode"), "Scalable Cheat"]
 SCALABLE_NAMES = [_("Song Slowdown"), _("Early Hit Window Adjustment")]
 SCORE_MULTIPLIER = [0, 10, 20, 30]
 BASS_GROOVE_SCORE_MULTIPLIER = [0, 10, 20, 30, 40, 50]

diff --git a/fofix/game/guitarscene/GuitarScene.py b/fofix/game/guitarscene/GuitarScene.py
@@ -1524,7 +1524,7 @@ def __init__(self, engine, libraryName, songName):
                 #MFH - should only be done the first time.
                 if self.hopoStyle > 0 or self.song.info.hopo == "on":
                     if not self.instruments[i].isDrum and not self.instruments[i].isVocal:
-                        if self.hopoStyle == 2 or self.hopoStyle == 3 or self.hopoStyle == 4:  #GH2 style HOPO system
+                        if self.hopoStyle == 2 or self.hopoStyle == 3:  #GH2 style HOPO system
                             self.song.track[i].markHopoGH2(self.song.info.eighthNoteHopo, self.hopoAfterChord, self.song.info.hopofreq)
                         elif self.hopoStyle == 1:   #RF-Mod style HOPO system
                             self.song.track[i].markHopoRF(self.song.info.eighthNoteHopo, self.song.info.hopofreq)
@@ -1535,7 +1535,7 @@ def __init__(self, engine, libraryName, songName):
                         self.song.track[i].markBars()
                         if self.hopoStyle > 0 or self.song.info.hopo == "on":
                             if not self.instruments[i].isDrum:
-                                if self.hopoStyle == 2 or self.hopoStyle == 3 or self.hopoStyle == 4:  #GH2 style HOPO system
+                                if self.hopoStyle == 2 or self.hopoStyle == 3:  #GH2 style HOPO system
                                     self.song.track[i].markHopoGH2(self.song.info.eighthNoteHopo, self.hopoAfterChord, self.song.info.hopofreq)
                                 elif self.hopoStyle == 1:   #RF-Mod style HOPO system
                                     self.song.track[i].markHopoRF(self.song.info.eighthNoteHopo, self.song.info.hopofreq)
@@ -4118,9 +4118,6 @@ def doPick3GH2(self, num, hopo = False, pullOff = False): #MFH - so DoPick knows
                 if (self.instruments[num].LastStrumWasChord or (self.instruments[num].wasLastNoteHopod and LastHopoFretStillHeld)):
                     ApplyPenalty = False
 
-            if (self.hopoStyle == 4 and hopo == True):  #GH2 Sloppy
-                ApplyPenalty = False
-
             if (self.hopoStyle == 3 and hopo == True):  #GH2
                 ApplyPenalty = False
                 if not (self.instruments[num].LastStrumWasChord or (self.instruments[num].wasLastNoteHopod and LastHopoFretStillHeld)):

diff --git a/fofix/game/guitarscene/instruments/Guitar.py b/fofix/game/guitarscene/instruments/Guitar.py
@@ -77,9 +77,6 @@ def __init__(self, engine, playerObj, scene, player = 0, bass = False):
 
         #myfingershurt:
         self.hopoStyle        = self.engine.config.get("game", "hopo_system")
-        self.gh2sloppy        = self.engine.config.get("game", "gh2_sloppy")
-        if self.gh2sloppy == 1:
-            self.hopoStyle = 4
         self.sfxVolume    = self.engine.config.get("audio", "SFX_volume")
 
         #blazingamer