Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- coin ani redesign

Browse Source 
- Score balk
- point animation units memorise color
- Song title scalen in info Panel
This commit is contained in:
Bilel Bghiel
2015-07-08 18:10:01 +02:00
parent 811f778553 bad1f459aa
commit 34f6d10532
8 changed files with 220 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/gameState/PlayState.java
+16 -19
View File
@@ -72,15 +72,12 @@ public class PlayState extends GameState {
buttons_pressed = 0;
joystick_moved = 0;
infoPanel.init(sql.getHighscore(sh.getCurrentSong(), sh.getCurrentSongInstance()).getScore());
for(Path p : area.paths)
{
p.getEnemysInPath().clear();
}
for (int i = 1; i < ButtonHandler.getButtons().size(); i++) {
Button b = ButtonHandler.getButton(i);
b.setColor(Color.BLACK);
}
ButtonHandler.getButton(1).setColor(sh.getCurrentSongInstance().getButtons().get(0).getColor());
@@ -160,7 +157,7 @@ public class PlayState extends GameState {
}
private void endGame() {
if(sh.getProgress()/1000 < 5000)
if(sh.getProgress()/1000 > 5000)
{
sql.addPlaydata(sh.getCurrentSong(), sh.getCurrentSongInstance(), sh.getProgress()/1000, enemies_missed, enemies_hit, buttons_pressed, joystick_moved);
sh.getCurrentSongInstance().played();
@@ -194,19 +191,19 @@ public class PlayState extends GameState {
player.draw(g2);
} catch (Exception e) {
}
if(!Window.ON_RASP){
int width,height;
width = g2.getFontMetrics().stringWidth("");
height = g2.getFontMetrics().getHeight();
for (int i = 1; i < ButtonHandler.getButtons().size(); i++) {
Ellipse2D oval = new Ellipse2D.Double(880+(50*i), 0, 50, 50);
g2.setColor(ButtonHandler.getButton(i).getColor());
g2.fill(oval);
g2.setColor(Color.BLACK);
width = g2.getFontMetrics().stringWidth(""+i);
g2.drawString(""+i, (int)oval.getCenterX()-width/2,(int)oval.getMaxY()+height);
}
}
// if(!Window.ON_RASP){
// int width,height;
// width = g2.getFontMetrics().stringWidth("");
// height = g2.getFontMetrics().getHeight();
// for (int i = 1; i < ButtonHandler.getButtons().size(); i++) {
// Ellipse2D oval = new Ellipse2D.Double(880+(50*i), 0, 50, 50);
// g2.setColor(ButtonHandler.getButton(i).getColor());
// g2.fill(oval);
// g2.setColor(Color.BLACK);
// width = g2.getFontMetrics().stringWidth(""+i);
// g2.drawString(""+i, (int)oval.getCenterX()-width/2,(int)oval.getMaxY()+height);
// }
// }
}
@Override