Skip to content

Commit

Permalink
rockScoring has not yet been implemented in master branch
Browse files Browse the repository at this point in the history
  • Loading branch information
erodozer committed Sep 22, 2011
1 parent 753d54c commit 3290226
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions src/Rockmeter.py
Expand Up @@ -1107,7 +1107,7 @@ def updateVars(self, p):
score = scene.scoring[playerNum].score
stars = scene.scoring[playerNum].stars
partialStars = scene.scoring[playerNum].starRatio
rock = scene.rockScoring[playerNum].percentage
rock = scene.rock[playerNum]

streak = scene.scoring[playerNum].streak
power = player.starPower/100.0
Expand All @@ -1118,9 +1118,16 @@ def updateVars(self, p):
else:
streakMax = 30

multiplier = scene.rockScoring[playerNum].mult

if streak >= streakMax:
multiplier = int(streakMax*.1) + 1
else:
multiplier = int(streak*.1) + 1

boost = player.starPowerActive

#doubles the multiplier number when starpower is activated
if boost:
multiplier *= 2

if player.isBassGuitar and streak >= 40:
bassgroove = True
Expand Down

0 comments on commit 3290226

Please sign in to comment.