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

Unloader fix 4 - New Load Priority (#6840)

Browse Source 
* should solve the MD bug and some others

* skill issue
This commit is contained in:
hortiSquash
2022-05-12 04:39:50 +02:00
committed by GitHub
parent 6e79f22734
commit 7914a187e5
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/world/blocks/storage/Unloader.java
View File

@@ -85,9 +85,15 @@ public class Unloader extends Block{
public int[] lastUsed; public int[] lastUsed;
protected final Comparator<ContainerStat> comparator = Structs.comps( protected final Comparator<ContainerStat> comparator = Structs.comps(
//sort so it gives priority for blocks that can only either recieve or give (not both), and then by load, and then by last use
//highest = unload from, lowest = unload to
Structs.comps( Structs.comps(
Structs.comparingBool(e -> e.building.block.highUnloadPriority && !e.canLoad), Structs.comparingBool(e -> e.building.block.highUnloadPriority && !e.canLoad), //stackConveyors and Storage
Structs.comparingBool(e -> e.canUnload) // && !e.canLoad Structs.comps(
Structs.comparingBool(e -> e.canUnload && !e.canLoad), //priority to give
Structs.comparingBool(e -> e.canUnload || !e.canLoad) //priority to receive
)
), ),
Structs.comps( Structs.comps(
Structs.comparingFloat(e -> e.loadFactor), Structs.comparingFloat(e -> e.loadFactor),
@@ -168,7 +174,6 @@ public class Unloader extends Block{
pb.loadFactor = (other.getMaximumAccepted(item) == 0) || (other.items == null) ? 0 : other.items.get(item) / (float)other.getMaximumAccepted(item); pb.loadFactor = (other.getMaximumAccepted(item) == 0) || (other.items == null) ? 0 : other.items.get(item) / (float)other.getMaximumAccepted(item);
} }
//sort so it gives full priority to blocks that can give but not receive (stackConveyors and Storage), and then by load, and then by last use
possibleBlocks.sort(comparator); possibleBlocks.sort(comparator);
ContainerStat dumpingFrom = null; ContainerStat dumpingFrom = null;