From 84697c427f665e6d55ef1a39f4c1ef9ff9189945 Mon Sep 17 00:00:00 2001
From: HydroFlo <HydroGamer@outlook.fr>
Date: Wed, 10 Jan 2024 15:37:56 +0100
Subject: [PATCH] edit question random
---
S1.02/Jeu/classes/Labyrinthe.class | Bin 15368 -> 15304 bytes
S1.02/Jeu/src/Labyrinthe.java | 30 +++++++++++++----------------
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/S1.02/Jeu/classes/Labyrinthe.class b/S1.02/Jeu/classes/Labyrinthe.class
index 6a762ea6238e2ee59597f7aa1916c099c26a172d..bb94bee69158126eaf95c44f11ce38ffd17cff2f 100644
GIT binary patch
delta 1378
zcmeCEI8nYKl$}>xBibjhG_|-SGe6IIb258{w2mDED+3n;1M^B5fs6$V>{{CxcF71-
zEnv7O%aSsi;fA&>ONx;wi-~~4e1_AL*_Ew$>?K*ZFzlVhV6G*}HrZZ9Vse(Ugk%U@
zoznsaRj3MCElKvtg{qR1w<@bjJ&|Qe(9&kv#!#^cY-$3+)GwH(8h}lNsKI99A{AB9
z`=TsRCmMlRP$%9|!EmDZWII(!kbzKjm<HNOKNV#GxsMg*K9JG`sF9~su^6eN1~)Rn
zL;%xB*~v9(QT2HY{}@Uc{xj4uGB9*7GBQkLWM-Jo$jY#uk&R(HBRj)BMh=E!jGPSD
z7`YhkF>*7!X5?q&ViaH$XB1?VXB1-8WE5t!U=(5WWfWx$WfWtKVH9UfWt3pdXOv{D
zV3cO8W0Yl_#wf=)k5Qg+DWd}8T1G|2y^KnXM;VnFFEOguGrnQeVEoCb$;8O0#l+31
z%_POB!=%rs%Vf@|$7IK-&*aW%z!b=6$P~qB%#^@r%2dH<#?-)Q&eYCm!PL)a$uytQ
zifK8cHPaSGd!{Rl4onXj9hqJ-Ix&4_bY^B^bYT`}bY+%jbYoUybZ6FQ^kBAR^kjBo
z^k(*8^kq(9jP+yAVDx9sXAEF2XAER+XAENQXAEYZ!x+xEpMinFo<Wl9H-p<B277h}
z>t774OnQpH8GKN=?x<W}B<^NIjYS-Kx(qA~%nS?+f?C@crfX?$W5{dI?z7dFG1|bu
zz`)43n}LCWi-C!Of$<LmFXP|I8iqEkj0~(yOp`MWdkona*qJyOgqb)Qq?ouE)R?##
z448NrY?$~MJear`{Fnq8LYagZBAGZC;+aGk(wIais~NRPN-*#+Nis+=NinD}Ni!HS
zNivu-Nif(l$xl9N<jbkVz|Ex0Ai$(DS=!i5P@RE;NrOR{Ns~d6NrOS2NqcgUaTKpU
zgBX(mgA9`)gA$X`<eSDplBNv2OlAxcOy&%VOco5vOlAz4Ox6tAOtzC<Os2>>G6*m^
zF(@!OGZ-+rFqksAGB`20G59mNGsH4^O#W&TCF#w;!Q{ih#pK5z%H+?W%@n|(%jCyk
z%oIF1!?aQ{oPmWYf`Nl6l7WXQia~%Wnn8vshCzcVmcfK6j=_;Beln9;l4cSE6H_t+
zJ5ve+4^t|G2vZt^G*dc*GE*jlCQ}xJ9#b}h1yde_HB<iPUNa-+`eFulrV<8TrcwrB
zrZNU;rg8=qrV0jarb-4wrYZ(UrfLQcrWyu+rdozDraFc=rh0~CrUr&GrbdPqrY43-
zOw9}nn3@=tF*P!*VQOdC%GANIkExsC6jKkw1*Tqx+f027&zbreJ}^yU_`)=W;WyJ%
zMn<M-jGRo<8O4}pFzVMc&1AG;n#JhBG@CJjX%1sH(_F?vrumGGObZx0nHDnkGc96V
z&a{|uBhwPb?MzD<cQGwvyv($m@d49H##c<Mm^hhMGVwF5VG?Cp%cQ`xj>(c~J(D}r
z2Bu`DjZAe+o0(dewlK|M+Qzh!X(!Vfrd>>1n07NAX4=bio@qbReWn9U>>rs9GJRz_
Ky!nWg3nKthODL28
delta 1450
zcmX?6-chk3l$}pPBibjhG_|-SGe6JTb8`}Vg|tB!11kd;0|WCx8G(!i4D4Fl7<S1B
zR4rh5BFmC8o8g|eEK7=!D2s`J!+eH|AkO5E$|95Hl$8WsBw4pG?48A6qb11(V){+~
zt13P@Sy@sl6r>KU$!P(D8c1&MECx9(Np|MRajKG&*D0$?y^>`~(9&kv#!#^cY)1lE
zImnL5Z<VcZnC+zkF&m;7tJzakR7IbPvOt|~1Y$v)KKZ-~c4MU{8>otcoD5Zr#aKJ(
z*P<*S_p-v=3sRc^HF&!!c7qLIh9;N@U@=s7a<W=feKEs7hAM{t49$!T484qu4AU5y
z8RjsuGHhXFW7x~c&Txd0gW(J#C&L{^E`}$J+zcNX`56Tm1sG)+1sPQtg&6f2g&FM_
zMHqt_MHv$q#Te5W#Tg42B^aw1B^jF;r5QUJWf>PT$}z5DlxN(?sKB_BQIYW^qY~pq
zMrFo(jOz7_KNvNbSQ#~$cp0^r#2K}j)EIS`tQmEgJQ($u{2BF`A{Y&rk{At{vKft;
z3K>nAIvLHFCNY{b&1AG-TF7Y0w2{$@X(yvK(=kSSre}-}OrIGYnSL`mF|#r{Gm9{~
zFl#cpGMh2FG21e_GrKW*Fb6PtGDk9cGsiRfGM6*P`Y|^!`ZKpP1~B(C1~SiQ3}Rl+
z7|gtdF`RKf0|SFSgCy5)2Dd*9F6<1}zZh7V^c8<I_@Hv#QMtZI+|3dii#S3<7+4tC
z7#J8dw6-x!*V5j`kSCMUp514sEi02?WW}N_V`RmuEi1_ytSuwS5-iEGfq{X6k#RQz
z1A`PuALAbee#XBHVvPS7q#6G+C@?WFs4_85eqmt4%F4jX#5P&eu*Z;#ft`tmL70h`
zL5hiwL5+!@!GKAC!G=kQ!Gnp9!H-FlA(TmsA(DxQA)ZNsA&p6L@-xFWNf`znCRqk4
zCOHNbCV2)!CRqk^CK(1>CgsVkM!uYC4BSlW3<69VlW!Zj32HNNFzGM|GwCu&GU+hL
zGwDw@GLGUkW)NdCVUS@mWl&-=n>^DvNYavlm&uAjg2|dek;#TZnaPSllgXYzo5^u9
zi^&vOR|WwlHwFbJcLoC{4+c{vPX;F@F9v@mZ-!VVpUGQIq9pwpIG6$$xR`<%M45sa
zw3$K}beVz}jG4kGYnWClMl-N5#V~L%#WL_P#W4sl#WTn-B`|0(B{G;WB{4WMB~LzN
znxvV=z{Hf!z|NGxz{8ZuAi|WzAkCD`pv;uZpvjcSpvRQYV8K+xV9iv#+1Jd7xxSo%
zovDI>m#LCLn5l|EnyH#Wg{g)?o2iz;kg1Nrk*S`+gQ<bRpQ(`{jH!tsj;Wa;nW=@L
zjH#8Og{h5U5>q?F0;V>GWlXIMYnZwjwleiF>|^R@IK?!9;R4e{hTBY&7@jjtX86D~
zjo}N^42IuKGZ`6~W-)Ry&1Mv1n!~7H&or0OhG`z72h)7U1f~Uy*-Q%=3z-%(HZm<?
z>||QX*w3_#aXHg+#*IuX7`HR6WZcEHit#ejYQ_glYZ+fLtz+V3TFb=Gw1G*KX(N*Y
z(<UZMrp-+5Ok0?enYJ?3F>PmRVcNkohiMnnN~XO`Ynb*iZDHEabeQQN(|M-DO!t|N
TFtLARI?D8w>G<XrD;GupC$c^@
diff --git a/S1.02/Jeu/src/Labyrinthe.java b/S1.02/Jeu/src/Labyrinthe.java
index b5dea62..ca9849d 100644
--- a/S1.02/Jeu/src/Labyrinthe.java
+++ b/S1.02/Jeu/src/Labyrinthe.java
@@ -250,7 +250,7 @@ class Labyrinthe extends Program{
Lab[positionL-1][positionC] = 'P';
return new int[]{positionL-1, positionC};
} else if(Lab[positionL-1][positionC] == 'M' && !j.aJouee){ //Si Monstre, affiche la question.
- Question q = questionRandom(liste, j.score);
+ Question q = questionRandom(liste);
afficheQuestion(q, true);
if(questionCorrect(q)){ //En cas de bonne réponse efface le monstre
Lab[positionL-1][positionC] = '.';
@@ -259,7 +259,7 @@ class Labyrinthe extends Program{
perteHP(j);
}
} else if(Lab[positionL-1][positionC] == 'B' && !j.aJouee){ //Si Monstre, affiche la question.
- Question q = questionRandom(listeBoss, 0);
+ Question q = questionRandom(listeBoss);
afficheQuestion(q, true);
updateBoss(q, j);
} else if(Lab[positionL-1][positionC] == 'S'){
@@ -274,7 +274,7 @@ class Labyrinthe extends Program{
Lab[positionL+1][positionC] = 'P';
return new int[]{positionL+1, positionC};
} else if (Lab[positionL+1][positionC] == 'M' && !j.aJouee){
- Question q = questionRandom(liste, j.score);
+ Question q = questionRandom(liste);
afficheQuestion(q, true);
if(questionCorrect(q)){ //En cas de bonne réponse efface le monstre
Lab[positionL+1][positionC] = '.';
@@ -283,7 +283,7 @@ class Labyrinthe extends Program{
perteHP(j);
}
} else if(Lab[positionL+1][positionC] == 'B' && !j.aJouee){ //Si Monstre, affiche la question.
- Question q = questionRandom(listeBoss, 0);
+ Question q = questionRandom(listeBoss);
afficheQuestion(q, true);
updateBoss(q, j);
} else if (Lab[positionL+1][positionC] == 'S'){
@@ -298,7 +298,7 @@ class Labyrinthe extends Program{
Lab[positionL][positionC-1] = 'P';
return new int[]{positionL, positionC-1};
} else if (Lab[positionL][positionC-1] == 'M' && !j.aJouee){
- Question q = questionRandom(liste, j.score);
+ Question q = questionRandom(liste);
afficheQuestion(q, true);
if(questionCorrect(q)){ //En cas de bonne réponse efface le monstre
Lab[positionL][positionC-1] = '.';
@@ -307,7 +307,7 @@ class Labyrinthe extends Program{
perteHP(j);
}
} else if(Lab[positionL][positionC-1] == 'B' && !j.aJouee){ //Si Monstre, affiche la question.
- Question q = questionRandom(listeBoss, 0);
+ Question q = questionRandom(listeBoss);
afficheQuestion(q, true);
updateBoss(q, j);
} else if (Lab[positionL][positionC-1] == 'S'){
@@ -322,7 +322,7 @@ class Labyrinthe extends Program{
Lab[positionL][positionC+1] = 'P';
return new int[]{positionL, positionC+1};
} else if (Lab[positionL][positionC+1] == 'M' && !j.aJouee){
- Question q = questionRandom(liste, j.score);
+ Question q = questionRandom(liste);
afficheQuestion(q, true);
if(questionCorrect(q)){ //En cas de bonne réponse efface le monstre
Lab[positionL][positionC+1] = '.';
@@ -331,7 +331,7 @@ class Labyrinthe extends Program{
perteHP(j);
}
} else if(Lab[positionL][positionC+1] == 'B' && !j.aJouee){ //Si Monstre, affiche la question.
- Question q = questionRandom(listeBoss, 0);
+ Question q = questionRandom(listeBoss);
afficheQuestion(q, true);
updateBoss(q, j);
} else if (Lab[positionL][positionC+1] == 'S'){
@@ -504,13 +504,9 @@ class Labyrinthe extends Program{
assertEquals(test2.question, tabTest[length(tabTest)-1].question);
}
- Question questionRandom(Question[] liste, int nbUtilisees){
- int choix = (int) (random()*(length(liste)-nbUtilisees));
- Question res = liste[choix + nbUtilisees];
- Question temp = liste[nbUtilisees];
- liste[choix] = temp;
- liste[nbUtilisees] = res;
- return res;
+ Question questionRandom(Question[] liste){ //Choisie une question au hasard
+ int choix = (int) (random()*(length(liste)));
+ return liste[choix];
}
boolean questionCorrect(Question q){ //Vérifie si on donne la bonne réponse
@@ -546,7 +542,7 @@ class Labyrinthe extends Program{
}
return new int[]{0,0};
}
- void afficherSalle(int nbr){
+ void afficherSalle(int nbr){ //affiche la salle
char[][] salle = genererSalle("ressources/Lab/Salle"+nbr);
afficheLab(salle);
}
@@ -587,7 +583,7 @@ class Labyrinthe extends Program{
assertFalse(equals(tab1, tab4));
}
- boolean estInt(String verif){
+ boolean estInt(String verif){ //vérifie si la String entrée est un entier
if(length(verif) == 0){
return false;
}
--
GitLab