From 02bda7161af40c574f82b1f127b536fe73424b97 Mon Sep 17 00:00:00 2001 From: nhydock Date: Sun, 22 Aug 2010 23:46:13 -0400 Subject: [PATCH] Should fix most, if not all, of the calls to variables that I removed from the theme.py --- src/GuitarScene.py | 42 +++++++----------------------------------- src/Instrument.py | 1 - src/Theme.py | 5 +++++ 3 files changed, 12 insertions(+), 36 deletions(-) diff --git a/src/GuitarScene.py b/src/GuitarScene.py index 43c67809c..2e26ea7d1 100644 --- a/src/GuitarScene.py +++ b/src/GuitarScene.py @@ -374,12 +374,12 @@ def __init__(self, engine, libraryName, songName): self.camera.target = (0.0, 1.0, 8.0) self.camera.origin = (0.0, 2.0, -3.4) - self.targetX = self.engine.theme.povTargetX - self.targetY = self.engine.theme.povTargetY - self.targetZ = self.engine.theme.povTargetZ - self.originX = self.engine.theme.povOriginX - self.originY = self.engine.theme.povOriginY - self.originZ = self.engine.theme.povOriginZ + self.targetX = self.engine.theme.povTarget[0] + self.targetY = self.engine.theme.povTarget[1] + self.targetZ = self.engine.theme.povTarget[2] + self.originX = self.engine.theme.povOrigin[0] + self.originY = self.engine.theme.povOrigin[1] + self.originZ = self.engine.theme.povOrigin[0] self.customPOV = False self.ending = False @@ -670,7 +670,6 @@ def __init__(self, engine, libraryName, songName): self.starScoreUpdates = self.engine.config.get("performance", "star_score_updates") #MFH self.currentlyAnimating = True self.missPausesAnim = self.engine.config.get("game", "miss_pauses_anim") #MFH - self.displayAllGreyStars = self.engine.theme.displayAllGreyStars self.starpowerMode = self.engine.config.get("game", "starpower_mode") #MFH self.useMidiSoloMarkers = False self.logMarkerNotes = self.engine.config.get("game", "log_marker_notes") @@ -888,10 +887,6 @@ def __init__(self, engine, libraryName, songName): self.phrases = self.engine.config.get("coffee", "game_phrases")#blazingamer self.starfx = self.engine.config.get("game", "starfx")#blazingamer - smallMult = self.engine.config.get("game","small_rb_mult") - self.rbmfx = False - if smallMult == 2 or (smallMult == 1 and self.engine.theme.smallMult): - self.rbmfx = True self.boardY = 2 self.rbOverdriveBarGlowVisibility = 0 self.rbOverdriveBarGlowFadeOut = False @@ -1597,35 +1592,12 @@ def __init__(self, engine, libraryName, songName): self.fail_text_color = self.engine.theme.hexToColor(self.engine.theme.fail_text_colorVar) self.fail_selected_color = self.engine.theme.hexToColor(self.engine.theme.fail_selected_colorVar) self.fail_completed_color = self.engine.theme.hexToColor(self.engine.theme.fail_completed_colorVar) - settingsMenu = Settings.GameSettingsMenu(self.engine, self.pause_text_color, self.pause_selected_color, players = self.playerList) careerSettingsMenu = Settings.GameCareerSettingsMenu(self.engine, self.pause_text_color, self.pause_selected_color, players = self.playerList) settingsMenu.fadeScreen = False - careerSettingsMenu.fadeScreen = False - - - # evilynux - More themeable options - self.rockmeter_score_color = self.engine.theme.rockmeter_score_colorVar - - #self.fail_completed_color = self.engine.theme.hexToColor(self.engine.theme.song_name_selected_colorVar) # text same color as selected song - #self.fail_completed_color = self.engine.theme.hexToColor(self.engine.theme.fail_text_colorVar) #No, now same as fail_text color. + careerSettingsMenu.fadeScreen = False - self.ingame_stats_color = self.engine.theme.ingame_stats_colorVar - - - if self.pause_text_color == None: - self.pause_text_color = (1,1,1) - if self.pause_selected_color == None: - self.pause_selected_color = (1,0.75,0) - - if self.fail_text_color == None: - self.fail_text_color = (1,1,1) - if self.fail_selected_color == None: - self.fail_selected_color = (1,0.75,0) - if self.fail_completed_color == None: - self.fail_completed_color = self.fail_text_color - Log.debug("Pause text / selected colors: " + str(self.pause_text_color) + " / " + str(self.pause_selected_color)) diff --git a/src/Instrument.py b/src/Instrument.py index bf09a170e..82e445524 100644 --- a/src/Instrument.py +++ b/src/Instrument.py @@ -327,7 +327,6 @@ def __init__(self, engine, playerObj, player = 0): self.spotColor = self.engine.theme.spotColor self.keyColor = self.engine.theme.keyColor self.key2Color = self.engine.theme.key2Color - self.tracksColor = self.engine.theme.tracksColor fC = [(.84, 1, .51), (1, .53, .5), (.98, .96, .42), (.64, .97, 1), (1, .87, .55)] self.flameColors = [fC,fC,fC,fC] self.gh3flameColor = (.75,.36,.02) diff --git a/src/Theme.py b/src/Theme.py index 6ef359968..0aab2e530 100644 --- a/src/Theme.py +++ b/src/Theme.py @@ -145,11 +145,14 @@ def get(value, type = str, default = None): default_color = ["#22FF22", "#FF2222", "#FFFF22", "#3333FF", "#FF9933", "#CC22CC"] self.noteColors = [get("fret%d_color" % i, "color", default_color[i]) for i in range(6)] self.spNoteColor = get("fretS_color", "color", "#4CB2E5") + self.killNoteColor = get("fretK_color", "color", "#FFFFFF") #just like glow_color, this allows you to have tails use either the color of the note #or the actual color of the tail self.use_fret_colors = get("use_fret_colors", bool, False) + self.fretPress = get("fretPress", bool, False) + #Point of View (x, y, z) self.povTarget = (get("pov_target_x", float), get("pov_target_y", float), get("pov_target_z", float)) self.povOrigin = (get("pov_origin_x", float), get("pov_origin_y", float), get("pov_origin_z", float)) @@ -546,6 +549,8 @@ def get(value, type = str, default = None): self.drumnotepos = [get("drumnotepos"+str(i+1), float, 0) for i in range(5)] self.drumkeypos = [get("drumkeypos"+str(i+1), float, 0) for i in range(5)] + self.shaderSolocolor = get("shaderSoloColor", "color", "#0000FF") + #In-game rendering self.hopoIndicatorX = get("hopo_indicator_x") self.hopoIndicatorY = get("hopo_indicator_y")