Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blending cleanup / Misc bugfixes

Browse Source
This commit is contained in:
Anuken
2021-06-10 15:10:52 -04:00
parent 448604062d
commit a180aae838
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/ui/dialogs/GameOverDialog.java
View File

@@ -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();

1
core/src/mindustry/world/Block.java
View File

@@ -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;

1
core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java
View File

@@ -8,6 +8,7 @@ public class ArmoredConveyor extends Conveyor{
public ArmoredConveyor(String name){
super(name);
noSideBlend = true;
}
@Override

1
core/src/mindustry/world/blocks/distribution/Duct.java
View File

@@ -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;
}

3
core/src/mindustry/world/blocks/distribution/StackConveyor.java
View File

@@ -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) &&