Add basic non-player things system.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 8ec6f524d22e8283ba13fc47424dc4e18352de2d..1c59abfd0b4ca9e4bcb82351297cf1bab59c321b 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -4,11 +4,19 @@ 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):
 
     def lower_msg_by_volume(msg, volume):
@@ -28,7 +36,7 @@ def cmd_ALL(game, msg, connection_id):
     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)]
@@ -55,7 +63,7 @@ def cmd_ALL(game, msg, connection_id):
     #        x = 0
     #        print(' '.join(line_to_print))
     for c_id in game.sessions:
-        listener = game.get_thing(game.sessions[c_id], create_unfound=False)
+        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)
@@ -67,11 +75,11 @@ def cmd_ALL(game, msg, connection_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.nickname == 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__?
     game.sessions[connection_id] = t.id_
@@ -83,12 +91,12 @@ def cmd_LOGIN(game, nick, connection_id):
 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.nickname == 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)
+    t = game.get_thing(t_id)
     old_nick = t.nickname
     t.nickname = nick
     game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
@@ -104,7 +112,7 @@ cmd_GET_GAMESTATE.argtypes = ''
 #        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 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)
@@ -123,7 +131,7 @@ 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)
+    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):
@@ -137,7 +145,7 @@ 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)
+    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):
@@ -161,7 +169,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)';
@@ -186,3 +194,19 @@ 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'