commit c548cb070f3038cc52363567801601f558f642eb
parent 72ffd82cc29499ccefecd1c9e93ae29de571fab3
Author: mpizzzle <michael.770211@gmail.com>
Date: Sun, 3 Mar 2019 14:34:56 +0000
renaming variables
Diffstat:
6 files changed, 100 insertions(+), 107 deletions(-)
diff --git a/Link/src/Link.java b/Link/src/Link.java
@@ -75,31 +75,31 @@ public class Link extends JFrame implements KeyListener, Runnable {
static int startPosY = GROUNDLEVEL;
public static void main(String[] args) {
- Link Link = new Link();
+ Link link = new Link();
- Link.setLayout(null);
- Link.setBackground(Color.white);
- Link.setSize(RIGHTEDGE, BOTTOMEDGE);
+ link.setLayout(null);
+ link.setBackground(Color.white);
+ link.setSize(RIGHTEDGE, BOTTOMEDGE);
- area = new LinkArea(Link);
- Link.add(area);
+ area = new LinkArea(link);
+ link.add(area);
XAMOUNT = 12;
YAMOUNT = 12;
//RIGHTEDGE = (Link.getBounds().width / XAMOUNT) * XAMOUNT + LEFTEDGE;
//BOTTOMEDGE = Link.getBounds().height - 1;
- Link.setVisible(true);
+ link.setVisible(true);
//area.setBounds(0, 0, Link.getBounds().width, BOTTOMEDGE);
area.setBounds(0, 0, RIGHTEDGE, BOTTOMEDGE);
area.setVisible(true);
- Link.addKeyListener(Link);
- area.addKeyListener(Link);
+ link.addKeyListener(link);
+ area.addKeyListener(link);
area.requestFocus();
levellengths[0] = RIGHTEDGE;
obstacleImages[0] = area.obstacle;
- timer = new Thread(Link);
+ timer = new Thread(link);
timer.start();
}
@@ -273,11 +273,6 @@ public class Link extends JFrame implements KeyListener, Runnable {
return (-1);
}
- public void finished() {
- finished = true;
- System.exit(0);
- }
-
int randomMove() {
// return + or - value (randomly)
if (Math.random() >= 0.5)
diff --git a/Mario/src/Mario.java b/Mario/src/Mario.java
@@ -163,15 +163,15 @@ public class Mario extends JFrame implements KeyListener, Runnable {
// *************************************************************
public static void main(String[] args) {
- Mario Mario = new Mario();
- Mario.setLayout(null);
- Mario.setBackground(Color.white);
- Mario.setSize(RIGHTEDGE, BOTTOMEDGE);
- area = new MarioArea(Mario);
- Mario.add(area);
+ Mario mario = new Mario();
+ mario.setLayout(null);
+ mario.setBackground(Color.white);
+ mario.setSize(RIGHTEDGE, BOTTOMEDGE);
+ area = new MarioArea(mario);
+ mario.add(area);
//RIGHTEDGE = (Mario.getBounds().width / XAMOUNT) * XAMOUNT + LEFTEDGE;
//BOTTOMEDGE = Mario.getBounds().height - 1;
- Mario.setVisible(true);
+ mario.setVisible(true);
area.setBounds(0, 0, RIGHTEDGE, BOTTOMEDGE);
//GROUNDLEVEL = Mario.getBounds().height - GROUNDDIFF;
//GROUNDLEVEL = BOTTOMEDGE;// - GROUNDDIFF;
@@ -179,8 +179,8 @@ public class Mario extends JFrame implements KeyListener, Runnable {
//MarioArea.FLOORLEVEL = Mario.getBounds().height - MarioArea.FLOORDIFF;
area.setVisible(true);
- Mario.addKeyListener(Mario);
- area.addKeyListener(Mario);
+ mario.addKeyListener(mario);
+ area.addKeyListener(mario);
area.requestFocus();
obstacleImages[0] = area.obstacle;
@@ -342,7 +342,7 @@ public class Mario extends JFrame implements KeyListener, Runnable {
floors[7] = area.floor6;
floors[8] = area.Floor10;
- timer = new Thread(Mario);
+ timer = new Thread(mario);
timer.start();
}
diff --git a/Pong/src/Pong.java b/Pong/src/Pong.java
@@ -35,27 +35,25 @@ public class Pong extends JFrame implements KeyListener, Runnable {
int timeSinceLastBall = 0;
public static void main(String[] args) {
- Pong Pong = new Pong();
+ Pong pong = new Pong();
- Pong.setLayout(null);
- Pong.setBackground(Color.black);
- Pong.setSize(RIGHTEDGE, BOTTOMEDGE);
- Pong.area = new PongArea(Pong);
- Pong.add(area);
+ pong.setLayout(null);
+ pong.setBackground(Color.black);
+ pong.setSize(RIGHTEDGE, BOTTOMEDGE);
+ Pong.area = new PongArea(pong);
+ pong.add(area);
//RIGHTEDGE = Pong.getBounds().width - 1;
//BOTTOMEDGE = Pong.getBounds().height - 1;
- Pong.setVisible(true);
+ pong.setVisible(true);
area.setBounds(0, 0, RIGHTEDGE, BOTTOMEDGE);
area.setVisible(true);
- Pong.addKeyListener(Pong);
- area.addKeyListener(Pong);
+ pong.addKeyListener(pong);
+ area.addKeyListener(pong);
area.requestFocus();
- balls = new Thread(Pong);
+ balls = new Thread(pong);
balls.start();
-
- //EventQueue.invokeLater(Pong);
}
public void doLevel(int level) {
diff --git a/Reaper/src/Reaper.java b/Reaper/src/Reaper.java
@@ -125,25 +125,25 @@ public class Reaper extends JFrame implements KeyListener, Runnable {
// *************************************************************
public static void main(String[] args) {
- Reaper Reaper = new Reaper();
+ Reaper reaper = new Reaper();
- Reaper.setLayout(null);
- Reaper.setBackground(Color.white);
- Reaper.setSize(RIGHTEDGE, BOTTOMEDGE);
+ reaper.setLayout(null);
+ reaper.setBackground(Color.white);
+ reaper.setSize(RIGHTEDGE, BOTTOMEDGE);
- area = new ReaperArea(Reaper);
- Reaper.add(area);
+ area = new ReaperArea(reaper);
+ reaper.add(area);
//RIGHTEDGE = (Reaper.getBounds().width / XAMOUNT) * XAMOUNT + LEFTEDGE;
//BOTTOMEDGE = Reaper.getBounds().height - 1;
- Reaper.setVisible(true);
+ reaper.setVisible(true);
area.setBounds(0, 0, RIGHTEDGE, BOTTOMEDGE);
//GROUNDLEVEL = Reaper.getBounds().height - Reaper.GROUNDDIFF;
startPosY = GROUNDLEVEL;
//ReaperArea.FLOORLEVEL = Reaper.getBounds().height - ReaperArea.FLOORDIFF;
area.setVisible(true);
- Reaper.addKeyListener(Reaper);
- area.addKeyListener(Reaper);
+ reaper.addKeyListener(reaper);
+ area.addKeyListener(reaper);
area.requestFocus();
for (int i = 0; i < OBSTACLEIMAGES; i++) {
@@ -163,7 +163,7 @@ public class Reaper extends JFrame implements KeyListener, Runnable {
// floors[i] = area.floor4;
// }
- timer = new Thread(Reaper);
+ timer = new Thread(reaper);
timer.start();
}
diff --git a/Tank/src/Tank.java b/Tank/src/Tank.java
@@ -51,66 +51,66 @@ public class Tank extends JFrame implements KeyListener, Runnable {
Image[][] badImages = new Image[8][2]; // up up2 down down2 left left2 right right2 x SHOOTING and NON_SHOOTING
public static void main(String[] args) {
- Tank Tank = new Tank();
- Tank.setLayout(null);
- Tank.setBackground(Color.gray);
- Tank.setSize(RIGHTEDGE, BOTTOMEDGE);
-
- area = new TankArea(Tank);
- Tank.add(area);
- //RIGHTEDGE = Tank.getBounds().width - 1;
- //BOTTOMEDGE = Tank.getBounds().height - 1;
+ Tank tank = new Tank();
+ tank.setLayout(null);
+ tank.setBackground(Color.gray);
+ tank.setSize(RIGHTEDGE, BOTTOMEDGE);
+
+ area = new TankArea(tank);
+ tank.add(area);
+ //RIGHTEDGE = tank.getBounds().width - 1;
+ //BOTTOMEDGE = tank.getBounds().height - 1;
XAMOUNT = 12;
YAMOUNT = 12;
- Tank.setVisible(true);
+ tank.setVisible(true);
area.setBounds(0, 0, RIGHTEDGE, BOTTOMEDGE);
area.setVisible(true);
- Tank.addKeyListener(Tank);
- area.addKeyListener(Tank);
+ tank.addKeyListener(tank);
+ area.addKeyListener(tank);
area.requestFocus();
- Tank.goodImages[FIRSTUP][NOTSHOOTING] = area.tankup;
- Tank.goodImages[FIRSTUP + 1][NOTSHOOTING] = area.tankup2;
- Tank.goodImages[FIRSTUP][SHOOTING] = area.tankupshoot;
- Tank.goodImages[FIRSTUP + 1][SHOOTING] = area.tankupshoot2;
+ tank.goodImages[FIRSTUP][NOTSHOOTING] = area.tankup;
+ tank.goodImages[FIRSTUP + 1][NOTSHOOTING] = area.tankup2;
+ tank.goodImages[FIRSTUP][SHOOTING] = area.tankupshoot;
+ tank.goodImages[FIRSTUP + 1][SHOOTING] = area.tankupshoot2;
- Tank.goodImages[FIRSTDOWN][NOTSHOOTING] = area.tankdown;
- Tank.goodImages[FIRSTDOWN + 1][NOTSHOOTING] = area.tankdown2;
- Tank.goodImages[FIRSTDOWN][SHOOTING] = area.tankdownshoot;
- Tank.goodImages[FIRSTDOWN + 1][SHOOTING] = area.tankdownshoot2;
+ tank.goodImages[FIRSTDOWN][NOTSHOOTING] = area.tankdown;
+ tank.goodImages[FIRSTDOWN + 1][NOTSHOOTING] = area.tankdown2;
+ tank.goodImages[FIRSTDOWN][SHOOTING] = area.tankdownshoot;
+ tank.goodImages[FIRSTDOWN + 1][SHOOTING] = area.tankdownshoot2;
- Tank.goodImages[FIRSTLEFT][NOTSHOOTING] = area.tankleft;
- Tank.goodImages[FIRSTLEFT + 1][NOTSHOOTING] = area.tankleft2;
- Tank.goodImages[FIRSTLEFT][SHOOTING] = area.tankleftshoot;
- Tank.goodImages[FIRSTLEFT + 1][SHOOTING] = area.tankleftshoot2;
+ tank.goodImages[FIRSTLEFT][NOTSHOOTING] = area.tankleft;
+ tank.goodImages[FIRSTLEFT + 1][NOTSHOOTING] = area.tankleft2;
+ tank.goodImages[FIRSTLEFT][SHOOTING] = area.tankleftshoot;
+ tank.goodImages[FIRSTLEFT + 1][SHOOTING] = area.tankleftshoot2;
- Tank.goodImages[FIRSTRIGHT][NOTSHOOTING] = area.tankright;
- Tank.goodImages[FIRSTRIGHT + 1][NOTSHOOTING] = area.tankright2;
- Tank.goodImages[FIRSTRIGHT][SHOOTING] = area.tankrightshoot;
- Tank.goodImages[FIRSTRIGHT + 1][SHOOTING] = area.tankrightshoot2;
-
- Tank.badImages[FIRSTUP][NOTSHOOTING] = area.badtankup;
- Tank.badImages[FIRSTUP + 1][NOTSHOOTING] = area.badtankup2;
- Tank.badImages[FIRSTUP][SHOOTING] = area.badtankupshoot;
- Tank.badImages[FIRSTUP + 1][SHOOTING] = area.badtankupshoot2;
-
- Tank.badImages[FIRSTDOWN][NOTSHOOTING] = area.badtankdown;
- Tank.badImages[FIRSTDOWN + 1][NOTSHOOTING] = area.badtankdown2;
- Tank.badImages[FIRSTDOWN][SHOOTING] = area.badtankdownshoot;
- Tank.badImages[FIRSTDOWN + 1][SHOOTING] = area.badtankdownshoot2;
-
- Tank.badImages[FIRSTLEFT][NOTSHOOTING] = area.badtankleft;
- Tank.badImages[FIRSTLEFT + 1][NOTSHOOTING] = area.badtankleft2;
- Tank.badImages[FIRSTLEFT][SHOOTING] = area.badtankleftshoot;
- Tank.badImages[FIRSTLEFT + 1][SHOOTING] = area.badtankleftshoot2;
-
- Tank.badImages[FIRSTRIGHT][NOTSHOOTING] = area.badtankright;
- Tank.badImages[FIRSTRIGHT + 1][NOTSHOOTING] = area.badtankright2;
- Tank.badImages[FIRSTRIGHT][SHOOTING] = area.badtankrightshoot;
- Tank.badImages[FIRSTRIGHT + 1][SHOOTING] = area.badtankrightshoot2;
-
- enemies = new Thread(Tank);
+ tank.goodImages[FIRSTRIGHT][NOTSHOOTING] = area.tankright;
+ tank.goodImages[FIRSTRIGHT + 1][NOTSHOOTING] = area.tankright2;
+ tank.goodImages[FIRSTRIGHT][SHOOTING] = area.tankrightshoot;
+ tank.goodImages[FIRSTRIGHT + 1][SHOOTING] = area.tankrightshoot2;
+
+ tank.badImages[FIRSTUP][NOTSHOOTING] = area.badtankup;
+ tank.badImages[FIRSTUP + 1][NOTSHOOTING] = area.badtankup2;
+ tank.badImages[FIRSTUP][SHOOTING] = area.badtankupshoot;
+ tank.badImages[FIRSTUP + 1][SHOOTING] = area.badtankupshoot2;
+
+ tank.badImages[FIRSTDOWN][NOTSHOOTING] = area.badtankdown;
+ tank.badImages[FIRSTDOWN + 1][NOTSHOOTING] = area.badtankdown2;
+ tank.badImages[FIRSTDOWN][SHOOTING] = area.badtankdownshoot;
+ tank.badImages[FIRSTDOWN + 1][SHOOTING] = area.badtankdownshoot2;
+
+ tank.badImages[FIRSTLEFT][NOTSHOOTING] = area.badtankleft;
+ tank.badImages[FIRSTLEFT + 1][NOTSHOOTING] = area.badtankleft2;
+ tank.badImages[FIRSTLEFT][SHOOTING] = area.badtankleftshoot;
+ tank.badImages[FIRSTLEFT + 1][SHOOTING] = area.badtankleftshoot2;
+
+ tank.badImages[FIRSTRIGHT][NOTSHOOTING] = area.badtankright;
+ tank.badImages[FIRSTRIGHT + 1][NOTSHOOTING] = area.badtankright2;
+ tank.badImages[FIRSTRIGHT][SHOOTING] = area.badtankrightshoot;
+ tank.badImages[FIRSTRIGHT + 1][SHOOTING] = area.badtankrightshoot2;
+
+ enemies = new Thread(tank);
enemies.start();
}
diff --git a/Zombie/src/Zombie.java b/Zombie/src/Zombie.java
@@ -37,26 +37,26 @@ public class Zombie extends JFrame implements KeyListener, Runnable {
protected int explosionx = -1, explosiony = -1;
public static void main(String[] args) {
- Zombie Zombie = new Zombie();
- Zombie.setLayout(null);
- Zombie.setBackground(Color.gray);
- Zombie.setSize(RIGHTEDGE, BOTTOMEDGE);
+ Zombie zombie = new Zombie();
+ zombie.setLayout(null);
+ zombie.setBackground(Color.gray);
+ zombie.setSize(RIGHTEDGE, BOTTOMEDGE);
- area = new ZombieArea(Zombie);
- Zombie.add(area);
+ area = new ZombieArea(zombie);
+ zombie.add(area);
// RIGHTEDGE = getBounds().width - 1;
// BOTTOMEDGE = getBounds().height - 1;
XAMOUNT = 12;
YAMOUNT = 12;
- Zombie.setVisible(true);
+ zombie.setVisible(true);
area.setBounds(0, 0, RIGHTEDGE, BOTTOMEDGE);
area.setVisible(true);
- Zombie.addKeyListener(Zombie);
- area.addKeyListener(Zombie);
+ zombie.addKeyListener(zombie);
+ area.addKeyListener(zombie);
area.requestFocus();
- zombies = new Thread(Zombie);
+ zombies = new Thread(zombie);
zombies.start();
}
