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

Mass driver fixes

Browse Source
This commit is contained in:
Anuken
2018-09-29 22:53:24 -04:00
parent b43c542213
commit fc8d9febf6
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
View File

@ -83,8 +83,11 @@ public class MassDriver extends Block{
DriverBulletData data = Pooling.obtain(DriverBulletData.class, DriverBulletData::new); DriverBulletData data = Pooling.obtain(DriverBulletData.class, DriverBulletData::new);
data.from = entity; data.from = entity;
data.to = other; data.to = other;
int totalUsed = 0;
for(int i = 0; i < content.items().size; i++){ for(int i = 0; i < content.items().size; i++){
data.items[i] = entity.items.get(content.item(i)); int maxTransfer = Math.min(entity.items.get(content.item(i)), ((MassDriver) tile.block()).itemCapacity - totalUsed);
data.items[i] = maxTransfer;
totalUsed += maxTransfer;
} }
entity.items.clear(); entity.items.clear();
@ -150,6 +153,11 @@ public class MassDriver extends Block{
entity.reload = Mathf.clamp(entity.reload - entity.delta() / reloadTime); entity.reload = Mathf.clamp(entity.reload - entity.delta() / reloadTime);
} }
//unload when dest is full
if(!linkValid(tile) || (link.entity.items.total() >= itemCapacity) && entity.items.total() > 0){
entity.isUnloading = true;
}
if(!entity.isRecieving){ if(!entity.isRecieving){
if(entity.waiting.size > 0){ //accepting takes priority over shooting if(entity.waiting.size > 0){ //accepting takes priority over shooting
@ -282,12 +290,12 @@ public class MassDriver extends Block{
//add all the items possible //add all the items possible
for(int i = 0; i < data.items.length; i++){ for(int i = 0; i < data.items.length; i++){
int maxAdd = Math.min(data.items[i], itemCapacity - totalItems); int maxAdd = Math.min(data.items[i], itemCapacity*2 - totalItems);
items.add(content.item(i), maxAdd); items.add(content.item(i), maxAdd);
data.items[i] -= maxAdd; data.items[i] -= maxAdd;
totalItems += maxAdd; totalItems += maxAdd;
if(totalItems >= itemCapacity){ if(totalItems >= itemCapacity*2){
break; break;
} }
} }
@ -297,7 +305,6 @@ public class MassDriver extends Block{
int amountDropped = Mathf.random(0, data.items[i]); int amountDropped = Mathf.random(0, data.items[i]);
if(amountDropped > 0){ if(amountDropped > 0){
float angle = Mathf.range(180f); float angle = Mathf.range(180f);
float vs = Mathf.random(0f, 4f);
Effects.effect(EnvironmentFx.dropItem, Color.WHITE, bullet.x, bullet.y, angle, content.item(i)); Effects.effect(EnvironmentFx.dropItem, Color.WHITE, bullet.x, bullet.y, angle, content.item(i));
} }
} }
@ -317,11 +324,13 @@ public class MassDriver extends Block{
@Override @Override
public void write(DataOutputStream stream) throws IOException{ public void write(DataOutputStream stream) throws IOException{
stream.writeInt(link); stream.writeInt(link);
stream.writeFloat(rotation);
} }
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInputStream stream) throws IOException{
link = stream.readInt(); link = stream.readInt();
rotation = stream.readFloat();
} }
} }
} }