From 6ba873d572f17eb1db3af10ab73e418f69a8da1c Mon Sep 17 00:00:00 2001 From: Calclavia Date: Tue, 24 Dec 2013 14:28:52 +0800 Subject: [PATCH] Rebalanced wire capacities --- Universal-Electricity | 2 +- src/resonantinduction/wire/EnumWireMaterial.java | 12 ++++++------ src/resonantinduction/wire/part/TraitEnergySink.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Universal-Electricity b/Universal-Electricity index d2034508..78435458 160000 --- a/Universal-Electricity +++ b/Universal-Electricity @@ -1 +1 @@ -Subproject commit d2034508e7de77a7b64905a0236a6356ad2a2478 +Subproject commit 784354589b4b3ad36e2c095ae829388b3e639e32 diff --git a/src/resonantinduction/wire/EnumWireMaterial.java b/src/resonantinduction/wire/EnumWireMaterial.java index 943ed9ed..78151446 100644 --- a/src/resonantinduction/wire/EnumWireMaterial.java +++ b/src/resonantinduction/wire/EnumWireMaterial.java @@ -17,17 +17,17 @@ import codechicken.lib.colour.ColourRGBA; public enum EnumWireMaterial { /** 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("Tin", 11f, 1, 15, 132, 132, 130), + TIN("Tin", 11f, 1, 100, 132, 132, 130), /** Iron: High Capacity */ - IRON("Iron", 10f, 3, 100, 97, 102, 105), + IRON("Iron", 10f, 3, 400, 97, 102, 105), /** Aluminum: High Shock */ - ALUMINUM("Aluminum", 2.82f, 10, 80, 215, 205, 181), + ALUMINUM("Aluminum", 2.82f, 10, 320, 215, 205, 181), /** 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("Superconductor", 0, 10, 200, 255, 255, 1); + SUPERCONDUCTOR("Superconductor", 0, 10, 1000, 255, 255, 1); public final float resistance; public final int damage; diff --git a/src/resonantinduction/wire/part/TraitEnergySink.java b/src/resonantinduction/wire/part/TraitEnergySink.java index e77d0725..74732379 100644 --- a/src/resonantinduction/wire/part/TraitEnergySink.java +++ b/src/resonantinduction/wire/part/TraitEnergySink.java @@ -86,7 +86,7 @@ public class TraitEnergySink extends TileMultipart implements IEnergySink TMultiPart part = this.partMap(dir.ordinal()); if (this.icInterfaces.contains(part)) - { + {System.out.println("DEMAND"+((IEnergySink) part).demandedEnergyUnits()); return ((IEnergySink) part).demandedEnergyUnits(); } }