mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-03-15 19:30:51 -07:00
Code Issues Projects Releases Wiki Activity

Impact cryo requirement fix

Browse source
This commit is contained in:
Anuken 2022-06-19 00:22:06 -04:00
parent 077ee978f6
commit a8a2b9f684
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/mindustry/content/Blocks.java
View file

@ -1277,7 +1277,7 @@ public class Blocks{
drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput());
size = 2;
heatOutput = 15f;
craftTime = 60f * 15f;
craftTime = 60f * 12f;
consumeItem(Items.phaseFabric);
}};

12
core/src/mindustry/world/blocks/power/BeamNode.java
View file

@ -72,6 +72,12 @@ public class BeamNode extends PowerBlock{
int offset = size/2;
for(int j = 1 + offset; j <= range + offset; j++){
var other = world.build(x + j * dir.x, y + j * dir.y);
//hit insulated wall
if(other != null && other.isInsulated()){
break;
}
if(other != null && other.block.hasPower && other.team == Vars.player.team() && !(other.block instanceof PowerNode)){
maxLen = j;
dest = other;
@ -166,6 +172,12 @@ public class BeamNode extends PowerBlock{
//find first block with power in range
for(int j = 1 + offset; j <= range + offset; j++){
var other = world.build(tile.x + j * dir.x, tile.y + j * dir.y);
//hit insulated wall
if(other != null && other.isInsulated()){
break;
}
//power nodes do NOT play nice with beam nodes, do not touch them as that forcefully modifies their links
if(other != null && other.block.hasPower && other.team == team && !(other.block instanceof PowerNode)){
links[i] = other;

2
core/src/mindustry/world/blocks/power/ImpactReactor.java
View file

@ -76,7 +76,7 @@ public class ImpactReactor extends PowerGenerator{
@Override
public void updateTile(){
if(efficiency > 0 && power.status >= 0.99f){
if(efficiency >= 0.9999f && power.status >= 0.99f){
boolean prevOut = getPowerProduction() <= consPower.requestedPower(this);
warmup = Mathf.lerpDelta(warmup, 1f, warmupSpeed * timeScale);