X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=server_%2Fgame.py;h=958bdc8c7d8a5caaf43e88234a0c62b413b2728e;hb=6237227d771fa5b4cfbcdffb8c74457e2d406bb1;hp=df6a9f24a9314c41ae32ec38292ab8ece824425a;hpb=70da7de2d179e893309491c1e8f31e0e868b7b42;p=plomrogue2-experiments diff --git a/server_/game.py b/server_/game.py index df6a9f2..958bdc8 100644 --- a/server_/game.py +++ b/server_/game.py @@ -68,53 +68,109 @@ class World(game_common.World): class Task: - def __init__(self, thing, name, args=(), kwargs={}): + def __init__(self, thing, name, args=()): self.name = name self.thing = thing self.args = args - self.kwargs = kwargs self.todo = 3 def check(self): - if self.name == 'move': - if len(self.args) > 0: - direction = self.args[0] - else: - direction = self.kwargs['direction'] - test_pos = self.thing.world.map_.move(self.thing.position, direction) + if self.name == 'MOVE': + test_pos = self.thing.world.map_.move(self.thing.position, self.args[0]) if self.thing.world.map_[test_pos] != '.': - raise GameError('would move into illegal terrain') + raise GameError(str(self.thing.id_) + + ' would move into illegal terrain') for t in self.thing.world.things: if t.position == test_pos: - raise GameError('would move into other thing') + raise GameError(str(self.thing.id_) + + ' would move into other thing') class Thing(game_common.Thing): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - self.task = Task(self, 'wait') + self.task = Task(self, 'WAIT') self.last_task_result = None self._stencil = None - def task_wait(self): + def task_WAIT(self): return 'success' - def task_move(self, direction): + def task_MOVE(self, direction): self.position = self.world.map_.move(self.position, direction) return 'success' + task_MOVE.argtypes = 'string:direction' + + def move_towards_target(self, target): + dijkstra_map = type(self.world.map_)(self.world.map_.size) + n_max = 256 + dijkstra_map.terrain = [n_max for i in range(dijkstra_map.size_i)] + dijkstra_map[target] = 0 + shrunk = True + while shrunk: + shrunk = False + for pos in dijkstra_map: + if self.world.map_[pos] != '.': + continue + neighbors = dijkstra_map.get_neighbors(pos) + for yx in neighbors: + if yx is not None and dijkstra_map[yx] < dijkstra_map[pos] - 1: + dijkstra_map[pos] = dijkstra_map[yx] + 1 + shrunk = True + #with open('log', 'a') as f: + # f.write('---------------------------------\n') + # for y, line in dijkstra_map.lines(): + # for val in line: + # if val < 10: + # f.write(str(val)) + # elif val == 256: + # f.write('x') + # else: + # f.write('~') + # f.write('\n') + neighbors = dijkstra_map.get_neighbors(self.position) + n = n_max + dirs = dijkstra_map.get_directions() + #print('DEBUG dirs', dirs) + #print('DEBUG neighbors', neighbors) + #debug_scores = [] + #for pos in neighbors: + # if pos is None: + # debug_scores += [9000] + # else: + # debug_scores += [dijkstra_map[pos]] + #print('DEBUG debug_scores', debug_scores) + direction = None + for i_dir in range(len(neighbors)): + pos = neighbors[i_dir] + if pos is not None and dijkstra_map[pos] < n: + n = dijkstra_map[pos] + direction = dirs[i_dir] + #print('DEBUG result', direction) + if direction: + self.set_task('MOVE', (direction,)) + #self.world.game.io.send('would move ' + direction) def decide_task(self): - #if self.position[1] > 1: - # self.set_task('move', 'LEFT') - #elif self.position[1] < 3: - # self.set_task('move', 'RIGHT') - #else: - self.set_task('wait') + visible_things = self.get_visible_things() + target = None + for t in visible_things: + if t.type_ == 'human': + target = t.position + break + if target is not None: + try: + self.move_towards_target(target) + return + except GameError: + pass + self.set_task('WAIT') + - def set_task(self, task_name, *args, **kwargs): - self.task = Task(self, task_name, args, kwargs) - self.task.check() + def set_task(self, task_name, args=()): + self.task = Task(self, task_name, args) + self.task.check() # will throw GameError if necessary def proceed(self, is_AI=True): """Further the thing in its tasks. @@ -135,15 +191,21 @@ class Thing(game_common.Thing): self.task = None self.last_task_result = e if is_AI: - self.decide_task() + try: + self.decide_task() + except GameError: + self.set_task('WAIT') return self.task.todo -= 1 if self.task.todo <= 0: task = getattr(self, 'task_' + self.task.name) - self.last_task_result = task(*self.task.args, **self.task.kwargs) + self.last_task_result = task(*self.task.args) self.task = None if is_AI and self.task is None: - self.decide_task() + try: + self.decide_task() + except GameError: + self.set_task('WAIT') def get_stencil(self): if self._stencil is not None: @@ -258,20 +320,15 @@ class Game(game_common.CommonCommandsMixin): self.send_gamestate() self.pool_result = self.pool.map_async(fib, (35, 35)) - def cmd_MOVE(self, direction): - """Set player task to 'move' with direction arg, finish player turn.""" - import parser - legal_directions = self.world.map_.get_directions() - if direction not in legal_directions: - raise parser.ArgError('Move argument must be one of: ' + - ', '.join(legal_directions)) - self.world.get_player().set_task('move', direction=direction) - self.proceed() - cmd_MOVE.argtypes = 'string' - - def cmd_WAIT(self): - """Set player task to 'wait', finish player turn.""" - self.world.get_player().set_task('wait') + def cmd_SWITCH_PLAYER(self): + player = self.world.get_player() + player.set_task('WAIT') + thing_ids = [t.id_ for t in self.world.things] + player_index = thing_ids.index(player.id_) + if player_index == len(thing_ids) - 1: + self.world.player_id = thing_ids[0] + else: + self.world.player_id = thing_ids[player_index + 1] self.proceed() def cmd_GET_GAMESTATE(self, connection_id): @@ -293,9 +350,38 @@ class Game(game_common.CommonCommandsMixin): cmd_TERRAIN_LINE.argtypes = 'int:nonneg string' def cmd_GEN_WORLD(self, geometry, yx, seed): - legal_grids = self.map_manager.get_map_geometries() - if geometry not in legal_grids: - raise ArgError('First map argument must be one of: ' + - ', '.join(legal_grids)) self.world.make_new(geometry, yx, seed) - cmd_GEN_WORLD.argtypes = 'string yx_tuple:pos string' + cmd_GEN_WORLD.argtypes = 'string:geometry yx_tuple:pos string' + + def get_command_signature(self, command_name): + from functools import partial + + def cmd_TASK_colon(task_name, *args): + self.world.get_player().set_task(task_name, args) + self.proceed() + + method = None + argtypes = '' + task_prefix = 'TASK:' + if command_name[:len(task_prefix)] == task_prefix: + task_name = command_name[len(task_prefix):] + task_method_candidate = 'task_' + task_name + if hasattr(Thing, task_method_candidate): + method = partial(cmd_TASK_colon, task_name) + task_method = getattr(Thing, task_method_candidate) + if hasattr(task_method, 'argtypes'): + argtypes = task_method.argtypes + return method, argtypes + method_candidate = 'cmd_' + command_name + if hasattr(self, method_candidate): + method = getattr(self, method_candidate) + if hasattr(method, 'argtypes'): + argtypes = method.argtypes + return method, argtypes + + def get_string_options(self, string_option_type): + if string_option_type == 'geometry': + return self.map_manager.get_map_geometries() + elif string_option_type == 'direction': + return self.world.map_.get_directions() + return None