Morph01/Tetris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: piece generation

Browse Source
This commit is contained in:
Morph01
2025-05-19 22:02:16 +02:00
committed by Morph01
parent a8f543114e
commit 85aafa8240
14 changed files with 205 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/src/main/java/org/Models/Jeu.java
View File

@@ -2,8 +2,15 @@ package org.Models;
import java.awt.Point;
import java.util.Observable;
import java.util.Random;
import org.Models.Pieces.PieceI;
import org.Models.Pieces.PieceJ;
import org.Models.Pieces.PieceL;
import org.Models.Pieces.PieceO;
import org.Models.Pieces.PieceS;
import org.Models.Pieces.PieceT;
import org.Models.Pieces.PieceZ;
@SuppressWarnings("deprecation")
public class Jeu extends Observable implements Runnable {
@@ -15,16 +22,16 @@ public class Jeu extends Observable implements Runnable {
private int pieceSuivanteX;
private int pieceSuivanteY;
// TODO : remove test variable
public int test = 0;
public boolean jeuEnCours = true;
public Jeu(Grille grille, Musique musique) {
System.err.println("init jeu");
this.grille = grille;
this.musique = musique;
System.err.println("init nouvelle piece courante");
this.grille.setPieceCourante(getNouvellePiece());
System.err.println("init nouvelle piece suivante");
this.pieceSuivante = getNouvellePiece();
this.ordonnanceur = new Ordonnanceur(this, 1000);
@@ -32,10 +39,46 @@ public class Jeu extends Observable implements Runnable {
}
private PieceCourante getNouvellePiece() {
this.pieceSuivante = new PieceL();
this.pieceSuivanteX = 3;
this.pieceSuivanteY = 0;
return pieceSuivante;
Random random = new Random();
int randomiiii = random.nextInt(6);
System.err.println("randomiiiii : " + randomiiii);
PieceCourante nouvellePiece;
switch (randomiiii) {
case 0:
nouvellePiece = new PieceI();
System.err.println("piece I");
break;
case 1:
nouvellePiece = new PieceL();
System.err.println("piece L");
break;
case 2:
nouvellePiece = new PieceJ();
System.err.println("piece J");
break;
case 3:
nouvellePiece = new PieceO();
System.err.println("piece O");
break;
case 4:
nouvellePiece = new PieceS();
System.err.println("piece S");
break;
case 5:
nouvellePiece = new PieceT();
System.err.println("piece T");
break;
case 6:
nouvellePiece = new PieceZ();
System.err.println("piece Z");
break;
default:
nouvellePiece = new PieceL();
break;
}
return nouvellePiece;
}
public PieceCourante getPieceSuivante() {
@@ -91,7 +134,8 @@ public class Jeu extends Observable implements Runnable {
this.grille.deplacerPiece(Direction.BAS);
} else {
this.grille.fixerPiece();
this.grille.setPieceCourante(getNouvellePiece());
this.grille.setPieceCourante(pieceSuivante);
this.pieceSuivante = getNouvellePiece();
}
setChanged();