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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2019-09-24 19:16:12 -04:00
parent 5b0250ee74
commit 83dce4d8d2
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -915,7 +915,7 @@ public class Blocks implements ContentList{
junction = new Junction("junction"){{ junction = new Junction("junction"){{
requirements(Category.distribution, ItemStack.with(Items.copper, 1), true); requirements(Category.distribution, ItemStack.with(Items.copper, 1), true);
speed = 26; speed = 26;
capacity = 15; capacity = 12;
health = 30; health = 30;
}}; }};
@@ -923,7 +923,7 @@ public class Blocks implements ContentList{
requirements(Category.distribution, ItemStack.with(Items.lead, 4, Items.copper, 4)); requirements(Category.distribution, ItemStack.with(Items.lead, 4, Items.copper, 4));
range = 4; range = 4;
speed = 70f; speed = 70f;
bufferCapacity = 15; bufferCapacity = 14;
}}; }};
phaseConveyor = new ItemBridge("phase-conveyor"){{ phaseConveyor = new ItemBridge("phase-conveyor"){{

4
core/src/io/anuke/mindustry/core/UI.java
View File

@@ -359,9 +359,11 @@ public class UI implements ApplicationListener, Loadable{
public void showText(String titleText, String text){ public void showText(String titleText, String text){
new Dialog(titleText){{ new Dialog(titleText){{
cont.margin(15).add(text).width(400f).wrap().get().setAlignment(Align.center, Align.center); cont.row();
cont.addImage().width(400f).pad(2).colspan(2).height(4f).color(Pal.accent); cont.addImage().width(400f).pad(2).colspan(2).height(4f).color(Pal.accent);
cont.row(); cont.row();
cont.add(text).width(400f).wrap().get().setAlignment(Align.center, Align.center);
cont.row();
buttons.addButton("$ok", this::hide).size(90, 50).pad(4); buttons.addButton("$ok", this::hide).size(90, 50).pad(4);
}}.show(); }}.show();
} }

10
core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
View File

@@ -252,6 +252,16 @@ public class ItemBridge extends Block{
int rel2 = tile.relativeTo(source.x, source.y); int rel2 = tile.relativeTo(source.x, source.y);
if(rel == rel2) return false; if(rel == rel2) return false;
IntSetIterator it = entity.incoming.iterator();
while(it.hasNext){
int v = it.next();
if(tile.absoluteRelativeTo(Pos.x(v), Pos.y(v)) == rel2){
return false;
}
}
}else{ }else{
return source.block() instanceof ItemBridge && source.<ItemBridgeEntity>entity().link == tile.pos() && tile.entity.items.total() < itemCapacity; return source.block() instanceof ItemBridge && source.<ItemBridgeEntity>entity().link == tile.pos() && tile.entity.items.total() < itemCapacity;
} }