From 40ca29879ad306cc0c18f93ef18bacf6c4cf2dc7 Mon Sep 17 00:00:00 2001
From: Vincent <xefal77@gmail.com>
Date: Sun, 27 Oct 2024 19:53:31 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20erreur=20derniere=20tuile=20fin=20de=20s?=
=?UTF-8?q?=C3=A9rie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/controller/GameController.class | Bin 6225 -> 6231 bytes
bin/view/App.class | Bin 1428 -> 1421 bytes
src/main/java/controller/GameController.java | 12 +++++++++---
src/main/java/view/App.java | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/bin/controller/GameController.class b/bin/controller/GameController.class
index 1c15dd9476d6c31147ca49bbc5bfe39c70de5b8c..c45b87bf6f46f346b75635a7c38f1613f1d7f961 100644
GIT binary patch
delta 523
zcmY+B-Aj{U7{-6^t8PwK`L6alDmy8m?bV!9krMi_vV+>pz$_K52<(F_zl%OhA?yRo
zditQG$XpIgl9$b~Nu=NoIxz@>j{GY+5vl0zu#+1ep8LA^UDy3B_#-&_)v=CL9%1|Y
zh{LVr(C?=2-?$aO<V?BD2o9V;CXm2orP-wOlC-Keo|YyslK2BB6X@BeX3=Fs&ksh)
z4I~NJGAvt!I+tZOVXEIoLECOB*h4jYsbL>s4$#g)dZ}fQLp+lAGY<2XBgCk~<|uR2
z^O<AJbDTv^&?9a>9KR@bQuv1wC%u|hu|kf2l`Pfai5Sh~(n<lR*}@sNb5<>RiZo08
z^n`2t|6_%4i(Na}oWsR=)^GtY7cuEztALkrh5d92QkNif3qp??S|9cIi{h$iuZiLY
z8@Wjl0}|=B01wi_koXLU_D;NRLzdQXSBUPB&wUI=DC8kK7^R%Y?Ba=JRz!GCBQHeu
zO6ngIgVzl6MmEQ#?{`cyL7FHFyeGpXUx=xg_qumVTt8sRe~6D%F(cjDs>*EkCgg0h
jtR=~2Qf!kREk3E3S*gv(m(7soT9m{Y9<Zc*zMX#oUI%uy
delta 517
zcmYL`TT4`77=@p`b7nU&m3wM$qtcranmr~q8Bt<|6?9-Ug0X`U9qDLC513J8K~h=9
zr&M$lrYO|PW*lZNlBl4rf+*+*^d~ApT6f*N@V%_H-nG{EqvmT(|Cexz!Zc=%eeVlL
zxj<*s3Te=hZFLF}e*<A0;6sojk|;9I<{kx8=MGfoiEHWR34$Ft?2<j>*jm`7$swE|
zPhw0wo0FQ&cxKWq+gVR7tEgi&4Xh!hd5E>NvyMxw=a$}sY~%@>$gr7VA;xKBf+pUx
zl{P7r5&BD&L-{0&9oj9c_7|Z)RGGF|qnl<b+XZQ%f?X_PxA_*UwBqJ>EY%RmQT)H7
zBvGmDrG$M%*w1th;BgS2!z|zkOE@ZL$K>L;F1ISd3DY|(6F)7+8F9~w(ZO6gsiaH3
z&#{GW9X&5z7pJ(GP0yZUrF-P)GNoL><tpX$Qq47%a-EgjQ0zX%>t`FcMH`UdAU)g>
z@-8>IucjX`!b6HY;vJ9qsA@hlWJbMiFC*2bBzQ)W=Pc)iY8^K9ev9`~ANGnFyk<Uc
eSV&H&yczYES;g#6KWRnYD)EFYd@>btR{R627;{np
diff --git a/bin/view/App.class b/bin/view/App.class
index c2a18a7c18c4effb20978055e1e0d54e1fd187f7..8b783ef66c39db4ba4a3e210a185b40805f00667 100644
GIT binary patch
delta 25
gcmbQj-OIf}k%@=fCBG=mE3quGBr|)n2~z?y0At$+!vFvP
delta 32
ncmeC>p2EFBkx5v{v7jI)GdZy&Ge1uuB~`&IwRE#CQvx#przr{+
diff --git a/src/main/java/controller/GameController.java b/src/main/java/controller/GameController.java
index fb35432..84e418e 100644
--- a/src/main/java/controller/GameController.java
+++ b/src/main/java/controller/GameController.java
@@ -58,11 +58,13 @@ public class GameController implements TilePlacer {
return;
}
+ // Placer la tuile actuelle
hexTile.setTile(nextTile);
gridPanel.revalidate();
gridPanel.repaint();
availablePositions.remove(position);
+ // Mettre à jour les positions disponibles autour de la tuile ajoutée
for (Point adj : getAdjacentPositions(position)) {
if (!hexagonMap.containsKey(adj)) {
availablePositions.add(adj);
@@ -71,13 +73,17 @@ public class GameController implements TilePlacer {
}
gameContext.repaintGrid(gridPanel);
- generateNextTile();
scoreGameContext.calculateScore();
+ // Incrémenter le nombre de tuiles placées et vérifier si la limite est atteinte
placedTileCount++;
- if (placedTileCount >= 50) {
- endGame(); // Appeler endGame pour terminer la partie
+ if (placedTileCount > 48) {
+ endGame(); // Terminer la partie si on a atteint la 50ᵉ tuile pile
+ return; // Arrêter ici pour éviter de générer une tuile vide
}
+
+ // Générer la prochaine tuile si la partie n'est pas terminée
+ generateNextTile();
}
}
diff --git a/src/main/java/view/App.java b/src/main/java/view/App.java
index 32b14f2..0f07327 100644
--- a/src/main/java/view/App.java
+++ b/src/main/java/view/App.java
@@ -13,7 +13,7 @@ public class App {
private static JPanel mainPanel;
static {
- frame = new JFrame("Application de Jeu");
+ frame = new JFrame("DorfJavatik");
cardLayout = new CardLayout();
mainPanel = new JPanel(cardLayout);
frame.setContentPane(mainPanel);