X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fcommands.py;h=249e1ab5e91d50a91a51ff940ba572936baf1cef;hb=43591a0ee2c85a98730aac730aded8c0a8cdba57;hp=8ec6f524d22e8283ba13fc47424dc4e18352de2d;hpb=e67306357a830cabdd5ce86b2b333499d99da325;p=plomrogue2
diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 8ec6f52..249e1ab 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -1,21 +1,37 @@
from plomrogue.misc import quote
from plomrogue.errors import GameError
-from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex, Map
+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 = ''
+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):
- def lower_msg_by_volume(msg, volume):
+ 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 * 8:
+ while random.random() > volume * factor:
if c.isupper():
c = c.lower()
elif c != '.' and c != ' ':
@@ -25,41 +41,24 @@ def cmd_ALL(game, msg, connection_id):
lowered_msg += c
return lowered_msg
- import random
if not connection_id in game.sessions:
raise GameError('need to be logged in for this')
- speaker = game.get_thing(game.sessions[connection_id], False)
- n_max = 255
- map_size = game.map.size_i
- dijkstra_map = [n_max for i in range(game.map.size_i)]
- dijkstra_map[game.map.get_position_index(speaker.position)] = 0
- shrunk = True
- while shrunk:
- shrunk = False
- for i in range(map_size):
- if game.map.terrain[i] == 'X':
- continue
- neighbors = game.map_geometry.get_neighbors_i(i)
- for direction in [d for d in neighbors if neighbors[d]]:
- j = neighbors[direction]
- if dijkstra_map[j] < dijkstra_map[i] - 1:
- dijkstra_map[i] = dijkstra_map[j] + 1
- shrunk = True
- #print('DEBUG')
- #line_to_print = []
- #x = 0
- #for n in dijkstra_map:
- # line_to_print += ['%3s' % n]
- # x += 1
- # if x >= game.map.size.x:
- # x = 0
- # print(' '.join(line_to_print))
+ speaker = game.get_thing(game.sessions[connection_id])
+ largest_audible_distance = 20
+ dijkstra_map = DijkstraMap(game.maps, speaker.position,
+ largest_audible_distance, game.get_map)
for c_id in game.sessions:
- listener = game.get_thing(game.sessions[c_id], create_unfound=False)
- listener_vol = dijkstra_map[game.map.get_position_index(listener.position)]
- volume = 1 / max(1, listener_vol)
- lowered_msg = lower_msg_by_volume(msg, volume)
- lowered_nick = lower_msg_by_volume(speaker.nickname, volume)
+ listener = game.get_thing(game.sessions[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)),
@@ -67,30 +66,32 @@ def cmd_ALL(game, msg, connection_id):
cmd_ALL.argtypes = 'string'
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:
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 = (YX(0,0),
+ YX(game.map_geometry.size.y // 2, game.map_geometry.size.x // 2))
game.things += [t] # TODO refactor into Thing.__init__?
+ t.player_char = game.get_next_player_char()
game.sessions[connection_id] = t.id_
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)
game.changed = True
cmd_LOGIN.argtypes = '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:
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
+ t = game.get_thing(t_id)
+ 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'
@@ -103,8 +104,8 @@ cmd_GET_GAMESTATE.argtypes = ''
# 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]:
+# 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)
@@ -123,66 +124,105 @@ def cmd_TURN(game, n):
cmd_TURN.argtypes = 'int:nonneg'
def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
- player = game.get_thing(game.sessions[connection_id], False)
- if player.fov_stencil[yx] != '.':
+ player = game.get_thing(game.sessions[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(yx, pw):
+ 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 not big_yx in game.annotations:
+ game.annotations[big_yx] = {}
+ game.annotations[big_yx][little_yx] = msg
game.changed = True
cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
def cmd_PORTAL(game, yx, msg, pw, connection_id):
- player = game.get_thing(game.sessions[connection_id], False)
- if player.fov_stencil[yx] != '.':
+ player = game.get_thing(game.sessions[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(yx, pw):
+ 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_xy]
else:
- game.portals[yx] = msg
+ if not big_yx 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, yx, msg):
- game.annotations[yx] = msg
+def cmd_GOD_ANNOTATE(game, big_yx, little_yx, msg):
+ if not big_yx in game.annotations:
+ game.annotations[big_yx] = {}
+ game.annotations[big_yx][little_yx] = msg
game.changed = True
-cmd_GOD_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
+cmd_GOD_ANNOTATE.argtypes = 'yx_tuple yx_tuple:nonneg string'
-def cmd_GOD_PORTAL(game, yx, msg):
- game.portals[yx] = msg
+def cmd_GOD_PORTAL(game, big_yx, little_yx, msg):
+ if not big_yx in game.portals:
+ game.portals[big_yx] = {}
+ game.portals[big_yx][little_yx] = msg
game.changed = True
-cmd_GOD_PORTAL.argtypes = 'yx_tuple:nonneg string'
+cmd_GOD_PORTAL.argtypes = 'yx_tuple yx_tuple:nonneg string'
def cmd_GET_ANNOTATION(game, yx, connection_id):
- player = game.get_thing(game.sessions[connection_id], False)
+ player = game.get_thing(game.sessions[connection_id])
+ big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
annotation = '(unknown)';
- if player.fov_stencil[yx] == '.':
+ if player.fov_test(big_yx, little_yx):
annotation = '(none)';
- if yx in game.annotations:
- annotation = game.annotations[yx]
+ 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, 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]
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 not thing_type in game.thing_types:
+ raise GameError('illegal thing type %s' % thing_type)
+ map_ = 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):
+ 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'