From c04955cd8ac69b6e459b68baac7c9ad2ccf61158 Mon Sep 17 00:00:00 2001 From: Robert S Date: Mon, 14 Apr 2014 19:33:24 -0400 Subject: [PATCH] Tweaked wire electrocution damage range --- .../resonantinduction/electrical/wire/PartAdvancedWire.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/electrical/src/main/scala/resonantinduction/electrical/wire/PartAdvancedWire.java b/electrical/src/main/scala/resonantinduction/electrical/wire/PartAdvancedWire.java index 3c1dc5cf5..9c3baa642 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/wire/PartAdvancedWire.java +++ b/electrical/src/main/scala/resonantinduction/electrical/wire/PartAdvancedWire.java @@ -16,6 +16,7 @@ import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.MultipartUtility; import resonantinduction.electrical.Electrical; import universalelectricity.api.CompatibilityModule; +import universalelectricity.api.UniversalElectricity; import universalelectricity.api.electricity.IElectricalNetwork; import universalelectricity.api.energy.IConductor; import calclavia.lib.prefab.CustomDamageSource; @@ -94,11 +95,11 @@ public abstract class PartAdvancedWire extends PartConductor if (this.getNetwork() instanceof IElectricalNetwork && this.getNetwork().getRequest() > 0) { - damage = ((IElectricalNetwork) this.getNetwork()).getVoltage() / 60; + damage = ((IElectricalNetwork) this.getNetwork()).getVoltage() / UniversalElectricity.DEFAULT_VOLTAGE; } if (damage > 0) - entity.attackEntityFrom(CustomDamageSource.electrocution, Math.max(damage, 10)); + entity.attackEntityFrom(CustomDamageSource.electrocution, Math.min(damage, 10)); } }