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

original game?

Browse Source
This commit is contained in:
Remco
2015-06-02 09:59:26 +02:00
parent d685ffc6ac
commit 3fc6c98ea5
21 changed files with 357 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/gameState/MenuState.java
+17 -67
View File
@@ -1,62 +1,44 @@
package model.gameState;
import image.Images;
import image.Images.ImageType;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import model.objects.MenuButton;
import control.GameStateManager;
import control.button.Button;
import control.button.ButtonEvent;
import control.joystick.Joystick;
import control.joystick.JoystickEvent;
public class MenuState extends GameState {
private ArrayList<MenuButton> buttons;
private int selected;
int frame = 0;
int maxFrames = 2560;
int animationcounter;
public MenuState(GameStateManager gsm) {
public MenuState(GameStateManager gsm) {
super(gsm);
buttons = new ArrayList<MenuButton>();
buttons.add(new MenuButton(-600, 50,1.7,"Genre", 0, Color.green));
buttons.add(new MenuButton(-600, 150, 1.7, "Most played", 10, new Color(60,60,255)));
buttons.add(new MenuButton(-600, 250, 1.7, "Best played", 20, Color.red));
buttons.add(new MenuButton(-600, 350, 1.7, "Last played", 30, Color.yellow));
}
@Override
public void init() {
// TODO Auto-generated method stub
}
@Override
public void update() {
buttonInAnimation(animationcounter);
for(MenuButton b:buttons){
b.update();
}
frame++;
// TODO Auto-generated method stub
}
@Override
public void draw(Graphics2D g2) {
g2.drawImage(Images.getImage(ImageType.background), -640 -((frame * 4) % maxFrames), 0, 5120, 1024, null);
for(MenuButton b:buttons){
b.draw(g2);
}
g2.drawString("Press 0 to start the game", 1280/2, 1024/2);
}
@Override
public void buttonPressed(ButtonEvent e) {
switch(e.getButton().getButtonID()){
case 0:
gsm.next();
break;
}
}
@Override
public void buttonReleased(ButtonEvent e) {
@@ -64,40 +46,8 @@ public class MenuState extends GameState {
}
@Override
public void onJoystickMoved(JoystickEvent e) {
if(e.getJoystick().getPos() == Joystick.Position.DOWN){
selected++;
selected %= buttons.size();
for(int i = 0; i < buttons.size(); i++){
if(selected == i){
buttons.get(i).setSelected(true);
}else{
buttons.get(i).setSelected(false);
}
}
}else if(e.getJoystick().getPos() == Joystick.Position.UP){
selected--;
if(selected < 0) selected = buttons.size()-1;
for(int i = 0; i < buttons.size(); i++){
if(selected == i){
buttons.get(i).setSelected(true);
}else{
buttons.get(i).setSelected(false);
}
}
}
}
public void buttonInAnimation(int button){
if(button >= 0 && button < buttons.size() ){
buttons.get(button).setX(buttons.get(button).getX()+40);
if(buttons.get(button).getX() >= 320){
animationcounter++;
}
if(buttons.get(button).getX() >= -200){
buttonInAnimation(button+1);
System.out.println(buttons.get(button).getX());
}
}
// TODO Auto-generated method stub
}
}
model/gameState/PlayState.java
+50 -95
View File
@@ -1,19 +1,21 @@
package model.gameState;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Stroke;
import java.awt.geom.Line2D;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import model.GameModel;
import model.drawObjects.Bullet;
import model.drawObjects.Enemy;
import model.drawObjects.Player;
import model.drawObjects.enemy.Enemy;
import model.objects.InfoPanel;
import model.objects.PlayArea;
import control.GameStateManager;
@@ -26,26 +28,27 @@ public class PlayState extends GameState{
private PlayArea area;
private InfoPanel infoPanel;
private Player player;
private List<Enemy> enemys;
private List<Bullet> bullets;
private Iterator<Enemy> enemyIterator;
private Iterator<Bullet> bulletIterator;
private List<Enemy> enemys;
private Stroke stroke;
private Iterator<Enemy> enemyIterator;
public static int sizeOfEnemy = 40;
public static int currentScore = 0;
public static int lifePoints = 100;
public PlayState(GameStateManager gsm) {
super(gsm);
area = new PlayArea((int) borderRect.getX(),1024,1024,100);
area = new PlayArea(borderRect.getX(),1024,1024,150);
infoPanel = new InfoPanel(0, 0);
enemys = new ArrayList<Enemy>();
bullets =new ArrayList<Bullet>();
player = new Player(1280-1024+1024/2, 1024/2);
for(int i = 0; i < 8; i++){
Line2D line = area.getLine(i);
addEnemy(line, Color.RED, 200);
enemys = new ArrayList<Enemy>();
for(int index = 0; index < 2; index++){
Line2D path = area.paths.get(index);
addEnemy(index, GameModel.colors[index % 6], path.getP1(),path.getP2());
}
player = new Player(1280-1024+1024/2, 1024/2);
stroke = new BasicStroke(sizeOfEnemy,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND);
}
@Override
@@ -56,88 +59,40 @@ public class PlayState extends GameState{
@Override
public void update() {
player.update();
bulletIterator = bullets.iterator();
while(bulletIterator.hasNext()){
Bullet b = bulletIterator.next();
//als de bullet de border raakt verwijder hem, anders update je hem
if(!borderRect.intersectsLine(b.getBullet())){
bulletIterator.remove();
break;
}else{
b.update();
}
}
player.update();
enemyIterator = enemys.iterator();
while(enemyIterator.hasNext()){
while(enemyIterator.hasNext()){
Enemy e = enemyIterator.next();
e.update();
//als de enemy de octagon raakt verwijder hem
if(area.octagon.intersects(e.getCircle().getBounds2D())){
lifePoints -= 5;
if(lifePoints < 10){
lifePoints += 10; //Dit is voor te testen.
}
Rectangle2D hitArea = area.hitAreas[e.getIndex()];
if(e.finised()){
enemyIterator.remove();
}
if(hitArea.intersectsLine(e.enemy) && !e.isClickable()){
e.clickable();
}
//nu kijken of je de enemy raakt met een bullet
else{
bulletIterator = bullets.iterator();
if(e.isClickable()){
while(bulletIterator.hasNext()){
Bullet b = bulletIterator.next();
//kijkt of de enemy een bullet tegen komt, zoja verwijder de bullet, zoniet update de enemy.
if(e.bulletHitMe(b)){
bulletIterator.remove();
//kijkt of de bullet die de enemy heeft gehit, ook dezelfde kleur heeft als de enemy, zoja verwijder de enemy
if(e.ColorHitMe(b)){
currentScore += 1;
if(lifePoints < 100) {
lifePoints += 5;
}
enemyIterator.remove();
break;
}
}
}
}
// System.out.println(e.enemy.getP1().distance(hitArea.getCenterX(), hitArea.getCenterY()));
e.update();
}
infoPanel.updateIPanel();
}
while(enemys.size() < 8){
int index = (int)(Math.random()*8);
int color = (int)(Math.random()*GameModel.colors.length);
Line2D line = area.getLine(index);
addEnemy(line,GameModel.colors[color],200);
}
}
@Override
public void draw(Graphics2D g2) {
try{
public void draw(Graphics2D g2) {
try{
infoPanel.draw(g2);
g2.setClip(borderRect);
area.draw(g2);
area.draw(g2);
g2.setStroke(stroke);
if(enemys != null){
for(Enemy enemy : enemys){
enemy.draw(g2);
}
}
g2.setStroke(new BasicStroke(5));
for(Bullet b : bullets){
b.draw(g2);
}
}
if(player != null)
player.draw(g2);
@@ -148,10 +103,19 @@ public class PlayState extends GameState{
@Override
public void buttonPressed(ButtonEvent e) {
if(e.getButton().getButtonID() != 0){
addBullet(GameModel.colors[e.getButton().getButtonID()-1],player.getIndex());
}
public void buttonPressed(ButtonEvent e) {
enemyIterator = enemys.iterator();
while(enemyIterator.hasNext()){
Enemy enemy = enemyIterator.next();
if(enemy.isClickable()){
if(enemy.getIndex() == player.getIndex()){
if(enemy.getColor().equals(e.getButton().getColor())){
enemyIterator.remove();
currentScore += enemy.getTimeLeftToClick();
}
}
}
}
}
@Override
@@ -192,16 +156,7 @@ public class PlayState extends GameState{
}
}
public void addEnemy(Line2D path,Color c,double speed){
enemys.add(new Enemy(path,c,20,speed));
}
public void addBullet(Color c,int index){ ;
bullets.add(new Bullet(10, c, 10, index,area.paths.get(index)));
}
public void removeBullet(Bullet bullet){
bullets.remove(bullet);
}
public void addEnemy(int pathID,Color color,Point2D beginPoint,Point2D endPoint){
enemys.add(new Enemy(pathID,1,color,100,beginPoint, endPoint));
}
}
model/gameState/TitleState.java
-91
View File
@@ -1,91 +0,0 @@
package model.gameState;
import image.Images;
import image.Images.ImageType;
import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import control.GameStateManager;
import control.button.ButtonEvent;
import control.joystick.JoystickEvent;
public class TitleState extends GameState {
BufferedImage pressStart = Images.getImage(ImageType.pressstart);
BufferedImage colorStrike = Images.getImage(ImageType.colorstrike);
BufferedImage background = Images.getImage(ImageType.background);
int index = 0;
int varx = 0;
int frame = 0;
int maxFrames = 2560;
public TitleState(GameStateManager gsm) {
super(gsm);
}
@Override
public void init() {
// TODO Auto-generated method stub
}
@Override
public void update() {
frame++;
}
@Override
public void draw(Graphics2D g2) {
g2.setColor(Color.WHITE);
g2.fillRect(0,0,1280,1024);
g2.translate(640, 512);
BufferedImage subImg2 = background.getSubimage(0, 0, 5120, 1024);
g2.drawImage(subImg2, -640 -((frame * 4) % maxFrames), -512, 5120, 1024, null);
//
// g2.setColor(Color.ORANGE);
// g2.fillRect( -25*5 -1, - 18*5 -1, 49*5 + 1, 26*5 + 1);
// g2.drawRect( -25*5 -3, - 18*5 -3, 49*5 + 4, 26*5 + 4);
int image_x = ((frame / 6) % 6) * 49;
BufferedImage subImg = pressStart.getSubimage(image_x, 0, 49, 26);
g2.drawImage(subImg, - 25*5, - 18*5, 49*5, 26*5, null);
g2.drawImage(colorStrike, -27*8 , -300, 54*8, 18*8, null);
Font textFont = new Font("OCR A Extended", Font.BOLD, 15);
g2.setFont(textFont);
g2.setColor(Color.WHITE);
g2.drawString("©2015 Team Hamtaro", - 18*5, 500);
}
@Override
public void buttonPressed(ButtonEvent e) {
switch(e.getButton().getButtonID()){
case 0:
gsm.next();
break;
}
}
@Override
public void buttonReleased(ButtonEvent e) {
}
@Override
public void onJoystickMoved(JoystickEvent e) {
// TODO Auto-generated method stub
}
}