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

Fixed iron and tin wire resistance too high

Browse source
This commit is contained in:
Calclavia 2014-02-18 20:52:59 +08:00
parent d7c4cc712d
commit 7ba1c1c52e
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
electrical/src/main/java/resonantinduction/electrical/wire/EnumWireMaterial.java
View file

@ -19,11 +19,11 @@ public enum EnumWireMaterial
/** Copper: General. */
COPPER("Copper", 1.68f, 5, 300, 184, 115, 51),
/** Tin: Low shock, cheap */
TIN("Tin", 11f, 1, 2000, 132, 132, 130),
TIN("Tin", 3.1f, 1, 2000, 132, 132, 130),
/** Iron: High Capacity */
IRON("Iron", 10f, 3, 8000, 97, 102, 105),
IRON("Iron", 3f, 3, 8000, 97, 102, 105),
/** Aluminum: High Shock */
ALUMINUM("Aluminum", 2.82f, 10, 3200, 215, 205, 181),
ALUMINUM("Aluminum", 2.6f, 10, 3200, 215, 205, 181),
/** Aluminum: Low Resistance */
SILVER("Silver", 1.59f, 5, 4000, 192, 192, 192),
/** Superconductor: Over-powered */

10
electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java
View file

@ -50,11 +50,6 @@ public class PartFramedWire extends PartFramedConnection<EnumWireMaterial, ICond
breakIcon = RenderFramedWire.breakIcon;
}
public PartFramedWire(int typeID)
{
this(EnumWireMaterial.values()[typeID]);
}
public PartFramedWire(EnumWireMaterial type)
{
super();
@ -62,6 +57,11 @@ public class PartFramedWire extends PartFramedConnection<EnumWireMaterial, ICond
material = type;
}
public PartFramedWire(int typeID)
{
this(EnumWireMaterial.values()[typeID]);
}
@Override
public String getType()
{