Skip to content

J
JTankTrouble
Commit ee85ed06 authored by nargessalehi98's avatar nargessalehi98
Browse files
Options

Add back and for movement limit.

parent 94e27df8
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 20 deletions
src/GameState.java
View file @ ee85ed06
...@@ -33,6 +33,8 @@ public class GameState { ...@@ -33,6 +33,8 @@ public class GameState {
private boolean two = false; private boolean two = false;
private boolean three = false; private boolean three = false;
private int step=0; private int step=0;
boolean PermissionUp = true;
boolean PermissionDown = true;
public GameState(int num) { public GameState(int num) {
...@@ -78,42 +80,55 @@ public class GameState { ...@@ -78,42 +80,55 @@ public class GameState {
locY = mouseY - diam / 2; locY = mouseY - diam / 2;
locX = mouseX - diam / 2; locX = mouseX - diam / 2;
} }
//
if(step>2) // if(step<2)
step=0; // step=0;
if (keyUP) { if (keyUP) {
boolean PermissionDown = true; PermissionUp=true;
for (Wall wall : Controller.walls) { for (Wall wall : Controller.walls) {
if (wall.intersects(getBounds(locX + 5, locY + 5))) { if (wall.getWidth() == 5 && wall.getHeight() == 50 ) {
System.out.println("4"); if ((getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 5, 50)))) {
PermissionDown = false; PermissionUp = false;
break; //System.out.println(wall.getHeight());
break;
}
}
if (wall.getWidth() == 50 && wall.getHeight() == 5 ) {
if ((getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 50, 5)))) {
//System.out.println(wall.getHeight());
PermissionUp = false;
break;
}
} }
} }
if (PermissionDown) if (PermissionUp)
move(+5); move(+5);
if(!PermissionDown && step<2){ if(!PermissionDown ){
move(+5); move(+5);
step++;
} }
} }
if (keyDOWN) { if (keyDOWN) {
boolean PermissionUp = true; PermissionDown=true;
for (Wall wall : Controller.walls) { for (Wall wall : Controller.walls) {
if (wall.intersects(getBounds(locX + 5, locY + 5))) { if (wall.getWidth() == 5 && wall.getHeight() == 50 ) {
System.out.println("5"); if ((getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 5, 50)))) {
PermissionUp = false; PermissionDown = false;
break; break;
}
}
if (wall.getWidth() == 50 && wall.getHeight() == 5 ) {
if ((getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 50, 5)))) {
PermissionDown = false;
break;
}
} }
} }
if (PermissionUp) if (PermissionDown)
move(-5); move(-5);
if(!PermissionUp && step<2) { if(!PermissionUp ) {
move(-5); move(-5);
step++;
System.out.println(step);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment