Hochschulprojekte/SpaceScooter
0
0
Fork 0
Code Issues Pull Requests Activity

* Merge Confilct

Browse Source
This commit is contained in:
JJTCM 2014-10-31 11:06:30 +01:00
parent 3588532c24
commit d013afb465
2 changed files with 79 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/de/teamteamteam/spacescooter/entity/Player.java
View File

@ -35,13 +35,15 @@ public class Player extends ShootingEntity {
if(Keyboard.isKeyDown(KeyEvent.VK_RIGHT) && this.x < (GameConfig.windowWidth - this.getImage().getWidth())) {
this.x += off;
}
if(Keyboard.isKeyDown(KeyEvent.VK_SPACE)) {
if(Keyboard.isKeyDown(KeyEvent.VK_SPACE) && shoot==false) {
shoot = true;
this.shoot();
}
if(!Keyboard.isKeyDown(KeyEvent.VK_SPACE) && shoot==true) {
shoot = false;
}
}
if(!Keyboard.isKeyDown(KeyEvent.VK_SPACE) && shoot==true) {
shoot = false;
}
}

80
src/de/teamteamteam/spacescooter/screen/GameOverScreen.java
View File

@ -4,30 +4,96 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.event.KeyEvent;
import java.awt.image.BufferedImage;
import java.util.Iterator;
import java.util.LinkedList;
import de.teamteamteam.spacescooter.control.Keyboard;
import de.teamteamteam.spacescooter.entity.Entity;
import de.teamteamteam.spacescooter.entity.Player;
import de.teamteamteam.spacescooter.gui.Button;
import de.teamteamteam.spacescooter.utility.GameConfig;
import de.teamteamteam.spacescooter.utility.Loader;
public class GameOverScreen extends Screen {
private BufferedImage img;
private Player player;
private float playerMoveSpeed = 0;
private int colorValue = 0;
private boolean colorValueIncrease = true;
private int menuPoint = 0;
private int animationStatus = 0; //0 = Noch nicht gestartet, 1 = Animation läuft, 2 = Animation beendet
public GameOverScreen(Screen parent) {
super(parent);
this.img = Loader.getBufferedImageByFilename("images/pausebackground.png");
this.entities.add(new Button(GameConfig.windowWidth/2-125, 300));
this.entities.add(new Button(GameConfig.windowWidth/2-125, 400));
player = new Player(GameConfig.windowWidth/2-170, 309);
player.setCanMove(false);
this.entities.add(player);
}
@Override
protected void paint(Graphics2D g) {
g.setColor(new Color(0,0,120));
g.fillRect(0, 0, GameConfig.windowWidth, GameConfig.windowHeight);
g.setColor(new Color(255,255,255));
g.setFont(new Font("Monospace", 0, 50));
g.drawString("LOL you died!", 100, 100);
g.drawString("Press space to retry!", 100, 400);
g.drawImage(this.img, 0, 0, null);
LinkedList<Entity> list = this.getEntities();
Iterator<Entity> i = list.iterator();
while (i.hasNext()) {
i.next().paint(g);
}
g.setFont(new Font("Monospace", 0, 100));
g.setColor(new Color(75 + colorValue, 175 + colorValue, 175 + colorValue));
g.drawString("Game Over", GameConfig.windowWidth/2-290, 200);
g.setFont(new Font("Monospace", 0, 20));
g.setColor(new Color(0, 0, 0));
g.drawString("Wiederholen", GameConfig.windowWidth/2-60, 332);
g.drawString("Hauptmenü", GameConfig.windowWidth/2-60, 432);
}
@Override
protected void update() {
LinkedList<Entity> list = this.getEntities();
Iterator<Entity> i = list.iterator();
while (i.hasNext()) {
i.next().update();
}
if(this.colorValueIncrease){
this.colorValue += 2;
if(this.colorValue > 70) this.colorValueIncrease = false;
}else{
this.colorValue -= 2;
if(this.colorValue < -70) this.colorValueIncrease = true;
}
if(Keyboard.isKeyDown(KeyEvent.VK_DOWN)){
this.menuPoint = 1;
player.setPosition(player.getX(), 409);
}
if(Keyboard.isKeyDown(KeyEvent.VK_UP)){
this.menuPoint = 0;
player.setPosition(player.getX(), 309);
}
if(Keyboard.isKeyDown(KeyEvent.VK_SPACE)) {
this.parent.setOverlay(new MainMenuScreen(this.parent));
this.animationStatus = 1;
}
if(this.animationStatus == 1){
if(player.getX() <= GameConfig.windowWidth){
player.setPosition(player.getX() + (int)playerMoveSpeed, player.getY());
playerMoveSpeed += 0.1;
}else this.animationStatus = 2;
}else if(this.animationStatus == 2){
switch (this.menuPoint) {
case 0:
this.parent.setOverlay(new GameScreen(this.parent));
break;
case 1:
this.parent.setOverlay(new MainMenuScreen(this.parent));
break;
}
}
}