From 0354df9a6228e16a96ce4bab48bf73221a58129e Mon Sep 17 00:00:00 2001 From: Wesley <60010287+WeslayCodes@users.noreply.github.com> Date: Fri, 24 Oct 2025 21:09:25 -0500 Subject: [PATCH] Revert "v2.0.28 - Boar-o-ween 2025" --- resourcepack | 2 +- .../dev/boarbot/jobs/SpookMessageJob.java | 23 ++++++++++++++++++- .../dev/boarbot/util/data/UserDataUtil.java | 2 +- src/main/resources/config/game/rarities.json | 2 +- src/main/resources/config/lang/en_us.json | 2 +- src/main/resources/config/util/colors.json | 2 +- 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/resourcepack b/resourcepack index f6a345c..191eebe 160000 --- a/resourcepack +++ b/resourcepack @@ -1 +1 @@ -Subproject commit f6a345cda3dacdefc31f65fa9efd756f5eb5a7fa +Subproject commit 191eebe9cfbfc496cf6e51720ab9ca61c2922444 diff --git a/src/main/java/dev/boarbot/jobs/SpookMessageJob.java b/src/main/java/dev/boarbot/jobs/SpookMessageJob.java index 4bf6512..e8b77e8 100644 --- a/src/main/java/dev/boarbot/jobs/SpookMessageJob.java +++ b/src/main/java/dev/boarbot/jobs/SpookMessageJob.java @@ -22,10 +22,28 @@ public class SpookMessageJob implements Job, Configured { .build(); @Getter private final static Trigger trigger2 = TriggerBuilder.newTrigger() .withSchedule( - CronScheduleBuilder.cronSchedule("0 0 19 31 10 ?").inTimeZone(TimeZone.getTimeZone("America/Chicago")) + CronScheduleBuilder.cronSchedule("0 0 18 31 10 ?").inTimeZone(TimeZone.getTimeZone("America/Chicago")) ) .withIdentity("trigger2") .build(); + @Getter private final static Trigger trigger3 = TriggerBuilder.newTrigger() + .withSchedule( + CronScheduleBuilder.cronSchedule("0 0 20 31 10 ?").inTimeZone(TimeZone.getTimeZone("America/Chicago")) + ) + .withIdentity("trigger3") + .build(); + @Getter private final static Trigger trigger4 = TriggerBuilder.newTrigger() + .withSchedule( + CronScheduleBuilder.cronSchedule("0 0 21 31 10 ?").inTimeZone(TimeZone.getTimeZone("America/Chicago")) + ) + .withIdentity("trigger4") + .build(); + @Getter private final static Trigger trigger5 = TriggerBuilder.newTrigger() + .withSchedule( + CronScheduleBuilder.cronSchedule("0 0 22 31 10 ?").inTimeZone(TimeZone.getTimeZone("America/Chicago")) + ) + .withIdentity("trigger5") + .build(); @Override public void execute(JobExecutionContext context) throws JobExecutionException { @@ -45,6 +63,9 @@ public void execute(JobExecutionContext context) throws JobExecutionException { messageStr = switch (triggerName) { case "trigger1" -> STRS.getSpookMessages()[0]; case "trigger2" -> STRS.getSpookMessages()[1]; + case "trigger3" -> STRS.getSpookMessages()[2]; + case "trigger4" -> STRS.getSpookMessages()[3]; + case "trigger5" -> STRS.getSpookMessages()[4]; default -> null; }; } catch (IndexOutOfBoundsException exception) { diff --git a/src/main/java/dev/boarbot/util/data/UserDataUtil.java b/src/main/java/dev/boarbot/util/data/UserDataUtil.java index c91132c..30f6316 100644 --- a/src/main/java/dev/boarbot/util/data/UserDataUtil.java +++ b/src/main/java/dev/boarbot/util/data/UserDataUtil.java @@ -120,7 +120,7 @@ public static void setStreakFreeze(Connection connection, boolean shouldFreeze) public static synchronized boolean isSpookyAvailable(Connection connection, String obtainType) throws SQLException { String query = """ - SELECT COUNT(*) < 5 + SELECT COUNT(*) < 3 FROM collected_boars WHERE boar_id = 'spooky' AND original_obtain_type = ?; """; diff --git a/src/main/resources/config/game/rarities.json b/src/main/resources/config/game/rarities.json index 2f27ef6..35b00b8 100644 --- a/src/main/resources/config/game/rarities.json +++ b/src/main/resources/config/game/rarities.json @@ -1,7 +1,7 @@ { "halloween": { "name": "Haunting", - "emoji": "<:haunting:1430378325158793257>", + "emoji": "<:haunting:1248314112434372619>", "weight": 825, "baseBucks": 20, "researcherNeed": true, diff --git a/src/main/resources/config/lang/en_us.json b/src/main/resources/config/lang/en_us.json index 1f45c4a..ff8981e 100644 --- a/src/main/resources/config/lang/en_us.json +++ b/src/main/resources/config/lang/en_us.json @@ -396,7 +396,7 @@ "unavailable": "N/A", "pullLink": "https:<>api.github.com/repos/BoarBotDevs/BoarBot/pulls?state=closed&base=main", "githubImg": "https:<>github.githubassets.com/images/modules/logos_page/GitHub-Mark.png", - "supportStr": "## As BoarBot is not pay-to-win, we rely on donations to support the servers and contributors. Become a member on our Patreon to help out!\nhttps://www.patreon.com/BoarBotDevs\n-# Note: This monetization method is temporary! It will be replaced when cosmetics are added sometime in future.", + "supportStr": "## As BoarBot is not pay-to-win, we rely on donations to support the servers and contributors. Become a member on our Patreon to help out!\nhttps://www.patreon.com/BoarBotDevs\n-# Note: This monetization method is temporary! It will be replaced when cosmetics are added in the near future.", "guessStrs": [ "weslayisverycool", "nobodywilleverguessthis", diff --git a/src/main/resources/config/util/colors.json b/src/main/resources/config/util/colors.json index 0a72103..3d7f6ab 100644 --- a/src/main/resources/config/util/colors.json +++ b/src/main/resources/config/util/colors.json @@ -14,7 +14,7 @@ "green": "#55FF55", "maintenance": "#FFFF00", "error": "#FF5555", - "halloween": "#0f5544,#1cdda0,#0f5544", + "halloween": "#474747,#679311,#474747", "christmas": "#ffffff,#e13737,#ffffff,#e13737,#ffffff,#e13737,", "event": "#00b4ff,#00ff48,#c468ff,#ff68af,#ffa71d", "common": "#FFFFFF",