From e75cfea30b646025db52c31f243f6435b833d5f5 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 12 Oct 2023 15:45:16 +0200
Subject: support for multiple baskets per entrance

---
 .../skyhanni/features/mainlobby/halloweenwaypoints/BasketEntrances.kt | 4 ++--
 .../skyhanni/features/mainlobby/halloweenwaypoints/BasketWaypoints.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/features')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mainlobby/halloweenwaypoints/BasketEntrances.kt b/src/main/java/at/hannibal2/skyhanni/features/mainlobby/halloweenwaypoints/BasketEntrances.kt
index 1fd106965..a923a382a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mainlobby/halloweenwaypoints/BasketEntrances.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mainlobby/halloweenwaypoints/BasketEntrances.kt
@@ -5,9 +5,9 @@ import at.hannibal2.skyhanni.utils.LorenzVec
 enum class BasketEntrances(
     val basketEntranceName: String,
     val waypoint: LorenzVec,
-    val basket: Basket
+    vararg val basket: Basket
 ) {
-    BASKET_ENTER_23("#23, #24 (behind the lava)", LorenzVec(-138, 74, -4), Basket.BASKET_23),
+    BASKET_ENTER_23("#23, #24 (behind the lava)", LorenzVec(-138, 74, -4), Basket.BASKET_23, Basket.BASKET_24),
     BASKET_ENTER_24("#24 (within this tunnel)", LorenzVec(-80, 72, -4), Basket.BASKET_24),
     BASKET_ENTER_25_1("#25 (1st digit, SNEAK + RCLICK)", LorenzVec(143, 65, -30), Basket.BASKET_25),
     BASKET_ENTER_25_2("#25 (3rd digit, open chest)", LorenzVec(205, 34, -157), Basket.BASKET_25),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mainlobby/halloweenwaypoints/BasketWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/mainlobby/halloweenwaypoints/BasketWaypoints.kt
index ec51358ae..2dd0f00df 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mainlobby/halloweenwaypoints/BasketWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mainlobby/halloweenwaypoints/BasketWaypoints.kt
@@ -59,7 +59,7 @@ class BasketWaypoints {
 
         if (config.allEntranceWaypoints) {
             for (basketEntrance in BasketEntrances.entries) {
-                if (basketEntrance.basket.found) continue
+                if (!basketEntrance.basket.any { !it.found }) continue
                 event.drawWaypointFilled(basketEntrance.waypoint, LorenzColor.YELLOW.toColor())
                 event.drawDynamicText(basketEntrance.waypoint, "§e" + basketEntrance.basketEntranceName, 1.5)
             }
-- 
cgit