From 7271edadd7d55bbfef45dbe01bfad14546239f0b Mon Sep 17 00:00:00 2001 From: WeslayCodes <60010287+WeslayCodes@users.noreply.github.com> Date: Sun, 30 Nov 2025 16:18:03 -0600 Subject: [PATCH] Add new festive boars, fixes - Adds three new festive boars - Fixes logic to work with 3 instead of 5 boars --- resourcepack | 2 +- .../boar/megamenu/MegaMenuActionHandler.java | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/resourcepack b/resourcepack index 7ed5607..5788d60 160000 --- a/resourcepack +++ b/resourcepack @@ -1 +1 @@ -Subproject commit 7ed5607d43d95672d38da7ffda3e5ffe858cce9e +Subproject commit 5788d60349864f65e98664850e2acefa1eacf54c diff --git a/src/main/java/dev/boarbot/interactives/boar/megamenu/MegaMenuActionHandler.java b/src/main/java/dev/boarbot/interactives/boar/megamenu/MegaMenuActionHandler.java index 6015b39..8ce2dd0 100644 --- a/src/main/java/dev/boarbot/interactives/boar/megamenu/MegaMenuActionHandler.java +++ b/src/main/java/dev/boarbot/interactives/boar/megamenu/MegaMenuActionHandler.java @@ -604,7 +604,15 @@ public void doAdventClaim(BoarUser boarUser, Connection connection) throws SQLEx claimStr = STRS.getAdventFestiveClaimed() .formatted(BOARS.get("creator").getName(), RARITIES.get("christmas").getName()); - int index = RARITIES.get("christmas").getBoars().length - 5 + (TimeUtil.getDayOfMonth()-1) / 5; + List festiveBoars = Arrays.asList(RARITIES.get("christmas").getBoars()); + int numCurFestive = (int) BOARS.entrySet().stream() + .filter(boar -> festiveBoars.contains(boar.getKey()) && boar.getValue().isSecret()) + .count(); + + // Hackily estimates the current festive index based on the number available for the current year + int curFestiveIndex = (TimeUtil.getDayOfMonth()-1) / (25 / numCurFestive + 1); + + int index = festiveBoars.size() - numCurFestive + curFestiveIndex; List boarIDs = new ArrayList<>(); List bucksGotten = new ArrayList<>(); List editions = new ArrayList<>();