add autosalvage

2 files changed, 58 insertions, 11 deletions

diff --git a/src/main/kotlin/com/ambientaddons/config/Config.kt b/src/main/kotlin/com/ambientaddons/config/Config.kt
index 691b784..6e5bfc8 100644
--- a/src/main/kotlin/com/ambientaddons/config/Config.kt
+++ b/src/main/kotlin/com/ambientaddons/config/Config.kt
@@ -10,7 +10,8 @@ import java.io.File
 object Config : Vigilant(
     File(AmbientAddons.configDirectory, "config.toml"), AmbientAddons.metadata.name
 ) {
-
+    var salvageMode = 0
+    var topQualityStrategy = false
 
     var kuudraReady = false
     var kuudraHp = false
@@ -50,10 +51,24 @@ object Config : Vigilant(
 
     var melodyBlockMisclicks = false
     var melodyAnnouncement = "Meowlody on me!"
-    var throttledAnnouncement = "Hi! This is Hypixel Support. We noticed that your runs are actually efficient so we’re throttling this menu. Enjoy slower runs, dipshit. Hope Goldor kills you. Meow."
+    var throttledAnnouncement =
+        "Hi! This is Hypixel Support. We noticed that your runs are actually efficient so we’re throttling this menu. Enjoy slower runs, dipshit. Hope Goldor kills you. Meow."
 
     init {
         category("Misc") {
+            subcategory("Salvaging") {
+                selector(
+                    ::salvageMode,
+                    name = "Salvaging features",
+                    description = "Various modes to improve salvaging.",
+                    options = listOf("Off", "Highlight", "Block misclicks", "Legit autosalvage", "Unlegit autosalvage")
+                )
+                switch(
+                    ::topQualityStrategy,
+                    name = "Should salvage top quality",
+                    description = "If selected, automatically salvages top-quality items. Otherwise, allows them to be salvaged but does not automatically."
+                )
+            }
             subcategory("Kuudra") {
                 switch(
                     ::kuudraReady,
@@ -181,13 +196,7 @@ object Config : Vigilant(
             )
         }
 
-        category("Notifications") {
-            switch(
-                ::maskWarning,
-                name = "Mask proc warning",
-                description = "Displays a title when a spirit mask or bonzo mask procs."
-            )
-        }
+
 
         category("Displays") {
             button(
@@ -197,6 +206,11 @@ object Config : Vigilant(
                 currentGui = MoveGui()
             }
             switch(
+                ::maskWarning,
+                name = "Mask proc warning",
+                description = "Displays a title when a spirit mask or bonzo mask procs."
+            )
+            switch(
                 ::cat,
                 name = "Cat",
                 description = "Show catplague's awesome cat upgrade! Disabling is a crime.",
@@ -219,7 +233,7 @@ object Config : Vigilant(
                     name = "Enable ping",
                     description = "Enables ping in command and display. This requires sending packets to the server.",
                     options = listOf("Off", "In Skyblock", "On Hypixel", "Always")
-                    )
+                )
                 selector(
                     ::pingDisplay,
                     name = "Ping and TPS display",
@@ -252,6 +266,8 @@ object Config : Vigilant(
                 switch(
                     ::ignoreCarpet, name = "Ignore carpet hitboxes", description = "Removes all carpet hitboxes"
                 )
+            }
+            subcategory("Melody") {
                 switch(
                     ::melodyBlockMisclicks,
                     name = "Block misclicks on Melody terminal",
@@ -268,6 +284,7 @@ object Config : Vigilant(
                     description = "Announces that a terminal was throttled in party chat; leave empty to disable."
                 )
             }
+
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/ambientaddons/config/PersistentData.kt b/src/main/kotlin/com/ambientaddons/config/PersistentData.kt
index 9588e21..f46bcd9 100644
--- a/src/main/kotlin/com/ambientaddons/config/PersistentData.kt
+++ b/src/main/kotlin/com/ambientaddons/config/PersistentData.kt
@@ -1,6 +1,7 @@
 package com.ambientaddons.config
 
 import com.ambientaddons.gui.GuiPosition
+import com.ambientaddons.utils.SalvageStrategy
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import java.io.File
@@ -25,7 +26,36 @@ data class PersistentData(
         "WITHER_CHESTPLATE" to null,
         "ULTIMATE_ONE_FOR_ALL_1" to null
     ),
-    var positions: MutableMap<String, GuiPosition> = mutableMapOf()
+    var positions: MutableMap<String, GuiPosition> = mutableMapOf(),
+    var salvageMap: MutableMap<String, SalvageStrategy> = mutableMapOf(
+        "SLUG_BOOTS" to SalvageStrategy.Always,
+        "MOOGMA_LEGGINGS" to SalvageStrategy.Always,
+        "FLAMING_CHESTPLATE" to SalvageStrategy.Always,
+        "TAURUS_HELMET" to SalvageStrategy.Always,
+        "BLADE_OF_THE_VOLCANO" to SalvageStrategy.Always,
+        "STAFF_OF_THE_VOLCANO" to SalvageStrategy.Always,
+        "RAMPART_HELMET" to SalvageStrategy.Always,
+        "RAMPART_CHESTPLATE" to SalvageStrategy.Always,
+        "RAMPART_LEGGINGS" to SalvageStrategy.Always,
+        "RAMPART_BOOTS" to SalvageStrategy.Always,
+        "SWORD_OF_BAD_HEALTH" to SalvageStrategy.Always,
+        "ARACHNE_HELMET" to SalvageStrategy.Always,
+        "ARACHNE_CHESTPLATE" to SalvageStrategy.Always,
+        "ARACHNE_LEGGINGS" to SalvageStrategy.Always,
+        "ARACHNE_BOOTS" to SalvageStrategy.Always,
+        "WITHER_CLOAK_SWORD" to SalvageStrategy.Block,
+        "DARK_CLAYMORE" to SalvageStrategy.Block,
+        "GIANTS_SWORD" to SalvageStrategy.Block,
+        "WITHER_HELMET" to SalvageStrategy.Block,
+        "WITHER_CHESTPLATE" to SalvageStrategy.Block,
+        "WITHER_LEGGINGS" to SalvageStrategy.Block,
+        "WITHER_BOOTS" to SalvageStrategy.Block,
+        "ICE_SPRAY_WAND" to SalvageStrategy.Block,
+        "SHADOW_ASSASSIN_HELMET" to SalvageStrategy.Block,
+        "SHADOW_ASSASSIN_CHESTPLATE" to SalvageStrategy.Block,
+        "SHADOW_ASSASSIN_LEGGINGS" to SalvageStrategy.Block,
+        "SHADOW_ASSASSIN_BOOTS" to SalvageStrategy.Block,
+    )
 ) {
 
     fun save() {