From f7273556ebbebfd75380c18cff2720e9b1be1a2d Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Sat, 30 Mar 2019 23:10:51 -0700 Subject: [PATCH] Possible fix for https://github.com/collinsmith/riiablo/issues/24#issuecomment-478314953 --- core/src/com/riiablo/item/PropertyList.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core/src/com/riiablo/item/PropertyList.java b/core/src/com/riiablo/item/PropertyList.java index 95a39493..9a1d41b9 100644 --- a/core/src/com/riiablo/item/PropertyList.java +++ b/core/src/com/riiablo/item/PropertyList.java @@ -21,6 +21,8 @@ public class PropertyList { private static final int[] POISONDMG = {Stat.poisonmindam, Stat.poisonmaxdam, Stat.poisonlength}; private static final int[] ENHANCEDDMG = {Stat.item_mindamage_percent, Stat.item_maxdamage_percent}; private static final int[] MINDMG = {Stat.mindamage, Stat.maxdamage}; + private static final int[] MINDMG2 = {Stat.mindamage, Stat.secondary_mindamage, Stat.item_throw_mindamage}; + private static final int[] MAXDMG2 = {Stat.maxdamage, Stat.secondary_maxdamage, Stat.item_throw_maxdamage}; final IntMap props = new IntMap<>(); @@ -150,6 +152,14 @@ public class PropertyList { props.put(Stat.poisondam, new Stat.Aggregate(Stat.poisondam, "strModPoisonDamage", "strModPoisonDamageRange", poisonmindam, poisonmaxdam, poisonlength)); } + if (containsAll(MINDMG2) && allEqual(MINDMG2)) { + for (int i = 1; i < MINDMG2.length; i++) props.remove(MINDMG2[i]); + } + + if (containsAll(MAXDMG2) && allEqual(MAXDMG2)) { + for (int i = 1; i < MAXDMG2.length; i++) props.remove(MAXDMG2[i]); + } + return this; }