home · contact · privacy
Persist Thing names, simplify their client info display.
[plomrogue2] / plomrogue / commands.py
index a3d1f4ce685cfabb9f6108ff8bd7f0f154e8434b..8732bf3f02eca9ccff649ec98d4316ab7e99153b 100644 (file)
 from plomrogue.misc import quote
 from plomrogue.errors import GameError
-from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex
+from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex, Map
 
 
 
+# TODO: instead of sending tasks and thing types on request, send them on connection
+
 def cmd_TASKS(game, connection_id):
     tasks = []
     game.io.send('TASKS ' + ','.join(game.tasks.keys()), connection_id)
 cmd_TASKS.argtypes = ''
 
+def cmd_THING_TYPES(game, connection_id):
+    for t_t in game.thing_types.values():
+        game.io.send('THING_TYPE %s %s' % (t_t.get_type(), t_t.symbol_hint),
+                     connection_id)
+cmd_THING_TYPES.argtypes = ''
+
 def cmd_ALL(game, msg, connection_id):
-    import math
+
+    def lower_msg_by_volume(msg, volume):
+        lowered_msg = ''
+        for c in msg:
+            c = c
+            while random.random() > volume * 8:
+                if c.isupper():
+                    c = c.lower()
+                elif c != '.' and c != ' ':
+                    c = '.'
+                else:
+                    c = ' '
+            lowered_msg += c
+        return lowered_msg
+
+    import random
     if not connection_id in game.sessions:
         raise GameError('need to be logged in for this')
-    speaker = game.get_thing(game.sessions[connection_id], False)
+    speaker = game.get_thing(game.sessions[connection_id])
+    n_max = 255
+    map_size = game.map.size_i
+    dijkstra_map = [n_max for i in range(game.map.size_i)]
+    dijkstra_map[game.map.get_position_index(speaker.position)] = 0
+    shrunk = True
+    while shrunk:
+        shrunk = False
+        for i in range(map_size):
+            if game.map.terrain[i] == 'X':
+                continue
+            neighbors = game.map_geometry.get_neighbors_i(i)
+            for direction in [d for d in neighbors if neighbors[d]]:
+                j = neighbors[direction]
+                if dijkstra_map[j] < dijkstra_map[i] - 1:
+                    dijkstra_map[i] = dijkstra_map[j] + 1
+                    shrunk = True
+    #print('DEBUG')
+    #line_to_print = []
+    #x = 0
+    #for n in dijkstra_map:
+    #    line_to_print += ['%3s' % n]
+    #    x += 1
+    #    if x >= game.map.size.x:
+    #        x = 0
+    #        print(' '.join(line_to_print))
     for c_id in game.sessions:
-        listener = game.get_thing(game.sessions[c_id], create_unfound=False)
-        d_y = abs(speaker.position.y - listener.position.y)
-        d_x = abs(speaker.position.x - listener.position.x)
-        d = math.sqrt(d_y ** 2 + d_x ** 2)
-        distance = '(close)' if d < 3 else '(distant)'
+        listener = game.get_thing(game.sessions[c_id])
+        listener_vol = dijkstra_map[game.map.get_position_index(listener.position)]
+        volume = 1 / max(1, listener_vol)
+        lowered_msg = lower_msg_by_volume(msg, volume)
+        lowered_nick = lower_msg_by_volume(speaker.name, volume)
         game.io.send('CHAT ' +
-                     quote('%s %s: %s' % (distance, speaker.nickname, msg)),
+                     quote('(volume: %.2f) %s: %s' % (volume, lowered_nick,
+                                                      lowered_msg)),
                      c_id)
 cmd_ALL.argtypes = 'string'
 
 def cmd_LOGIN(game, nick, connection_id):
-    for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]:
+    for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
         raise GameError('name already in use')
     if connection_id in game.sessions:
         raise GameError('cannot log in twice')
-    t = game.thing_types['player'](game)
+    t = game.thing_types['Player'](game)
     t.position = YX(game.map.size.y // 2, game.map.size.x // 2)
     game.things += [t]  # TODO refactor into Thing.__init__?
+    t.player_char = game.get_next_player_char()
     game.sessions[connection_id] = t.id_
     game.io.send('LOGIN_OK', connection_id)
-    t.nickname = nick
-    game.io.send('CHAT ' + quote(t.nickname + ' entered the map.'))
+    t.name = nick
+    game.io.send('CHAT ' + quote(t.name + ' entered the map.'))
     game.io.send('PLAYER_ID %s' % t.id_, connection_id)
     game.changed = True
 cmd_LOGIN.argtypes = 'string'
 
 def cmd_NICK(game, nick, connection_id):
-    for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]:
+    for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
         raise GameError('name already in use')
     if not connection_id in game.sessions:
         raise GameError('can only rename when already logged in')
     t_id = game.sessions[connection_id]
-    t = game.get_thing(t_id, False)
-    old_nick = t.nickname
-    t.nickname = nick
+    t = game.get_thing(t_id)
+    old_nick = t.name
+    t.name = nick
     game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
     game.changed = True
 cmd_NICK.argtypes = 'string'
@@ -58,20 +108,20 @@ def cmd_GET_GAMESTATE(game, connection_id):
     game.send_gamestate(connection_id)
 cmd_GET_GAMESTATE.argtypes = ''
 
-def cmd_QUERY(game, target_nick, msg, connection_id):
-    if not connection_id in game.sessions:
-        raise GameError('can only query when logged in')
-    t = game.get_thing(game.sessions[connection_id], False)
-    source_nick = t.nickname
-    for t in [t for t in game.things if t.type_ == 'player' and t.nickname == target_nick]:
-        for c_id in game.sessions:
-            if game.sessions[c_id] == t.id_:
-                game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id)
-                game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id)
-                return
-        raise GameError('target user offline')
-    raise GameError('can only query with registered nicknames')
-cmd_QUERY.argtypes = 'string string'
+#def cmd_QUERY(game, target_nick, msg, connection_id):
+#    if not connection_id in game.sessions:
+#        raise GameError('can only query when logged in')
+#    t = game.get_thing(game.sessions[connection_id], False)
+#    source_nick = t.name
+#    for t in [t for t in game.things if t.type_ == 'Player' and t.name == target_nick]:
+#        for c_id in game.sessions:
+#            if game.sessions[c_id] == t.id_:
+#                game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id)
+#                game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id)
+#                return
+#        raise GameError('target user offline')
+#    raise GameError('can only query with registered nicknames')
+#cmd_QUERY.argtypes = 'string string'
 
 def cmd_PING(game, connection_id):
     game.io.send('PONG', connection_id)
@@ -82,8 +132,8 @@ def cmd_TURN(game, n):
 cmd_TURN.argtypes = 'int:nonneg'
 
 def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
-    player = game.get_thing(game.sessions[connection_id], False)
-    if player.fov_stencil[yx] == '.':
+    player = game.get_thing(game.sessions[connection_id])
+    if player.fov_stencil[yx] != '.':
         raise GameError('cannot annotate tile outside field of view')
     if not game.can_do_tile_with_pw(yx, pw):
         raise GameError('wrong password for tile')
@@ -96,8 +146,8 @@ def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
 cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
 
 def cmd_PORTAL(game, yx, msg, pw, connection_id):
-    player = game.get_thing(game.sessions[connection_id], False)
-    if player.fov_stencil[yx] == '.':
+    player = game.get_thing(game.sessions[connection_id])
+    if player.fov_stencil[yx] != '.':
         raise GameError('cannot edit portal on tile outside field of view')
     if not game.can_do_tile_with_pw(yx, pw):
         raise GameError('wrong password for tile')
@@ -120,7 +170,7 @@ def cmd_GOD_PORTAL(game, yx, msg):
 cmd_GOD_PORTAL.argtypes = 'yx_tuple:nonneg string'
 
 def cmd_GET_ANNOTATION(game, yx, connection_id):
-    player = game.get_thing(game.sessions[connection_id], False)
+    player = game.get_thing(game.sessions[connection_id])
     annotation = '(unknown)';
     if player.fov_stencil[yx] == '.':
         annotation = '(none)';
@@ -145,3 +195,26 @@ cmd_MAP_CONTROL_LINE.argtypes = 'int:nonneg string'
 def cmd_MAP_CONTROL_PW(game, tile_class, password):
     game.map_control_passwords[tile_class] = password
 cmd_MAP_CONTROL_PW.argtypes = 'char string'
+
+def cmd_THING(game, yx, thing_type, thing_id):
+    if not thing_type in game.thing_types:
+        raise GameError('illegal thing type %s' % thing_type)
+    if yx.y < 0 or yx.x < 0 or yx.y >= game.map.size.y or yx.x >= game.map.size.x:
+        raise GameError('illegal position %s' % 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=yx)
+    if t_old:
+        game.things[game.things.index(t_old)] = t_new
+    else:
+        game.things += [t_new]
+    game.changed = True
+cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type int:nonneg'
+
+def cmd_THING_NAME(game, thing_id, name):
+    t = game.get_thing(thing_id)
+    if not t:
+        raise GameError('thing of ID %s not found' % thing_id)
+    t.name = name
+cmd_THING_NAME.argtypes = 'int:pos string'