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

Merge branch '6.0' into crater

Browse Source 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
This commit is contained in:
Patrick 'Quezler' Mounier
2020-04-16 17:13:18 +02:00
parent 5c28985ee6 a8f4df8030
commit a1d4804fae
17 changed files with 782 additions and 702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/world/Block.java
View File

@@ -43,6 +43,7 @@ public class Block extends UnlockableContent{
public boolean outputsLiquid = false;
public boolean consumesPower = true;
public boolean outputsPower = false;
public boolean outputsPayload = false;
public int itemCapacity = 10;
public float liquidCapacity = 10f;

84
core/src/mindustry/world/blocks/distribution/MassConveyor.java
View File

@@ -11,8 +11,8 @@ import mindustry.content.*;
import mindustry.game.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.ui.*;
import mindustry.world.*;
import mindustry.world.blocks.payloads.*;
import static mindustry.Vars.*;
@@ -29,6 +29,7 @@ public class MassConveyor extends Block{
size = 3;
rotate = true;
update = true;
outputsPayload = true;
}
@Override
@@ -39,10 +40,27 @@ public class MassConveyor extends Block{
edgeRegion = Core.atlas.find(name + "-edge");
}
public class MassConveyorEntity extends TileEntity implements MassAcceptor{
@Override
protected TextureRegion[] generateIcons(){
return new TextureRegion[]{Core.atlas.find(name + "-icon")};
}
@Override
public void drawPlace(int x, int y, int rotation, boolean valid){
super.drawPlace(x, y, rotation, valid);
for(int i = 0; i < 4; i++){
Tilec other = world.ent(x + Geometry.d4x[i] * size, y + Geometry.d4y[i] * size);
if(other != null && other.block().outputsPayload && other.block().size == size){
Drawf.selected(other.tileX(), other.tileY(), other.block(), Pal.accent);
}
}
}
public class MassConveyorEntity extends TileEntity{
public @Nullable Payload item;
public float progress, itemRotation, animation;
public @Nullable MassAcceptor next;
public @Nullable Tilec next;
public boolean blocked;
public int step = -1, stepAccepted = -1;
@@ -52,9 +70,9 @@ public class MassConveyor extends Block{
Tilec accept = nearby(Geometry.d4[rotation()].x * size, Geometry.d4[rotation()].y * size);
//next block must be aligned and of the same size
if(accept instanceof MassAcceptor && accept.block().size == size &&
if(accept != null && accept.block().size == size &&
tileX() + Geometry.d4[rotation()].x * size == accept.tileX() && tileY() + Geometry.d4[rotation()].y * size == accept.tileY()){
next = (MassAcceptor)accept;
next = accept;
}
int ntrns = 1 + size/2;
@@ -73,6 +91,7 @@ public class MassConveyor extends Block{
animation = 0f;
}
//TODO nondeterministic input priority
int curStep = curStep();
if(curStep > step){
boolean valid = step != -1;
@@ -83,21 +102,21 @@ public class MassConveyor extends Block{
//trigger update forward
next.updateTile();
if(next.acceptMass(item, this)){
if(next.acceptPayload(this, item)){
//move forward.
next.handleMass(item, this);
next.handlePayload(this, item);
item = null;
}
}else if(!blocked){
//dump item forward
float trnext = size * tilesize / 2f, cx = Geometry.d4[rotation()].x, cy = Geometry.d4[rotation()].y, rot = rotation() * 90;
item.dump(x + cx * trnext, y + cy * trnext, rotation() * 90);
item = null;
if(item.dump(x + cx * trnext, y + cy * trnext, rotation() * 90)){
item = null;
}
}
}
}
}
@Override
@@ -172,13 +191,13 @@ public class MassConveyor extends Block{
}
@Override
public boolean acceptMass(Payload item, Tilec source){
public boolean acceptPayload(Tilec source, Payload payload){
return this.item == null;
}
@Override
public void handleMass(Payload item, Tilec source){
this.item = item;
public void handlePayload(Tilec source, Payload payload){
this.item = payload;
this.stepAccepted = curStep();
this.itemRotation = source.rotation() * 90;
this.animation = 0;
@@ -189,8 +208,9 @@ public class MassConveyor extends Block{
return !blocked || next != null;
}else{
Tilec accept = nearby(Geometry.d4[direction].x * size, Geometry.d4[direction].y * size);
return accept instanceof MassAcceptor && accept.block().size == size &&
accept.tileX() + Geometry.d4[accept.rotation()].x * size == tileX() && accept.tileY() + Geometry.d4[accept.rotation()].y * size == tileY();
return accept != null && accept.block().size == size && accept.block().outputsPayload &&
//block must either be facing this one, or not be rotating
((accept.tileX() + Geometry.d4[accept.rotation()].x * size == tileX() && accept.tileY() + Geometry.d4[accept.rotation()].y * size == tileY()) || !accept.block().rotate);
}
}
@@ -219,7 +239,7 @@ public class MassConveyor extends Block{
}
int curStep(){
return (int)(Time.time() / moveTime);
return (int)((Time.time()) / moveTime);
}
float fract(){
@@ -227,36 +247,4 @@ public class MassConveyor extends Block{
}
}
public interface MassAcceptor extends Tilec{
boolean acceptMass(Payload item, Tilec source);
void handleMass(Payload item, Tilec source);
}
public interface Payload{
void draw(float x, float y, float rotation);
void dump(float x, float y, float rotation);
}
public static class UnitPayload implements Payload{
public Unitc unit;
public UnitPayload(Unitc unit){
this.unit = unit;
}
@Override
public void dump(float x, float y, float rotation){
unit.set(x, y);
unit.rotation(rotation);
unit.add();
}
@Override
public void draw(float x, float y, float rotation){
Drawf.shadow(x, y, 24);
Draw.rect("pneumatic-drill", x, y, rotation);
Drawf.shadow(x, y, 20);
Draw.rect(unit.type().icon(Cicon.full), x, y, rotation - 90);
}
}
}

12
core/src/mindustry/world/blocks/payloads/Payload.java Normal file
View File

@@ -0,0 +1,12 @@
package mindustry.world.blocks.payloads;
public interface Payload{
/** draws this payload at a position. */
void draw(float x, float y, float rotation);
/** @return whether this payload was dumped. */
default boolean dump(float x, float y, float rotation){
return false;
}
}

31
core/src/mindustry/world/blocks/payloads/UnitPayload.java Normal file
View File

@@ -0,0 +1,31 @@
package mindustry.world.blocks.payloads;
import arc.graphics.g2d.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.ui.*;
public class UnitPayload implements Payload{
public Unitc unit;
public UnitPayload(Unitc unit){
this.unit = unit;
}
@Override
public boolean dump(float x, float y, float rotation){
unit.set(x, y);
unit.rotation(rotation);
unit.add();
return true;
}
@Override
public void draw(float x, float y, float rotation){
Drawf.shadow(x, y, 24);
Draw.rect("pneumatic-drill", x, y, rotation);
Drawf.shadow(x, y, 20);
Draw.rect(unit.type().icon(Cicon.full), x, y, rotation - 90);
}
}