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

Large constructor variant

Browse Source
This commit is contained in:
Anuken
2021-07-22 17:48:50 -04:00
parent d30c32eddc
commit bda461e480
9 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/assets/icons/icons.properties
View File

@@ -394,3 +394,6 @@
63339=carbon-stone|block-carbon-stone-ui
63338=payload-deconstructor|block-payload-deconstructor-ui
63337=cliff-crusher|block-cliff-crusher-ui
63336=deconstructor|block-deconstructor-ui
63335=constructor|block-constructor-ui
63334=large-constructor|block-large-constructor-ui

BIN
core/assets/logicids.dat
View File

Binary file not shown.

13
core/src/mindustry/content/Blocks.java
View File

@@ -96,7 +96,7 @@ public class Blocks implements ContentList{
repairPoint, repairTurret, resupplyPoint,
//payloads
payloadConveyor, payloadRouter, payloadPropulsionTower, deconstructor, constructor, blockLoader, blockUnloader,
payloadConveyor, payloadRouter, payloadPropulsionTower, deconstructor, constructor, largeConstructor, blockLoader, blockUnloader,
//logic
message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, memoryCell, memoryBank,
@@ -2240,12 +2240,21 @@ public class Blocks implements ContentList{
}};
constructor = new Constructor("constructor"){{
requirements(Category.units, BuildVisibility.debugOnly, with(Items.thorium, 100));
requirements(Category.units, with(Items.thorium, 100));
hasPower = true;
consumes.power(2f);
size = 3;
}};
largeConstructor = new Constructor("large-constructor"){{
requirements(Category.units, with(Items.thorium, 100));
hasPower = true;
consumes.power(2f);
maxBlockSize = 4;
minBlockSize = 3;
size = 5;
}};
blockLoader = new BlockLoader("block-loader"){{
requirements(Category.units, BuildVisibility.debugOnly, with(Items.thorium, 100));
hasPower = true;

3
core/src/mindustry/graphics/Shaders.java
View File

@@ -175,6 +175,7 @@ public class Shaders{
public static class BlockBuildShader extends LoadShader{
public float progress;
public TextureRegion region = new TextureRegion();
public float time;
public BlockBuildShader(){
super("blockbuild", "default");
@@ -185,7 +186,7 @@ public class Shaders{
setUniformf("u_progress", progress);
setUniformf("u_uv", region.u, region.v);
setUniformf("u_uv2", region.u2, region.v2);
setUniformf("u_time", Time.time);
setUniformf("u_time", time);
setUniformf("u_texsize", region.texture.width, region.texture.height);
}
}

3
core/src/mindustry/io/SaveFileReader.java
View File

@@ -52,7 +52,8 @@ public abstract class SaveFileReader{
"snowrock", "snow-boulder",
"cliffs", "stone-wall",
"cryofluidmixer", "cryofluid-mixer"
"cryofluidmixer", "cryofluid-mixer",
"block-forge", "constructor"
);
protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream();

1
core/src/mindustry/mod/ClassMap.java
View File

@@ -223,7 +223,6 @@ public class ClassMap{
classes.put("BallisticSilo", mindustry.world.blocks.payloads.BallisticSilo.class);
classes.put("BallisticSiloBuild", mindustry.world.blocks.payloads.BallisticSilo.BallisticSiloBuild.class);
classes.put("BlockForge", Constructor.class);
classes.put("BlockForgeBuild", Constructor.BlockForgeBuild.class);
classes.put("BlockLoader", mindustry.world.blocks.payloads.BlockLoader.class);
classes.put("BlockLoaderBuild", mindustry.world.blocks.payloads.BlockLoader.BlockLoaderBuild.class);
classes.put("BlockProducer", mindustry.world.blocks.payloads.BlockProducer.class);

1
core/src/mindustry/world/blocks/ConstructBlock.java
View File

@@ -221,6 +221,7 @@ public class ConstructBlock extends Block{
for(TextureRegion region : current.getGeneratedIcons()){
Shaders.blockbuild.region = region;
Shaders.blockbuild.time = Time.time;
Shaders.blockbuild.progress = progress;
Draw.rect(region, x, y, current.rotate ? rotdeg() : 0);

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

@@ -2,6 +2,7 @@ package mindustry.world.blocks.experimental;
import mindustry.world.blocks.payloads.*;
/** @deprecated use Constructor instead. */
@Deprecated
public class BlockForge extends Constructor{
@@ -10,7 +11,7 @@ public class BlockForge extends Constructor{
}
@Deprecated
public class BlockForgeBuild extends Constructor.BlockForgeBuild{
public class BlockForgeBuild extends Constructor.ConstructorBuild{
}
}

1
core/src/mindustry/world/blocks/payloads/BlockProducer.java
View File

@@ -110,6 +110,7 @@ public abstract class BlockProducer extends PayloadBlock{
for(TextureRegion region : recipe.getGeneratedIcons()){
Shaders.blockbuild.region = region;
Shaders.blockbuild.time = time;
Shaders.blockbuild.progress = progress / recipe.buildCost;
Draw.rect(region, x, y, recipe.rotate ? rotdeg() : 0);