diff --git a/fofix/core/Settings.py b/fofix/core/Settings.py index 3e23dae7f..9ab655ba7 100644 --- a/fofix/core/Settings.py +++ b/fofix/core/Settings.py @@ -716,26 +716,6 @@ def __init__(self, engine): ] self.advancedGameSettingsMenu = Menu.Menu(self.engine, self.advancedGameSettings, pos = (self.opt_text_x, self.opt_text_y), textColor = self.opt_text_color, selectedColor = self.opt_selected_color) - self.battleObjectSettings = [ - ConfigChoice(engine, engine.config, "game", "battle_Whammy", autoApply = True), - ConfigChoice(engine, engine.config, "game", "battle_Diff_Up", autoApply = True), - ConfigChoice(engine, engine.config, "game", "battle_String_Break", autoApply = True), - ConfigChoice(engine, engine.config, "game", "battle_Double", autoApply = True), - ConfigChoice(engine, engine.config, "game", "battle_Death_Drain", autoApply = True), - ConfigChoice(engine, engine.config, "game", "battle_Amp_Overload", autoApply = True), - ConfigChoice(engine, engine.config, "game", "battle_Switch_Controls", autoApply = True), - ConfigChoice(engine, engine.config, "game", "battle_Steal", autoApply = True), - ConfigChoice(engine, engine.config, "game", "battle_Tune", autoApply = True), - ] - - self.battleObjectSettingsMenu = Menu.Menu(self.engine, self.battleObjectSettings, pos = (self.opt_text_x, self.opt_text_y), textColor = self.opt_text_color, selectedColor = self.opt_selected_color) - - self.battleSettings = [ - (_("Battle Objects"), self.battleObjectSettingsMenu, _("Set which objects can appear in Battle Mode")), - ] - - self.battleSettingsMenu = Menu.Menu(self.engine, self.battleSettings, pos = (self.opt_text_x, self.opt_text_y), textColor = self.opt_text_color, selectedColor = self.opt_selected_color) - self.basicSettings = [ ConfigChoice(self.engine, self.engine.config, "game", "language"), ConfigChoice(self.engine, self.engine.config, "game", "T_sound", autoApply = True), #Faaa Drum sound @@ -749,7 +729,6 @@ def __init__(self, engine): (_("Advanced Gameplay Settings"), self.advancedGameSettingsMenu, _("Set advanced gameplay settings that affect the game rules.")), (_("Vocal Mode Settings"), self.lyricsSettingsMenu, _("Change settings that affect lyrics and in-game vocals.")), (_("HO/PO Settings"), self.hopoSettingsMenu, _("Change settings that affect hammer-ons and pull-offs (HO/PO).")), - (_("Battle Settings"), self.battleSettingsMenu, _("Change settings that affect battle mode.")), ] self.basicSettingsMenu = Menu.Menu(self.engine, self.basicSettings, pos = (self.opt_text_x, self.opt_text_y), textColor = self.opt_text_color, selectedColor = self.opt_selected_color) diff --git a/fofix/game/MainMenu.py b/fofix/game/MainMenu.py index a6fdfe2b3..66163c3f5 100644 --- a/fofix/game/MainMenu.py +++ b/fofix/game/MainMenu.py @@ -178,7 +178,6 @@ def __init__(self, engine): (_("Pro Face-Off"), lambda: self.newLocalGame(players = 2, mode2p = 1, maxplayers = 4)), (_("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 Battle"), lambda: self.newLocalGame(players = 2, mode2p = 6, allowDrum = False)), #akedrou- so you can block drums ] if not self.useSoloMenu: diff --git a/fofix/game/World.py b/fofix/game/World.py index 6ef57143f..e2bfb32d1 100644 --- a/fofix/game/World.py +++ b/fofix/game/World.py @@ -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, Co-Op, RB Co-Op, Battle + self.multiMode = multiMode #Face-Off, Pro FO, Co-Op, RB Co-Op self.allowGuitar = allowGuitar self.allowDrum = allowDrum self.allowMic = allowMic diff --git a/fofix/game/guitarscene/GuitarScene.py b/fofix/game/guitarscene/GuitarScene.py index cdf1a8cea..2091a1dec 100644 --- a/fofix/game/guitarscene/GuitarScene.py +++ b/fofix/game/guitarscene/GuitarScene.py @@ -302,10 +302,6 @@ def loadSettings(self): #MFH - no Jurgen in Career mode. if self.careerMode: self.autoPlay = False - if self.bossBattle: - self.autoPlay = True - self.jurg = [False for i in self.players] - self.jurg[1] = True self.hopoStyle = self.engine.config.get("game", "hopo_system") self.allTaps = 0 @@ -466,9 +462,6 @@ def songLoaded(self, song): song.difficulty[i] = Song.difficulties[Song.EXP_DIF] #for track-finding purposes! Don't change this, ok? continue song.difficulty[i] = player.difficulty - if self.bossBattle == True: - song.difficulty[1] = song.difficulty[0] - self.song.readyToGo = False @@ -649,28 +642,20 @@ def __init__(self, engine, libraryName, songName): superClass.__init__(engine, libraryName, songName) self.battle = False #QQstarS:new2 Bettle - self.battleGH = False #Qstick self.coOp = False self.coOpRB = False #akedrou self.coOpType = False self.practiceMode = False - self.bossBattle = False log.debug("GuitarScene init...") self.coOpPlayerMeter = 0 - #MFH - retrieve game parameters: self.gamePlayers = len(self.players) self.gameMode1p = self.engine.world.gameMode self.gameMode2p = self.engine.world.multiMode - if self.sinfo.bossBattle == "True" and self.gameMode1p == 2 and self.gamePlayers == 1: - self.bossBattle = True - self.engine.world.multiMode = 6 - self.gameMode2p = 6 - self.gamePlayers = 2 if self.gameMode1p == 2: self.careerMode = True else: @@ -683,29 +668,22 @@ def __init__(self, engine, libraryName, songName): #MFH - check for battle mode if self.gameMode2p == 1: self.battle = True - self.battleGH = False self.coOp = False self.coOpRB = False self.coOpType = False # Mode 2 was party mode elif self.gameMode2p == 3: self.battle = False - self.battleGH = False self.coOp = True self.coOpRB = False self.coOpType = True elif self.gameMode2p == 4: self.battle = False - self.battleGH = False self.coOp = False self.coOpRB = True self.coOpType = True # mode 5 was coop gh - elif self.gameMode2p == 6: - self.battle = False - self.battleGH = True - self.coOp = False - self.coOpRB = False + # mode 6 was GH3 battle self.coOpType = False else: self.battle = False @@ -769,42 +747,8 @@ def __init__(self, engine, libraryName, songName): self.aiSkill = [0 for i in self.players] self.aiHitPercentage = [0 for i in self.players] self.aiPlayNote = [True for i in self.players] - self.jurgBattleWhammyTime = [0 for i in self.players] - self.jurgBattleUseTime = [0 for i in self.players] self.aiUseSP = [0 for i in self.players] - self.battleItemsHolding = [0 for i in self.players] self.battleTarget = [0 for i in self.players] - for i, player in enumerate(self.players): - self.battleTarget[i] = i-1 - if self.battleTarget[i] == -1: - self.battleTarget[i] = self.numOfPlayers - 1 - self.aiSkill[i] = self.engine.config.get("game", "jurg_skill_p%d" % i) - if self.aiSkill[i] == 0: - self.aiHitPercentage[i] = 70 + (5*player.getDifficultyInt()) - self.jurgBattleWhammyTime[i] = 1000 - self.jurgBattleUseTime[i] = 5000 - elif self.aiSkill[i] == 1: - self.aiHitPercentage[i] = 80 + (5*player.getDifficultyInt()) - self.jurgBattleWhammyTime[i] = 750 - self.jurgBattleUseTime[i] = 2000 - elif self.aiSkill[i] == 2: - self.aiHitPercentage[i] = 85 + (5*player.getDifficultyInt()) - self.jurgBattleWhammyTime[i] = 750 - self.jurgBattleUseTime[i] = 2000 - elif self.aiSkill[i] == 3: - self.aiHitPercentage[i] = 90 + (5*player.getDifficultyInt()) - self.jurgBattleWhammyTime[i] = 500 - self.jurgBattleUseTime[i] = 1000 - elif self.aiSkill[i] == 4: - self.aiHitPercentage[i] = 95 + (5*player.getDifficultyInt()) - self.jurgBattleWhammyTime[i] = 250 - self.jurgBattleUseTime[i] = 1000 #this will be replaced by algorithm - elif self.aiSkill[i] == 5: - self.aiHitPercentage[i] = 100 - self.jurgBattleWhammyTime[i] = 200 - self.jurgBattleUseTime[i] = 1000 #this will be replaced by algorithm - if self.aiHitPercentage[i] > 100: - self.aiHitPercentage[i] = 100 self.jurgenText = self.engine.theme.jurgTextPos if float(self.jurgenText[2]) < 0.00035: @@ -814,8 +758,6 @@ def __init__(self, engine, libraryName, songName): if float(self.jurgenText[1]) < 0: self.jurgenText[1] = 0 - self.battleJurgMissTime = [0 for i in self.players] - self.whammySavesSP = self.engine.config.get("game", "whammy_saves_starpower") #MFH self.failingEnabled = self.engine.config.get("coffee", "failingEnabled") @@ -869,7 +811,6 @@ def __init__(self, engine, libraryName, songName): self.coOpStarPower = 0 self.coOpStarPowerTimer = 0 self.coOpStarPowerActive = [0 for i in self.players] - self.battleSuddenDeath = False self.failTimer = 0 self.rockTimer = 0 #myfingershurt self.youRock = False #myfingershurt @@ -940,16 +881,6 @@ def __init__(self, engine, libraryName, songName): self.tsBotNames = [_("KiD"), _("Stump"), _("AkedRobot"), _("Q"), _("MFH"), _("Jurgen")] #MFH pre-translate text strings: self.powerUpName = self.engine.theme.power_up_name - if self.battleGH: - self.tsBattleIcons = [None] * 9 - self.tsBattleIcons[1] = _("Death Drain") - self.tsBattleIcons[2] = _("Difficulty Up") - self.tsBattleIcons[3] = _("Broken String") - self.tsBattleIcons[4] = _("Whammy") - self.tsBattleIcons[5] = _("Powerup Steal") - self.tsBattleIcons[6] = _("Switch Controls") - self.tsBattleIcons[7] = _("Double Notes") - self.tsBattleIcons[8] = _("Amp Overload") self.tsNoteStreak = _("%d Note Streak") self.tsPhraseStreak = _("%d Phrase Streak") self.tsStarPowerReady = _("%s Ready") % self.powerUpName @@ -1268,11 +1199,6 @@ def __init__(self, engine, libraryName, songName): #MFH - no Jurgen in Career mode or tutorial mode or practice mode: if self.careerMode or self.tut or self.players[0].practiceMode: self.autoPlay = False - #force jurgen player 2 (and only player 2) for boss battles - if self.bossBattle: - self.autoPlay = True - self.jurg = [False for i in self.players] - self.jurg[1] = True self.rockFailUp = True #akedrou - fading mech self.rockFailViz = 0.0 @@ -1508,18 +1434,6 @@ def __init__(self, engine, libraryName, songName): elif self.hopoStyle == 1: #RF-Mod style HOPO system self.song.track[i].markHopoRF(self.song.info.eighthNoteHopo, self.song.info.hopofreq) - if self.battleGH and not self.instruments[i].isVocal: - if self.instruments[i].difficulty != 0: - self.song.difficulty[i] = Song.difficulties[self.instruments[i].difficulty-1] - 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: #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) - self.song.difficulty[i] = Song.difficulties[self.instruments[i].difficulty] - #myfingershurt: removing buggy disable stats option lastTime = 0 for i in range(self.numOfPlayers): @@ -1758,10 +1672,6 @@ def __init__(self, engine, libraryName, songName): self.textY = [.3 for i in self.players] self.scaleText2 = [0.0 for i in self.players] self.goingUP = [False for i in self.players] - if self.battleGH: - self.battleJustUsed = [0 for i in self.players] - self.battleText = [None for i in self.players] - self.battleTextTimer = [0.0 for i in self.players] self.lastStreak = [0 for i in self.players] if self.coOpType: self.coOpPhrase = len(self.scaleText) @@ -2194,11 +2104,7 @@ def resetVariablesToDefaults(self): self.rockTimer = 0 #myfingershurt self.youRock = False #myfingershurt self.rockFinished = False #myfingershurt - if self.battleGH: - if not self.battleSuddenDeath: - self.rock = [self.rockMax/2 for i in self.players] - else: - self.rock = [self.rockMax/2 for i in self.players] + self.rock = [self.rockMax/2 for i in self.players] self.minusRock = [0.0 for i in self.players] self.plusRock = [0.0 for i in self.players] self.coOpMulti = 1 @@ -2213,15 +2119,7 @@ def resetVariablesToDefaults(self): self.minusRock.append(0.0) self.plusRock.append(0.0) self.timesFailed = [0 for i in self.players] - if self.battleGH: - self.battleJustUsed = [0 for i in self.players] for instrument in self.instruments: - if self.battleGH: - if not self.battleSuddenDeath: - instrument.battleObjects = [0] * 3 - instrument.battleSuddenDeath = False - instrument.battleStatus = [False] * 9 - instrument.battleBeingUsed = [0] * 2 instrument.starPower = 0 instrument.coOpFailed = False #volshebnyi - BRE variables reset @@ -2251,7 +2149,6 @@ def resetVariablesToDefaults(self): shaders.var["scoreMult"][i]=1 shaders.var["multChangePos"][i]=-10.0 self.failed = False - self.battleSuddenDeath = False self.finalFailed = False self.failEnd = False self.drumScoringEnabled = True #MFH @@ -2480,50 +2377,6 @@ def handleWhammy(self, playerNum): try: #since analog axis might be set but joystick not present = crash #MFH - adding another nest of logic filtration; don't even want to run these checks unless there are playedNotes present! - if self.battleGH: - if self.isKillAnalog[i]: - if self.analogKillMode[i] == 2: #XBOX mode: (1.0 at rest, -1.0 fully depressed) - self.whammyVol[i] = 1.0 - (round(10* ((self.engine.input.joysticks[self.whichJoyKill[i]].get_axis(self.whichAxisKill[i])+1.0) / 2.0 ))/10.0) - elif self.analogKillMode[i] == 3: #XBOX Inverted mode: (-1.0 at rest, 1.0 fully depressed) - self.whammyVol[i] = (round(10* ((self.engine.input.joysticks[self.whichJoyKill[i]].get_axis(self.whichAxisKill[i])+1.0) / 2.0 ))/10.0) - else: #PS2 mode: (0.0 at rest, fluctuates between 1.0 and -1.0 when pressed) - self.whammyVol[i] = (round(10*(abs(self.engine.input.joysticks[self.whichJoyKill[i]].get_axis(self.whichAxisKill[i]))))/10.0) - if self.whammyVol[i] > 0.0 and self.whammyVol[i] < 0.1: - self.whammyVol[i] = 0.1 - #MFH - simple whammy tail determination: - if self.whammyVol[i] > 0.1: - self.instruments[i].battleWhammyDown = True - else: - if self.instruments[i].battleWhammyDown: - self.instruments[i].battleWhammyDown = False - if self.instruments[i].battleStatus[4]: - self.instruments[i].battleWhammyNow -= 1 - if self.instruments[i].battleWhammyNow == 0: - self.instruments[i].battleStatus[4] = False - for k, nowUsed in enumerate(self.instruments[i].battleBeingUsed): - if self.instruments[i].battleBeingUsed[k] == 4: - self.instruments[i].battleBeingUsed[k] = 0 - else: - self.battleTarget[i] += 1 - if self.battleTarget[i] == self.numOfPlayers: - self.battleTarget[i] = 0 - if self.battleTarget[i] == i: - self.battleTarget[i] += 1 - else: - if self.killswitchEngaged[i] == True: #QQstarS:new Fix the killswitch - self.killswitchEngaged[i] = True - if self.instruments[i].battleStatus[4]: - self.instruments[i].battleWhammyDown = True - else: - if self.instruments[i].battleStatus[4] and self.instruments[i].battleWhammyDown: - self.instruments[i].battleWhammyNow -= 1 - self.instruments[i].battleWhammyDown = False - if self.instruments[i].battleWhammyNow == 0: - self.instruments[i].battleStatus[4] = False - for k, nowUsed in enumerate(self.instruments[i].battleBeingUsed): - if self.instruments[i].battleBeingUsed[k] == 4: - self.instruments[i].battleBeingUsed[k] = 0 - if self.instruments[i].playedNotes: #Player i kill / whammy check: if self.isKillAnalog[i]: @@ -2736,12 +2589,6 @@ def handlePhrases(self, playerNum, playerStreak): self.scaleText[i] = self.maxDisplayTextScale if not self.displayText[i] == None: self.textTimer[i] += 1 - if self.battleGH: - if not self.battleText[i] == None: - self.battleTextTimer[i] += 1 - if self.battleTextTimer[i] > 500: - self.battleText[i] = None - self.battleTextTimer[i] = 0 if self.textTimer[i] > self.textTimeToDisplay: self.textY[i] -= 0.02 if self.textY[i] < 0: @@ -2771,7 +2618,7 @@ def handlePick(self, playerNum, hopo = False, pullOff = False): return #MFH - only actually pick if the player has not failed already! - if self.rock[i] > 0 and guitar.battleStatus[4] == False: + if self.rock[i] > 0: # Volshebnyi - new BRE and drum fills scoring if guitar.freestyleActive or (guitar.isDrum and guitar.drumFillsActive): @@ -2855,34 +2702,6 @@ def handleJurgen(self, pos): if instrument.isVocal: continue - if self.battleGH: - self.aiUseSP[i] = 0 - if self.aiSkill[i] == 4 or self.aiSkill[i] == 5: - - self.aiUseSP[i] += 25 * self.battleItemsHolding[i] #Number of Items in Holding - if self.instruments[self.battleTarget[i]].isStarPhrase: - self.aiUseSP[i] += 100 #always use when target is in starphrase - self.aiUseSP[i] += max((100 - (300*self.rock[self.battleTarget[i]])/self.rockMax), 0) #use when they're almost dead - self.aiUseSP[i] += max((100 - (500*self.rock[i])/self.rockMax), 0) #use when they're almost dead - else: - self.aiUseSP[i] = 100 - - #PRELIM LOGIC until algorithm goes in - if instrument.battleObjects[0] != 0: - if self.aiUseSP[i] > 50 and pos > instrument.battleGetTime + self.jurgBattleUseTime[i]: - self.activateSP(i) - if instrument.battleStatus[4]: - if instrument.battleWhammyNow == 0: - instrument.battleStatus[4] = False - for k, nowUsed in enumerate(instrument.battleBeingUsed): - if instrument.battleBeingUsed[k] == 4: - instrument.battleBeingUsed[k] = 0 - if instrument.battleWhammyNow != 0: - if pos - instrument.battleStartTimes[4] > self.jurgBattleWhammyTime[i]: - instrument.battleStartTimes[4] = pos - instrument.battleWhammyNow -= 1 - - # Have Jurgen attempt to strum on time instead of as early as possible # This method retrieves all notes in the window and only attempts to play them as they pass the current position, like a real player notes = self.instruments[i].getRequiredNotes(self.song, pos) #mfh - needed updatin' @@ -2898,19 +2717,6 @@ def handleJurgen(self, pos): changed = False held = 0 - if self.battleJurgMissTime[i] != jurgStrumTime: - self.battleJurgMissTime[i] = jurgStrumTime - if instrument.battleStatus[2] or instrument.battleStatus[6] or instrument.battleStatus[7] or instrument.battleStatus[8]: - if random.randint(0,100) > self.aiHitPercentage[i] - ((5-self.aiSkill[i])*15): - self.aiPlayNote[i] = False - else: - self.aiPlayNote[i] = True - else: - if random.randint(1,100) > self.aiHitPercentage[i]: - self.aiPlayNote[i] = False - else: - self.aiPlayNote[i] = True - # MFH - check if jurgStrumTime is close enough to the current position (or behind it) before actually playing the notes: if (not notes or jurgStrumTime <= (pos + 30)) and self.aiPlayNote[i]: for n, k in enumerate(self.keysList[i]): @@ -3114,10 +2920,7 @@ def rockmeterIncrease(self, playerNum, vScore = 0): def rockmeterDrain(self, playerNum): - if self.battleGH: - self.rock[playerNum] -= 70.0 - else: - self.rock[playerNum] -= 15.0 + self.rock[playerNum] -= 15.0 self.minusRock[playerNum] += self.minGain/10/self.coOpMulti @@ -3146,18 +2949,6 @@ def run(self, ticks): #QQstarS: Fix this funcion if self.vbpmLogicType == 1: self.handleTempo(self.song, self.songTime) #MFH - new global tempo / BPM handling logic - if self.bossBattle and self.rock[1] < 0: - if self.careerMode and not self.song.info.completed: - if self.song.info.count: - count = int(self.song.info.count) - else: - count = 0 - count += 1 - log.debug("Song completed") - self.song.info.completed = True - self.song.info.count = "%d" % count - self.song.info.save() - #MFH - new failing detection logic if self.failingEnabled: if self.numOfPlayers > 1 and self.coOpType: @@ -3178,10 +2969,6 @@ def run(self, ticks): #QQstarS: Fix this funcion if self.whammyEffect == 1: #pitchbend self.song.resetInstrumentPitch(self.players[i].part) self.coOpFailDone[i] = True - elif self.numOfPlayers > 1 and self.battleGH: - for i, player in enumerate(self.players): - if self.rock[i] <= 0: - self.failed = True else: somebodyStillAlive = False for i, player in enumerate(self.players): @@ -3232,78 +3019,6 @@ def run(self, ticks): #QQstarS: Fix this funcion instrument.camAngle = -degrees(atan(abs(self.camera.origin[2] - self.camera.target[2]) / abs(self.camera.origin[1] - self.camera.target[1]))) - if instrument.battleObjects[0] != 0: - self.battleItemsHolding[i] = 1 - else: - self.battleItemsHolding[i] = 0 - if instrument.battleObjects[1] != 0: - self.battleItemsHolding[i] = 2 - if instrument.battleObjects[2] != 0: - self.battleItemsHolding[i] = 3 - - if self.battleGH: - if instrument.battleBeingUsed[0] == 0 and instrument.battleBeingUsed[1] != 0: - instrument.battleBeingUsed[0] = instrument.battleBeingUsed[1] - instrument.battleBeingUsed[1] = 0 - - - if instrument.battleStatus[1]: - if self.songTime - instrument.battleDrainStart > instrument.battleDrainLength: - log.debug("Drain for Player %d disabled" % i) - instrument.battleStatus[1] = False - for k, nowUsed in enumerate(instrument.battleBeingUsed): - if instrument.battleBeingUsed[k] == 1: - instrument.battleBeingUsed[k] = 0 - else: - self.rockmeterDrain(i) - - for k, nowUsed in enumerate(instrument.battleBeingUsed): - if instrument.battleBeingUsed[k] == 5: - instrument.battleBeingUsed[k] = 0 - - if instrument.battleStatus[6]: - if self.songTime - instrument.battleStartTimes[6] > instrument.battleLeftyLength: - log.debug("Lefty Mode for Player %d disabled" % i) - instrument.battleStatus[6] = False - for k, nowUsed in enumerate(instrument.battleBeingUsed): - if instrument.battleBeingUsed[k] == 6: - instrument.battleBeingUsed[k] = 0 - - if instrument.battleStatus[8]: - if self.songTime - instrument.battleStartTimes[8] > instrument.battleAmpLength: - log.debug("Diff Up Mode for Player %d disabled" % i) - instrument.battleStatus[8] = False - for k, nowUsed in enumerate(instrument.battleBeingUsed): - if instrument.battleBeingUsed[k] == 8: - instrument.battleBeingUsed[k] = 0 - - - if instrument.battleStatus[7]: - if self.songTime - instrument.battleStartTimes[7] > instrument.battleDoubleLength: - log.debug("Diff Up Mode for Player %d disabled" % i) - instrument.battleStatus[7] = False - for k, nowUsed in enumerate(instrument.battleBeingUsed): - if instrument.battleBeingUsed[k] == 7: - instrument.battleBeingUsed[k] = 0 - - if instrument.battleStatus[3]: - if instrument.battleBreakNow <= 0: - instrument.battleStatus[3] = False - instrument.battleBreakString = 0 - for k, nowUsed in enumerate(instrument.battleBeingUsed): - if instrument.battleBeingUsed[k] == 3: - instrument.battleBeingUsed[k] = 0 - - if instrument.battleStatus[2]: - if self.songTime - instrument.battleStartTimes[2] > instrument.battleDiffUpLength: - log.debug("Diff Up Mode for Player %d disabled" % i) - instrument.battleStatus[2] = False - self.song.difficulty[i] = Song.difficulties[instrument.battleDiffUpValue] - instrument.difficulty = instrument.battleDiffUpValue - for k, nowUsed in enumerate(instrument.battleBeingUsed): - if instrument.battleBeingUsed[k] == 2: - instrument.battleBeingUsed[k] = 0 - if instrument.isDrum and instrument.freestyleSP: #MFH - this drum fill starpower activation logic should always be checked. self.activateSP(i) @@ -3347,13 +3062,8 @@ def run(self, ticks): #QQstarS: Fix this funcion if self.phrases > 1: - if self.battleGH: - if instrument.battleObjectGained and instrument.battleObjects[0] != 0: - self.battleText[i] = self.tsBattleIcons[instrument.battleObjects[0]] - instrument.battleObjectGained = False - else: - if instrument.starPower >= 50 and not instrument.starPowerActive: #QQstarS:Set [0] to [i] - self.newScalingText(playerNum, self.tsStarPowerReady ) + if instrument.starPower >= 50 and not instrument.starPowerActive: #QQstarS:Set [0] to [i] + self.newScalingText(playerNum, self.tsStarPowerReady ) self.hopFretboard(i, 0.04) #stump instrument.starPowerGained = False #QQstarS:Set [0] to [i] @@ -3619,10 +3329,7 @@ def run(self, ticks): #QQstarS: Fix this funcion #myfingershurt: This ends the song after 100 ticks of displaying "you rock" - if the use hasn't paused the game. if self.rockFinished and not self.pause: - if self.battleGH: - self.restartSong() - else: - self.goToResults() + self.goToResults() return #MFH @@ -3870,10 +3577,9 @@ def doPick(self, num): self.engine.data.starDingSound.play() self.stage.triggerPick(self.songTime, [n[1].number for n in self.instruments[num].playedNotes]) - if not self.battleGH: - if self.scoring[num].streak % 10 == 0: - self.lastMultTime[num] = self.songTime - self.instruments[num].setMultiplier(self.scoring[num].getScoreMultiplier()) + if self.scoring[num].streak % 10 == 0: + self.lastMultTime[num] = self.songTime + self.instruments[num].setMultiplier(self.scoring[num].getScoreMultiplier()) #myfingershurt if self.showAccuracy: @@ -4059,79 +3765,23 @@ def doPick3GH2(self, num, hopo = False, pullOff = False): #MFH - so DoPick knows def activateSP(self, num): #QQstarS: Fix this function, add a element "num" - if self.battleGH: #from akedrou: this will die horribly if you allow vocal players in. Just sayin'. ... sorry? - if self.songTime - self.battleJustUsed[num] > 1500: #must wait 1.5sec before next object use - if self.instruments[num].battleObjects[0] != 0: - self.engine.data.battleUsedSound.play() - self.instruments[self.battleTarget[num]].battleStatus[self.instruments[num].battleObjects[0]] = True - #start object use on other player - - self.instruments[self.battleTarget[num]].battleStartTimes[self.instruments[num].battleObjects[0]] = self.songTime - - if self.instruments[num].battleObjects[0] == 1: - self.instruments[self.battleTarget[num]].battleDrainStart = self.songTime - elif self.instruments[num].battleObjects[0] == 3: - self.instruments[self.battleTarget[num]].battleBreakNow = self.instruments[self.battleTarget[num]].battleBreakLimit - self.instruments[self.battleTarget[num]].battleBreakString = random.randint(0,4) - self.endPick(self.battleTarget[num]) - elif self.instruments[num].battleObjects[0] == 4: - self.instruments[self.battleTarget[num]].battleWhammyNow = self.instruments[self.battleTarget[num]].battleWhammyLimit - self.endPick(self.battleTarget[num]) - elif self.instruments[num].battleObjects[0] == 5: - if self.instruments[self.battleTarget[num]].battleObjects[0] != 0: - self.instruments[num].battleObjects[0] = self.instruments[self.battleTarget[num]].battleObjects[0] - self.instruments[self.battleTarget[num]].battleObjects[0] = self.instruments[self.battleTarget[num]].battleObjects[1] - self.instruments[self.battleTarget[num]].battleObjects[1] = self.instruments[self.battleTarget[num]].battleObjects[2] - self.instruments[self.battleTarget[num]].battleObjects[2] = 0 - self.instruments[self.battleTarget[num]].battleStatus[5] = False - self.battleText[num] = None - self.battleTextTimer[num] = 0 - self.instruments[num].battleObjectGained = self.instruments[num].battleObjects[0] - self.battleJustUsed[num] = self.songTime - return - - #tells us which objects are currently running - if self.instruments[self.battleTarget[num]].battleBeingUsed[1] != 0: - self.instruments[self.battleTarget[num]].battleStatus[self.instruments[self.battleTarget[num]].battleBeingUsed[1]] = False - if self.instruments[self.battleTarget[num]].battleBeingUsed[0] != 0: - if self.instruments[self.battleTarget[num]].battleBeingUsed[0] != self.instruments[num].battleObjects[0]: - self.instruments[self.battleTarget[num]].battleBeingUsed[1] = self.instruments[self.battleTarget[num]].battleBeingUsed[0] - self.instruments[self.battleTarget[num]].battleBeingUsed[0] = self.instruments[num].battleObjects[0] - - #bring up other objects in players queue - self.instruments[num].battleObjects[0] = self.instruments[num].battleObjects[1] - self.instruments[num].battleObjects[1] = self.instruments[num].battleObjects[2] - self.instruments[num].battleObjects[2] = 0 - self.battleText[num] = None - self.battleTextTimer[num] = 0 - self.battleJustUsed[num] = self.songTime - - else: - guitar = self.instruments[num] - if guitar.starPower >= 50: #QQstarS:Set [0] to [i] - if self.coOpRB: - while len(self.deadPlayerList) > 0: - i = self.deadPlayerList.pop(0) #keeps order intact (with >2 players) - if self.instruments[i].coOpFailed and self.timesFailed[i]<3: - self.instruments[i].coOpRescue(self.songTime) - self.rock[i] = self.rockMax * 0.667 - guitar.starPower -= 50 - self.engine.data.rescueSound.play() - self.coOpFailDone[i] = False - self.numDeadPlayers -= 1 - if not guitar.isVocal: - self.hopFretboard(num, 0.07) #stump - guitar.neck.overdriveFlashCount = 0 #MFH - this triggers the oFlash strings & timer - guitar.neck.ocount = 0 #MFH - this triggers the oFlash strings & timer - break - else: - if not guitar.starPowerActive: - self.engine.data.starActivateSound.play() - guitar.starPowerActive = True #QQstarS:Set [0] to [i] - if not guitar.isVocal: - self.hopFretboard(num, 0.07) #stump - guitar.neck.overdriveFlashCount = 0 #MFH - this triggers the oFlash strings & timer - guitar.neck.ocount = 0 #MFH - this triggers the oFlash strings & timer + guitar = self.instruments[num] + if guitar.starPower >= 50: #QQstarS:Set [0] to [i] + if self.coOpRB: + while len(self.deadPlayerList) > 0: + i = self.deadPlayerList.pop(0) #keeps order intact (with >2 players) + if self.instruments[i].coOpFailed and self.timesFailed[i]<3: + self.instruments[i].coOpRescue(self.songTime) + self.rock[i] = self.rockMax * 0.667 + guitar.starPower -= 50 + self.engine.data.rescueSound.play() + self.coOpFailDone[i] = False + self.numDeadPlayers -= 1 + if not guitar.isVocal: + self.hopFretboard(num, 0.07) #stump + guitar.neck.overdriveFlashCount = 0 #MFH - this triggers the oFlash strings & timer + guitar.neck.ocount = 0 #MFH - this triggers the oFlash strings & timer + break else: if not guitar.starPowerActive: self.engine.data.starActivateSound.play() @@ -4140,6 +3790,14 @@ def activateSP(self, num): #QQstarS: Fix this function, add a element "num" self.hopFretboard(num, 0.07) #stump guitar.neck.overdriveFlashCount = 0 #MFH - this triggers the oFlash strings & timer guitar.neck.ocount = 0 #MFH - this triggers the oFlash strings & timer + else: + if not guitar.starPowerActive: + self.engine.data.starActivateSound.play() + guitar.starPowerActive = True #QQstarS:Set [0] to [i] + if not guitar.isVocal: + self.hopFretboard(num, 0.07) #stump + guitar.neck.overdriveFlashCount = 0 #MFH - this triggers the oFlash strings & timer + guitar.neck.ocount = 0 #MFH - this triggers the oFlash strings & timer def goToResults(self): self.ending = True @@ -4248,12 +3906,6 @@ def keyPressed(self, key, unicode, control=None, pullOff = False): if not(LastHopoFretStillHeld and not HigherFretsHeld): #tapping a lower note should do nothing. pressed = True - if self.battleGH: - if self.instruments[num].battleStatus[3]: - if control == self.instruments[num].keys[self.instruments[num].battleBreakString]: - self.instruments[num].battleBreakNow -= 1 - self.controls.toggle(control, False) - if control in (self.instruments[num].actions): for k in self.keysList[num]: if self.controls.getState(k): @@ -4681,7 +4333,7 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly. #MFH: Realtime hit accuracy display: # TODO - Maybe break degug overlays into a function. - if ((self.inGameStats == 2 or (self.inGameStats == 1 and self.theme == 2) or self.hopoDebugDisp == 1 ) and (not self.pause and not self.failed) and not (self.coOpType and not i==0 and not self.coOp) and not self.battleGH): + if ((self.inGameStats == 2 or (self.inGameStats == 1 and self.theme == 2) or self.hopoDebugDisp == 1 ) and (not self.pause and not self.failed) and not (self.coOpType and not i==0 and not self.coOp)): #will not show on pause screen, unless HOPO debug is on (for debugging) if self.coOpRB: sNotesHit = self.coOpScoreCard.notesHit @@ -4712,11 +4364,6 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly. accDispX = 0.890 accDispYac = 0.140 accDispYam = 0.164 - if self.battleGH: - if i == 0: - accDispX = 0.890 - else: - accDispX = 0.110 font.render(text, (accDispX - w/2, accDispYac),(1, 0, 0),0.00140) #top-centered by streak under score trimmedAvMult = self.roundDecimalForDisplay(sAvMult) text = "%(avLab)s: %(avMult)sx" % \ diff --git a/fofix/game/guitarscene/Stage.py b/fofix/game/guitarscene/Stage.py index 666f29fb1..2be18f8b1 100644 --- a/fofix/game/guitarscene/Stage.py +++ b/fofix/game/guitarscene/Stage.py @@ -391,7 +391,7 @@ def restartVideo(self): def load(self, libraryName, songName, practiceMode = False): if self.scene.coOpType: rm = os.path.join("themes", self.themename, "rockmeter_coop.ini") - elif self.scene.battle or self.scene.battleGH: + elif self.scene.battle: rm = os.path.join("themes", self.themename, "rockmeter_profaceoff.ini") elif self.scene.gamePlayers > 1: rm = os.path.join("themes", self.themename, "rockmeter_faceoff.ini") diff --git a/fofix/game/guitarscene/instruments/Guitar.py b/fofix/game/guitarscene/instruments/Guitar.py index cb3514cef..a26ee8670 100644 --- a/fofix/game/guitarscene/instruments/Guitar.py +++ b/fofix/game/guitarscene/instruments/Guitar.py @@ -127,20 +127,16 @@ def renderFrets(self, visibility, song, controls): size = (self.boardWidth / self.strings / 2, self.boardWidth / self.strings / 2.4) texSize = (n / self.lanenumber, n / self.lanenumber + 1 / self.lanenumber) - if self.battleStatus[3] and self.battleFrets != None and self.battleBreakString == n: - texSize = (n/5.0+.042,n/5.0+0.158) - size = (.30, .40) - fretPos = 8 - round((self.battleBreakNow/self.battleBreakLimit) * 8) - texY = (fretPos/8.0,(fretPos + 1.0)/8) + # fret normal guitar/bass/drums + texY = (0.0, 1.0 / self.fretImgColNumber) - else: - texY = (0.0, 1.0 / self.fretImgColNumber)#fret normal guitar/bass/drums - - if controls.getState(self.keys[n]) or controls.getState(self.keys[n+5]):#fret press - texY = (1.0 / self.fretImgColNumber, 2.0 / self.fretImgColNumber) + # fret press + if controls.getState(self.keys[n]) or controls.getState(self.keys[n+5]): + texY = (1.0 / self.fretImgColNumber, 2.0 / self.fretImgColNumber) - elif self.hit[n] or (self.battleStatus[3] and self.battleBreakString == n):#frets on note hit - texY = (2.0 / self.fretImgColNumber,1.0) + #frets on note hit + elif self.hit[n]: + texY = (2.0 / self.fretImgColNumber,1.0) draw3Dtex(self.fretButtons, vertex = (size[0],size[1],-size[0],-size[1]), texcoord = (texSize[0], texY[0], texSize[1], texY[1]), coord = (x,v,0), multiples = True,color = fretColor, depth = True) @@ -301,9 +297,6 @@ def render(self, visibility, song, pos, controls, killswitch): gl.glEnable(gl.GL_COLOR_MATERIAL) if self.leftyMode: - if not self.battleStatus[6]: - gl.glScalef(-1, 1, 1) - elif self.battleStatus[6]: gl.glScalef(-1, 1, 1) if self.freestyleActive: @@ -334,113 +327,8 @@ def render(self, visibility, song, pos, controls, killswitch): self.renderFlames(song, pos) #MFH - only when freestyle inactive! if self.leftyMode: - if not self.battleStatus[6]: - gl.glScalef(-1, 1, 1) - elif self.battleStatus[6]: gl.glScalef(-1, 1, 1) - def getDoubleNotes(self, notes): - if self.battleStatus[7] and notes != []: - notes = sorted(notes, key=lambda x: x[0]) - curTime = 0 - tempnotes = [] - tempnumbers = [] - curNumbers = [] - noteCount = 0 - for time, note in notes: - noteCount += 1 - if not isinstance(note, Note): - if noteCount == len(notes) and len(curNumbers) < 3 and len(curNumbers) > 0: - maxNote = curNumbers[0] - minNote = curNumbers[0] - for i in range(0, len(curNumbers)): - if curNumbers[i] > maxNote: - maxNote = curNumbers[i] - if curNumbers[i] < minNote: - minNote = curNumbers[i] - curNumbers = [] - if maxNote < 4: - tempnumbers.append(maxNote + 1) - elif minNote > 0: - tempnumbers.append(minNote - 1) - else: - tempnumbers.append(2) - elif noteCount == len(notes) and len(curNumbers) > 2: - tempnumbers.append(-1) - curNumbers = [] - continue - if time != curTime: - if curTime != 0 and len(curNumbers) < 3: - maxNote = curNumbers[0] - minNote = curNumbers[0] - for i in range(0, len(curNumbers)): - if curNumbers[i] > maxNote: - maxNote = curNumbers[i] - if curNumbers[i] < minNote: - minNote = curNumbers[i] - curNumbers = [] - if maxNote < 4: - tempnumbers.append(maxNote + 1) - elif minNote > 0: - tempnumbers.append(minNote - 1) - else: - tempnumbers.append(2) - elif (curTime != 0 or noteCount == len(notes)) and len(curNumbers) > 2: - tempnumbers.append(-1) - curNumbers = [] - tempnotes.append((time,deepcopy(note))) - curTime = time - curNumbers.append(note.number) - if noteCount == len(notes) and len(curNumbers) < 3: - maxNote = curNumbers[0] - minNote = curNumbers[0] - for i in range(0, len(curNumbers)): - if curNumbers[i] > maxNote: - maxNote = curNumbers[i] - if curNumbers[i] < minNote: - minNote = curNumbers[i] - curNumbers = [] - if maxNote < 4: - tempnumbers.append(maxNote + 1) - elif minNote > 0: - tempnumbers.append(minNote - 1) - else: - tempnumbers.append(2) - elif noteCount == len(notes) and len(curNumbers) > 2: - tempnumbers.append(-1) - curNumbers = [] - else: - curNumbers.append(note.number) - if noteCount == len(notes) and len(curNumbers) < 3: - maxNote = curNumbers[0] - minNote = curNumbers[0] - for i in range(0, len(curNumbers)): - if curNumbers[i] > maxNote: - maxNote = curNumbers[i] - if curNumbers[i] < minNote: - minNote = curNumbers[i] - curNumbers = [] - if maxNote < 4: - tempnumbers.append(maxNote + 1) - elif minNote > 0: - tempnumbers.append(minNote - 1) - else: - tempnumbers.append(2) - elif noteCount == len(notes) and len(curNumbers) > 2: - tempnumbers.append(-1) - curNumbers = [] - noteCount = 0 - for time, note in tempnotes: - if tempnumbers[noteCount] != -1: - note.number = tempnumbers[noteCount] - noteCount += 1 - if time > self.battleStartTimes[7] + self.currentPeriod * self.beatsPerBoard and time < self.battleStartTimes[7] - self.currentPeriod * self.beatsPerBoard + self.battleDoubleLength: - notes.append((time,note)) - else: - noteCount += 1 - return sorted(notes, key=lambda x: x[0]) - - def controlsMatchNotes(self, controls, notes): # no notes? if not notes: diff --git a/fofix/game/guitarscene/instruments/Instrument.py b/fofix/game/guitarscene/instruments/Instrument.py index 42b0b6157..6d6295f22 100644 --- a/fofix/game/guitarscene/instruments/Instrument.py +++ b/fofix/game/guitarscene/instruments/Instrument.py @@ -128,51 +128,8 @@ def __init__(self, engine, playerObj, scene, player = 0): self.cappedScoreMult = 0 - self.battleSuddenDeath = False - self.battleObjectsEnabled = [] - self.battleSDObjectsEnabled = [] - if self.engine.config.get("game", "battle_Whammy") == 1: - self.battleObjectsEnabled.append(4) - if self.engine.config.get("game", "battle_Diff_Up") == 1: - self.battleObjectsEnabled.append(2) - if self.engine.config.get("game", "battle_String_Break") == 1: - self.battleObjectsEnabled.append(3) - if self.engine.config.get("game", "battle_Double") == 1: - self.battleObjectsEnabled.append(7) - if self.engine.config.get("game", "battle_Death_Drain") == 1: - self.battleObjectsEnabled.append(1) - if self.engine.config.get("game", "battle_Amp_Overload") == 1: - self.battleObjectsEnabled.append(8) - if self.engine.config.get("game", "battle_Switch_Controls") == 1: - self.battleObjectsEnabled.append(6) - if self.engine.config.get("game", "battle_Steal") == 1: - self.battleObjectsEnabled.append(5) - - log.debug("Battle Objects Enabled: "+str(self.battleObjectsEnabled)) - self.battleNextObject = 0 - self.battleObjects = [0] * 3 - self.battleBeingUsed = [0] * 2 - self.battleStatus = [False] * 9 - self.battleStartTimes = [0] * 9 - self.battleGetTime = 0 self.battleTarget = 0 - self.battleLeftyLength = 8000 - self.battleDiffUpLength = 15000 - self.battleDiffUpValue = playerObj.getDifficultyInt() - self.battleDoubleLength = 8000 - self.battleAmpLength = 8000 - self.battleWhammyLimit = 6 - self.battleWhammyNow = 0 - self.battleWhammyDown = False - self.battleBreakLimit = 8.0 - self.battleBreakNow = 0.0 - self.battleBreakString = 0 - self.battleObjectGained = 0 - self.battleSuddenDeath = False - self.battleDrainStart = 0 - self.battleDrainLength = 8000 - self.currentBpm = 120.0 #MFH - need a default 120BPM to be set in case a custom song has no tempo events. self.currentPeriod = 60000.0 / self.currentBpm self.targetBpm = self.currentBpm @@ -455,15 +412,7 @@ def loadNotes(self): engine.loadImgDrawing(self, "noteAnimatedPowerActive", get("animated_power_active.png")) engine.loadImgDrawing(self, "noteAnimatedPowerActiveHOPO", get("animated_power_active_hopo.png")) - if self.gameMode2p == 6: #battle multiplayer - if engine.loadImgDrawing(self, "noteButtons", get("spinnotesbattle.png")): - self.starSpinFrames = 8 - - if not self.isDrum and self.gameMode2p == 6: #battle multiplayer - if not self.engine.loadImgDrawing(self, "noteButtons", get("notesbattle.png")): - engine.loadImgDrawing(self, "noteButtons", get("notes.png")) - else: - engine.loadImgDrawing(self, "noteButtons", get("notes.png")) + engine.loadImgDrawing(self, "noteButtons", get("notes.png")) size = (self.boardWidth/self.strings/2, self.boardWidth/self.strings/2) self.noteVtx = np.array([[-size[0], 0.0, size[1]], @@ -527,8 +476,6 @@ def loadFrets(self): get = lambda file: self.checkPath("frets", file) if self.twoDkeys == True: #death_au - if self.gameMode2p == 6: - engine.loadImgDrawing(self, "battleFrets", get("battle_frets.png")) engine.loadImgDrawing(self, "fretButtons", get("fretbuttons.png")) else: defaultKey = False @@ -685,9 +632,6 @@ def getRequiredNotes(self, song, pos): not (event.hopod or event.played or event.skipped) and (time >= (pos - self.lateMargin)) and (time <= (pos + self.earlyMargin)) ] - if not self.isDrum and self.battleStatus[7]: - notes = self.getDoubleNotes(notes) - return sorted(notes, key=lambda x: x[0]) def areNotesTappable(self, notes): @@ -720,34 +664,8 @@ def getMissedNotes(self, song, pos, catchup = False): return sorted(notes, key=lambda x: x[0]) def getRequiredNotesForRender(self, song, pos): - if self.battleStatus[2] and self.difficulty != 0: - log.debug(self.battleDiffUpValue) - song.difficulty[self.player] = Song.difficulties[self.battleDiffUpValue] - track0 = song.track[self.player] - notes0 = [(time, event) for time, event in track0.getEvents(pos - self.currentPeriod * 2, pos + self.currentPeriod * self.beatsPerBoard)] - - song.difficulty[self.player] = Song.difficulties[self.battleDiffUpValue - 1] - track1 = song.track[self.player] - notes1 = [(time, event) for time, event in track1.getEvents(pos - self.currentPeriod * 2, pos + self.currentPeriod * self.beatsPerBoard)] - - notes = [] - for time,note in notes0: - if time < self.battleStartTimes[2] + self.currentPeriod * self.beatsPerBoard or time > self.battleStartTimes[2] - self.currentPeriod * self.beatsPerBoard + self.battleDiffUpLength: - notes.append((time,note)) - for time,note in notes1: - if time > self.battleStartTimes[2] + self.currentPeriod * self.beatsPerBoard and time < self.battleStartTimes[2] - self.currentPeriod * self.beatsPerBoard + self.battleDiffUpLength: - notes.append((time,note)) - notes0 = None - notes1 = None - track0 = None - track1 = None - notes = sorted(notes, key=lambda x: x[0]) - else: - track = song.track[self.player] - notes = [(time, event) for time, event in track.getEvents(pos - self.currentPeriod * 2, pos + self.currentPeriod * self.beatsPerBoard)] - - if self.battleStatus[7]: - notes = self.getDoubleNotes(notes) + track = song.track[self.player] + notes = [(time, event) for time, event in track.getEvents(pos - self.currentPeriod * 2, pos + self.currentPeriod * self.beatsPerBoard)] return notes @@ -1317,20 +1235,11 @@ def renderNotes(self, visibility, song, pos): for dfEvent in self.drumFillEvents: dfEvent.happened = True log.debug("star power added") - if self.gameMode2p == 6 and not self.isDrum: - if self.battleSuddenDeath: - self.battleObjects = [1] + self.battleObjects[:2] - else: - self.battleObjects = [self.battleObjectsEnabled[random.randint(0,len(self.battleObjectsEnabled)-1)]] + self.battleObjects[:2] - self.battleGetTime = pos - self.battleObjectGained = True - log.debug("Battle Object Gained, Objects %s" % str(self.battleObjects)) - else: - if self.starPower < 100: - self.starPower += 25 - if self.starPower > 100: - self.starPower = 100 + if self.starPower < 100: + self.starPower += 25 + if self.starPower > 100: + self.starPower = 100 self.overdriveFlashCount = 0 #MFH - this triggers the oFlash strings & timer self.starPowerGained = True @@ -1376,12 +1285,7 @@ def renderNotes(self, visibility, song, pos): if shaders.turnon: shaders.setVar("note_position",(x, (1.0 - visibility) ** (event.number + 1), z),"notes") - if self.battleStatus[8]: - renderNote = random.randint(0,2) - else: - renderNote = 0 - if renderNote == 0: - self.renderNote(length, sustain = sustain, color = color, tailOnly = tailOnly, isTappable = isTappable, fret = event.number, spNote = self.spNote) + self.renderNote(length, sustain = sustain, color = color, tailOnly = tailOnly, isTappable = isTappable, fret = event.number, spNote = self.spNote) gl.glPopMatrix() #myfingershurt: end FOR loop / note rendering loop @@ -1561,10 +1465,7 @@ def render3DKey(self, texture, model, x, y, color, fretNum, f): gl.glRotate(self.keyrot[4], 0, 1, 0) gl.glTranslatef(0, 0, self.keypos[4]) - if self.battleStatus[4]: - gl.glTranslatef(x, y + self.battleWhammyNow * .15 + color[3] * 6, 0) - else: - gl.glTranslatef(x, y + color[3] * 6, 0) + gl.glTranslatef(x, y + color[3] * 6, 0) if texture: gl.glColor4f(1,1,1,color[3]+1.0) @@ -1635,10 +1536,7 @@ def renderHitGlow(self): gl.glColor3f(c[0] * (1 - ms), c[1] * (1 - ms), c[2] * (1 - ms)) gl.glPushMatrix() - if self.battleStatus[4]: - gl.glTranslatef(x, y + self.battleWhammyNow * .15, 0) - else: - gl.glTranslatef(x, y, 0) + gl.glTranslatef(x, y, 0) gl.glScalef(.1 + .02 * ms * f, .1 + .02 * ms * f, .1 + .02 * ms * f) gl.glRotatef( 90, 0, 1, 0) gl.glRotatef(-90, 1, 0, 0) @@ -1659,14 +1557,9 @@ def renderHitGlow(self): f += 2 - if self.battleStatus[4]: - draw3Dtex(self.glowDrawing, coord = (x, self.battleWhammyNow * .15, 0.01), rot = (f * 90 + self.time, 0, 1, 0), - texcoord = (0.0, 0.0, 1.0, 1.0), vertex = (-size * f, -size * f, size * f, size * f), - multiples = True, alpha = True, color = glowcol) - else: - draw3Dtex(self.glowDrawing, coord = (x, 0, 0.01), rot = (f * 90 + self.time, 0, 1, 0), - texcoord = (0.0, 0.0, 1.0, 1.0), vertex = (-size * f, -size * f, size * f, size * f), - multiples = True, alpha = True, color = glowcol) + draw3Dtex(self.glowDrawing, coord = (x, 0, 0.01), rot = (f * 90 + self.time, 0, 1, 0), + texcoord = (0.0, 0.0, 1.0, 1.0), vertex = (-size * f, -size * f, size * f, size * f), + multiples = True, alpha = True, color = glowcol) def renderTail(self, song, length, sustain, kill, color, tailOnly = False, isTappable = False, big = False, fret = 0, spNote = False, freestyleTail = 0, pos = 0): @@ -2072,16 +1965,11 @@ def renderTails(self, visibility, song, pos, killswitch): gl.glPushMatrix() gl.glTranslatef(x, (1.0 - visibility) ** (event.number + 1), z) - if self.battleStatus[8]: - renderNote = random.randint(0,2) + if big == True and num < self.bigMax: + num += 1 + self.renderTail(song, length, sustain = sustain, kill = killswitch, color = color, tailOnly = tailOnly, isTappable = isTappable, big = True, fret = event.number, spNote = spNote, pos = pos) else: - renderNote = 0 - if renderNote == 0: - if big == True and num < self.bigMax: - num += 1 - self.renderTail(song, length, sustain = sustain, kill = killswitch, color = color, tailOnly = tailOnly, isTappable = isTappable, big = True, fret = event.number, spNote = spNote, pos = pos) - else: - self.renderTail(song, length, sustain = sustain, kill = killswitch, color = color, tailOnly = tailOnly, isTappable = isTappable, fret = event.number, spNote = spNote, pos = pos) + self.renderTail(song, length, sustain = sustain, kill = killswitch, color = color, tailOnly = tailOnly, isTappable = isTappable, fret = event.number, spNote = spNote, pos = pos) gl.glPopMatrix() diff --git a/fofix/game/guitarscene/instruments/ProGuitar.py b/fofix/game/guitarscene/instruments/ProGuitar.py index f65cb6e44..714ce7426 100644 --- a/fofix/game/guitarscene/instruments/ProGuitar.py +++ b/fofix/game/guitarscene/instruments/ProGuitar.py @@ -60,14 +60,6 @@ def loadNotes(self): engine.loadImgDrawing(self, "noteAnimatedPowerHOPO", get("animated_power_hopo.png")) engine.loadImgDrawing(self, "noteAnimatedPowerActive", get("animated_power_active.png")) engine.loadImgDrawing(self, "noteAnimatedPowerActiveHOPO", get("animated_power_active_hopo.png")) - - if self.gameMode2p == 6: #battle multiplayer - if engine.loadImgDrawing(self, "noteButtons", get("spinnotesbattle.png")): - self.starSpinFrames = 8 - - if self.gameMode2p == 6: #battle multiplayer - if not self.engine.loadImgDrawing(self, "noteButtons", get("notesbattle.png")): - engine.loadImgDrawing(self, "noteButtons", get("notes.png")) else: engine.loadImgDrawing(self, "noteButtons", get("notes.png")) @@ -304,19 +296,10 @@ def renderNotes(self, visibility, song, pos): for dfEvent in self.drumFillEvents: dfEvent.happened = True log.debug("star power added") - if self.gameMode2p == 6 and not self.isDrum: - if self.battleSuddenDeath: - self.battleObjects = [1] + self.battleObjects[:2] - else: - self.battleObjects = [self.battleObjectsEnabled[random.randint(0,len(self.battleObjectsEnabled)-1)]] + self.battleObjects[:2] - self.battleGetTime = pos - self.battleObjectGained = True - log.debug("Battle Object Gained, Objects %s" % str(self.battleObjects)) - else: - if self.starPower < 100: - self.starPower += 25 - if self.starPower > 100: - self.starPower = 100 + if self.starPower < 100: + self.starPower += 25 + if self.starPower > 100: + self.starPower = 100 self.overdriveFlashCount = 0 #MFH - this triggers the oFlash strings & timer self.starPowerGained = True @@ -354,12 +337,7 @@ def renderNotes(self, visibility, song, pos): if shaders.turnon: shaders.setVar("note_position",(x, (1.0 - visibility) ** (event.number + 1), z),"notes") - if self.battleStatus[8]: - renderNote = random.randint(0,2) - else: - renderNote = 0 - if renderNote == 0: - self.renderNote(length, sustain = sustain, color = color, tailOnly = tailOnly, isTappable = isTappable, string = event.lane, fret = event.number, spNote = spNote) + self.renderNote(length, sustain = sustain, color = color, tailOnly = tailOnly, isTappable = isTappable, string = event.lane, fret = event.number, spNote = spNote) gl.glPopMatrix() #myfingershurt: end FOR loop / note rendering loop