From 0bcba4b39fcf62c5e624e19dbc351f05d704ebbd Mon Sep 17 00:00:00 2001
From: feschi55 <yes@freechoc.de>
Date: Tue, 6 Jan 2015 08:19:19 +0100
Subject: [PATCH] Scoreberechnung und StatusPanelPowerPanel nachgebessert
 hoffentlich zur zufriedenstellung

---
 HeatUp/src/de/heatup/ui/StatusPanelAdder.java  | 4 ++--
 HeatUp/src/de/heatup/ui/statusPanel/Score.java | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java
index bda8f1f..6e51d1e 100644
--- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java
+++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java
@@ -39,7 +39,7 @@ public class StatusPanelAdder{
 	private static JProgressBar tempBar;
 	private static JLabel labelScore= new JLabel("score");
 	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 labelTime=new JLabel("Time");
 	private static JLabel timeLabel = new JLabel("0");
@@ -103,7 +103,7 @@ public class StatusPanelAdder{
 	public static void tick() {
 		Timer.tickTimer();
 		timeLabel.setText(Timer.getMinuteS() + ":" + Timer.getSecondsS());
-		scoreLabel.setText(Score.getScoreS());
+		scoreLabel.setText(Score.endScore() + "");
 		
 		/**
 		 * Temperaturaktualisierung
diff --git a/HeatUp/src/de/heatup/ui/statusPanel/Score.java b/HeatUp/src/de/heatup/ui/statusPanel/Score.java
index fe2a9a5..19b3917 100644
--- a/HeatUp/src/de/heatup/ui/statusPanel/Score.java
+++ b/HeatUp/src/de/heatup/ui/statusPanel/Score.java
@@ -52,10 +52,13 @@ public class Score {
 	 */
 	public static int endScore(){
 		int manipulations=StatusPanelAdder.getManipulations();
-		int manipulationsBonus=600/manipulations;
+		int manipulationsBonus=0;
+		if (manipulations >0){
+			manipulationsBonus=2400/manipulations;
+		}
 		int endScore=score + manipulationsBonus;
 		if (Timer.getAllInSeconds()<bonusTime){
-			endScore+=(bonusTime-Timer.getAllInSeconds());
+			endScore+=(((2*bonusTime)-Timer.getAllInSeconds()));
 		}
 		
 		return endScore;