Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed the Spawning and despawning, added the ability to lose and
restart, hopefully this push works, it didnt earlier
  • Loading branch information
jdm13003 committed Apr 27, 2016
1 parent bafc8e4 commit 12b5b03
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 5 deletions.
82 changes: 77 additions & 5 deletions src/main/Game.java
Expand Up @@ -39,6 +39,8 @@ public class Game extends Canvas implements Runnable{
private BufferedImage level4 = null;
private BufferedImage level5 = null;
private BufferedImage level6 = null;
private BufferedImage gameOver = null;


private int is_shooting = 0;
private int is_shooting2 = 0;
Expand All @@ -58,7 +60,8 @@ public class Game extends Canvas implements Runnable{

public static enum STATE {
MENU,
GAME
GAME,
END
};
public static STATE State = STATE.MENU;

Expand All @@ -83,6 +86,18 @@ public class Game extends Canvas implements Runnable{

spriteSheet = loader.loadimage("/sprite_sheet.png");
background = loader.loadimage("/background.png");
level0 = loader.loadimage("/level0.png");
level1 = loader.loadimage("/Space1.png");
level2 = loader.loadimage("/Space2.png");
level3 = loader.loadimage("/Space3.png");
level4 = loader.loadimage("/Space4.png");
level5 = loader.loadimage("/Space5.png");
level6 = loader.loadimage("/Space6.png");
gameOver = loader.loadimage("/GameOver.png");





}catch(IOException e){
e.printStackTrace();
Expand Down Expand Up @@ -189,15 +204,36 @@ public class Game extends Canvas implements Runnable{
}
if(Tiekills >= enemy_count){
if (enemy_count == 10){
SDcount++;
c.createSD(SDcount);
enemy_count = 2;
SDcount++;
Tiekills = 0;
c.createEnemy(enemy_count);
}else{
enemy_count +=1;
Tiekills = 0;
c.createEnemy(enemy_count);
}}
}
}
if(Score > 10){
level = 1;
}
if(Score > 500){
level = 2;
}
if(Score > 1000){
level = 3;
}
if(Score > 10000){
level = 4;
}
if(Score > 100000){
level = 5;
}
if(Score > 1000000){
level = 6;
}


}
private void render(){
Expand All @@ -209,7 +245,28 @@ public class Game extends Canvas implements Runnable{
Graphics g = bufferstrat.getDrawGraphics();
/////////////////
g.drawImage(image, 0, 0, getWidth(), getHeight(), this);
g.drawImage(background, 0,0, null);

if(level == 0){
g.drawImage(level0, 0,0, null);
}
if(level == 1){
g.drawImage(level1, 0,0, null);
}
if(level == 2){
g.drawImage(level2, 0,0, null);
}
if(level == 3){
g.drawImage(level3, 0,0, null);
}
if(level == 4){
g.drawImage(level4, 0,0, null);
}
if(level == 5){
g.drawImage(level5, 0,0, null);
}
if(level > 5){
g.drawImage(level6, 0,0, null);
}
//g.drawImage(player, 100, 100, this);
if(State == STATE.GAME){
p.render(g);
Expand All @@ -218,7 +275,21 @@ public class Game extends Canvas implements Runnable{
p2.render(g);
}
}else if(State == STATE.MENU){
g.drawImage(background, 0,0, null);
menu.render(g);
delay = 0;
enemy_count = 1;
Tiekills = 0;
SDcount = 0;
SDkills = 0;
Score = 0;
level = 0;
}else if(State == STATE.END){
g.drawImage(gameOver,0,0, null);
if(delay == 10000){
State = STATE.MENU;
}
delay++;
}
/////////////////
g.dispose();
Expand Down Expand Up @@ -262,7 +333,8 @@ public class Game extends Canvas implements Runnable{
c.addEntity(new Laser(p2.getX(),p2.getY(), tp, this));}
is_shooting2++;
}
}}
}
}

}

Expand Down
1 change: 1 addition & 0 deletions src/main/Skins.java
Expand Up @@ -32,6 +32,7 @@ public class Skins {
enemy1 = ss.grabimage(1, 3, 64, 64);
player2 = ss.grabimage(2, 2, 64, 64);
enemyLaser = ss.grabimage(3, 2, 64, 64);
starDestroyer = ss.grabimage(3, 3, 128, 128);
}else{
player = ss.grabimage(playerx, playery, 64, 64);
laser = ss.grabimage(2, 3, 64, 64);
Expand Down

0 comments on commit 12b5b03

Please sign in to comment.