Balance, textures and items

This commit is contained in:
Dimmerworld 2017-10-06 23:27:57 +11:00 committed by drcrazy
parent 4205beaead
commit 5d0b5c3ea3
20 changed files with 35 additions and 13 deletions

View file

@ -4,33 +4,33 @@ import net.minecraft.util.IStringSerializable;
import reborncore.api.power.EnumPowerTier;
public enum EnumPanelType implements IStringSerializable {
Basic("basic", 128, 64, 50000, EnumPowerTier.LOW, 0),
Hybrid("hybrid", 256, 128, 1000000, EnumPowerTier.MEDIUM, 1),
Advanced("advanced", 512, 256, 5000000, EnumPowerTier.HIGH, 2),
Ultimate("ultimate", 2048, 1042, 10000000, EnumPowerTier.EXTREME, 3),
Quantum("quantum", 16384, 8192, 100000000, EnumPowerTier.INSANE, 4);
Basic("basic", 1, 0, EnumPowerTier.MICRO, 0),
Hybrid("hybrid", 16, 0, EnumPowerTier.LOW, 1),
Advanced("advanced", 64, 6, EnumPowerTier.MEDIUM, 2),
Ultimate("ultimate", 256, 26, EnumPowerTier.HIGH, 3),
Quantum("quantum", 1024, 102, EnumPowerTier.EXTREME, 4);
private int ID;
private String friendlyName;
public int generationRateD = 128;
public int generationRateD = 10;
// Generation of FE during Day
public int generationRateN = 64;
public int generationRateN = 0;
// Generation of FE during Night
public int internalCapacity = 0;
public int internalCapacity = 1000;
// Internal FE storage of solar panel
public EnumPowerTier powerTier;
EnumPanelType(String friendlyName, int generationRateD, int generationRateN, int internalCapacity, EnumPowerTier tier, int ID) {
EnumPanelType(String friendlyName, int generationRateD, int generationRateN, EnumPowerTier tier, int ID) {
this.friendlyName = friendlyName;
this.ID = ID;
this.generationRateD = generationRateD;
this.generationRateN = generationRateN;
this.internalCapacity = internalCapacity;
this.internalCapacity = (generationRateD * 1000);
this.powerTier = tier;
}

View file

@ -45,7 +45,7 @@ public class ItemParts extends ItemTR {
"thorium_cell", "double_thorium_cell", "quad_thorium_cell", "plutonium_cell", "double_plutonium_cell",
"quad_plutonium_cell", "computer_monitor", "machine_parts", "neutron_reflector", "iridium_neutron_reflector",
"thick_neutron_reflector", "electronic_circuit", "advanced_circuit", "sap", "rubber", "scrap",
"carbon_mesh", "carbon_fiber", "coolant_simple", "coolant_triple", "coolant_six" };
"carbon_mesh", "carbon_fiber", "coolant_simple", "coolant_triple", "coolant_six", "solar_cell","compact_solar_cell","quantum_singularity" };
public ItemParts() {
this.setCreativeTab(TechRebornCreativeTab.instance);

View file

@ -36,6 +36,8 @@ import techreborn.blocks.generator.solarpanel.EnumPanelType;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
import java.util.List;
/**
* Created by modmuss50 on 25/02/2016.
*/
@ -56,6 +58,7 @@ public class TileSolarPanel extends TilePowerAcceptor implements IToolDrop {
private int generationRateD = 0;
private int generationRateN = 0;
private int internalCapacity = 0;
private int generationCurrent = 0;
private EnumPowerTier tier = null;
public TileSolarPanel() {
@ -78,10 +81,11 @@ public class TileSolarPanel extends TilePowerAcceptor implements IToolDrop {
if (isSunOut()) {
this.powerToAdd = this.generationRateD;
this.addEnergy(this.powerToAdd);
} else if(this.world.canBlockSeeSky(this.pos.up())) {
this.powerToAdd = this.generationRateN;
this.addEnergy(this.powerToAdd);
}
this.addEnergy(this.powerToAdd);
}
public boolean isSunOut() {
@ -113,7 +117,7 @@ public class TileSolarPanel extends TilePowerAcceptor implements IToolDrop {
@Override
public double getBaseMaxOutput() {
return generationRateD;
return powerToAdd;
}
@Override

View file

@ -86,6 +86,21 @@
"layer0": "techreborn:items/part/kanthal_heating_coil"
}
},
"solar_cell": {
"textures": {
"layer0": "techreborn:items/part/solar_cell"
}
},
"compact_solar_cell": {
"textures": {
"layer0": "techreborn:items/part/compact_solar_cell"
}
},
"quantum_singularity": {
"textures": {
"layer0": "techreborn:items/part/quantum_singularity"
}
},
"super_conductor": {
"textures": {
"layer0": "techreborn:items/part/super_conductor"

View file

@ -524,6 +524,9 @@ item.techreborn.part.advanced_circuit.name=Advanced Electronic Circuit
item.techreborn.part.coolant_simple.name=10k Coolant Cell
item.techreborn.part.coolant_triple.name=30k Coolant Cell
item.techreborn.part.coolant_six.name=60k Coolant Cell
item.techreborn.part.solar_cell.name=Solar Cell
item.techreborn.part.compact_solar_cell.name=Compact Solar Cell
item.techreborn.part.quantum_singularity.name=Quantum Singularity
item.techreborn.frequencyTransmitter.name=Frequency Transmitter

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 650 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 813 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 650 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 813 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 653 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 813 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 189 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 B