Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed RTG generator not using items

Browse Source
This commit is contained in:
Anuken
2018-10-18 16:33:39 -04:00
parent 91a2dfab36
commit cecf32e52e
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java
View File

@@ -85,7 +85,6 @@ public abstract class ItemGenerator extends PowerGenerator{
ItemGeneratorEntity entity = tile.entity(); ItemGeneratorEntity entity = tile.entity();
float maxPower = Math.min(powerCapacity - entity.power.amount, powerOutput * entity.delta()) * entity.efficiency; float maxPower = Math.min(powerCapacity - entity.power.amount, powerOutput * entity.delta()) * entity.efficiency;
float mfract = maxPower / (powerOutput);
if(entity.generateTime <= 0f && entity.items.total() > 0){ if(entity.generateTime <= 0f && entity.items.total() > 0){
Effects.effect(generateEffect, tile.worldx() + Mathf.range(3f), tile.worldy() + Mathf.range(3f)); Effects.effect(generateEffect, tile.worldx() + Mathf.range(3f), tile.worldy() + Mathf.range(3f));
@@ -98,7 +97,7 @@ public abstract class ItemGenerator extends PowerGenerator{
entity.power.graph.update(); entity.power.graph.update();
if(entity.generateTime > 0f){ if(entity.generateTime > 0f){
entity.generateTime -= 1f / itemDuration * mfract * entity.delta(); entity.generateTime -= 1f / itemDuration * entity.delta();
entity.power.amount += maxPower; entity.power.amount += maxPower;
entity.generateTime = Mathf.clamp(entity.generateTime); entity.generateTime = Mathf.clamp(entity.generateTime);

3
core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
View File

@@ -57,7 +57,6 @@ public abstract class ItemLiquidGenerator extends ItemGenerator{
}else if(entity.cons.valid()){ }else if(entity.cons.valid()){
float maxPower = Math.min(powerCapacity - entity.power.amount, powerOutput * entity.delta()) * entity.efficiency; float maxPower = Math.min(powerCapacity - entity.power.amount, powerOutput * entity.delta()) * entity.efficiency;
float mfract = maxPower / (powerOutput);
if(entity.generateTime <= 0f && entity.items.total() > 0){ if(entity.generateTime <= 0f && entity.items.total() > 0){
Effects.effect(generateEffect, tile.worldx() + Mathf.range(3f), tile.worldy() + Mathf.range(3f)); Effects.effect(generateEffect, tile.worldx() + Mathf.range(3f), tile.worldy() + Mathf.range(3f));
@@ -68,7 +67,7 @@ public abstract class ItemLiquidGenerator extends ItemGenerator{
} }
if(entity.generateTime > 0f){ if(entity.generateTime > 0f){
entity.generateTime -= 1f / itemDuration * mfract * entity.delta(); entity.generateTime -= 1f / itemDuration * entity.delta();
entity.power.amount += maxPower; entity.power.amount += maxPower;
entity.generateTime = Mathf.clamp(entity.generateTime); entity.generateTime = Mathf.clamp(entity.generateTime);