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

"stuff"

Browse Source
This commit is contained in:
Anuken
2021-11-06 22:21:46 -04:00
parent da49328412
commit 09a934385e
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-stack.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 298 B

After

Width:  |  Height:  |  Size: 244 B

7
core/src/mindustry/content/Fx.java
View File

@@ -1690,6 +1690,13 @@ public class Fx{
}); });
}), }),
conveyorPoof = new Effect(35, e -> {
color(Pal.plasticBurn, Color.gray, e.fin());
randLenVectors(e.id, 4, 3f + e.fin() * 4f, (x, y) -> {
Fill.circle(e.x + x, e.y + y, e.fout() * 1.11f);
});
}),
pulverize = new Effect(40, e -> { pulverize = new Effect(40, e -> {
randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> {
color(Pal.stoneGray); color(Pal.stoneGray);

4
core/src/mindustry/graphics/EnvRenderers.java
View File

@@ -19,7 +19,7 @@ public class EnvRenderers{
Rand rand = new Rand(); Rand rand = new Rand();
Core.assets.load("sprites/rays.png", Texture.class).loaded = t -> { Core.assets.load("sprites/rays.png", Texture.class).loaded = t -> {
((Texture)t).setFilter(TextureFilter.linear); t.setFilter(TextureFilter.linear);
}; };
Color particleColor = Color.valueOf("a7c1fa"); Color particleColor = Color.valueOf("a7c1fa");
@@ -98,7 +98,7 @@ public class EnvRenderers{
} }
Draw.z(Layer.weather - 1); Draw.z(Layer.weather - 1);
Weather.drawNoiseLayers(tex, Color.scarlet, 1000f, 0.24f, 0.4f, 1f, 1f, 0f, Weather.drawNoiseLayers(tex, Color.scarlet, 1000f, 0.23f, 0.4f, 1f, 1f, 0f,
4, -1.3f, 0.7f, 0.8f, 0.9f); 4, -1.3f, 0.7f, 0.8f, 0.9f);
Draw.reset(); Draw.reset();
}); });

2
core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
View File

@@ -210,7 +210,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
} }
//not allowed //not allowed
state.rules.hiddenBuildItems.addAll(Items.copper, Items.titanium, Items.coal, Items.lead, Items.blastCompound, Items.pyratite, Items.sporePod, Items.metaglass); state.rules.hiddenBuildItems.addAll(Items.copper, Items.titanium, Items.coal, Items.lead, Items.blastCompound, Items.pyratite, Items.sporePod, Items.metaglass, Items.plastanium);
//it is very hot //it is very hot
state.rules.attributes.set(Attribute.heat, 0.8f); state.rules.attributes.set(Attribute.heat, 0.8f);

4
core/src/mindustry/world/blocks/distribution/StackConveyor.java
View File

@@ -37,8 +37,8 @@ public class StackConveyor extends Block implements Autotiler{
public boolean outputRouter = true; public boolean outputRouter = true;
/** (minimum) amount of loading docks needed to fill a line. */ /** (minimum) amount of loading docks needed to fill a line. */
public float recharge = 2f; public float recharge = 2f;
public Effect loadEffect = Fx.plasticburn; public Effect loadEffect = Fx.conveyorPoof;
public Effect unloadEffect = Fx.plasticburn; public Effect unloadEffect = Fx.conveyorPoof;
public StackConveyor(String name){ public StackConveyor(String name){
super(name); super(name);