Skip to content

Revert "v2.0.28 - Boar-o-ween 2025" #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
WeslayCodes wants to merge 1 commit into from
Closed

Revert "v2.0.28 - Boar-o-ween 2025" #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resourcepack
Open in desktop
Submodule resourcepack updated from f6a345 to 191eeb
23 changes: 22 additions & 1 deletion src/main/java/dev/boarbot/jobs/SpookMessageJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/boarbot/util/data/UserDataUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ?;
""";
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/config/game/rarities.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"halloween": {
"name": "Haunting",
"emoji": "<:haunting:1430378325158793257>",
"emoji": "<:haunting:1248314112434372619>",
"weight": 825,
"baseBucks": 20,
"researcherNeed": true,
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/config/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/config/util/colors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down