Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Corentin MIMEAU
PolyDefense
Commits
3f40530e
Commit
3f40530e
authored
Dec 08, 2015
by
Mimeau Corentin
Browse files
rectification erreur
parent
0d298e35
Changes
1
Show whitespace changes
Inline
Side-by-side
carte.py
View file @
3f40530e
...
...
@@ -428,25 +428,11 @@ def ecran_principal(ecran, j1, j2, verif_tour, base_1, base_2):
carte
.
liste_tour_1
.
append
(
Constante
.
position
)
tour
=
Tour_feu
(
Constante
.
position
,
verif_tour
)
base_1
.
liste_tour
.
append
(
tour
)
<<<<<<<
HEAD
=======
carte
.
liste_herbe_obstacle
.
append
(
Constante
.
position
)
maj_affichage_tour
(
ecran
,
base_1
.
liste_tour
,
base_2
.
liste_tour
,
herbe_finale
,
verif_tour
)
maj_affichage_argent
(
ecran
,
base_1
,
j1
)
elif
(
u
,
v
)
==
(
22
,
3
):
if
verif_pose_tour
(
ecran
,
carte
,
Constante
.
position
)
==
True
:
couvrir_ecran_ennemie
(
ecran
,
verif_tour
)
if
base_1
.
depenser_argent
(
20
)
!=
"NON"
:
carte
.
liste_tour_1
.
append
(
Constante
.
position
)
tour
=
Tour_glace
(
Constante
.
position
,
verif_tour
)
base_1
.
liste_tour
.
append
(
tour
)
>>>>>>>
43
a6ccbcc5f92e1f86ed5191e4a955d9746f0a04
carte
.
liste_herbe_obstacle
.
append
(
Constante
.
position
)
maj_affichage_tour
(
ecran
,
base_1
.
liste_tour
,
base_2
.
liste_tour
,
herbe_finale
,
verif_tour
)
maj_affichage_argent
(
ecran
,
base_1
,
j1
)
<<<<<<<
HEAD
elif
(
u
,
v
)
==
(
22
,
3
):
if
verif_pose_tour
(
ecran
,
carte
,
Constante
.
position
)
==
True
:
couvrir_ecran_ennemie
(
ecran
,
verif_tour
)
...
...
@@ -454,12 +440,12 @@ def ecran_principal(ecran, j1, j2, verif_tour, base_1, base_2):
carte
.
liste_tour_1
.
append
(
Constante
.
position
)
tour
=
Tour_glace
(
Constante
.
position
,
verif_tour
)
base_1
.
liste_tour
.
append
(
tour
)
carte
.
liste_herbe_obstacle
.
append
(
Constante
.
position
)
maj_affichage_tour
(
ecran
,
base_1
.
liste_tour
,
base_2
.
liste_tour
,
herbe_finale
,
verif_tour
)
maj_affichage_argent
(
ecran
,
base_1
,
j1
)
=======
>>>>>>>
43
a6ccbcc5f92e1f86ed5191e4a955d9746f0a04
elif
verif_tour
==
2
:
if
(
u
,
v
)
==
(
8
,
3
):
if
verif_pose_tour
(
ecran
,
carte
,
Constante
.
position
)
==
True
:
...
...
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