home · contact · privacy
Add toilets, and terrain type tags.
[plomrogue2] / plomrogue / commands.py
index daa43576cd7181ed4e285e3a389abf7dce0b5bbd..49312eeff129006a7755bee3ed4645088eaacf5e 100644 (file)
@@ -1,5 +1,6 @@
 from plomrogue.misc import quote
 from plomrogue.errors import GameError, ArgError
+from plomrogue.misc import Terrain
 
 
 
@@ -16,15 +17,35 @@ def cmd_THING_TYPES(game, connection_id):
 cmd_THING_TYPES.argtypes = ''
 
 def cmd_TERRAINS(game, connection_id):
-    for t in game.terrains.keys():
-        game.io.send('TERRAIN %s %s' % (quote(t), quote(game.terrains[t])),
-                     connection_id)
+    for t in game.terrains.values():
+        game.io.send('TERRAIN %s %s' % (quote(t.character),
+                                        quote(t.description)), connection_id)
 cmd_TERRAINS.argtypes = ''
 
+def cmd_TERRAIN(game, character, description,
+                blocks_light, blocks_sound, blocks_movement):
+    game.terrains[character] = Terrain(character, description, blocks_light,
+                                       blocks_sound, blocks_movement)
+cmd_TERRAIN.argtypes = 'char string bool bool bool'
+
+def cmd_TERRAIN_TAG(game, character, tag):
+    if not character in game.terrains:
+        raise GameError('terrain does not exist: %s' % character)
+    game.terrains[character].tags.add(tag)
+cmd_TERRAIN_TAG.argtypes = 'char string'
+
 def cmd_ALL(game, msg, connection_id):
     speaker = game.get_player(connection_id)
     if not speaker:
         raise GameError('need to be logged in for this')
+    if speaker.drunk > 0:
+        import random
+        drunken_msg = ''
+        for c in msg:
+            if random.random() > 0.85:
+                c = random.choice(['l', 'll', 'n', 'nhg', 'w', 'wl', 'bw'])
+            drunken_msg += c
+        msg = drunken_msg
     speaker.sound(speaker.name, msg)
 cmd_ALL.argtypes = 'string'
 
@@ -36,31 +57,32 @@ def cmd_SPAWN_POINT(game, big_yx, little_yx):
 cmd_SPAWN_POINT.argtypes = 'yx_tuple yx_tuple:nonneg'
 
 def cmd_LOGIN(game, nick, connection_id):
+    nick = nick.strip()
+    if len(nick) == 0:
+        raise GameError('empty name')
     for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
         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.name = nick
     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 = True  # handled by game.add_thing
 cmd_LOGIN.argtypes = 'string'
 
 def cmd_BECOME_ADMIN(game, password, connection_id):
-    player = game.thing_types['Player'](game)
+    player = game.get_player(connection_id)
     if not player:
         raise GameError('need to be logged in for this')
     if password in game.admin_passwords:
@@ -84,20 +106,21 @@ 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.record_change((big_yx, little_yx), 'fov')
 cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char'
 
-def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
+def cmd_THING_PROTECTION(game, protection_char, connection_id):
     player = game.get_player(connection_id)
     if not player:
         raise GameError('need to be logged in for this')
     if not game.sessions[connection_id]['status'] == 'admin':
         raise GameError('need to be admin for this')
-    t = game.get_thing(thing_id)
-    if not t:
-        raise GameError('thing of ID %s not found' % thing_id)
-    t.protection = protection_char
-    #game.changed = True
-cmd_THING_PROTECTION.argtypes = 'int:pos char'
+    if not player.carrying:
+        raise GameError('need to carry a thing to protect it')
+    player.carrying.protection = protection_char
+    game.changed = True
+    game.record_change(player.carrying.position, 'other')
+cmd_THING_PROTECTION.argtypes = 'char'
 
 def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
     player = game.get_player(connection_id)
@@ -108,10 +131,12 @@ def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
     if tile_class == '.':
         raise GameError('tile class "." must remain unprotected')
     game.map_control_passwords[tile_class] = password
-    #game.changed = True
 cmd_SET_MAP_CONTROL_PASSWORD.argtypes = 'char string'
 
 def cmd_NICK(game, nick, connection_id):
+    nick = nick.strip()
+    if len(nick) == 0:
+        raise GameError('empty name')
     for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
         raise GameError('name already in use')
     t = game.get_player(connection_id)
@@ -121,6 +146,7 @@ def cmd_NICK(game, nick, connection_id):
     t.name = nick
     game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
     game.changed = True
+    game.record_change(t.position, 'other')
 cmd_NICK.argtypes = 'string'
 
 def cmd_GET_GAMESTATE(game, connection_id):
@@ -167,6 +193,7 @@ 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
+    game.record_change([big_yx, little_yx], 'other')
     game.changed = True
 cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
 
@@ -185,6 +212,7 @@ 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
+    game.record_change([big_yx, little_yx], 'other')
     game.changed = True
 cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string'
 
@@ -192,14 +220,14 @@ def cmd_GOD_ANNOTATE(game, big_yx, little_yx, msg):
     if big_yx not in game.annotations:
         game.annotations[big_yx] = {}
     game.annotations[big_yx][little_yx] = msg
-    game.changed = True
+    #game.changed = True
 cmd_GOD_ANNOTATE.argtypes = 'yx_tuple yx_tuple:nonneg string'
 
 def cmd_GOD_PORTAL(game, big_yx, little_yx, msg):
     if big_yx not in game.portals:
         game.portals[big_yx] = {}
     game.portals[big_yx][little_yx] = msg
-    game.changed = True
+    #game.changed = True
 cmd_GOD_PORTAL.argtypes = 'yx_tuple yx_tuple:nonneg string'
 
 def cmd_MAP_LINE(game, big_yx, y, line):
@@ -213,6 +241,7 @@ def cmd_MAP(game, geometry, size):
     if geometry == 'Hex':
         map_geometry_class = MapGeometryHex
     game.new_world(map_geometry_class(size))
+    game.terrains = {}
 cmd_MAP.argtypes = 'string:map_geometry yx_tuple:pos'
 
 def cmd_MAP_CONTROL_LINE(game, big_yx, y, line):
@@ -228,28 +257,27 @@ 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.add_thing(thing_type, (big_yx, little_yx), id_=thing_id)
 cmd_THING.argtypes = 'yx_tuple yx_tuple:nonneg string:thing_type int:nonneg'
 
-def cmd_THING_NAME(game, thing_id, name, pw, connection_id):
-    # TODO check if thing in FOV
-    t = game.get_thing(thing_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')
-    t.name = name
+def cmd_THING_NAME(game, name, pw, connection_id):
+    player = game.get_player(connection_id)
+    if not player:
+        raise GameError('need to be logged in for this')
+    if not player.carrying:
+        raise GameError('need to carry a thing to rename it')
+    if not game.can_do_thing_with_pw(player.carrying, pw):
+        raise GameError('wrong password for thing')
+    if name == ' ':
+        if hasattr(player.carrying.__class__, 'name'):
+            raise GameError('cannot un-name things of this type')
+        if hasattr(player.carrying, 'name'):
+            del player.carrying.name
+    else:
+        player.carrying.name = name
     game.changed = True
-cmd_THING_NAME.argtypes = 'int:pos string string'
+    game.record_change(player.carrying.position, 'other')
+cmd_THING_NAME.argtypes = 'string string'
 
 def cmd_GOD_THING_NAME(game, thing_id, name):
     t = game.get_thing(thing_id)
@@ -271,9 +299,7 @@ def cmd_THING_DOOR_CLOSED(game, thing_id):
         raise GameError('thing of ID %s not found' % thing_id)
     if not t.type_ == 'Door':
         raise GameError('thing of ID %s not door' % thing_id)
-    t.blocking = True
-    t.portable = False
-    t.thing_char = '#'
+    t.close()
 cmd_THING_DOOR_CLOSED.argtypes = 'int:pos'
 
 def cmd_THING_MUSICPLAYER_SETTINGS(game, thing_id, playing, index, repeat):
@@ -313,3 +339,60 @@ def cmd_THING_INSTALLED(game, thing_id):
         raise GameError('thing of ID %s not installable' % thing_id)
     t.install()
 cmd_THING_INSTALLED.argtypes = 'int:pos'
+
+def cmd_PLAYER_FACE(game, face, connection_id):
+    t = game.get_player(connection_id)
+    if not t:
+        raise GameError('can only draw face when already logged in')
+    if len(face) != 18:
+        raise GameError('wrong face string length')
+    game.faces[t.name] = face
+    game.changed = True
+    game.record_change(t.position, 'other')
+cmd_PLAYER_FACE.argtypes = 'string'
+
+def cmd_PLAYER_HAT(game, hat, connection_id):
+    t = game.get_player(connection_id)
+    if not t:
+        raise GameError('can only edit hat when already logged in')
+    if not t.name in game.hats:
+        raise GameError('not currently wearing an editable hat')
+    if len(hat) != 18:
+        raise GameError('wrong hat string length')
+    legal_chars = t.get_cookie_chars()
+    for c in hat:
+        if c not in legal_chars:
+            raise GameError('used illegal character: "%s" – '
+                            'allowed characters: %s'
+                            % (c, legal_chars))
+    game.hats[t.name] = hat
+    game.changed = True
+    game.record_change(t.position, 'other')
+cmd_PLAYER_HAT.argtypes = 'string'
+
+def cmd_GOD_PLAYER_FACE(game, name, face):
+    if len(face) != 18:
+        raise GameError('wrong face string length')
+    game.faces[name] = face
+cmd_GOD_PLAYER_FACE.argtypes = 'string string'
+
+def cmd_GOD_PLAYER_HAT(game, name, hat):
+    if len(hat) != 18:
+        raise GameError('wrong hat string length')
+    game.hats[name] = hat
+cmd_GOD_PLAYER_HAT.argtypes = 'string string'
+
+def cmd_GOD_PLAYERS_HAT_CHARS(game, name, hat_chars):
+    game.players_hat_chars[name] = hat_chars
+cmd_GOD_PLAYERS_HAT_CHARS.argtypes = 'string string'
+
+def cmd_THING_HAT_DESIGN(game, thing_id, design):
+    if len(design) != 18:
+        raise GameError('hat design of wrong length')
+    t = game.get_thing(thing_id)
+    if not t:
+        raise GameError('thing of ID %s not found' % thing_id)
+    if t.type_ != 'Hat':
+        raise GameError('thing of ID %s not a hat' % thing_id)
+    t.design = design
+cmd_THING_HAT_DESIGN.argtypes = 'int:pos string'