Rejig map_search a bit.

Use the "set" functions instead of array.push and array.includes.

Update "seen" when adding entries to search queue to avoid the extra
loop that scanned the queue for duplicates.

Don't create lots of temporary arrays that create needless work
for the garbage collector.

1 files changed, 17 insertions, 21 deletions

diff --git a/rules.js b/rules.js
index ccb9378..5cdc14d 100644
--- a/rules.js
+++ b/rules.js
@@ -3534,32 +3534,28 @@ function find_parley_targets(lord, acceptfn, adjacentfn) {
 	return results
 }
 
-function* map_search(lord, acceptfn, adjacentfn, prune=true) {
-	let here = get_lord_locale(lord)
-	let locales = [{locale:here, distance: 0}]
-
-	let seen = []
-
-	while (true) {
-		if (locales.length === 0)
-			return
+function* map_search(lord, acceptfn, adjacentfn, prune = true) {
+	let start = get_lord_locale(lord)
+	let queue = [ { locale: start, distance: 0 } ]
+	let seen = [ start ]
 
-		let loc = locales.shift()
-		seen.push(loc.locale)
+	while (queue.length > 0) {
+		let item = queue.shift()
 
-		if (acceptfn(loc)) {
-			yield loc
+		if (acceptfn(item)) {
+			yield item
 			if (prune)
 				continue
 		}
-		if (is_friendly_locale(loc.locale)) {
-			let distance = loc.distance + 1
-			locales = locales.concat(
-							adjacentfn(loc.locale, lord)
-								.filter(l => !seen.includes(l))
-								.filter(l => !locales.some((r) => r.locale === l))
-								.map(x => {return {locale: x, distance: distance }})
-							)
+
+		if (is_friendly_locale(item.locale)) {
+			let distance = item.distance + 1
+			for (let next of adjacentfn(item.locale, lord)) {
+				if (!set_has(seen, next)) {
+					set_add(seen, next)
+					queue.push({ locale: next, distance })
+				}
+			}
 		}
 	}
 }