Merge branch 'beta' into cumcum

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
#	src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java

1 files changed, 27 insertions, 3 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DianaConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/DianaConfig.java
index 99437bb83..990f29d17 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DianaConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DianaConfig.java
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.config.features;
 
+import at.hannibal2.skyhanni.config.FeatureToggle;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.*;
 import org.lwjgl.input.Keyboard;
@@ -9,11 +10,13 @@ public class DianaConfig {
     @Expose
     @ConfigOption(name = "Soopy Guess", desc = "Uses §eSoopy's Guess Logic §7to find the next burrow. Does not require SoopyV2 or ChatTriggers to be installed.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean burrowsSoopyGuess = false;
 
     @Expose
     @ConfigOption(name = "Nearby Detection", desc = "Show burrows near you.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean burrowsNearbyDetection = false;
 
     @Expose
@@ -32,6 +35,25 @@ public class DianaConfig {
     public int keyBindWarp = Keyboard.KEY_NONE;
 
     @Expose
+    @ConfigOption(name = "Ignored Warps", desc = "")
+    @Accordion
+    public IgnoredWarpsConfig ignoredWarps = new IgnoredWarpsConfig();
+
+    public static class IgnoredWarpsConfig {
+
+        @Expose
+        @ConfigOption(name = "Crypt", desc = "Ignore the Crypt warp point (Because it takes a long time to leave).")
+        @ConfigEditorBoolean
+        public boolean crypt = false;
+
+        @Expose
+        @ConfigOption(name = "Wizard", desc = "Ignore the Wizard Tower warp point (Because it is easy to fall into the rift).")
+        @ConfigEditorBoolean
+        public boolean wizard = false;
+
+    }
+
+    @Expose
     @ConfigOption(name = "Inquisitor Waypoint Sharing", desc = "")
     @Accordion
     @ConfigAccordionId(id = 9)
@@ -42,15 +64,16 @@ public class DianaConfig {
         @Expose
         @ConfigOption(name = "Enabled", desc = "Shares your Inquisitor and receiving other Inquisitors via Party Chat.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean enabled = true;
 
         @Expose
-        @ConfigOption(name = "Focus", desc = "Hide other waypoints when your party finds a inquisitor.")
+        @ConfigOption(name = "Focus", desc = "Hide other waypoints when your Party finds a Inquisitor.")
         @ConfigEditorBoolean
         public boolean focusInquisitor = false;
 
         @Expose
-        @ConfigOption(name = "Instant Share", desc = "Share the waypoint as soon as you find a inquisitor. As alternative, you can share it only via key press")
+        @ConfigOption(name = "Instant Share", desc = "Share the waypoint as soon as you find a Inquisitor. As alternative, you can share it only via key press")
         @ConfigEditorBoolean
         public boolean instantShare = true;
 
@@ -66,7 +89,8 @@ public class DianaConfig {
     }
 
     @Expose
-    @ConfigOption(name = "Griffin Pet Warning", desc = "Warn when holding an Ancestral Spade while no Griffin pet is selected.")
+    @ConfigOption(name = "Griffin Pet Warning", desc = "Warn when holding an Ancestral Spade if a Griffin pet is not equipped.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean petWarning = true;
 }