Blending cleanup / Misc bugfixes
This commit is contained in:
@@ -5,7 +5,6 @@ import mindustry.core.GameState.*;
|
|||||||
import mindustry.game.EventType.*;
|
import mindustry.game.EventType.*;
|
||||||
import mindustry.game.*;
|
import mindustry.game.*;
|
||||||
import mindustry.type.*;
|
import mindustry.type.*;
|
||||||
import mindustry.ui.*;
|
|
||||||
|
|
||||||
import static mindustry.Vars.*;
|
import static mindustry.Vars.*;
|
||||||
|
|
||||||
@@ -31,7 +30,7 @@ public class GameOverDialog extends BaseDialog{
|
|||||||
}
|
}
|
||||||
|
|
||||||
void rebuild(){
|
void rebuild(){
|
||||||
title.setText(state.isCampaign() ? "@sector.curlost" : "@gameover");
|
title.setText(state.isCampaign() ? Core.bundle.format("sector.lost", state.getSector().name()) : "@gameover");
|
||||||
buttons.clear();
|
buttons.clear();
|
||||||
cont.clear();
|
cont.clear();
|
||||||
|
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ public class Block extends UnlockableContent{
|
|||||||
public boolean outputsPayload = false;
|
public boolean outputsPayload = false;
|
||||||
public boolean acceptsPayload = false;
|
public boolean acceptsPayload = false;
|
||||||
public boolean outputFacing = true;
|
public boolean outputFacing = true;
|
||||||
|
public boolean noSideBlend = false;
|
||||||
public boolean acceptsItems = false;
|
public boolean acceptsItems = false;
|
||||||
|
|
||||||
public int itemCapacity = 10;
|
public int itemCapacity = 10;
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ public class ArmoredConveyor extends Conveyor{
|
|||||||
|
|
||||||
public ArmoredConveyor(String name){
|
public ArmoredConveyor(String name){
|
||||||
super(name);
|
super(name);
|
||||||
|
noSideBlend = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ public class Duct extends Block implements Autotiler{
|
|||||||
itemCapacity = 1;
|
itemCapacity = 1;
|
||||||
noUpdateDisabled = true;
|
noUpdateDisabled = true;
|
||||||
rotate = true;
|
rotate = true;
|
||||||
|
noSideBlend = true;
|
||||||
envEnabled = Env.space | Env.terrestrial | Env.underwater;
|
envEnabled = Env.space | Env.terrestrial | Env.underwater;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import mindustry.entities.units.*;
|
|||||||
import mindustry.gen.*;
|
import mindustry.gen.*;
|
||||||
import mindustry.graphics.*;
|
import mindustry.graphics.*;
|
||||||
import mindustry.type.*;
|
import mindustry.type.*;
|
||||||
import mindustry.ui.*;
|
|
||||||
import mindustry.world.*;
|
import mindustry.world.*;
|
||||||
import mindustry.world.blocks.*;
|
import mindustry.world.blocks.*;
|
||||||
import mindustry.world.blocks.distribution.Conveyor.*;
|
import mindustry.world.blocks.distribution.Conveyor.*;
|
||||||
@@ -63,7 +62,7 @@ public class StackConveyor extends Block implements Autotiler{
|
|||||||
return otherblock.outputsItems() && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock);
|
return otherblock.outputsItems() && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock);
|
||||||
}else if(state == stateUnload){ //router mode
|
}else if(state == stateUnload){ //router mode
|
||||||
return otherblock.acceptsItems &&
|
return otherblock.acceptsItems &&
|
||||||
(!(otherblock instanceof ArmoredConveyor) || lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock)) &&
|
(!otherblock.noSideBlend || lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock)) &&
|
||||||
(notLookingAt(tile, rotation, otherx, othery, otherrot, otherblock) ||
|
(notLookingAt(tile, rotation, otherx, othery, otherrot, otherblock) ||
|
||||||
(otherblock instanceof StackConveyor && facing(otherx, othery, otherrot, tile.x, tile.y))) &&
|
(otherblock instanceof StackConveyor && facing(otherx, othery, otherrot, tile.x, tile.y))) &&
|
||||||
!(world.build(otherx, othery) instanceof StackConveyorBuild s && s.state == stateUnload) &&
|
!(world.build(otherx, othery) instanceof StackConveyorBuild s && s.state == stateUnload) &&
|
||||||
|
|||||||
Reference in New Issue
Block a user