"final" commit

Author: LevFlavien

src/game/Controller.java

@@ -13,8 +13,6 @@
  */
 public class Controller {
 
-    Game game;
-    
     public ArrayList<Rectangle> columns = new ArrayList<>();
     public Random random = new Random();
 

src/game/Game.java

@@ -33,7 +33,7 @@ public Game() {
     public void run() {
         int speed = 10;
         System.out.println("Game.run()");
-
+        
         while (Runner.state == Runner.STATE.GAME) {
             ticks++;
 
@@ -47,7 +47,7 @@ public void run() {
             }
 
             // incrémente le niveau tout les 500 ticks
-            if (ticks % 250 == 0) {
+            if (ticks % 500 == 0) {
                 level++;
                 speed = (int)round(speed * 1.2);
             }
@@ -76,18 +76,19 @@ public void run() {
                 }
             }
 
-            // stoppe player au niveau du sol
-            if (player.y >= Runner.HEIGHT - 160 || player.y < 0) {
+            // stoppe player au niveau du sol en fonction de sa position
+            if ((player.y >= Runner.HEIGHT - 160 || player.y < 0) && !player.crouched) {
                 player.y = Runner.HEIGHT - 160;
-            }
-
-            // réinitialise le double saut quand player atterit
-            if (player.y == 440) {
+                player.jumping = 0;
+            } else if ((player.y >= Runner.HEIGHT - 140 || player.y < 0) && player.crouched) {
+                player.y = Runner.HEIGHT - 140;
                 player.jumping = 0;
             }
-            System.out.println(player.y);
-            // actualise le rendu
-            Runner.renderer.repaint();
+            
+            // actualise le rendu tout les deux ticks
+            if (ticks % 2 == 0) {
+                Runner.renderer.repaint();
+            }
 
             try {
                 Thread.sleep(20);
@@ -142,9 +143,11 @@ public void mousePressed(MouseEvent e) {
         switch (Runner.state) {
             case GAME:
                 System.out.println(Runner.state);
-                if (e.getButton() == 1) {   // si clic droit
+                // si clic gauche
+                if (e.getButton() == 1) {
                     player.jump();
-                } else {
+                    player.uncrouch();
+                } else if (player.jumping == 0) {
                     player.crouch();
                 }
                 break;
@@ -155,5 +158,16 @@ public void mousePressed(MouseEvent e) {
                 break;
         }
     }
+    
+    public void mouseReleased(MouseEvent e) {
+        // si clic droit pendant l'état de jeu
+        if (e.getButton() == 3 && player.crouched) {
+            player.crouch();
+        }
+    }
+    
+    public void mouseClicked(MouseEvent e) {
+        System.out.println("a");
+    }
 
 }

src/game/HighScore.java

@@ -5,8 +5,9 @@
 class HighScore {
 
     private static final File scoreFile = new File("score.txt");
-
-    public static int getHighScore() {
+    
+    // Récupère le score présent dans le fichier score.txt
+    public static int getHighScore() { 
         int currentHighScore = 0;
 
         if (!scoreFile.exists()) {
@@ -32,7 +33,8 @@ public static int getHighScore() {
 
         return currentHighScore;
     }
-
+    
+    //
     public static void setHighScore(int score) {
         if (score > getHighScore()) {
             System.out.println("NEW HIGHSCORE" + score + getHighScore());

src/game/Menu.java

@@ -9,7 +9,7 @@
 class Menu {
 
     public static final Rectangle playButton = new Rectangle(Runner.WIDTH / 2, 200, 140, 50);
-    public static final Rectangle hiscoreButton = new Rectangle(Runner.WIDTH / 2, 300, 140, 50);
+    public static final Rectangle highscoreButton = new Rectangle(Runner.WIDTH / 2, 300, 140, 50);
     public static final Rectangle quitButton = new Rectangle(Runner.WIDTH / 2, 400, 140, 50);
 
     public void render(Graphics g) {
@@ -24,14 +24,14 @@ public void render(Graphics g) {
         g2d.setColor(Color.blue);
         g.setFont(fnt0.deriveFont(38f));
         g.drawString("Play", playButton.x + 10, playButton.y + 40);
-        g.drawString("Score", hiscoreButton.x + 10, hiscoreButton.y + 40);
+        g.drawString("Score", highscoreButton.x + 10, highscoreButton.y + 40);
         g.drawString("Quit", quitButton.x + 10, quitButton.y + 40);
         g2d.draw(playButton);
-        g2d.draw(hiscoreButton);
+        g2d.draw(highscoreButton);
         g2d.draw(quitButton);
     }
 
     public void displayScores() {
-        JOptionPane.showMessageDialog(null, "Le score le plus haut est actuellement " + HighScore.getHighScore());
+        JOptionPane.showMessageDialog(null, "Le score le plus haut est actuellement\n" + HighScore.getHighScore());
     }
 }

src/game/MouseInput.java

@@ -13,15 +13,15 @@ class MouseInput implements MouseListener {
     public void mousePressed(MouseEvent e) {
         if (Runner.state == Runner.STATE.MENU) {
             System.out.println(Runner.state);
-
+            System.out.println(e.getButton());
             int x = e.getX() - 3;
             int y = e.getY() - 22;
 
             //play
             if (Menu.playButton.contains(x, y)) {
                 Runner.state = Runner.STATE.GAME;
                 Runner.start();
-            } else if (Menu.hiscoreButton.contains(x, y)) {
+            } else if (Menu.highscoreButton.contains(x, y)) {
                 Runner.menu.displayScores();
             } else if (Menu.quitButton.contains(x, y)) {
                 Runner.quit();
@@ -34,6 +34,7 @@ public void mousePressed(MouseEvent e) {
 
     @Override
     public void mouseReleased(MouseEvent e) {
+        Runner.game.mouseReleased(e);
     }
 
     @Override

src/game/Player.java

@@ -28,11 +28,22 @@ public void jump() {
 
     // fait se baisser player
     public void crouch() {
-        crouched = true;
-        this.height -= 20;
-        this.y += 20;
-        //this.ymotion -= 10;
-        System.out.println("CROUCHED : " + height);
+    	if (!crouched) {
+            this.height -= 20;
+            this.y = 460;
+            System.out.println("CROUCHED : " + height);
+            this.crouched = true;
+    	} else {
+            uncrouch();
+        }
     }
-
+    
+    public void uncrouch() {
+        if (crouched) {
+            this.crouched = false;
+            this.height += 20;
+            this.y = 440;
+        }
+    }
+    
 }

src/game/Renderer.java

@@ -21,8 +21,6 @@ protected void paintComponent(Graphics g) {
             case MENU:
                 Runner.menu.render(g);
                 break;
-            case HISCORE:
-                break;
         }
 
     }

src/game/Runner.java

@@ -50,7 +50,6 @@ public static void main(String[] args) {
 
     public enum STATE {
         MENU,
-        HISCORE,
         GAME,
         OVER
     }