Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Groupe 16
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Paul Ripault
Groupe 16
Commits
d5af7154
Commit
d5af7154
authored
4 years ago
by
Francois DEROUBAIX
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into Francois
parents
4dea711b
fcdb5c34
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/items/Crown.java
+1
-1
1 addition, 1 deletion
src/items/Crown.java
src/main/Affichage.java
+3
-3
3 additions, 3 deletions
src/main/Affichage.java
src/main/Main.java
+3
-1
3 additions, 1 deletion
src/main/Main.java
with
7 additions
and
5 deletions
src/items/Crown.java
+
1
−
1
View file @
d5af7154
...
...
@@ -14,7 +14,7 @@ public class Crown extends Items{
@Override
public
void
usage
(
Joueur
joueur
)
{
//TODO: premi
r
e version, tu prend la couronne tu gagne, ensuite faire de systm
e
de rcu
p
et d'arriver au camp
//TODO: premi
�re
version, tu prend la couronne tu gagne, ensuite faire de syst�m
e d
e r�cup
et
d'arriver au camp
joueur
.
setWin
(
true
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/Affichage.java
+
3
−
3
View file @
d5af7154
...
...
@@ -4,12 +4,12 @@ public class Affichage {
public
static
void
affichage
(
Plateau
plateau
){
final
char
plaine
=
'.'
;
final
char
montagne
=
'
◼
'
;
final
char
inconnu
=
'
~
'
;
final
char
montagne
=
'
Ѧ
'
;
final
char
inconnu
=
'
ࡇ
'
;
for
(
int
i
=
0
;
i
<
plateau
.
getPlateau
().
length
*
5
;
i
++)
{
for
(
int
j
=
0
;
j
<
plateau
.
getPlateau
()[
0
].
length
*
5
;
j
++)
{
if
(
plateau
.
getCase
(
i
,
j
).
getType
()==
Type
.
FORT
)
{
System
.
out
.
print
(
"
F
"
);
System
.
out
.
print
(
"
♜
"
);
}
else
if
(
plateau
.
getCase
(
i
,
j
).
getUnite
()
!=
null
)
{
System
.
out
.
print
(
plateau
.
getCase
(
i
,
j
).
getUnite
().
getSymbol
());
}
else
{
...
...
This diff is collapsed.
Click to expand it.
src/main/Main.java
+
3
−
1
View file @
d5af7154
...
...
@@ -21,8 +21,10 @@ public class Main {
Affichage
.
affichage
(
plateau
);
plateau
.
getCase
(
x
,
y
).
getUnite
().
move
(
Direction
.
HAUT
);
System
.
out
.
println
(
'\n'
);
plateau
.
getCase
(
12
,
0
);
Affichage
.
affichage
(
plateau
);
Menu
();
//Menu();
}
public
static
void
Menu
()
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment