Skip to content

Commit

Permalink
GuitarScene(Scene) Couple of typos and BRE fix
Browse files Browse the repository at this point in the history
  • Loading branch information
fuzion committed Oct 14, 2010
1 parent 12c41c1 commit 74de33d
Showing 1 changed file with 19 additions and 17 deletions.
36 changes: 19 additions & 17 deletions src/GuitarScene.py
View file
Expand Up @@ -573,13 +573,13 @@ def __init__(self, engine, libraryName, songName):
if not self.engine.data.bassDrumSoundFound:
self.bassKickSoundEnabled = False
if not self.engine.data.T1DrumSoundFound:
self.drumMisses == 0
self.drumMisses = 0
if not self.engine.data.T2DrumSoundFound:
self.drumMisses == 0
self.drumMisses = 0
if not self.engine.data.T3DrumSoundFound:
self.drumMisses == 0
self.drumMisses = 0
if not self.engine.data.CDrumSoundFound:
self.drumMisses == 0
self.drumMisses = 0


#MFH - constant definitions, ini value retrievals
Expand Down Expand Up @@ -1373,6 +1373,7 @@ def __init__(self, engine, libraryName, songName):


#brescorebackground.png
self.breScoreBackground = None
if self.engine.loadImgDrawing(self, "breScoreBackground", os.path.join("themes",themename,"brescorebackground.png")):
breScoreBackgroundImgwidth = self.breScoreBackground.width1()
self.breScoreBackgroundWFactor = 640.000/breScoreBackgroundImgwidth
Expand All @@ -1382,6 +1383,7 @@ def __init__(self, engine, libraryName, songName):
self.breScoreBackgroundWFactor = None

#brescoreframe.png
self.breScoreFrame = None
if self.engine.loadImgDrawing(self, "breScoreFrame", os.path.join("themes",themename,"brescoreframe.png")):
breScoreFrameImgwidth = self.breScoreFrame.width1()
self.breScoreFrameWFactor = 640.000/breScoreFrameImgwidth
Expand All @@ -1398,7 +1400,7 @@ def __init__(self, engine, libraryName, songName):

if self.engine.loadImgDrawing(self, "soloFrame", os.path.join("themes",themename,"soloframe.png")):
soloImgwidth = self.soloFrame.width1()
self.soloFrameWFactor = 640.000/soloImgwidth
self.soloFrameWFactor = 80.000/soloImgwidth
else:
self.soloFrame = None
self.soloFrameWFactor = None
Expand Down Expand Up @@ -4701,7 +4703,7 @@ def activateSP(self, num): #QQstarS: Fix this function, add a element "num"
time = self.getSongPosition()
Log.debug("Star Power Activated at: " + str(time))
self.coOpStarPowerActive[num] = time
if time - min(self.coOpStarPowerActive) < 300.0 and not self.instruments[i].starPowerActive:
if time - min(self.coOpStarPowerActive) < 300.0 and not self.instruments[num].starPowerActive:
self.engine.data.starActivateSound.play()
for i in range(self.numOfPlayers):
self.hopFretboard(i, 0.07) #stump
Expand Down Expand Up @@ -5628,7 +5630,7 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly.
tempWScale = frameWidth*self.soloFrameWFactor
tempHScale = -(frameHeight)*self.soloFrameWFactor

self.engine.drawImage(self.soloFrame, scale = (tempWScale,tempHScale), coord = (self.wPlayer[i]*boxXOffset,boxYOffset))
self.engine.drawImage(self.soloFrame, scale = (tempWScale,tempHScale), coord = (self.wPlayer[i]*boxXOffset,boxYOffset), stretched = 11)

self.solo_soloFont.render(text1, (0.5 - Tw/2, yOffset),(1, 0, 0),txtSize) #centered
self.solo_soloFont.render(text2, (0.5 - Tw2/2, yOffset+lineSpacing),(1, 0, 0),txtSize) #centered
Expand Down Expand Up @@ -5876,7 +5878,7 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly.
self.solo_boxYOffset[i] = self.hPlayer[i]-(self.hPlayer[i]* ((self.solo_yOffset[i] + self.solo_Th[i]/2.0 ) / self.fontScreenBottom) )
tempWScale = frameWidth*self.soloFrameWFactor
tempHScale = -(frameHeight)*self.soloFrameWFactor
self.engine.drawImage(self.soloFrame, scale = (tempWScale,tempHScale), coord = (self.wPlayer[i]*self.solo_boxXOffset[i],self.solo_boxYOffset[i]))
self.engine.drawImage(self.soloFrame, scale = (tempWScale,tempHScale), coord = (self.wPlayer[i]*self.solo_boxXOffset[i],self.solo_boxYOffset[i]), stretched = 11)
self.solo_soloFont.render(self.solo_soloText[i], (self.solo_xOffset[i], self.solo_yOffset[i]),(1, 0, 0),self.solo_txtSize)

if self.coOpType: #1 BRE in co-op
Expand Down Expand Up @@ -5909,7 +5911,7 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly.
boxXOffset = self.wPlayer[i]*xOffset
tempWScale = frameWidth*self.breScoreFrameWFactor
tempHScale = -(frameHeight)*self.breScoreFrameWFactor
self.engine.drawImage(self.breScoreFrame, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset))
self.engine.drawImage(self.breScoreFrame, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset), stretched = 11)

self.solo_soloFont.render(text, (xOffset - tW/2.0, yOffset),(1, 0, 0),self.solo_txtSize/2.0)

Expand Down Expand Up @@ -5938,7 +5940,7 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly.
boxXOffset = self.wPlayer[i]*xOffset
tempWScale = frameWidth*self.breScoreBackgroundWFactor
tempHScale = -(frameHeight)*self.breScoreBackgroundWFactor
self.engine.drawImage(self.breScoreBackground, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset))
self.engine.drawImage(self.breScoreBackground, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset), stretched = 11)


if self.breScoreFrame:
Expand All @@ -5952,7 +5954,7 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly.
boxXOffset = self.wPlayer[i]*xOffset
tempWScale = frameWidth*self.breScoreFrameWFactor
tempHScale = -(frameHeight)*self.breScoreFrameWFactor
self.engine.drawImage(self.breScoreFrame, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset))
self.engine.drawImage(self.breScoreFrame, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset), stretched = 11)
self.solo_soloFont.render(text, (xOffset - tW/2.0, yOffset),(1, 0, 0),self.solo_txtSize)

elif scoreCard.freestyleWasJustActive and not scoreCard.endingStreakBroken and scoreCard.endingAwarded and oneTime == True:
Expand All @@ -5974,7 +5976,7 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly.
boxXOffset = self.wPlayer[i]*xOffset
tempWScale = frameWidth*self.breScoreFrameWFactor
tempHScale = -(frameHeight)*self.breScoreFrameWFactor
self.engine.drawImage(self.breScoreFrame, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset))
self.engine.drawImage(self.breScoreFrame, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset), stretched = 11)

self.solo_soloFont.render(text, (xOffset - tW/2.0, yOffset),(1, 0, 0),self.solo_txtSize/2.0)

Expand Down Expand Up @@ -6003,7 +6005,7 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly.
boxXOffset = self.wPlayer[i]*xOffset
tempWScale = frameWidth*self.breScoreBackgroundWFactor
tempHScale = -(frameHeight)*self.breScoreBackgroundWFactor
self.engine.drawImage(self.breScoreBackground, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset))
self.engine.drawImage(self.breScoreBackground, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset), stretched = 11)

if self.breScoreFrame:
frameWidth = tW*1.15
Expand All @@ -6016,7 +6018,7 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly.
boxXOffset = self.wPlayer[i]*xOffset
tempWScale = frameWidth*self.breScoreFrameWFactor
tempHScale = -(frameHeight)*self.breScoreFrameWFactor
self.engine.drawImage(self.breScoreFrame, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset))
self.engine.drawImage(self.breScoreFrame, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset), stretched = 11)
self.solo_soloFont.render(text, (xOffset - tW/2.0, yOffset),(1, 0, 0),self.solo_txtSize)

elif scoreCard.freestyleWasJustActive and scoreCard.endingStreakBroken and oneTime == True:
Expand All @@ -6038,7 +6040,7 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly.
boxXOffset = self.wPlayer[i]*xOffset
tempWScale = frameWidth*self.breScoreFrameWFactor
tempHScale = -(frameHeight)*self.breScoreFrameWFactor
self.engine.drawImage(self.breScoreFrame, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset))
self.engine.drawImage(self.breScoreFrame, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset), stretched = 11)

self.solo_soloFont.render(text, (xOffset - tW/2.0, yOffset),(1, 0, 0),self.solo_txtSize/2.0)

Expand Down Expand Up @@ -6071,7 +6073,7 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly.
boxXOffset = self.wPlayer[i]*xOffset
tempWScale = frameWidth*self.breScoreBackgroundWFactor
tempHScale = -(frameHeight)*self.breScoreBackgroundWFactor
self.engine.drawImage(self.breScoreBackground, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset))
self.engine.drawImage(self.breScoreBackground, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset), stretched = 11)

if self.breScoreFrame:
frameWidth = tW*1.15
Expand All @@ -6084,7 +6086,7 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly.
boxXOffset = self.wPlayer[i]*xOffset
tempWScale = frameWidth*self.breScoreFrameWFactor
tempHScale = -(frameHeight)*self.breScoreFrameWFactor
self.engine.drawImage(self.breScoreFrame, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset))
self.engine.drawImage(self.breScoreFrame, scale = (tempWScale,tempHScale), coord = (boxXOffset,boxYOffset), stretched = 11)
self.solo_soloFont.render(text, (xOffset - tW/2.0, yOffset),(1, 0, 0),self.solo_txtSize)

self.engine.view.setViewportHalf(1,0)
Expand Down

0 comments on commit 74de33d

Please sign in to comment.