X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/form?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=8b1a1b99d58b54505c1a3c89c5752b11f20481cb;hb=74c0ec0247f058b977996f9e1e2d696f3d2d162b;hp=dea07173c6181f2233260823977c95766732bd60;hpb=54d8db95b3bb690b712ec09179922829d0c68a54;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index dea0717..8b1a1b9 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -40,24 +40,21 @@ 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_,
         'status': 'player'
     }
+    game.io.send('PLAYER_ID %s' % t.id_, connection_id)
     game.io.send('LOGIN_OK', connection_id)
     t.name = nick
     game.io.send('CHAT ' + quote(t.name + ' entered the map.'))
-    game.io.send('PLAYER_ID %s' % t.id_, connection_id)
     for s in [s for s in game.things
               if s.type_ == 'SpawnPoint' and s.name == t.name]:
         t.position = s.position
         break
-    game.changed = True
-    game.changed_fovs = True
+    # game.changed = True  # handled by game.add_thing
 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):
@@ -98,7 +95,9 @@ def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
     if not t:
         raise GameError('thing of ID %s not found' % thing_id)
     t.protection = protection_char
-    #game.changed = True
+    game.changed = True
+    # FIXME: pseudo-FOV-change actually
+    game.record_fov_change(t.position)
 cmd_THING_PROTECTION.argtypes = 'int:pos char'
 
 def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
@@ -123,6 +122,8 @@ def cmd_NICK(game, nick, connection_id):
     t.name = nick
     game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
     game.changed = True
+    # FIXME: pseudo-FOV-change actually
+    game.record_fov_change(t.position)
 cmd_NICK.argtypes = 'string'
 
 def cmd_GET_GAMESTATE(game, connection_id):
@@ -169,6 +170,8 @@ def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
         if big_yx not in game.annotations:
             game.annotations[big_yx] = {}
         game.annotations[big_yx][little_yx] = msg
+    # FIXME: pseudo-FOV-change actually
+    game.record_fov_change([big_yx, little_yx])
     game.changed = True
 cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
 
@@ -187,6 +190,8 @@ def cmd_PORTAL(game, yx, msg, pw, connection_id):
         if big_yx not in game.portals:
             game.portals[big_yx] = {}
         game.portals[big_yx][little_yx] = msg
+    # FIXME: pseudo-FOV-change actually
+    game.record_fov_change([big_yx, little_yx])
     game.changed = True
 cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string'
 
@@ -230,17 +235,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.changed = True
-    game.changed_fovs = True
+    game.add_thing(thing_type, (big_yx, little_yx), id_=thing_id)
+    # game.changed = True  handled by add_thing
 cmd_THING.argtypes = 'yx_tuple yx_tuple:nonneg string:thing_type int:nonneg'
 
 def cmd_THING_NAME(game, thing_id, name, pw, connection_id):
@@ -249,9 +245,11 @@ def cmd_THING_NAME(game, thing_id, name, pw, connection_id):
     if not t:
         raise GameError('thing of ID %s not found' % thing_id)
     if not game.can_do_thing_with_pw(t, pw):
-        raise GameError('wrong password for tile')
+        raise GameError('wrong password for thing')
     t.name = name
     game.changed = True
+    # FIXME: pseudo-FOV-change actually
+    game.record_fov_change(t.position)
 cmd_THING_NAME.argtypes = 'int:pos string string'
 
 def cmd_GOD_THING_NAME(game, thing_id, name):
@@ -325,6 +323,8 @@ def cmd_PLAYER_FACE(game, face, connection_id):
         raise GameError('wrong face string length')
     game.faces[t.name] = face
     game.changed = True
+    # FIXME: pseudo-FOV-change actually
+    game.record_fov_change(t.position)
 cmd_PLAYER_FACE.argtypes = 'string'
 
 def cmd_GOD_PLAYER_FACE(game, name, face):