X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=3a183b9f08f905062e83a902784c5bf2406c9e48;hb=eadcddf7699d5df683d544531b441332d79b6661;hp=dea07173c6181f2233260823977c95766732bd60;hpb=54d8db95b3bb690b712ec09179922829d0c68a54;p=plomrogue2 diff --git a/plomrogue/commands.py b/plomrogue/commands.py index dea0717..3a183b9 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -40,9 +40,7 @@ def cmd_LOGIN(game, nick, connection_id): raise GameError('name already in use') if game.get_player(connection_id): raise GameError('cannot log in twice') - t = game.thing_types['Player'](game) - t.position = game.spawn_point - game.things += [t] # TODO refactor into Thing.__init__? + t = game.add_thing('Player', game.spawn_point) t.thing_char = game.get_next_player_char() game.sessions[connection_id] = { 'thing_id': t.id_, @@ -57,7 +55,6 @@ def cmd_LOGIN(game, nick, connection_id): t.position = s.position break game.changed = True - game.changed_fovs = True cmd_LOGIN.argtypes = 'string' def cmd_BECOME_ADMIN(game, password, connection_id): @@ -85,7 +82,7 @@ def cmd_SET_TILE_CONTROL(game, yx, control_char, connection_id): map_control = game.get_map(big_yx, 'control') map_control[little_yx] = control_char game.changed = True - game.changed_fovs = True + game.record_fov_change((big_yx, little_yx)) cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char' def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id): @@ -230,17 +227,8 @@ def cmd_THING(game, big_yx, little_yx, thing_type, thing_id): if thing_type not in game.thing_types: raise GameError('illegal thing type %s' % thing_type) _ = game.get_map(big_yx) - t_old = None - if thing_id > 0: - t_old = game.get_thing(thing_id) - t_new = game.thing_types[thing_type](game, id_=thing_id, position=(big_yx, - little_yx)) - if t_old: - game.things[game.things.index(t_old)] = t_new - else: - game.things += [t_new] + game.add_thing(thing_type, (big_yx, little_yx), id_=thing_id) game.changed = True - game.changed_fovs = True cmd_THING.argtypes = 'yx_tuple yx_tuple:nonneg string:thing_type int:nonneg' def cmd_THING_NAME(game, thing_id, name, pw, connection_id):