mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
Merge pull request #2761 from havocx42/master
Removing reverselist() from all bot pathing.
This commit is contained in:
@@ -225,7 +225,6 @@ text("<A href='?src=\ref[src];operation=oddbutton'>[src.oddbutton ? "Yes" : "No"
|
|||||||
next_dest_loc = closest_loc
|
next_dest_loc = closest_loc
|
||||||
if (next_dest_loc)
|
if (next_dest_loc)
|
||||||
src.patrol_path = AStar(src.loc, next_dest_loc, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 120, id=botcard, exclude=null)
|
src.patrol_path = AStar(src.loc, next_dest_loc, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 120, id=botcard, exclude=null)
|
||||||
src.patrol_path = reverselist(src.patrol_path)
|
|
||||||
else
|
else
|
||||||
patrol_move()
|
patrol_move()
|
||||||
|
|
||||||
@@ -235,7 +234,6 @@ text("<A href='?src=\ref[src];operation=oddbutton'>[src.oddbutton ? "Yes" : "No"
|
|||||||
spawn(0)
|
spawn(0)
|
||||||
if(!src || !target) return
|
if(!src || !target) return
|
||||||
src.path = AStar(src.loc, src.target.loc, /turf/proc/AdjacentTurfs, /turf/proc/Distance, 0, 30)
|
src.path = AStar(src.loc, src.target.loc, /turf/proc/AdjacentTurfs, /turf/proc/Distance, 0, 30)
|
||||||
src.path = reverselist(src.path)
|
|
||||||
if(src.path.len == 0)
|
if(src.path.len == 0)
|
||||||
src.oldtarget = src.target
|
src.oldtarget = src.target
|
||||||
src.target = null
|
src.target = null
|
||||||
|
|||||||
@@ -615,7 +615,6 @@ Auto Patrol: []"},
|
|||||||
// given an optional turf to avoid
|
// given an optional turf to avoid
|
||||||
/obj/machinery/bot/ed209/proc/calc_path(var/turf/avoid = null)
|
/obj/machinery/bot/ed209/proc/calc_path(var/turf/avoid = null)
|
||||||
src.path = AStar(src.loc, patrol_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 120, id=botcard, exclude=avoid)
|
src.path = AStar(src.loc, patrol_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 120, id=botcard, exclude=avoid)
|
||||||
src.path = reverselist(src.path)
|
|
||||||
|
|
||||||
|
|
||||||
// look for a criminal in view of the bot
|
// look for a criminal in view of the bot
|
||||||
|
|||||||
@@ -357,7 +357,6 @@
|
|||||||
var/turf/dest = get_step_towards(target,src) //Can't pathfind to a tray, as it is dense, so pathfind to the spot next to the tray
|
var/turf/dest = get_step_towards(target,src) //Can't pathfind to a tray, as it is dense, so pathfind to the spot next to the tray
|
||||||
|
|
||||||
src.path = AStar(src.loc, dest, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 30,id=botcard)
|
src.path = AStar(src.loc, dest, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 30,id=botcard)
|
||||||
src.path = reverselist(src.path)
|
|
||||||
if(src.path.len == 0)
|
if(src.path.len == 0)
|
||||||
for ( var/turf/spot in orange(1,target) ) //The closest one is unpathable, try the other spots
|
for ( var/turf/spot in orange(1,target) ) //The closest one is unpathable, try the other spots
|
||||||
if ( spot == dest ) //We already tried this spot
|
if ( spot == dest ) //We already tried this spot
|
||||||
|
|||||||
@@ -244,7 +244,6 @@
|
|||||||
src.path = AStar(src.loc, src.target.loc, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30)
|
src.path = AStar(src.loc, src.target.loc, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30)
|
||||||
else
|
else
|
||||||
src.path = AStar(src.loc, src.target, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30)
|
src.path = AStar(src.loc, src.target, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30)
|
||||||
src.path = reverselist(src.path)
|
|
||||||
if(src.path.len == 0)
|
if(src.path.len == 0)
|
||||||
src.oldtarget = src.target
|
src.oldtarget = src.target
|
||||||
src.target = null
|
src.target = null
|
||||||
|
|||||||
@@ -299,7 +299,6 @@
|
|||||||
if(src.patient && src.path.len == 0 && (get_dist(src,src.patient) > 1))
|
if(src.patient && src.path.len == 0 && (get_dist(src,src.patient) > 1))
|
||||||
spawn(0)
|
spawn(0)
|
||||||
src.path = AStar(src.loc, get_turf(src.patient), /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 30,id=botcard)
|
src.path = AStar(src.loc, get_turf(src.patient), /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 30,id=botcard)
|
||||||
src.path = reverselist(src.path)
|
|
||||||
if(src.path.len == 0)
|
if(src.path.len == 0)
|
||||||
src.oldpatient = src.patient
|
src.oldpatient = src.patient
|
||||||
src.patient = null
|
src.patient = null
|
||||||
|
|||||||
@@ -583,7 +583,6 @@ Auto Patrol: []"},
|
|||||||
// given an optional turf to avoid
|
// given an optional turf to avoid
|
||||||
/obj/machinery/bot/secbot/proc/calc_path(var/turf/avoid = null)
|
/obj/machinery/bot/secbot/proc/calc_path(var/turf/avoid = null)
|
||||||
src.path = AStar(src.loc, patrol_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 120, id=botcard, exclude=avoid)
|
src.path = AStar(src.loc, patrol_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 120, id=botcard, exclude=avoid)
|
||||||
src.path = reverselist(src.path)
|
|
||||||
|
|
||||||
|
|
||||||
// look for a criminal in view of the bot
|
// look for a criminal in view of the bot
|
||||||
|
|||||||
Reference in New Issue
Block a user