X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=65b054019b0f38dbb6d492803ec72e821baff28f;hb=df9a8d0a788b29913dae3eec4ef8113e2d8e9a41;hp=a4507b1b74f011654b62de6f319df45fdf963c57;hpb=b96c09a32fe69f9549c0569498cdc42c08dbfcde;p=plomrogue2
diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index a4507b1..65b0540 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
# 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,6 +22,7 @@ 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
@@ -147,20 +146,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)
@@ -182,7 +181,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
@@ -198,23 +197,23 @@ 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
@@ -223,9 +222,9 @@ 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)';
+ annotation = '(unknown)'
if player.fov_test(big_yx, little_yx):
- annotation = '(none)';
+ annotation = '(none)'
if big_yx in game.annotations:
if little_yx in game.annotations[big_yx]:
annotation = game.annotations[big_yx][little_yx]
@@ -252,9 +251,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)