small fix for lower experiments

hannibal002 · Jul 5, 2024 · b4d6f4c · b4d6f4c
1 parent c5a7952
commit b4d6f4c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/...main/java/at/hannibal2/skyhanni/config/features/inventory/ExperimentationTableConfig.java b/...main/java/at/hannibal2/skyhanni/config/features/inventory/ExperimentationTableConfig.java
@@ -89,21 +89,23 @@ public static class ExperimentsDryStreakConfig {
     public boolean ultraRareBookAlert = false;
 
     public enum Experiments {
-        NONE("", 0),
-        BEGINNER("Beginner", 14),
-        HIGH("High", 20),
-        GRAND("Grand", 20),
-        SUPREME("Supreme", 28),
-        TRANSCENDENT("Transcendent", 28),
-        METAPHYSICAL("Metaphysical", 28),
+        NONE("", 0, 0),
+        BEGINNER("Beginner", 14, 18),
+        HIGH("High", 20, 9),
+        GRAND("Grand", 20, 9),
+        SUPREME("Supreme", 28, 9),
+        TRANSCENDENT("Transcendent", 28, 9),
+        METAPHYSICAL("Metaphysical", 28, 9),
         ;
 
         public final String name;
         public final int gridSize;
+        public final int startSlot;
 
-        Experiments(String name, int gridSize) {
+        Experiments(String name, int gridSize, int startSlot) {
             this.name = name;
             this.gridSize = gridSize;
+            this.startSlot = startSlot;
         }
 
         @Override

diff --git a/.../java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsDisplay.kt b/.../java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsDisplay.kt
@@ -24,7 +24,6 @@ object ExperimentsDisplay {
     private val config get() = SkyHanniMod.feature.inventory.experimentationTable
 
     private var display = emptyList<String>()
-    private val startSlot = 9
 
     private var uncoveredAt = 0
     private var uncoveredItems = mutableListOf<Pair<Int, String>>()
@@ -55,6 +54,7 @@ object ExperimentsDisplay {
 
     @SubscribeEvent
     fun onInventoryClose(event: InventoryCloseEvent) {
+        println(listOf(uncoveredAt, uncoveredItems, foundNormals, foundMatches, foundPairs, foundPowerUps, toCheck, lastClicked))
         display = emptyList()
 
         uncoveredAt = 0
@@ -261,7 +261,7 @@ object ExperimentsDisplay {
     }
 
     private fun isOutOfBounds(slot: Int, experiment: Experiments) =
-        slot <= startSlot || slot >= startSlot + experiment.gridSize + 7 || listOf(17, 18, 26, 27, 35, 36).contains(slot)
+        slot <= experiment.startSlot || slot >= experiment.startSlot + experiment.gridSize + 7 || listOf(17, 18, 26, 27, 35, 36).contains(slot)
 
     private fun isEnabled() =
         config.experimentationTableDisplay && LorenzUtils.inSkyBlock && InventoryUtils.openInventoryName().startsWith("Superpairs (")