diff --git a/core/src/mindustry/world/blocks/power/PowerGraph.java b/core/src/mindustry/world/blocks/power/PowerGraph.java index 3bdddb5d22..3b217a06ba 100644 --- a/core/src/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/mindustry/world/blocks/power/PowerGraph.java @@ -270,7 +270,7 @@ public class PowerGraph{ if(build.power.graph != this || !build.power.init){ //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.entity != null) build.power.graph.entity.remove(); + if(build.power.graph.entity != null) build.power.graph.entity.remove(); } build.power.graph = this; diff --git a/core/src/mindustry/world/blocks/power/VariableReactor.java b/core/src/mindustry/world/blocks/power/VariableReactor.java index 038bb39a44..5cbd6574f0 100644 --- a/core/src/mindustry/world/blocks/power/VariableReactor.java +++ b/core/src/mindustry/world/blocks/power/VariableReactor.java @@ -70,7 +70,7 @@ public class VariableReactor extends PowerGenerator{ public void updateTile(){ heat = calculateHeat(sideHeat); - productionEfficiency = Mathf.clamp(heat / maxHeat); + productionEfficiency = Mathf.clamp(heat / maxHeat) * efficiency; warmup = Mathf.lerpDelta(warmup, productionEfficiency > 0 ? 1f : 0f, warmupSpeed); if(instability >= 1f){ diff --git a/core/src/mindustry/world/consumers/Consume.java b/core/src/mindustry/world/consumers/Consume.java index be75eaacd6..4f9cadffe6 100644 --- a/core/src/mindustry/world/consumers/Consume.java +++ b/core/src/mindustry/world/consumers/Consume.java @@ -7,8 +7,6 @@ import mindustry.world.meta.*; /** An abstract class that defines a type of resource that a block can 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. */ public boolean optional; /** If true, this consumer will be displayed as a boost input. */ @@ -61,7 +59,4 @@ public abstract class Consume{ } public void display(Stats stats){} - - //TODO this should use efficiency instead - remove or deprecate - //public abstract boolean valid(Building build); }