amélioré la génération des colonnes : difficulté progressive, trou

Author: Poulet

src/game/Controller.java

@@ -1,33 +1,63 @@
+
 package game;
 
 import java.awt.*;
 import java.util.ArrayList;
 import java.util.Random;
 
 /**
+ *
  * Controller.java
  * Controleur
  * Génère les obstacles et powerups
  */
-class Controller {
-
-    public final ArrayList<Rectangle> columns = new ArrayList<>();
-    private final Random rand = new Random();
-
+public class Controller {
+    
+    Game game;
+    
+    public ArrayList<Rectangle> columns = new ArrayList<>();
+    public Random random = new Random();
+    
     public Controller() {
     }
-
-    public void addColumn(boolean start) {
+    
+    public void addColumn(int level) {
+        //int space = 300;
         int width = 10;
-        int height = 10 + rand.nextInt(80);
-
-        int r_height = Runner.HEIGHT - height - (start ? 140 : 120);
-        int r_width = start ? Runner.WIDTH + width + columns.size() * 900 : columns.get(columns.size() - 1).x + 600;
-
-        columns.add(new Rectangle(r_width, r_height, width, height));
-
+        int height = 10;
+        
+        int rWidth = 10;
+        
+        // une chance sur deux d'obtenir un trou sous la colonne
+        int hole = random.nextBoolean() ? 20 : 0;
+        
+        switch (level) {
+            case 0:
+                height = 10 + random.nextInt(40);
+                rWidth = Runner.WIDTH + width + columns.size() * 900;
+                break;
+            case 1:
+                height = 10 + random.nextInt(60);
+                rWidth = columns.get(columns.size()-1).x + 600;
+                break;
+            case 2:
+                height = 10 + random.nextInt(80);
+                rWidth = columns.get(columns.size()-1).x + 600;
+                break;
+            case 3:
+                height = 10 + random.nextInt(100);
+                rWidth = columns.get(columns.size()-1).x + 600;
+                break;
+            case 4:
+                height = 10 + random.nextInt(120);
+                rWidth = columns.get(columns.size()-1).x + 600;
+                break;
+        }
+        
+        int rHeight = Runner.HEIGHT - height - 120 - hole;
+        columns.add(new Rectangle(rWidth, rHeight, width, height));
     }
-
+      
     public void paintColumn(Graphics g, Rectangle column) {
         g.setColor(Color.green.darker());
         g.fillRect(column.x, column.y, column.width, column.height);

src/game/Game.java

@@ -2,6 +2,7 @@
 
 import java.awt.*;
 import java.awt.event.MouseEvent;
+import static java.lang.Math.round;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -15,6 +16,7 @@ class Game implements Runnable {
     private final Player player;
     private int ticks;
     private int score;
+    private int level = 0;
 
     public Game() {
 
@@ -23,7 +25,7 @@ public Game() {
         score = 0;
 
         for (int i = 0; i < 5; i++) {
-            c.addColumn(true);
+            c.addColumn(0);
         }
     }
 
@@ -43,16 +45,22 @@ public void run() {
             if (ticks % 2 == 0 && player.ymotion < 15) {
                 player.ymotion += 2;
             }
-
+            
+            // incrémente le niveau tout les 500 ticks
+            if (ticks % 250 == 0) {
+                level++;
+                speed = (int)round(speed * 1.2);
+            }
+            
             for (int i = 0; i < c.columns.size(); i++) {
                 Rectangle column = c.columns.get(i);
 
                 if (column.x + column.width < 0) {
                     c.columns.remove(column);
-                    c.addColumn(false);
+                    c.addColumn(1);
 
                     if (column.y == 0) {
-                        c.addColumn(false);
+                        c.addColumn(1);
                     }
                 }
             }
@@ -124,6 +132,9 @@ void render(Graphics g) {
         }
         String scoreString = "Score : " + score;
         g.drawString(scoreString, 20, Runner.HEIGHT - 50);
+        
+        String levelString = "Level : " + level;
+        g.drawString(levelString, Runner.WIDTH - 250, Runner.HEIGHT - 50);
     }
 
     public void mousePressed(MouseEvent e) {

src/game/Player.java

@@ -28,9 +28,11 @@ public void jump() {
 
     // fait se baisser player
     public void crouch() {
-        /*this.height -= 20;
+        crouched = true;
+        this.height -= 20;
         this.y += 20;
-        System.out.println("CROUCHED : " + height);*/
+        //this.ymotion -= 10;
+        System.out.println("CROUCHED : " + height);
     }
 
 }

src/game/Renderer.java

@@ -17,17 +17,14 @@ protected void paintComponent(Graphics g) {
             case GAME:
             case OVER:
                 Runner.game.render(g);
-                System.out.println("rendered game/over");
                 break;
             case MENU:
                 Runner.menu.render(g);
-                System.out.println("menu");
                 break;
             case HISCORE:
                 break;
         }
 
     }
 
-
 }