projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into No_movement_mode
[naja.git]
/
naja
/
gameboard.py
diff --git
a/naja/gameboard.py
b/naja/gameboard.py
index 7e8f27323aa54f4e9fa4a05e3b1dae6cbd82a96a..d62684924a514847634707ff038250de5ed5f33f 100644
(file)
--- a/
naja/gameboard.py
+++ b/
naja/gameboard.py
@@
-2,7
+2,7
@@
from random import choice
from naja.constants import(
BITS, DIRECTION_BITS, CONDITION_BITS, PLAYER_DEFAULTS,
from naja.constants import(
BITS, DIRECTION_BITS, CONDITION_BITS, PLAYER_DEFAULTS,
-
MOVE,
ACT, EXAMINE)
+ ACT, EXAMINE)
from naja.player import Player
from naja import actions
from naja.player import Player
from naja import actions
@@
-20,7
+20,7
@@
class GameBoard(object):
self.locations = [item.copy() for item in state['locations']]
self.player = player
self.board_locations = board_locations
self.locations = [item.copy() for item in state['locations']]
self.player = player
self.board_locations = board_locations
- self.player_mode =
MOV
E
+ self.player_mode =
EXAMIN
E
@classmethod
def new_game(cls, locations_definition,
@classmethod
def new_game(cls, locations_definition,
@@
-152,7
+152,7
@@
class GameBoard(object):
if new_mode == self.player_mode:
raise RuntimeError("Inconsistent state. Setting mode %s to itself"
% self.player_mode)
if new_mode == self.player_mode:
raise RuntimeError("Inconsistent state. Setting mode %s to itself"
% self.player_mode)
- elif new_mode in (
MOVE,
ACT, EXAMINE):
+ elif new_mode in (ACT, EXAMINE):
self.player_mode = new_mode
else:
raise RuntimeError("Illegal player mode %s" % self.player_mode)
self.player_mode = new_mode
else:
raise RuntimeError("Illegal player mode %s" % self.player_mode)