1 files changed, 83 insertions, 8 deletions

diff --git a/settings.js b/settings.js
index cc6382e..92c13d2 100644
--- a/settings.js
+++ b/settings.js
@@ -1,10 +1,11 @@
-import { @Vigilant, @ButtonProperty, @SwitchProperty, @SelectorProperty } from 'Vigilance'
+import { @Vigilant, @ButtonProperty, @SwitchProperty, @SelectorProperty, @SliderProperty } from 'Vigilance'
 
 @Vigilant("Coleweight")
 class Settings {
     @SwitchProperty({
         name: "Coleweight tracker",
         description: "Enables the Coleweight tracker.",
+        subcategory: "Coleweight Tracker",
         category: "General"
     })
     cwToggle = true;
@@ -12,6 +13,7 @@ class Settings {
     @ButtonProperty({
         name: "Change Coleweight tracker position",
         description: "Move the location of the coleweight tracker.",
+        subcategory: "Coleweight Tracker",
         category: "General",
         placeholder: "Open"
     })
@@ -22,6 +24,7 @@ class Settings {
     @SwitchProperty({
         name: "Rank chat",
         description: "Enables the Coleweight rank message after a name in chat.",
+        subcategory: "Ranked Chat",
         category: "General"
     })
     rankChat = true;
@@ -29,6 +32,7 @@ class Settings {
     @SwitchProperty({
         name: "Rank everywhere",
         description: "Enables showing Coleweight rank everywhere. (instead of just in crystal hollows)",
+        subcategory: "Ranked Chat",
         category: "General"
     })
     rankEverywhere = false;
@@ -36,6 +40,7 @@ class Settings {
     @SwitchProperty({
         name: "Track griefers",
         description: "Check lobbies for griefers (on join and when new players join.)",
+        subcategory: "Random Features",
         category: "General"
     })
     trackGriefers = true;
@@ -43,35 +48,77 @@ class Settings {
     @SwitchProperty({
         name: "Claiming",
         description: "Enables lobby claiming (/claim).",
+        subcategory: "Random Features",
         category: "General"
     })
     claiming = true;
 
     @SwitchProperty({
-        name: "Timer",
-        description: "Toggles visibility of CHollows timer",
+        name: "Downtime tracker",
+        description: "Tracks downtime.",
+        subcategory: "Downtime",
         category: "General"
     })
-    timerVisible = false;
+    downtimeTracker = false;
 
     @ButtonProperty({
-        name: "Change timer position",
-        description: "Move the location of the timer.",
+        name: "Change downtime tracker position",
+        description: "Move the location of the downtime tracker.",
+        subcategory: "Downtime",
         category: "General",
         placeholder: "Open"
     })
-    moveTimerLocation() {
-        ChatLib.command("cw move timer", true);
+    moveDowntimeLocation() {
+        ChatLib.command("cw move downtime", true);
     }
 
     @SwitchProperty({
         name: "Debug",
         description: "Toggles debug mode.",
+        subcategory: "Random Features",
         category: "General"
     })
     debug = false;
 
     @SwitchProperty({
+        name: "Marked lobbies",
+        description: "Enables lobby marking (automatic).",
+        category: "General",
+        subcategory: "Marking"
+    })
+    lobbyMarking = false;
+
+    @ButtonProperty({
+        name: "Clear lobbies",
+        description: "Clears marked lobbies.",
+        category: "General",
+        subcategory: "Marking",
+        placeholder: "Clear"
+    })
+    clearLobbies() {
+        ChatLib.command("cw clearlobbies", true);
+    }
+
+    @SwitchProperty({
+        name: "Timer",
+        description: "Toggles visibility of CHollows timer",
+        subcategory: "Timer",
+        category: "General"
+    })
+    timerVisible = false;
+
+    @ButtonProperty({
+        name: "Change timer position",
+        description: "Move the location of the timer.",
+        subcategory: "Timer",
+        category: "General",
+        placeholder: "Open"
+    })
+    moveTimerLocation() {
+        ChatLib.command("cw move timer", true);
+    }
+
+    @SwitchProperty({
         name: "Show powdertracker",
         description: "If the tracker overlay should be visible.",
         category: "Powdertracker"
@@ -110,6 +157,22 @@ class Settings {
         ChatLib.command("cw move powdertracker", true);
     }
 
+    @SwitchProperty({
+        name: "Show naturals",
+        description: "If natural veins should show.",
+        category: "Naturals"
+    })
+    showNaturals = false
+
+    @SliderProperty({
+        name: "Natural range",
+        description: "Range that naturals will show up in",
+        category: "Naturals",
+        min: 16,
+        max: 64
+    })
+    naturalRange = 32
+
     constructor() {
         this.initialize(this);
         this.registerListener("Rank chat", value => {
@@ -124,9 +187,15 @@ class Settings {
         this.registerListener("Claiming", value => {
             this.claiming = value;
         })
+        this.registerListener("Marked lobbies", value => {
+            this.lobbyMarking = value;
+        })
         this.registerListener("Timer", value => {
             this.timerVisible = value;
         })
+        this.registerListener("Downtime tracker", value => {
+            this.downtimeTracker = value;
+        })
         this.registerListener("Debug", value => {
             this.debug = value;
         })
@@ -142,6 +211,12 @@ class Settings {
         this.registerListener("Alignment", value => {
             this.trackerAlignment = value;
         })
+        this.registerListener("Show naturals", value => {
+            this.showNaturals = value;
+        })
+        this.registerListener("Natural range", value => {
+            this.naturalRange = value;
+        })
     }
 }