mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-06 07:30:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #7296

Browse Source
This commit is contained in:
Anuken 2022-08-05 09:35:04 -04:00
parent 11d3b1d973
commit 0f831d598d
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/power/PowerGraph.java
View File

@ -270,7 +270,7 @@ public class PowerGraph{
if(build.power.graph != this || !build.power.init){ if(build.power.graph != this || !build.power.init){
//any old graph that is added here MUST be invalid, remove it //any old graph that is added here MUST be invalid, remove it
if(build.power.graph != null && build.power.graph != this){ if(build.power.graph != null && build.power.graph != this){
if( build.power.graph.entity != null) build.power.graph.entity.remove(); if(build.power.graph.entity != null) build.power.graph.entity.remove();
} }
build.power.graph = this; build.power.graph = this;

2
core/src/mindustry/world/blocks/power/VariableReactor.java
View File

@ -70,7 +70,7 @@ public class VariableReactor extends PowerGenerator{
public void updateTile(){ public void updateTile(){
heat = calculateHeat(sideHeat); heat = calculateHeat(sideHeat);
productionEfficiency = Mathf.clamp(heat / maxHeat); productionEfficiency = Mathf.clamp(heat / maxHeat) * efficiency;
warmup = Mathf.lerpDelta(warmup, productionEfficiency > 0 ? 1f : 0f, warmupSpeed); warmup = Mathf.lerpDelta(warmup, productionEfficiency > 0 ? 1f : 0f, warmupSpeed);
if(instability >= 1f){ if(instability >= 1f){

5
core/src/mindustry/world/consumers/Consume.java
View File

@ -7,8 +7,6 @@ import mindustry.world.meta.*;
/** An abstract class that defines a type of resource that a block can consume. */ /** An abstract class that defines a type of resource that a block can consume. */
public abstract class Consume{ public abstract class Consume{
//TODO maybe remove these and make it an interface if possible?
/** If true, this consumer will not influence consumer validity. */ /** If true, this consumer will not influence consumer validity. */
public boolean optional; public boolean optional;
/** If true, this consumer will be displayed as a boost input. */ /** If true, this consumer will be displayed as a boost input. */
@ -61,7 +59,4 @@ public abstract class Consume{
} }
public void display(Stats stats){} public void display(Stats stats){}
//TODO this should use efficiency instead - remove or deprecate
//public abstract boolean valid(Building build);
} }