Refactored isShield and removed equipflag.

This commit is contained in:
2024-03-09 11:26:19 -05:00
parent 658b442b36
commit 6f028ab8c8
9 changed files with 65 additions and 61 deletions
@@ -334,22 +334,24 @@ public class CombatUtilities {
if (agent.getEquip().get(1) != null) {
return agent.getEquip().get(1).getItemBase().getDamageType();
}
if (agent.getEquip().get(2) != null && agent.getEquip().get(2).getItemBase().isShield() == false) {
if (agent.getEquip().get(2) != null && ItemTemplate.isShield(agent.getEquip().get(2).template) == false) {
return agent.getEquip().get(2).getItemBase().getDamageType();
}
return dt;
}
public static double getMinDmg(Mob agent) {
if(agent.equip.get(2) != null && !agent.equip.get(2).getItemBase().isShield())
if (agent.equip.get(2) != null && !ItemTemplate.isShield(agent.equip.get(2).template))
return agent.minDamageHandTwo;
else return agent.minDamageHandOne;
else
return agent.minDamageHandOne;
}
public static double getMaxDmg(Mob agent) {
if(agent.equip.get(2) != null && !agent.equip.get(2).getItemBase().isShield())
if (agent.equip.get(2) != null && !ItemTemplate.isShield(agent.equip.get(2).template))
return agent.maxDamageHandTwo;
else return agent.maxDamageHandOne;
else
return agent.maxDamageHandOne;
}
}