Merge pull request #309

* added text on Killer spring and Blood ichor

* twinclaw sound and delay

* Merge branch 'beta' of https://github.com/hannibal002/skyhanni into i…

* draw line from boss to ichor/spring

* changed default color

* fixes

* fixes

* draw line to the boss head if higlighted

* Merge branch 'beta' into ichor_spring_text

* merge conflicts and more sub configs

1 files changed, 63 insertions, 5 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java
index e5aba386f..4efa9feb4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java
@@ -130,9 +130,14 @@ public class SlayerConfig {
             public boolean steakAlert = true;
 
             @Expose
-            @ConfigOption(name = "Twinclaws warning", desc = "Send a title when Twinclaws is about to happen.\nWork on others highlighted people boss.")
+            @ConfigOption(name = "Twinclaws title", desc = "Send a title when Twinclaws is about to happen.\nWork on others highlighted people boss.")
             @ConfigEditorBoolean
             public boolean twinClawsTitle = true;
+
+            @Expose
+            @ConfigOption(name = "Twinclaws sound", desc = "Play a sound when Twinclaws is about to happen.")
+            @ConfigEditorBoolean
+            public boolean twinClawsSound = true;
         }
 
         @Expose
@@ -158,15 +163,20 @@ public class SlayerConfig {
             public boolean steakAlert = true;
 
             @Expose
-            @ConfigOption(name = "Twinclaws warning", desc = "Send a title when Twinclaws is about to happen.")
+            @ConfigOption(name = "Twinclaws title", desc = "Send a title when Twinclaws is about to happen.")
             @ConfigEditorBoolean
             public boolean twinClawsTitle = true;
+
+            @Expose
+            @ConfigOption(name = "Twinclaws sound", desc = "Play a sound when Twinclaws is about to happen.")
+            @ConfigEditorBoolean
+            public boolean twinClawsSound = true;
         }
 
         @Expose
         @ConfigOption(name = "Co-op Boss", desc = "")
         @Accordion
-        public CoopBossHighlight coopsBossHighlight = new CoopBossHighlight();
+        public CoopBossHighlight coopBoss = new CoopBossHighlight();
 
         public static class CoopBossHighlight {
             @Expose
@@ -190,9 +200,14 @@ public class SlayerConfig {
             public boolean steakAlert = true;
 
             @Expose
-            @ConfigOption(name = "Twinclaws warning", desc = "Send a title when Twinclaws is about to happen.")
+            @ConfigOption(name = "Twinclaws title", desc = "Send a title when Twinclaws is about to happen.")
             @ConfigEditorBoolean
             public boolean twinClawsTitle = true;
+
+            @Expose
+            @ConfigOption(name = "Twinclaws sound", desc = "Play a sound when Twinclaws is about to happen.")
+            @ConfigEditorBoolean
+            public boolean twinClawsSound = true;
         }
 
         @Expose
@@ -215,6 +230,28 @@ public class SlayerConfig {
         @ConfigEditorColour
         public String steakColor = "0:255:255:0:88";
 
+        @Expose
+        @ConfigOption(name = "Twinclaws", desc = "Delay the sound and title of twinclaws alert for a given amount in milliseconds.")
+        @ConfigEditorSlider(minStep = 1, minValue = 0, maxValue = 1000)
+        public int twinclawsDelay = 0;
+
+        @Expose
+        @ConfigOption(name = "Draw line", desc = "Draw a line starting at your crosshair to the boss head")
+        @ConfigEditorBoolean
+        public boolean drawLine = false;
+
+        @Expose
+        @ConfigOption(name = "Line color", desc = "Color of the line")
+        @ConfigEditorColour
+        public String lineColor = "0:255:255:0:88";
+
+        @Expose
+        @ConfigOption(name = "Line Width", desc = "Width of the line")
+        @ConfigEditorSlider(minStep = 1, minValue = 1, maxValue = 10)
+        public int lineWidth = 1;
+
+
+
 
         @Expose
         @ConfigOption(name = "Blood Ichor", desc = "")
@@ -236,6 +273,17 @@ public class SlayerConfig {
             @ConfigOption(name = "Color", desc = "Highlight color.")
             @ConfigEditorColour
             public String color = "0:199:100:0:88";
+
+            @Expose
+            @ConfigOption(name = "Show lines", desc = "Draw lines that start from the head of the boss and end on the Blood Ichor.")
+            @ConfigEditorBoolean
+            public boolean showLines = false;
+
+            @Expose
+            @ConfigOption(name = "Lines start color", desc = "Starting color of the lines.")
+            @ConfigEditorColour
+            public String linesColor = "0:255:255:13:0";
+
         }
 
         @Expose
@@ -253,6 +301,16 @@ public class SlayerConfig {
             @ConfigOption(name = "Color", desc = "Highlight color.")
             @ConfigEditorColour
             public String color = "0:199:100:0:88";
+
+            @Expose
+            @ConfigOption(name = "Show lines", desc = "Draw lines that start from the head of the boss and end on the Killer Spring tower.")
+            @ConfigEditorBoolean
+            public boolean showLines = false;
+
+            @Expose
+            @ConfigOption(name = "Lines start color", desc = "Starting color of the lines.")
+            @ConfigEditorColour
+            public String linesColor = "0:255:255:13:0";
         }
     }
 
@@ -347,7 +405,7 @@ public class SlayerConfig {
     @Expose
     @ConfigOption(name = "Broken Wither Impact",
             desc = "Warns when right-clicking with a Wither Impact weapon (e.g. Hyperion) no longer gains combat exp. " +
-            "Kill a mob with melee-hits to fix this hypixel bug. §cOnly works while doing slayers!"
+                    "Kill a mob with melee-hits to fix this hypixel bug. §cOnly works while doing slayers!"
     )
     @ConfigEditorBoolean
     public boolean brokenHyperion = true;