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

qweq we

Browse Source 
qwe qwe q# Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,
This commit is contained in:
toksikk
2015-01-30 13:51:35 +01:00
parent 411cff529d
commit 56597fee59
3 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HeatUp/src/de/heatup/highscore/ScoreEntry.java
+1 -1
View File
@@ -11,7 +11,7 @@ public class ScoreEntry implements Serializable {
public ScoreEntry() { public ScoreEntry() {
name = "default"; name = "default";
score = 2342; score = 1;
} }
public ScoreEntry(String name, int score) { public ScoreEntry(String name, int score) {
HeatUp/src/de/heatup/mapengine/CollisionHandler.java
+3 -1
View File
@@ -7,6 +7,8 @@ import de.heatup.logging.Logger;
import de.heatup.objects.Player; import de.heatup.objects.Player;
import de.heatup.objects.PowerUp; import de.heatup.objects.PowerUp;
import de.heatup.objects.PowerUpHandler; import de.heatup.objects.PowerUpHandler;
import de.heatup.ui.Main;
import de.heatup.ui.menu.MenuPanel;
public class CollisionHandler { public class CollisionHandler {
private static ArrayList<Player> movingObjects = new ArrayList<Player>(); private static ArrayList<Player> movingObjects = new ArrayList<Player>();
@@ -52,7 +54,7 @@ public class CollisionHandler {
public static void tick() { public static void tick() {
for (int i=1; i<movingObjects.size();i++) { for (int i=1; i<movingObjects.size();i++) {
if (movingObjects.get(0).getGridLocation().x== movingObjects.get(i).getGridLocation().x && movingObjects.get(0).getGridLocation().y == movingObjects.get(i).getGridLocation().y) { if (movingObjects.get(0).getGridLocation().x== movingObjects.get(i).getGridLocation().x && movingObjects.get(0).getGridLocation().y == movingObjects.get(i).getGridLocation().y) {
// Logger.write("COLLISION WITH ENEMY");
} }
} }
} }
HeatUp/src/de/heatup/ui/StatusPanelAdder.java
+30
View File
@@ -9,13 +9,17 @@ import java.awt.Font;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.InputStream; import java.io.InputStream;
import java.util.Scanner;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JProgressBar; import javax.swing.JProgressBar;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import de.heatup.highscore.ScoreEntry;
import de.heatup.logging.Logger; import de.heatup.logging.Logger;
import de.heatup.ui.menu.MenuPanel;
import de.heatup.ui.menu.SaveScorePanel;
import de.heatup.ui.statusPanel.Score; import de.heatup.ui.statusPanel.Score;
import de.heatup.ui.statusPanel.Timer; import de.heatup.ui.statusPanel.Timer;
@@ -139,6 +143,32 @@ public class StatusPanelAdder{
} }
if (tempBar.getValue()==110){ if (tempBar.getValue()==110){
Logger.write(Score.endScore()+""); Logger.write(Score.endScore()+"");
Main.pause();
MenuPanel.gameExists=1;
int i;
// end gameExists
i =1;
for (ScoreEntry se : PanelBuilder.getMapEngine().getHighscoreHandler().getHighscores(
PanelBuilder.getMapEngine().getHighscoreHandler().getCurrentMapHash())) {
System.out.println(i+". "+se.getName() + " " +se.getScore());
i++;
}
System.out.print("Ende. Highscore: " + Score.endScore() + " Bitte Name eintippen: ");
Scanner s = new Scanner(System.in);
String name = s.nextLine();
PanelBuilder.getMapEngine().getHighscoreHandler().setHighscore(
PanelBuilder.getMapEngine().getHighscoreHandler().getCurrentMapHash(), name, Score.endScore());
PanelBuilder.getMapEngine().getHighscoreHandler().saveHighscores();
i =1;
for (ScoreEntry se : PanelBuilder.getMapEngine().getHighscoreHandler().getHighscores(
PanelBuilder.getMapEngine().getHighscoreHandler().getCurrentMapHash())) {
System.out.println(i+". "+se.getName() + " " +se.getScore());
i++;
}
System.exit(0);
} }
/* /*
* Änderung der Farbe der TempBar * Änderung der Farbe der TempBar