diff --git a/core/src/mindustry/ui/dialogs/GameOverDialog.java b/core/src/mindustry/ui/dialogs/GameOverDialog.java index 083e49c116..32e593ea0e 100644 --- a/core/src/mindustry/ui/dialogs/GameOverDialog.java +++ b/core/src/mindustry/ui/dialogs/GameOverDialog.java @@ -5,7 +5,6 @@ import mindustry.core.GameState.*; import mindustry.game.EventType.*; import mindustry.game.*; import mindustry.type.*; -import mindustry.ui.*; import static mindustry.Vars.*; @@ -31,7 +30,7 @@ public class GameOverDialog extends BaseDialog{ } void rebuild(){ - title.setText(state.isCampaign() ? "@sector.curlost" : "@gameover"); + title.setText(state.isCampaign() ? Core.bundle.format("sector.lost", state.getSector().name()) : "@gameover"); buttons.clear(); cont.clear(); diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index bcee08544e..4f2f9a8ccd 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -46,6 +46,7 @@ public class Block extends UnlockableContent{ public boolean outputsPayload = false; public boolean acceptsPayload = false; public boolean outputFacing = true; + public boolean noSideBlend = false; public boolean acceptsItems = false; public int itemCapacity = 10; diff --git a/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java b/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java index af7e2c985b..e5e2c05545 100644 --- a/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java @@ -8,6 +8,7 @@ public class ArmoredConveyor extends Conveyor{ public ArmoredConveyor(String name){ super(name); + noSideBlend = true; } @Override diff --git a/core/src/mindustry/world/blocks/distribution/Duct.java b/core/src/mindustry/world/blocks/distribution/Duct.java index c2a63f238e..b485fe6341 100644 --- a/core/src/mindustry/world/blocks/distribution/Duct.java +++ b/core/src/mindustry/world/blocks/distribution/Duct.java @@ -38,6 +38,7 @@ public class Duct extends Block implements Autotiler{ itemCapacity = 1; noUpdateDisabled = true; rotate = true; + noSideBlend = true; envEnabled = Env.space | Env.terrestrial | Env.underwater; } diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java index 7c7007cb54..030319a447 100644 --- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java @@ -12,7 +12,6 @@ import mindustry.entities.units.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.type.*; -import mindustry.ui.*; import mindustry.world.*; import mindustry.world.blocks.*; 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); }else if(state == stateUnload){ //router mode 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) || (otherblock instanceof StackConveyor && facing(otherx, othery, otherrot, tile.x, tile.y))) && !(world.build(otherx, othery) instanceof StackConveyorBuild s && s.state == stateUnload) &&