From e576c1cc33f2eee55ab19f81dfad6b74da9b86d9 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Tue, 26 Sep 2023 23:50:11 +0200 Subject: [PATCH] Implemented a max point limit per rarity for fish that are too long --- src/main/java/com/alttd/fishingevent/config/Config.java | 3 ++- src/main/java/com/alttd/fishingevent/listeners/CatchFish.java | 2 +- src/main/java/com/alttd/fishingevent/objects/Rarity.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/alttd/fishingevent/config/Config.java b/src/main/java/com/alttd/fishingevent/config/Config.java index 87d7b61..769f292 100644 --- a/src/main/java/com/alttd/fishingevent/config/Config.java +++ b/src/main/java/com/alttd/fishingevent/config/Config.java @@ -79,7 +79,8 @@ public class Config extends AbstractConfig { getFishTypes(rarityPrefix), config.getInt(rarityPrefix, "chance", 1), config.getDouble(rarityPrefix, "multiplier", 1.0), - config.getInt(rarityPrefix, "rarity-value", 1) + config.getInt(rarityPrefix, "rarity-value", 1), + config.getInt(rarityPrefix, "max-point-limit", 1000) ); RARITY_SET.add(rarity); } diff --git a/src/main/java/com/alttd/fishingevent/listeners/CatchFish.java b/src/main/java/com/alttd/fishingevent/listeners/CatchFish.java index bf34057..7e41907 100644 --- a/src/main/java/com/alttd/fishingevent/listeners/CatchFish.java +++ b/src/main/java/com/alttd/fishingevent/listeners/CatchFish.java @@ -93,7 +93,7 @@ public class CatchFish implements Listener { Fish fish = optionalFish.get(); float length = fish.generateLength(); - int pointsValue = pointsManagement.calculatePoints(fish.getRarity(), length); + int pointsValue = Math.min(fish.getRarity().maxPointLimit(), pointsManagement.calculatePoints(fish.getRarity(), length)); Optional fishItem = fish.createItem(player, length, pointsValue); if (fishItem.isEmpty()) { player.sendMiniMessage(Messages.OTHER_ERRORS.UNABLE_TO_CREATE_FISH, null); diff --git a/src/main/java/com/alttd/fishingevent/objects/Rarity.java b/src/main/java/com/alttd/fishingevent/objects/Rarity.java index 61d4ac3..f4af782 100644 --- a/src/main/java/com/alttd/fishingevent/objects/Rarity.java +++ b/src/main/java/com/alttd/fishingevent/objects/Rarity.java @@ -4,5 +4,5 @@ import net.kyori.adventure.text.Component; import java.util.Set; -public record Rarity(String internalName, Component displayName, String displayNameString, Set fishTypes, int chance, double multiplier, int rarityValue) { +public record Rarity(String internalName, Component displayName, String displayNameString, Set fishTypes, int chance, double multiplier, int rarityValue, int maxPointLimit) { }