Refactor: Set default speed to 'run'

other speed level will require manual set
This commit is contained in:
LmeSzinc 2023-09-30 18:37:37 +08:00
parent 826d92e40e
commit 0300de86f6
3 changed files with 19 additions and 15 deletions

View File

@ -83,16 +83,16 @@ class Route(RouteBase, Combat, CharacterTrial):
Waypoint((587.6, 366.9)).run_2x(), Waypoint((587.6, 366.9)).run_2x(),
) )
self.clear_item( self.clear_item(
Waypoint((575.5, 377.4)), Waypoint((575.5, 377.4)).straight_run(),
) )
self.clear_item( self.clear_item(
# Go through arched door # Go through arched door
Waypoint((581.5, 383.3)).run().set_threshold(3), Waypoint((581.5, 383.3)).set_threshold(3),
Waypoint((575.7, 417.2)).run(), Waypoint((575.7, 417.2)),
) )
# Goto boss # Goto boss
self.clear_enemy( self.clear_enemy(
Waypoint((613.5, 427.3)), Waypoint((613.5, 427.3)).straight_run(),
) )
def route_item(self): def route_item(self):
@ -104,12 +104,12 @@ class Route(RouteBase, Combat, CharacterTrial):
Waypoint((587.6, 366.9)).run_2x(), Waypoint((587.6, 366.9)).run_2x(),
) )
self.clear_item( self.clear_item(
Waypoint((575.5, 377.4)), Waypoint((575.5, 377.4)).straight_run(),
) )
self.clear_item( self.clear_item(
# Go through arched door # Go through arched door
Waypoint((581.5, 383.3)).run().set_threshold(3), Waypoint((581.5, 383.3)).set_threshold(3),
Waypoint((575.7, 417.2)).run(), Waypoint((575.7, 417.2)),
) )
# Exit # Exit
self.exit_trial() self.exit_trial()
@ -121,11 +121,11 @@ class Route(RouteBase, Combat, CharacterTrial):
# Goto boss # Goto boss
self.clear_enemy( self.clear_enemy(
# Before the corner, turn right # Before the corner, turn right
Waypoint((571.7, 371.3)).run(), Waypoint((571.7, 371.3)),
# Go through arched door # Go through arched door
Waypoint((581.5, 383.3)).run(), Waypoint((581.5, 383.3)),
# Boss # Boss
Waypoint((613.5, 427.3)), Waypoint((613.5, 427.3)).straight_run(),
) )
def exit(self): def exit(self):

View File

@ -377,11 +377,15 @@ if __name__ == '__main__':
self.clear_item( self.clear_item(
Waypoint((587.6, 366.9)).run_2x(), Waypoint((587.6, 366.9)).run_2x(),
) )
self.clear_item((575.5, 377.4)) self.clear_item(
Waypoint((575.5, 377.4)).straight_run(),
)
self.clear_item( self.clear_item(
# Go through arched door # Go through arched door
Waypoint((581.5, 383.3)).run().set_threshold(3), Waypoint((581.5, 383.3)).set_threshold(3),
Waypoint((575.7, 417.2)).run(), Waypoint((575.7, 417.2)),
) )
# Goto boss # Goto boss
self.clear_enemy((613.5, 427.3)) self.clear_enemy(
Waypoint((613.5, 427.3)).straight_run(),
)

View File

@ -15,7 +15,7 @@ class Waypoint:
endpoint_threshold: int = 3 endpoint_threshold: int = 3
# Max move speed, 'run_2x', 'straight_run', 'run', 'walk' # Max move speed, 'run_2x', 'straight_run', 'run', 'walk'
# See MapControl._goto() for details of each speed level # See MapControl._goto() for details of each speed level
speed: str = 'straight_run' speed: str = 'run'
""" """
The following attributes are only be used if this waypoint is the end point of goto() The following attributes are only be used if this waypoint is the end point of goto()