eryn/going-rogue
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIX THE COLLISION DETECTION BUG

Browse source
This commit is contained in:
Eryn Wells 2022-05-15 19:58:39 -07:00
parent d4e4684694
commit 85569595a9
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
erynrl/actions.py
View file

@ -149,14 +149,14 @@ class BumpAction(MoveAction):
position_is_walkable = engine.map.tile_is_walkable(new_position) position_is_walkable = engine.map.tile_is_walkable(new_position)
for ent in engine.entities: for ent in engine.entities:
if new_position != ent.position: if new_position != ent.position or not ent.blocks_movement:
continue continue
entity_occupying_position = ent entity_occupying_position = ent
break break
else: else:
entity_occupying_position = None entity_occupying_position = None
log.ACTIONS.debug('Bumping %s into %s (in_bounds:%s walkable:%s overlaps:%s)', log.ACTIONS.info('Bumping %s into %s (in_bounds:%s walkable:%s overlaps:%s)',
self.actor, self.actor,
new_position, new_position,
position_is_in_bounds, position_is_in_bounds,
@ -166,7 +166,8 @@ class BumpAction(MoveAction):
if not position_is_in_bounds or not position_is_walkable: if not position_is_in_bounds or not position_is_walkable:
return self.failure() return self.failure()
if entity_occupying_position and entity_occupying_position.blocks_movement: if entity_occupying_position:
assert entity_occupying_position.blocks_movement
return ActionResult(self, alternate=MeleeAction(self.actor, self.direction, entity_occupying_position)) return ActionResult(self, alternate=MeleeAction(self.actor, self.direction, entity_occupying_position))
return ActionResult(self, alternate=WalkAction(self.actor, self.direction)) return ActionResult(self, alternate=WalkAction(self.actor, self.direction))

12
erynrl/engine.py
View file

@ -182,12 +182,12 @@ class Engine:
alternate_string = f'{result.alternate.__class__.__name__}[{result.alternate.actor.symbol}]' alternate_string = f'{result.alternate.__class__.__name__}[{result.alternate.actor.symbol}]'
else: else:
alternate_string = str(result.alternate) alternate_string = str(result.alternate)
log.ACTIONS_TREE.info('| %s-> %s => success=%s done=%s alternate=%s', log.ACTIONS_TREE.info('| %s-> %s => success=%s done=%s alternate=%s',
'|' if not result.success or not result.done else '`', '|' if not result.success or not result.done else '`',
action, action,
result.success, result.success,
result.done, result.done,
alternate_string) alternate_string)
while not result.done: while not result.done:
action = result.alternate action = result.alternate