Bugfixes
|
Before Width: | Height: | Size: 326 B After Width: | Height: | Size: 302 B |
|
Before Width: | Height: | Size: 434 B After Width: | Height: | Size: 405 B |
|
Before Width: | Height: | Size: 351 B After Width: | Height: | Size: 339 B |
|
Before Width: | Height: | Size: 777 B After Width: | Height: | Size: 777 B |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 186 KiB After Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 1.8 MiB After Width: | Height: | Size: 1.8 MiB |
|
Before Width: | Height: | Size: 188 KiB After Width: | Height: | Size: 193 KiB |
@@ -434,6 +434,7 @@ public class Control implements ApplicationListener, Loadable{
|
|||||||
ui.showStartupInfo("[accent]v6[] is currently in [accent]pre-alpha[].\n" +
|
ui.showStartupInfo("[accent]v6[] is currently in [accent]pre-alpha[].\n" +
|
||||||
"[lightgray]This means:[]\n" +
|
"[lightgray]This means:[]\n" +
|
||||||
"- Content is missing\n" +
|
"- Content is missing\n" +
|
||||||
|
"- [scarlet]Mobile[] is not supported.\n" +
|
||||||
"- Most [scarlet]Unit AI[] does not work\n" +
|
"- Most [scarlet]Unit AI[] does not work\n" +
|
||||||
"- Many units are [scarlet]missing[] or unfinished\n" +
|
"- Many units are [scarlet]missing[] or unfinished\n" +
|
||||||
"- The campaign is completely unfinished\n" +
|
"- The campaign is completely unfinished\n" +
|
||||||
|
|||||||
@@ -318,7 +318,7 @@ public class ItemBridge extends Block{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean acceptItem(Building source, Item item){
|
public boolean acceptItem(Building source, Item item){
|
||||||
if(team != source.team()) return false;
|
if(team != source.team) return false;
|
||||||
|
|
||||||
Tile other = world.tile(link);
|
Tile other = world.tile(link);
|
||||||
|
|
||||||
@@ -328,7 +328,7 @@ public class ItemBridge extends Block{
|
|||||||
|
|
||||||
if(rel == rel2) return false;
|
if(rel == rel2) return false;
|
||||||
}else{
|
}else{
|
||||||
return source.block() instanceof ItemBridge && linkValid(source.tile(), tile) && items.total() < itemCapacity;
|
return linked(source) && items.total() < itemCapacity;
|
||||||
}
|
}
|
||||||
|
|
||||||
return items.total() < itemCapacity;
|
return items.total() < itemCapacity;
|
||||||
@@ -350,13 +350,17 @@ public class ItemBridge extends Block{
|
|||||||
int rel2 = relativeTo(Edges.getFacingEdge(source, this));
|
int rel2 = relativeTo(Edges.getFacingEdge(source, this));
|
||||||
|
|
||||||
if(rel == rel2) return false;
|
if(rel == rel2) return false;
|
||||||
}else if(!(source.block() instanceof ItemBridge && linkValid(source.tile(), tile))){
|
}else if(!(linked(source))){
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return liquids.get(liquid) + amount < liquidCapacity && (liquids.current() == liquid || liquids.get(liquids.current()) < 0.2f);
|
return liquids.get(liquid) + amount < liquidCapacity && (liquids.current() == liquid || liquids.get(liquids.current()) < 0.2f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private boolean linked(Building source){
|
||||||
|
return source instanceof ItemBridgeEntity && linkValid(source.tile(), tile) && ((ItemBridgeEntity)source).link == pos();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canDump(Building to, Item item){
|
public boolean canDump(Building to, Item item){
|
||||||
return checkDump(to);
|
return checkDump(to);
|
||||||
|
|||||||