Added shortest path potion sorting option (hex-agon#85)

BlueSoapTurtle · Oct 30, 2024 · eb462f3 · eb462f3
1 parent d8d59f9
commit eb462f3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/main/java/work/fking/masteringmixology/PotionComparators.java b/src/main/java/work/fking/masteringmixology/PotionComparators.java
@@ -3,7 +3,6 @@
 import java.util.Comparator;
 
 public class PotionComparators {
-
     // Sort by modifier, in the order CRYSTALISED > HOMOGENOUS > CONCENTRATED
     // And then by PotionType name alphabetically
     public static Comparator<PotionOrder> byStation() {
@@ -21,4 +20,19 @@ public static Comparator<PotionOrder> byStation() {
                 })
                 .thenComparing(order -> order.potionType().name());
     }
+
+    public static Comparator<PotionOrder> shortestPath() {
+        return Comparator.comparing(order -> {
+            switch (order.potionModifier()) {
+                case CRYSTALISED:
+                    return 1;
+                case CONCENTRATED:
+                    return 2;
+                case HOMOGENOUS:
+                    return 3;
+                default:
+                    throw new IllegalStateException("Unexpected value: " + order.potionModifier().toString());
+            }
+        });
+    }
 }
diff --git a/src/main/java/work/fking/masteringmixology/PotionOrderSorting.java b/src/main/java/work/fking/masteringmixology/PotionOrderSorting.java
@@ -4,7 +4,8 @@
 
 public enum PotionOrderSorting {
     VANILLA("Vanilla (random)", null),
-    BY_STATION("By station", PotionComparators.byStation());
+    BY_STATION("By station", PotionComparators.byStation()),
+    SHORTEST_PATH("Shortest Path", PotionComparators.shortestPath());
 
     private final String name;
     private final Comparator<PotionOrder> comparator;