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

Buffed wires and battery

Browse source
This commit is contained in:
Calclavia 2014-02-13 21:59:50 +08:00
parent 6031f8181f
commit 873d7b12cb
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
electrical/src/main/java/resonantinduction/electrical/battery/TileBattery.java
View file

@ -90,9 +90,9 @@ public class TileBattery extends TileElectrical implements IConnector<BatteryNet
if (!this.worldObj.isRemote)
{
energy.setMaxTransfer((long) Math.min(Math.pow(1000, this.getNetwork().getConnectors().size()), energy.getEnergyCapacity()));
energy.setMaxTransfer((long) Math.min(Math.pow(10000, this.getNetwork().getConnectors().size()), energy.getEnergyCapacity()));
long produce = this.produce();
long produce = produce();
if ((markDistributionUpdate || produce > 0) && ticks % 5 == 0)
{

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

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