leech cap stat

Author: RobertSkalko

CHANGELOG.txt

@@ -166,4 +166,6 @@ v5.0.4
 
 - death favor added. If you die you lose favor, if you loot chests you gain favor. You can also regain favor slowly over time if it's below a certain point.
 
-- added new supp gems: LMP, GMP, Barrage versions, faster projectiles
+- added new supp gems: LMP, GMP, Barrage versions, faster projectiles
+
+- added leech cap stat, and base leech is now 5% total hp etc capped per second

src/main/java/com/robertx22/age_of_exile/capability/entity/EntityLeechData.java

@@ -1,5 +1,6 @@
 package com.robertx22.age_of_exile.capability.entity;
 
+import com.robertx22.age_of_exile.database.data.stats.types.resources.LeechCapStat;
 import com.robertx22.age_of_exile.saveclasses.unit.ResourceType;
 
 import java.util.HashMap;
@@ -19,15 +20,15 @@ public void addLeech(ResourceType type, float num) {
         map.put(type, fi);
     }
 
-    static float MAX_LEECH_PERCENT_PER_SECOND = 0.1F; // todo maybe a stat
-
     public void onSecondUseLeeches(EntityData data) {
 
+        float leechMaxPerSec = data.getUnit().getCalculatedStat(LeechCapStat.getInstance()).getValueOrBase(LeechCapStat.getInstance()) / 100F;
+
         for (Map.Entry<ResourceType, Float> entry : map.entrySet()) {
 
             float num = entry.getValue();
 
-            float max = MAX_LEECH_PERCENT_PER_SECOND * data.getResources().get(data.entity, entry.getKey());
+            float max = leechMaxPerSec * data.getResources().getMax(data.entity, entry.getKey());
 
             if (num > max) {
                 num = max;

src/main/java/com/robertx22/age_of_exile/database/data/stats/types/resources/LeechCapStat.java

@@ -0,0 +1,34 @@
+package com.robertx22.age_of_exile.database.data.stats.types.resources;
+
+import com.robertx22.age_of_exile.database.data.stats.Stat;
+import com.robertx22.age_of_exile.uncommon.enumclasses.Elements;
+
+public class LeechCapStat extends Stat {
+    public static LeechCapStat getInstance() {
+        return SingletonHolder.INSTANCE;
+    }
+
+    private static class SingletonHolder {
+        private static final LeechCapStat INSTANCE = new LeechCapStat();
+    }
+
+    @Override
+    public Elements getElement() {
+        return Elements.Physical;
+    }
+
+    @Override
+    public String locDescForLangFile() {
+        return "Your leech/resource on hits are capped to x% per second, this stat increases that.";
+    }
+
+    @Override
+    public String locNameForLangFile() {
+        return "Total Leech Per Second";
+    }
+
+    @Override
+    public String GUID() {
+        return "leech_per_sec";
+    }
+}

src/main/java/com/robertx22/age_of_exile/database/data/stats/types/resources/blood/BloodUser.java

@@ -8,8 +8,6 @@
 import com.robertx22.age_of_exile.uncommon.enumclasses.Elements;
 import net.minecraft.ChatFormatting;
 
-import com.robertx22.age_of_exile.database.data.stats.Stat.StatGroup;
-
 public class BloodUser extends Stat {
     public static String GUID = "blood_user";
 
@@ -28,9 +26,6 @@ public StatNameRegex getStatNameRegex() {
         return StatNameRegex.JUST_NAME;
     }
 
-    public static BloodUser getInstance() {
-        return BloodUser.SingletonHolder.INSTANCE;
-    }
 
     @Override
     public String locDescForLangFile() {
@@ -55,8 +50,12 @@ public boolean IsPercent() {
     @Override
     public String locNameForLangFile() {
         return ChatFormatting.GRAY + "You now use " + Blood.getInstance()
-            .getIconNameFormat() + " instead of " + Mana.getInstance()
-            .getIconNameFormat();
+                .getIconNameFormat() + " instead of " + Mana.getInstance()
+                .getIconNameFormat();
+    }
+
+    public static BloodUser getInstance() {
+        return BloodUser.SingletonHolder.INSTANCE;
     }
 
     private static class SingletonHolder {

src/main/java/com/robertx22/age_of_exile/database/registrators/StatsRegister.java

@@ -20,6 +20,7 @@
 import com.robertx22.age_of_exile.database.data.stats.types.offense.SkillDamage;
 import com.robertx22.age_of_exile.database.data.stats.types.offense.WeaponDamage;
 import com.robertx22.age_of_exile.database.data.stats.types.resources.DamageAbsorbedByMana;
+import com.robertx22.age_of_exile.database.data.stats.types.resources.LeechCapStat;
 import com.robertx22.age_of_exile.database.data.stats.types.resources.RegeneratePercentStat;
 import com.robertx22.age_of_exile.database.data.stats.types.resources.blood.Blood;
 import com.robertx22.age_of_exile.database.data.stats.types.resources.blood.BloodUser;
@@ -66,8 +67,10 @@ public void registerAll() {
                         add(new AilmentProcStat(ailment));
                     }
 
-                    add(JewelSocketStat.getInstance());
+                    add(LeechCapStat.getInstance());
 
+                    add(JewelSocketStat.getInstance());
+
                     add(new BonusPhysicalAsElemental(Elements.Elemental));
                     add(new MaxElementalResist(Elements.Elemental));
 

src/main/java/com/robertx22/age_of_exile/mmorpg/MMORPG.java

@@ -60,7 +60,7 @@
 public class MMORPG {
 
     // DISABLE WHEN PUBLIC BUILD
-    public static boolean RUN_DEV_TOOLS = false;
+    public static boolean RUN_DEV_TOOLS = true;
 
     private static final String PROTOCOL_VERSION = "1";
     public static final SimpleChannel NETWORK = NetworkRegistry.newSimpleChannel(

src/main/java/com/robertx22/age_of_exile/saveclasses/unit/StatData.java

@@ -58,6 +58,13 @@ public float getValue() {
         // todo this shouldnt be needed return Mth.clamp(v1, stat.min, stat.max);
     }
 
+    public float getValueOrBase(Stat stat) {
+
+        if (this.isNotZero()) {
+            return v1;
+        }
+        return stat.base;
+    }
 
     public boolean isNotZero() {
         return v1 != 0 || this.m != 1;

src/main/java/com/robertx22/age_of_exile/saveclasses/unit/Unit.java

@@ -80,13 +80,10 @@ public StatData getCalculatedStat(Stat stat) {
     }
 
     public StatData getCalculatedStat(String guid) {
-
         if (getStats().stats == null) {
             this.initStats();
         }
-
         return getStats().stats.getOrDefault(guid, StatData.empty());
-
     }
 
     public Unit() {

src/main/java/com/robertx22/age_of_exile/uncommon/effectdatas/rework/action/RestoreResourceAction.java

@@ -35,13 +35,11 @@ public void activate(EffectEvent event, EffectSides statSource, StatData data, S
         float val = num_provider.getValue(event, event.getSide(statSource), data);
         val *= event.data.getNumber(EventData.ATTACK_COOLDOWN).number; // todo test
 
-
         if (this.restore_type == RestoreType.leech) {
             event.targetData.leech.addLeech(type, val);
             return;
         }
 
-
         EventBuilder<RestoreResourceEvent> restore = EventBuilder.ofRestore(event.source, event.getSide(side), type, restore_type, val);
         if (event.data.isSpellEffect()) {
             restore.setSpell(event.getSpell());