From 7f7e3aba779f4354072c8b8725739cb79fad2e0d Mon Sep 17 00:00:00 2001
From: nhydock <n_hydock@comcast.net>
Date: Fri, 10 Jun 2011 23:03:19 -0400
Subject: [PATCH] Fixes some bugs with the GH3 rockmeter

---
 data/themes/MegaLight GH3/rockmeter.ini | 63 ++++++++++++++-----------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/data/themes/MegaLight GH3/rockmeter.ini b/data/themes/MegaLight GH3/rockmeter.ini
index 02bf82f3d..e0edcf634 100644
--- a/data/themes/MegaLight GH3/rockmeter.ini	
+++ b/data/themes/MegaLight GH3/rockmeter.ini	
@@ -4,11 +4,11 @@ xpos = .0425
 ypos = .12
 xscale = .5
 yscale = .5
-rect = ((multiplier-1)/4.0, multiplier/4.0,0,1/3)
+rect = ((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,0,1/3)
 
 [layer0:fx0:Replace]
-rect = (3/4,1,1,2/3)|((multiplier-1)/4.0, multiplier/4.0,2/3,1)|((multiplier-1)/4.0, multiplier/4.0,1/3,2/3)
-condition = streak >= streakMax|streak%10 >= 2|streak%10 == 1
+rect = (3/4,1,2/3,1)|(3/4,1,2/3,1)|(3/4,1,1/3,2/3)|(3/4,1,0,1/3)|(2/4,3/4,2/3,1)|((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,2/3,1)|((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,1/3,2/3)
+condition = (boost or bassgroove) and streak >= streakMax|(boost or bassgroove) and streak%10 >= 2|(boost or bassgroove) and streak%10 == 1|(boost or bassgroove)|streak >= streakMax|streak%10 >= 2|streak%10 == 1
 
 [layer1:Image]
 texture = dotshalf.png
@@ -16,11 +16,11 @@ xpos = .0425
 ypos = .154
 xscale = .5
 yscale = .5
-rect = ((multiplier-1)/4.0, multiplier/4.0,0,1/3)
+rect = ((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,0,1/3)
 
 [layer1:fx0:Replace]
-rect = (3/4,1,1,2/3)|((multiplier-1)/4.0, multiplier/4.0,2/3,1)|((multiplier-1)/4.0, multiplier/4.0,1/3,2/3)
-condition = streak >= streakMax|streak%10 >= 4|streak%10 == 3
+rect = (3/4,1,2/3,1)|(3/4,1,2/3,1)|(3/4,1,1/3,2/3)|(3/4,1,0,1/3)|(2/4,3/4,2/3,1)|((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,2/3,1)|((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,1/3,2/3)
+condition = (boost or bassgroove) and streak >= streakMax|(boost or bassgroove) and streak%10 >= 4|(boost or bassgroove) and streak%10 == 3|(boost or bassgroove)|streak >= streakMax|streak%10 >= 4|streak%10 == 3
 
 [layer2:Image]
 texture = dotshalf.png
@@ -28,11 +28,11 @@ xpos = .0425
 ypos = .188
 xscale = .5
 yscale = .5
-rect = ((multiplier-1)/4.0, multiplier/4.0,0,1/3)
+rect = ((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,0,1/3)
 
 [layer2:fx0:Replace]
-rect = (3/4,1,1,2/3)|((multiplier-1)/4.0, multiplier/4.0,2/3,1)|((multiplier-1)/4.0, multiplier/4.0,1/3,2/3)
-condition = streak >= streakMax|streak%10 >= 6|streak%10 == 5
+rect = (3/4,1,2/3,1)|(3/4,1,2/3,1)|(3/4,1,1/3,2/3)|(3/4,1,0,1/3)|(2/4,3/4,2/3,1)|((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,2/3,1)|((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,1/3,2/3)
+condition = (boost or bassgroove) and streak >= streakMax|(boost or bassgroove) and streak%10 >= 6|(boost or bassgroove) and streak%10 == 5|(boost or bassgroove)|streak >= streakMax|streak%10 >= 6|streak%10 == 5
 
 [layer3:Image]
 texture = dotshalf.png
@@ -40,11 +40,11 @@ xpos = .0425
 ypos = .222
 xscale = .5
 yscale = .5
-rect = ((multiplier-1)/4.0, multiplier/4.0,0,1/3)
+rect = ((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,0,1/3)
 
 [layer3:fx0:Replace]
-rect = (3/4,1,1,2/3)|((multiplier-1)/4.0, multiplier/4.0,2/3,1)|((multiplier-1)/4.0, multiplier/4.0,1/3,2/3)
-condition = streak >= streakMax|streak%10 >= 8|streak%10 == 7
+rect = (3/4,1,2/3,1)|(3/4,1,2/3,1)|(3/4,1,1/3,2/3)|(3/4,1,0,1/3)|(2/4,3/4,2/3,1)|((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,2/3,1)|((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,1/3,2/3)
+condition = (boost or bassgroove) and streak >= streakMax|(boost or bassgroove) and streak%10 >= 8|(boost or bassgroove) and streak%10 == 7|(boost or bassgroove)|streak >= streakMax|streak%10 >= 8|streak%10 == 7
 
 [layer4:Image]
 texture = dotshalf.png
@@ -52,11 +52,11 @@ xpos = .0425
 ypos = .256
 xscale = .5
 yscale = .5
-rect = ((multiplier-1)/4.0, multiplier/4.0,0,1/3)
+rect = ((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,0,1/3)
 
 [layer4:fx0:Replace]
-rect = (3/4,1,1,2/3)|((multiplier-1)/4.0, multiplier/4.0,1/3,2/3)
-condition = streak >= streakMax|streak%10 >= 9
+rect = (3/4,1,2/3,1)|(3/4,1,1/3,2/3)|(3/4,1,0,1/3)|(2/4,3/4,2/3,1)|((multiplier-1-int(multiplier != 1))/4.0, (multiplier-int(multiplier != 1))/4.0,1/3,2/3)
+condition = (boost or bassgroove) and streak >= streakMax|(boost or bassgroove) and streak%10 == 9|(boost or bassgroove)|streak >= streakMax|streak%10 == 9
 
 [layer5:Image]
 texture = mult.png
@@ -64,12 +64,12 @@ xpos = 0.134
 ypos = 0.19
 xscale = .5
 yscale = .5
-rect = (0.0, 1.0, (multiplier - 1)/8.0, multiplier/8.0)
+rect = (0.0, 1.0, (int((multiplier - 1)/(int(boost)+1))+(int(boost)*4))/8.0, (int((multiplier)/(int(boost)+1))+(int(boost)*4))/8.0)
 
 [layer5:fx0:Replace]
 texture = bass_mult.png
-rect = (0.0, 1.0, (multiplier - 1)/12, multiplier/12)
-condition = player.isBassGuitar and multiplier > 4
+rect = (0.0, 1.0, int((multiplier-5)/(int(boost)+1))/4, int((multiplier-4)/(int(boost)+1))/4)
+condition = bassgroove
 
 [layer6:Image]
 texture = rockmeter.png
@@ -166,7 +166,7 @@ yscale = .35
 
 [layer13:fx0:Replace]
 rect = (2/3.0, 1.0, 0, 1)
-condition = power > .50 or player.starPowerActive
+condition = power >= .50 or boost
 
 [layer14:Image]
 texture = splight.png
@@ -189,7 +189,7 @@ yscale = .35
 
 [layer15:fx0:Replace]
 rect = (2/3.0, 1.0, 0, 1)
-condition = power > .50 or player.starPowerActive
+condition = power >= .50 or boost
 
 [layer16:Image]
 texture = splight.png
@@ -212,7 +212,7 @@ yscale = .35
 
 [layer17:fx0:Replace]
 rect = (2/3.0, 1.0, 0, 1)
-condition = power > .50 or player.starPowerActive
+condition = power >= .50 or boost
 
 [layer18:Image]
 texture = splight.png
@@ -228,7 +228,7 @@ endX = 0.8581
 endY = 0.3449
 transitionTime = 256.0
 reverse = True
-condition = power > .5 or player.starPowerActive
+condition = power >= .5 or boost
 
 [layer19:Image]
 texture = splight.png
@@ -245,7 +245,7 @@ endX = 0.8581
 endY = 0.3449
 transitionTime = 256.0
 reverse = True
-condition = power > .5 or player.starPowerActive
+condition = power >= .5 or boost
 
 [layer20:Image]
 texture = splight.png
@@ -261,7 +261,7 @@ endX = .9023
 endY = .3311
 transitionTime = 256.0
 reverse = True
-condition = power > .5 or player.starPowerActive
+condition = power >= .5 or boost
 
 [layer21:Image]
 texture = splight.png
@@ -278,7 +278,7 @@ endX = .9023
 endY = .3311
 transitionTime = 256.0
 reverse = True
-condition = power > .5 or player.starPowerActive
+condition = power >= .5 or boost
 
 [layer22:Image]
 texture = splight.png
@@ -294,7 +294,7 @@ endX = 0.9431
 endY = 0.3023
 transitionTime = 256.0
 reverse = True
-condition = power > .5 or player.starPowerActive
+condition = power >= .5 or boost
 
 [layer23:Image]
 texture = splight.png
@@ -311,7 +311,7 @@ endX = 0.9431
 endY = 0.3023
 transitionTime = 256.0
 reverse = True
-condition = power > .5 or player.starPowerActive
+condition = power >= .5 or boost
 
 #/////////End of Star Power Lights//////////
 
@@ -340,3 +340,12 @@ xpos = .86
 ypos = .2
 xscale = .5
 yscale = .5
+
+[layer27:Text]
+font = font
+text = multiplier
+xpos = 0.134
+ypos = 0.19
+alignment = center
+color = #4DB3E6
+condition = bassgroove and not self.stage.layers[5].drawing