ENSEEIHT/projet-genie-logiciel-systeme
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fin attributs et constructeurs des classes

Browse source
This commit is contained in:
gdamms 2021-12-01 09:09:27 +01:00
parent 526bfab1a8
commit bff06307c2
6 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
enigme.java/Condition.java
View file

@ -1,9 +1,11 @@
public class Condition { public class Condition {
String condition; String condition;
ConditionEt[] conditionEts; List<ConditionEt> conditionEts;
public Condition(String condition, ConditionEt[] conditionEts) { public Condition(
String condition,
List<ConditionEt> conditionEts) {
this.condition = condition; this.condition = condition;
this.conditionEts = conditionEts; this.conditionEts = conditionEts;
} }

4
enigme.java/ConditionConnaissance.java
View file

@ -3,7 +3,9 @@ public class ConditionConnaissance implements ConditionTest {
Connaissance connaissance; Connaissance connaissance;
Boolean negation; Boolean negation;
public ConditionConnaissance(String connaissance, Boolean negation) { public ConditionConnaissance(
Connaissance connaissance,
Boolean negation) {
this.connaissance = connaissance; this.connaissance = connaissance;
this.negation = negation; this.negation = negation;
} }

2
enigme.java/ConditionEt.java
View file

@ -1,6 +1,6 @@
public class ConditionEt { public class ConditionEt {
ConditionTest[] conditionTests; List<ConditionTest> conditionTests;
public ConditionEt(ConditionTest[] conditionTests) { public ConditionEt(ConditionTest[] conditionTests) {
this.conditionTests = conditionTests; this.conditionTests = conditionTests;

4
test.game
View file

@ -63,7 +63,7 @@
"lieu_in": "Énigme", "lieu_in": "Énigme",
"lieu_out": "Succès", "lieu_out": "Succès",
"ouvert": "(true)", "ouvert": "(true)",
"visible": "(connaissance_Réussite==1)", "visible": "(Réussite==1)",
"obligatoire": "(false)", "obligatoire": "(false)",
"connaissances_gift": [], "connaissances_gift": [],
"objets_gift": [], "objets_gift": [],
@ -79,7 +79,7 @@
"lieu_in": "Énigme", "lieu_in": "Énigme",
"lieu_out": "Échec", "lieu_out": "Échec",
"ouvert": "(true)", "ouvert": "(true)",
"visible": "(objet_tentatives==0)", "visible": "(tentatives==0)",
"obligatoire": "(false)", "obligatoire": "(false)",
"connaissances": [], "connaissances": [],
"objets": [], "objets": [],

6
workspace/game/bin/xtext/Game.xtext
View file

@ -130,15 +130,15 @@ ConditionTest:
; ;
ConditionConnaissance: ConditionConnaissance:
'connaissance_' connaissance=Nom connaissance=Nom
; ;
NOTConditionConnaissance: NOTConditionConnaissance:
'!' 'connaissance_' connaissance=Nom '!' connaissance=Nom
; ;
ConditionObjet: ConditionObjet:
'objet_' objet=Nom comparateur=Comparateur nombre=INT objet=Nom comparateur=Comparateur nombre=INT
; ;
Comparateur: Comparateur:

6
workspace/game/src/xtext/Game.xtext
View file

@ -130,15 +130,15 @@ ConditionTest:
; ;
ConditionConnaissance: ConditionConnaissance:
'connaissance_' connaissance=Nom connaissance=Nom
; ;
NOTConditionConnaissance: NOTConditionConnaissance:
'!' 'connaissance_' connaissance=Nom '!' connaissance=Nom
; ;
ConditionObjet: ConditionObjet:
'objet_' objet=Nom comparateur=Comparateur nombre=INT objet=Nom comparateur=Comparateur nombre=INT
; ;
Comparateur: Comparateur: