Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix
  • Loading branch information
@jdm13003
jdm13003 committed Apr 27, 2016
1 parent 0e8972d commit bafc8e4
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 74 deletions.
Binary file added resources/level0.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
176 changes: 102 additions & 74 deletions src/main/Game.java
View file
Expand Up @@ -19,41 +19,53 @@ import entity.EntityTypeC;
import entity.EntityTypeD; import entity.EntityTypeD;


public class Game extends Canvas implements Runnable{ public class Game extends Canvas implements Runnable{

private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static final int Width = 800; public static final int Width = 800;
public static final int Height = 600; public static final int Height = 600;
public final String Title = "spaaaaaace"; public final String Title = "spaaaaaace";

private boolean gameon = false; private boolean gameon = false;
private Thread thread; private Thread thread;


private BufferedImage image = new BufferedImage(Width, Height, BufferedImage.TYPE_INT_RGB); private BufferedImage image = new BufferedImage(Width, Height, BufferedImage.TYPE_INT_RGB);
private BufferedImage spriteSheet = null; private BufferedImage spriteSheet = null;
private BufferedImage background = null; private BufferedImage background = null;

private BufferedImage level0 = null;
private BufferedImage level1 = null;
private BufferedImage level2 = null;
private BufferedImage level3 = null;
private BufferedImage level4 = null;
private BufferedImage level5 = null;
private BufferedImage level6 = null;

private int is_shooting = 0; private int is_shooting = 0;
private int is_shooting2 = 0; private int is_shooting2 = 0;

private int enemy_count = 1; private int enemy_count = 1;
private int kills = 0; private int Tiekills = 0;
private int SDcount = 0; private int SDcount = 0;
private int SDkills = 0;
private int Score = 0;
private int level = 0;
private int delay = 0;
public LinkedList<EntityTypeA> ea; public LinkedList<EntityTypeA> ea;
public LinkedList<EntityTypeB> eb; public LinkedList<EntityTypeB> eb;
public LinkedList<EntityTypeC> ec; public LinkedList<EntityTypeC> ec;
public LinkedList<EntityTypeD> ed; public LinkedList<EntityTypeD> ed;



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

Random r = new Random(); Random r = new Random();




//private BufferedImage player; //private BufferedImage player;
private Player p; private Player p;
private Player2 p2; private Player2 p2;
Expand All @@ -62,16 +74,16 @@ public class Game extends Canvas implements Runnable{
private Menu menu; private Menu menu;
public static int numberOfPlayers = 2; public static int numberOfPlayers = 2;
public static boolean padraicmode = false; public static boolean padraicmode = false;

public void init() public void init()
{ {
requestFocus(); requestFocus();
BufferedImageLoader loader = new BufferedImageLoader(); BufferedImageLoader loader = new BufferedImageLoader();
try{ try{

spriteSheet = loader.loadimage("/sprite_sheet.png"); spriteSheet = loader.loadimage("/sprite_sheet.png");
background = loader.loadimage("/background.png"); background = loader.loadimage("/background.png");

}catch(IOException e){ }catch(IOException e){
e.printStackTrace(); e.printStackTrace();
} }
Expand All @@ -92,33 +104,33 @@ public class Game extends Canvas implements Runnable{
ed = c.getEntityD(); ed = c.getEntityD();
c.createEnemy(enemy_count); c.createEnemy(enemy_count);
} }



public static void main(String args[]){ public static void main(String args[]){
Game game = new Game(); Game game = new Game();

game.setPreferredSize(new Dimension(Width, Height)); game.setPreferredSize(new Dimension(Width, Height));

JFrame screen = new JFrame(game.Title); JFrame screen = new JFrame(game.Title);
screen.add(game); screen.add(game);
screen.pack(); screen.pack();
screen.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); screen.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
screen.setResizable(false); screen.setResizable(false);
screen.setVisible(true); screen.setVisible(true);

game.start(); game.start();
} }



private synchronized void start(){ private synchronized void start(){
if (gameon) if (gameon)
return; return;
gameon = true; gameon = true;
thread = new Thread(this); thread = new Thread(this);
thread.start(); thread.start();
} }

private synchronized void stop(){ private synchronized void stop(){
if (!gameon) if (!gameon)
return; return;
Expand All @@ -130,8 +142,8 @@ public class Game extends Canvas implements Runnable{
} }
System.exit(1); System.exit(1);
} }


//game loop //game loop
public void run() { public void run() {
init(); init();
Expand Down Expand Up @@ -160,10 +172,10 @@ public class Game extends Canvas implements Runnable{
updates = 0; updates = 0;
frames = 0; frames = 0;
} }

} }
stop(); stop();

} }




Expand All @@ -172,21 +184,21 @@ public class Game extends Canvas implements Runnable{
p.tick(); p.tick();
c.tick(); c.tick();
if(numberOfPlayers == 2){ if(numberOfPlayers == 2){
p2.tick(); p2.tick();
} }
} }
if(kills >= enemy_count){ if(Tiekills >= enemy_count){
if (enemy_count == 10){ if (enemy_count == 10){
c.createSD(SDcount); c.createSD(SDcount);
enemy_count = 2; enemy_count = 2;
SDcount++; SDcount++;
c.createEnemy(enemy_count); c.createEnemy(enemy_count);
}else{ }else{
enemy_count +=1; enemy_count +=1;
kills = 0; Tiekills = 0;
c.createEnemy(enemy_count); c.createEnemy(enemy_count);
}} }}

} }
private void render(){ private void render(){
BufferStrategy bufferstrat = this.getBufferStrategy(); BufferStrategy bufferstrat = this.getBufferStrategy();
Expand All @@ -203,22 +215,22 @@ public class Game extends Canvas implements Runnable{
p.render(g); p.render(g);
c.render(g); c.render(g);
if(numberOfPlayers == 2){ if(numberOfPlayers == 2){
p2.render(g); p2.render(g);
} }
}else if(State == STATE.MENU){ }else if(State == STATE.MENU){
menu.render(g); menu.render(g);
} }
///////////////// /////////////////
g.dispose(); g.dispose();
bufferstrat.show(); bufferstrat.show();

} }
public void keyPressed(KeyEvent e){ public void keyPressed(KeyEvent e){
int key = e.getKeyCode(); int key = e.getKeyCode();
if(State == STATE.GAME){ if(State == STATE.GAME){
if(key == KeyEvent.VK_RIGHT){ if(key == KeyEvent.VK_RIGHT){
p.setVelX(6); p.setVelX(6);

} else if(key == KeyEvent.VK_LEFT){ } else if(key == KeyEvent.VK_LEFT){
p.setVelX(-6); p.setVelX(-6);
} else if(key == KeyEvent.VK_DOWN){ } else if(key == KeyEvent.VK_DOWN){
Expand All @@ -230,28 +242,30 @@ public class Game extends Canvas implements Runnable{
is_shooting = 0; is_shooting = 0;
} }
if(is_shooting == 0){ if(is_shooting == 0){
c.addEntity(new Laser(p.getX(),p.getY(), tp, this));} c.addEntity(new Laser(p.getX(),p.getY(), tp, this));}
is_shooting++; is_shooting++;
} else if(key == KeyEvent.VK_A){ }
p2.setVelX(-4); if(numberOfPlayers == 2){
} else if(key == KeyEvent.VK_D){ if(key == KeyEvent.VK_A){
p2.setVelX(4); p2.setVelX(-4);
}else if(key == KeyEvent.VK_S){ } else if(key == KeyEvent.VK_D){
p2.setVelY(4); p2.setVelX(4);
}else if(key == KeyEvent.VK_W){ }else if(key == KeyEvent.VK_S){
p2.setVelY(-4); p2.setVelY(4);
}else if(key == KeyEvent.VK_SPACE ){ }else if(key == KeyEvent.VK_W){
if(is_shooting2 == 4){ p2.setVelY(-4);
is_shooting2 = 0; }else if(key == KeyEvent.VK_SPACE ){
if(is_shooting2 == 4){
is_shooting2 = 0;
}
if(is_shooting2 == 0){
c.addEntity(new Laser(p2.getX(),p2.getY(), tp, this));}
is_shooting2++;
} }
if(is_shooting2 == 0){ }}
c.addEntity(new Laser(p2.getX(),p2.getY(), tp, this));}
is_shooting2++;
}
}

} }

public void keyReleased(KeyEvent e){ public void keyReleased(KeyEvent e){
int key = e.getKeyCode(); int key = e.getKeyCode();
if(key == KeyEvent.VK_RIGHT){ if(key == KeyEvent.VK_RIGHT){
Expand All @@ -264,40 +278,54 @@ public class Game extends Canvas implements Runnable{
p.setVelY(0); p.setVelY(0);
} else if(key == KeyEvent.VK_L){ } else if(key == KeyEvent.VK_L){
is_shooting = 0; is_shooting = 0;
} else if(key == KeyEvent.VK_A){
p2.setVelX(0);
} else if(key == KeyEvent.VK_D){
p2.setVelX(0);
}else if(key == KeyEvent.VK_S){
p2.setVelY(0);
}else if(key == KeyEvent.VK_W){
p2.setVelX(0);
}else if(key == KeyEvent.VK_SPACE ){

is_shooting2 = 0;


} }

if(numberOfPlayers == 2){
if(key == KeyEvent.VK_A){
p2.setVelX(0);
} else if(key == KeyEvent.VK_D){
p2.setVelX(0);
}else if(key == KeyEvent.VK_S){
p2.setVelY(0);
}else if(key == KeyEvent.VK_W){
p2.setVelY(0);
}else if(key == KeyEvent.VK_SPACE ){

is_shooting2 = 0;


}}

} }

public BufferedImage getSpriteSheet(){ public BufferedImage getSpriteSheet(){
return spriteSheet; return spriteSheet;
} }

public int getScore(){
return Score;
}
public void setScore(int score){
Score = score;
}
public int getEnemy_count() { public int getEnemy_count() {
return enemy_count; return enemy_count;
} }
public void setEnemy_count(int enemy_count) { public void setEnemy_count(int enemy_count) {
this.enemy_count = enemy_count; this.enemy_count = enemy_count;
} }
public int getKills() { public int getSDKills(){
return kills; return SDkills;
} }
public void setKills(int kills) { public void setSDKills(int SDkill){
this.kills = kills; SDkills = SDkill;
}
public int getTieKills() {
return Tiekills;
}
public void setTieKills(int kills) {
this.Tiekills = kills;
} }
public boolean getPadraic(){ public boolean getPadraic(){
return padraicmode; return padraicmode;
} }

} }

0 comments on commit bafc8e4

Please sign in to comment.