Scoreberechnung und StatusPanelPowerPanel nachgebessert hoffentlich zur zufriedenstellung

This commit is contained in:
feschi55
2015-01-06 08:19:19 +01:00
parent 7c561ea504
commit 0bcba4b39f
2 changed files with 7 additions and 4 deletions
@@ -103,7 +103,7 @@ public class StatusPanelAdder{
public static void tick() { public static void tick() {
Timer.tickTimer(); Timer.tickTimer();
timeLabel.setText(Timer.getMinuteS() + ":" + Timer.getSecondsS()); timeLabel.setText(Timer.getMinuteS() + ":" + Timer.getSecondsS());
scoreLabel.setText(Score.getScoreS()); scoreLabel.setText(Score.endScore() + "");
/** /**
* Temperaturaktualisierung * Temperaturaktualisierung
@@ -52,10 +52,13 @@ public class Score {
*/ */
public static int endScore(){ public static int endScore(){
int manipulations=StatusPanelAdder.getManipulations(); int manipulations=StatusPanelAdder.getManipulations();
int manipulationsBonus=600/manipulations; int manipulationsBonus=0;
if (manipulations >0){
manipulationsBonus=2400/manipulations;
}
int endScore=score + manipulationsBonus; int endScore=score + manipulationsBonus;
if (Timer.getAllInSeconds()<bonusTime){ if (Timer.getAllInSeconds()<bonusTime){
endScore+=(bonusTime-Timer.getAllInSeconds()); endScore+=(((2*bonusTime)-Timer.getAllInSeconds()));
} }
return endScore; return endScore;