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

game logic fixed1.0

Browse Source
This commit is contained in:
Remco
2015-06-05 11:48:09 +02:00
parent 1bf525c6b7
commit 76c288cfec
3 changed files with 107 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/drawObjects/Enemy.java
+6 -30
View File
@@ -8,13 +8,11 @@ import model.objects.Path;
public class Enemy extends DrawObject { public class Enemy extends DrawObject {
public static final int distanceToOctagon = 1000; public static final double distanceToOctagon = 1000,secondsToEnd = 5.0;
private final double secondsToEnd = 3; private int length;
private int length,timeToClick = 10,currentTimeToClick;
private double lengthOf1Side,distanceFromStart;//lengthOf1Side wordt alleen gebruikt als de lijn een schuine lijn is. private double lengthOf1Side,distanceFromStart;//lengthOf1Side wordt alleen gebruikt als de lijn een schuine lijn is.
public Line2D enemy; public Line2D enemy;
private Color c; private Color c;
private boolean clickable = false;
private Path path; private Path path;
public Enemy(int pathID,int lengthOfEnemy,Color c,Path path){ public Enemy(int pathID,int lengthOfEnemy,Color c,Path path){
@@ -67,6 +65,7 @@ public class Enemy extends DrawObject {
endY += beginY; endY += beginY;
enemy = new Line2D.Double(beginX, beginY, endX, endY); enemy = new Line2D.Double(beginX, beginY, endX, endY);
// System.out.println("Enemy added on path: "+pathID);
} }
@Override @Override
@@ -77,9 +76,6 @@ public class Enemy extends DrawObject {
@Override @Override
public void update(float factor) { public void update(float factor) {
if(clickable){
currentTimeToClick++;
}
distanceFromStart += (distanceToOctagon/(secondsToEnd*1000))*factor; distanceFromStart += (distanceToOctagon/(secondsToEnd*1000))*factor;
@@ -93,7 +89,7 @@ public class Enemy extends DrawObject {
angleX = Math.cos(Math.toRadians(45))*distanceFromStart; angleX = Math.cos(Math.toRadians(45))*distanceFromStart;
angleY = Math.sin(Math.toRadians(45))*distanceFromStart; angleY = Math.sin(Math.toRadians(45))*distanceFromStart;
System.out.println(Math.toRadians(45)*distanceFromStart); // System.out.println(Math.toRadians(45)*distanceFromStart);
System.out.println(angleX+" - "+angleY); System.out.println(angleX+" - "+angleY);
switch(index){ switch(index){
@@ -163,27 +159,7 @@ public class Enemy extends DrawObject {
this.enemy = bullet; this.enemy = bullet;
} }
public void clickable(){ public double getDistanceFromStart() {
clickable = true; return distanceFromStart;
} }
/**
* deze methode kijkt hoeveel frame je nog hebt om te klikken op het moment dat je bolletje in de hitzone zit
* @return
*/
public boolean finised(){
if(currentTimeToClick >= timeToClick){
return true;
}
return false;
}
public boolean isClickable(){
return clickable;
}
public int getTimeLeftToClick() {
return currentTimeToClick;
}
} }
model/gameState/PlayState.java
+57 -54
View File
@@ -1,7 +1,5 @@
package model.gameState; package model.gameState;
import java.awt.BasicStroke; import java.awt.BasicStroke;
import java.awt.Color; import java.awt.Color;
import java.awt.Graphics2D; import java.awt.Graphics2D;
@@ -9,7 +7,6 @@ import java.awt.Stroke;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import java.util.Iterator; import java.util.Iterator;
import model.GameModel;
import model.SongHandler; import model.SongHandler;
import model.drawObjects.Enemy; import model.drawObjects.Enemy;
import model.drawObjects.Player; import model.drawObjects.Player;
@@ -21,9 +18,10 @@ import control.GameStateManager;
import control.button.ButtonEvent; import control.button.ButtonEvent;
import control.joystick.JoystickEvent; import control.joystick.JoystickEvent;
public class PlayState extends GameState{ public class PlayState extends GameState {
public static final Rectangle2D borderRect = new Rectangle2D.Double(256, 0, 1024, 1024); public static final Rectangle2D borderRect = new Rectangle2D.Double(256, 0,
1024, 1024);
private PlayArea area; private PlayArea area;
private InfoPanel infoPanel; private InfoPanel infoPanel;
private Player player; private Player player;
@@ -36,15 +34,16 @@ public class PlayState extends GameState{
private long oldProgress = 0; private long oldProgress = 0;
public PlayState(GameStateManager gsm, SongHandler sh) { public PlayState(GameStateManager gsm, SongHandler sh) {
super(gsm,sh); super(gsm, sh);
infoPanel = new InfoPanel(0, 0); infoPanel = new InfoPanel(0, 0);
area = new PlayArea(256, 1024, 1024, 100); area = new PlayArea(256, 1024, 1024, 125);
for(int index = 0; index < 8; index++){ // for(int index = 0; index < 8; index++){
addEnemy(index, GameModel.colors[index % 6]); // addEnemy(index, GameModel.colors[index % 6]);
} // }
//
player = new Player(1280-1024+1024/2, 1024/2); player = new Player(1280 - 1024 + 1024 / 2, 1024 / 2);
stroke = new BasicStroke(sizeOfEnemy,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND); stroke = new BasicStroke(sizeOfEnemy, BasicStroke.CAP_ROUND,
BasicStroke.JOIN_ROUND);
} }
@Override @Override
@@ -52,78 +51,82 @@ public class PlayState extends GameState{
sh.stop(); sh.stop();
sh.play(); sh.play();
// System.out.println("Diff" + sh.getCurrentSongInstance().getDifficulty()); // System.out.println("Diff" +
// sh.getCurrentSongInstance().getDifficulty());
} }
@Override @Override
public void update(float factor) { public void update(float factor) {
player.update(factor); player.update(factor);
for(Path path : area.paths){ for (Path path : area.paths) {
Iterator<Enemy>enemyIterator = path.getEnemysInPath().iterator();
while(enemyIterator.hasNext()){ Iterator<Enemy> enemyIterator = path.getEnemysInPath().iterator();
Enemy e = enemyIterator.next();
Rectangle2D hitArea = area.hitAreas[e.getIndex()]; while (enemyIterator.hasNext()) {
if(e.finised()){
enemyIterator.remove(); Enemy e = enemyIterator.next();
}
if(hitArea.intersectsLine(e.enemy) && !e.isClickable()){ if(e.getDistanceFromStart() > Enemy.distanceToOctagon+(sizeOfEnemy*1.5)){
e.clickable(); enemyIterator.remove();
} }
e.update(factor); e.update(factor);
} }
} }
infoPanel.updateIPanel(); infoPanel.updateIPanel();
// long progress = sh.getProgress() / 1000; long progress = (long) ((sh.getProgress() / 1000) + (Enemy.secondsToEnd * 1000));
//
// for(ObjectInstance ob : sh.getCurrentSongInstance().getBetween(oldProgress, progress))
// {
// Path p = area.paths.get(ob.getDirection());
// p.addEnemy(ob.getColor(), ob.getDirection(), (int) ob.getLength());
// }
//
// oldProgress = progress;
}
for (ObjectInstance ob : sh.getCurrentSongInstance().getBetween(
oldProgress, progress)) {
Path p = area.paths.get(ob.getDirection());
p.addEnemy(ob.getColor(), ob.getDirection(), (int) ob.getLength());
}
oldProgress = progress;
}
@Override @Override
public void draw(Graphics2D g2) { public void draw(Graphics2D g2) {
try{ try {
infoPanel.draw(g2); infoPanel.draw(g2);
g2.setClip(borderRect); g2.setClip(borderRect);
area.draw(g2); area.draw(g2);
g2.setStroke(stroke); g2.setStroke(stroke);
for(Path p : area.paths){ for (Path p : area.paths) {
if(p.getEnemysInPath() != null){ if (p.getEnemysInPath() != null) {
for(Enemy enemy : p.getEnemysInPath()){ for (Enemy enemy : p.getEnemysInPath()) {
enemy.draw(g2); enemy.draw(g2);
} }
} }
} }
if(player != null) if (player != null)
player.draw(g2); player.draw(g2);
}catch(Exception e){}; } catch (Exception e) {
}
;
} }
@Override @Override
public void buttonPressed(ButtonEvent e) { public void buttonPressed(ButtonEvent e) {
// int index = player.getIndex(); Iterator<Enemy> enemysInPath = area.paths.get(player.getIndex()).getEnemysInPath().iterator();
Path currentPath = area.paths.get(player.getIndex()); while(enemysInPath.hasNext()){
if (!currentPath.getEnemysInPath().isEmpty()) { Enemy enemy = enemysInPath.next();
Enemy ce = currentPath.getEnemysInPath().getFirst(); if(enemy.getDistanceFromStart() > Enemy.distanceToOctagon || enemy.getDistanceFromStart() > Enemy.distanceToOctagon+sizeOfEnemy)
if (ce.isClickable()) { {
if (ce.getColor().equals(e.getButton().getColor())) { if(e.getButton().getColor().equals(enemy.getColor()))
currentScore += ce.getTimeLeftToClick(); {
currentPath.getEnemysInPath().remove(ce); currentScore += enemy.getDistanceFromStart() - Enemy.distanceToOctagon;
enemysInPath.remove();
} }
} }
} }
} }
@Override @Override
@@ -132,7 +135,7 @@ public class PlayState extends GameState{
@Override @Override
public void onJoystickMoved(JoystickEvent e) { public void onJoystickMoved(JoystickEvent e) {
switch(e.getJoystick().getPos()){ switch (e.getJoystick().getPos()) {
case CENTER: case CENTER:
break; break;
case DOWN: case DOWN:
@@ -164,9 +167,9 @@ public class PlayState extends GameState{
} }
} }
public void addEnemy(int pathID,Color color){ public void addEnemy(int pathID, Color color) {
Path path = area.paths.get(pathID); Path path = area.paths.get(pathID);
Enemy e = new Enemy(pathID,1,color,path); Enemy e = new Enemy(pathID, 1, color, path);
path.getEnemysInPath().addLast(e); path.getEnemysInPath().addLast(e);
} }
} }
model/gameState/TitleState.java
+3 -1
View File
@@ -11,6 +11,7 @@ import java.awt.image.BufferedImage;
import control.joystick.JoystickEvent; import control.joystick.JoystickEvent;
import model.SongHandler; import model.SongHandler;
import control.GameStateManager; import control.GameStateManager;
import control.GameStateManager.State;
import control.button.ButtonEvent; import control.button.ButtonEvent;
public class TitleState extends GameState { public class TitleState extends GameState {
@@ -73,7 +74,8 @@ public class TitleState extends GameState {
switch(e.getButton().getButtonID()){ switch(e.getButton().getButtonID()){
case 0: case 0:
gsm.next(); //gsm.next();
gsm.setState(State.PLAY_STATE);
break; break;
} }