From b2d1c22d4baebc6eaf9eef823b11fa9d1801ced1 Mon Sep 17 00:00:00 2001 From: ILike2WatchMemes Date: Thu, 12 Sep 2024 02:31:14 +0200 Subject: Feature: Zombie Shootout QOL (#2497) --- .../config/features/event/EventConfig.java | 6 ++++ .../features/event/carnival/CarnivalConfig.java | 13 +++++++ .../event/carnival/ZombieShootoutConfig.java | 41 ++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/CarnivalConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/ZombieShootoutConfig.java (limited to 'src/main/java/at/hannibal2/skyhanni/config/features') diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java index 57d3e0699..1c916bbe1 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.config.features.event; import at.hannibal2.skyhanni.config.features.event.bingo.BingoConfig; +import at.hannibal2.skyhanni.config.features.event.carnival.CarnivalConfig; import at.hannibal2.skyhanni.config.features.event.diana.DianaConfig; import at.hannibal2.skyhanni.config.features.event.hoppity.HoppityEggsConfig; import at.hannibal2.skyhanni.config.features.event.waypoints.LobbyWaypointsConfig; @@ -43,6 +44,11 @@ public class EventConfig { @Expose public GreatSpookConfig spook = new GreatSpookConfig(); + @ConfigOption(name = "Carnival", desc = "") + @Accordion + @Expose + public CarnivalConfig carnival = new CarnivalConfig(); + // comment in if the event is needed again // @ConfigOption(name = "300þ Anniversary Celebration", desc = "Features for the 300þ year of SkyBlock") @Accordion diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/CarnivalConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/CarnivalConfig.java new file mode 100644 index 000000000..b874f7558 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/CarnivalConfig.java @@ -0,0 +1,13 @@ +package at.hannibal2.skyhanni.config.features.event.carnival; + +import com.google.gson.annotations.Expose; +import io.github.notenoughupdates.moulconfig.annotations.Accordion; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; + +public class CarnivalConfig { + + @Expose + @ConfigOption(name = "Zombie Shootout", desc = "") + @Accordion + public ZombieShootoutConfig zombieShootout = new ZombieShootoutConfig(); +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/ZombieShootoutConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/ZombieShootoutConfig.java new file mode 100644 index 000000000..5709e7e58 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/ZombieShootoutConfig.java @@ -0,0 +1,41 @@ +package at.hannibal2.skyhanni.config.features.event.carnival; + +import at.hannibal2.skyhanni.config.FeatureToggle; +import at.hannibal2.skyhanni.config.core.config.Position; +import com.google.gson.annotations.Expose; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigLink; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; + +public class ZombieShootoutConfig { + + @Expose + @ConfigOption(name = "Enabled", desc = "QOL Features for Zombie Shootout.") + @FeatureToggle + @ConfigEditorBoolean + public boolean enabled = false; + + @Expose + @ConfigOption(name = "Colored Hitboxes", desc = "Display colored hitboxes for zombies and lamps.") + @ConfigEditorBoolean + public boolean coloredHitboxes = true; + + @Expose + @ConfigOption(name = "Colored Lines", desc = "Display a colored line to lamps.") + @ConfigEditorBoolean + public boolean coloredLines = true; + + @Expose + @ConfigOption(name = "Highest Only", desc = "Only draw colored hitboxes/lines for the highest scoring zombies.") + @ConfigEditorBoolean + public boolean highestOnly = false; + + @Expose + @ConfigOption(name = "Lamp Timer", desc = "Show time until current lamp disappears.") + @ConfigEditorBoolean + public boolean lampTimer = true; + + @Expose + @ConfigLink(owner = ZombieShootoutConfig.class, field = "lampTimer") + public Position lampPosition = new Position(20, 20, false, true); +} -- cgit