raise GameError('need to be logged in for this')
speaker = game.get_thing(game.sessions[connection_id])
largest_audible_distance = 20
- dijkstra_map_class = game.map_geometry.dijkstra_map_class
- dijkstra_map = dijkstra_map_class(game.map, speaker.position,
- largest_audible_distance)
+ 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])
- target_yx = dijkstra_map.target_yx(listener.position, True)
+ target_yx = dijkstra_map.target_yx(*listener.position, True)
if not target_yx:
continue
listener_distance = dijkstra_map[target_yx]
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.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_
def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
player = game.get_thing(game.sessions[connection_id])
- source_yx = player.fov_stencil.source_yx(yx)
- if not player.fov_test(source_yx):
+ 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(source_yx, pw):
+ if not game.can_do_tile_with_pw(big_yx, little_yx, pw):
raise GameError('wrong password for tile')
if msg == ' ':
- if source_yx in game.annotations:
- del game.annotations[source_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[source_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])
- source_yx = player.fov_stencil.source_yx(yx)
- if not player.fov_test(source_yx):
+ 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(source_yx, pw):
+ if not game.can_do_tile_with_pw(big_yx, little_yx, pw):
raise GameError('wrong password for tile')
if msg == ' ':
- if source_yx in game.portals:
- del game.portals[source_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[source_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])
- source_yx = player.fov_stencil.source_yx(yx)
+ big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
annotation = '(unknown)';
- if player.fov_test(source_yx):
+ if player.fov_test(big_yx, little_yx):
annotation = '(none)';
- if source_yx in game.annotations:
- annotation = game.annotations[source_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, yx, thing_type, thing_id):
+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)
- if not game.map.inside(yx):
- raise GameError('illegal position %s' % yx)
+ 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=yx)
+ 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:nonneg string:thing_type int:nonneg'
+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)
projects / plomrogue2 / blobdiff