X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=server_%2Fgame.py;h=eee30d9702a4814322254411546bb86b5d4b4b9d;hb=deb2d17307e58864871f2da9bd806f01bfb5fa67;hp=9c264ed019584fdc6fdb009ab5434623bd0cdbdd;hpb=8c827d2cce8c69c55bcf9154ec7c8fc12732c3bf;p=plomrogue2-experiments diff --git a/server_/game.py b/server_/game.py index 9c264ed..eee30d9 100644 --- a/server_/game.py +++ b/server_/game.py @@ -1,6 +1,7 @@ import sys sys.path.append('../') import game_common +import parser class GameError(Exception): @@ -60,7 +61,7 @@ class Task: self.thing = thing self.args = args self.kwargs = kwargs - self.todo = 1 + self.todo = 3 def check(self): if self.name == 'move': @@ -78,6 +79,9 @@ class Task: map_tile = self.thing.world.terrain_map[pos_i] if map_tile != '.': raise GameError('would move into illegal terrain') + for t in self.thing.world.things: + if t.position == test_pos: + raise GameError('would move into other thing') class Thing(game_common.Thing): @@ -85,12 +89,14 @@ class Thing(game_common.Thing): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.task = Task(self, 'wait') + self.last_task_result = None def task_wait(self): - pass + return 'success' def task_move(self, direction): move_pos(direction, self.position) + return 'success' def decide_task(self): if self.position[1] > 1: @@ -110,11 +116,22 @@ class Thing(game_common.Thing): Decrements .task.todo; if it thus falls to <= 0, enacts method whose name is 'task_' + self.task.name and sets .task = None. If is_AI, calls .decide_task to decide a self.task. + + Before doing anything, checks that task is still possible, and aborts + it otherwise (for AI things, decides a new task). """ + try: + self.task.check() + except GameError as e: + self.task = None + self.last_task_result = e + if is_AI: + self.decide_task() + return self.task.todo -= 1 if self.task.todo <= 0: task = getattr(self, 'task_' + self.task.name) - task(*self.task.args, **self.task.kwargs) + self.last_task_result = task(*self.task.args, **self.task.kwargs) self.task = None if is_AI and self.task is None: self.decide_task() @@ -136,9 +153,9 @@ class Commander(): self.world.get_player().set_task('wait') self.proceed() - def cmd_GET_TURN(self, connection_id): - """Send world.turn to caller.""" - self.send_to(connection_id, str(self.world.turn)) + def cmd_GET_GAMESTATE(self, connection_id): + """Send game state jto caller.""" + self.send_gamestate(connection_id) def cmd_ECHO(self, msg, connection_id): """Send msg to caller."""