from plomrogue.errors import GameError
+from plomrogue.mapping import YX
class ThingBase:
type_ = '?'
- def __init__(self, world, id_=None, position=((0,0), (0,0))):
+ def __init__(self, world, id_=None, position=(YX(0,0), YX(0,0))):
self.world = world
- self.position = position
if id_ is None:
self.id_ = self.world.new_thing_id()
else:
self.id_ = id_
+ self.position = position
+
+ @property
+ def position(self):
+ return self._position
+
+ def _position_set(self, pos):
+ """Set self._position to pos.
+
+ We use this setter as core to the @position.setter property
+ method due to property setter subclassing not yet working
+ properly, see <https://bugs.python.org/issue14965>. We will
+ therefore super() _position_set instead of @position.setter in
+ subclasses.
+
+ """
+ self._position = pos
+
+ @position.setter
+ def position(self, pos):
+ self._position_set(pos)
in_inventory = False
def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
self.inventory = []
+ self._radius = 8
+ super().__init__(*args, **kwargs)
def proceed(self):
pass
+ def _position_set(self, pos):
+ super()._position_set(pos)
+ for t_id in self.inventory:
+ t = self.world.get_thing(t_id)
+ t.position = self.position
+ if not self.id_ == self.world.player_id:
+ return
+ edge_left = self.position[1].x - self._radius
+ edge_right = self.position[1].x + self._radius
+ edge_up = self.position[1].y - self._radius
+ edge_down = self.position[1].y + self._radius
+ if edge_left < 0:
+ self.world.get_map(self.position[0] - YX(1,-1))
+ self.world.get_map(self.position[0] - YX(0,-1))
+ self.world.get_map(self.position[0] - YX(-1,-1))
+ if edge_right >= self.world.map_size.x:
+ self.world.get_map(self.position[0] + YX(1,1))
+ self.world.get_map(self.position[0] + YX(0,1))
+ self.world.get_map(self.position[0] + YX(-1,1))
+ if edge_up < 0:
+ self.world.get_map(self.position[0] - YX(-1,1))
+ self.world.get_map(self.position[0] - YX(-1,0))
+ self.world.get_map(self.position[0] - YX(-1,-1))
+ if edge_down >= self.world.map_size.y:
+ self.world.get_map(self.position[0] + YX(1,1))
+ self.world.get_map(self.position[0] + YX(1,0))
+ self.world.get_map(self.position[0] + YX(1,-1))
+
class ThingItem(Thing):
super().__init__(*args, **kwargs)
self.set_task('WAIT')
self._last_task_result = None
- self._radius = 8
self.unset_surroundings()
def move_on_dijkstra_map(self, own_pos, targets):
for pos in dijkstra_map:
if visible_map[pos] != '.':
continue
- neighbors = dijkstra_map.get_neighbors(tuple(pos))
+ neighbors = dijkstra_map.get_neighbors(pos)
for direction in neighbors:
yx = neighbors[direction]
if yx is not None and dijkstra_map[yx] < dijkstra_map[pos] - 1:
return target_direction
def hunt_player(self):
- visible_things, offset = self.get_visible_things()
+ visible_things = self.get_visible_things()
+ offset = self.get_surroundings_offset()
target = None
for t in visible_things:
if t.type_ == 'human':
- target = (t.position[1][0] - offset[0],
- t.position[1][1] - offset[1])
+ target = t.position[1] - offset
break
if target is not None:
try:
- offset_self_pos = (self.position[1][0] - offset[0],
- self.position[1][1] - offset[1])
+ offset_self_pos = self.position[1] - offset
target_dir = self.move_on_dijkstra_map(offset_self_pos,
[target])
if target_dir is not None:
if t.type_ == 'food':
self.set_task('PICKUP', (id_,))
return True
- visible_things, offset = self.get_visible_things()
+ visible_things = self.get_visible_things()
+ offset = self.get_surroundings_offset()
food_targets = []
for t in visible_things:
if t.type_ == 'food':
- food_targets += [(t.position[1][0] - offset[0],
- t.position[1][1] - offset[1])]
- offset_self_pos = (self.position[1][0] - offset[0],
- self.position[1][1] - offset[1])
+ food_targets += [t.position[1] - offset]
+ offset_self_pos = self.position[1] - offset
target_dir = self.move_on_dijkstra_map(offset_self_pos,
food_targets)
if target_dir:
self._surroundings_offset = None
def must_fix_indentation(self):
- return self._radius % 2 != self.position[1][0] % 2
+ return self._radius % 2 != self.position[1].y % 2
def get_surroundings_offset(self):
if self._surroundings_offset is not None:
return self._surroundings_offset
add_line = self.must_fix_indentation()
- offset_y = self.position[1][0] - self._radius - int(add_line)
- offset_x = self.position[1][1] - self._radius
- self._surroundings_offset = (offset_y, offset_x)
+ offset = YX(self.position[1].y - self._radius - int(add_line),
+ self.position[1].x - self._radius)
+ self._surroundings_offset = offset
return self._surroundings_offset
def get_surrounding_map(self):
add_line = self.must_fix_indentation()
self._surrounding_map = self.world.game.\
- map_type(size=(self._radius*2+1+int(add_line),
- self._radius*2+1))
- size = self.world.maps[(0,0)].size
+ map_type(size=YX(self._radius*2+1+int(add_line),
+ self._radius*2+1))
+ size = self.world.map_size
offset = self.get_surroundings_offset()
for pos in self._surrounding_map:
- big_y, small_y = pan_and_scan(size[0], pos[0], offset[0])
- big_x, small_x = pan_and_scan(size[1], pos[1], offset[1])
- big_yx = (big_y, big_x)
- small_yx = (small_y, small_x)
- self._surrounding_map[pos] = self.world.maps[big_yx][small_yx]
+ big_y, small_y = pan_and_scan(size.y, pos.y, offset.y)
+ big_x, small_x = pan_and_scan(size.x, pos.x, offset.x)
+ big_yx = YX(big_y, big_x)
+ small_yx = YX(small_y, small_x)
+ map_ = self.world.get_map(big_yx, False)
+ if map_ is None:
+ map_ = self.world.game.map_type(size=self.world.map_size)
+ self._surrounding_map[pos] = map_[small_yx]
return self._surrounding_map
def get_stencil(self):
if surrounding_map[pos] in {'.', '~'}:
m[pos] = '.'
offset = self.get_surroundings_offset()
- fov_center = (self.position[1][0] - offset[0],
- self.position[1][1] - offset[1])
+ fov_center = self.position[1] - offset
self._stencil = m.get_fov_map(fov_center)
return self._stencil
stencil = self.get_stencil()
offset = self.get_surroundings_offset()
visible_things = []
- size = self.world.maps[(0,0)].size
+ size = self.world.map_size
fov_size = self.get_surrounding_map().size
for thing in self.world.things:
big_pos = thing.position[0]
small_pos = thing.position[1]
- pos_y = calc_pos_in_fov(big_pos[0], small_pos[0], offset[0], size[0])
- pos_x = calc_pos_in_fov(big_pos[1], small_pos[1], offset[1], size[1])
- if pos_y < 0 or pos_x < 0 or pos_y >= fov_size[0] or pos_x >= fov_size[1]:
+ pos_y = calc_pos_in_fov(big_pos.y, small_pos.y, offset.y, size.y)
+ pos_x = calc_pos_in_fov(big_pos.x, small_pos.x, offset.x, size.x)
+ if pos_y < 0 or pos_x < 0 or\
+ pos_y >= fov_size.y or pos_x >= fov_size.x:
continue
- if (not thing.in_inventory) and stencil[(pos_y, pos_x)] == '.':
+ if (not thing.in_inventory) and stencil[YX(pos_y, pos_x)] == '.':
visible_things += [thing]
- return visible_things, offset
+ return visible_things
def get_pickable_items(self):
pickable_ids = []
- visible_things, _ = self.get_visible_things()
+ visible_things = self.get_visible_things()
for t in [t for t in visible_things if
isinstance(t, ThingItem) and
(t.position == self.position or
t.position[1] in
- self.world.maps[(0,0)].get_neighbors(self.position[1]).values())]:
+ self.world.maps[YX(0,0)].get_neighbors(self.position[1]).values())]:
pickable_ids += [t.id_]
return pickable_ids
projects / plomrogue2-experiments / blobdiff