Fix: Add copy of Herta_SupplyZone_F2_X550Y248 and Luofu_Cloudford_F1Rogue_X44Y405

for wrong spawn point detected
This commit is contained in:
LmeSzinc 2024-05-07 23:18:59 +08:00
parent 66aa3c4848
commit c581f427b5
3 changed files with 107 additions and 0 deletions

View File

@ -105,3 +105,62 @@ class Route(RouteBase):
Luofu_Cloudford_F1Rogue_X49Y405 is the same as Luofu_Cloudford_F1Rogue_X59Y405 Luofu_Cloudford_F1Rogue_X49Y405 is the same as Luofu_Cloudford_F1Rogue_X59Y405
but for wrong spawn point detected but for wrong spawn point detected
""" """
def Luofu_Cloudford_F1Rogue_X44Y405(self):
"""
| Waypoint | Position | Direction | Rotation |
| ------------ | ------------------------- | --------- | -------- |
| spawn | Waypoint((59.3, 405.6)), | 96.7 | 91 |
| item1 | Waypoint((96.9, 393.0)), | 87.7 | 84 |
| enemy1 | Waypoint((126.2, 402.5)), | 96.8 | 101 |
| node2 | Waypoint((142.9, 413.0)), | 96.8 | 101 |
| enemy2top | Waypoint((214.6, 432.8)), | 94.1 | 87 |
| enemy2bottom | Waypoint((211.4, 483.3)), | 191.8 | 174 |
| enemy3 | Waypoint((288.0, 452.2)), | 87.7 | 260 |
| exit_ | Waypoint((291.8, 454.4)), | 5.7 | 91 |
| exit1 | Waypoint((295.0, 451.4)), | 96.7 | 89 |
| exit2 | Waypoint((296.0, 460.2)), | 96.9 | 89 |
"""
self.map_init(plane=Luofu_Cloudford, floor="F1Rogue", position=(43.8, 405.0))
self.register_domain_exit(
Waypoint((291.8, 454.4)), end_rotation=91,
left_door=Waypoint((295.0, 451.4)), right_door=Waypoint((296.0, 460.2)))
item1 = Waypoint((96.9, 393.0))
enemy1 = Waypoint((126.2, 402.5))
node2 = Waypoint((142.9, 413.0))
enemy2top = Waypoint((214.6, 432.8))
enemy2bottom = Waypoint((211.4, 483.3))
enemy3 = Waypoint((288.0, 452.2))
# ===== End of generated waypoints =====
self.rotation_set(120)
self.minimap.lock_rotation(120)
# 1, ignore item1, which position may cause detection error
# self.clear_item(item1)
self.clear_enemy(enemy1)
# 2 moving enemy
# Ignore enemy2, it might be a pig, you can never catch it.
# self.clear_enemy(
# enemy2top,
# enemy2bottom.straight_run(),
# )
# 3
self.clear_enemy(
node2.set_threshold(3),
enemy3,
)
if self.minimap.position_diff(enemy3.position) > 60:
logger.info('Cleared an enemy but have not reached enemy3')
self.clear_enemy(enemy3)
"""
Notes
Luofu_Cloudford_F1Rogue_X44Y405 is the same as Luofu_Cloudford_F1Rogue_X59Y405
but for wrong spawn point detected
"""
# Best 3 predictions: [
# ('Combat_Luofu_Cloudford_F1Rogue_X59Y405', 0.349, (43.8, 405.0)),
# ('Combat_Luofu_Cloudford_F1Rogue_X49Y405', 0.349, (43.8, 405.0)),
# ('Combat_Herta_SupplyZone_F2_X594Y247', 0.262, (641.3, 250.5))
# ]
# Best 3 nearby predictions: [('Combat_Jarilo_RivetTown_F1_X181Y439', 0.109, (178.5, 435.4))]

View File

@ -23,3 +23,29 @@ class Route(RouteBase):
self.domain_herta(herta) self.domain_herta(herta)
self.domain_single_exit(exit_) self.domain_single_exit(exit_)
# ===== End of generated waypoints ===== # ===== End of generated waypoints =====
def Herta_SupplyZone_F2_X550Y248(self):
"""
| Waypoint | Position | Direction | Rotation |
| -------- | ------------------------- | --------- | -------- |
| spawn | Waypoint((554.6, 245.0)), | 274.2 | 274 |
| item | Waypoint((541.9, 238.4)), | 308.0 | 301 |
| herta | Waypoint((506.8, 238.4)), | 283.0 | 281 |
| exit_ | Waypoint((495.0, 244.8)), | 283.0 | 274 |
"""
self.map_init(plane=Herta_SupplyZone, floor="F2", position=(550.7, 248.7))
item = Waypoint((541.9, 238.4))
herta = Waypoint((506.8, 238.4))
exit_ = Waypoint((495.0, 244.8))
self.clear_item(item)
self.domain_herta(herta)
self.domain_single_exit(exit_)
# ===== End of generated waypoints =====
# Best 3 predictions: [('Respite_Herta_SupplyZone_F2_X554Y245', 0.257, (550.7, 248.7)),
"""
Notes
Herta_SupplyZone_F2_X550Y248 is the same as Herta_SupplyZone_F2_X554Y245
but for wrong spawn point detected
"""

View File

@ -912,6 +912,17 @@
], ],
"domain": "Combat" "domain": "Combat"
}, },
{
"name": "Combat_Luofu_Cloudford_F1Rogue_X44Y405",
"route": "route.rogue.Combat.Luofu_Cloudford_F1Rogue:Luofu_Cloudford_F1Rogue_X44Y405",
"plane": "Luofu_Cloudford",
"floor": "F1Rogue",
"position": [
43.8,
405.0
],
"domain": "Combat"
},
{ {
"name": "Combat_Luofu_Cloudford_F2_X425Y111", "name": "Combat_Luofu_Cloudford_F2_X425Y111",
"route": "route.rogue.Combat.Luofu_Cloudford_F2:Luofu_Cloudford_F2_X425Y111", "route": "route.rogue.Combat.Luofu_Cloudford_F2:Luofu_Cloudford_F2_X425Y111",
@ -1946,6 +1957,17 @@
], ],
"domain": "Respite" "domain": "Respite"
}, },
{
"name": "Respite_Herta_SupplyZone_F2_X550Y248",
"route": "route.rogue.Respite.Herta_SupplyZone_F2:Herta_SupplyZone_F2_X550Y248",
"plane": "Herta_SupplyZone",
"floor": "F2",
"position": [
550.7,
248.7
],
"domain": "Respite"
},
{ {
"name": "Respite_Jarilo_BackwaterPass_F1_X581Y403", "name": "Respite_Jarilo_BackwaterPass_F1_X581Y403",
"route": "route.rogue.Respite.Jarilo_BackwaterPass_F1:Jarilo_BackwaterPass_F1_X581Y403", "route": "route.rogue.Respite.Jarilo_BackwaterPass_F1:Jarilo_BackwaterPass_F1_X581Y403",