nvim

Platformer.java

@@ -1,14 +1,10 @@
-import java.util.Random;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.io.*;
 import java.awt.*;
-import java.awt.event.*;
 import java.awt.Graphics;
+import java.awt.event.*;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.HashMap;
 import javax.swing.*;
-import java.time.LocalTime;
-
 
 public class Platformer extends JPanel implements KeyListener, ActionListener {
 
@@ -46,7 +42,6 @@ public class Platformer extends JPanel implements KeyListener, ActionListener{
   Image heart, emptyHeart, slash, amendmentImg, powerImg, startImg;
   ArrayList<Image> numbers;
 
-
   public Platformer(int boardWidth, int boardHeight, int tileSize) {
     // setup game
     this.boardWidth = boardWidth;
@@ -57,7 +52,6 @@ public class Platformer extends JPanel implements KeyListener, ActionListener{
     this.setFocusable(true);
     this.setLayout(null);
 
-        
     pressedKeys = new HashMap<>();
     jumpPressed = false;
     gameOver = false;
@@ -79,14 +73,14 @@ public class Platformer extends JPanel implements KeyListener, ActionListener{
     cameraY = 0;
     currentLevel = 0;
     numbers = new ArrayList<>();
-        for (int i =0; i < 10; i++) numbers.add((new ImageIcon("Sprites/Numbers/" + i + ".png")).getImage());
+    for (int i = 0; i < 10; i++)
+      numbers.add((new ImageIcon("Sprites/Numbers/" + i + ".png")).getImage());
     slash = new ImageIcon("Sprites/Numbers/Slash.png").getImage();
     amendmentImg = new ImageIcon("Sprites/Amendment.png").getImage();
     powerImg = new ImageIcon("Sprites/Powerup1.png").getImage();
 
     gameTimer.start();
 
-        
     // if i wanna add a button
     /*JButton gameStart = new JButton("Start Game");
     gameStart.addActionListener(e -> {
@@ -111,8 +105,6 @@ public class Platformer extends JPanel implements KeyListener, ActionListener{
     cameraY = player.y - boardHeight / 2;
     // cameraY = Math.max(0, cameraY);
 
-        
-        
     // win
     allCollected = player.numAmendments >= numAm[currentLevel - 1];
     if (player.collidesWith(flag) && allCollected) {
@@ -131,17 +123,17 @@ public class Platformer extends JPanel implements KeyListener, ActionListener{
     if (Math.abs(player.xVelo) < MAXXVELO) {
       if (isKeyPressed(KeyEvent.VK_D) || isKeyPressed(KeyEvent.VK_RIGHT)) {
         player.xVelo += 1;
-            }
+      } else if (isKeyPressed(KeyEvent.VK_A) || isKeyPressed(KeyEvent.VK_LEFT)) {
-            else if(isKeyPressed(KeyEvent.VK_A) || isKeyPressed(KeyEvent.VK_LEFT)){
         player.xVelo -= 1;
       }
-
     }
-        if (!isKeyPressed(KeyEvent.VK_D) && !isKeyPressed(KeyEvent.VK_RIGHT) && !isKeyPressed(KeyEvent.VK_A) && !isKeyPressed(KeyEvent.VK_LEFT)){ //friction
+    if (!isKeyPressed(KeyEvent.VK_D)
+        && !isKeyPressed(KeyEvent.VK_RIGHT)
+        && !isKeyPressed(KeyEvent.VK_A)
+        && !isKeyPressed(KeyEvent.VK_LEFT)) { // friction
       if (player.xVelo > 0) {
         player.xVelo = Math.max(0, player.xVelo - FRICTION);
-                }
+      } else if (player.xVelo < 0) {
-                else if (player.xVelo < 0){
         player.xVelo = Math.min(0, player.xVelo + FRICTION);
       }
     }
@@ -154,8 +146,7 @@ public class Platformer extends JPanel implements KeyListener, ActionListener{
         player.onGround = false;
         jumpPressed = true;
         player.airJumps = 0;
-            }
+      } else if (player.curPower == 1 && player.airJumps < 1) {
-            else if (player.curPower == 1 && player.airJumps < 1){
         player.yVelo = -15;
         player.airJumps++;
         jumpPressed = true;
@@ -195,8 +186,7 @@ public class Platformer extends JPanel implements KeyListener, ActionListener{
           player.curPower = pu.id;
           player.powerTimer = Player.POWER_DURATION;
         }
-            }
+      } else if (c instanceof Amendment) {
-            else if (c instanceof Amendment){
         Amendment am = (Amendment) c;
         if (player.collidesWith(am)) {
           player.numAmendments++;
@@ -227,8 +217,6 @@ public class Platformer extends JPanel implements KeyListener, ActionListener{
       }
     }
 
-        
-
     // Powerup timer
     if (player.curPower > 0) {
       player.powerTimer--;
@@ -267,7 +255,6 @@ public class Platformer extends JPanel implements KeyListener, ActionListener{
       }
     }
 
-        
     // update enemies
     for (Enemy e : enemies) {
       e.patrol(collidables);
@@ -341,7 +328,6 @@ public class Platformer extends JPanel implements KeyListener, ActionListener{
 
     g.translate(cameraX, cameraY);
 
-        
     int modAmt = 2000;
     int curTime = (int) System.currentTimeMillis() % modAmt;
     curTime = Math.abs(curTime);
@@ -396,7 +382,6 @@ public class Platformer extends JPanel implements KeyListener, ActionListener{
       g.drawImage(numbers.get(numAm[currentLevel - 1]), 390, 10, null);
       g.drawImage(amendmentImg, 420, 10, null);
 
-        
       // draw powerup timer
       if (player.curPower == 1) {
         int secs = player.powerTimer / 66;
@@ -411,9 +396,7 @@ public class Platformer extends JPanel implements KeyListener, ActionListener{
     }
 
     // gameover screen
-        if (gameOver){
+    if (gameOver) {}
-            
-        }
   }
 
   // is key pressed
@@ -468,7 +451,5 @@ public class Platformer extends JPanel implements KeyListener, ActionListener{
 
   // dont need
   @Override
-    public void keyTyped(KeyEvent e){
+  public void keyTyped(KeyEvent e) {}
-
-    }
 }