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

Duct router distribution fixes

Browse Source
This commit is contained in:
Anuken
2022-05-09 23:11:52 -04:00
parent 051a41e86d
commit 95254eef44
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/payload/payload-conveyor-top.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 513 B

After

Width:  |  Height:  |  Size: 529 B

BIN
core/assets-raw/sprites/blocks/payload/reinforced-payload-conveyor-top.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 518 B

After

Width:  |  Height:  |  Size: 536 B

19
core/src/mindustry/world/blocks/distribution/DuctRouter.java
View File

@@ -1,7 +1,6 @@
package mindustry.world.blocks.distribution; package mindustry.world.blocks.distribution;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.math.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.util.*; import arc.util.*;
import arc.util.io.*; import arc.util.io.*;
@@ -99,8 +98,6 @@ public class DuctRouter extends Block{
var target = target(); var target = target();
if(target != null){ if(target != null){
target.handleItem(this, current); target.handleItem(this, current);
int mod = sortItem != null && current != sortItem ? 2 : 3;
cdump = ((cdump + 1) % mod);
items.remove(current, 1); items.remove(current, 1);
current = null; current = null;
progress %= (1f - 1f/speed); progress %= (1f - 1f/speed);
@@ -124,14 +121,20 @@ public class DuctRouter extends Block{
public Building target(){ public Building target(){
if(current == null) return null; if(current == null) return null;
for(int i = -1; i <= 1; i++){ int dump = cdump;
int dir = Mathf.mod(rotation + (((i + cdump + 1) % 3) - 1), 4);
if(sortItem != null && (current == sortItem) != (dir == rotation)) continue; for(int i = 0; i < proximity.size; i++){
Building other = nearby(dir); Building other = proximity.get((i + dump) % proximity.size);
if(other != null && other.team == team && other.acceptItem(this, current)){ int rel = relativeTo(other);
if(!(sortItem != null && (current == sortItem) != (rel == rotation)) && !(rel == (rotation + 2) % 4) && other.team == team && other.acceptItem(this, current)){
incrementDump(proximity.size);
return other; return other;
} }
incrementDump(proximity.size);
} }
return null; return null;
} }