Opt: Clear items at waypoints also

This commit is contained in:
LmeSzinc 2023-11-21 11:49:59 +08:00
parent adfbb4a02b
commit e3eae4847a

View File

@ -140,9 +140,10 @@ class RouteBase(RouteBase_, RogueExit, RogueEvent, RogueReward):
def clear_enemy(self, *waypoints): def clear_enemy(self, *waypoints):
waypoints = ensure_waypoints(waypoints) waypoints = ensure_waypoints(waypoints)
end_point = waypoints[-1]
if self.plane.is_rogue_combat: if self.plane.is_rogue_combat:
end_point.expected_enroute.append('item') for point in waypoints:
if 'item' not in point.expected_enroute:
point.expected_enroute.append('item')
return super().clear_enemy(*waypoints) return super().clear_enemy(*waypoints)
def clear_item(self, *waypoints): def clear_item(self, *waypoints):
@ -191,7 +192,9 @@ class RouteBase(RouteBase_, RogueExit, RogueEvent, RogueReward):
end_point.interact_radius = 7 end_point.interact_radius = 7
end_point.expected_end.append(self._domain_event_expected_end) end_point.expected_end.append(self._domain_event_expected_end)
if self.plane.is_rogue_occurrence: if self.plane.is_rogue_occurrence:
end_point.expected_enroute.append('item') for point in waypoints:
if 'item' not in point.expected_enroute:
point.expected_enroute.append('item')
result = self.goto(*waypoints) result = self.goto(*waypoints)
self.clear_occurrence() self.clear_occurrence()