From 777332375e070910a77d38cf60b6095b6c5be762 Mon Sep 17 00:00:00 2001 From: feschi55 Date: Fri, 21 Nov 2014 15:54:46 +0100 Subject: [PATCH] =?UTF-8?q?Schrift=20emulogic=20implementiert=20und=20eing?= =?UTF-8?q?ef=C3=BChrt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../de/heatup/resources/fonts/emulogic.ttf | Bin 0 -> 45480 bytes HeatUp/src/de/heatup/ui/StatusPanelAdder.java | 72 +++++++++++------- .../src/de/heatup/ui/statusPanel/Score.java | 5 ++ .../de/heatup/ui/statusPanel/Temperature.java | 11 ++- 4 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 HeatUp/src/de/heatup/resources/fonts/emulogic.ttf diff --git a/HeatUp/src/de/heatup/resources/fonts/emulogic.ttf b/HeatUp/src/de/heatup/resources/fonts/emulogic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..99b620c904a2a7b991f14a8184d0aa634d4a3dd4 GIT binary patch literal 45480 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 SxF=-`+;N$MJ0V*qUirTZ5OOyF literal 0 HcmV?d00001 diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java index 4978a94..a78d0d0 100644 --- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java +++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java @@ -4,14 +4,12 @@ import java.awt.BorderLayout; import java.awt.Color; import java.awt.FlowLayout; import java.awt.Font; - +import java.io.File; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JProgressBar; - import de.heatup.logging.Logger; import de.heatup.ui.statusPanel.Score; -import de.heatup.ui.statusPanel.Temperature; import de.heatup.ui.statusPanel.Timer; @@ -35,6 +33,28 @@ public class StatusPanelAdder{ private static JLabel powerUpLabel = new JLabel(/*new ImageIcon("path_to_image.png")*/"powerUpLabel"); private static JLabel labelTime=new JLabel("Time"); private static JLabel timeLabel = new JLabel("123456789"); + private static Font emulogicheading; + private static Font emulogictext; + private static Font ttfBase; + + private static Font implementFont(){ + String fontFileName = "emulogic.ttf"; + File ttf= new File("src/de/heatup/resources/fonts/" + fontFileName); + + try { + ttfBase = Font.createFont(Font.TRUETYPE_FONT, ttf); + + }catch (Exception ex) { + ex.printStackTrace(); + System.err.println(ttf.getAbsolutePath()); + } + Logger.write("Font implemented"); + return ttfBase; + } + + + + public static void raiseMod(){ if (modifier==-1){ @@ -84,12 +104,14 @@ public class StatusPanelAdder{ } } - + if (temping!=0){ + Logger.write("Temperatur: " + tempBar.getValue()); + } if (tempBar.getValue()<=30 && modifier==-1) { } else { tempBar.setValue(tempBar.getValue()+temping); } - Logger.write("Temperatur: " + tempBar.getValue()); + } @@ -99,52 +121,46 @@ public class StatusPanelAdder{ public static void createPanel(){ - - labelTemp.setFont(new Font("emulogic", Font.CENTER_BASELINE, 16)); + implementFont(); + emulogicheading = ttfBase.deriveFont(Font.PLAIN, 16); + emulogictext= ttfBase.deriveFont(Font.PLAIN, 12); + JPanel tempPanel=new JPanel(); + labelTemp.setFont(emulogicheading); labelTemp.setForeground(Color.YELLOW); tempBar= new JProgressBar(30,200); tempBar.setValue(45); - - JPanel tempPanel=new JPanel(); tempPanel.setLayout(new BorderLayout(0,vgap)); tempPanel.add(labelTemp, BorderLayout.NORTH); tempPanel.add(tempBar, BorderLayout.SOUTH); tempPanel.setBackground(Color.BLACK); + - - - labelScore.setFont(new Font("emulogic", Font.CENTER_BASELINE, 16)); - labelScore.setForeground(Color.YELLOW); - - scoreLabel.setFont(new Font("emulogic", Font.CENTER_BASELINE, 12)); - scoreLabel.setForeground(Color.YELLOW); JPanel scorePanel=new JPanel(); + labelScore.setFont(emulogicheading); + labelScore.setForeground(Color.YELLOW); + scoreLabel.setFont(emulogictext); + scoreLabel.setForeground(Color.YELLOW); scorePanel.setLayout(new BorderLayout(0,vgap)); scorePanel.add(labelScore, BorderLayout.NORTH); scorePanel.add(scoreLabel, BorderLayout.SOUTH); scorePanel.setBackground(Color.BLACK); - - labelPowerUp.setFont(new Font("emulogic", Font.CENTER_BASELINE, 16)); - labelPowerUp.setForeground(Color.YELLOW); - - powerUpLabel.setFont(new Font("emulogic", Font.CENTER_BASELINE, 12)); - powerUpLabel.setForeground(Color.YELLOW); - JPanel powerUpPanel=new JPanel(); + labelPowerUp.setFont(emulogicheading); + labelPowerUp.setForeground(Color.YELLOW); + powerUpLabel.setFont(emulogictext); + powerUpLabel.setForeground(Color.YELLOW); powerUpPanel.setLayout(new BorderLayout(0,vgap)); powerUpPanel.add(labelPowerUp, BorderLayout.NORTH); powerUpPanel.add(powerUpLabel, BorderLayout.SOUTH); powerUpPanel.setBackground(Color.BLACK); - - - labelTime.setFont(new Font("emulogic", Font.CENTER_BASELINE, 16)); + JPanel timePanel=new JPanel(); + labelTime.setFont(emulogicheading); labelTime.setSize(100,10); labelTime.setForeground(Color.YELLOW); - timeLabel.setFont(new Font("emulogic", Font.CENTER_BASELINE, 12)); + timeLabel.setFont(emulogictext); timeLabel.setForeground(Color.YELLOW); - JPanel timePanel=new JPanel(); timePanel.setLayout(new BorderLayout(0,vgap)); timePanel.add(labelTime, BorderLayout.NORTH); timePanel.add(timeLabel, BorderLayout.SOUTH); diff --git a/HeatUp/src/de/heatup/ui/statusPanel/Score.java b/HeatUp/src/de/heatup/ui/statusPanel/Score.java index d43b472..2d9a2ba 100644 --- a/HeatUp/src/de/heatup/ui/statusPanel/Score.java +++ b/HeatUp/src/de/heatup/ui/statusPanel/Score.java @@ -10,6 +10,11 @@ public class Score { public int getScore(){ return score; } + public String getScoreS(){ + int score=getScore(); + Integer string= new Integer(score); + return string.toString(); + } //resets score public void resetScore(){ score=0; diff --git a/HeatUp/src/de/heatup/ui/statusPanel/Temperature.java b/HeatUp/src/de/heatup/ui/statusPanel/Temperature.java index b8d5078..cea501f 100644 --- a/HeatUp/src/de/heatup/ui/statusPanel/Temperature.java +++ b/HeatUp/src/de/heatup/ui/statusPanel/Temperature.java @@ -17,31 +17,34 @@ public class Temperature { public int getTemp(){ return valtemp; } + public void setTemp(int a){ + valtemp=a; + } /* * raiseTemp * return true, gameplay goes on * return false, heatup done */ - public boolean raiseTemp(int additional){ + /*public boolean raiseTemp(int additional){ valtemp+=additional; if(valtemp>max){ return false; } else { return true; } - } + }*/ /* reduceTemp * return true; gameplay goes on * return false; game over, temperature too low */ - public boolean reduceTemp(int reduce){ + /*public boolean reduceTemp(int reduce){ valtemp-=reduce; if (valtemp