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

Functioning 5x5 reconstructor

Browse Source
This commit is contained in:
Anuken
2020-06-08 21:34:08 -04:00
parent 6501071510
commit 99518f4e1d
12 changed files with 2167 additions and 2101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@ import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.*;
import mindustry.annotations.Annotations.*;
import mindustry.entities.units.*;
import mindustry.gen.*;
import mindustry.graphics.*;
@@ -22,7 +21,6 @@ import mindustry.world.consumers.*;
public class BlockForge extends PayloadAcceptor{
public float buildSpeed = 0.4f;
public @Load(value = "@-out", fallback = "factory-out") TextureRegion outRegion;
public BlockForge(String name){
super(name);

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

@@ -2,7 +2,6 @@ package mindustry.world.blocks.experimental;
import arc.graphics.g2d.*;
import arc.util.*;
import mindustry.annotations.Annotations.*;
import mindustry.entities.units.*;
import mindustry.gen.*;
import mindustry.graphics.*;
@@ -20,10 +19,6 @@ public class BlockLoader extends PayloadAcceptor{
public int itemsLoaded = 5;
public float liquidsLoaded = 5f;
public @Load(value = "@-top", fallback = "factory-top") TextureRegion topRegion;
public @Load(value = "@-out", fallback = "factory-out") TextureRegion outRegion;
public @Load(value = "@-in", fallback = "factory-in") TextureRegion inRegion;
public BlockLoader(String name){
super(name);

7
core/src/mindustry/world/blocks/production/PayloadAcceptor.java
View File

@@ -5,6 +5,7 @@ import arc.math.*;
import arc.math.geom.*;
import arc.util.ArcAnnotate.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.*;
@@ -15,6 +16,10 @@ import static mindustry.Vars.tilesize;
public class PayloadAcceptor extends Block{
public float payloadSpeed = 0.5f;
public @Load(value = "@-top", fallback = "factory-top-$size") TextureRegion topRegion;
public @Load(value = "@-out", fallback = "factory-out-$size") TextureRegion outRegion;
public @Load(value = "@-in", fallback = "factory-in-$size") TextureRegion inRegion;
public PayloadAcceptor(String name){
super(name);
@@ -92,7 +97,7 @@ public class PayloadAcceptor extends Block{
if(movePayload(payload)){
payload = null;
}
}else if(front != null && !front.tile().solid()){
}else if(front == null || !front.tile().solid()){
dumpPayload();
}
}

4
core/src/mindustry/world/blocks/units/Reconstructor.java
View File

@@ -3,7 +3,6 @@ package mindustry.world.blocks.units;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.util.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.entities.units.*;
@@ -17,9 +16,6 @@ import mindustry.world.meta.*;
import static mindustry.Vars.state;
public class Reconstructor extends UnitBlock{
public @Load(value = "@-top", fallback = "factory-top") TextureRegion topRegion;
public @Load(value = "@-out", fallback = "factory-out") TextureRegion outRegion;
public @Load(value = "@-in", fallback = "factory-in") TextureRegion inRegion;
public float constructTime = 60 * 2;
public UnitType[][] upgrades = {};

3
core/src/mindustry/world/blocks/units/UnitFactory.java
View File

@@ -10,7 +10,6 @@ import arc.struct.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.*;
import mindustry.annotations.Annotations.*;
import mindustry.entities.*;
import mindustry.entities.units.*;
import mindustry.gen.*;
@@ -23,8 +22,6 @@ import mindustry.world.consumers.*;
import mindustry.world.meta.*;
public class UnitFactory extends UnitBlock{
public @Load(value = "@-top", fallback = "factory-top") TextureRegion topRegion;
public @Load(value = "@-out", fallback = "factory-out") TextureRegion outRegion;
public int[] capacities;
public UnitPlan[] plans = new UnitPlan[0];