Merge pull request #337

* trophy fillet tooltip; trophy info tooltip in chat

* add new config options for trophy

* fix up some settings

* Merge remote-tracking branch 'upstream/beta' into trophy-data

* using TrophyFishJson to load repo data

* fixed missing separators for total number

* fixed trophy fish sack display

1 files changed, 12 insertions, 0 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java
index e7fcff1ff..2374a9e2f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java
@@ -44,6 +44,12 @@ public class Fishing {
     public boolean trophyFishTotalAmount = false;
 
     @Expose
+    @ConfigOption(name = "Trophy Fish Info", desc = "Show information and stats about a trophy fish when hovering over a catch message in chat.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 0)
+    public boolean trophyFishTooltip = true;
+
+    @Expose
     @ConfigOption(name = "Bronze Duplicates", desc = "Hide duplicate messages for bronze trophy fishes from chat.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
@@ -56,6 +62,12 @@ public class Fishing {
     public boolean trophyFishSilverHider = false;
 
     @Expose
+    @ConfigOption(name = "Fillet Tooltip", desc = "Show fillet value of trophy fish in tooltip.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 0)
+    public boolean trophyFilletTooltip = true;
+
+    @Expose
     @ConfigOption(name = "Odger Waypoint", desc = "Show the Odger waypoint when trophy fishes are in the inventory and no lava rod in hand.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)