Rewrote the RNG system to be more unified

2025-08-05 22:15:27 +02:00 · 2019-01-24 20:45:26 -08:00
parent b7fc3f05e9
commit 1d6a142b12
47 changed files with 699 additions and 461 deletions
--- a/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java
+++ b/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java
@@ -0,0 +1,100 @@
+package com.gmail.nossr50.util.random;
+
+import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.util.player.UserManager;
+import org.bukkit.entity.Player;
+
+public class RandomChanceSkill implements RandomChanceExecution {
+
+    protected final PrimarySkillType primarySkillType;
+    protected final SubSkillType subSkillType;
+    protected final double probabilityCap;
+    private int skillLevel;
+
+    public RandomChanceSkill(Player player, SubSkillType subSkillType)
+    {
+        this.primarySkillType = subSkillType.getParentSkill();
+        this.subSkillType = subSkillType;
+        this.probabilityCap = RandomChanceUtil.LINEAR_CURVE_VAR;
+
+        if(player != null)
+            this.skillLevel = UserManager.getPlayer(player).getSkillLevel(primarySkillType);
+        else
+            this.skillLevel = 0;
+    }
+
+    public RandomChanceSkill(Player player, SubSkillType subSkillType, boolean hasCap)
+    {
+        if(hasCap)
+            this.probabilityCap = AdvancedConfig.getInstance().getMaximumProbability(subSkillType);
+        else
+            this.probabilityCap = RandomChanceUtil.LINEAR_CURVE_VAR;
+
+        this.primarySkillType = subSkillType.getParentSkill();
+        this.subSkillType = subSkillType;
+
+        if(player != null)
+            this.skillLevel = UserManager.getPlayer(player).getSkillLevel(primarySkillType);
+        else
+            this.skillLevel = 0;
+    }
+
+    /**
+     * The subskill corresponding to this RandomChanceSkill
+     * @return this subskill
+     */
+    public SubSkillType getSubSkill() {
+        return subSkillType;
+    }
+
+    /**
+     * Gets the skill level of the player who owns this RandomChanceSkill
+     * @return the current skill level relating to this RandomChanceSkill
+     */
+    public int getSkillLevel()
+    {
+        return skillLevel;
+    }
+
+    /**
+     * Modify the skill level used for this skill's RNG calculations
+     * @param newSkillLevel new skill level
+     */
+    public void setSkillLevel(int newSkillLevel) {
+        skillLevel = newSkillLevel;
+    }
+
+    /**
+     * The maximum bonus level for this skill
+     * This is when the skills level no longer increases the odds of success
+     * For example, a value of 25 will mean the success chance no longer grows after skill level 25
+     *
+     * @return the maximum bonus from skill level for this skill
+     */
+    public double getMaximumBonusLevelCap() {
+        return AdvancedConfig.getInstance().getMaxBonusLevel(subSkillType);
+    }
+
+    /**
+     * Gets the XPos used in the formula for success
+     *
+     * @return value of x for our success probability graph
+     */
+    @Override
+    public double getXPos() {
+        return getSkillLevel();
+    }
+
+    /**
+     * The maximum odds for this RandomChanceExecution
+     * For example, if this value is 10, then 10% odds would be the maximum and would be achieved only when xPos equaled the LinearCurvePeak
+     *
+     * @return maximum probability odds from 0.00 (no chance of ever happened) to 100.0 (probability can be guaranteed)
+     */
+    @Override
+    public double getProbabilityCap() {
+        return probabilityCap;
+    }
+}