From 5c6d74c07c8e1a05579c2ce85895d512fd6cdd40 Mon Sep 17 00:00:00 2001 From: Simon Cross Date: Sun, 8 Jun 2014 23:13:40 +0200 Subject: [PATCH] Remove player_mode from game state. --- naja/gameboard.py | 16 +--------------- naja/tests/test_gameboard.py | 3 +-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/naja/gameboard.py b/naja/gameboard.py index 894f2b3..0c0d922 100644 --- 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, - ACT, EXAMINE, ROTATION) + ROTATION) from naja.options import options from naja.player import Player from naja import actions @@ -25,7 +25,6 @@ class GameBoard(object): self.puzzle = state.get('puzzle', False) self.player = player self.board_locations = board_locations - self.player_mode = state.get('player_mode', EXAMINE) self.has_cheated = state.get('cheater', options.cheat_enabled) self.clock_count = state.get('clock_count', 0) self.replacement_params = state.get('replacement_params', None) @@ -99,7 +98,6 @@ class GameBoard(object): 'puzzle': self.puzzle, 'player': self.player.export(), 'board_locations': self.export_board_locations(), - 'player_mode': self.player_mode, 'clock_count': self.clock_count, 'replacement_params': self.replacement_params, } @@ -268,18 +266,6 @@ class GameBoard(object): def allow_chess_move(self, chesspiece): self.player.allow_chess_move(chesspiece) - def change_mode(self, new_mode): - """Advance to the next mode""" - if new_mode == self.player_mode: - raise RuntimeError("Inconsistent state. Setting mode %s to itself" - % self.player_mode) - elif new_mode in (ACT, EXAMINE): - self.player_mode = new_mode - if new_mode is EXAMINE: - self.board_update() - else: - raise RuntimeError("Illegal player mode %s" % self.player_mode) - def board_update(self): self.clock_count += 1 for position, location in self.board_locations.iteritems(): diff --git a/naja/tests/test_gameboard.py b/naja/tests/test_gameboard.py index cccd9aa..e5c509a 100644 --- a/naja/tests/test_gameboard.py +++ b/naja/tests/test_gameboard.py @@ -1,6 +1,6 @@ from unittest import TestCase -from naja.constants import BITS, MOVES, EXAMINE +from naja.constants import BITS, MOVES from naja.gameboard import GameBoard, LocationCard from naja.options import parse_args from naja import actions @@ -59,7 +59,6 @@ class TestGameBoard(TestCase): ]}], 'player': board.player.export(), 'puzzle': False, - 'player_mode': EXAMINE, 'replacement_params': None, }) positions = [] -- 2.34.1