tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Tweaked wire electrocution damage range

Browse source
This commit is contained in:
Robert S 2014-04-14 19:33:24 -04:00
parent bb1aaecc5b
commit c04955cd8a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
electrical/src/main/scala/resonantinduction/electrical/wire/PartAdvancedWire.java
View file

@ -16,6 +16,7 @@ import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.MultipartUtility; import resonantinduction.core.MultipartUtility;
import resonantinduction.electrical.Electrical; import resonantinduction.electrical.Electrical;
import universalelectricity.api.CompatibilityModule; import universalelectricity.api.CompatibilityModule;
import universalelectricity.api.UniversalElectricity;
import universalelectricity.api.electricity.IElectricalNetwork; import universalelectricity.api.electricity.IElectricalNetwork;
import universalelectricity.api.energy.IConductor; import universalelectricity.api.energy.IConductor;
import calclavia.lib.prefab.CustomDamageSource; import calclavia.lib.prefab.CustomDamageSource;
@ -94,11 +95,11 @@ public abstract class PartAdvancedWire extends PartConductor
if (this.getNetwork() instanceof IElectricalNetwork && this.getNetwork().getRequest() > 0) 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) if (damage > 0)
entity.attackEntityFrom(CustomDamageSource.electrocution, Math.max(damage, 10)); entity.attackEntityFrom(CustomDamageSource.electrocution, Math.min(damage, 10));
} }
} }