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

Changed junction capacity and processing system

Browse Source
This commit is contained in:
Anuken
2018-02-05 15:37:07 -05:00
parent a3a42bace2
commit f2c83b733a
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java
View File

@@ -1,5 +1,6 @@
package io.anuke.mindustry.world.blocks.types.distribution; package io.anuke.mindustry.world.blocks.types.distribution;
import com.badlogic.gdx.utils.NumberUtils;
import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
@@ -8,8 +9,8 @@ import io.anuke.ucore.core.Timers;
import io.anuke.ucore.util.Bits; import io.anuke.ucore.util.Bits;
public class Junction extends Block{ public class Junction extends Block{
protected float speed = 15; //frames taken to go through this junction protected float speed = 26; //frames taken to go through this junction
protected int capacity = 16; protected int capacity = 32;
public Junction(String name) { public Junction(String name) {
super(name); super(name);
@@ -26,10 +27,10 @@ public class Junction extends Block{
public void handleItem(Item item, Tile tile, Tile source){ public void handleItem(Item item, Tile tile, Tile source){
JunctionEntity entity = tile.entity(); JunctionEntity entity = tile.entity();
boolean x = tile.x == source.x; boolean x = tile.x == source.x;
int value = Bits.packInt((short)item.id, source.relativeTo(tile.x, tile.y)); long value = Bits.packLong(NumberUtils.floatToIntBits(Timers.time()), Bits.packInt((short)item.id, source.relativeTo(tile.x, tile.y)));
if(x){ if(x){
entity.bx.add(value); entity.bx.add(value);
}else{ }else {
entity.by.add(value); entity.by.add(value);
} }
} }
@@ -41,10 +42,13 @@ public class Junction extends Block{
for(int i = 0; i < 2; i ++){ for(int i = 0; i < 2; i ++){
Buffer buffer = (i == 0 ? entity.bx : entity.by); Buffer buffer = (i == 0 ? entity.bx : entity.by);
if(buffer.index > 0){ if(buffer.index > 0){
buffer.time += Timers.delta(); if(buffer.index > buffer.items.length) buffer.index = buffer.items.length;
if(buffer.time >= speed){ long l = buffer.items[0];
if(buffer.index > buffer.items.length) buffer.index = buffer.items.length; float time = NumberUtils.intBitsToFloat(Bits.getLeftInt(l));
int val = buffer.items[buffer.index - 1];
if(Timers.time() >= time + speed){
int val = Bits.getRightInt(l);
Item item = Item.getByID(Bits.getLeftShort(val)); Item item = Item.getByID(Bits.getLeftShort(val));
int direction = Bits.getRightShort(val); int direction = Bits.getRightShort(val);
@@ -53,12 +57,9 @@ public class Junction extends Block{
if(dest == null || !dest.block().acceptItem(item, dest, tile)) continue; if(dest == null || !dest.block().acceptItem(item, dest, tile)) continue;
dest.block().handleItem(item, dest, tile); dest.block().handleItem(item, dest, tile);
System.arraycopy(buffer.items, 1, buffer.items, 0, buffer.index - 1);
buffer.time = 0f;
buffer.index --; buffer.index --;
} }
}else{
buffer.time = 0f;
} }
} }
} }
@@ -86,12 +87,11 @@ public class Junction extends Block{
} }
class Buffer{ class Buffer{
int[] items = new int[capacity]; long[] items = new long[capacity];
int index; int index;
float time;
void add(int id){ void add(long id){
items[index ++] = id; items[index++] = id;
} }
boolean full(){ boolean full(){

4
core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java
View File

@@ -8,8 +8,8 @@ import io.anuke.ucore.core.Timers;
public class TunnelConveyor extends Block{ public class TunnelConveyor extends Block{
protected int maxdist = 3; protected int maxdist = 3;
protected float speed = 18; //frames taken to go through this tunnel protected float speed = 12; //frames taken to go through this tunnel
protected int capacity = 16; protected int capacity = 32;
protected TunnelConveyor(String name) { protected TunnelConveyor(String name) {
super(name); super(name);