From 1f4198caa685bc8719caa6a106308fc9f33eb906 Mon Sep 17 00:00:00 2001 From: Ganom Date: Mon, 20 May 2019 20:24:01 -0400 Subject: [PATCH] Make Scouterer Gooderer Lookinin (#337) --- .../client/plugins/raids/RaidsConfig.java | 483 ++++++++++-------- 1 file changed, 277 insertions(+), 206 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java index 751e25d2f2..b5200a5612 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java @@ -29,144 +29,26 @@ import java.awt.Color; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; +import net.runelite.client.config.Stub; @ConfigGroup("raids") public interface RaidsConfig extends Config { @ConfigItem( - position = 0, - keyName = "raidsTimer", - name = "Display elapsed raid time", - description = "Display elapsed raid time" + keyName = "scouterConfig", + name = "Scouter Config", + description = "", + position = 0 ) - default boolean raidsTimer() + default Stub scouterConfig() { - return true; + return new Stub(); } + @ConfigItem( position = 1, - keyName = "pointsMessage", - name = "Display points in chatbox after raid", - description = "Display a message with total points, individual points and percentage at the end of a raid" - ) - default boolean pointsMessage() - { - return true; - } - - @ConfigItem( - position = 2, - keyName = "scoutOverlay", - name = "Show scout overlay", - description = "Display an overlay that shows the current raid layout (when entering lobby)" - ) - default boolean scoutOverlay() - { - return true; - } - - @ConfigItem( - position = 3, - keyName = "scoutOverlayAtBank", - name = "Show scout overlay outside lobby", - description = "Keep the overlay active while at the raids area" - ) - default boolean scoutOverlayAtBank() - { - return true; - } - - @ConfigItem( - position = 4, - keyName = "scoutOverlayInRaid", - name = "Show scout overlay inside raid", - description = "Keep the overlay active while inside raid" - ) - default boolean scoutOverlayInRaid() - { - return false; - } - - @ConfigItem( - position = 5, - keyName = "whitelistedRooms", - name = "Whitelisted rooms", - description = "Display whitelisted rooms in green on the overlay. Separate with comma (full name)" - ) - default String whitelistedRooms() - { - return ""; - } - - @ConfigItem( - position = 6, - keyName = "blacklistedRooms", - name = "Blacklisted rooms", - description = "Display blacklisted rooms in red on the overlay. Separate with comma (full name)" - ) - default String blacklistedRooms() - { - return ""; - } - - @ConfigItem( - position = 7, - keyName = "enableRotationWhitelist", - name = "Enable rotation whitelist", - description = "Enable the rotation whitelist" - ) - default boolean enableRotationWhitelist() - { - return false; - } - - @ConfigItem( - position = 8, - keyName = "whitelistedRotations", - name = "Whitelisted rotations", - description = "Warn when boss rotation doesn't match a whitelisted one. Add rotations like [tekton, muttadile, guardians]" - ) - default String whitelistedRotations() - { - return ""; - } - - @ConfigItem( - position = 9, - keyName = "enableLayoutWhitelist", - name = "Enable layout whitelist", - description = "Enable the layout whitelist" - ) - default boolean enableLayoutWhitelist() - { - return false; - } - - @ConfigItem( - position = 10, - keyName = "whitelistedLayouts", - name = "Whitelisted layouts", - description = "Warn when layout doesn't match a whitelisted one. Add layouts like CFSCPPCSCF separated with comma" - ) - default String whitelistedLayouts() - { - return ""; - } - - @ConfigItem( - position = 11, - keyName = "showScavsFarms", - name = "Show scavengers and farming", - description = "Adds scavengers and farming to the room breakdown" - ) - default boolean showScavsFarms() - { - return false; - } - - @ConfigItem( - position = 12, + parent = "scouterConfig", keyName = "enhanceScouterTitle", name = "Enhance scouter title", description = "Adds #combat and good puzzles to scouter title" @@ -177,7 +59,33 @@ public interface RaidsConfig extends Config } @ConfigItem( - position = 1, + position = 2, + parent = "scouterConfig", + keyName = "raidsTimer", + name = "Display elapsed raid time", + description = "Display elapsed raid time" + ) + default boolean raidsTimer() + { + return true; + } + + @ConfigItem( + position = 3, + parent = "scouterConfig", + keyName = "pointsMessage", + name = "Display points in chatbox after raid", + description = "Display a message with total points, individual points and percentage at the end of a raid" + ) + default boolean pointsMessage() + { + return true; + } + + + @ConfigItem( + position = 4, + parent = "scouterConfig", keyName = "ptsHr", name = "Enable points per hour message", description = "Enable the message" @@ -188,7 +96,56 @@ public interface RaidsConfig extends Config } @ConfigItem( - position = 16, + position = 5, + parent = "scouterConfig", + keyName = "scoutOverlay", + name = "Show scout overlay", + description = "Display an overlay that shows the current raid layout (when entering lobby)" + ) + default boolean scoutOverlay() + { + return true; + } + + @ConfigItem( + position = 6, + parent = "scouterConfig", + keyName = "scoutOverlayAtBank", + name = "Show scout overlay outside lobby", + description = "Keep the overlay active while at the raids area" + ) + default boolean scoutOverlayAtBank() + { + return true; + } + + @ConfigItem( + position = 7, + parent = "scouterConfig", + keyName = "scoutOverlayInRaid", + name = "Show scout overlay inside raid", + description = "Keep the overlay active while inside raid" + ) + default boolean scoutOverlayInRaid() + { + return false; + } + + @ConfigItem( + position = 8, + parent = "scouterConfig", + keyName = "displayFloorBreak", + name = "Layout floor break", + description = "Displays floor break in layout" + ) + default boolean displayFloorBreak() + { + return false; + } + + @ConfigItem( + position = 9, + parent = "scouterConfig", keyName = "showRecommendedItems", name = "Show recommended items", description = "Adds overlay with recommended items to scouter" @@ -199,9 +156,12 @@ public interface RaidsConfig extends Config } @ConfigItem( - position = 17, + position = 10, + parent = "scouterConfig", keyName = "recommendedItems", name = "Recommended items", + hidden = true, + unhide = "showRecommendedItems", description = "User-set recommended items in the form: [muttadiles,ice barrage,zamorak godsword],[tekton,elder maul], ..." ) default String recommendedItems() @@ -210,40 +170,8 @@ public interface RaidsConfig extends Config } @ConfigItem( - position = 18, - keyName = "scavsBeforeIce", - name = "Show last scavs for Ice Demon", - description = "Highlights final scavengers before Ice Demon" - ) - default boolean scavsBeforeIce() - { - return false; - } - - @ConfigItem( - position = 19, - keyName = "scavsBeforeOlm", - name = "Show last scavs for Olm", - description = "Highlights final scavengers before Olm" - ) - default boolean scavsBeforeOlm() - { - return true; - } - - @ConfigItem( - position = 20, - keyName = "scavPrepColor", - name = "Last scavs color", - description = "The color of the final scavs before Ice Demon/Olm" - ) - default Color scavPrepColor() - { - return new Color(130, 222, 255); //light blue - } - - @ConfigItem( - position = 21, + position = 11, + parent = "scouterConfig", keyName = "alwaysShowWorldAndCC", name = "Always show CC and World", description = "The CC and World are not removed from being in the in-game scouter" @@ -254,7 +182,8 @@ public interface RaidsConfig extends Config } @ConfigItem( - position = 22, + position = 12, + parent = "scouterConfig", keyName = "colorTightrope", name = "Color tightrope", description = "Colors tightrope a separate color" @@ -265,10 +194,13 @@ public interface RaidsConfig extends Config } @ConfigItem( - position = 23, + position = 13, + parent = "scouterConfig", keyName = "tightropeColor", name = "Tightrope color", - description = "The color of tightropes" + description = "The color of tightropes", + hidden = true, + unhide = "colorTightrope" ) default Color tightropeColor() { @@ -276,40 +208,8 @@ public interface RaidsConfig extends Config } @ConfigItem( - position = 24, - keyName = "hideRopeless", - name = "Hide no Tightrope raids", - description = "Completely hides raids with no tightrope" - ) - default boolean hideRopeless() - { - return false; - } - - @ConfigItem( - position = 25, - keyName = "hideVanguards", - name = "Hide Vanguard raids", - description = "Completely hides raids with Vanguards" - ) - default boolean hideVanguards() - { - return false; - } - - @ConfigItem( - position = 26, - keyName = "hideUnknownCombat", - name = "Hide Unknown combat raids", - description = "Completely hides raids with Unknown combat" - ) - default boolean hideUnknownCombat() - { - return false; - } - - @ConfigItem( - position = 27, + position = 14, + parent = "scouterConfig", keyName = "layoutMessage", name = "Send raid layout message when entering raid", description = "Sends game message with raid layout on entering new raid" @@ -320,12 +220,183 @@ public interface RaidsConfig extends Config } @ConfigItem( - position = 28, - keyName = "displayFloorBreak", - name = "Layout floor break", - description = "Displays floor break in layout" + keyName = "roomConfig", + name = "Room Config", + description = "", + position = 15 ) - default boolean displayFloorBreak() + default Stub roomConfig() + { + return new Stub(); + } + + @ConfigItem( + position = 16, + parent = "roomConfig", + keyName = "enableRotationWhitelist", + name = "Enable rotation whitelist", + description = "Enable the rotation whitelist" + ) + default boolean enableRotationWhitelist() + { + return false; + } + + @ConfigItem( + position = 17, + parent = "roomConfig", + keyName = "whitelistedRotations", + name = "Whitelisted rotations", + hidden = true, + unhide = "enableRotationWhitelist", + description = "Warn when boss rotation doesn't match a whitelisted one. Add rotations like [tekton, muttadile, guardians]" + ) + default String whitelistedRotations() + { + return ""; + } + + @ConfigItem( + position = 18, + parent = "roomConfig", + keyName = "enableLayoutWhitelist", + name = "Enable layout whitelist", + description = "Enable the layout whitelist" + ) + default boolean enableLayoutWhitelist() + { + return false; + } + + @ConfigItem( + position = 19, + parent = "roomConfig", + keyName = "whitelistedLayouts", + name = "Whitelisted layouts", + hidden = true, + unhide = "enableLayoutWhitelist", + description = "Warn when layout doesn't match a whitelisted one. Add layouts like CFSCPPCSCF separated with comma" + ) + default String whitelistedLayouts() + { + return ""; + } + + @ConfigItem( + position = 20, + parent = "roomConfig", + keyName = "showScavsFarms", + name = "Show scavengers and farming", + description = "Adds scavengers and farming to the room breakdown" + ) + default boolean showScavsFarms() + { + return false; + } + + @ConfigItem( + position = 21, + parent = "roomConfig", + keyName = "scavsBeforeIce", + name = "Show last scavs for Ice Demon", + description = "Highlights final scavengers before Ice Demon" + ) + default boolean scavsBeforeIce() + { + return false; + } + + @ConfigItem( + position = 22, + parent = "roomConfig", + keyName = "scavsBeforeOlm", + name = "Show last scavs for Olm", + description = "Highlights final scavengers before Olm" + ) + default boolean scavsBeforeOlm() + { + return true; + } + + @ConfigItem( + position = 23, + parent = "roomConfig", + keyName = "scavPrepColor", + name = "Last scavs color", + description = "The color of the final scavs before Ice Demon/Olm" + ) + default Color scavPrepColor() + { + return new Color(130, 222, 255); //light blue + } + + @ConfigItem( + position = 24, + parent = "roomConfig", + keyName = "whitelistedRooms", + name = "Whitelisted rooms", + description = "Display whitelisted rooms in green on the overlay. Separate with comma (full name)" + ) + default String whitelistedRooms() + { + return ""; + } + + @ConfigItem( + position = 25, + parent = "roomConfig", + keyName = "blacklistedRooms", + name = "Blacklisted rooms", + description = "Display blacklisted rooms in red on the overlay. Separate with comma (full name)" + ) + default String blacklistedRooms() + { + return ""; + } + + @ConfigItem( + keyName = "hideRooms", + name = "Hide Rooms", + description = "", + position = 26 + ) + default Stub hideRooms() + { + return new Stub(); + } + + @ConfigItem( + position = 27, + parent = "hideRooms", + keyName = "hideRopeless", + name = "Hide no Tightrope raids", + description = "Completely hides raids with no tightrope" + ) + default boolean hideRopeless() + { + return false; + } + + @ConfigItem( + position = 28, + parent = "hideRooms", + keyName = "hideVanguards", + name = "Hide Vanguard raids", + description = "Completely hides raids with Vanguards" + ) + default boolean hideVanguards() + { + return false; + } + + @ConfigItem( + position = 29, + parent = "hideRooms", + keyName = "hideUnknownCombat", + name = "Hide Unknown combat raids", + description = "Completely hides raids with Unknown combat" + ) + default boolean hideUnknownCombat() { return false; }