From 691d2551cf722b76c1894c814d1f6c2e98fe17d6 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Fri, 13 Sep 2024 20:23:40 +0200
Subject: Feature: Carnival QoL (#2498)

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/event/EventConfig.java         |  4 +---
 .../features/event/carnival/CarnivalConfig.java    | 26 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

(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 1c916bbe1..41d5771ab 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
@@ -44,9 +44,8 @@ public class EventConfig {
     @Expose
     public GreatSpookConfig spook = new GreatSpookConfig();
 
-    @ConfigOption(name = "Carnival", desc = "")
-    @Accordion
     @Expose
+    @Category(name = "The Carnival", desc = "Features for games at §eThe Carnival §7when §bFoxy §7is Mayor.")
     public CarnivalConfig carnival = new CarnivalConfig();
 
     // comment in if the event is needed again
@@ -58,5 +57,4 @@ public class EventConfig {
     @Category(name = "Lobby Waypoints", desc = "Lobby Event Waypoint settings")
     @Expose
     public LobbyWaypointsConfig lobbyWaypoints = new LobbyWaypointsConfig();
-
 }
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
index b874f7558..cad2b7ea3 100644
--- 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
@@ -1,7 +1,11 @@
 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.Accordion;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class CarnivalConfig {
@@ -10,4 +14,26 @@ public class CarnivalConfig {
     @ConfigOption(name = "Zombie Shootout", desc = "")
     @Accordion
     public ZombieShootoutConfig zombieShootout = new ZombieShootoutConfig();
+
+    @Expose
+    @ConfigOption(name = "Reminder Daily Tickets", desc = "Reminds you when tickets can be claimed from the carnival leader.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean reminderDailyTickets = true;
+
+    @Expose
+    @ConfigOption(name = "Show Goals", desc = "Displays the goals for this carnival event.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean showGoals = true;
+
+    @Expose
+    @ConfigLink(owner = CarnivalConfig.class, field = "showGoals")
+    public Position goalsPosition = new Position(20, 20);
+
+    @Expose
+    @ConfigOption(name = "Double Click to Start", desc = "Clicking the npc again after the npc finishes talking to start game.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean doubleClickToStart = true;
 }
-- 
cgit