diff --git a/CHANGELOG.md b/CHANGELOG.md index 46dcbea8..0d857baa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## Unreleased +- Minor: Add herbiboar support to kill count notifier. (#602) - Minor: Enable the leagues notifier again. (#597) - Bugfix: Identify all CoX members from raiding party widget. (#600) - Dev: Clarify json example for kill counter notifier to include `time` and `isPersonalBest`. (#601) diff --git a/docs/json-examples.md b/docs/json-examples.md index 577eef9e..6bd2df46 100644 --- a/docs/json-examples.md +++ b/docs/json-examples.md @@ -337,7 +337,7 @@ JSON for Kill Count Notifications: } ``` -When an associated duration is not found, `extra.time` is reported as zero seconds and `extra.isPersonalBest` is not populated. +When an associated duration is not found, `extra.time` and `extra.isPersonalBest` are not populated. Note: when `boss` is `Penance Queen`, `count` refers to the high level gamble count, rather than kill count. diff --git a/src/main/java/dinkplugin/VersionManager.java b/src/main/java/dinkplugin/VersionManager.java index 544a694d..89785be0 100644 --- a/src/main/java/dinkplugin/VersionManager.java +++ b/src/main/java/dinkplugin/VersionManager.java @@ -131,5 +131,6 @@ public static Version of(@NotNull String version) { register("1.10.2", "Chat notifier can read commands and RL notifications"); register("1.10.5", "Pet notifications now report rarity and luck"); register("1.10.12", "Rarity is now reported for notable pickpocket loot"); + register("1.10.14", "Kill count notifier now triggers for Herbiboar"); } } diff --git a/src/main/java/dinkplugin/notifiers/KillCountNotifier.java b/src/main/java/dinkplugin/notifiers/KillCountNotifier.java index 47aa3d13..8e73e7ef 100644 --- a/src/main/java/dinkplugin/notifiers/KillCountNotifier.java +++ b/src/main/java/dinkplugin/notifiers/KillCountNotifier.java @@ -38,7 +38,7 @@ public class KillCountNotifier extends BaseNotifier { public static final int KILL_COUNT_SPAM_FILTER = 4930; public static final String SPAM_WARNING = "Kill Count Notifier requires disabling the in-game setting: Filter out boss kill-count with spam-filter"; - private static final Pattern PRIMARY_REGEX = Pattern.compile("Your (?.+)\\s(?kill|chest|completion)\\s?count is: (?[\\d,]+)\\b", Pattern.CASE_INSENSITIVE); + private static final Pattern PRIMARY_REGEX = Pattern.compile("Your (?.+)\\s(?kill|chest|completion|harvest)\\s?count is: (?[\\d,]+)\\b", Pattern.CASE_INSENSITIVE); private static final Pattern SECONDARY_REGEX = Pattern.compile("Your (?:completed|subdued) (?.+) count is: (?[\\d,]+)\\b"); private static final Pattern TIME_REGEX = Pattern.compile("(?:Duration|time|Subdued in):? (?