|
|
@ -221,29 +221,9 @@ public class EffectsBase { |
|
|
|
if (damageType1.isEmpty() && damageType2.isEmpty() && damageType3.isEmpty()) |
|
|
|
if (damageType1.isEmpty() && damageType2.isEmpty() && damageType3.isEmpty()) |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
|
|
|
|
if (!EffectsBase.EffectDamageTypes.containsKey(eb.getToken())) { |
|
|
|
if (!EffectsBase.EffectDamageTypes.containsKey(eb.getToken())) |
|
|
|
EffectsBase.EffectDamageTypes.put(eb.getToken(), new HashSet<>()); |
|
|
|
EffectsBase.EffectDamageTypes.put(eb.getToken(), new HashSet<>()); |
|
|
|
} |
|
|
|
|
|
|
|
if (damageType1.equalsIgnoreCase("Crushing")) |
|
|
|
|
|
|
|
damageType1 = "Crush"; |
|
|
|
|
|
|
|
if (damageType1.equalsIgnoreCase("Piercing")) |
|
|
|
|
|
|
|
damageType1 = "Pierce"; |
|
|
|
|
|
|
|
if (damageType1.equalsIgnoreCase("Slashing")) |
|
|
|
|
|
|
|
damageType1 = "Slash"; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (damageType2.equalsIgnoreCase("Crushing")) |
|
|
|
|
|
|
|
damageType2 = "Crush"; |
|
|
|
|
|
|
|
if (damageType2.equalsIgnoreCase("Piercing")) |
|
|
|
|
|
|
|
damageType2 = "Pierce"; |
|
|
|
|
|
|
|
if (damageType2.equalsIgnoreCase("Slashing")) |
|
|
|
|
|
|
|
damageType2 = "Slash"; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (damageType3.equalsIgnoreCase("Crushing")) |
|
|
|
|
|
|
|
damageType3 = "Crush"; |
|
|
|
|
|
|
|
if (damageType3.equalsIgnoreCase("Piercing")) |
|
|
|
|
|
|
|
damageType3 = "Pierce"; |
|
|
|
|
|
|
|
if (damageType3.equalsIgnoreCase("Slashing")) |
|
|
|
|
|
|
|
damageType3 = "Slash"; |
|
|
|
|
|
|
|
Enum.SourceType dt = getDamageType(damageType1); |
|
|
|
Enum.SourceType dt = getDamageType(damageType1); |
|
|
|
if (dt != null) |
|
|
|
if (dt != null) |
|
|
|
EffectsBase.EffectDamageTypes.get(eb.token).add(dt); |
|
|
|
EffectsBase.EffectDamageTypes.get(eb.token).add(dt); |
|
|
|