X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=41509df312a7cf7506208ad92dcc2e98983a1ce7;hb=600df1cb4f785eeeb0d604a2d7b6e08d41dd652c;hp=843bcfe844ca509b5f3ee354f192e62df0affa91;hpb=ba3c64445489ef0194b5e5025f87dd3c557d827a;p=plomrogue2
diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 843bcfe..41509df 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -27,7 +27,7 @@ def cmd_ALL(game, msg, connection_id):
def lower_msg_by_volume(msg, volume, largest_audible_distance):
import random
- factor = largest_audible_distance / 8
+ factor = largest_audible_distance / 4
lowered_msg = ''
for c in msg:
c = c
@@ -65,14 +65,20 @@ def cmd_ALL(game, msg, connection_id):
c_id)
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.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 = (YX(0,0),
- YX(game.map_geometry.size.y // 2, game.map_geometry.size.x // 2))
+ t.position = game.spawn_point
game.things += [t] # TODO refactor into Thing.__init__?
t.player_char = game.get_next_player_char()
game.sessions[connection_id] = {
@@ -106,7 +112,8 @@ 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 in game.map_control_passwords.keys():
+ 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')