diff --git a/src/main/java/com/example/tankbattle/ResourceMgr.java b/src/main/java/com/example/tankbattle/ResourceMgr.java index dab015a..48d911f 100644 --- a/src/main/java/com/example/tankbattle/ResourceMgr.java +++ b/src/main/java/com/example/tankbattle/ResourceMgr.java @@ -5,16 +5,22 @@ import java.io.IOException; import javax.imageio.ImageIO; public class ResourceMgr { - public static BufferedImage tankL, tankU, tankR, tankD; + public static BufferedImage GoodTankL, GoodTankU, GoodTankR, GoodTankD; + public static BufferedImage BadTankL, BadTankU, BadTankR, BadTankD; public static BufferedImage bulletL, bulletU,bulletR, bulletD; public static BufferedImage[] explodes = new BufferedImage[16]; static { try { - tankU = ImageIO.read(ResourceMgr.class.getClassLoader().getResourceAsStream("images/BadTank1.png")); - tankL = ImageUtil.rotateImage(tankU, -90); - tankR = ImageUtil.rotateImage(tankU, 90); - tankD = ImageUtil.rotateImage(tankU, 180); + GoodTankU = ImageIO.read(ResourceMgr.class.getClassLoader().getResourceAsStream("images/GoodTank1.png")); + GoodTankL = ImageUtil.rotateImage(GoodTankU, -90); + GoodTankR = ImageUtil.rotateImage(GoodTankU, 90); + GoodTankD = ImageUtil.rotateImage(GoodTankU, 180); + + BadTankU = ImageIO.read(ResourceMgr.class.getClassLoader().getResourceAsStream("images/BadTank1.png")); + BadTankL = ImageUtil.rotateImage(BadTankU, -90); + BadTankR = ImageUtil.rotateImage(BadTankU, 90); + BadTankD = ImageUtil.rotateImage(BadTankU, 180); bulletU = ImageIO.read(ResourceMgr.class.getClassLoader().getResourceAsStream("images/bulletU.png")); bulletL = ImageUtil.rotateImage(bulletU, -90); diff --git a/src/main/java/com/example/tankbattle/Tank.java b/src/main/java/com/example/tankbattle/Tank.java index 36e9381..ba1ab4d 100644 --- a/src/main/java/com/example/tankbattle/Tank.java +++ b/src/main/java/com/example/tankbattle/Tank.java @@ -6,8 +6,8 @@ import java.util.Random; public class Tank { private static final int SPEED = 1; - public static int WIDTH = ResourceMgr.tankD.getWidth(); - public static int HEIGHT = ResourceMgr.tankD.getHeight(); + public static int WIDTH = ResourceMgr.GoodTankD.getWidth(); + public static int HEIGHT = ResourceMgr.GoodTankD.getHeight(); private Random random = new Random(); @@ -96,16 +96,16 @@ public class Tank { if (!living) tf.tanks.remove(this); switch (dir) { case LEFT: - g.drawImage(ResourceMgr.tankL, x, y, null); + g.drawImage(this.group == Group.GOOD ? ResourceMgr.GoodTankL : ResourceMgr.BadTankL, x, y, null); break; case UP: - g.drawImage(ResourceMgr.tankU, x, y, null); + g.drawImage(this.group == Group.GOOD ? ResourceMgr.GoodTankU : ResourceMgr.BadTankU, x, y, null); break; case RIGHT: - g.drawImage(ResourceMgr.tankR, x, y, null); + g.drawImage(this.group == Group.GOOD ? ResourceMgr.GoodTankR : ResourceMgr.BadTankR, x, y, null); break; case DOWN: - g.drawImage(ResourceMgr.tankD, x, y, null); + g.drawImage(this.group == Group.GOOD ? ResourceMgr.GoodTankD : ResourceMgr.BadTankD, x, y, null); break; default: break;