diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png index ecd147450a..e673a4c6cf 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png index 6e7321360b..be533536a7 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png index 050aa16f7a..f4e6379a31 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png differ diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 9677923456..94d1d88158 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png index 6c54531d6d..8946651002 100644 Binary files a/core/assets/sprites/fallback/sprites2.png and b/core/assets/sprites/fallback/sprites2.png differ diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png index 12c6e236b4..cf9e042ca8 100644 Binary files a/core/assets/sprites/fallback/sprites4.png and b/core/assets/sprites/fallback/sprites4.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index b51a1238aa..a680e37b7d 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index 65f9572463..a0ecfa748b 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index be5d8a1b59..0c327c3643 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -434,6 +434,7 @@ public class Control implements ApplicationListener, Loadable{ ui.showStartupInfo("[accent]v6[] is currently in [accent]pre-alpha[].\n" + "[lightgray]This means:[]\n" + "- Content is missing\n" + + "- [scarlet]Mobile[] is not supported.\n" + "- Most [scarlet]Unit AI[] does not work\n" + "- Many units are [scarlet]missing[] or unfinished\n" + "- The campaign is completely unfinished\n" + diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java index 86ae676221..3491f5b3ea 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -318,7 +318,7 @@ public class ItemBridge extends Block{ @Override public boolean acceptItem(Building source, Item item){ - if(team != source.team()) return false; + if(team != source.team) return false; Tile other = world.tile(link); @@ -328,7 +328,7 @@ public class ItemBridge extends Block{ if(rel == rel2) return false; }else{ - return source.block() instanceof ItemBridge && linkValid(source.tile(), tile) && items.total() < itemCapacity; + return linked(source) && items.total() < itemCapacity; } return items.total() < itemCapacity; @@ -350,13 +350,17 @@ public class ItemBridge extends Block{ int rel2 = relativeTo(Edges.getFacingEdge(source, this)); if(rel == rel2) return false; - }else if(!(source.block() instanceof ItemBridge && linkValid(source.tile(), tile))){ + }else if(!(linked(source))){ return false; } 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 public boolean canDump(Building to, Item item){ return checkDump(to);