diff --git a/pokemongo_bot/cell_workers/follow_path.py b/pokemongo_bot/cell_workers/follow_path.py index 055150070a..4f98cb93fd 100644 --- a/pokemongo_bot/cell_workers/follow_path.py +++ b/pokemongo_bot/cell_workers/follow_path.py @@ -136,10 +136,10 @@ def work(self): self.emit_event( 'position_update', - formatted="Walking from {last_position} to {current_position} ({distance} {distance_unit})", + formatted="Walk to {last_position} now at {current_position}, distance left: ({distance} {distance_unit}) ..", data={ - 'last_position': (last_lat, last_lng, 0), - 'current_position': (lat, lng, 0), + 'last_position': (lat, lng, 0), + 'current_position': (last_lat, last_lng, 0), 'distance': dist, 'distance_unit': 'm' } diff --git a/pokemongo_bot/cell_workers/recycle_items.py b/pokemongo_bot/cell_workers/recycle_items.py index 630072e59e..0219b00aaf 100644 --- a/pokemongo_bot/cell_workers/recycle_items.py +++ b/pokemongo_bot/cell_workers/recycle_items.py @@ -75,7 +75,7 @@ def should_run(self): :return: True if the recycling process should be run; otherwise, False. :rtype: bool """ - if inventory.Items.get_space_left() < (DEFAULT_MIN_EMPTY_SPACE if self.min_empty_space is None else self.min_empty_space): + if inventory.Items.get_space_left() <= (DEFAULT_MIN_EMPTY_SPACE if self.min_empty_space is None else self.min_empty_space): return True return False @@ -165,7 +165,7 @@ def get_category_items_to_recycle(self, category_inventory, category_count, cate items_to_be_recycled = category_count - category_max for item in category_inventory: - if items_to_be_recycled == 0: + if items_to_be_recycled == 0: break if items_to_be_recycled >= item[1]: items_to_recycle.append([]) @@ -175,7 +175,7 @@ def get_category_items_to_recycle(self, category_inventory, category_count, cate items_to_recycle.append([]) items_to_recycle[x].append(item[0]) items_to_recycle[x].append(items_to_be_recycled) - items_to_be_recycled = items_to_be_recycled - items_to_recycle[x][1] + items_to_be_recycled = items_to_be_recycled - items_to_recycle[x][1] x = x + 1 return items_to_recycle