Retouche sur conf et commentaires
This commit is contained in:
parent
29187d1046
commit
bf50b9bc20
|
@ -13,12 +13,13 @@ Ce fichier fait partie du projet `roboc`
|
||||||
MAP_DIRECTORY = 'cartes/' # repertoire des fichiers carte
|
MAP_DIRECTORY = 'cartes/' # repertoire des fichiers carte
|
||||||
MAP_EXTENTION = '.txt' # extention des fichiers carte
|
MAP_EXTENTION = '.txt' # extention des fichiers carte
|
||||||
SAVED_GAME_FILENAME = '.backup' # fichier de sauvegarde
|
SAVED_GAME_FILENAME = '.backup' # fichier de sauvegarde
|
||||||
DIRECTIONS = ['n', 'e', 's', 'o'] # commandes de deplacement
|
DIRECTIONS = ['n', 's', 'e', 'o'] # commandes de deplacement
|
||||||
MAZE_ELEMENTS = {'wall': 'O', # elements dispo dans le labyrinthe
|
MAZE_ELEMENTS = {'wall': 'O', # elements dispo dans le labyrinthe
|
||||||
'door': '.',
|
'door': '.',
|
||||||
'exit': 'U',
|
'exit': 'U',
|
||||||
'robo': 'X'}
|
'robo': 'X',
|
||||||
MOVE_TO_STATUS = ['bad', 'wall', 'exit', 'door', 'ok']
|
'trace': ' '}
|
||||||
|
MOVE_STATUS = ['bad', 'wall', 'exit', 'door', 'ok']
|
||||||
|
|
||||||
ERR_ = "#!@?# Oups… "
|
ERR_ = "#!@?# Oups… "
|
||||||
ERR_MAP_FILE = ERR_ + "carte «{}» inaccessible!"
|
ERR_MAP_FILE = ERR_ + "carte «{}» inaccessible!"
|
||||||
|
|
30
roboc/map.py
30
roboc/map.py
|
@ -8,8 +8,7 @@ Ce fichier fait partie du projet `roboc`
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from configuration import MAZE_ELEMENTS, ERR_MAP_FILE, MIN_MAP_SIDE, \
|
from configuration import *
|
||||||
ERR_MAP_SIZE, ERR_MAP_ROBO, MOVE_TO_STATUS
|
|
||||||
|
|
||||||
|
|
||||||
class Map:
|
class Map:
|
||||||
|
@ -34,12 +33,6 @@ class Map:
|
||||||
>>> print(NoRoboMap.status_message)
|
>>> print(NoRoboMap.status_message)
|
||||||
#!@?# Oups… robo est introuvable sur la carte «cartes/sans_robo.txt»!
|
#!@?# Oups… robo est introuvable sur la carte «cartes/sans_robo.txt»!
|
||||||
|
|
||||||
>>> print("_data_text: {}".format(TestMap._data_text))
|
|
||||||
_data_text: O1234
|
|
||||||
abcde
|
|
||||||
ABCDE
|
|
||||||
zyXwv
|
|
||||||
|
|
||||||
>>> print("_column_nb: {}".format(TestMap._column_nb))
|
>>> print("_column_nb: {}".format(TestMap._column_nb))
|
||||||
_column_nb: 5
|
_column_nb: 5
|
||||||
|
|
||||||
|
@ -49,14 +42,8 @@ class Map:
|
||||||
>>> print("_init_robo_position: {}".format(TestMap._init_robo_position))
|
>>> print("_init_robo_position: {}".format(TestMap._init_robo_position))
|
||||||
_init_robo_position: 20
|
_init_robo_position: 20
|
||||||
|
|
||||||
>>> print("_robo_position: {}".format(TestMap._robo_position))
|
|
||||||
_robo_position: 20
|
|
||||||
|
|
||||||
>>> type(TestMap._data_text)
|
|
||||||
<class 'str'>
|
|
||||||
|
|
||||||
>>> TestMap.map_print()
|
>>> TestMap.map_print()
|
||||||
O1234
|
01234
|
||||||
abcde
|
abcde
|
||||||
ABCDE
|
ABCDE
|
||||||
zyXwv
|
zyXwv
|
||||||
|
@ -117,6 +104,7 @@ class Map:
|
||||||
self.status = False
|
self.status = False
|
||||||
self.status_message = ERR_MAP_FILE.format(map_file)
|
self.status_message = ERR_MAP_FILE.format(map_file)
|
||||||
|
|
||||||
|
# TODO est-ce utile de conserver cette methode?
|
||||||
def __getattr__(self, name):
|
def __getattr__(self, name):
|
||||||
"""
|
"""
|
||||||
Si un attribut manque a l'appel (_robo_position ou
|
Si un attribut manque a l'appel (_robo_position ou
|
||||||
|
@ -133,16 +121,16 @@ class Map:
|
||||||
Deplace le «robo» sur la carte
|
Deplace le «robo» sur la carte
|
||||||
|
|
||||||
:param move: mouvement souhaite
|
:param move: mouvement souhaite
|
||||||
:return: key in MOVE_TO_STATUS
|
:return: key in MOVE_STATUS
|
||||||
"""
|
"""
|
||||||
# decompose le move
|
# decompose le mouvement
|
||||||
direction = move[0]
|
direction = move[0]
|
||||||
distance = move[1:]
|
distance = move[1:]
|
||||||
stop = False
|
stop = False
|
||||||
|
|
||||||
# direction non conforme
|
# direction non conforme
|
||||||
if direction not in DIRECTIONS:
|
if direction not in DIRECTIONS:
|
||||||
move_to_status = 0
|
move_status = 0
|
||||||
|
|
||||||
# move possible
|
# move possible
|
||||||
else:
|
else:
|
||||||
|
@ -158,11 +146,9 @@ class Map:
|
||||||
else:
|
else:
|
||||||
distance -= 1
|
distance -= 1
|
||||||
|
|
||||||
# effectue le move et met a jour la carte
|
# effectue le mouvement
|
||||||
|
|
||||||
move_to_status =
|
return move_status
|
||||||
|
|
||||||
return move_to_status
|
|
||||||
|
|
||||||
def restore_backup(self, position):
|
def restore_backup(self, position):
|
||||||
""" Charge une carte issue d'une sauvegarde """
|
""" Charge une carte issue d'une sauvegarde """
|
||||||
|
|
Loading…
Reference in New Issue
Block a user