X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fcommands.py;h=07bfae0e1b905f8141fe281d1c475b44fcd400e0;hb=61fa10d0738452a5f0e62fd33d48eabcfa46b7c3;hp=94d1c591045dcee8ffbdbcf0f7dd0ab5b5186efa;hpb=6f5e2612e8d2b2515612e3dee6dc5ab115f0c1a3;p=plomrogue2
diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 94d1c59..07bfae0 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -1,5 +1,5 @@
from plomrogue.misc import quote
-from plomrogue.errors import GameError
+from plomrogue.errors import GameError, ArgError
@@ -22,46 +22,10 @@ def cmd_TERRAINS(game, connection_id):
cmd_TERRAINS.argtypes = ''
def cmd_ALL(game, msg, connection_id):
- from plomrogue.mapping import DijkstraMap
-
- def lower_msg_by_volume(msg, volume, largest_audible_distance):
- import random
- factor = largest_audible_distance / 4
- 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 = 20
- dijkstra_map = DijkstraMap(game.things, 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):
@@ -79,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'
@@ -132,7 +96,7 @@ def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
if not t:
raise GameError('thing of ID %s not found' % thing_id)
t.protection = protection_char
- game.changed = True
+ #game.changed = True
cmd_THING_PROTECTION.argtypes = 'int:pos char'
def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
@@ -144,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):
@@ -187,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):
@@ -236,18 +202,6 @@ def cmd_GOD_PORTAL(game, 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)
@@ -310,3 +264,43 @@ def cmd_GOD_THING_PROTECTION(game, thing_id, protection_char):
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:nonneg 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'