commit 11b0d0a5737b5ff87604505cf8d49450e892221d parent e0905bcac40149ca22c0b4281b438d26c7dc3801 Author: mpizzzle <michael.770211@gmail.com> Date: Sat, 2 Mar 2019 13:03:55 +0000 moving tank assets Diffstat:
40 files changed, 157 insertions(+), 203 deletions(-)
diff --git a/Tank/.gitignore b/Tank/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/Tank/arenafloor.gif b/Tank/Assets/arenafloor.gif Binary files differ. diff --git a/Tank/bad-tank-down-2.gif b/Tank/Assets/bad-tank-down-2.gif Binary files differ. diff --git a/Tank/bad-tank-down-shoot-2.gif b/Tank/Assets/bad-tank-down-shoot-2.gif Binary files differ. diff --git a/Tank/bad-tank-down-shoot.gif b/Tank/Assets/bad-tank-down-shoot.gif Binary files differ. diff --git a/Tank/bad-tank-down.gif b/Tank/Assets/bad-tank-down.gif Binary files differ. diff --git a/Tank/bad-tank-left-2.gif b/Tank/Assets/bad-tank-left-2.gif Binary files differ. diff --git a/Tank/bad-tank-left-shoot-2.gif b/Tank/Assets/bad-tank-left-shoot-2.gif Binary files differ. diff --git a/Tank/bad-tank-left-shoot.gif b/Tank/Assets/bad-tank-left-shoot.gif Binary files differ. diff --git a/Tank/bad-tank-left.gif b/Tank/Assets/bad-tank-left.gif Binary files differ. diff --git a/Tank/bad-tank-right-2.gif b/Tank/Assets/bad-tank-right-2.gif Binary files differ. diff --git a/Tank/bad-tank-right-shoot-2.gif b/Tank/Assets/bad-tank-right-shoot-2.gif Binary files differ. diff --git a/Tank/bad-tank-right-shoot.gif b/Tank/Assets/bad-tank-right-shoot.gif Binary files differ. diff --git a/Tank/bad-tank-right.gif b/Tank/Assets/bad-tank-right.gif Binary files differ. diff --git a/Tank/bad-tank-up-2.gif b/Tank/Assets/bad-tank-up-2.gif Binary files differ. diff --git a/Tank/bad-tank-up-shoot-2.gif b/Tank/Assets/bad-tank-up-shoot-2.gif Binary files differ. diff --git a/Tank/bad-tank-up-shoot.gif b/Tank/Assets/bad-tank-up-shoot.gif Binary files differ. diff --git a/Tank/bad-tank-up.gif b/Tank/Assets/bad-tank-up.gif Binary files differ. diff --git a/Tank/pit.gif b/Tank/Assets/pit.gif Binary files differ. diff --git a/Tank/tank-down-2.gif b/Tank/Assets/tank-down-2.gif Binary files differ. diff --git a/Tank/tank-down-shoot-2.gif b/Tank/Assets/tank-down-shoot-2.gif Binary files differ. diff --git a/Tank/tank-down-shoot.gif b/Tank/Assets/tank-down-shoot.gif Binary files differ. diff --git a/Tank/tank-down.gif b/Tank/Assets/tank-down.gif Binary files differ. diff --git a/Tank/tank-left-2.gif b/Tank/Assets/tank-left-2.gif Binary files differ. diff --git a/Tank/tank-left-shoot-2.gif b/Tank/Assets/tank-left-shoot-2.gif Binary files differ. diff --git a/Tank/tank-left-shoot.gif b/Tank/Assets/tank-left-shoot.gif Binary files differ. diff --git a/Tank/tank-left.gif b/Tank/Assets/tank-left.gif Binary files differ. diff --git a/Tank/tank-right-2.gif b/Tank/Assets/tank-right-2.gif Binary files differ. diff --git a/Tank/tank-right-shoot-2.gif b/Tank/Assets/tank-right-shoot-2.gif Binary files differ. diff --git a/Tank/tank-right-shoot.gif b/Tank/Assets/tank-right-shoot.gif Binary files differ. diff --git a/Tank/tank-right.gif b/Tank/Assets/tank-right.gif Binary files differ. diff --git a/Tank/tank-up-2.gif b/Tank/Assets/tank-up-2.gif Binary files differ. diff --git a/Tank/tank-up-shoot-2.gif b/Tank/Assets/tank-up-shoot-2.gif Binary files differ. diff --git a/Tank/tank-up-shoot.gif b/Tank/Assets/tank-up-shoot.gif Binary files differ. diff --git a/Tank/tank-up.gif b/Tank/Assets/tank-up.gif Binary files differ. diff --git a/Tank/TankArea.java b/Tank/TankArea.java @@ -1,151 +0,0 @@ -package Tank; - -import java.awt.*; - -public class TankArea extends Panel { - TankGame myApplet = null; - -Image badtankdown2; -Image badtankdownshoot; -Image badtankdownshoot2; -Image badtankdown; -Image badtankleft2; -Image badtankleftshoot2; -Image badtankleftshoot; -Image badtankleft ; -Image badtankright2; -Image badtankrightshoot2; -Image badtankrightshoot; -Image badtankright; -Image badtankup2; -Image badtankupshoot2; -Image badtankupshoot; -Image badtankup; -Image tankdown2; -Image tankdownshoot2; -Image tankdownshoot; -Image tankdown; -Image tankleft2; -Image tankleftshoot2; -Image tankleftshoot; -Image tankleft; -Image tankright2; -Image tankrightshoot2; -Image tankrightshoot; -Image tankright; -Image tankup2; -Image tankupshoot2; -Image tankupshoot; -Image tankup; -Image enemyImage; -Image personImage; -Image pitImage; - - private Image explosion1, explosion2, explosion3; - MediaTracker mt=null; - - public TankArea(TankGame parent) { - myApplet = parent; - enemyImage = load(myApplet, "bad-tank-up.gif"); - personImage = load(myApplet, "tank-up.gif"); - pitImage = load(myApplet, "pit.gif"); - explosion1 = load(myApplet, "explosion1.gif"); - explosion2 = load(myApplet, "explosion2.gif"); - explosion3 = load(myApplet, "explosion3.gif"); - badtankdown2 = load(myApplet, "bad-tank-down-2.gif"); - badtankdownshoot = load(myApplet, "bad-tank-down-shoot.gif"); - badtankdownshoot2 = load(myApplet, "bad-tank-down-shoot-2.gif"); - badtankdown = load(myApplet, " bad-tank-down.gif"); - badtankleft2 = load(myApplet, "bad-tank-left-2.gif"); - badtankleftshoot2 = load(myApplet, "bad-tank-left-shoot-2.gif"); - badtankleftshoot = load(myApplet, "bad-tank-left-shoot.gif"); - badtankleft = load(myApplet, "bad-tank-left.gif"); - badtankright2 = load(myApplet, "bad-tank-right-2.gif"); - badtankrightshoot2 = load(myApplet, "bad-tank-right-shoot-2.gif"); - badtankrightshoot = load(myApplet, "bad-tank-right-shoot.gif"); - badtankright = load(myApplet, "bad-tank-right.gif"); - badtankup2 = load(myApplet, "bad-tank-up-2.gif"); - badtankupshoot2 = load(myApplet, "bad-tank-up-shoot-2.gif"); - badtankupshoot = load(myApplet, "bad-tank-up-shoot.gif"); - badtankup = load(myApplet, "bad-tank-up.gif"); - tankdown2 = load(myApplet, "tank-down-2.gif"); - tankdownshoot2 = load(myApplet, "tank-down-shoot-2.gif"); - tankdownshoot = load(myApplet, "tank-down-shoot.gif"); - tankdown = load(myApplet, "tank-down.gif"); - tankleft2= load(myApplet, "tank-left-2.gif"); - tankleftshoot2 = load(myApplet, "tank-left-shoot-2.gif"); - tankleftshoot = load(myApplet, "tank-left-shoot.gif"); - tankleft = load(myApplet, "tank-left.gif"); - tankright2 = load(myApplet, "tank-right-2.gif"); - tankrightshoot2 = load(myApplet, "tankright-shoot-2.gif"); - tankrightshoot = load(myApplet, "tank-right-shoot.gif"); - tankright = load(myApplet, "tank-right.gif"); - tankup2 = load(myApplet, "tank-up-2.gif"); - tankupshoot2 = load(myApplet, "tank-up-shoot-2.gif"); - tankupshoot = load(myApplet, "tank-up-shoot.gif"); - tankup = load(myApplet, "tank-up.gif"); - } - - Image load(TankGame parent, String picture) { - Image im = parent.getImage(myApplet.getCodeBase(), "Tank\\" + picture); - checkImage(im, picture); - return(im); - } - - void checkImage(Image image, String name) { - if (mt != null) { - mt.addImage(image,0); - try { - mt.waitForID(0,5000); - } - catch (InterruptedException ie) { - // nothing to do - } - if (mt.isErrorID(0)) System.out.println("Image Not found: "+name.toString()); - } - } - - public void paint (Graphics g) { - if (myApplet == null) return; - final int w = getBounds().width; - final int h = getBounds().height; - g.setColor(Color.gray); - g.fillRect(0, 0, w, h); - FontMetrics fm = getFontMetrics(getFont()); - - g.setColor(Color.black); - int asc = fm.getAscent() + 4; - - if (myApplet.playerPosition != null) { - // show the player - //g.drawString("#", myApplet.playerPosition.x, myApplet.playerPosition.y); - int elem = myApplet.shooting ? myApplet.SHOOTING : myApplet.NOTSHOOTING; - g.drawImage(myApplet.goodImages[myApplet.goodImageNo][elem], myApplet.playerPosition.x, myApplet.playerPosition.y,Color.gray, null); - - // show the pits - for (int i=0; i < myApplet.pitPositions.length; i++) { - g.drawImage(pitImage, myApplet.pitPositions[i].x, myApplet.pitPositions[i].y,Color.gray, null); - } - - // show the enemies - for (int i=0; i < myApplet.enemyPositions.length; i++) { - if (myApplet.enemyPositions[i].x > -1) { - int eelem = myApplet.enemyShooting[i] ? myApplet.SHOOTING : myApplet.NOTSHOOTING; - g.drawImage(myApplet.badImages[myApplet.enemyImageNo[i]][eelem], myApplet.enemyPositions[i].x, myApplet.enemyPositions[i].y,null); - } - } - if (myApplet.explosionx != -1) { - g.drawImage(explosion1, myApplet.explosionx, myApplet.explosiony,Color.gray, null); - try { - Thread.sleep(80); - g.drawImage(explosion2, myApplet.explosionx, myApplet.explosiony,Color.gray, null); - Thread.sleep(80); - g.drawImage(explosion3, myApplet.explosionx, myApplet.explosiony,Color.gray, null); - } - catch (Exception e) {} - myApplet.explosionx = -1; - myApplet.explosiony=-1; - } - } - } -}- \ No newline at end of file diff --git a/Tank/TankFrame.java b/Tank/TankFrame.java @@ -1,10 +0,0 @@ -package Tank; - -import java.awt.Frame; - -public class TankFrame extends Frame { - - public TankFrame() { - setBounds(200, 200, 200, 150); - } -}- \ No newline at end of file diff --git a/Tank/files.txt b/Tank/files.txt @@ -1,40 +0,0 @@ - Volume in drive D has no label. - Volume Serial Number is 1450-9A5C - - Directory of D:\develop\Tank - -04/11/2003 17:11 850 arenafloor.gif -04/11/2003 17:02 1,266 bad-tank-down-2.gif -04/11/2003 17:05 1,271 bad-tank-down-shoot-2.gif -04/11/2003 17:07 1,260 bad-tank-down-shoot.gif -04/11/2003 16:59 1,255 bad-tank-down.gif -04/11/2003 17:03 1,225 bad-tank-left-2.gif -04/11/2003 17:05 1,230 bad-tank-left-shoot-2.gif -04/11/2003 17:07 1,221 bad-tank-left-shoot.gif -04/11/2003 16:59 1,217 bad-tank-left.gif -04/11/2003 17:01 1,225 bad-tank-right-2.gif -04/11/2003 17:04 1,226 bad-tank-right-shoot-2.gif -04/11/2003 17:07 1,214 bad-tank-right-shoot.gif -04/11/2003 16:58 1,212 bad-tank-right.gif -04/11/2003 17:01 1,265 bad-tank-up-2.gif -04/11/2003 17:04 1,270 bad-tank-up-shoot-2.gif -04/11/2003 17:06 1,266 bad-tank-up-shoot.gif -04/11/2003 16:57 1,264 bad-tank-up.gif -03/11/2003 18:26 1,266 tank-down-2.gif -03/11/2003 18:29 1,271 tank-down-shoot-2.gif -03/11/2003 18:21 1,260 tank-down-shoot.gif -03/11/2003 18:18 1,255 tank-down.gif -03/11/2003 18:26 1,225 tank-left-2.gif -03/11/2003 18:29 1,230 tank-left-shoot-2.gif -03/11/2003 18:21 1,221 tank-left-shoot.gif -03/11/2003 18:18 1,217 tank-left.gif -03/11/2003 18:26 1,225 tank-right-2.gif -03/11/2003 18:28 1,226 tank-right-shoot-2.gif -03/11/2003 18:21 1,214 tank-right-shoot.gif -03/11/2003 18:17 1,212 tank-right.gif -03/11/2003 18:25 1,265 tank-up-2.gif -03/11/2003 18:28 1,270 tank-up-shoot-2.gif -03/11/2003 18:20 1,266 tank-up-shoot.gif -03/11/2003 18:17 1,264 tank-up.gif - 33 File(s) 40,624 bytes - 0 Dir(s) 831,519,232 bytes free diff --git a/Tank/src/TankArea.java b/Tank/src/TankArea.java @@ -0,0 +1,155 @@ +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.MediaTracker; + +import javax.swing.JPanel; + +public class TankArea extends JPanel { + private static final long serialVersionUID = -2906196036928924340L; + + TankGame myApplet = null; + +Image badtankdown2; +Image badtankdownshoot; +Image badtankdownshoot2; +Image badtankdown; +Image badtankleft2; +Image badtankleftshoot2; +Image badtankleftshoot; +Image badtankleft ; +Image badtankright2; +Image badtankrightshoot2; +Image badtankrightshoot; +Image badtankright; +Image badtankup2; +Image badtankupshoot2; +Image badtankupshoot; +Image badtankup; +Image tankdown2; +Image tankdownshoot2; +Image tankdownshoot; +Image tankdown; +Image tankleft2; +Image tankleftshoot2; +Image tankleftshoot; +Image tankleft; +Image tankright2; +Image tankrightshoot2; +Image tankrightshoot; +Image tankright; +Image tankup2; +Image tankupshoot2; +Image tankupshoot; +Image tankup; +Image enemyImage; +Image personImage; +Image pitImage; + + private Image explosion1, explosion2, explosion3; + MediaTracker mt=null; + + public TankArea(TankGame parent) { + myApplet = parent; + enemyImage = load(myApplet, "bad-tank-up.gif"); + personImage = load(myApplet, "tank-up.gif"); + pitImage = load(myApplet, "pit.gif"); + explosion1 = load(myApplet, "explosion1.gif"); + explosion2 = load(myApplet, "explosion2.gif"); + explosion3 = load(myApplet, "explosion3.gif"); + badtankdown2 = load(myApplet, "bad-tank-down-2.gif"); + badtankdownshoot = load(myApplet, "bad-tank-down-shoot.gif"); + badtankdownshoot2 = load(myApplet, "bad-tank-down-shoot-2.gif"); + badtankdown = load(myApplet, " bad-tank-down.gif"); + badtankleft2 = load(myApplet, "bad-tank-left-2.gif"); + badtankleftshoot2 = load(myApplet, "bad-tank-left-shoot-2.gif"); + badtankleftshoot = load(myApplet, "bad-tank-left-shoot.gif"); + badtankleft = load(myApplet, "bad-tank-left.gif"); + badtankright2 = load(myApplet, "bad-tank-right-2.gif"); + badtankrightshoot2 = load(myApplet, "bad-tank-right-shoot-2.gif"); + badtankrightshoot = load(myApplet, "bad-tank-right-shoot.gif"); + badtankright = load(myApplet, "bad-tank-right.gif"); + badtankup2 = load(myApplet, "bad-tank-up-2.gif"); + badtankupshoot2 = load(myApplet, "bad-tank-up-shoot-2.gif"); + badtankupshoot = load(myApplet, "bad-tank-up-shoot.gif"); + badtankup = load(myApplet, "bad-tank-up.gif"); + tankdown2 = load(myApplet, "tank-down-2.gif"); + tankdownshoot2 = load(myApplet, "tank-down-shoot-2.gif"); + tankdownshoot = load(myApplet, "tank-down-shoot.gif"); + tankdown = load(myApplet, "tank-down.gif"); + tankleft2= load(myApplet, "tank-left-2.gif"); + tankleftshoot2 = load(myApplet, "tank-left-shoot-2.gif"); + tankleftshoot = load(myApplet, "tank-left-shoot.gif"); + tankleft = load(myApplet, "tank-left.gif"); + tankright2 = load(myApplet, "tank-right-2.gif"); + tankrightshoot2 = load(myApplet, "tankright-shoot-2.gif"); + tankrightshoot = load(myApplet, "tank-right-shoot.gif"); + tankright = load(myApplet, "tank-right.gif"); + tankup2 = load(myApplet, "tank-up-2.gif"); + tankupshoot2 = load(myApplet, "tank-up-shoot-2.gif"); + tankupshoot = load(myApplet, "tank-up-shoot.gif"); + tankup = load(myApplet, "tank-up.gif"); + } + + Image load(TankGame parent, String picture) { + Image im = parent.getImage(myApplet.getCodeBase(), "Tank\\" + picture); + checkImage(im, picture); + return(im); + } + + void checkImage(Image image, String name) { + if (mt != null) { + mt.addImage(image,0); + try { + mt.waitForID(0,5000); + } + catch (InterruptedException ie) { + // nothing to do + } + if (mt.isErrorID(0)) System.out.println("Image Not found: "+name.toString()); + } + } + + @Override + public void paintComponent(Graphics g) { + super.paintComponent(g); + if (myApplet == null) return; + final int w = getBounds().width; + final int h = getBounds().height; + g.setColor(Color.gray); + g.fillRect(0, 0, w, h); + g.setColor(Color.black); + + if (TankGame.playerPosition != null) { + // show the player + //g.drawString("#", myApplet.playerPosition.x, myApplet.playerPosition.y); + int elem = myApplet.shooting ? myApplet.SHOOTING : myApplet.NOTSHOOTING; + g.drawImage(myApplet.goodImages[myApplet.goodImageNo][elem], TankGame.playerPosition.x, TankGame.playerPosition.y,Color.gray, null); + + // show the pits + for (int i=0; i < TankGame.pitPositions.length; i++) { + g.drawImage(pitImage, TankGame.pitPositions[i].x, TankGame.pitPositions[i].y,Color.gray, null); + } + + // show the enemies + for (int i=0; i < TankGame.enemyPositions.length; i++) { + if (TankGame.enemyPositions[i].x > -1) { + int eelem = myApplet.enemyShooting[i] ? myApplet.SHOOTING : myApplet.NOTSHOOTING; + g.drawImage(myApplet.badImages[myApplet.enemyImageNo[i]][eelem], TankGame.enemyPositions[i].x, TankGame.enemyPositions[i].y,null); + } + } + if (myApplet.explosionx != -1) { + g.drawImage(explosion1, myApplet.explosionx, myApplet.explosiony,Color.gray, null); + try { + Thread.sleep(80); + g.drawImage(explosion2, myApplet.explosionx, myApplet.explosiony,Color.gray, null); + Thread.sleep(80); + g.drawImage(explosion3, myApplet.explosionx, myApplet.explosiony,Color.gray, null); + } + catch (Exception e) {} + myApplet.explosionx = -1; + myApplet.explosiony=-1; + } + } + } +}+ \ No newline at end of file diff --git a/Tank/TankGame.java b/Tank/src/TankGame.java
