mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Overflow gate delay

Browse Source
This commit is contained in:
Anuken 2019-05-29 22:57:32 -04:00
parent bc78d1a561
commit 1a0b22ef15
3 changed files with 59 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
View File

@ -1,44 +1,56 @@
package io.anuke.mindustry.world.blocks.distribution;
import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.meta.BlockGroup;
import java.io.*;
public class OverflowGate extends Router{
private int bufferCapacity = 10;
public class OverflowGate extends Block{
protected int bufferCapacity = 10;
protected float speed = 45f;
public OverflowGate(String name){
super(name);
hasItems = true;
speed = 1f;
solid = true;
update = true;
group = BlockGroup.transportation;
}
@Override
public void update(Tile tile){
SplitterEntity entity = tile.entity();
OverflowGateEntity entity = tile.entity();
if(entity.lastItem == null && entity.items.total() > 0){
entity.items.clear();
}
if(entity.lastItem != null){
entity.time += 1f / speed * Time.delta();
Tile target = getTileTarget(tile, entity.lastItem, entity.lastInput, false);
if(target != null && (entity.time >= 1f)){
getTileTarget(tile, entity.lastItem, entity.lastInput, true);
target.block().handleItem(entity.lastItem, target, Edges.getFacingEdge(tile, target));
entity.items.remove(entity.lastItem, 1);
entity.lastItem = null;
for(int i = 0; i < 4; i++){
Item item = entity.buffer.poll(i);
if(item != null){
Tile other = getTileTarget(tile, item, tile.getNearby(i), true);
if(other != null && other.block().acceptItem(item, other, tile)){
other.block().handleItem(item, other, tile);
entity.buffer.remove(i);
}
}
}
}
@Override
public boolean acceptItem(Item item, Tile tile, Tile source){
OverflowGateEntity entity = tile.entity();
return entity.buffer.accepts(tile.relativeTo(source.x, source.y));
}
@Override
public void handleItem(Item item, Tile tile, Tile source){
OverflowGateEntity entity = tile.entity();
int buffer = tile.relativeTo(source.x, source.y);
if(entity.buffer.accepts(buffer)){
entity.buffer.accept(buffer, item);
}
}
Tile getTileTarget(Tile tile, Item item, Tile src, boolean flip){
int from = tile.relativeTo(src.x, src.y);
if(from == -1) return null;
@ -74,9 +86,19 @@ public class OverflowGate extends Router{
return to;
}
@Override
public TileEntity newEntity(){
return new OverflowGateEntity();
}
public class OverflowGateEntity extends TileEntity{
DirectionalItemBuffer buffer = new DirectionalItemBuffer(bufferCapacity, speed);
@Override
public byte version(){
return 1;
}
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
@ -86,7 +108,9 @@ public class OverflowGate extends Router{
@Override
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
buffer.read(stream);
if(revision == 1){
buffer.read(stream);
}
}
}
}

12
core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
View File

@ -21,7 +21,7 @@ public class Router extends Block{
@Override
public void update(Tile tile){
SplitterEntity entity = tile.entity();
RouterEntity entity = tile.entity();
if(entity.lastItem == null && entity.items.total() > 0){
entity.items.clear();
@ -42,14 +42,14 @@ public class Router extends Block{
@Override
public boolean acceptItem(Item item, Tile tile, Tile source){
SplitterEntity entity = tile.entity();
RouterEntity entity = tile.entity();
return tile.getTeam() == source.getTeam() && entity.lastItem == null && entity.items.total() == 0;
}
@Override
public void handleItem(Item item, Tile tile, Tile source){
SplitterEntity entity = tile.entity();
RouterEntity entity = tile.entity();
entity.items.add(item, 1);
entity.lastItem = item;
entity.time = 0f;
@ -72,7 +72,7 @@ public class Router extends Block{
@Override
public int removeStack(Tile tile, Item item, int amount){
SplitterEntity entity = tile.entity();
RouterEntity entity = tile.entity();
int result = super.removeStack(tile, item, amount);
if(result != 0 && item == entity.lastItem){
entity.lastItem = null;
@ -82,10 +82,10 @@ public class Router extends Block{
@Override
public TileEntity newEntity(){
return new SplitterEntity();
return new RouterEntity();
}
public class SplitterEntity extends TileEntity{
public class RouterEntity extends TileEntity{
Item lastItem;
Tile lastInput;
float time;

12
core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java
View File

@ -92,7 +92,8 @@ public class Sorter extends Block{
}
}
@Nullable Tile getTileTarget(Item item, Tile dest, Tile source, boolean flip){
@Nullable
Tile getTileTarget(Item item, Tile dest, Tile source, boolean flip){
SorterEntity entity = dest.entity();
int dir = source.relativeTo(dest.x, dest.y);
@ -145,6 +146,11 @@ public class Sorter extends Block{
DirectionalItemBuffer buffer = new DirectionalItemBuffer(bufferCapacity, speed);
Item sortItem;
@Override
public byte version(){
return 1;
}
@Override
public void write(DataOutput stream) throws IOException{
super.write(stream);
@ -156,7 +162,9 @@ public class Sorter extends Block{
public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision);
sortItem = content.item(stream.readShort());
buffer.read(stream);
if(revision == 1){
buffer.read(stream);
}
}
}
}