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

Rebalanced wire capacities

Browse source
This commit is contained in:
Calclavia 2013-12-24 14:28:52 +08:00
parent 18c9e3f94c
commit 6ba873d572
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Universal-Electricity

@ -1 +1 @@
Subproject commit d2034508e7de77a7b64905a0236a6356ad2a2478 Subproject commit 784354589b4b3ad36e2c095ae829388b3e639e32

12
src/resonantinduction/wire/EnumWireMaterial.java
View file

@ -17,17 +17,17 @@ import codechicken.lib.colour.ColourRGBA;
public enum EnumWireMaterial public enum EnumWireMaterial
{ {
/** Copper: General. */ /** Copper: General. */
COPPER("Copper", 1.68f, 5, 30, 184, 115, 51), COPPER("Copper", 1.68f, 5, 150, 184, 115, 51),
/** Tin: Low shock, cheap */ /** Tin: Low shock, cheap */
TIN("Tin", 11f, 1, 15, 132, 132, 130), TIN("Tin", 11f, 1, 100, 132, 132, 130),
/** Iron: High Capacity */ /** Iron: High Capacity */
IRON("Iron", 10f, 3, 100, 97, 102, 105), IRON("Iron", 10f, 3, 400, 97, 102, 105),
/** Aluminum: High Shock */ /** Aluminum: High Shock */
ALUMINUM("Aluminum", 2.82f, 10, 80, 215, 205, 181), ALUMINUM("Aluminum", 2.82f, 10, 320, 215, 205, 181),
/** Aluminum: Low Resistance */ /** Aluminum: Low Resistance */
SILVER("Silver", 1.59f, 5, 40, 192, 192, 192), SILVER("Silver", 1.59f, 5, 200, 192, 192, 192),
/** Superconductor: Over-powered */ /** Superconductor: Over-powered */
SUPERCONDUCTOR("Superconductor", 0, 10, 200, 255, 255, 1); SUPERCONDUCTOR("Superconductor", 0, 10, 1000, 255, 255, 1);
public final float resistance; public final float resistance;
public final int damage; public final int damage;

2
src/resonantinduction/wire/part/TraitEnergySink.java
View file

@ -86,7 +86,7 @@ public class TraitEnergySink extends TileMultipart implements IEnergySink
TMultiPart part = this.partMap(dir.ordinal()); TMultiPart part = this.partMap(dir.ordinal());
if (this.icInterfaces.contains(part)) if (this.icInterfaces.contains(part))
{ {System.out.println("DEMAND"+((IEnergySink) part).demandedEnergyUnits());
return ((IEnergySink) part).demandedEnergyUnits(); return ((IEnergySink) part).demandedEnergyUnits();
} }
} }