From 87ae5a89f9fb8b9ddb5ac11acbeb5d41745ed3e5 Mon Sep 17 00:00:00 2001
From: TheColdPot <66854652+TheColdPot@users.noreply.github.com>
Date: Wed, 5 Oct 2022 17:05:26 +0800
Subject: Fix trivia solver glitch
---
src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java
index 73511c00..2d4d565e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java
@@ -40,13 +40,14 @@ public class Trivia extends ChatPatternListener {
}
private void updateSolutions(String question) {
- if (question.equals("What SkyBlock year is it?")) {
+ String trimmedQuestion = question.trim();
+ if (trimmedQuestion.equals("What SkyBlock year is it?")) {
long currentTime = System.currentTimeMillis() / 1000L;
long diff = currentTime - 1560276000;
int year = (int) (diff / 446400 + 1);
solutions = Collections.singletonList("Year " + year);
} else {
- solutions = Arrays.asList(answers.get(question));
+ solutions = Arrays.asList(answers.get(trimmedQuestion));
}
}
--
cgit
From 32a141133b636b6a50a01b0e7698c12690246f72 Mon Sep 17 00:00:00 2001
From: TheColdPot <66854652+TheColdPot@users.noreply.github.com>
Date: Wed, 5 Oct 2022 17:20:04 +0800
Subject: Add a new one to `answers`.
---
src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java
index 2d4d565e..b437ce10 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java
@@ -16,7 +16,7 @@ public class Trivia extends ChatPatternListener {
private List<String> solutions = Collections.emptyList();
public Trivia() {
- super("^ +(?:([A-Za-z' ]*\\?)|§6 ([ⓐⓑⓒ]) §a([a-zA-Z0-9 ]+))$");
+ super("^ +(?:([A-Za-z,' ]*\\?)|§6 ([ⓐⓑⓒ]) §a([a-zA-Z0-9 ]+))$");
}
@Override
@@ -64,6 +64,7 @@ public class Trivia extends ChatPatternListener {
answers.put("What is the status of Goldor?", new String[]{"The Wither Lords"});
answers.put("What is the status of Storm?", new String[]{"The Wither Lords"});
answers.put("What is the status of Necron?", new String[]{"The Wither Lords"});
+ answers.put("What is the status of Maxor, Storm, Goldor and Necron?", new String[]{"The Wither Lords"});
answers.put("How many total Fairy Souls are there?", new String[]{"238 Fairy Souls"});
answers.put("How many Fairy Souls are there in Spider's Den?", new String[]{"19 Fairy Souls"});
answers.put("How many Fairy Souls are there in The End?", new String[]{"12 Fairy Souls"});
--
cgit