X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fplomrogue%2Fcommands.py;h=7eecf23b77a7e2fb515674626a99f33f72389855;hb=ecf3799b03f0a9098956d529f26be54f37c6534b;hp=35ced5cb0314d89cea9fbf51fbd3a9db7dad2cd9;hpb=115bcd418a32a8c0525f6989b2a78c06d64d3198;p=plomrogue2-experiments diff --git a/new/plomrogue/commands.py b/new/plomrogue/commands.py index 35ced5c..7eecf23 100644 --- a/new/plomrogue/commands.py +++ b/new/plomrogue/commands.py @@ -1,23 +1,41 @@ -from plomrogue.misc import quote, stringify_yx +from plomrogue.misc import quote def cmd_GEN_WORLD(game, yx, seed): - game.world.make_new(yx, seed) -cmd_GEN_WORLD.argtypes = 'yx_tuple:pos string' + game.make_new_world(yx, seed) +cmd_GEN_WORLD.argtypes = 'yx_tuple:pos int:nonneg' def cmd_GET_GAMESTATE(game, connection_id): """Send game state to caller.""" game.send_gamestate(connection_id) -def cmd_MAP(game, yx): - """Create new map of size yx and only '?' cells.""" - game.world.new_map(yx) -cmd_MAP.argtypes = 'yx_tuple:pos' +def cmd_SEED(game, seed): + game.rand.prngod_seed = seed +cmd_SEED.argtypes = 'int:nonneg' + +def cmd_MAP_SIZE(game, size): + game.map_size = size +cmd_MAP_SIZE.argtypes = 'yx_tuple:pos' + +def cmd_MAP(game, map_pos, awakeness): + """Ensure (possibly empty/'?'-filled) map at position map_pos. + + Awakeness > 0 puts the map into the player's reality bubble. + + """ + m = game.get_map(map_pos) + m.awake = awakeness +cmd_MAP.argtypes = 'yx_tuple int:nonneg' + +def cmd_MAP_STATS(game, map_pos, type_, population, health): + m = game.get_map(map_pos) + m.stats[type_] = {'population': population, 'health': health} +cmd_MAP_STATS = 'yx_tuple string:thingtype int:nonneg int:nonneg' def cmd_THING_TYPE(game, i, type_): - t_old = game.world.get_thing(i) - t_new = game.thing_types[type_](game.world, i) + t_old = game.get_thing(i, create_unfound=True) + t_new = game.thing_types[type_](game, i) #attr_names_of_old = [name for name in dir(t_old) where name[:2] != '__'] #attr_names_of_new = [name for name in dir(t_new) where name[:2] != '__'] #class_new = type(t_new) @@ -32,41 +50,59 @@ def cmd_THING_TYPE(game, i, type_): # continue # setattr(t_new, attr_name, attr_old) t_new.position = t_old.position - t_old_index = game.world.things.index(t_old) - game.world.things[t_old_index] = t_new + t_new.in_inventory = t_old.in_inventory + t_old_index = game.things.index(t_old) + game.things[t_old_index] = t_new cmd_THING_TYPE.argtypes = 'int:nonneg string:thingtype' -def cmd_THING_POS(game, i, yx): - t = game.world.get_thing(i) - t.position = list(yx) -cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg' +def cmd_THING_POS(game, i, big_yx, small_yx): + t = game.get_thing(i, create_unfound=True) + t.position = (big_yx, small_yx) +cmd_THING_POS.argtypes = 'int:nonneg yx_tuple yx_tuple:nonneg' def cmd_THING_INVENTORY(game, id_, ids): - t = game.world.get_thing(id_) - t.inventory = [ids] # TODO: test whether valid IDs -cmd_THING_INVENTORY.argtypes = 'int:nonneg, seq:int:nonneg' + carrier = game.get_thing(id_, create_unfound=True) + carrier.inventory = ids + for id_ in ids: + t = game.get_thing(id_, create_unfound=True) + t.in_inventory = True + t.position = carrier.position +cmd_THING_INVENTORY.argtypes = 'int:nonneg seq:int:nonneg' + +def cmd_THING_HEALTH(game, id_, health): + t = game.get_thing(id_, create_unfound=True) + t.health = health +cmd_THING_HEALTH.argtypes = 'int:nonneg int:nonneg' + +def cmd_GET_PICKABLE_ITEMS(game, connection_id): + pickable_ids = game.player.get_pickable_items() + if len(pickable_ids) > 0: + game.io.send('PICKABLE_ITEMS %s' % + ','.join([str(id_) for id_ in pickable_ids])) + else: + game.io.send('PICKABLE_ITEMS ,') -def cmd_TERRAIN_LINE(game, y, terrain_line): - game.world.map_.set_line(y, terrain_line) -cmd_TERRAIN_LINE.argtypes = 'int:nonneg string' +def cmd_TERRAIN_LINE(game, big_yx, y, terrain_line): + game.maps[big_yx].set_line(y, terrain_line) +cmd_TERRAIN_LINE.argtypes = 'yx_tuple int:nonneg string' def cmd_PLAYER_ID(game, id_): # TODO: test whether valid thing ID - game.world.player_id = id_ + game.player_id = id_ cmd_PLAYER_ID.argtypes = 'int:nonneg' def cmd_TURN(game, n): - game.world.turn = n + game.turn = n cmd_TURN.argtypes = 'int:nonneg' def cmd_SWITCH_PLAYER(game): - game.world.player.set_task('WAIT') - thing_ids = [t.id_ for t in game.world.things] - player_index = thing_ids.index(game.world.player.id_) + game.player.set_task('WAIT') + thing_ids = [t.id_ for t in game.things] + player_index = thing_ids.index(game.player.id_) if player_index == len(thing_ids) - 1: - game.world.player_id = thing_ids[0] + game.player_id = thing_ids[0] else: - game.world.player_id = thing_ids[player_index + 1] + game.player_id = thing_ids[player_index + 1] game.proceed() def cmd_SAVE(game): @@ -76,17 +112,30 @@ def cmd_SAVE(game): save_file_name = game.io.game_file_name + '.save' with open(save_file_name, 'w') as f: - write(f, 'TURN %s' % game.world.turn) - write(f, 'MAP ' + stringify_yx(game.world.map_.size)) - for y, line in game.world.map_.lines(): - write(f, 'TERRAIN_LINE %5s %s' % (y, quote(line))) - for thing in game.world.things: + write(f, 'TURN %s' % game.turn) + write(f, 'SEED %s' % game.rand.prngod_seed) + write(f, 'MAP_SIZE %s' % (game.map_size,)) + for map_pos in game.maps: + m = game.maps[map_pos] + write(f, 'MAP %s %s' % (map_pos, m.awake)) + for t_type in m.stats: + write(f, 'MAP_STATS %s %s %s %s' % + (map_pos, t_type, m.stats[t_type]['population'], + m.stats[t_type]['health'])) + for map_pos in game.maps: + for y, line in game.maps[map_pos].lines(): + write(f, 'TERRAIN_LINE %s %5s %s' % (map_pos, y, quote(line))) + for thing in game.things: write(f, 'THING_TYPE %s %s' % (thing.id_, thing.type_)) - write(f, 'THING_POS %s %s' % (thing.id_, - stringify_yx(thing.position))) - write(f, 'THING_INVENTORY %s %s' % (thing.id_, - ','.join([str(i) for i in - thing.inventory]))) + write(f, 'THING_POS %s %s %s' % (thing.id_, thing.position[0], + thing.position[1])) + if hasattr(thing, 'health'): + write(f, 'THING_HEALTH %s %s' % (thing.id_, thing.health)) + if len(thing.inventory) > 0: + write(f, 'THING_INVENTORY %s %s' % + (thing.id_,','.join([str(i) for i in thing.inventory]))) + else: + write(f, 'THING_INVENTORY %s ,' % thing.id_) if hasattr(thing, 'task'): task = thing.task if task is not None: @@ -95,5 +144,5 @@ def cmd_SAVE(game): if game.tasks[k] == task.__class__][0] write(f, 'SET_TASK:%s %s %s %s' % (task_name, thing.id_, task.todo, task_args)) - write(f, 'PLAYER_ID %s' % game.world.player_id) + write(f, 'PLAYER_ID %s' % game.player_id) cmd_SAVE.dont_save = True