This commit is contained in:
Anuken
2023-04-15 22:17:46 -04:00
parent e47806b9b8
commit b83f5c66ca
6 changed files with 12 additions and 11 deletions

View File

@@ -134,7 +134,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
}else if(build != null){
float result = 0f;
if(block.hasItems){
if(block.hasItems && build.items.total() > 0){
result += build.items.sum((item, amount) -> item.flammability * amount) / Math.max(block.itemCapacity, 1) * Mathf.clamp(block.itemCapacity / 2.4f, 1f, 3f);
}

View File

@@ -33,6 +33,7 @@ public class PayloadConveyor extends Block{
priority = TargetPriority.transport;
envEnabled |= Env.space | Env.underwater;
sync = true;
underBullets = true;
}
@Override

View File

@@ -492,6 +492,12 @@ public class CoreBlock extends StorageBlock{
storageCapacity = itemCapacity + proximity().sum(e -> owns(e) ? e.block.itemCapacity : 0);
proximity.each(this::owns, t -> {
//add inventory if there is something in it from a payload
if(t.items != items){
items.add(t.items);
t.items.clear();
}
t.items = items;
((StorageBuild)t).linkedCore = this;
});