Browse Source

Raised overfishing limit + improved tips

nossr50 6 years ago
parent
commit
a53505ee0b

+ 7 - 0
Changelog.txt

@@ -1,3 +1,10 @@
+Version 2.1.59
+    Raised the overfishing limit from 3 to 10
+    Improved the overfishing messages to be more clear about its mechanics
+    Overfishing locale keys renamed "Fishing.ScarcityTip" and "Fishing.LowResourcesTip"
+
+    NOTES: This and other exploit prevention measures are much more customizable in 2.2, which shouldn't be too far off.
+
 Version 2.1.58
 Version 2.1.58
     Fixed the wrong locale string being used for Mining Double Drops
     Fixed the wrong locale string being used for Mining Double Drops
 
 

+ 1 - 1
pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.58</version>
+    <version>2.1.59</version>
     <name>mcMMO</name>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
     <scm>

+ 1 - 1
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -385,7 +385,7 @@ public class PlayerListener implements Listener {
                 {
                 {
                     if(fishingManager.isExploitingFishing(event.getHook().getLocation().toVector()))
                     if(fishingManager.isExploitingFishing(event.getHook().getLocation().toVector()))
                     {
                     {
-                        player.sendMessage(LocaleLoader.getString("Fishing.Scarcity"));
+                        player.sendMessage(LocaleLoader.getString("Fishing.ScarcityTip", 3));
                         event.setExpToDrop(0);
                         event.setExpToDrop(0);
                         Item caughtItem = (Item) caught;
                         Item caughtItem = (Item) caught;
                         caughtItem.remove();
                         caughtItem.remove();

+ 2 - 2
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java

@@ -44,7 +44,7 @@ import java.util.*;
 
 
 public class FishingManager extends SkillManager {
 public class FishingManager extends SkillManager {
     public static final int FISHING_ROD_CAST_CD_MILLISECONDS = 100;
     public static final int FISHING_ROD_CAST_CD_MILLISECONDS = 100;
-    public static final int OVERFISH_LIMIT = 4;
+    public static final int OVERFISH_LIMIT = 10;
     private final long FISHING_COOLDOWN_SECONDS = 1000L;
     private final long FISHING_COOLDOWN_SECONDS = 1000L;
 
 
     private long fishingRodCastTimestamp = 0L;
     private long fishingRodCastTimestamp = 0L;
@@ -139,7 +139,7 @@ public class FishingManager extends SkillManager {
 
 
         if(fishCaughtCounter + 1 == OVERFISH_LIMIT)
         if(fishCaughtCounter + 1 == OVERFISH_LIMIT)
         {
         {
-            getPlayer().sendMessage(LocaleLoader.getString("Fishing.LowResources"));
+            getPlayer().sendMessage(LocaleLoader.getString("Fishing.LowResourcesTip", 3));
         }
         }
 
 
         //If the new bounding box does not intersect with the old one, then update our bounding box reference
         //If the new bounding box does not intersect with the old one, then update our bounding box reference

+ 2 - 2
src/main/resources/locale/locale_en_US.properties

@@ -223,10 +223,10 @@ Excavation.Skills.GigaDrillBreaker.Refresh=[[GREEN]]Your [[YELLOW]]Giga Drill Br
 Excavation.Skills.GigaDrillBreaker.Other.Off=Giga Drill Breaker[[GREEN]] has worn off for [[YELLOW]]{0}
 Excavation.Skills.GigaDrillBreaker.Other.Off=Giga Drill Breaker[[GREEN]] has worn off for [[YELLOW]]{0}
 Excavation.Skills.GigaDrillBreaker.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Giga Drill Breaker!
 Excavation.Skills.GigaDrillBreaker.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Giga Drill Breaker!
 #FISHING
 #FISHING
-Fishing.Scarcity=[[YELLOW]]&oThis area is suffering from overfishing, try fishing in a new area.
+Fishing.ScarcityTip=[[YELLOW]]&oThis area is suffering from overfishing, cast your rod in a different spot for more fish. At least {0} blocks away.
 Fishing.Scared=[[GRAY]]&oChaotic movements will scare fish!
 Fishing.Scared=[[GRAY]]&oChaotic movements will scare fish!
 Fishing.Exhausting=[[RED]]&oImproper use of the fishing rod will cause fatigue and wear out the rod!
 Fishing.Exhausting=[[RED]]&oImproper use of the fishing rod will cause fatigue and wear out the rod!
-Fishing.LowResources=[[GRAY]]You sense that there might not be many fish left in this area.
+Fishing.LowResourcesTip=[[GRAY]]You sense that there might not be many fish left in this area. Try fishing at least {0} blocks away.
 Fishing.Ability.Info=Magic Hunter: [[GRAY]] **Improves With Treasure Hunter Rank**
 Fishing.Ability.Info=Magic Hunter: [[GRAY]] **Improves With Treasure Hunter Rank**
 Fishing.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (SHAKE)
 Fishing.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (SHAKE)
 Fishing.Ability.Locked.1=LOCKED UNTIL {0}+ SKILL (ICE FISHING)
 Fishing.Ability.Locked.1=LOCKED UNTIL {0}+ SKILL (ICE FISHING)