X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fcommands.py;h=daa43576cd7181ed4e285e3a389abf7dce0b5bbd;hb=5f77cabba400be428d6d402d9642836e449bd332;hp=f6744aca92e037d132effc9ebd0b8dcae9e05d13;hpb=da3b93d7a4bd66aef5860bb5a7099e89ab18024c;p=plomrogue2
diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index f6744ac..daa4357 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -1,46 +1,124 @@
from plomrogue.misc import quote
-from plomrogue.errors import GameError
-from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex
+from plomrogue.errors import GameError, ArgError
+# TODO: instead of sending tasks, thing types etc. 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(), quote(t_t.symbol_hint)),
+ 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)
+cmd_TERRAINS.argtypes = ''
+
def cmd_ALL(game, msg, connection_id):
- if not connection_id in game.sessions:
+ speaker = game.get_player(connection_id)
+ if not speaker:
raise GameError('need to be logged in for this')
- t = game.get_thing(game.sessions[connection_id], False)
- game.io.send('CHAT ' + quote(t.nickname + ': ' + msg))
+ speaker.sound(speaker.name, msg)
cmd_ALL.argtypes = 'string'
+def cmd_SPAWN_POINT(game, big_yx, little_yx):
+ if little_yx.y >= game.map_geometry.size.y or \
+ little_yx.x >= game.map_geometry.size.x:
+ raise GameError('illegal spawn point')
+ game.spawn_point = big_yx, little_yx
+cmd_SPAWN_POINT.argtypes = 'yx_tuple yx_tuple:nonneg'
+
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:
+ if game.get_player(connection_id):
raise GameError('cannot log in twice')
- t = game.thing_types['player'](game)
- t.position = YX(game.map.size.y // 2, game.map.size.x // 2)
+ t = game.thing_types['Player'](game)
+ t.position = game.spawn_point
game.things += [t] # TODO refactor into Thing.__init__?
- game.sessions[connection_id] = t.id_
+ t.thing_char = game.get_next_player_char()
+ game.sessions[connection_id] = {
+ 'thing_id': t.id_,
+ 'status': 'player'
+ }
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)
+ 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
cmd_LOGIN.argtypes = 'string'
+def cmd_BECOME_ADMIN(game, password, connection_id):
+ player = game.thing_types['Player'](game)
+ if not player:
+ raise GameError('need to be logged in for this')
+ if password in game.admin_passwords:
+ game.sessions[connection_id]['status'] = 'admin'
+ game.io.send('ADMIN_OK', connection_id)
+ else:
+ raise GameError('wrong password')
+cmd_BECOME_ADMIN.argtypes = 'string'
+
+def cmd_ADMIN_PASSWORD(game, password):
+ game.admin_passwords += [password]
+cmd_ADMIN_PASSWORD.argtypes = 'string'
+
+def cmd_SET_TILE_CONTROL(game, yx, control_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')
+ big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
+ map_control = game.get_map(big_yx, 'control')
+ map_control[little_yx] = control_char
+ game.changed = True
+cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char'
+
+def cmd_THING_PROTECTION(game, thing_id, 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'
+
+def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, 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')
+ 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):
- 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:
+ t = game.get_player(connection_id)
+ if not t:
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
+ 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'
@@ -49,20 +127,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)
@@ -72,48 +150,166 @@ def cmd_TURN(game, n):
game.turn = n
cmd_TURN.argtypes = 'int:nonneg'
-def cmd_ANNOTATE(game, pw, yx, msg, connection_id):
- if not game.can_do_tile_with_pw(yx, pw):
+def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
+ if len(msg) > 500:
+ raise ArgError('annotation text must be <= 500 characters')
+ player = game.get_player(connection_id)
+ big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
+ if not player.fov_test(big_yx, little_yx):
+ raise GameError('cannot annotate tile outside field of view')
+ if not game.can_do_tile_with_pw(big_yx, little_yx, pw):
raise GameError('wrong password for tile')
if msg == ' ':
- if yx in game.annotations:
- del game.annotations[yx]
+ if big_yx in game.annotations:
+ if little_yx in game.annotations[big_yx]:
+ del game.annotations[big_yx][little_yx]
else:
- game.annotations[yx] = msg
+ if big_yx not in game.annotations:
+ game.annotations[big_yx] = {}
+ game.annotations[big_yx][little_yx] = msg
game.changed = True
-cmd_ANNOTATE.argtypes = 'string yx_tuple:nonneg string'
+cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
-def cmd_PORTAL(game, pw, yx, msg, connection_id):
- if not game.can_do_tile_with_pw(yx, pw):
+def cmd_PORTAL(game, yx, msg, pw, connection_id):
+ player = game.get_player(connection_id)
+ big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
+ if not player.fov_test(big_yx, little_yx):
+ raise GameError('cannot edit portal on tile outside field of view')
+ if not game.can_do_tile_with_pw(big_yx, little_yx, pw):
raise GameError('wrong password for tile')
if msg == ' ':
- if yx in game.portals:
- del game.portals[yx]
+ if big_yx in game.portals:
+ if little_yx in game.portals[big_yx]:
+ del game.portals[big_yx][little_yx]
else:
- game.portals[yx] = msg
+ if big_yx not in game.portals:
+ game.portals[big_yx] = {}
+ game.portals[big_yx][little_yx] = msg
game.changed = True
-cmd_PORTAL.argtypes = 'string yx_tuple:nonneg string'
+cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string'
-def cmd_GET_ANNOTATION(game, yx, connection_id):
- annotation = '(none)';
- if yx in game.annotations:
- annotation = game.annotations[yx]
- game.io.send('ANNOTATION %s %s' % (yx, quote(annotation)))
-cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg'
+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
+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
+cmd_GOD_PORTAL.argtypes = 'yx_tuple yx_tuple:nonneg string'
-def cmd_MAP_LINE(game, y, line):
- game.map.set_line(y, line)
-cmd_MAP_LINE.argtypes = 'int:nonneg string'
+def cmd_MAP_LINE(game, big_yx, y, line):
+ map_ = game.get_map(big_yx)
+ map_.set_line(y, line)
+cmd_MAP_LINE.argtypes = 'yx_tuple int:nonneg string'
def cmd_MAP(game, geometry, size):
- map_geometry_class = globals()['MapGeometry' + geometry]
+ from plomrogue.mapping import MapGeometryHex, MapGeometrySquare
+ map_geometry_class = MapGeometrySquare
+ if geometry == 'Hex':
+ map_geometry_class = MapGeometryHex
game.new_world(map_geometry_class(size))
cmd_MAP.argtypes = 'string:map_geometry yx_tuple:pos'
-def cmd_MAP_CONTROL_LINE(game, y, line):
- game.map_control.set_line(y, line)
-cmd_MAP_CONTROL_LINE.argtypes = 'int:nonneg string'
+def cmd_MAP_CONTROL_LINE(game, big_yx, y, line):
+ map_control = game.get_map(big_yx, 'control')
+ map_control.set_line(y, line)
+cmd_MAP_CONTROL_LINE.argtypes = 'yx_tuple 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, 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
+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
+ game.changed = True
+cmd_THING_NAME.argtypes = 'int:pos string string'
+
+def cmd_GOD_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_GOD_THING_NAME.argtypes = 'int:pos string'
+
+def cmd_GOD_THING_PROTECTION(game, thing_id, protection_char):
+ t = game.get_thing(thing_id)
+ if not t:
+ raise GameError('thing of ID %s not found' % thing_id)
+ t.protection = protection_char
+cmd_GOD_THING_PROTECTION.argtypes = 'int:pos char'
+
+def cmd_THING_DOOR_CLOSED(game, thing_id):
+ t = game.get_thing(thing_id)
+ if not t:
+ 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 = '#'
+cmd_THING_DOOR_CLOSED.argtypes = 'int:pos'
+
+def cmd_THING_MUSICPLAYER_SETTINGS(game, thing_id, playing, index, repeat):
+ t = game.get_thing(thing_id)
+ if not t:
+ raise GameError('thing of ID %s not found' % thing_id)
+ if not t.type_ == 'MusicPlayer':
+ raise GameError('thing of ID %s not music player' % thing_id)
+ t.playing = playing
+ t.playlist_index = index
+ t.repeat = repeat
+cmd_THING_MUSICPLAYER_SETTINGS.argtypes = 'int:pos bool int bool'
+
+def cmd_THING_MUSICPLAYER_PLAYLIST_ITEM(game, thing_id, title, length):
+ t = game.get_thing(thing_id)
+ if not t:
+ raise GameError('thing of ID %s not found' % thing_id)
+ if not t.type_ == 'MusicPlayer':
+ raise GameError('thing of ID %s not music player' % thing_id)
+ t.playlist += [(title, length)]
+cmd_THING_MUSICPLAYER_PLAYLIST_ITEM.argtypes = 'int:pos string int:pos'
+
+def cmd_THING_BOTTLE_EMPTY(game, thing_id):
+ t = game.get_thing(thing_id)
+ if not t:
+ raise GameError('thing of ID %s not found' % thing_id)
+ if not t.type_ == 'Bottle':
+ raise GameError('thing of ID %s not bottle' % thing_id)
+ t.empty()
+cmd_THING_BOTTLE_EMPTY.argtypes = 'int:pos'
+
+def cmd_THING_INSTALLED(game, thing_id):
+ t = game.get_thing(thing_id)
+ if not t:
+ raise GameError('thing of ID %s not found' % thing_id)
+ if not hasattr(t, 'installable'):
+ raise GameError('thing of ID %s not installable' % thing_id)
+ t.install()
+cmd_THING_INSTALLED.argtypes = 'int:pos'