X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fcommands.py;h=daa43576cd7181ed4e285e3a389abf7dce0b5bbd;hb=5f77cabba400be428d6d402d9642836e449bd332;hp=26576d052649b9b3f903650729ad760c79f6bf3c;hpb=b1c482d48bf1772d23b98bb93f95292e76afa765;p=plomrogue2
diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 26576d0..daa4357 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -1,13 +1,11 @@
from plomrogue.misc import quote
-from plomrogue.errors import GameError
-from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex, DijkstraMap
+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 = ''
@@ -24,45 +22,10 @@ def cmd_TERRAINS(game, connection_id):
cmd_TERRAINS.argtypes = ''
def cmd_ALL(game, msg, connection_id):
-
- def lower_msg_by_volume(msg, volume, largest_audible_distance):
- import random
- factor = largest_audible_distance / 8
- lowered_msg = ''
- for c in msg:
- c = c
- while random.random() > volume * factor:
- if c.isupper():
- c = c.lower()
- elif c != '.' and c != ' ':
- c = '.'
- else:
- c = ' '
- lowered_msg += c
- return lowered_msg
-
speaker = game.get_player(connection_id)
if not speaker:
raise GameError('need to be logged in for this')
- largest_audible_distance = 40
- dijkstra_map = DijkstraMap(game.maps, speaker.position,
- largest_audible_distance, game.get_map)
- for c_id in game.sessions:
- listener = game.get_player(c_id)
- target_yx = dijkstra_map.target_yx(*listener.position, True)
- if not target_yx:
- continue
- listener_distance = dijkstra_map[target_yx]
- if listener_distance > largest_audible_distance:
- continue
- volume = 1 / max(1, listener_distance)
- lowered_msg = lower_msg_by_volume(msg, volume, largest_audible_distance)
- lowered_nick = lower_msg_by_volume(speaker.name, volume,
- largest_audible_distance)
- game.io.send('CHAT ' +
- quote('(volume: %.2f) %s: %s' % (volume, lowered_nick,
- lowered_msg)),
- c_id)
+ speaker.sound(speaker.name, msg)
cmd_ALL.argtypes = 'string'
def cmd_SPAWN_POINT(game, big_yx, little_yx):
@@ -80,7 +43,7 @@ def cmd_LOGIN(game, nick, connection_id):
t = game.thing_types['Player'](game)
t.position = game.spawn_point
game.things += [t] # TODO refactor into Thing.__init__?
- t.player_char = game.get_next_player_char()
+ t.thing_char = game.get_next_player_char()
game.sessions[connection_id] = {
'thing_id': t.id_,
'status': 'player'
@@ -89,6 +52,10 @@ def cmd_LOGIN(game, nick, 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
cmd_LOGIN.argtypes = 'string'
@@ -98,6 +65,7 @@ def cmd_BECOME_ADMIN(game, password, connection_id):
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'
@@ -112,15 +80,25 @@ def cmd_SET_TILE_CONTROL(game, yx, control_char, connection_id):
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 not (control_char == '.'
- or control_char in game.map_control_passwords.keys()):
- raise GameError('no password set for this tile class')
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:
@@ -130,7 +108,7 @@ 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
+ #game.changed = True
cmd_SET_MAP_CONTROL_PASSWORD.argtypes = 'char string'
def cmd_NICK(game, nick, connection_id):
@@ -149,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.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_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)
@@ -173,6 +151,8 @@ def cmd_TURN(game, n):
cmd_TURN.argtypes = 'int:nonneg'
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):
@@ -184,7 +164,7 @@ def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
if little_yx in game.annotations[big_yx]:
del game.annotations[big_yx][little_yx]
else:
- if not big_yx in game.annotations:
+ if big_yx not in game.annotations:
game.annotations[big_yx] = {}
game.annotations[big_yx][little_yx] = msg
game.changed = True
@@ -200,47 +180,38 @@ def cmd_PORTAL(game, yx, msg, pw, connection_id):
if msg == ' ':
if big_yx in game.portals:
if little_yx in game.portals[big_yx]:
- del game.portals[big_yx][little_xy]
+ del game.portals[big_yx][little_yx]
else:
- if not big_yx in game.portals:
+ if big_yx not in game.portals:
game.portals[big_yx] = {}
game.portals[big_yx][little_yx] = msg
game.changed = True
cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string'
def cmd_GOD_ANNOTATE(game, big_yx, little_yx, msg):
- if not big_yx in game.annotations:
+ 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 not big_yx in game.portals:
+ 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_GET_ANNOTATION(game, yx, connection_id):
- player = game.get_player(connection_id)
- big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
- annotation = '(unknown)';
- if player.fov_test(big_yx, little_yx):
- annotation = '(none)';
- if big_yx in game.annotations:
- if little_yx in game.annotations[big_yx]:
- annotation = game.annotations[big_yx][little_yx]
- game.io.send('ANNOTATION %s %s' % (yx, quote(annotation)))
-cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg'
-
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'
@@ -254,9 +225,9 @@ def cmd_MAP_CONTROL_PW(game, tile_class, password):
cmd_MAP_CONTROL_PW.argtypes = 'char string'
def cmd_THING(game, big_yx, little_yx, thing_type, thing_id):
- if not thing_type in game.thing_types:
+ if thing_type not in game.thing_types:
raise GameError('illegal thing type %s' % thing_type)
- map_ = game.get_map(big_yx)
+ _ = game.get_map(big_yx)
t_old = None
if thing_id > 0:
t_old = game.get_thing(thing_id)
@@ -269,9 +240,76 @@ def cmd_THING(game, big_yx, little_yx, thing_type, thing_id):
game.changed = True
cmd_THING.argtypes = 'yx_tuple yx_tuple:nonneg string:thing_type int:nonneg'
-def cmd_THING_NAME(game, thing_id, name):
+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_THING_NAME.argtypes = 'int:pos string'
+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'