Skip to content

J
JTankTrouble
Commit d53304e0 authored by 9831111's avatar 9831111 🙂
Browse files
Options

Add calculate bullet method to find first shot point.

parent 660d635a
Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 84 deletions
src/GameFrame.java
View file @ d53304e0
...@@ -338,21 +338,7 @@ public class GameFrame extends JFrame { ...@@ -338,21 +338,7 @@ public class GameFrame extends JFrame {
} }
} }
public boolean checkWallAdded(int currentX, int currentY) {
String str = currentX + " " + currentY;
for (Wall wall : walls) {
if (wall.toString().equals(str)) return false;
else return true;
}
return true;
}
public void getColor(int x, int y) throws AWTException {
Robot robot = new Robot();
System.out.println(robot.getPixelColor(x, y));
}
/** /**
* Draw prize randomly * Draw prize randomly
......
src/GameState.java
View file @ d53304e0
...@@ -33,9 +33,9 @@ public class GameState { ...@@ -33,9 +33,9 @@ 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; public double rotateAmountTank;
boolean PermissionDown = true; public double rotateAmountBullet;
boolean check = true; private int bulletTime = 0;
public GameState(int num) { public GameState(int num) {
...@@ -84,87 +84,114 @@ public class GameState { ...@@ -84,87 +84,114 @@ public class GameState {
if (keyUP) { if (keyUP) {
PermissionUp = true;
for (Wall wall : Controller.walls) {
if (wall.getWidth() == 5 && wall.getHeight() == 50) {
if ((getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 5, 50)))) {
//&&
// ((rotateAmount == 0 && locX < wall.getX()) || ((rotateAmount == 180 || rotateAmount == -180) && locX > wall.getX()))
PermissionUp = false;
break;
}
}
if (wall.getWidth() == 50 && wall.getHeight() == 5) {
if ((getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 50, 5)))) {
// &&
// (((rotateAmount == +90 || rotateAmount == -270) && locY < wall.getY()) || (((rotateAmount == -90 || rotateAmount == -270) && locY > wall.getY())))
PermissionUp = false;
break;
}
}
}
if (PermissionUp)
move(+5);
for (Wall wall : Controller.walls)
if (!PermissionDown && (!(getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 50, 5))) ||
!(getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 5, 50))))) {
move(+5); move(+5);
break;
}
} }
if (keyDOWN) { if (keyDOWN) {
PermissionDown = true; move(-5);
}
if (keyLEFT)
rotateAmount -= 15;
if (keyRIGHT)
rotateAmount += 15;
locX = Math.max(locX, 40);
locX = Math.min(locX, 20 + (((Controller.col - 1) / 2) * 50) + (((Controller.col - 1) / 2) + 1) * 5 - 25);
locY = Math.max(locY, 70);
locY = Math.min(locY, 50 + ((Controller.row - 1) / 2) * 50 + (((Controller.row - 1) / 2) + 1) * 5 - 25);
}
public Wall verticalWallCollision() {
for (Wall wall : Controller.walls) { for (Wall wall : Controller.walls) {
if (wall.getWidth() == 5 && wall.getHeight() == 50) { if (wall.getWidth() == 5 && wall.getHeight() == 50) {
if ((getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 5, 50)))) { if ((getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 5, 50)))) {
//&& return wall;
// ((((rotateAmount == 0) || locX >= wall.getX())) || (((rotateAmount == -180 || rotateAmount == 180) && locX <= wall.getX()))) }
PermissionDown = false;
break;
} }
} }
return null;
}
public Wall horizontalWallCollision() {
for (Wall wall : Controller.walls) {
if (wall.getWidth() == 50 && wall.getHeight() == 5) { if (wall.getWidth() == 50 && wall.getHeight() == 5) {
if ((getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 50, 5)))) { if ((getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 50, 5)))) {
// && return wall;
// (((rotateAmount == -90 || rotateAmount == 270) && locY<wall.getY()))|| (((rotateAmount==90||rotateAmount==-270)&& locY>wall.getY()))
PermissionDown = false;
break;
} }
} }
} }
if (PermissionDown) return null;
move(-5);
for (Wall wall : Controller.walls)
if (!PermissionUp && (!(getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 50, 5))) ||
!(getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 5, 50))))) {
move(-5);
break;
} }
public boolean isMoveAllowed(int px) {
if (verticalWallCollision() != null) {
if (verticalWallCollision().getX() > locX && px > 0) {
if ((rotateAmount <= 90 && rotateAmount >= -90) || (rotateAmount <= -270 && rotateAmount > -360) || (rotateAmount >= 270 && rotateAmount < 360)) {
return false;
} else return true;
} }
for(Prize prize:Controller.prizes){ if (verticalWallCollision().getX() < locX && px < 0) {
if((getBounds(locX, locY).intersects(new Rectangle((int) prize.getX(), (int) prize.getY(), prize.getWidth(), prize.getHeight())))){ if ((rotateAmount <= 90 && rotateAmount >= -90) || (rotateAmount <= -270 && rotateAmount > -360) || (rotateAmount >= 270 && rotateAmount < 360)) {
Controller.getPrize=true; return false;
Controller.tanks.get(0).setPrize(prize.getName()); } else return true;
}
if (verticalWallCollision().getX() > locX && px < 0) {
if ((rotateAmount >= 90 && rotateAmount <= 270) || (rotateAmount <= -90 && rotateAmount >= -270)) {
return false;
} else return true;
} }
if (verticalWallCollision().getX() < locX && px > 0) {
if ((rotateAmount >= 90 || rotateAmount <= 270) || (rotateAmount <= -90 && rotateAmount >= -270)) {
return false;
} else return true;
} }
if (keyLEFT) }
rotateAmount -= 15; if (horizontalWallCollision() != null) {
if (horizontalWallCollision().getY() > locY && px > 0) {
if ((rotateAmount <= 180 && rotateAmount >= 0) || (rotateAmount <= -180 && rotateAmount > -360)) {
System.out.println("1");
return false;
} else return true;
}
if (horizontalWallCollision().getY() < locY && px < 0) {
if ((rotateAmount <= 180 && rotateAmount >= 0) || (rotateAmount <= -180 && rotateAmount > -360)) {
System.out.println("2");
if (keyRIGHT) return false;
rotateAmount += 15; } else return true;
}
if (horizontalWallCollision().getY() < locY && px > 0) {
if ((rotateAmount >= -180 && rotateAmount <= 0) || (rotateAmount >= 180 && rotateAmount < 360)) {
System.out.println("3");
locX = Math.max(locX, 40); return false;
locX = Math.min(locX, 20 + (((Controller.col - 1) / 2) * 50) + (((Controller.col - 1) / 2) + 1) * 5 - 25); } else return true;
}
if (horizontalWallCollision().getY() > locY && px < 0) {
if ((rotateAmount >= -180 && rotateAmount <= 0) || (rotateAmount >= 180 && rotateAmount < 360)) {
System.out.println("4");
locY = Math.max(locY, 70); return false;
locY = Math.min(locY, 50 + ((Controller.row - 1) / 2) * 50 + (((Controller.row - 1) / 2) + 1) * 5 - 25); } else return true;
}
}
return true;
} }
public void move(int px) { public void move(int px) {
double d; double d;
if (!isMoveAllowed(px)) px = 0;
if (rotateAmount == 0) locX += px; if (rotateAmount == 0) locX += px;
if (rotateAmount == 90 || rotateAmount == -270) locY += px; if (rotateAmount == 90 || rotateAmount == -270) locY += px;
if (rotateAmount == -90 || rotateAmount == 270) locY -= px; if (rotateAmount == -90 || rotateAmount == 270) locY -= px;
...@@ -217,16 +244,71 @@ public class GameState { ...@@ -217,16 +244,71 @@ public class GameState {
} }
} }
public int calculateBullet(String xy) {
int x = locX;
int y = locY;
if (rotateAmountTank == 0) {
if (xy.equals("x")) {
x += 20;
return x;
} else {
y += 10;
return y;
}
}
if (rotateAmountTank == 90 || rotateAmountTank == -270) {
if (xy.equals("x")) {
x += 9;
return x;
} else {
return y + 20;
}
}
if (rotateAmountTank == -90 || rotateAmountTank == 270) {
if (xy.equals("x")) {
x += 9;
return x;
} else {
return y - 20;
}
}
if (rotateAmountTank == 180 || rotateAmountTank == -180) {
if (xy.equals("x")) {
return x;
} else {
y += 10;
return y;
}
}
if ((rotateAmountTank > 0 && rotateAmountTank < 90) || (rotateAmountTank < -270 && rotateAmountTank > -360)) {
x += 10 * Math.sin(rotateAmountTank * Math.PI / 180);
y += 10 * Math.cos(rotateAmountTank * Math.PI / 180);
if (xy.equals("x")) return x;
else return y;
}
if ((rotateAmountTank > 180 && rotateAmountTank < 270) || (rotateAmountTank < -90 && rotateAmountTank > -180)) {
x -= 10 * Math.sin(rotateAmountTank * Math.PI / 180);
y -= 10 * Math.cos(rotateAmountTank * Math.PI / 180);
if (xy.equals("x")) return x;
else return y;
public void checkWall() {
for (Wall wall : Controller.walls) {
if (wall.getX() == locX + 5 || wall.getY() == locY + 5) {
keyDOWN = false;
} else if (wall.getX() == locX - 5 || wall.getY() == locY - 5) {
keyUP = false;
} }
if ((rotateAmountTank > 90 && rotateAmountTank < 180) || (rotateAmountTank < -180 && rotateAmountTank > -270)) {
x += 25 * Math.sin(rotateAmountTank * Math.PI / 180);
y -= 20 * Math.cos(rotateAmountTank * Math.PI / 180);
if (xy.equals("x")) return x;
else return y;
} }
if ((rotateAmountTank > 270 && rotateAmountTank < 360) || (rotateAmountTank < 0 && rotateAmountTank > -90)) {
x += 20 * Math.cos(rotateAmountTank * Math.PI / 180);
y -= 25 * Math.sin(rotateAmountTank * Math.PI / 180);
if (xy.equals("x")) return x;
else return y;
} }
return 0;
}
public KeyListener getKeyListener() { public KeyListener getKeyListener() {
return keyHandler; return keyHandler;
......
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