da/HeatUp
1
0
Fork 0
mirror of https://github.com/jokerx3/HeatUp synced 2026-07-27 08:59:44 +02:00
Code Issues Releases Wiki Activity

Scoreberechnung und StatusPanelPowerPanel nachgebessert hoffentlich zur zufriedenstellung

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
HeatUp/src/de/heatup/ui/StatusPanelAdder.java
+2 -2
View File
@@ -39,7 +39,7 @@ public class StatusPanelAdder{
private static JProgressBar tempBar; private static JProgressBar tempBar;
private static JLabel labelScore= new JLabel("score"); private static JLabel labelScore= new JLabel("score");
private static JLabel scoreLabel= new JLabel(" "); private static JLabel scoreLabel= new JLabel(" ");
private static JLabel labelPowerUp = new JLabel("! PowerUp !"); private static JLabel labelPowerUp = new JLabel("!P o w e r U p!");
private static JLabel powerUpLabel = new JLabel(" "); private static JLabel powerUpLabel = new JLabel(" ");
private static JLabel labelTime=new JLabel("Time"); private static JLabel labelTime=new JLabel("Time");
private static JLabel timeLabel = new JLabel("0"); private static JLabel timeLabel = new JLabel("0");
@@ -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
HeatUp/src/de/heatup/ui/statusPanel/Score.java
+5 -2
View File
@@ -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;