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

Minor bugfixes/cleanup

Browse Source
This commit is contained in:
Anuken 2022-08-04 13:49:22 -04:00
parent 46f8838d1a
commit 1bb45fe91c
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2449,10 +2449,9 @@ public class Blocks{
researchCost = with(Items.beryllium, 15);
}};
//TODO rename
chemicalCombustionChamber = new ConsumeGenerator("chemical-combustion-chamber"){{
requirements(Category.power, with(Items.graphite, 40, Items.tungsten, 40, Items.oxide, 40f, Items.silicon, 30));
powerProduction = 9f;
powerProduction = 8f;
consumeLiquids(LiquidStack.with(Liquids.ozone, 2f / 60f, Liquids.arkycite, 40f / 60f));
size = 3;
drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawPistons(){{

5
core/src/mindustry/graphics/Layer.java
View File

@ -35,6 +35,9 @@ public class Layer{
//informal layer used for additive blending overlay, grouped together to reduce draw calls
blockAdditive = 31,
//props such as boulders
blockProp = 32,
//things drawn over blocks (intermediate layer)
blockOver = 35,
@ -83,7 +86,7 @@ public class Layer{
//shield effects
shields = 125,
//weather effects, e.g. rain and snow TODO draw before overlay UI?
//weather effects, e.g. rain and snow
weather = 130,
//light rendering *shaders used*

4
core/src/mindustry/net/NetworkIO.java
View File

@ -44,10 +44,8 @@ public class NetworkIO{
stream.writeLong(GlobalVars.rand.seed0);
stream.writeLong(GlobalVars.rand.seed1);
Writes write = new Writes(stream);
stream.writeInt(player.id);
player.write(write);
player.write(new Writes(stream));
SaveIO.getSaveWriter().writeContentHeader(stream);
SaveIO.getSaveWriter().writeMap(stream);

3
core/src/mindustry/world/blocks/environment/Prop.java
View File

@ -5,9 +5,11 @@ import arc.graphics.g2d.*;
import arc.math.*;
import mindustry.content.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.*;
public class Prop extends Block{
public float layer = Layer.blockProp;
public Prop(String name){
super(name);
@ -20,6 +22,7 @@ public class Prop extends Block{
@Override
public void drawBase(Tile tile){
Draw.z(layer);
Draw.rect(variants > 0 ? variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))] : region, tile.worldx(), tile.worldy());
}