Merge branch 'master' of git@github.com:stump/fofix.git into menu-edits

data/themes/MegaLight V4/theme.ini

@@ -1,5 +1,7 @@
 [theme]
 
+twoDnote = false
+
 menu_x = .5
 menu_y = .25
 main_menu_vspacing = 0

data/themes/MegaLight/rockmeter.ini

@@ -1,126 +1,278 @@
 [layer0:Image]
+texture = overdrive bottom.png
+xpos = .5
+ypos = 0.04
+xscale = .41
+yscale = .41
+
+[layer1:Image]
+texture = overdrive fill.png
+xpos = .5 - 0.203
+ypos = 0.04
+xscale = .41
+yscale = .41
+rect = (0.0, power, 0.0, 1.0)
+alignment = left
+
+[layer2:Image]
+texture = overdrive top.png
+xpos = .5
+ypos = 0.04
+xscale = .41
+yscale = .41
+
+[layer3:Image]
+texture = mult2.png
+condition = streak < streakMax
+xpos = .5
+ypos = 0.0393
+xscale = .63
+yscale = .63
+rect = (0.0, 1.0, float(streak-1)*0.1, float(streak)*0.1)
+
+[layer4:Image]
+texture = mult2.png
+condition = streak >= streakMax
+xpos = .5
+ypos = 0.0393
+xscale = .63
+yscale = .63
+rect = (0.0, 1.0, 0.9, 1.0)
+
+[layer5:Image]
+texture = mult.png
+xpos = .5
+ypos = 0.034
+xscale = .5
+yscale = .5
+rect = (0.0, 1.0, float(multiplier-1)*0.125, float(multiplier)*0.125)
+
+[layer6:Image]
 texture = rock_bottom.png
-xpos = 25
+xpos = .06
 ypos = 0.5
-xscale = .25
-yscale = .25
-inPixels = xpos
+xscale = .603725
+yscale = .603725
+alignment = left
 
-[layer1:Image]
+[layer7:Image]
 texture = rock_fill.png
-xpos = 25
-ypos = 0.5
-xscale = .25
-yscale = .25
+condition = rock < 1/3
+xpos = .06
+ypos = 0.25
+xscale = .603725
+yscale = .603725
+color = #ff0000
 rect = (0.0,1.0,0,rock)
 valignment = bottom
-inPixels = xpos
+alignment = left
 
-[layer2:Image]
+[layer8:Image]
+texture = rock_fill.png
+condition = rock > 1/3 and rock < 2/3
+xpos = .06
+ypos = 0.25
+xscale = .603725
+yscale = .603725
+color = #ffff00
+rect = (0.0,1.0,0,rock)
+valignment = bottom
+alignment = left
+
+[layer9:Image]
+texture = rock_fill.png
+condition = rock > 2/3
+xpos = .06
+ypos = 0.25
+xscale = .603725
+yscale = .603725
+color = #00ff00
+rect = (0.0,1.0,0,rock)
+valignment = bottom
+alignment = left
+
+[layer10:Image]
 texture = rock_top.png
-xpos = 25
+xpos = .06
 ypos = 0.5
-xscale = .25
-yscale = .25
+xscale = .603725
+yscale = .603725
+alignment = left
 
-[layer3:Image]
+[layer11:Image]
 texture = rock_arr.png
 xpos = .095
-ypos = ((.2575*rock) * 2) + .1
+;ypos = (rock * (% of screen the arr should move bottom to top) ) + (% from the bottom the bottom of the arr should be located) #explination of values below
+ypos = (rock * .5) + .25 
 xscale = .25
 yscale = .25
 
-[layer4:Image]
-texture = overdrive bottom.png
-xpos = 0.5
-ypos = 0.04
-xscale = 0.41
-yscale = 0.41
-
-[layer5:Image]
-texture = overdrive fill.png
-xpos = 0.5
-ypos = 0.032
+[layer12:Image]
+texture = score.png
+xpos = 1.0 - .03
+ypos = 1.0 - .14
 xscale = .41
-yscale = .35
-rect = (0.0, power, 0.25, 1.0)
-alignment = left
-
-[layer6:Image]
-texture = overdrive top.png
-xpos = .5
-ypos = 0.065
-xscale = 0.3
-yscale = 0.3
-
-[layer9:Text]
-text = streak
-font = streakFont
-xpos = 620
-ypos = 0.75
-useComma = True
+yscale = .41
 alignment = right
-inPixels = xpos
-replace = 0,O
 
-[layer10:Text]
+[layer13:Text]
 text = score
 font = scoreFont
-xpos = 620
-ypos = 0.8
+xpos = 1.0 - .032
+ypos = 1.0-.14
+color = #ffffff
+alignment = right
 useComma = True
+
+[layer14:Image]
+texture = counter.png
+xpos = 1.0 - .03
+ypos = 1.0 - .2
+xscale = .41
+yscale = .41
 alignment = right
-inPixels = xpos
-replace = 0,O
 
-[layer11:Image]
+[layer15:Text]
+text = streak
+font = scoreFont
+xpos = 1.0 - .032
+ypos = 1.0-.2
+color = #ffffff
+alignment = right
+useComma = True
+
+[layer16:Image]
 texture = stargrey.png
-xpos = 600
-ypos = 315
-xscale = .30
-yscale = .30
-inPixels = xpos|ypos
+condition = stars < 6
+ypos = 1 - .247
+xpos = 1 - .216
+xscale = .351293
+yscale = .351293
+valignment = top
+alignment = left
 
-[layer12:Circle]
+[layer16:fx0:Replace]
+condition = stars >= 1
 texture = starwhite.png
-ratio = partialStars
-xpos = 600
-ypos = 315
-xscale = .30
-yscale = .30
-inPixels = xpos|ypos
-condition = ratio > 0
-
-[layer13:Text]
-text = "%d Stars"  % stars
-font = loadingFont
-xpos = 425
-ypos = 315
-alignment = right
-inPixels = xpos|ypos
 
 [layer17:Image]
-texture = mult2.png
-xpos = .5
-ypos = 0.0395
-xscale = .4305
-yscale = .4305
-rect = (0.0, 1.0, (streak%10)*.1, ((streak%10)+1)*.1)
+texture = stargrey.png
+condition = stars < 6
+ypos = 1 - .247
+xpos = 1 - .176
+xscale = .351293
+yscale = .351293
+valignment = top
+alignment = left
 
 [layer17:fx0:Replace]
-rect = (0.0, 1.0, 0.9, 1.0)
-condition = streak >= streakMax
+condition = stars >= 2
+texture = starwhite.png
 
 [layer18:Image]
-texture = mult.png
-xpos = .5
-ypos = 0.034
-xscale = .5
-yscale = .5
-rect = (0.0, 1.0, float(multiplier-1)*0.125, float(multiplier)*0.125)
+texture = stargrey.png
+condition = stars < 6
+ypos = 1 - .247
+xpos = 1 - .136
+xscale = .351293
+yscale = .351293
+valignment = top
+alignment = left
 
 [layer18:fx0:Replace]
-texture = bassgroovemult.png
-rect = (0.0, 1.0, float(multiplier-1)*0.083333333, float(multiplier)*0.083333333)
-condition = player.isBassGuitar and streak > 30
+condition = stars >= 3
+texture = starwhite.png
+
+[layer19:Image]
+texture = stargrey.png
+condition = stars < 6
+ypos = 1 - .247
+xpos = 1 - .096
+xscale = .351293
+yscale = .351293
+valignment = top
+alignment = left
 
+[layer19:fx0:Replace]
+condition = stars >= 4
+texture = starwhite.png
+
+[layer20:Image]
+texture = stargrey.png
+condition = stars < 6
+ypos = 1 - .247
+xpos = 1 - .056
+xscale = .351293
+yscale = .351293
+valignment = top
+alignment = left
+
+[layer20:fx0:Replace]
+condition = stars >= 5
+texture = starwhite.png
+
+[layer21:Circle]
+texture = starwhite.png
+ratio = partialStars
+ypos = 1 - .272
+xpos = 1 - (.216 - (stars * .04))
+xscale = .351293
+yscale = .351293
+valignment = top
+alignment = left
+condition = ratio > 0 and stars < 5
+
+[layer22:Image]
+texture = starwhite.png
+condition = stars == 6
+ypos = 1 - .247
+xpos = 1 - .216
+xscale = .351293
+yscale = .351293
+color = #ffff00
+valignment = top
+alignment = left
+
+[layer23:Image]
+texture = starwhite.png
+condition = stars == 6
+ypos = 1 - .247
+xpos = 1 - .176
+xscale = .351293
+yscale = .351293
+color = #ffff00
+valignment = top
+alignment = left
+
+[layer24:Image]
+texture = starwhite.png
+condition = stars == 6
+ypos = 1 - .247
+xpos = 1 - .136
+xscale = .351293
+yscale = .351293
+color = #ffff00
+valignment = top
+alignment = left
+
+[layer25:Image]
+texture = starwhite.png
+condition = stars == 6
+ypos = 1 - .247
+xpos = 1 - .096
+xscale = .351293
+yscale = .351293
+color = #ffff00
+valignment = top
+alignment = left
+
+[layer26:Image]
+texture = starwhite.png
+condition = stars == 6
+ypos = 1 - .247
+xpos = 1 - .056
+xscale = .351293
+yscale = .351293
+color = #ffff00
+valignment = top
+alignment = left

src/Audio.py

@@ -153,7 +153,7 @@ def isPlaying(self):
     #MFH - gotta catch case when mixer not initialized yet...
     try:
       busy = pygame.mixer.music.get_busy()
-    except Exception, e:
+    except Exception:
       busy = True      
     return busy