Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
Not Alone
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Anthony ROZEN
Not Alone
Commits
36a23121
Commit
36a23121
authored
Dec 24, 2020
by
Anthony ROZEN
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avancement implementation
parent
ab51c297
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
31 deletions
+35
-31
not-alone-server/src/main/java/fr/univnantes/alma/game/ServeurNotAlone.java
...rc/main/java/fr/univnantes/alma/game/ServeurNotAlone.java
+35
-30
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/Jeton.java
...n/java/fr/univnantes/alma/game/composant/Jeton/Jeton.java
+0
-1
No files found.
not-alone-server/src/main/java/fr/univnantes/alma/game/ServeurNotAlone.java
View file @
36a23121
...
...
@@ -4,6 +4,7 @@ import fr.univnantes.alma.game.composant.Carte.CarteLieu;
import
fr.univnantes.alma.game.composant.Carte.CarteSurvie
;
import
fr.univnantes.alma.game.composant.Carte.CarteTraque
;
import
fr.univnantes.alma.game.composant.GameVariable
;
import
fr.univnantes.alma.game.composant.Jeton.SymboleJeton
;
import
fr.univnantes.alma.game.composant.Joueur.Creature
;
import
fr.univnantes.alma.game.composant.Joueur.Traque
;
import
fr.univnantes.alma.game.composant.Pion.Pion
;
...
...
@@ -422,38 +423,42 @@ public class ServeurNotAlone implements ServeurNotAloneInterface {
creature
.
poserJetonCreature
(
c1
,
null
);
}
System
.
out
.
println
(
"Est ce que vous voulez poser le jeton CIBLE sur 2 cartes adjacente ? (OUI / NON)"
);
reponse
=
sc
.
nextLine
();
if
(
reponse
.
compareTo
(
"OUI"
)
==
0
){
System
.
out
.
println
(
"Sur quel carte Lieu vous voulez poser le jeton CIBLE ? (ex:L'Antre)"
);
carte1
=
sc
.
nextLine
();
c1
=
retournerCarteLieu
(
carte1
);
System
.
out
.
println
(
"avec quel carte adjacente ?"
);
carte2
=
sc
.
nextLine
();
c2
=
retournerCarteLieu
(
carte2
);
creature
.
poserJetonCible
(
c1
,
c2
);
}
else
{
System
.
out
.
println
(
"Sur quel carte Lieu vous voulez poser le jeton CIBLE ? (ex:L'Antre)"
);
carte1
=
sc
.
nextLine
();
c1
=
retournerCarteLieu
(
carte1
);
creature
.
poserJetonCible
(
c1
,
null
);
if
(
carteTraqueJouer
.
getSymbole
()
==
SymboleJeton
.
CIBLE
){
System
.
out
.
println
(
"Est ce que vous voulez poser le jeton CIBLE sur 2 cartes adjacente ? (OUI / NON)"
);
reponse
=
sc
.
nextLine
();
if
(
reponse
.
compareTo
(
"OUI"
)
==
0
){
System
.
out
.
println
(
"Sur quel carte Lieu vous voulez poser le jeton CIBLE ? (ex:L'Antre)"
);
carte1
=
sc
.
nextLine
();
c1
=
retournerCarteLieu
(
carte1
);
System
.
out
.
println
(
"avec quel carte adjacente ?"
);
carte2
=
sc
.
nextLine
();
c2
=
retournerCarteLieu
(
carte2
);
creature
.
poserJetonCible
(
c1
,
c2
);
}
else
{
System
.
out
.
println
(
"Sur quel carte Lieu vous voulez poser le jeton CIBLE ? (ex:L'Antre)"
);
carte1
=
sc
.
nextLine
();
c1
=
retournerCarteLieu
(
carte1
);
creature
.
poserJetonCible
(
c1
,
null
);
}
}
System
.
out
.
println
(
"Est ce que vous voulez poser le jeton ARTEMIA sur 2 cartes adjacente ? (OUI / NON)"
);
reponse
=
sc
.
nextLine
();
if
(
reponse
.
compareTo
(
"OUI"
)
==
0
){
System
.
out
.
println
(
"Sur quel carte Lieu vous voulez poser le jeton ARTEMIA ? (ex:L'Antre)"
);
carte1
=
sc
.
nextLine
();
c1
=
retournerCarteLieu
(
carte1
);
System
.
out
.
println
(
"avec quel carte adjacente ?"
);
carte2
=
sc
.
nextLine
();
c2
=
retournerCarteLieu
(
carte2
);
creature
.
poserJetonArtemia
(
c1
,
c2
);
}
else
{
System
.
out
.
println
(
"Sur quel carte Lieu vous voulez poser le jeton ARTEMIA ? (ex:L'Antre)"
);
carte1
=
sc
.
nextLine
();
c1
=
retournerCarteLieu
(
carte1
);
creature
.
poserJetonArtemia
(
c1
,
null
);
if
((
carteTraqueJouer
.
getSymbole
()
==
SymboleJeton
.
ARTEMIA
)
||
(
plateau
.
getPlateauPion
().
get
(
plateau
.
getPionSecours
().
getPosition
()).
getSymboleJeton
()
==
SymboleJeton
.
ARTEMIA
)){
System
.
out
.
println
(
"Est ce que vous voulez poser le jeton ARTEMIA sur 2 cartes adjacente ? (OUI / NON)"
);
reponse
=
sc
.
nextLine
();
if
(
reponse
.
compareTo
(
"OUI"
)
==
0
){
System
.
out
.
println
(
"Sur quel carte Lieu vous voulez poser le jeton ARTEMIA ? (ex:L'Antre)"
);
carte1
=
sc
.
nextLine
();
c1
=
retournerCarteLieu
(
carte1
);
System
.
out
.
println
(
"avec quel carte adjacente ?"
);
carte2
=
sc
.
nextLine
();
c2
=
retournerCarteLieu
(
carte2
);
creature
.
poserJetonArtemia
(
c1
,
c2
);
}
else
{
System
.
out
.
println
(
"Sur quel carte Lieu vous voulez poser le jeton ARTEMIA ? (ex:L'Antre)"
);
carte1
=
sc
.
nextLine
();
c1
=
retournerCarteLieu
(
carte1
);
creature
.
poserJetonArtemia
(
c1
,
null
);
}
}
}
...
...
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/Jeton.java
View file @
36a23121
package
fr.univnantes.alma.game.composant.Jeton
;
import
fr.univnantes.alma.game.composant.Carte.CarteLieu
;
import
sun.jvm.hotspot.debugger.cdbg.Sym
;
import
java.util.ArrayList
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment