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

Block (un)loader major improvements (#4127)

Browse Source 
* make it consider consVaild

* make this too

* pattern style and max block size

* Is there a better way to do this?

* Update BlockUnloader.java

* do not the /0

* prevent /0

* test 1

* yup it works for enabled
This commit is contained in:
Sunny Kim
2020-12-27 12:10:37 +09:00
committed by GitHub
parent c02d603a7a
commit 8d18649323
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/world/blocks/experimental/BlockLoader.java
View File

@@ -18,6 +18,7 @@ public class BlockLoader extends PayloadAcceptor{
public float loadTime = 2f; public float loadTime = 2f;
public int itemsLoaded = 5; public int itemsLoaded = 5;
public float liquidsLoaded = 5f; public float liquidsLoaded = 5f;
public int maxBlockSize = 2;
public BlockLoader(String name){ public BlockLoader(String name){
super(name); super(name);
@@ -60,8 +61,8 @@ public class BlockLoader extends PayloadAcceptor{
@Override @Override
public boolean acceptPayload(Building source, Payload payload){ public boolean acceptPayload(Building source, Payload payload){
return super.acceptPayload(source, payload) && return super.acceptPayload(source, payload) &&
(payload instanceof BuildPayload) && (payload instanceof BuildPayload build) &&
((((BuildPayload)payload).build.block.hasItems && ((BuildPayload)payload).block().unloadable && ((BuildPayload)payload).block().itemCapacity >= 10)/* || ((build.build.block.hasItems && build.block().unloadable && build.block().itemCapacity >= 10 && build.block().size <= maxBlockSize)/* ||
((BlockPayload)payload).entity.block().hasLiquids && ((BlockPayload)payload).block().liquidCapacity >= 10f)*/); ((BlockPayload)payload).entity.block().hasLiquids && ((BlockPayload)payload).block().liquidCapacity >= 10f)*/);
} }
@@ -99,7 +100,7 @@ public class BlockLoader extends PayloadAcceptor{
//load up items //load up items
if(payload.block().hasItems && items.any()){ if(payload.block().hasItems && items.any()){
if(timer(timerLoad, loadTime)){ if(efficiency() > 0.01f && timer(timerLoad, loadTime / efficiency())){
//load up items a set amount of times //load up items a set amount of times
for(int j = 0; j < itemsLoaded && items.any(); j++){ for(int j = 0; j < itemsLoaded && items.any(); j++){

2
core/src/mindustry/world/blocks/experimental/BlockUnloader.java
View File

@@ -31,7 +31,7 @@ public class BlockUnloader extends BlockLoader{
//load up items //load up items
if(payload.block().hasItems && !full()){ if(payload.block().hasItems && !full()){
if(timer(timerLoad, loadTime)){ if(efficiency() > 0.01f && timer(timerLoad, loadTime / efficiency())){
//load up items a set amount of times //load up items a set amount of times
for(int j = 0; j < itemsLoaded && !full(); j++){ for(int j = 0; j < itemsLoaded && !full(); j++){
for(int i = 0; i < items.length(); i++){ for(int i = 0; i < items.length(); i++){