Fixes rockmeter image and also gets the counter to be more accurate

data/themes/MegaLight GH3/rockmeter.ini

@@ -6,16 +6,16 @@ xscale = .5
 yscale = .5
 
 [layer0:fx0:Replace]
-texture = rock_high.png|rock_med.png
-condition = rock > 200/3.0|rock > 100/3.0
+texture = rock_hi.png|rock_med.png
+condition = rock > 2/3.0|rock > 1/3.0
 
 [layer1:Image]
 texture = rock_arr.png
 xpos = .86
 ypos = .136
-xscale = 0.5
-yscale = 0.5
-angle = -45 + 90*(rock/100.0)
+xscale = .45
+yscale = .45
+angle = -45 + 90 * rock
 
 [layer2:Image]
 texture = rock_top.png
@@ -34,7 +34,7 @@ rect = ((multiplier%4)/4.0, (1+multiplier%4)/4.0,0,1/3)
 
 [layer3:fx0:Replace]
 rect = ((multiplier%4)/4.0, (1+multiplier%4)/4.0,1,2/3)|((multiplier%4)/4.0, (1+multiplier%4)/4.0,1/3,2/3)
-condition = streak%10 >= 2 or streak > streakMax|streak%10 == 1
+condition = streak%10 >= 2 or streak >= streakMax|streak%10 == 1
 
 [layer4:Image]
 texture = dotshalf.png
@@ -46,7 +46,7 @@ rect = ((multiplier%4)/4.0, (1+multiplier%4)/4.0,0,1/3)
 
 [layer4:fx0:Replace]
 rect = ((multiplier%4)/4.0, (1+multiplier%4)/4.0,1,2/3)|((multiplier%4)/4.0, (1+multiplier%4)/4.0,1/3,2/3)
-condition = streak%10 >= 4 or streak > streakMax|streak%10 == 3
+condition = streak%10 >= 4 or streak >= streakMax|streak%10 == 3
 
 [layer5:Image]
 texture = dotshalf.png
@@ -58,7 +58,7 @@ rect = ((multiplier%4)/4.0, (1+multiplier%4)/4.0,0,1/3)
 
 [layer5:fx0:Replace]
 rect = ((multiplier%4)/4.0, (1+multiplier%4)/4.0,1,2/3)|((multiplier%4)/4.0, (1+multiplier%4)/4.0,1/3,2/3)
-condition = streak%10 >= 6 or streak > streakMax|streak%10 == 5
+condition = streak%10 >= 6 or streak >= streakMax|streak%10 == 5
 
 [layer6:Image]
 texture = dotshalf.png
@@ -70,7 +70,7 @@ rect = ((multiplier%4)/4.0, (1+multiplier%4)/4.0,0,1/3)
 
 [layer6:fx0:Replace]
 rect = ((multiplier%4)/4.0, (1+multiplier%4)/4.0,1,2/3)|((multiplier%4)/4.0, (1+multiplier%4)/4.0,1/3,2/3)
-condition = streak%10 >= 8 or streak > streakMax|streak%10 == 7
+condition = streak%10 >= 8 or streak >= streakMax|streak%10 == 7
 
 [layer7:Image]
 texture = dotshalf.png
@@ -82,7 +82,7 @@ rect = ((multiplier%4)/4.0, (1+multiplier%4)/4.0,0,1/3)
 
 [layer7:fx0:Replace]
 rect = ((multiplier%4)/4.0, (1+multiplier%4)/4.0,1,2/3)|((multiplier%4)/4.0, (1+multiplier%4)/4.0,1/3,2/3)
-condition = streak > streakMax|streak%10 == 9
+condition = streak >= streakMax|streak%10 == 9
 
 [layer8:Image]
 texture = mult.png
@@ -95,7 +95,7 @@ rect = (0.0, 1.0, multiplier/8.0, (multiplier+1)/8.0)
 [layer8:fx0:Replace]
 texture = bass_mult.png
 rect = (0.0, 1.0, multiplier/12, (multiplier+1)/12)
-condition = player.isBassGuitar
+condition = player.isBassGuitar and multiplier > 4
 
 [layer9:Image]
 texture = rockmeter.png
@@ -122,12 +122,11 @@ condition = streak > 10
 [layer11:Text]
 text = ("%03i" % streak)[2:3]
 font = streakFont
-alignment = left
 color = #000000
 
 [layer11:fx0:Slide]
 startX = .193
-startY = -.05
+startY = -.1
 endX = .193
 endY = 0.1125
 reverse = True
@@ -137,11 +136,10 @@ transitionTime = 256.0
 [layer12:Text]
 text = ("%03i" % streak)[1:2]
 font = streakFont
-alignment = left
 
 [layer12:fx0:Slide]
 startX = .161
-startY = -.05
+startY = -.1
 endX = .161
 endY = 0.1125
 reverse = True
@@ -151,11 +149,10 @@ transitionTime = 256.0
 [layer13:Text]
 text = ("%03i" % streak)[0:1]
 font = streakFont
-alignment = left
 
 [layer13:fx0:Slide]
 startX = .132
-startY = -.05
+startY = -.1
 endX = .132
 endY = 0.1125
 reverse = True
@@ -166,7 +163,7 @@ transitionTime = 256.0
 text = score
 font = scoreFont
 xpos = 0.19
-ypos =  0.312
+ypos =  0.298
 alignment = right
 
 [layer16:Image]