Skip to content

Commit

Permalink
Remove party mode.
Browse files Browse the repository at this point in the history 
It is a very old game mode, that was an early attempt at multiplayer for Frets On Fire. With real multiplayer this mode is obsolete.
  • Loading branch information
@mdsitton
mdsitton committed Sep 14, 2015
1 parent 617ad56 commit 61299ad
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 54 deletions.
1 change: 0 additions & 1 deletion fofix/core/ConfigDefs.py
View file
Expand Up @@ -264,7 +264,6 @@ def sortOptionsByKey(dict):
Config.define("game", "whammy_changes_sort_order", bool, True, text = _("Whammy Changes Sort Order"), options = {False: _("No"), True: _("Yes")}, tipText = _("When enabled, pressing the whammy bar will change the sort order in the setlist."))
Config.define("fretboard", "neck_intro_animation", int, 4, text = _("Neck Intro Animation"), options = sortOptionsByKey({0: _("Original"), 1: _("Guitar Hero"), 2: _("Rock Band"), 3: _("Off"), 4: _("Theme")}), tipText = _("Sets what the neck animation looks like. Set it to 'Theme' to leave it to the theme creator.")) #weirdpeople
Config.define("fretboard", "point_of_view", int, 5, text = _("Point Of View"), options = sortOptionsByKey({0: _("FoF"), 1: _("GH3"), 2: _("Rock Band"), 3: _("GH2"), 4: _("Rock Rev"), 5: _("Theme")}), tipText = _("Sets the camera's point of view. Set it to any game, or set it to 'Theme' to leave it to the theme creator.")) #Racer, Blazingamer
Config.define("game", "party_time", int, 30, text = _("Party Mode Timer"), options = dict([(n, n) for n in range(1, 99)]), tipText = _("Sets the timer in Party Mode."))
Config.define("performance", "disable_libcount", bool, True, text = _("Show Setlist Size"), options = {False: _("Yes"), True: _("No")}, tipText = _("Show the number of songs inside of each setlist."))

Config.define("game", "jurg_p0", bool, False, text = _("P1 AI"), options = {True: _("On"), False: _("Off")}, tipText = _("Enable or disable the player 1 AI"))
Expand Down
8 changes: 2 additions & 6 deletions fofix/core/Player.py
View file
Expand Up @@ -971,17 +971,13 @@ def getDifficultyInt(self):

def getPart(self):
#myfingershurt: this should not be reading from the ini file each time it wants to know the part. Also add "self."
if self.whichPart == -1:
return "Party Mode"
elif self.whichPart == -2:
if self.whichPart == -2:
return "No Player 2"
else:
return Song.parts.get(self.whichPart)

def setPart(self, part):
if part == "Party Mode":
self.whichPart = -1 #myfingershurt: also need to set self.part here to avoid unnecessary ini reads
elif part == "No Player 2":
if part == "No Player 2":
self.whichPart = -2 #myfingershurt: also need to set self.part here to avoid unnecessary ini reads
else:
self.whichPart = part.id #myfingershurt: also need to set self.part here to avoid unnecessary ini reads
Expand Down
1 change: 0 additions & 1 deletion fofix/core/Settings.py
View file
Expand Up @@ -710,7 +710,6 @@ def __init__(self, engine):
ConfigChoice(self.engine, self.engine.config, "game", "ignore_open_strums", autoApply = True), #myfingershurt
ConfigChoice(self.engine, self.engine.config, "game", "big_rock_endings", autoApply = True, isQuickset = 2),#myfingershurt
ConfigChoice(self.engine, self.engine.config, "game", "starpower_mode", autoApply = True),#myfingershurt
ConfigChoice(self.engine, self.engine.config, "game", "party_time", autoApply = True),
ConfigChoice(self.engine, self.engine.config, "game", "keep_play_count", autoApply = True),
ConfigChoice(self.engine, self.engine.config, "game", "lost_focus_pause", autoApply = True),
]
Expand Down
1 change: 0 additions & 1 deletion fofix/game/MainMenu.py
View file
Expand Up @@ -175,7 +175,6 @@ def __init__(self, engine):
multPlayerMenu = [
(_("Face-Off"), lambda: self.newLocalGame(players = 2, maxplayers = 4)),
(_("Pro Face-Off"), lambda: self.newLocalGame(players = 2, mode2p = 1, maxplayers = 4)),
(_("Party Mode"), lambda: self.newLocalGame( mode2p = 2)),
(_("FoFiX Co-Op"), lambda: self.newLocalGame(players = 2, mode2p = 3, maxplayers = 4, allowMic = allowMic)),
(_("RB Co-Op"), lambda: self.newLocalGame(players = 2, mode2p = 4, maxplayers = 4, allowMic = allowMic)),
(_("GH Co-Op"), lambda: self.newLocalGame(players = 2, mode2p = 5, maxplayers = 4)),
Expand Down
4 changes: 1 addition & 3 deletions fofix/game/World.py
View file
Expand Up @@ -36,7 +36,7 @@ def __init__(self, engine, players, maxplayers = None, gameMode = 0, multiMode =
self.minPlayers = players
self.maxPlayers = maxplayers or players
self.gameMode = gameMode #Quickplay, Practice, Career
self.multiMode = multiMode #Face-Off, Pro FO, Party, Co-Op, RB Co-Op, GH Co-Op, Battle
self.multiMode = multiMode #Face-Off, Pro FO, Co-Op, RB Co-Op, GH Co-Op, Battle
self.allowGuitar = allowGuitar
self.allowDrum = allowDrum
self.allowMic = allowMic
Expand All @@ -54,8 +54,6 @@ def setGameName(self):
self.gameName = _("Face-Off")
elif self.gameMode == 1:
self.gameName = _("Pro Face-Off")
elif self.gameMode == 2:
self.gameName = _("Party Mode")
elif self.gameMode == 3:
self.gameName = _("FoFiX Co-Op Mode")
elif self.gameMode == 4:
Expand Down
47 changes: 5 additions & 42 deletions fofix/game/guitarscene/GuitarScene.py
View file
Expand Up @@ -684,15 +684,8 @@ def __init__(self, engine, libraryName, songName):

if self.gameMode1p == 1:
self.practiceMode = True

#MFH - check for party mode
if self.gameMode2p == 2:
self.partyMode = True
self.gamePlayers = 1
self.partySwitch = 0
self.partyTime = self.engine.config.get("game", "party_time")
self.partyPlayer = 0
elif self.gamePlayers > 1:

if self.gamePlayers > 1:
#MFH - check for battle mode
if self.gameMode2p == 1:
self.battle = True
Expand All @@ -701,6 +694,9 @@ def __init__(self, engine, libraryName, songName):
self.coOpRB = False
self.coOpGH = False
self.coOpType = False

# Mode 2 was party mode

elif self.gameMode2p == 3:
self.battle = False
self.battleGH = False
Expand Down Expand Up @@ -2369,10 +2365,6 @@ def resetVariablesToDefaults(self):
instrument.neck.guitarSolo = False
instrument.currentGuitarSoloHitNotes = 0

if self.partyMode == True:
self.instruments[0].keys = self.players[0].keys
self.instruments[0].actions = self.players[0].actions
self.keysList = self.players[0].keys
if self.battle == True:
for i in range(self.numOfPlayers):
self.instruments[i].actions = self.players[i].actions
Expand Down Expand Up @@ -6259,32 +6251,3 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly.
if countdownPos < 0:
countdownPos = 0
self.engine.theme.setBaseColor()

#Party mode #FIXME
if self.partyMode == True:
timeleft = (self.songTime - self.partySwitch) / 1000
if timeleft > self.partyTime:
self.partySwitch = self.songTime
if self.partyPlayer == 0:
self.instruments[0].keys = PLAYER2KEYS
self.instruments[0].actions = PLAYER2ACTIONS
self.keysList = [PLAYER2KEYS]
self.partyPlayer = 1
else:
self.instruments[0].keys = PLAYER1KEYS
self.instruments[0].actions = PLAYER1ACTIONS
self.keysList = [PLAYER1KEYS]
self.partyPlayer = 0
t = "%d" % (self.partyTime - timeleft + 1)
if self.partyTime - timeleft < 5:
glColor3f(1, 0, 0)
w, h = font.getStringSize(t)#QQstarS:party
font.render(t, (.5 - w / 2, 0.4)) #QQstarS:party
elif self.partySwitch != 0 and timeleft < 1:
t = "Switch"
glColor3f(0, 1, 0)
w, h = font.getStringSize(t)#QQstarS:party
font.render(t, (.5 - w / 2, 0.4))#QQstarS:party
else:#QQstarS:party
w, h = font.getStringSize(t)
font.render(t, (.5 - w / 2, y + h))

0 comments on commit 61299ad

Please sign in to comment.