Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added Menu with MouseInput (click the star in the bottom right for
Padraic Single Player)
  • Loading branch information
tpg13002 committed Apr 26, 2016
1 parent 357f052 commit e9798ff
Show file tree
Hide file tree
Showing 4 changed files with 145 additions and 43 deletions.
101 changes: 59 additions & 42 deletions src/main/Game.java
Expand Up @@ -23,7 +23,7 @@ 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 = "Star Wars"; public final String Title = "spaaaaaace";


private boolean gameon = false; private boolean gameon = false;
private Thread thread; private Thread thread;
Expand All @@ -43,7 +43,12 @@ public class Game extends Canvas implements Runnable{
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 {
MENU,
GAME
};
public static STATE State = STATE.MENU;


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


Expand All @@ -54,8 +59,9 @@ public class Game extends Canvas implements Runnable{
private Player2 p2; private Player2 p2;
private Controller c; private Controller c;
private Skins tp; private Skins tp;
private int numberOfPlayers = 2; private Menu menu;
private boolean padraicmode = false; public static int numberOfPlayers = 2;
public static boolean padraicmode = false;


public void init() public void init()
{ {
Expand All @@ -70,8 +76,10 @@ public class Game extends Canvas implements Runnable{
e.printStackTrace(); e.printStackTrace();
} }
addKeyListener(new KeyboardInput(this)); addKeyListener(new KeyboardInput(this));
this.addMouseListener(new MouseInput());
tp = new Skins(this); tp = new Skins(this);
c = new Controller(tp, this); c = new Controller(tp, this);
menu = new Menu();


if(numberOfPlayers == 2){ if(numberOfPlayers == 2){
p2 = new Player2(300, 300, tp, this, c); p2 = new Player2(300, 300, tp, this, c);
Expand Down Expand Up @@ -135,6 +143,7 @@ public class Game extends Canvas implements Runnable{
int frames = 0; int frames = 0;
long timer = System.currentTimeMillis(); long timer = System.currentTimeMillis();
while(gameon){ while(gameon){
tp.getTextures();
long now = System.nanoTime(); long now = System.nanoTime();
delta += (now - lasttime) / ns; delta += (now - lasttime) / ns;
lasttime = now; lasttime = now;
Expand All @@ -159,10 +168,12 @@ public class Game extends Canvas implements Runnable{




private void tick() { private void tick() {
p.tick(); if(State == STATE.GAME){
c.tick(); p.tick();
if(numberOfPlayers == 2){ c.tick();
p2.tick(); if(numberOfPlayers == 2){
p2.tick();
}
} }
if(kills >= enemy_count){ if(kills >= enemy_count){
if (enemy_count == 10){ if (enemy_count == 10){
Expand All @@ -188,10 +199,14 @@ public class Game extends Canvas implements Runnable{
g.drawImage(image, 0, 0, getWidth(), getHeight(), this); g.drawImage(image, 0, 0, getWidth(), getHeight(), this);
g.drawImage(background, 0,0, null); g.drawImage(background, 0,0, null);
//g.drawImage(player, 100, 100, this); //g.drawImage(player, 100, 100, this);
p.render(g); if(State == STATE.GAME){
c.render(g); p.render(g);
if(numberOfPlayers == 2){ c.render(g);
p2.render(g); if(numberOfPlayers == 2){
p2.render(g);
}
}else if(State == STATE.MENU){
menu.render(g);
} }
///////////////// /////////////////
g.dispose(); g.dispose();
Expand All @@ -200,37 +215,39 @@ public class Game extends Canvas implements Runnable{
} }
public void keyPressed(KeyEvent e){ public void keyPressed(KeyEvent e){
int key = e.getKeyCode(); int key = e.getKeyCode();
if(key == KeyEvent.VK_RIGHT){ if(State == STATE.GAME){
p.setVelX(6); if(key == KeyEvent.VK_RIGHT){

p.setVelX(6);
} else if(key == KeyEvent.VK_LEFT){
p.setVelX(-6); } else if(key == KeyEvent.VK_LEFT){
} else if(key == KeyEvent.VK_DOWN){ p.setVelX(-6);
p.setVelY(6); } else if(key == KeyEvent.VK_DOWN){
} else if(key == KeyEvent.VK_UP){ p.setVelY(6);
p.setVelY(-6); } else if(key == KeyEvent.VK_UP){
} else if(key == KeyEvent.VK_L ){ p.setVelY(-6);
if(is_shooting == 3){ } else if(key == KeyEvent.VK_L ){
is_shooting = 0; if(is_shooting == 3){
} is_shooting = 0;
if(is_shooting == 0){ }
c.addEntity(new Laser(p.getX(),p.getY(), tp, this));} if(is_shooting == 0){
is_shooting++; c.addEntity(new Laser(p.getX(),p.getY(), tp, this));}
} else if(key == KeyEvent.VK_A){ is_shooting++;
p2.setVelX(-4); } else if(key == KeyEvent.VK_A){
} else if(key == KeyEvent.VK_D){ p2.setVelX(-4);
p2.setVelX(4); } else if(key == KeyEvent.VK_D){
}else if(key == KeyEvent.VK_S){ p2.setVelX(4);
p2.setVelY(4); }else if(key == KeyEvent.VK_S){
}else if(key == KeyEvent.VK_W){ p2.setVelY(4);
p2.setVelY(-4); }else if(key == KeyEvent.VK_W){
}else if(key == KeyEvent.VK_SPACE ){ p2.setVelY(-4);
if(is_shooting2 == 4){ }else if(key == KeyEvent.VK_SPACE ){
is_shooting2 = 0; 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++;
} }


} }
Expand Down
27 changes: 27 additions & 0 deletions src/main/Menu.java
@@ -0,0 +1,27 @@
package main;
import java.awt.Color;
import java.awt.Graphics;
import java.awt.Font;

public class Menu {

public void render(Graphics g){
Font title_font = new Font("comic sans ms", Font.BOLD, 100);
g.setFont(title_font);
g.setColor(Color.white);
g.drawString("spaaaaaace", 145, 150);

Font single_font = new Font("comic sans ms", Font.BOLD, 50);
g.setFont(single_font);
g.drawString("single player", 265, 275);

Font multi_font = new Font("comic sans ms", Font.BOLD, 50);
g.setFont(multi_font);
g.drawString("multiplayer", 285, 375);

Font quit_font = new Font("comic sans ms", Font.BOLD, 50);
g.setFont(quit_font);
g.drawString("quit", 365, 475);
}

}
58 changes: 58 additions & 0 deletions src/main/MouseInput.java
@@ -0,0 +1,58 @@
package main;

import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;

public class MouseInput implements MouseListener{

public void mouseClicked(MouseEvent arg0) {
// TODO Auto-generated method stub

}

public void mouseEntered(MouseEvent arg0) {
// TODO Auto-generated method stub

}

public void mouseExited(MouseEvent arg0) {
// TODO Auto-generated method stub

}

public void mousePressed(MouseEvent e) {
int mx = e.getX();
int my = e.getY();

if(mx >= 265 && mx <= 535 && my >= 225 && my <= 275)
{
Game.numberOfPlayers = 1;
Game.padraicmode = false;
Game.State = Game.STATE.GAME;
}
else if(mx >= 285 && mx <= 515 && my >= 325 && my <= 375)
{
Game.numberOfPlayers = 2;
Game.padraicmode = false;
Game.State = Game.STATE.GAME;
}
else if(mx >= 365 && mx <= 435 && my >= 425 && my <= 475)
{
System.exit(1);
}
else if(mx >= 610 && mx <= 650 && my >= 540 && my <= 580)
{
Game.numberOfPlayers = 1;
Game.padraicmode = true;
Game.State = Game.STATE.GAME;
}


}

public void mouseReleased(MouseEvent arg0) {
// TODO Auto-generated method stub

}

}
2 changes: 1 addition & 1 deletion src/main/Skins.java
Expand Up @@ -25,7 +25,7 @@ public class Skins {
getTextures(); getTextures();


} }
private void getTextures(){ public void getTextures(){
if(game.getPadraic()){ if(game.getPadraic()){
player = ss.grabimage(2, 2, 64, 64); player = ss.grabimage(2, 2, 64, 64);
laser = ss.grabimage(3, 2, 64, 64); laser = ss.grabimage(3, 2, 64, 64);
Expand Down

0 comments on commit e9798ff

Please sign in to comment.