enemies){
this.team = team;
this.enemies = enemies;
}
}
+
+ /** Represents a block made by this team that was destroyed somewhere on the map.
+ * This does not include deconstructed blocks.*/
+ @Struct
+ public class BrokenBlockStruct{
+ public short x, y, rotation, block;
+ }
}
diff --git a/core/src/io/anuke/mindustry/game/TypeID.java b/core/src/io/anuke/mindustry/game/TypeID.java
new file mode 100644
index 0000000000..c054f9d8e9
--- /dev/null
+++ b/core/src/io/anuke/mindustry/game/TypeID.java
@@ -0,0 +1,19 @@
+package io.anuke.mindustry.game;
+
+import io.anuke.arc.function.Supplier;
+import io.anuke.mindustry.entities.traits.TypeTrait;
+import io.anuke.mindustry.type.ContentType;
+
+public class TypeID extends MappableContent{
+ public final Supplier constructor;
+
+ public TypeID(String name, Supplier constructor){
+ super(name);
+ this.constructor = constructor;
+ }
+
+ @Override
+ public ContentType getContentType(){
+ return ContentType.typeid;
+ }
+}
diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
index 50d904682d..292052479c 100644
--- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
@@ -1,22 +1,16 @@
package io.anuke.mindustry.graphics;
-import io.anuke.arc.Core;
-import io.anuke.arc.Events;
-import io.anuke.arc.collection.Array;
-import io.anuke.arc.collection.Sort;
+import io.anuke.arc.*;
+import io.anuke.arc.collection.*;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.graphics.Texture.TextureFilter;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.Fill;
+import io.anuke.arc.graphics.g2d.*;
import io.anuke.arc.graphics.glutils.FrameBuffer;
-import io.anuke.arc.util.Disposable;
-import io.anuke.arc.util.Tmp;
+import io.anuke.arc.util.*;
import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.game.EventType.TileChangeEvent;
-import io.anuke.mindustry.game.EventType.WorldLoadEvent;
+import io.anuke.mindustry.game.EventType.*;
import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.world.Block;
-import io.anuke.mindustry.world.Tile;
+import io.anuke.mindustry.world.*;
import static io.anuke.arc.Core.camera;
import static io.anuke.mindustry.Vars.*;
diff --git a/core/src/io/anuke/mindustry/graphics/Bloom.java b/core/src/io/anuke/mindustry/graphics/Bloom.java
new file mode 100644
index 0000000000..734992d8c0
--- /dev/null
+++ b/core/src/io/anuke/mindustry/graphics/Bloom.java
@@ -0,0 +1,417 @@
+package io.anuke.mindustry.graphics;
+
+import io.anuke.arc.Core;
+import io.anuke.arc.graphics.*;
+import io.anuke.arc.graphics.Pixmap.Format;
+import io.anuke.arc.graphics.VertexAttributes.Usage;
+import io.anuke.arc.graphics.glutils.FrameBuffer;
+import io.anuke.arc.graphics.glutils.Shader;
+
+/**
+ * Bloomlib allow easy but efficient way to add bloom effect as post process
+ * effect
+ *
+ * @author kalle_h
+ */
+public class Bloom{
+
+ /**
+ * To use implement bloom more like a glow. Texture alpha channel can be
+ * used as mask which part are glowing and which are not. see more info at:
+ * http://www.gamasutra.com/view/feature/2107/realtime_glow.php
+ *
+ * NOTE: need to be set before bloom instance is created. After that this
+ * does nothing.
+ */
+ public static boolean useAlphaChannelAsMask = false;
+
+ /** how many blur pass */
+ public int blurPasses = 1;
+
+ private Shader tresholdShader;
+ private Shader bloomShader;
+
+ private Mesh fullScreenQuad;
+
+ private Texture pingPongTex1;
+ private Texture pingPongTex2;
+ private Texture original;
+
+ private FrameBuffer frameBuffer;
+ private FrameBuffer pingPongBuffer1;
+ private FrameBuffer pingPongBuffer2;
+
+ private Shader blurShader;
+
+ private float bloomIntensity;
+ private float originalIntensity;
+ private float threshold;
+ private int w;
+ private int h;
+ private boolean blending = false;
+ private boolean capturing = false;
+ private float r = 0f;
+ private float g = 0f;
+ private float b = 0f;
+ private float a = 1f;
+ private boolean disposeFBO = true;
+
+ /**
+ * IMPORTANT NOTE CALL THIS WHEN RESUMING
+ */
+ public void resume(){
+ bloomShader.begin();
+ {
+ bloomShader.setUniformi("u_texture0", 0);
+ bloomShader.setUniformi("u_texture1", 1);
+ }
+ bloomShader.end();
+
+ setSize(w, h);
+ setThreshold(threshold);
+ setBloomIntesity(bloomIntensity);
+ setOriginalIntesity(originalIntensity);
+
+ original = frameBuffer.getTexture();
+ pingPongTex1 = pingPongBuffer1.getTexture();
+ pingPongTex2 = pingPongBuffer2.getTexture();
+ }
+
+ /**
+ * Initialize bloom class that capsulate original scene capturate,
+ * tresholding, gaussian blurring and blending. Default values: depth = true
+ * blending = false 32bits = true
+ */
+ public Bloom(){
+ initialize(Core.graphics.getWidth() / 4, Core.graphics.getHeight() / 4,
+ null, false, false, true);
+ }
+
+ public Bloom(boolean useBlending){
+ initialize(Core.graphics.getWidth() / 4, Core.graphics.getHeight() / 4,
+ null, false, useBlending, true);
+ }
+
+ /**
+ * Initialize bloom class that capsulate original scene capturate,
+ * tresholding, gaussian blurring and blending.
+ *
+ * @param FBO_W
+ * @param FBO_H how big fbo is used for bloom texture, smaller = more blur and
+ * lot faster but aliasing can be problem
+ * @param hasDepth do rendering need depth buffer
+ * @param useBlending does fbo need alpha channel and is blending enabled when final
+ * image is rendered. This allow to combine background graphics
+ * and only do blooming on certain objects param use32bitFBO does
+ * fbo use higher precision than 16bits.
+ */
+ public Bloom(int FBO_W, int FBO_H, boolean hasDepth, boolean useBlending,
+ boolean use32bitFBO){
+ initialize(FBO_W, FBO_H, null, hasDepth, useBlending, use32bitFBO);
+
+ }
+
+ /**
+ * EXPERT FUNCTIONALITY. no error checking. Use this only if you know what
+ * you are doing. Remember that bloom.capture() clear the screen so use
+ * continue instead if that is a problem.
+ *
+ * Initialize bloom class that capsulate original scene capturate,
+ * tresholding, gaussian blurring and blending.
+ *
+ * * @param sceneIsCapturedHere diposing is user responsibility.
+ *
+ * @param FBO_W
+ * @param FBO_H how big fbo is used for bloom texture, smaller = more blur and
+ * lot faster but aliasing can be problem
+ * @param useBlending does fbo need alpha channel and is blending enabled when final
+ * image is rendered. This allow to combine background graphics
+ * and only do blooming on certain objects param use32bitFBO does
+ * fbo use higher precision than 16bits.
+ */
+ public Bloom(int FBO_W, int FBO_H, FrameBuffer sceneIsCapturedHere,
+ boolean useBlending, boolean use32bitFBO){
+
+ initialize(FBO_W, FBO_H, sceneIsCapturedHere, false, useBlending,
+ use32bitFBO);
+ disposeFBO = false;
+ }
+
+ private void initialize(int FBO_W, int FBO_H, FrameBuffer fbo,
+ boolean hasDepth, boolean useBlending, boolean use32bitFBO){
+ blending = useBlending;
+ Format format = null;
+
+ if(use32bitFBO){
+ if(useBlending){
+ format = Format.RGBA8888;
+ }else{
+ format = Format.RGB888;
+ }
+
+ }else{
+ if(useBlending){
+ format = Format.RGBA4444;
+ }else{
+ format = Format.RGB565;
+ }
+ }
+ if(fbo == null){
+ frameBuffer = new FrameBuffer(format, Core.graphics.getWidth(),
+ Core.graphics.getHeight(), hasDepth);
+ }else{
+ frameBuffer = fbo;
+ }
+
+ pingPongBuffer1 = new FrameBuffer(format, FBO_W, FBO_H, false);
+
+ pingPongBuffer2 = new FrameBuffer(format, FBO_W, FBO_H, false);
+
+ original = frameBuffer.getTexture();
+ pingPongTex1 = pingPongBuffer1.getTexture();
+ pingPongTex2 = pingPongBuffer2.getTexture();
+
+ fullScreenQuad = createFullScreenQuad();
+ final String alpha = useBlending ? "alpha_" : "";
+
+ bloomShader = createShader("screenspace", alpha + "bloom");
+
+ if(useAlphaChannelAsMask){
+ tresholdShader = createShader("screenspace", "maskedtreshold");
+ }else{
+ tresholdShader = createShader("screenspace", alpha + "threshold");
+ }
+
+ blurShader = createShader("blurspace", alpha + "gaussian");
+
+ setSize(FBO_W, FBO_H);
+ setBloomIntesity(2.5f);
+ setOriginalIntesity(0.8f);
+ setThreshold(0.5f);
+
+ bloomShader.begin();
+ {
+ bloomShader.setUniformi("u_texture0", 0);
+ bloomShader.setUniformi("u_texture1", 1);
+ }
+ bloomShader.end();
+ }
+
+ /**
+ * Set clearing color for capturing buffer
+ *
+ * @param r
+ * @param g
+ * @param b
+ * @param a
+ */
+ public void setClearColor(float r, float g, float b, float a){
+ this.r = r;
+ this.g = g;
+ this.b = b;
+ this.a = a;
+ }
+
+ /**
+ * Call this before rendering scene.
+ */
+ public void capture(){
+ if(!capturing){
+ capturing = true;
+ frameBuffer.begin();
+ Core.gl.glClearColor(r, g, b, a);
+ Core.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+
+ }
+ }
+
+ /**
+ * Pause capturing to fbo.
+ */
+ public void capturePause(){
+ if(capturing){
+ capturing = false;
+ frameBuffer.end();
+ }
+ }
+
+ /** Start capturing again after pause, no clearing is done to framebuffer */
+ public void captureContinue(){
+ if(!capturing){
+ capturing = true;
+ frameBuffer.begin();
+ }
+ }
+
+ /**
+ * Call this after scene. Renders the bloomed scene.
+ */
+ public void render(){
+ if(capturing){
+ capturing = false;
+ frameBuffer.end();
+ }
+
+ Core.gl.glDisable(GL20.GL_BLEND);
+ Core.gl.glDisable(GL20.GL_DEPTH_TEST);
+ Core.gl.glDepthMask(false);
+
+ gaussianBlur();
+
+ if(blending){
+ Core.gl.glEnable(GL20.GL_BLEND);
+ Core.gl.glBlendFunc(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA);
+ }
+
+ pingPongTex1.bind(1);
+ original.bind(0);
+ bloomShader.begin();
+ {
+ fullScreenQuad.render(bloomShader, GL20.GL_TRIANGLE_FAN);
+ }
+ bloomShader.end();
+
+ }
+
+ private void gaussianBlur(){
+
+ // cut bright areas of the picture and blit to smaller fbo
+
+ original.bind(0);
+ pingPongBuffer1.begin();
+ {
+ tresholdShader.begin();
+ {
+ // tresholdShader.setUniformi("u_texture0", 0);
+ fullScreenQuad.render(tresholdShader, GL20.GL_TRIANGLE_FAN, 0,
+ 4);
+ }
+ tresholdShader.end();
+ }
+ pingPongBuffer1.end();
+
+ for(int i = 0; i < blurPasses; i++){
+
+ pingPongTex1.bind(0);
+
+ // horizontal
+ pingPongBuffer2.begin();
+ {
+ blurShader.begin();
+ {
+ blurShader.setUniformf("dir", 1f, 0f);
+ fullScreenQuad.render(blurShader, GL20.GL_TRIANGLE_FAN, 0,
+ 4);
+ }
+ blurShader.end();
+ }
+ pingPongBuffer2.end();
+
+ pingPongTex2.bind(0);
+ // vertical
+ pingPongBuffer1.begin();
+ {
+ blurShader.begin();
+ {
+ blurShader.setUniformf("dir", 0f, 1f);
+
+ fullScreenQuad.render(blurShader, GL20.GL_TRIANGLE_FAN, 0,
+ 4);
+ }
+ blurShader.end();
+ }
+ pingPongBuffer1.end();
+ }
+ }
+
+ /**
+ * set intensity for bloom. higher mean more brightening for spots that are
+ * over threshold
+ *
+ * @param intensity multiplier for blurred texture in combining phase. must be
+ * positive.
+ */
+ public void setBloomIntesity(float intensity){
+ bloomIntensity = intensity;
+ bloomShader.begin();
+ {
+ bloomShader.setUniformf("BloomIntensity", intensity);
+ }
+ bloomShader.end();
+ }
+
+ /**
+ * set intensity for original scene. under 1 mean darkening and over 1 means
+ * lightening
+ *
+ * @param intensity multiplier for captured texture in combining phase. must be
+ * positive.
+ */
+ public void setOriginalIntesity(float intensity){
+ originalIntensity = intensity;
+ bloomShader.begin();
+ {
+ bloomShader.setUniformf("OriginalIntensity", intensity);
+ }
+ bloomShader.end();
+ }
+
+ /**
+ * Treshold for bright parts. everything under threshold is clamped to 0
+ *
+ * @param threshold must be in range 0..1
+ */
+ public void setThreshold(float threshold){
+ this.threshold = threshold;
+ tresholdShader.begin();
+ {
+ tresholdShader.setUniformf("threshold", threshold,
+ 1f / (1 - threshold));
+ }
+ tresholdShader.end();
+ }
+
+ private void setSize(int FBO_W, int FBO_H){
+ w = FBO_W;
+ h = FBO_H;
+ blurShader.begin();
+ blurShader.setUniformf("size", FBO_W, FBO_H);
+ blurShader.end();
+ }
+
+ /**
+ * Call this when application is exiting.
+ */
+ public void dispose(){
+ if(disposeFBO)
+ frameBuffer.dispose();
+
+ fullScreenQuad.dispose();
+
+ pingPongBuffer1.dispose();
+ pingPongBuffer2.dispose();
+
+ blurShader.dispose();
+ bloomShader.dispose();
+ tresholdShader.dispose();
+
+ }
+
+ private static Mesh createFullScreenQuad(){
+ float[] verts = {-1, -1, 0, 0, 1, -1, 1, 0, 1, 1, 1, 1, -1, 1, 0, 1};
+ Mesh tmpMesh = new Mesh(true, 4, 0, new VertexAttribute(
+ Usage.Position, 2, "a_position"), new VertexAttribute(
+ Usage.TextureCoordinates, 2, "a_texCoord0"));
+
+ tmpMesh.setVertices(verts);
+ return tmpMesh;
+
+ }
+
+ private static Shader createShader(String vertexName, String fragmentName){
+ String vertexShader = Core.files.internal("bloomshaders/" + vertexName + ".vertex.glsl").readString();
+ String fragmentShader = Core.files.internal("bloomshaders/" + fragmentName + ".fragment.glsl").readString();
+ return new Shader(vertexShader, fragmentShader);
+ }
+
+}
diff --git a/core/src/io/anuke/mindustry/graphics/Layer.java b/core/src/io/anuke/mindustry/graphics/Layer.java
index f84f6aa3c2..206da3d6e0 100644
--- a/core/src/io/anuke/mindustry/graphics/Layer.java
+++ b/core/src/io/anuke/mindustry/graphics/Layer.java
@@ -10,7 +10,5 @@ public enum Layer{
/** "High" blocks, like turrets. */
turret,
/** Power lasers. */
- power,
- /** Extra lasers, like healing turrets. */
- laser
+ power
}
diff --git a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java
new file mode 100644
index 0000000000..fb5831c903
--- /dev/null
+++ b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java
@@ -0,0 +1,300 @@
+package io.anuke.mindustry.graphics;
+
+import io.anuke.arc.Core;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.function.PositionConsumer;
+import io.anuke.arc.graphics.Camera;
+import io.anuke.arc.graphics.Color;
+import io.anuke.arc.graphics.g2d.*;
+import io.anuke.arc.graphics.glutils.FrameBuffer;
+import io.anuke.arc.math.*;
+import io.anuke.arc.scene.ui.layout.Unit;
+import io.anuke.arc.util.*;
+import io.anuke.arc.util.noise.RidgedPerlin;
+import io.anuke.arc.util.noise.Simplex;
+import io.anuke.mindustry.content.Blocks;
+import io.anuke.mindustry.content.UnitTypes;
+import io.anuke.mindustry.type.UnitType;
+import io.anuke.mindustry.world.*;
+import io.anuke.mindustry.world.blocks.Floor;
+import io.anuke.mindustry.world.blocks.OreBlock;
+
+import static io.anuke.mindustry.Vars.*;
+
+public class MenuRenderer implements Disposable{
+ private static final float darkness = 0.3f;
+ private final int width = !mobile ? 100 : 60, height = !mobile ? 50 : 40;
+
+ private int cacheFloor, cacheWall;
+ private Camera camera = new Camera();
+ private Matrix3 mat = new Matrix3();
+ private FrameBuffer shadows;
+ private CacheBatch batch;
+ private float time = 0f;
+ private float flyerRot = 45f;
+ private int flyers = Mathf.chance(0.2) ? Mathf.random(35) : Mathf.random(15);
+ private UnitType flyerType = Structs.select(UnitTypes.wraith, UnitTypes.wraith, UnitTypes.ghoul, UnitTypes.phantom, UnitTypes.phantom, UnitTypes.revenant);
+
+ public MenuRenderer(){
+ Time.mark();
+ generate();
+ cache();
+ Log.info("Time to generate menu: {0}", Time.elapsed());
+ }
+
+ private void generate(){
+ Tile[][] tiles = world.createTiles(width, height);
+ Array ores = content.blocks().select(b -> b instanceof OreBlock);
+ shadows = new FrameBuffer(width, height);
+ int offset = Mathf.random(100000);
+ Simplex s1 = new Simplex(offset);
+ Simplex s2 = new Simplex(offset + 1);
+ Simplex s3 = new Simplex(offset + 2);
+ RidgedPerlin rid = new RidgedPerlin(1 + offset, 1);
+ Block[] selected = Structs.select(
+ new Block[]{Blocks.sand, Blocks.sandRocks},
+ new Block[]{Blocks.shale, Blocks.shaleRocks},
+ new Block[]{Blocks.ice, Blocks.icerocks},
+ new Block[]{Blocks.sand, Blocks.sandRocks},
+ new Block[]{Blocks.shale, Blocks.shaleRocks},
+ new Block[]{Blocks.ice, Blocks.icerocks},
+ new Block[]{Blocks.moss, Blocks.sporePine}
+ );
+ Block[] selected2 = Structs.select(
+ new Block[]{Blocks.ignarock, Blocks.duneRocks},
+ new Block[]{Blocks.ignarock, Blocks.duneRocks},
+ new Block[]{Blocks.stone, Blocks.rocks},
+ new Block[]{Blocks.stone, Blocks.rocks},
+ new Block[]{Blocks.moss, Blocks.sporerocks},
+ new Block[]{Blocks.salt, Blocks.saltRocks}
+ );
+
+ Block ore1 = ores.random();
+ ores.remove(ore1);
+ Block ore2 = ores.random();
+
+ double tr1 = Mathf.random(0.65f, 0.85f);
+ double tr2 = Mathf.random(0.65f, 0.85f);
+ boolean doheat = Mathf.chance(0.25);
+ boolean tendrils = Mathf.chance(0.25);
+ boolean tech = Mathf.chance(0.25);
+ int secSize = 10;
+
+ Block floord = selected[0], walld = selected[1];
+ Block floord2 = selected2[0], walld2 = selected2[1];
+
+ for(int x = 0; x < width; x++){
+ for(int y = 0; y < height; y++){
+ Block floor = floord;
+ Block ore = Blocks.air;
+ Block wall = Blocks.air;
+
+ if(s1.octaveNoise2D(3, 0.5, 1/20.0, x, y) > 0.5){
+ wall = walld;
+ }
+
+ if(s3.octaveNoise2D(3, 0.5, 1/20.0, x, y) > 0.5){
+ floor = floord2;
+ if(wall != Blocks.air){
+ wall = walld2;
+ }
+ }
+
+ if(s2.octaveNoise2D(3, 0.3, 1/30.0, x, y) > tr1){
+ ore = ore1;
+ }
+
+ if(s2.octaveNoise2D(2, 0.2, 1/15.0, x, y+99999) > tr2){
+ ore = ore2;
+ }
+
+ if(doheat){
+ double heat = s3.octaveNoise2D(4, 0.6, 1 / 50.0, x, y + 9999);
+ double base = 0.65;
+
+ if(heat > base){
+ ore = Blocks.air;
+ wall = Blocks.air;
+ floor = Blocks.ignarock;
+
+ if(heat > base + 0.1){
+ floor = Blocks.hotrock;
+
+ if(heat > base + 0.15){
+ floor = Blocks.magmarock;
+ }
+ }
+ }
+ }
+
+ if(tech){
+ int mx = x % secSize, my = y % secSize;
+ int sclx = x / secSize, scly = y / secSize;
+ if(s1.octaveNoise2D(2, 1f / 10f, 0.5f, sclx, scly) > 0.4f && (mx == 0 || my == 0 || mx == secSize - 1 || my == secSize - 1)){
+ floor = Blocks.darkPanel3;
+ if(Mathf.dst(mx, my, secSize/2, secSize/2) > secSize/2f + 1){
+ floor = Blocks.darkPanel4;
+ }
+
+
+ if(wall != Blocks.air && Mathf.chance(0.7)){
+ wall = Blocks.darkMetal;
+ }
+ }
+ }
+
+ if(tendrils){
+ if(rid.getValue(x, y, 1f / 17f) > 0f){
+ floor = Mathf.chance(0.2) ? Blocks.sporeMoss : Blocks.moss;
+
+ if(wall != Blocks.air){
+ wall = Blocks.sporerocks;
+ }
+ }
+ }
+
+ Tile tile;
+ tiles[x][y] = (tile = new CachedTile());
+ tile.x = (short)x;
+ tile.y = (short)y;
+ tile.setFloor((Floor) floor);
+ tile.setBlock(wall);
+ tile.setOverlay(ore);
+ }
+ }
+ }
+
+ private void cache(){
+
+ //draw shadows
+ Draw.proj().setOrtho(0, 0, shadows.getWidth(), shadows.getHeight());
+ shadows.beginDraw(Color.CLEAR);
+ Draw.color(Color.BLACK);
+ for(int x = 0; x < width; x++){
+ for(int y = 0; y < height; y++){
+ if(world.rawTile(x, y).block() != Blocks.air){
+ Fill.rect(x + 0.5f, y + 0.5f, 1, 1);
+ }
+ }
+ }
+ Draw.color();
+ shadows.endDraw();
+
+ SpriteBatch prev = Core.batch;
+
+ Core.batch = batch = new CacheBatch(new SpriteCache(width * height * 6, false));
+ batch.beginCache();
+
+ for(int x = 0; x < width; x++){
+ for(int y = 0; y < height; y++){
+ Tile tile = world.rawTile(x, y);
+ tile.floor().draw(tile);
+ }
+ }
+
+ for(int x = 0; x < width; x++){
+ for(int y = 0; y < height; y++){
+ Tile tile = world.rawTile(x, y);
+ if(tile.overlay() != Blocks.air){
+ tile.overlay().draw(tile);
+ }
+ }
+ }
+
+ cacheFloor = batch.endCache();
+ batch.beginCache();
+
+ for(int x = 0; x < width; x++){
+ for(int y = 0; y < height; y++){
+ Tile tile = world.rawTile(x, y);
+ if(tile.block() != Blocks.air){
+ tile.block().draw(tile);
+ }
+ }
+ }
+
+ cacheWall = batch.endCache();
+
+ Core.batch = prev;
+ }
+
+ public void render(){
+ time += Time.delta();
+ float scaling = Math.max(Unit.dp.scl(4f), Math.max(Core.graphics.getWidth() / ((width - 1f) * tilesize), Core.graphics.getHeight() / ((height - 1f) * tilesize)));
+ camera.position.set(width * tilesize / 2f, height * tilesize / 2f);
+ camera.resize(Core.graphics.getWidth() / scaling,
+ Core.graphics.getHeight() / scaling);
+
+ mat.set(Draw.proj());
+ Draw.flush();
+ Draw.proj(camera.projection());
+ batch.setProjection(camera.projection());
+ batch.beginDraw();
+ batch.drawCache(cacheFloor);
+ batch.endDraw();
+ Draw.rect(Draw.wrap(shadows.getTexture()),
+ width * tilesize / 2f - 4f, height * tilesize / 2f - 4f,
+ width * tilesize, -height * tilesize);
+ Draw.flush();
+ batch.beginDraw();
+ batch.drawCache(cacheWall);
+ batch.endDraw();
+
+ drawFlyers();
+
+ Draw.proj(mat);
+ Draw.color(0f, 0f, 0f, darkness);
+ Fill.crect(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight());
+ Draw.color();
+ }
+
+ private void drawFlyers(){
+ Draw.color(0f, 0f, 0f, 0.4f);
+
+ float size = Math.max(flyerType.iconRegion.getWidth(), flyerType.iconRegion.getHeight()) * Draw.scl * 1.6f;
+
+ flyers((x, y) -> {
+ Draw.rect(flyerType.region, x - 12f, y - 13f, flyerRot - 90);
+ });
+
+ flyers((x, y) -> {
+ Draw.rect("circle-shadow", x, y, size, size);
+ });
+ Draw.color();
+
+ flyers((x, y) -> {
+ float engineOffset = flyerType.engineOffset, engineSize = flyerType.engineSize, rotation = flyerRot;
+
+ Draw.color(Pal.engine);
+ Fill.circle(x + Angles.trnsx(rotation + 180, engineOffset), y + Angles.trnsy(rotation + 180, engineOffset),
+ engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f));
+
+ Draw.color(Color.WHITE);
+ Fill.circle(x + Angles.trnsx(rotation + 180, engineOffset - 1f), y + Angles.trnsy(rotation + 180, engineOffset - 1f),
+ (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)) / 2f);
+ Draw.color();
+
+ Draw.rect(flyerType.region, x, y, flyerRot - 90);
+ });
+ }
+
+ private void flyers(PositionConsumer cons){
+ float tw = width * tilesize * 1f + tilesize;
+ float th = height * tilesize * 1f + tilesize;
+ float range = 500f;
+ float offset = -100f;
+
+ for(int i = 0; i < flyers; i++){
+ Tmp.v1.trns(flyerRot, time * (2f + flyerType.speed));
+
+ cons.accept((Mathf.randomSeedRange(i, range) + Tmp.v1.x + Mathf.absin(time + Mathf.randomSeedRange(i + 2, 500), 10f, 3.4f) + offset) % (tw + Mathf.randomSeed(i + 5, 0, 500)),
+ (Mathf.randomSeedRange(i + 1, range) + Tmp.v1.y + Mathf.absin(time + Mathf.randomSeedRange(i + 3, 500), 10f, 3.4f) + offset) % th);
+ }
+ }
+
+ @Override
+ public void dispose(){
+ batch.dispose();
+ shadows.dispose();
+ }
+}
diff --git a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
index 9777f4e833..85b390d939 100644
--- a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
@@ -1,23 +1,20 @@
package io.anuke.mindustry.graphics;
-import io.anuke.arc.Core;
-import io.anuke.arc.Events;
-import io.anuke.arc.collection.Array;
+import io.anuke.arc.*;
+import io.anuke.arc.collection.*;
import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.Pixmap.Format;
+import io.anuke.arc.graphics.Pixmap.*;
import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Rectangle;
-import io.anuke.arc.util.Disposable;
-import io.anuke.mindustry.entities.Units;
-import io.anuke.mindustry.entities.type.Unit;
-import io.anuke.mindustry.game.EventType.TileChangeEvent;
-import io.anuke.mindustry.game.EventType.WorldLoadEvent;
-import io.anuke.mindustry.io.MapIO;
-import io.anuke.mindustry.world.Tile;
+import io.anuke.arc.math.*;
+import io.anuke.arc.math.geom.*;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.entities.*;
+import io.anuke.mindustry.entities.type.*;
+import io.anuke.mindustry.game.EventType.*;
+import io.anuke.mindustry.io.*;
+import io.anuke.mindustry.world.*;
-import static io.anuke.mindustry.Vars.tilesize;
-import static io.anuke.mindustry.Vars.world;
+import static io.anuke.mindustry.Vars.*;
public class MinimapRenderer implements Disposable{
private static final float baseSize = 16f;
@@ -129,8 +126,9 @@ public class MinimapRenderer implements Disposable{
}
private int colorFor(Tile tile){
+ if(tile == null) return 0;
tile = tile.link();
- return MapIO.colorFor(tile.floor(), tile.block(), tile.overlay(), tile.getTeam());
+ return Tmp.c1.set(MapIO.colorFor(tile.floor(), tile.block(), tile.overlay(), tile.getTeam())).mul(tile.block().cacheLayer == CacheLayer.walls ? 1f - tile.rotation() / 4f : 1f).rgba();
}
@Override
diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
index 494099befb..bccb17ebb7 100644
--- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
@@ -22,6 +22,7 @@ import static io.anuke.mindustry.Vars.*;
public class OverlayRenderer{
private static final float indicatorLength = 14f;
+ private static final float spawnerMargin = tilesize*11f;
private static final Rectangle rect = new Rectangle();
private float buildFadeTime;
@@ -92,6 +93,16 @@ public class OverlayRenderer{
}
}
+ Lines.stroke(2f);
+ Draw.color(Color.GRAY, Color.LIGHT_GRAY, Mathf.absin(Time.time(), 8f, 1f));
+
+ for(Tile tile : world.spawner.getGroundSpawns()){
+ if(tile.withinDst(player.x, player.y, state.rules.dropZoneRadius + spawnerMargin)){
+ Draw.alpha(Mathf.clamp(1f - (player.dst(tile) - state.rules.dropZoneRadius) / spawnerMargin));
+ Lines.dashCircle(tile.worldx(), tile.worldy(), state.rules.dropZoneRadius);
+ }
+ }
+
Draw.reset();
//draw selected block bars and info
diff --git a/core/src/io/anuke/mindustry/graphics/Pal.java b/core/src/io/anuke/mindustry/graphics/Pal.java
index aa4ca6f7e7..40c4867abc 100644
--- a/core/src/io/anuke/mindustry/graphics/Pal.java
+++ b/core/src/io/anuke/mindustry/graphics/Pal.java
@@ -11,6 +11,8 @@ public class Pal{
bulletYellow = Color.valueOf("ffeec9"),
bulletYellowBack = Color.valueOf("f9c87a"),
+ darkMetal = Color.valueOf("6e7080"),
+
missileYellow = Color.valueOf("ffd2ae"),
missileYellowBack = Color.valueOf("e58956"),
@@ -50,10 +52,11 @@ public class Pal{
bar = Color.SLATE,
accent = Color.valueOf("ffd37f"),
stat = Color.valueOf("ffd37f"),
- locked = Color.valueOf("989aa4"),
+ gray = Color.valueOf("454545"),
accentBack = Color.valueOf("d4816b"),
place = Color.valueOf("6335f8"),
remove = Color.valueOf("e55454"),
+ noplace = Color.valueOf("ffa697"),
removeBack = Color.valueOf("a73e3e"),
placeRotate = accent,
breakInvalid = Color.valueOf("d44b3d"),
diff --git a/core/src/io/anuke/mindustry/graphics/Pixelator.java b/core/src/io/anuke/mindustry/graphics/Pixelator.java
index e8a9e0d2f3..8cc252eebd 100644
--- a/core/src/io/anuke/mindustry/graphics/Pixelator.java
+++ b/core/src/io/anuke/mindustry/graphics/Pixelator.java
@@ -55,7 +55,7 @@ public class Pixelator implements Disposable{
Draw.rect(Draw.wrap(buffer.getTexture()), Core.camera.position.x, Core.camera.position.y, Core.camera.width, -Core.camera.height);
Draw.blend();
- renderer.drawAndInterpolate(playerGroup, p -> !p.isDead() && !p.isLocal, Player::drawName);
+ renderer.draw(playerGroup, p -> !p.isDead() && !p.isLocal, Player::drawName);
Core.camera.position.set(px, py);
Core.settings.put("animatedwater", hadWater);
diff --git a/core/src/io/anuke/mindustry/graphics/Shapes.java b/core/src/io/anuke/mindustry/graphics/Shapes.java
index 7e629d347b..3ab13f8c74 100644
--- a/core/src/io/anuke/mindustry/graphics/Shapes.java
+++ b/core/src/io/anuke/mindustry/graphics/Shapes.java
@@ -7,24 +7,22 @@ import io.anuke.arc.util.Tmp;
public class Shapes{
- public static void laser(String line, String edge, float x, float y, float x2, float y2, float scale){
+ public static void laser(TextureRegion line, TextureRegion edge, float x, float y, float x2, float y2, float scale){
laser(line, edge, x, y, x2, y2, Mathf.angle(x2 - x, y2 - y), scale);
}
- public static void laser(String line, String edge, float x, float y, float x2, float y2){
+ public static void laser(TextureRegion line, TextureRegion edge, float x, float y, float x2, float y2){
laser(line, edge, x, y, x2, y2, Mathf.angle(x2 - x, y2 - y), 1f);
}
- public static void laser(String line, String edge, float x, float y, float x2, float y2, float rotation, float scale){
- TextureRegion region = Core.atlas.find(edge);
-
+ public static void laser(TextureRegion line, TextureRegion edge, float x, float y, float x2, float y2, float rotation, float scale){
Tmp.v1.trns(rotation, 8f * scale * Draw.scl);
- Draw.rect(Core.atlas.find(edge), x, y, region.getWidth() * scale * Draw.scl, region.getHeight() * scale * Draw.scl, rotation + 180);
- Draw.rect(Core.atlas.find(edge), x2, y2, region.getWidth() * scale * Draw.scl, region.getHeight() * scale * Draw.scl, rotation);
+ Draw.rect(edge, x, y, edge.getWidth() * scale * Draw.scl, edge.getHeight() * scale * Draw.scl, rotation + 180);
+ Draw.rect(edge, x2, y2, edge.getWidth() * scale * Draw.scl, edge.getHeight() * scale * Draw.scl, rotation);
Lines.stroke(12f * scale);
- Lines.line(Core.atlas.find(line), x + Tmp.v1.x, y + Tmp.v1.y, x2 - Tmp.v1.x, y2 - Tmp.v1.y, CapStyle.none, 0f);
+ Lines.line(line, x + Tmp.v1.x, y + Tmp.v1.y, x2 - Tmp.v1.x, y2 - Tmp.v1.y, CapStyle.none, 0f);
Lines.stroke(1f);
}
diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java
index 2198f002ef..87b8a26a32 100644
--- a/core/src/io/anuke/mindustry/input/DesktopInput.java
+++ b/core/src/io/anuke/mindustry/input/DesktopInput.java
@@ -141,7 +141,7 @@ public class DesktopInput extends InputHandler{
if(state.is(State.menu) || Core.scene.hasDialog()) return;
- //zoom and rotate things
+ //zoom things
if(Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && (Core.input.keyDown(Binding.zoom_hold))){
renderer.scaleCamera(Core.input.axisTap(Binding.zoom));
}
@@ -214,7 +214,7 @@ public class DesktopInput extends InputHandler{
mode = placing;
}else if(selected != null){
//only begin shooting if there's no cursor event
- if(!tileTapped(selected) && !tryTapPlayer(Core.input.mouseWorld().x, Core.input.mouseWorld().y) && player.getPlaceQueue().size == 0 && !droppingItem &&
+ if(!tileTapped(selected) && !tryTapPlayer(Core.input.mouseWorld().x, Core.input.mouseWorld().y) && player.buildQueue().size == 0 && !droppingItem &&
!tryBeginMine(selected) && player.getMineTile() == null && !ui.chatfrag.chatOpen()){
player.isShooting = true;
}
@@ -222,7 +222,7 @@ public class DesktopInput extends InputHandler{
player.isShooting = true;
}
}else if(Core.input.keyTap(Binding.deselect) && (block != null || mode != none || player.isBuilding()) &&
- !(player.getCurrentRequest() != null && player.getCurrentRequest().breaking && Core.keybinds.get(Binding.deselect) == Core.keybinds.get(Binding.break_block))){
+ !(player.buildRequest() != null && player.buildRequest().breaking && Core.keybinds.get(Binding.deselect) == Core.keybinds.get(Binding.break_block))){
if(block == null){
player.clearBuilding();
}
diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java
index f69c9331a6..fae86625e8 100644
--- a/core/src/io/anuke/mindustry/input/InputHandler.java
+++ b/core/src/io/anuke/mindustry/input/InputHandler.java
@@ -42,7 +42,7 @@ public abstract class InputHandler implements InputProcessor{
/** Distance on the back from where items originate. */
final static float backTrns = 3f;
- public final OverlayFragment frag = new OverlayFragment(this);
+ public final OverlayFragment frag = new OverlayFragment();
public Block block;
public int rotation;
@@ -324,7 +324,7 @@ public abstract class InputHandler implements InputProcessor{
}
public boolean validBreak(int x, int y){
- return Build.validBreak(player.getTeam(), x, y) && Mathf.dst(player.x, player.y, x * tilesize, y * tilesize) < Player.placeDistance;
+ return Build.validBreak(player.getTeam(), x, y);
}
public void placeBlock(int x, int y, Block block, int rotation){
diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java
index a4b741e1a8..0bdbbbc7b3 100644
--- a/core/src/io/anuke/mindustry/input/MobileInput.java
+++ b/core/src/io/anuke/mindustry/input/MobileInput.java
@@ -20,6 +20,7 @@ import io.anuke.mindustry.content.Fx;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.Effects;
import io.anuke.mindustry.entities.Units;
+import io.anuke.mindustry.entities.traits.BuilderTrait.*;
import io.anuke.mindustry.entities.traits.TargetTrait;
import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.entities.type.Unit;
@@ -120,6 +121,19 @@ public class MobileInput extends InputHandler implements GestureListener{
return true;
}
}
+
+ for(BuildRequest req : player.buildQueue()){
+ Tile other = world.tile(req.x, req.y);
+
+ if(other == null || req.breaking) continue;
+
+ r1.setSize(req.block.size * tilesize);
+ r1.setCenter(other.worldx() + req.block.offset(), other.worldy() + req.block.offset());
+
+ if(r2.overlaps(r1)){
+ return true;
+ }
+ }
return false;
}
@@ -261,11 +275,11 @@ public class MobileInput extends InputHandler implements GestureListener{
@Override
public void buildUI(Table table){
- table.addImage("blank").color(Pal.accent).height(3f).colspan(4).growX();
+ table.addImage("whiteui").color(Pal.gray).height(4f).colspan(4).growX();
table.row();
table.left().margin(0f).defaults().size(48f);
- table.addImageButton("icon-break", "clear-toggle-partial", 16 * 2f, () -> {
+ table.addImageButton("icon-break-small", "clear-toggle-partial", iconsizesmall, () -> {
mode = mode == breaking ? block == null ? none : placing : breaking;
lastBlock = block;
if(mode == breaking){
@@ -274,17 +288,17 @@ public class MobileInput extends InputHandler implements GestureListener{
}).update(l -> l.setChecked(mode == breaking));
//diagonal swap button
- table.addImageButton("icon-diagonal", "clear-toggle-partial", 16 * 2f, () -> {
+ table.addImageButton("icon-diagonal-small", "clear-toggle-partial", iconsizesmall, () -> {
Core.settings.put("swapdiagonal", !Core.settings.getBool("swapdiagonal"));
Core.settings.save();
}).update(l -> l.setChecked(Core.settings.getBool("swapdiagonal")));
//rotate button
- table.addImageButton("icon-arrow", "clear-partial", 16 * 2f, () -> rotation = Mathf.mod(rotation + 1, 4))
+ table.addImageButton("icon-arrow-small", "clear-partial", iconsizesmall, () -> rotation = Mathf.mod(rotation + 1, 4))
.update(i -> i.getImage().setRotationOrigin(rotation * 90, Align.center)).visible(() -> block != null && block.rotate);
//confirm button
- table.addImageButton("icon-check", "clear-partial", 16 * 2f, () -> {
+ table.addImageButton("icon-check-small", "clear-partial", iconsizesmall, () -> {
for(PlaceRequest request : selection){
Tile tile = request.tile();
@@ -475,7 +489,10 @@ public class MobileInput extends InputHandler implements GestureListener{
//call tap events
if(pointer == 0 && !selecting && mode == none){
- tryTapPlayer(worldx, worldy);
+ if(!tryTapPlayer(worldx, worldy) && Core.settings.getBool("keyboard")){
+ //shoot on touch down when in keyboard mode
+ player.isShooting = true;
+ }
}
return false;
@@ -598,6 +615,27 @@ public class MobileInput extends InputHandler implements GestureListener{
mode = none;
}
+ //zoom things
+ if(Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && (Core.input.keyDown(Binding.zoom_hold))){
+ renderer.scaleCamera(Core.input.axisTap(Binding.zoom));
+ }
+
+ if(!Core.settings.getBool("keyboard")){
+ //move camera around
+ float camSpeed = 6f;
+ Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta() * camSpeed));
+ }
+
+ if(Core.settings.getBool("keyboard")){
+ if(Core.input.keyRelease(Binding.select)){
+ player.isShooting = false;
+ }
+
+ if(player.isShooting && !canShoot()){
+ player.isShooting = false;
+ }
+ }
+
//reset state when not placing
if(mode == none){
selecting = false;
@@ -678,7 +716,7 @@ public class MobileInput extends InputHandler implements GestureListener{
@Override
public boolean pan(float x, float y, float deltaX, float deltaY){
- if(Core.scene.hasDialog()) return false;
+ if(Core.scene.hasDialog() || Core.settings.getBool("keyboard")) return false;
float scale = Core.camera.width / Core.graphics.getWidth();
deltaX *= scale;
@@ -723,6 +761,7 @@ public class MobileInput extends InputHandler implements GestureListener{
@Override
public boolean zoom(float initialDistance, float distance){
+ if(Core.settings.getBool("keyboard")) return false;
if(lastDistance == -1) lastDistance = initialDistance;
float amount = (Mathf.sign(distance > lastDistance) * 0.04f) * Time.delta();
diff --git a/core/src/io/anuke/mindustry/io/Changelogs.java b/core/src/io/anuke/mindustry/io/Changelogs.java
deleted file mode 100644
index 33d888be47..0000000000
--- a/core/src/io/anuke/mindustry/io/Changelogs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.anuke.mindustry.io;
-
-import io.anuke.arc.collection.Array;
-import io.anuke.arc.function.Consumer;
-import io.anuke.arc.util.serialization.JsonReader;
-import io.anuke.arc.util.serialization.JsonValue;
-import io.anuke.mindustry.net.Net;
-
-import static io.anuke.mindustry.Vars.releasesURL;
-
-public class Changelogs{
-
- public static void getChangelog(Consumer> success, Consumer fail){
- Net.http(releasesURL, "GET", result -> {
- JsonReader reader = new JsonReader();
- JsonValue value = reader.parse(result).child;
- Array out = new Array<>();
-
- while(value != null){
- String name = value.getString("name");
- String description = value.getString("body").replace("\r", "");
- int id = value.getInt("id");
- int build = Integer.parseInt(value.getString("tag_name").substring(1));
- out.add(new VersionInfo(name, description, id, build, value.getString("published_at")));
- value = value.next;
- }
-
- success.accept(out);
- }, fail);
- }
-
- public static class VersionInfo{
- public final String name, description, date;
- public final int id, build;
-
- public VersionInfo(String name, String description, int id, int build, String date){
- this.name = name;
- this.description = description;
- this.id = id;
- this.build = build;
- this.date = date;
- }
-
- @Override
- public String toString(){
- return "VersionInfo{" +
- "name='" + name + '\'' +
- ", description='" + description + '\'' +
- ", id=" + id +
- ", build=" + build +
- '}';
- }
- }
-}
diff --git a/core/src/io/anuke/mindustry/io/JsonIO.java b/core/src/io/anuke/mindustry/io/JsonIO.java
index 3c1ce9520c..6cea5fb1c1 100644
--- a/core/src/io/anuke/mindustry/io/JsonIO.java
+++ b/core/src/io/anuke/mindustry/io/JsonIO.java
@@ -1,17 +1,19 @@
package io.anuke.mindustry.io;
-import io.anuke.arc.util.serialization.Json;
-import io.anuke.arc.util.serialization.JsonValue;
-import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.game.Rules;
-import io.anuke.mindustry.game.SpawnGroup;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.util.serialization.*;
+import io.anuke.mindustry.*;
+import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.game.Teams.*;
import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.world.*;
@SuppressWarnings("unchecked")
public class JsonIO{
private static Json json = new Json(){{
setIgnoreUnknownFields(true);
setElementType(Rules.class, "spawns", SpawnGroup.class);
+ setElementType(Rules.class, "loadout", ItemStack.class);
setSerializer(Zone.class, new Serializer(){
@Override
@@ -36,6 +38,70 @@ public class JsonIO{
return Vars.content.getByName(ContentType.item, jsonData.asString());
}
});
+
+ //TODO extremely hacky and disgusting
+ for(Block block : Vars.content.blocks()){
+ Class type = block.getClass();
+ if(type.isAnonymousClass()) type = type.getSuperclass();
+
+ setSerializer(type, new Serializer(){
+ @Override
+ public void write(Json json, Block object, Class knownType){
+ json.writeValue(object.name);
+ }
+
+ @Override
+ public Block read(Json json, JsonValue jsonData, Class type){
+ return Vars.content.getByName(ContentType.block, jsonData.asString());
+ }
+ });
+ }
+
+ setSerializer(Block.class, new Serializer(){
+ @Override
+ public void write(Json json, Block object, Class knownType){
+ json.writeValue(object.name);
+ }
+
+ @Override
+ public Block read(Json json, JsonValue jsonData, Class type){
+ return Vars.content.getByName(ContentType.block, jsonData.asString());
+ }
+ });
+
+ setSerializer(TeamData.class, new Serializer(){
+ @Override
+ public void write(Json json, TeamData object, Class knownType){
+ json.writeObjectStart();
+ json.writeValue("brokenBlocks", object.brokenBlocks.toArray());
+ json.writeValue("team", object.team.ordinal());
+ json.writeObjectEnd();
+ }
+
+ @Override
+ public TeamData read(Json json, JsonValue jsonData, Class type){
+ long[] blocks = jsonData.get("brokenBlocks").asLongArray();
+ Team team = Team.all[jsonData.getInt("team", 0)];
+ TeamData out = new TeamData(team, EnumSet.of(new Team[]{}));
+ out.brokenBlocks = new LongQueue(blocks);
+ return out;
+ }
+ });
+
+ setSerializer(ItemStack.class, new Serializer(){
+ @Override
+ public void write(Json json, ItemStack object, Class knownType){
+ json.writeObjectStart();
+ json.writeValue("item", object.item);
+ json.writeValue("amount", object.amount);
+ json.writeObjectEnd();
+ }
+
+ @Override
+ public ItemStack read(Json json, JsonValue jsonData, Class type){
+ return new ItemStack(json.getSerializer(Item.class).read(json, jsonData.get("item"), Item.class), jsonData.getInt("amount"));
+ }
+ });
}};
public static String write(Object object){
diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java
index 8daf1a7e2a..066d87d488 100644
--- a/core/src/io/anuke/mindustry/io/MapIO.java
+++ b/core/src/io/anuke/mindustry/io/MapIO.java
@@ -1,20 +1,18 @@
package io.anuke.mindustry.io;
-import io.anuke.arc.collection.StringMap;
-import io.anuke.arc.files.FileHandle;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.Pixmap;
-import io.anuke.arc.graphics.Pixmap.Format;
-import io.anuke.arc.util.io.CounterInputStream;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.game.Version;
-import io.anuke.mindustry.maps.Map;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.files.*;
+import io.anuke.arc.graphics.*;
+import io.anuke.arc.graphics.Pixmap.*;
+import io.anuke.arc.util.io.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.maps.*;
import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.storage.CoreBlock;
+import io.anuke.mindustry.world.blocks.storage.*;
import java.io.*;
-import java.util.zip.InflaterInputStream;
+import java.util.zip.*;
import static io.anuke.mindustry.Vars.*;
@@ -64,9 +62,8 @@ public class MapIO{
}
public static Pixmap generatePreview(Map map) throws IOException{
- //by default, it does not have an enemy core or any other cores
- map.tags.put("enemycore", "false");
- map.tags.put("othercore", "false");
+ map.spawns = 0;
+ map.teams.clear();
try(InputStream is = new InflaterInputStream(map.file.read(bufferSize)); CounterInputStream counter = new CounterInputStream(is); DataInputStream stream = new DataInputStream(counter)){
SaveIO.readHeader(stream);
@@ -93,15 +90,7 @@ public class MapIO{
public void setTeam(Team team){
super.setTeam(team);
if(block instanceof CoreBlock){
- if(team != defaultTeam){
- //map must have other team's cores
- map.tags.put("othercore", "true");
- }
-
- if(team == waveTeam){
- //map must have default enemy team's core
- map.tags.put("enemycore", "true");
- }
+ map.teams.add(team.ordinal());
}
}
};
@@ -127,6 +116,9 @@ public class MapIO{
}else{
floors.drawPixel(x, floors.getHeight() - 1 - y, colorFor(content.block(floorID), Blocks.air, Blocks.air, Team.none));
}
+ if(content.block(overlayID) == Blocks.spawn){
+ map.spawns ++;
+ }
return tile;
}
}));
diff --git a/core/src/io/anuke/mindustry/io/SaveFileReader.java b/core/src/io/anuke/mindustry/io/SaveFileReader.java
index 8384aca50e..a969776896 100644
--- a/core/src/io/anuke/mindustry/io/SaveFileReader.java
+++ b/core/src/io/anuke/mindustry/io/SaveFileReader.java
@@ -14,7 +14,9 @@ public abstract class SaveFileReader{
protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput);
protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream();
protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall);
- protected final ObjectMap fallback = ObjectMap.of();
+ protected final ObjectMap fallback = ObjectMap.of(
+
+ );
protected void region(String name, DataInput stream, CounterInputStream counter, IORunner cons) throws IOException{
counter.resetCount();
diff --git a/core/src/io/anuke/mindustry/io/SaveIO.java b/core/src/io/anuke/mindustry/io/SaveIO.java
index 916c4ad414..cb79c0222d 100644
--- a/core/src/io/anuke/mindustry/io/SaveIO.java
+++ b/core/src/io/anuke/mindustry/io/SaveIO.java
@@ -6,6 +6,7 @@ import io.anuke.arc.util.io.CounterInputStream;
import io.anuke.arc.util.io.FastDeflaterOutputStream;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.io.versions.Save1;
+import io.anuke.mindustry.io.versions.Save2;
import io.anuke.mindustry.world.WorldContext;
import java.io.*;
@@ -18,7 +19,7 @@ public class SaveIO{
/** Format header. This is the string 'MSAV' in ASCII. */
public static final byte[] header = {77, 83, 65, 86};
public static final IntMap versions = new IntMap<>();
- public static final Array versionArray = Array.with(new Save1());
+ public static final Array versionArray = Array.with(new Save1(), new Save2());
static{
for(SaveVersion version : versionArray){
diff --git a/core/src/io/anuke/mindustry/io/SaveVersion.java b/core/src/io/anuke/mindustry/io/SaveVersion.java
index 1071fc9b08..b4f700a582 100644
--- a/core/src/io/anuke/mindustry/io/SaveVersion.java
+++ b/core/src/io/anuke/mindustry/io/SaveVersion.java
@@ -1,15 +1,14 @@
package io.anuke.mindustry.io;
-import io.anuke.arc.collection.Array;
-import io.anuke.arc.collection.StringMap;
-import io.anuke.arc.util.Time;
-import io.anuke.arc.util.io.CounterInputStream;
-import io.anuke.mindustry.entities.Entities;
-import io.anuke.mindustry.entities.EntityGroup;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.util.*;
+import io.anuke.arc.util.io.*;
+import io.anuke.mindustry.entities.*;
import io.anuke.mindustry.entities.traits.*;
import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.maps.Map;
-import io.anuke.mindustry.type.ContentType;
+import io.anuke.mindustry.gen.*;
+import io.anuke.mindustry.maps.*;
+import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.*;
import java.io.*;
@@ -19,6 +18,9 @@ import static io.anuke.mindustry.Vars.*;
public abstract class SaveVersion extends SaveFileReader{
public final int version;
+ //HACK stores the last read build of the save file, valid after read meta call
+ protected int lastReadBuild;
+
public SaveVersion(int version){
this.version = version;
}
@@ -76,7 +78,9 @@ public abstract class SaveVersion extends SaveFileReader{
state.wavetime = map.getFloat("wavetime", state.rules.waveSpacing);
state.stats = JsonIO.read(Stats.class, map.get("stats", "{}"));
state.rules = JsonIO.read(Rules.class, map.get("rules", "{}"));
- if(state.rules.spawns.isEmpty()) state.rules.spawns = DefaultWaves.get();
+ if(state.rules.spawns.isEmpty()) state.rules.spawns = defaultWaves.get();
+ lastReadBuild = map.getInt("build", -1);
+
Map worldmap = world.maps.byName(map.get("mapname", "\\\\\\"));
world.setMap(worldmap == null ? new Map(StringMap.of(
"name", map.get("mapname", "Unknown"),
@@ -92,13 +96,13 @@ public abstract class SaveVersion extends SaveFileReader{
//floor + overlay
for(int i = 0; i < world.width() * world.height(); i++){
- Tile tile = world.tile(i % world.width(), i / world.width());
+ Tile tile = world.rawTile(i % world.width(), i / world.width());
stream.writeShort(tile.floorID());
stream.writeShort(tile.overlayID());
int consecutives = 0;
for(int j = i + 1; j < world.width() * world.height() && consecutives < 255; j++){
- Tile nextTile = world.tile(j % world.width(), j / world.width());
+ Tile nextTile = world.rawTile(j % world.width(), j / world.width());
if(nextTile.floorID() != tile.floorID() || nextTile.overlayID() != tile.overlayID()){
break;
@@ -113,7 +117,7 @@ public abstract class SaveVersion extends SaveFileReader{
//blocks
for(int i = 0; i < world.width() * world.height(); i++){
- Tile tile = world.tile(i % world.width(), i / world.width());
+ Tile tile = world.rawTile(i % world.width(), i / world.width());
stream.writeShort(tile.blockID());
if(tile.entity != null){
@@ -126,7 +130,7 @@ public abstract class SaveVersion extends SaveFileReader{
int consecutives = 0;
for(int j = i + 1; j < world.width() * world.height() && consecutives < 255; j++){
- Tile nextTile = world.tile(j % world.width(), j / world.width());
+ Tile nextTile = world.rawTile(j % world.width(), j / world.width());
if(nextTile.blockID() != tile.blockID()){
break;
@@ -220,7 +224,7 @@ public abstract class SaveVersion extends SaveFileReader{
SaveTrait save = (SaveTrait)entity;
//each entity is a separate chunk.
writeChunk(stream, true, out -> {
- out.writeByte(save.getTypeID());
+ out.writeByte(save.getTypeID().id);
out.writeByte(save.version());
save.writeSave(out);
});
@@ -239,7 +243,7 @@ public abstract class SaveVersion extends SaveFileReader{
readChunk(stream, true, in -> {
byte typeid = in.readByte();
byte version = in.readByte();
- SaveTrait trait = (SaveTrait)TypeTrait.getTypeByID(typeid).get();
+ SaveTrait trait = (SaveTrait)content.getByID(ContentType.typeid, typeid).constructor.get();
trait.readSave(in, version);
});
}
@@ -247,7 +251,6 @@ public abstract class SaveVersion extends SaveFileReader{
}
public void readContentHeader(DataInput stream) throws IOException{
-
byte mapped = stream.readByte();
MappableContent[][] map = new MappableContent[ContentType.values().length][0];
@@ -287,4 +290,17 @@ public abstract class SaveVersion extends SaveFileReader{
}
}
}
+
+ /** sometimes it's necessary to remap IDs after the content header is read.*/
+ public void remapContent(){
+ for(Team team : Team.all){
+ if(state.teams.isActive(team)){
+ LongQueue queue = state.teams.get(team).brokenBlocks;
+ for(int i = 0; i < queue.size; i++){
+ //remap broken block IDs
+ queue.set(i, BrokenBlock.block(queue.get(i), content.block(BrokenBlock.block(queue.get(i))).id));
+ }
+ }
+ }
+ }
}
diff --git a/core/src/io/anuke/mindustry/io/TypeIO.java b/core/src/io/anuke/mindustry/io/TypeIO.java
index c3dc0be2d3..97f92584f2 100644
--- a/core/src/io/anuke/mindustry/io/TypeIO.java
+++ b/core/src/io/anuke/mindustry/io/TypeIO.java
@@ -86,15 +86,15 @@ public class TypeIO{
@WriteClass(BaseUnit.class)
public static void writeBaseUnit(ByteBuffer buffer, BaseUnit unit){
- buffer.put((byte)unitGroups[unit.getTeam().ordinal()].getID());
+ buffer.put((byte)unit.getTeam().ordinal());
buffer.putInt(unit.getID());
}
@ReadClass(BaseUnit.class)
- public static BaseUnit writeBaseUnit(ByteBuffer buffer){
- byte gid = buffer.get();
+ public static BaseUnit readBaseUnit(ByteBuffer buffer){
+ byte tid = buffer.get();
int id = buffer.getInt();
- return (BaseUnit)Entities.getGroup(gid).getByID(id);
+ return unitGroups[tid].getByID(id);
}
@WriteClass(Tile.class)
@@ -139,6 +139,10 @@ public class TypeIO{
int position = buffer.getInt();
BuildRequest currentRequest;
+ if(world.tile(position) == null){
+ continue;
+ }
+
if(type == 1){ //remove
currentRequest = new BuildRequest(Pos.x(position), Pos.y(position));
}else{ //place
@@ -193,6 +197,16 @@ public class TypeIO{
return Effects.getEffect(buffer.getShort());
}
+ @WriteClass(UnitType.class)
+ public static void writeUnitType(ByteBuffer buffer, UnitType effect){
+ buffer.putShort(effect.id);
+ }
+
+ @ReadClass(UnitType.class)
+ public static UnitType readUnitType(ByteBuffer buffer){
+ return content.getByID(ContentType.unit, buffer.getShort());
+ }
+
@WriteClass(Color.class)
public static void writeColor(ByteBuffer buffer, Color color){
buffer.putInt(Color.rgba8888(color));
diff --git a/core/src/io/anuke/mindustry/io/versions/LegacyTypeTable.java b/core/src/io/anuke/mindustry/io/versions/LegacyTypeTable.java
new file mode 100644
index 0000000000..6205313247
--- /dev/null
+++ b/core/src/io/anuke/mindustry/io/versions/LegacyTypeTable.java
@@ -0,0 +1,129 @@
+package io.anuke.mindustry.io.versions;
+
+import io.anuke.arc.function.Supplier;
+import io.anuke.mindustry.entities.bullet.Bullet;
+import io.anuke.mindustry.entities.effect.*;
+import io.anuke.mindustry.entities.type.Player;
+import io.anuke.mindustry.entities.type.base.*;
+
+/*
+Latest data: [build 81]
+
+0 = Player
+1 = Fire
+2 = Puddle
+3 = Draug
+4 = Spirit
+5 = Phantom
+6 = Dagger
+7 = Crawler
+8 = Titan
+9 = Fortress
+10 = Eruptor
+11 = Wraith
+12 = Ghoul
+13 = Revenant
+
+Before removal of lightining/bullet: [build 80]
+
+0 = Player
+1 = Fire
+2 = Puddle
+3 = Bullet
+4 = Lightning
+5 = Draug
+6 = Spirit
+7 = Phantom
+8 = Dagger
+9 = Crawler
+10 = Titan
+11 = Fortress
+12 = Eruptor
+13 = Wraith
+14 = Ghoul
+15 = Revenant
+
+Before addition of new units: [build 79 and below]
+
+0 = Player
+1 = Fire
+2 = Puddle
+3 = Bullet
+4 = Lightning
+5 = Spirit
+6 = Dagger
+7 = Crawler
+8 = Titan
+9 = Fortress
+10 = Eruptor
+11 = Wraith
+12 = Ghoul
+13 = Phantom
+14 = Revenant
+ */
+public class LegacyTypeTable{
+ private static final Supplier[] build81Table = {
+ Player::new,
+ Fire::new,
+ Puddle::new,
+ Draug::new,
+ Spirit::new,
+ Phantom::new,
+ Dagger::new,
+ Crawler::new,
+ Titan::new,
+ Fortress::new,
+ Eruptor::new,
+ Wraith::new,
+ Ghoul::new,
+ Revenant::new
+ };
+
+ private static final Supplier[] build80Table = {
+ Player::new,
+ Fire::new,
+ Puddle::new,
+ Bullet::new, //TODO reading these may crash
+ Lightning::new,
+ Draug::new,
+ Spirit::new,
+ Phantom::new,
+ Dagger::new,
+ Crawler::new,
+ Titan::new,
+ Fortress::new,
+ Eruptor::new,
+ Wraith::new,
+ Ghoul::new,
+ Revenant::new
+ };
+
+ private static final Supplier[] build79Table = {
+ Player::new,
+ Fire::new,
+ Puddle::new,
+ Bullet::new, //TODO reading these may crash
+ Lightning::new,
+ Spirit::new,
+ Dagger::new,
+ Crawler::new,
+ Titan::new,
+ Fortress::new,
+ Eruptor::new,
+ Wraith::new,
+ Ghoul::new,
+ Phantom::new,
+ Revenant::new
+ };
+
+ public static Supplier[] getTable(int build){
+ if(build == -1 || build == 81){
+ //return most recent one since that's probably is; not guaranteed
+ return build81Table;
+ }else if(build == 80){
+ return build80Table;
+ }else{
+ return build79Table;
+ }
+ }
+}
diff --git a/core/src/io/anuke/mindustry/io/versions/Save1.java b/core/src/io/anuke/mindustry/io/versions/Save1.java
index f9ea40b8ce..545ae99eb2 100644
--- a/core/src/io/anuke/mindustry/io/versions/Save1.java
+++ b/core/src/io/anuke/mindustry/io/versions/Save1.java
@@ -1,10 +1,34 @@
package io.anuke.mindustry.io.versions;
+import io.anuke.arc.function.Supplier;
+import io.anuke.mindustry.entities.traits.SaveTrait;
import io.anuke.mindustry.io.SaveVersion;
+import java.io.DataInput;
+import java.io.IOException;
+
public class Save1 extends SaveVersion{
public Save1(){
super(1);
}
+
+ @Override
+ public void readEntities(DataInput stream) throws IOException{
+ Supplier[] table = LegacyTypeTable.getTable(lastReadBuild);
+
+ byte groups = stream.readByte();
+
+ for(int i = 0; i < groups; i++){
+ int amount = stream.readInt();
+ for(int j = 0; j < amount; j++){
+ readChunk(stream, true, in -> {
+ byte typeid = in.readByte();
+ byte version = in.readByte();
+ SaveTrait trait = (SaveTrait)table[typeid].get();
+ trait.readSave(in, version);
+ });
+ }
+ }
+ }
}
diff --git a/core/src/io/anuke/mindustry/io/versions/Save2.java b/core/src/io/anuke/mindustry/io/versions/Save2.java
new file mode 100644
index 0000000000..66d61964c5
--- /dev/null
+++ b/core/src/io/anuke/mindustry/io/versions/Save2.java
@@ -0,0 +1,9 @@
+package io.anuke.mindustry.io.versions;
+
+import io.anuke.mindustry.io.SaveVersion;
+
+public class Save2 extends SaveVersion{
+ public Save2(){
+ super(2);
+ }
+}
diff --git a/core/src/io/anuke/mindustry/maps/Map.java b/core/src/io/anuke/mindustry/maps/Map.java
index 07ed0efb1d..89165b14c8 100644
--- a/core/src/io/anuke/mindustry/maps/Map.java
+++ b/core/src/io/anuke/mindustry/maps/Map.java
@@ -1,13 +1,15 @@
package io.anuke.mindustry.maps;
import io.anuke.arc.Core;
-import io.anuke.arc.collection.StringMap;
+import io.anuke.arc.collection.*;
import io.anuke.arc.files.FileHandle;
import io.anuke.arc.graphics.Texture;
import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.game.DefaultWaves;
-import io.anuke.mindustry.game.Rules;
+import io.anuke.mindustry.game.*;
import io.anuke.mindustry.io.JsonIO;
+import io.anuke.mindustry.maps.filters.*;
+
+import static io.anuke.mindustry.Vars.world;
public class Map implements Comparable
-
+
diff --git a/android/build.gradle b/android/build.gradle
index 5c288d5e3a..491aaf0a5a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -113,9 +113,11 @@ android{
}
}
- buildTypes{
- release{
- signingConfig signingConfigs.release
+ if(project.hasProperty("RELEASE_STORE_FILE")) {
+ buildTypes {
+ release {
+ signingConfig signingConfigs.release
+ }
}
}
}
diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java
index 3f75f746fe..28426c356d 100644
--- a/android/src/io/anuke/mindustry/AndroidLauncher.java
+++ b/android/src/io/anuke/mindustry/AndroidLauncher.java
@@ -146,7 +146,7 @@ public class AndroidLauncher extends AndroidApplication{
InputStream inStream;
if(myFile != null) inStream = new FileInputStream(myFile);
else inStream = getContentResolver().openInputStream(uri);
- Core.app.post(() -> {
+ Core.app.post(() -> Core.app.post(() -> {
if(save){ //open save
System.out.println("Opening save.");
FileHandle file = Core.files.local("temp-save." + saveExtension);
@@ -172,7 +172,7 @@ public class AndroidLauncher extends AndroidApplication{
ui.editor.beginEditMap(file);
});
}
- });
+ }));
}
}catch(IOException e){
e.printStackTrace();
diff --git a/build.gradle b/build.gradle
index 15c9312444..086c056df0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript{
dependencies{
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.6'
- classpath "com.badlogicgames.gdx:gdx-tools:1.9.9"
+ classpath "com.badlogicgames.gdx:gdx-tools:1.9.10"
classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT"
}
}
@@ -22,7 +22,7 @@ allprojects{
versionModifier = 'beta'
if(!project.hasProperty("versionType")) versionType = 'official'
appName = 'Mindustry'
- gdxVersion = '1.9.9'
+ gdxVersion = '1.9.10'
roboVMVersion = '2.3.6'
arcHash = null
@@ -35,7 +35,7 @@ allprojects{
}
getArcHash = {
- //get latest commit hash from gtihub since JITPack's '-snapshot' version doesn't work correctly
+ //get latest commit hash from github since JITPack's '-snapshot' version doesn't work correctly
if(arcHash == null){
try{
arcHash = 'git ls-remote https://github.com/Anuken/Arc.git'.execute().text.split("\t")[0]
@@ -113,6 +113,8 @@ allprojects{
maven{ url 'https://jitpack.io' }
jcenter()
}
+
+ tasks.withType(Javadoc).all{ enabled = false }
}
project(":desktop"){
@@ -132,6 +134,23 @@ project(":desktop"){
}
}
+project(":desktop-sdl"){
+ apply plugin: "java"
+
+ dependencies{
+ compile project(":core")
+ compile project(":net")
+
+ if(debugged()) compile project(":debug")
+
+ compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+ compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
+
+ compile arcModule("backends:backend-sdl")
+ compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.2'
+ }
+}
+
project(":ios"){
apply plugin: "java"
apply plugin: "robovm"
@@ -170,7 +189,7 @@ project(":ios"){
project(":core"){
apply plugin: "java"
- task finish{
+ task preGen{
generateLocales()
}
@@ -200,6 +219,8 @@ project(":core"){
compileJava.finalizedBy(copyGen)
}
+ compileJava.dependsOn(preGen)
+
compile arcModule("arc-core")
compile arcModule("extensions:freetype")
compile arcModule("extensions:arcnet")
@@ -242,6 +263,12 @@ project(":tools"){
dependencies{
compile project(":core")
+
+ //for render tests
+ compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+ compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
+
+ compile arcModule("backends:backend-sdl")
}
}
diff --git a/core/assets-raw/sprites/blocks/defense/mend-projector-top.png b/core/assets-raw/sprites/blocks/defense/mend-projector-top.png
index 217574631e..8fa8a2da3a 100644
Binary files a/core/assets-raw/sprites/blocks/defense/mend-projector-top.png and b/core/assets-raw/sprites/blocks/defense/mend-projector-top.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/mender-top.png b/core/assets-raw/sprites/blocks/defense/mender-top.png
index 395ee6c254..36015652c7 100644
Binary files a/core/assets-raw/sprites/blocks/defense/mender-top.png and b/core/assets-raw/sprites/blocks/defense/mender-top.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png b/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png
index 9ade5fe188..83d1e772b4 100644
Binary files a/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png and b/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/bridge-arrow.png b/core/assets-raw/sprites/blocks/distribution/bridge-arrow.png
new file mode 100644
index 0000000000..e478d18d76
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/bridge-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png
index 2c88950956..acf07f760a 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png and b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png
index b553fc29a7..ccf11151c7 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png and b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png
index 76b29569ea..afe8a5b17c 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png and b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/distributor.png b/core/assets-raw/sprites/blocks/distribution/distributor.png
index 6322cb7379..4669dbc99e 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/distributor.png and b/core/assets-raw/sprites/blocks/distribution/distributor.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/junction.png b/core/assets-raw/sprites/blocks/distribution/junction.png
index e84244e630..f973535bfb 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/junction.png and b/core/assets-raw/sprites/blocks/distribution/junction.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/phase-conveyor-arrow.png b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-arrow.png
index 5873e584e8..d514df7dfa 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/phase-conveyor-arrow.png and b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/phase-conveyor.png b/core/assets-raw/sprites/blocks/distribution/phase-conveyor.png
index 20c9739180..e2fca93c08 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/phase-conveyor.png and b/core/assets-raw/sprites/blocks/distribution/phase-conveyor.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/router.png b/core/assets-raw/sprites/blocks/distribution/router.png
index 59a5fa0564..61201a705a 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/router.png and b/core/assets-raw/sprites/blocks/distribution/router.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/blast-drill-rim.png b/core/assets-raw/sprites/blocks/drills/blast-drill-rim.png
index dc6cb23e0f..b71305c856 100644
Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill-rim.png and b/core/assets-raw/sprites/blocks/drills/blast-drill-rim.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png
index ab75a38dd0..98a2834240 100644
Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png and b/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/blast-drill-top.png b/core/assets-raw/sprites/blocks/drills/blast-drill-top.png
index 3448ea9e70..189c04a372 100644
Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill-top.png and b/core/assets-raw/sprites/blocks/drills/blast-drill-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/blast-drill.png b/core/assets-raw/sprites/blocks/drills/blast-drill.png
index fcb9c57a1e..18697e720f 100644
Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill.png and b/core/assets-raw/sprites/blocks/drills/blast-drill.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill-rim.png b/core/assets-raw/sprites/blocks/drills/laser-drill-rim.png
index 45d006600c..3db73498f5 100644
Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill-rim.png and b/core/assets-raw/sprites/blocks/drills/laser-drill-rim.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png
index d4cf0ec730..44aa88d6b8 100644
Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png and b/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill-top.png b/core/assets-raw/sprites/blocks/drills/laser-drill-top.png
index 1b45be8083..bc2c136aea 100644
Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill-top.png and b/core/assets-raw/sprites/blocks/drills/laser-drill-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill.png b/core/assets-raw/sprites/blocks/drills/laser-drill.png
index b183f080d3..95cbc0a8e0 100644
Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill.png and b/core/assets-raw/sprites/blocks/drills/laser-drill.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png b/core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png
index 6cbbd821fd..3c38f1b6ad 100644
Binary files a/core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png and b/core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor-rotator.png b/core/assets-raw/sprites/blocks/drills/oil-extractor-rotator.png
index ced2a08d0e..a076b412c0 100644
Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor-rotator.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png b/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png
index f9c9008ed0..fd1d1046a2 100644
Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor.png b/core/assets-raw/sprites/blocks/drills/oil-extractor.png
index 08af487136..8568a087e4 100644
Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/pneumatic-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-rotator.png
index 98ab08b0ea..b9b498872d 100644
Binary files a/core/assets-raw/sprites/blocks/drills/pneumatic-drill-rotator.png and b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png
index 7d9e100498..6b9dd1f20e 100644
Binary files a/core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png and b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/pneumatic-drill.png b/core/assets-raw/sprites/blocks/drills/pneumatic-drill.png
index a265034fef..05e6832c37 100644
Binary files a/core/assets-raw/sprites/blocks/drills/pneumatic-drill.png and b/core/assets-raw/sprites/blocks/drills/pneumatic-drill.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/water-extractor-liquid.png b/core/assets-raw/sprites/blocks/drills/water-extractor-liquid.png
index 0c48f91821..2ac1564812 100644
Binary files a/core/assets-raw/sprites/blocks/drills/water-extractor-liquid.png and b/core/assets-raw/sprites/blocks/drills/water-extractor-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/water-extractor-top.png b/core/assets-raw/sprites/blocks/drills/water-extractor-top.png
index 96e7c4482b..088e510dc5 100644
Binary files a/core/assets-raw/sprites/blocks/drills/water-extractor-top.png and b/core/assets-raw/sprites/blocks/drills/water-extractor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/water-extractor.png b/core/assets-raw/sprites/blocks/drills/water-extractor.png
index 1a0a42382c..61030e7560 100644
Binary files a/core/assets-raw/sprites/blocks/drills/water-extractor.png and b/core/assets-raw/sprites/blocks/drills/water-extractor.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/cliffs1.png b/core/assets-raw/sprites/blocks/environment/cliffs1.png
index 52b99e2de6..087e3065e2 100644
Binary files a/core/assets-raw/sprites/blocks/environment/cliffs1.png and b/core/assets-raw/sprites/blocks/environment/cliffs1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dark-metal-large.png b/core/assets-raw/sprites/blocks/environment/dark-metal-large.png
index 2b30255f53..427eecae3c 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dark-metal-large.png and b/core/assets-raw/sprites/blocks/environment/dark-metal-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice-snow1.png b/core/assets-raw/sprites/blocks/environment/ice-snow1.png
index d671587375..fa26a7eb94 100644
Binary files a/core/assets-raw/sprites/blocks/environment/ice-snow1.png and b/core/assets-raw/sprites/blocks/environment/ice-snow1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice-snow2.png b/core/assets-raw/sprites/blocks/environment/ice-snow2.png
index 115a8a08a2..b1b895af0a 100644
Binary files a/core/assets-raw/sprites/blocks/environment/ice-snow2.png and b/core/assets-raw/sprites/blocks/environment/ice-snow2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice-snow3.png b/core/assets-raw/sprites/blocks/environment/ice-snow3.png
index 944fb54588..6448172835 100644
Binary files a/core/assets-raw/sprites/blocks/environment/ice-snow3.png and b/core/assets-raw/sprites/blocks/environment/ice-snow3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/icerocks-large.png b/core/assets-raw/sprites/blocks/environment/icerocks-large.png
index 4a9ffd8e52..f43c40e61a 100644
Binary files a/core/assets-raw/sprites/blocks/environment/icerocks-large.png and b/core/assets-raw/sprites/blocks/environment/icerocks-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/icerocks1.png b/core/assets-raw/sprites/blocks/environment/icerocks1.png
index 8e11fd1ddf..8b93485477 100644
Binary files a/core/assets-raw/sprites/blocks/environment/icerocks1.png and b/core/assets-raw/sprites/blocks/environment/icerocks1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/icerocks2.png b/core/assets-raw/sprites/blocks/environment/icerocks2.png
index 9b2cd18d2f..7264d6aa03 100644
Binary files a/core/assets-raw/sprites/blocks/environment/icerocks2.png and b/core/assets-raw/sprites/blocks/environment/icerocks2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/pebbles1.png b/core/assets-raw/sprites/blocks/environment/pebbles1.png
index 81baa64bd5..cac9429ba0 100644
Binary files a/core/assets-raw/sprites/blocks/environment/pebbles1.png and b/core/assets-raw/sprites/blocks/environment/pebbles1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/pebbles2.png b/core/assets-raw/sprites/blocks/environment/pebbles2.png
index 7b11d5fc17..a909715845 100644
Binary files a/core/assets-raw/sprites/blocks/environment/pebbles2.png and b/core/assets-raw/sprites/blocks/environment/pebbles2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/pebbles3.png b/core/assets-raw/sprites/blocks/environment/pebbles3.png
index 39b1ebd9c5..b8585099aa 100644
Binary files a/core/assets-raw/sprites/blocks/environment/pebbles3.png and b/core/assets-raw/sprites/blocks/environment/pebbles3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/pine.png b/core/assets-raw/sprites/blocks/environment/pine.png
index 1642bbbfd0..8a4dcd9ad2 100644
Binary files a/core/assets-raw/sprites/blocks/environment/pine.png and b/core/assets-raw/sprites/blocks/environment/pine.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rock1.png b/core/assets-raw/sprites/blocks/environment/rock1.png
index f5fbeae6eb..75d81ad163 100644
Binary files a/core/assets-raw/sprites/blocks/environment/rock1.png and b/core/assets-raw/sprites/blocks/environment/rock1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rock2.png b/core/assets-raw/sprites/blocks/environment/rock2.png
index df9303897d..b4a900c4fd 100644
Binary files a/core/assets-raw/sprites/blocks/environment/rock2.png and b/core/assets-raw/sprites/blocks/environment/rock2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/saltrocks-large.png b/core/assets-raw/sprites/blocks/environment/saltrocks-large.png
index f0ec9c74f3..3bf4af2ec1 100644
Binary files a/core/assets-raw/sprites/blocks/environment/saltrocks-large.png and b/core/assets-raw/sprites/blocks/environment/saltrocks-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/saltrocks1.png b/core/assets-raw/sprites/blocks/environment/saltrocks1.png
index 5ad770404e..74045a27a7 100644
Binary files a/core/assets-raw/sprites/blocks/environment/saltrocks1.png and b/core/assets-raw/sprites/blocks/environment/saltrocks1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/saltrocks2.png b/core/assets-raw/sprites/blocks/environment/saltrocks2.png
index b44d62eba4..25b801e550 100644
Binary files a/core/assets-raw/sprites/blocks/environment/saltrocks2.png and b/core/assets-raw/sprites/blocks/environment/saltrocks2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand-boulder1.png b/core/assets-raw/sprites/blocks/environment/sand-boulder1.png
new file mode 100644
index 0000000000..4afe994648
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/sand-boulder1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand-boulder2.png b/core/assets-raw/sprites/blocks/environment/sand-boulder2.png
new file mode 100644
index 0000000000..3c59c6240e
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/sand-boulder2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand1.png b/core/assets-raw/sprites/blocks/environment/sand1.png
index ae4fe3c363..ae6ca2d3be 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sand1.png and b/core/assets-raw/sprites/blocks/environment/sand1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks-large.png b/core/assets-raw/sprites/blocks/environment/sandrocks-large.png
index ff3efd9395..e9148b71b9 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sandrocks-large.png and b/core/assets-raw/sprites/blocks/environment/sandrocks-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks1.png b/core/assets-raw/sprites/blocks/environment/sandrocks1.png
index 2217bbd5e0..55f9afbbd5 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sandrocks1.png and b/core/assets-raw/sprites/blocks/environment/sandrocks1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks2.png b/core/assets-raw/sprites/blocks/environment/sandrocks2.png
index b2dacd5abf..2078ee2f2d 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sandrocks2.png and b/core/assets-raw/sprites/blocks/environment/sandrocks2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/shale-boulder1.png b/core/assets-raw/sprites/blocks/environment/shale-boulder1.png
index ed47edab22..00cc2f2ccb 100644
Binary files a/core/assets-raw/sprites/blocks/environment/shale-boulder1.png and b/core/assets-raw/sprites/blocks/environment/shale-boulder1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/shale-boulder2.png b/core/assets-raw/sprites/blocks/environment/shale-boulder2.png
index 1d54fe6d4a..e03c20b62c 100644
Binary files a/core/assets-raw/sprites/blocks/environment/shale-boulder2.png and b/core/assets-raw/sprites/blocks/environment/shale-boulder2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/shalerocks1.png b/core/assets-raw/sprites/blocks/environment/shalerocks1.png
index f489ee1d03..ff8b482bb7 100644
Binary files a/core/assets-raw/sprites/blocks/environment/shalerocks1.png and b/core/assets-raw/sprites/blocks/environment/shalerocks1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/shalerocks2.png b/core/assets-raw/sprites/blocks/environment/shalerocks2.png
index 356255acb4..50d0f74c0c 100644
Binary files a/core/assets-raw/sprites/blocks/environment/shalerocks2.png and b/core/assets-raw/sprites/blocks/environment/shalerocks2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snow-pine.png b/core/assets-raw/sprites/blocks/environment/snow-pine.png
new file mode 100644
index 0000000000..3e6f6a9da0
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/snow-pine.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snowrock1.png b/core/assets-raw/sprites/blocks/environment/snowrock1.png
index 5c3a702ccd..d81d328b9c 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snowrock1.png and b/core/assets-raw/sprites/blocks/environment/snowrock1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snowrock2.png b/core/assets-raw/sprites/blocks/environment/snowrock2.png
index c25c544910..99a4b14ce0 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snowrock2.png and b/core/assets-raw/sprites/blocks/environment/snowrock2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks-large.png b/core/assets-raw/sprites/blocks/environment/snowrocks-large.png
index 01cfa406f8..eb0a0f8ad8 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snowrocks-large.png and b/core/assets-raw/sprites/blocks/environment/snowrocks-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks1.png b/core/assets-raw/sprites/blocks/environment/snowrocks1.png
index 32bb74348d..c61d6f7f9e 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snowrocks1.png and b/core/assets-raw/sprites/blocks/environment/snowrocks1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks2.png b/core/assets-raw/sprites/blocks/environment/snowrocks2.png
index 8ddeafa1ff..3d659efc32 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snowrocks2.png and b/core/assets-raw/sprites/blocks/environment/snowrocks2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/spore-cluster1.png b/core/assets-raw/sprites/blocks/environment/spore-cluster1.png
index 9e3738039b..9bfdd4a4d2 100644
Binary files a/core/assets-raw/sprites/blocks/environment/spore-cluster1.png and b/core/assets-raw/sprites/blocks/environment/spore-cluster1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/spore-cluster2.png b/core/assets-raw/sprites/blocks/environment/spore-cluster2.png
index 4aaa8d86e3..4696b76ed9 100644
Binary files a/core/assets-raw/sprites/blocks/environment/spore-cluster2.png and b/core/assets-raw/sprites/blocks/environment/spore-cluster2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/spore-cluster3.png b/core/assets-raw/sprites/blocks/environment/spore-cluster3.png
index 57462c7762..047cada29a 100644
Binary files a/core/assets-raw/sprites/blocks/environment/spore-cluster3.png and b/core/assets-raw/sprites/blocks/environment/spore-cluster3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/spore-pine.png b/core/assets-raw/sprites/blocks/environment/spore-pine.png
index 661c4caeb7..802248118a 100644
Binary files a/core/assets-raw/sprites/blocks/environment/spore-pine.png and b/core/assets-raw/sprites/blocks/environment/spore-pine.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks-large.png b/core/assets-raw/sprites/blocks/environment/sporerocks-large.png
index 4153ac2798..d02f83cdff 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sporerocks-large.png and b/core/assets-raw/sprites/blocks/environment/sporerocks-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks1.png b/core/assets-raw/sprites/blocks/environment/sporerocks1.png
index 9672003dfb..6f937d4613 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sporerocks1.png and b/core/assets-raw/sprites/blocks/environment/sporerocks1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks2.png b/core/assets-raw/sprites/blocks/environment/sporerocks2.png
index 668e3d2cc6..cebda293b9 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sporerocks2.png and b/core/assets-raw/sprites/blocks/environment/sporerocks2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png
index 2c88950956..05bb28604f 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png
index 4fe3d03201..1142e49e21 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/bridge-conduit.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit.png
index 6b10c50140..f1c7bc3055 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png
index 7153704def..88e4f28423 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png
index 7d5b6fb9f9..3c968dd2b4 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png
index 977188d577..6b0a4ffff9 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png
index 0328b79b3e..969b593d8e 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png
index e7ef35006f..0317e0b0fa 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png
index 9b4b292794..30ecffba39 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png
index 4908fa83c9..1390737d20 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png
index 9dc9384971..a9dc2ec9c8 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png
index e219a5751d..d223e31491 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png
index 30d039d2d8..c29c2fc1e2 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png
index c7feafdfa8..c5500f1fd3 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png
index 58ab8e6927..ba4bc1c99a 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png
index 72461ba0b6..debece9dc9 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png
index d30fc7a8b6..56976bfe14 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-junction.png b/core/assets-raw/sprites/blocks/liquid/liquid-junction.png
index 0b0ad5344d..737f148b04 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-junction.png and b/core/assets-raw/sprites/blocks/liquid/liquid-junction.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png b/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png
index 75b058a987..be9e88c572 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png and b/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png b/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png
index a32ca6161a..09957a6554 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png and b/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png b/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png
index 53e880b826..474a4ecac8 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png and b/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/phase-conduit-arrow.png b/core/assets-raw/sprites/blocks/liquid/phase-conduit-arrow.png
index 858a02861c..a1a0cefc09 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/phase-conduit-arrow.png and b/core/assets-raw/sprites/blocks/liquid/phase-conduit-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/phase-conduit.png b/core/assets-raw/sprites/blocks/liquid/phase-conduit.png
index 9443960074..1956ea3565 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/phase-conduit.png and b/core/assets-raw/sprites/blocks/liquid/phase-conduit.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png
index c6a453fed9..8ae31a2dbc 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png
index 62f03471c4..f86fde1240 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png
index 3cea1a8e8d..2d9bcb39a3 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png
index 657e292eeb..d625cd185b 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png
index 0dda362ff1..e1938fde0b 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png
index 7ada32da91..ed9d334798 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png
index f43d03fa16..f25158d7de 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png differ
diff --git a/core/assets-raw/sprites/blocks/power/battery-large.png b/core/assets-raw/sprites/blocks/power/battery-large.png
index 5f7d9afc2c..5917051f44 100644
Binary files a/core/assets-raw/sprites/blocks/power/battery-large.png and b/core/assets-raw/sprites/blocks/power/battery-large.png differ
diff --git a/core/assets-raw/sprites/blocks/power/battery.png b/core/assets-raw/sprites/blocks/power/battery.png
index 65593f2167..44a863f123 100644
Binary files a/core/assets-raw/sprites/blocks/power/battery.png and b/core/assets-raw/sprites/blocks/power/battery.png differ
diff --git a/core/assets-raw/sprites/blocks/power/differential-generator-liquid.png b/core/assets-raw/sprites/blocks/power/differential-generator-liquid.png
new file mode 100644
index 0000000000..fa68927de4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/differential-generator-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/power/differential-generator.png b/core/assets-raw/sprites/blocks/power/differential-generator.png
index 96ff71e8ac..01a271abe0 100644
Binary files a/core/assets-raw/sprites/blocks/power/differential-generator.png and b/core/assets-raw/sprites/blocks/power/differential-generator.png differ
diff --git a/core/assets-raw/sprites/blocks/power/impact-reactor-bottom.png b/core/assets-raw/sprites/blocks/power/impact-reactor-bottom.png
index 8275642a0f..6b16fca94c 100644
Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor-bottom.png and b/core/assets-raw/sprites/blocks/power/impact-reactor-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/power/impact-reactor-top.png b/core/assets-raw/sprites/blocks/power/impact-reactor-top.png
deleted file mode 100644
index ee89e87b5e..0000000000
Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor-top.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/power/impact-reactor.png b/core/assets-raw/sprites/blocks/power/impact-reactor.png
index 89bb2b8ca5..c1dd5e46c8 100644
Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor.png and b/core/assets-raw/sprites/blocks/power/impact-reactor.png differ
diff --git a/core/assets-raw/sprites/blocks/power/power-node-large.png b/core/assets-raw/sprites/blocks/power/power-node-large.png
index 0a76d7e1a7..add53dd280 100644
Binary files a/core/assets-raw/sprites/blocks/power/power-node-large.png and b/core/assets-raw/sprites/blocks/power/power-node-large.png differ
diff --git a/core/assets-raw/sprites/blocks/power/power-node.png b/core/assets-raw/sprites/blocks/power/power-node.png
index 0e7296b98f..e8f6498ee1 100644
Binary files a/core/assets-raw/sprites/blocks/power/power-node.png and b/core/assets-raw/sprites/blocks/power/power-node.png differ
diff --git a/core/assets-raw/sprites/blocks/power/rtg-generator-top.png b/core/assets-raw/sprites/blocks/power/rtg-generator-top.png
index f4b6d38c54..dc89fca155 100644
Binary files a/core/assets-raw/sprites/blocks/power/rtg-generator-top.png and b/core/assets-raw/sprites/blocks/power/rtg-generator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/power/rtg-generator.png b/core/assets-raw/sprites/blocks/power/rtg-generator.png
index bb33034b49..414a606c8c 100644
Binary files a/core/assets-raw/sprites/blocks/power/rtg-generator.png and b/core/assets-raw/sprites/blocks/power/rtg-generator.png differ
diff --git a/core/assets-raw/sprites/blocks/power/surge-tower.png b/core/assets-raw/sprites/blocks/power/surge-tower.png
index ec9ab71c70..f381af0813 100644
Binary files a/core/assets-raw/sprites/blocks/power/surge-tower.png and b/core/assets-raw/sprites/blocks/power/surge-tower.png differ
diff --git a/core/assets-raw/sprites/blocks/power/thermal-generator.png b/core/assets-raw/sprites/blocks/power/thermal-generator.png
index b0ad9dc496..07b1da1567 100644
Binary files a/core/assets-raw/sprites/blocks/power/thermal-generator.png and b/core/assets-raw/sprites/blocks/power/thermal-generator.png differ
diff --git a/core/assets-raw/sprites/blocks/power/thorium-reactor-center.png b/core/assets-raw/sprites/blocks/power/thorium-reactor-center.png
index 10afc2e244..1254159ab9 100644
Binary files a/core/assets-raw/sprites/blocks/power/thorium-reactor-center.png and b/core/assets-raw/sprites/blocks/power/thorium-reactor-center.png differ
diff --git a/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png b/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png
index 2bc7d1baab..fe7b76179c 100644
Binary files a/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png and b/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png differ
diff --git a/core/assets-raw/sprites/blocks/power/thorium-reactor.png b/core/assets-raw/sprites/blocks/power/thorium-reactor.png
index 3d8ed983b0..7b7fdc1c79 100644
Binary files a/core/assets-raw/sprites/blocks/power/thorium-reactor.png and b/core/assets-raw/sprites/blocks/power/thorium-reactor.png differ
diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator-liquid.png b/core/assets-raw/sprites/blocks/power/turbine-generator-liquid.png
new file mode 100644
index 0000000000..e083c04492
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/turbine-generator-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator-top.png b/core/assets-raw/sprites/blocks/power/turbine-generator-top.png
index c95d49851a..d7cf0d8547 100644
Binary files a/core/assets-raw/sprites/blocks/power/turbine-generator-top.png and b/core/assets-raw/sprites/blocks/power/turbine-generator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator.png b/core/assets-raw/sprites/blocks/power/turbine-generator.png
index aa302411ee..b434c5c6fa 100644
Binary files a/core/assets-raw/sprites/blocks/power/turbine-generator.png and b/core/assets-raw/sprites/blocks/power/turbine-generator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png b/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png
index aa106fffa3..c946c0dd3e 100644
Binary files a/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png and b/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png b/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png
index a7a0aa14af..929c629499 100644
Binary files a/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png and b/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/graphite-press.png b/core/assets-raw/sprites/blocks/production/graphite-press.png
index b4d7a2e255..39d6adbe36 100644
Binary files a/core/assets-raw/sprites/blocks/production/graphite-press.png and b/core/assets-raw/sprites/blocks/production/graphite-press.png differ
diff --git a/core/assets-raw/sprites/blocks/production/melter.png b/core/assets-raw/sprites/blocks/production/melter.png
index 7502a32e17..2f4c3a0500 100644
Binary files a/core/assets-raw/sprites/blocks/production/melter.png and b/core/assets-raw/sprites/blocks/production/melter.png differ
diff --git a/core/assets-raw/sprites/blocks/production/pump-liquid.png b/core/assets-raw/sprites/blocks/production/pump-liquid.png
index f53fd4f8f4..e3d4c58e55 100644
Binary files a/core/assets-raw/sprites/blocks/production/pump-liquid.png and b/core/assets-raw/sprites/blocks/production/pump-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/separator-liquid.png b/core/assets-raw/sprites/blocks/production/separator-liquid.png
index af231fedb5..f9adfeb523 100644
Binary files a/core/assets-raw/sprites/blocks/production/separator-liquid.png and b/core/assets-raw/sprites/blocks/production/separator-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/spore-press-liquid.png b/core/assets-raw/sprites/blocks/production/spore-press-liquid.png
index b6ee31e12a..63944ceee2 100644
Binary files a/core/assets-raw/sprites/blocks/production/spore-press-liquid.png and b/core/assets-raw/sprites/blocks/production/spore-press-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/arc.png b/core/assets-raw/sprites/blocks/turrets/arc.png
index 5231db0265..b90265b520 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/arc.png and b/core/assets-raw/sprites/blocks/turrets/arc.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-1.png b/core/assets-raw/sprites/blocks/turrets/bases/block-1.png
index 43a8576c0f..36ec5be9a8 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-1.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-1.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-2.png b/core/assets-raw/sprites/blocks/turrets/bases/block-2.png
index b425980c32..ec0fba351a 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-2.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-2.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-3.png b/core/assets-raw/sprites/blocks/turrets/bases/block-3.png
index 4997c7fc3e..1b01ddd33f 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-3.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-3.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-4.png b/core/assets-raw/sprites/blocks/turrets/bases/block-4.png
index 7206b69d95..0cf01f72a9 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-4.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-4.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone.png b/core/assets-raw/sprites/blocks/turrets/cyclone.png
index 84d62394dc..e2f0dbbfcb 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/cyclone.png and b/core/assets-raw/sprites/blocks/turrets/cyclone.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/fuse.png
index d142523a22..39fedd6b51 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/fuse.png and b/core/assets-raw/sprites/blocks/turrets/fuse.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/hail.png b/core/assets-raw/sprites/blocks/turrets/hail.png
index 77aa236fa3..ffa58615d2 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/hail.png and b/core/assets-raw/sprites/blocks/turrets/hail.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/lancer.png b/core/assets-raw/sprites/blocks/turrets/lancer.png
index 2a998ac328..60f667d960 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/lancer.png and b/core/assets-raw/sprites/blocks/turrets/lancer.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/meltdown.png b/core/assets-raw/sprites/blocks/turrets/meltdown.png
index 1d0b7aba73..824443f1d5 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/meltdown.png and b/core/assets-raw/sprites/blocks/turrets/meltdown.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/ripple.png b/core/assets-raw/sprites/blocks/turrets/ripple.png
index 0dddade4fc..9013b07a94 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/ripple.png and b/core/assets-raw/sprites/blocks/turrets/ripple.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/salvo.png b/core/assets-raw/sprites/blocks/turrets/salvo.png
index 2f222833c1..c15a9d47cd 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/salvo.png and b/core/assets-raw/sprites/blocks/turrets/salvo.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scatter.png b/core/assets-raw/sprites/blocks/turrets/scatter.png
index 5c792708e8..3a9caea04a 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/scatter.png and b/core/assets-raw/sprites/blocks/turrets/scatter.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scorch.png b/core/assets-raw/sprites/blocks/turrets/scorch.png
index 3a20d8fd95..1ab0fbda81 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/scorch.png and b/core/assets-raw/sprites/blocks/turrets/scorch.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/spectre.png b/core/assets-raw/sprites/blocks/turrets/spectre.png
index f0e0ed7f64..71ab4e5d0e 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/spectre.png and b/core/assets-raw/sprites/blocks/turrets/spectre.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/swarmer.png b/core/assets-raw/sprites/blocks/turrets/swarmer.png
index 1672cd8e8e..60aeb73158 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/swarmer.png and b/core/assets-raw/sprites/blocks/turrets/swarmer.png differ
diff --git a/core/assets-raw/sprites/blocks/units/draug-factory-top.png b/core/assets-raw/sprites/blocks/units/draug-factory-top.png
new file mode 100644
index 0000000000..c20fe8d186
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/draug-factory-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/draug-factory.png b/core/assets-raw/sprites/blocks/units/draug-factory.png
new file mode 100644
index 0000000000..72105e12eb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/draug-factory.png differ
diff --git a/core/assets-raw/sprites/blocks/units/repair-point.png b/core/assets-raw/sprites/blocks/units/repair-point.png
index a0f6c69e45..5fe3b143fd 100644
Binary files a/core/assets-raw/sprites/blocks/units/repair-point.png and b/core/assets-raw/sprites/blocks/units/repair-point.png differ
diff --git a/core/assets-raw/sprites/blocks/units/spirit-factory-top.png b/core/assets-raw/sprites/blocks/units/spirit-factory-top.png
index c20fe8d186..a825a19d9b 100644
Binary files a/core/assets-raw/sprites/blocks/units/spirit-factory-top.png and b/core/assets-raw/sprites/blocks/units/spirit-factory-top.png differ
diff --git a/core/assets-raw/sprites/ui/white.png b/core/assets-raw/sprites/effects/white.png
similarity index 100%
rename from core/assets-raw/sprites/ui/white.png
rename to core/assets-raw/sprites/effects/white.png
diff --git a/core/assets-raw/sprites/items/item-biomatter.png b/core/assets-raw/sprites/items/item-biomatter.png
deleted file mode 100644
index 6dae991e87..0000000000
Binary files a/core/assets-raw/sprites/items/item-biomatter.png and /dev/null differ
diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech.png b/core/assets-raw/sprites/mechs/mechs/alpha-mech.png
index 83d62471d5..623b8e7791 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/alpha-mech.png and b/core/assets-raw/sprites/mechs/mechs/alpha-mech.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech.png b/core/assets-raw/sprites/mechs/mechs/delta-mech.png
index e3d6e6424b..826e9e1bec 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/delta-mech.png and b/core/assets-raw/sprites/mechs/mechs/delta-mech.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech.png b/core/assets-raw/sprites/mechs/mechs/omega-mech.png
index 1f7c0ad626..2129eb3c08 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/omega-mech.png and b/core/assets-raw/sprites/mechs/mechs/omega-mech.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/tau-mech.png b/core/assets-raw/sprites/mechs/mechs/tau-mech.png
index 9b6b934213..6f23a1364c 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/tau-mech.png and b/core/assets-raw/sprites/mechs/mechs/tau-mech.png differ
diff --git a/core/assets-raw/sprites/mechs/ships/dart-ship.png b/core/assets-raw/sprites/mechs/ships/dart-ship.png
index 6ca70bcc85..e9567d8ecd 100644
Binary files a/core/assets-raw/sprites/mechs/ships/dart-ship.png and b/core/assets-raw/sprites/mechs/ships/dart-ship.png differ
diff --git a/core/assets-raw/sprites/mechs/ships/glaive-ship.png b/core/assets-raw/sprites/mechs/ships/glaive-ship.png
index 34aac96310..6374f07725 100644
Binary files a/core/assets-raw/sprites/mechs/ships/glaive-ship.png and b/core/assets-raw/sprites/mechs/ships/glaive-ship.png differ
diff --git a/core/assets-raw/sprites/mechs/ships/javelin-ship.png b/core/assets-raw/sprites/mechs/ships/javelin-ship.png
index 174d6e59cd..a9dff9a99b 100644
Binary files a/core/assets-raw/sprites/mechs/ships/javelin-ship.png and b/core/assets-raw/sprites/mechs/ships/javelin-ship.png differ
diff --git a/core/assets-raw/sprites/mechs/ships/trident-ship.png b/core/assets-raw/sprites/mechs/ships/trident-ship.png
index 0a4c15e5a3..e7fc0b88b1 100644
Binary files a/core/assets-raw/sprites/mechs/ships/trident-ship.png and b/core/assets-raw/sprites/mechs/ships/trident-ship.png differ
diff --git a/core/assets-raw/sprites/pack_fallback.json b/core/assets-raw/sprites/pack_fallback.json
deleted file mode 100644
index 853c7fc32f..0000000000
--- a/core/assets-raw/sprites/pack_fallback.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- duplicatePadding: true,
- combineSubdirectories: true,
- flattenPaths: true,
- maxWidth: 1024,
- maxHeight: 1024,
- fast: true
-}
diff --git a/core/assets-raw/sprites/shapes/clear.png b/core/assets-raw/sprites/shapes/clear.png
deleted file mode 100644
index dc8beb206c..0000000000
Binary files a/core/assets-raw/sprites/shapes/clear.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/button-disabled.9.png b/core/assets-raw/sprites/ui/button-disabled.9.png
index b2e4d7eb25..a4602889e8 100644
Binary files a/core/assets-raw/sprites/ui/button-disabled.9.png and b/core/assets-raw/sprites/ui/button-disabled.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-down.9.png b/core/assets-raw/sprites/ui/button-down.9.png
index b26d54d0a1..1cc0db6249 100644
Binary files a/core/assets-raw/sprites/ui/button-down.9.png and b/core/assets-raw/sprites/ui/button-down.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-edge-1.9.png b/core/assets-raw/sprites/ui/button-edge-1.9.png
index b91afee83a..98f588a553 100644
Binary files a/core/assets-raw/sprites/ui/button-edge-1.9.png and b/core/assets-raw/sprites/ui/button-edge-1.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-edge-2.9.png b/core/assets-raw/sprites/ui/button-edge-2.9.png
index 063dfa6c69..745c279f10 100644
Binary files a/core/assets-raw/sprites/ui/button-edge-2.9.png and b/core/assets-raw/sprites/ui/button-edge-2.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-edge-3.9.png b/core/assets-raw/sprites/ui/button-edge-3.9.png
index a182e728a6..344cfc07a9 100644
Binary files a/core/assets-raw/sprites/ui/button-edge-3.9.png and b/core/assets-raw/sprites/ui/button-edge-3.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-edge-4.9.png b/core/assets-raw/sprites/ui/button-edge-4.9.png
index c8e554c5e3..831e94fd5e 100644
Binary files a/core/assets-raw/sprites/ui/button-edge-4.9.png and b/core/assets-raw/sprites/ui/button-edge-4.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-over.9.png b/core/assets-raw/sprites/ui/button-over.9.png
index fe5f260ce5..7effe30ffa 100644
Binary files a/core/assets-raw/sprites/ui/button-over.9.png and b/core/assets-raw/sprites/ui/button-over.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-red.9.png b/core/assets-raw/sprites/ui/button-red.9.png
new file mode 100644
index 0000000000..621dda2ca6
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-red.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-right-down.9.png b/core/assets-raw/sprites/ui/button-right-down.9.png
index efbabad92d..c410ca7f44 100644
Binary files a/core/assets-raw/sprites/ui/button-right-down.9.png and b/core/assets-raw/sprites/ui/button-right-down.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-right-over.9.png b/core/assets-raw/sprites/ui/button-right-over.9.png
index 1f6d0fa234..2f4a6a05bb 100644
Binary files a/core/assets-raw/sprites/ui/button-right-over.9.png and b/core/assets-raw/sprites/ui/button-right-over.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-right.9.png b/core/assets-raw/sprites/ui/button-right.9.png
index cd3d8d52e1..dc88b76b54 100644
Binary files a/core/assets-raw/sprites/ui/button-right.9.png and b/core/assets-raw/sprites/ui/button-right.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-select.9.png b/core/assets-raw/sprites/ui/button-select.9.png
index 73c217fc2b..a437c5b58d 100644
Binary files a/core/assets-raw/sprites/ui/button-select.9.png and b/core/assets-raw/sprites/ui/button-select.9.png differ
diff --git a/core/assets-raw/sprites/ui/button.9.png b/core/assets-raw/sprites/ui/button.9.png
index b88439e267..19e13554cf 100644
Binary files a/core/assets-raw/sprites/ui/button.9.png and b/core/assets-raw/sprites/ui/button.9.png differ
diff --git a/core/assets-raw/sprites/ui/check-disabled.png b/core/assets-raw/sprites/ui/check-disabled.png
index 68f22ed90e..53d7724049 100644
Binary files a/core/assets-raw/sprites/ui/check-disabled.png and b/core/assets-raw/sprites/ui/check-disabled.png differ
diff --git a/core/assets-raw/sprites/ui/check-off.png b/core/assets-raw/sprites/ui/check-off.png
index 79b86aabc1..31f800e66f 100644
Binary files a/core/assets-raw/sprites/ui/check-off.png and b/core/assets-raw/sprites/ui/check-off.png differ
diff --git a/core/assets-raw/sprites/ui/check-on-disabled.png b/core/assets-raw/sprites/ui/check-on-disabled.png
index bd65bb214f..8eadb568e9 100644
Binary files a/core/assets-raw/sprites/ui/check-on-disabled.png and b/core/assets-raw/sprites/ui/check-on-disabled.png differ
diff --git a/core/assets-raw/sprites/ui/check-on-over.png b/core/assets-raw/sprites/ui/check-on-over.png
index 716e6fffb7..5911e9ea4e 100644
Binary files a/core/assets-raw/sprites/ui/check-on-over.png and b/core/assets-raw/sprites/ui/check-on-over.png differ
diff --git a/core/assets-raw/sprites/ui/check-on.png b/core/assets-raw/sprites/ui/check-on.png
index e4a8d11538..424e7c324f 100644
Binary files a/core/assets-raw/sprites/ui/check-on.png and b/core/assets-raw/sprites/ui/check-on.png differ
diff --git a/core/assets-raw/sprites/ui/check-over.png b/core/assets-raw/sprites/ui/check-over.png
index 5f618e5c86..39611ce341 100644
Binary files a/core/assets-raw/sprites/ui/check-over.png and b/core/assets-raw/sprites/ui/check-over.png differ
diff --git a/core/assets-raw/sprites/ui/content-background-locked.9.png b/core/assets-raw/sprites/ui/content-background-locked.9.png
deleted file mode 100644
index 60e1941d4f..0000000000
Binary files a/core/assets-raw/sprites/ui/content-background-locked.9.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/content-background-noitems.9.png b/core/assets-raw/sprites/ui/content-background-noitems.9.png
deleted file mode 100644
index f612ec98d4..0000000000
Binary files a/core/assets-raw/sprites/ui/content-background-noitems.9.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/content-background-over.9.png b/core/assets-raw/sprites/ui/content-background-over.9.png
deleted file mode 100644
index 7e1a6e6c2d..0000000000
Binary files a/core/assets-raw/sprites/ui/content-background-over.9.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/content-background.9.png b/core/assets-raw/sprites/ui/content-background.9.png
deleted file mode 100644
index cdd8df0abc..0000000000
Binary files a/core/assets-raw/sprites/ui/content-background.9.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/discord-banner.png b/core/assets-raw/sprites/ui/discord-banner.png
index ac4d3b1ec9..d73d665602 100644
Binary files a/core/assets-raw/sprites/ui/discord-banner.png and b/core/assets-raw/sprites/ui/discord-banner.png differ
diff --git a/core/assets-raw/sprites/ui/empty-sector.png b/core/assets-raw/sprites/ui/empty-sector.png
deleted file mode 100644
index a0bad794cd..0000000000
Binary files a/core/assets-raw/sprites/ui/empty-sector.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/flat-down-base.9.png b/core/assets-raw/sprites/ui/flat-down-base.9.png
new file mode 100644
index 0000000000..10de55d3af
Binary files /dev/null and b/core/assets-raw/sprites/ui/flat-down-base.9.png differ
diff --git a/core/assets-raw/sprites/ui/icons-category/icon-crafting.png b/core/assets-raw/sprites/ui/icons-category/icon-crafting.png
deleted file mode 100644
index 9a5fd055e6..0000000000
Binary files a/core/assets-raw/sprites/ui/icons-category/icon-crafting.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons-category/icon-defense.png b/core/assets-raw/sprites/ui/icons-category/icon-defense.png
deleted file mode 100644
index 150f611402..0000000000
Binary files a/core/assets-raw/sprites/ui/icons-category/icon-defense.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons-category/icon-distribution.png b/core/assets-raw/sprites/ui/icons-category/icon-distribution.png
deleted file mode 100644
index 52a07aac9f..0000000000
Binary files a/core/assets-raw/sprites/ui/icons-category/icon-distribution.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons-category/icon-effect.png b/core/assets-raw/sprites/ui/icons-category/icon-effect.png
deleted file mode 100644
index d0613ec868..0000000000
Binary files a/core/assets-raw/sprites/ui/icons-category/icon-effect.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons-category/icon-liquid.png b/core/assets-raw/sprites/ui/icons-category/icon-liquid.png
deleted file mode 100644
index 050ea2ef38..0000000000
Binary files a/core/assets-raw/sprites/ui/icons-category/icon-liquid.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons-category/icon-power.png b/core/assets-raw/sprites/ui/icons-category/icon-power.png
deleted file mode 100644
index 27d9fa885d..0000000000
Binary files a/core/assets-raw/sprites/ui/icons-category/icon-power.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons-category/icon-production.png b/core/assets-raw/sprites/ui/icons-category/icon-production.png
deleted file mode 100644
index 8d037a43a2..0000000000
Binary files a/core/assets-raw/sprites/ui/icons-category/icon-production.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons-category/icon-turret.png b/core/assets-raw/sprites/ui/icons-category/icon-turret.png
deleted file mode 100644
index 60cce4fa14..0000000000
Binary files a/core/assets-raw/sprites/ui/icons-category/icon-turret.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons-category/icon-units.png b/core/assets-raw/sprites/ui/icons-category/icon-units.png
deleted file mode 100644
index d76063e640..0000000000
Binary files a/core/assets-raw/sprites/ui/icons-category/icon-units.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons-category/icon-upgrade.png b/core/assets-raw/sprites/ui/icons-category/icon-upgrade.png
deleted file mode 100644
index af4b3f4576..0000000000
Binary files a/core/assets-raw/sprites/ui/icons-category/icon-upgrade.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/controller-cursor.png b/core/assets-raw/sprites/ui/icons/controller-cursor.png
deleted file mode 100644
index 061fc5b62a..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/controller-cursor.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-admin.png b/core/assets-raw/sprites/ui/icons/icon-admin.png
index 2af8d3eca6..f4101c0423 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-admin.png and b/core/assets-raw/sprites/ui/icons/icon-admin.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-areaDelete.png b/core/assets-raw/sprites/ui/icons/icon-areaDelete.png
deleted file mode 100644
index e9341daca0..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-areaDelete.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-cancel-2.png b/core/assets-raw/sprites/ui/icons/icon-cancel-2.png
deleted file mode 100644
index 5b14e4c468..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-cancel-2.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-changelog.png b/core/assets-raw/sprites/ui/icons/icon-changelog.png
new file mode 100644
index 0000000000..e6fbf8d3c1
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-changelog.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-check-2.png b/core/assets-raw/sprites/ui/icons/icon-check-2.png
deleted file mode 100644
index ec0bb3cb8e..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-check-2.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-check.png b/core/assets-raw/sprites/ui/icons/icon-check.png
index 1617c299c5..db96907362 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-check.png and b/core/assets-raw/sprites/ui/icons/icon-check.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-crafting.png b/core/assets-raw/sprites/ui/icons/icon-crafting.png
new file mode 100644
index 0000000000..3f7022e87b
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-crafting.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-database-small.png b/core/assets-raw/sprites/ui/icons/icon-database-small.png
deleted file mode 100644
index 059fd6f219..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-database-small.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-database.png b/core/assets-raw/sprites/ui/icons/icon-database.png
index 41e4b672f2..059fd6f219 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-database.png and b/core/assets-raw/sprites/ui/icons/icon-database.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-defense.png b/core/assets-raw/sprites/ui/icons/icon-defense.png
new file mode 100644
index 0000000000..2ae509685e
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-defense.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-dev-builds.png b/core/assets-raw/sprites/ui/icons/icon-dev-builds.png
index 7edafcb7c0..27f46b6624 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-dev-builds.png and b/core/assets-raw/sprites/ui/icons/icon-dev-builds.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-distribution.png b/core/assets-raw/sprites/ui/icons/icon-distribution.png
new file mode 100644
index 0000000000..3a202b38e8
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-distribution.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-donate.png b/core/assets-raw/sprites/ui/icons/icon-donate.png
index 5c762f79d0..cad39eb1ba 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-donate.png and b/core/assets-raw/sprites/ui/icons/icon-donate.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-editor.png b/core/assets-raw/sprites/ui/icons/icon-editor.png
index bbfabe4141..6cb0a64f9f 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-editor.png and b/core/assets-raw/sprites/ui/icons/icon-editor.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-effect.png b/core/assets-raw/sprites/ui/icons/icon-effect.png
new file mode 100644
index 0000000000..212034645b
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-effect.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-egg.png b/core/assets-raw/sprites/ui/icons/icon-egg.png
deleted file mode 100644
index 11f2155605..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-egg.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-eraser.png b/core/assets-raw/sprites/ui/icons/icon-eraser.png
index 00ba36cc37..fc72acc9f2 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-eraser.png and b/core/assets-raw/sprites/ui/icons/icon-eraser.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-generated.png b/core/assets-raw/sprites/ui/icons/icon-generated.png
deleted file mode 100644
index f8630b8242..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-generated.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-github.png b/core/assets-raw/sprites/ui/icons/icon-github.png
index dafadb05fb..0de41be50d 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-github.png and b/core/assets-raw/sprites/ui/icons/icon-github.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-google-play.png b/core/assets-raw/sprites/ui/icons/icon-google-play.png
index b42f628d31..8464c51159 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-google-play.png and b/core/assets-raw/sprites/ui/icons/icon-google-play.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-hold.png b/core/assets-raw/sprites/ui/icons/icon-hold.png
deleted file mode 100644
index fc40846ebe..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-hold.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-holdDelete.png b/core/assets-raw/sprites/ui/icons/icon-holdDelete.png
deleted file mode 100644
index 56c2aff291..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-holdDelete.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-info.png b/core/assets-raw/sprites/ui/icons/icon-info.png
index e3461da338..7e2bb40037 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-info.png and b/core/assets-raw/sprites/ui/icons/icon-info.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-itch.io.png b/core/assets-raw/sprites/ui/icons/icon-itch.io.png
index 4cf4b3cfe6..b5bca0e50a 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-itch.io.png and b/core/assets-raw/sprites/ui/icons/icon-itch.io.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-items-none.png b/core/assets-raw/sprites/ui/icons/icon-items-none.png
deleted file mode 100644
index b90595d9ee..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-items-none.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-liquid-small.png b/core/assets-raw/sprites/ui/icons/icon-liquid-consume.png
similarity index 100%
rename from core/assets-raw/sprites/ui/icons/icon-liquid-small.png
rename to core/assets-raw/sprites/ui/icons/icon-liquid-consume.png
diff --git a/core/assets-raw/sprites/ui/icons/icon-liquid.png b/core/assets-raw/sprites/ui/icons/icon-liquid.png
new file mode 100644
index 0000000000..1306834469
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-liquid.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-loading.png b/core/assets-raw/sprites/ui/icons/icon-loading.png
index b857848f9a..0fd2d5265d 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-loading.png and b/core/assets-raw/sprites/ui/icons/icon-loading.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-locked.png b/core/assets-raw/sprites/ui/icons/icon-locked.png
index c76abf6346..cdf11fe658 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-locked.png and b/core/assets-raw/sprites/ui/icons/icon-locked.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-logic.png b/core/assets-raw/sprites/ui/icons/icon-logic.png
deleted file mode 100644
index 8ad3313701..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-logic.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-map.png b/core/assets-raw/sprites/ui/icons/icon-map.png
index 8891e80a71..92ff76d74f 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-map.png and b/core/assets-raw/sprites/ui/icons/icon-map.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-mission-background.png b/core/assets-raw/sprites/ui/icons/icon-mission-background.png
deleted file mode 100644
index 3dc92b6a77..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-mission-background.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-mission-battle.png b/core/assets-raw/sprites/ui/icons/icon-mission-battle.png
deleted file mode 100644
index 8c044dcf45..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-mission-battle.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-mission-defense.png b/core/assets-raw/sprites/ui/icons/icon-mission-defense.png
deleted file mode 100644
index dc503fa345..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-mission-defense.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-mission-done.png b/core/assets-raw/sprites/ui/icons/icon-mission-done.png
deleted file mode 100644
index 088f735f17..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-mission-done.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-mode-attack.png b/core/assets-raw/sprites/ui/icons/icon-mode-attack.png
new file mode 100644
index 0000000000..c6aac86259
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-mode-attack.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-mode-pvp.png b/core/assets-raw/sprites/ui/icons/icon-mode-pvp.png
new file mode 100644
index 0000000000..a98bb81e01
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-mode-pvp.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-mode-survival.png b/core/assets-raw/sprites/ui/icons/icon-mode-survival.png
new file mode 100644
index 0000000000..c88da7b3b6
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-mode-survival.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-pencil-small.png b/core/assets-raw/sprites/ui/icons/icon-pencil-small.png
deleted file mode 100644
index 71a25add80..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-pencil-small.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-pencil.png b/core/assets-raw/sprites/ui/icons/icon-pencil.png
index 448e3ef02b..053a283d08 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-pencil.png and b/core/assets-raw/sprites/ui/icons/icon-pencil.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-pick.png b/core/assets-raw/sprites/ui/icons/icon-pick.png
index e833f22561..dfd7743030 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-pick.png and b/core/assets-raw/sprites/ui/icons/icon-pick.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-power-requirement.png b/core/assets-raw/sprites/ui/icons/icon-power-requirement.png
deleted file mode 100644
index a6deaa19bc..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-power-requirement.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-power-small.png b/core/assets-raw/sprites/ui/icons/icon-power-small.png
deleted file mode 100644
index 666058d5c7..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-power-small.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-power.png b/core/assets-raw/sprites/ui/icons/icon-power.png
new file mode 100644
index 0000000000..57fbb2f2bd
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-power.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-production.png b/core/assets-raw/sprites/ui/icons/icon-production.png
new file mode 100644
index 0000000000..fe6c3523c0
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-production.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-redo.png b/core/assets-raw/sprites/ui/icons/icon-redo.png
index b563616f62..4c53eb56ef 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-redo.png and b/core/assets-raw/sprites/ui/icons/icon-redo.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-refresh.png b/core/assets-raw/sprites/ui/icons/icon-refresh.png
index ef69be3960..cd1050f017 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-refresh.png and b/core/assets-raw/sprites/ui/icons/icon-refresh.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-terrain.png b/core/assets-raw/sprites/ui/icons/icon-terrain.png
index 4f6326e012..cc9c57380e 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-terrain.png and b/core/assets-raw/sprites/ui/icons/icon-terrain.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-tools.png b/core/assets-raw/sprites/ui/icons/icon-tools.png
index 0c6a1016a1..2ece1ae8f4 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-tools.png and b/core/assets-raw/sprites/ui/icons/icon-tools.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-touch.png b/core/assets-raw/sprites/ui/icons/icon-touch.png
deleted file mode 100644
index 54f86930dd..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-touch.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-touchDelete.png b/core/assets-raw/sprites/ui/icons/icon-touchDelete.png
deleted file mode 100644
index 484ecf1bac..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-touchDelete.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-tree-locked.png b/core/assets-raw/sprites/ui/icons/icon-tree-locked.png
deleted file mode 100644
index 5c9678c8a9..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-tree-locked.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-turret.png b/core/assets-raw/sprites/ui/icons/icon-turret.png
new file mode 100644
index 0000000000..32fd01b464
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-turret.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-undo.png b/core/assets-raw/sprites/ui/icons/icon-undo.png
index 98f74d8de9..cf5dd4c154 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-undo.png and b/core/assets-raw/sprites/ui/icons/icon-undo.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-units.png b/core/assets-raw/sprites/ui/icons/icon-units.png
new file mode 100644
index 0000000000..1ee9cd9f55
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-units.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-unlocked.png b/core/assets-raw/sprites/ui/icons/icon-unlocked.png
deleted file mode 100644
index 9eedca0a66..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-unlocked.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-upgrade.png b/core/assets-raw/sprites/ui/icons/icon-upgrade.png
new file mode 100644
index 0000000000..80e416aebe
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-upgrade.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-wiki.png b/core/assets-raw/sprites/ui/icons/icon-wiki.png
index b97008c439..a4395e4ed5 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-wiki.png and b/core/assets-raw/sprites/ui/icons/icon-wiki.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-zone-locked.png b/core/assets-raw/sprites/ui/icons/icon-zone-locked.png
deleted file mode 100644
index b0b184918c..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-zone-locked.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-zone.png b/core/assets-raw/sprites/ui/icons/icon-zone.png
deleted file mode 100644
index 2496b1bc79..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-zone.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-zoom-small.png b/core/assets-raw/sprites/ui/icons/icon-zoom-small.png
deleted file mode 100644
index af547625b0..0000000000
Binary files a/core/assets-raw/sprites/ui/icons/icon-zoom-small.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-zoom.png b/core/assets-raw/sprites/ui/icons/icon-zoom.png
index fb5948a596..02736c1a4b 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-zoom.png and b/core/assets-raw/sprites/ui/icons/icon-zoom.png differ
diff --git a/core/assets-raw/sprites/ui/info-banner.png b/core/assets-raw/sprites/ui/info-banner.png
index 3568944de5..0ee4c4ad83 100644
Binary files a/core/assets-raw/sprites/ui/info-banner.png and b/core/assets-raw/sprites/ui/info-banner.png differ
diff --git a/core/assets-raw/sprites/ui/inventory.9.png b/core/assets-raw/sprites/ui/inventory.9.png
index 53a5632587..0bbff5a0fe 100644
Binary files a/core/assets-raw/sprites/ui/inventory.9.png and b/core/assets-raw/sprites/ui/inventory.9.png differ
diff --git a/core/assets-raw/sprites/ui/logotext.png b/core/assets-raw/sprites/ui/logotext.png
deleted file mode 100644
index 64976a6c47..0000000000
Binary files a/core/assets-raw/sprites/ui/logotext.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/pack_fallback.json b/core/assets-raw/sprites/ui/pack.json
similarity index 72%
rename from core/assets-raw/sprites/blocks/environment/pack_fallback.json
rename to core/assets-raw/sprites/ui/pack.json
index 853c7fc32f..2612f17acc 100644
--- a/core/assets-raw/sprites/blocks/environment/pack_fallback.json
+++ b/core/assets-raw/sprites/ui/pack.json
@@ -2,7 +2,7 @@
duplicatePadding: true,
combineSubdirectories: true,
flattenPaths: true,
- maxWidth: 1024,
- maxHeight: 1024,
+ maxWidth: 2048,
+ maxHeight: 2048,
fast: true
}
diff --git a/core/assets-raw/sprites/ui/pane-2.9.png b/core/assets-raw/sprites/ui/pane-2.9.png
index e2fe497574..417dcd02fd 100644
Binary files a/core/assets-raw/sprites/ui/pane-2.9.png and b/core/assets-raw/sprites/ui/pane-2.9.png differ
diff --git a/core/assets-raw/sprites/ui/pane.9.png b/core/assets-raw/sprites/ui/pane.9.png
index a21c4607aa..885a5c45f3 100644
Binary files a/core/assets-raw/sprites/ui/pane.9.png and b/core/assets-raw/sprites/ui/pane.9.png differ
diff --git a/core/assets-raw/sprites/ui/scroll-knob-horizontal-black.9.png b/core/assets-raw/sprites/ui/scroll-knob-horizontal-black.9.png
index 7f5dd4137f..7a3bac9b10 100644
Binary files a/core/assets-raw/sprites/ui/scroll-knob-horizontal-black.9.png and b/core/assets-raw/sprites/ui/scroll-knob-horizontal-black.9.png differ
diff --git a/core/assets-raw/sprites/ui/scroll-knob-vertical-black.9.png b/core/assets-raw/sprites/ui/scroll-knob-vertical-black.9.png
index 1b5c9d39d8..17d9dcf726 100644
Binary files a/core/assets-raw/sprites/ui/scroll-knob-vertical-black.9.png and b/core/assets-raw/sprites/ui/scroll-knob-vertical-black.9.png differ
diff --git a/core/assets-raw/sprites/ui/sector-select.png b/core/assets-raw/sprites/ui/sector-select.png
deleted file mode 100644
index 79987b507f..0000000000
Binary files a/core/assets-raw/sprites/ui/sector-select.png and /dev/null differ
diff --git a/core/assets-raw/sprites/ui/slider-knob-down.png b/core/assets-raw/sprites/ui/slider-knob-down.png
index 2822be93af..32fd414a91 100644
Binary files a/core/assets-raw/sprites/ui/slider-knob-down.png and b/core/assets-raw/sprites/ui/slider-knob-down.png differ
diff --git a/core/assets-raw/sprites/ui/slider-knob-over.png b/core/assets-raw/sprites/ui/slider-knob-over.png
index 2822be93af..d0dde09ecc 100644
Binary files a/core/assets-raw/sprites/ui/slider-knob-over.png and b/core/assets-raw/sprites/ui/slider-knob-over.png differ
diff --git a/core/assets-raw/sprites/ui/slider-knob.png b/core/assets-raw/sprites/ui/slider-knob.png
index 4d98387c78..1c40347ea0 100644
Binary files a/core/assets-raw/sprites/ui/slider-knob.png and b/core/assets-raw/sprites/ui/slider-knob.png differ
diff --git a/core/assets-raw/sprites/ui/slider.png b/core/assets-raw/sprites/ui/slider.png
index 278674e9a0..71b354ccc9 100644
Binary files a/core/assets-raw/sprites/ui/slider.png and b/core/assets-raw/sprites/ui/slider.png differ
diff --git a/core/assets-raw/sprites/ui/underline-2.9.png b/core/assets-raw/sprites/ui/underline-2.9.png
index f703111db2..24da68912a 100644
Binary files a/core/assets-raw/sprites/ui/underline-2.9.png and b/core/assets-raw/sprites/ui/underline-2.9.png differ
diff --git a/core/assets-raw/sprites/ui/underline-disabled.9.png b/core/assets-raw/sprites/ui/underline-disabled.9.png
index 753a3e9c24..778b428500 100644
Binary files a/core/assets-raw/sprites/ui/underline-disabled.9.png and b/core/assets-raw/sprites/ui/underline-disabled.9.png differ
diff --git a/core/assets-raw/sprites/ui/underline-red.9.png b/core/assets-raw/sprites/ui/underline-red.9.png
index 5a6bc60651..1237745208 100644
Binary files a/core/assets-raw/sprites/ui/underline-red.9.png and b/core/assets-raw/sprites/ui/underline-red.9.png differ
diff --git a/core/assets-raw/sprites/ui/underline.9.png b/core/assets-raw/sprites/ui/underline.9.png
index e42d29c78f..516f6f82cc 100644
Binary files a/core/assets-raw/sprites/ui/underline.9.png and b/core/assets-raw/sprites/ui/underline.9.png differ
diff --git a/core/assets-raw/sprites/ui/whiteui.png b/core/assets-raw/sprites/ui/whiteui.png
new file mode 100644
index 0000000000..ba9bf827c1
Binary files /dev/null and b/core/assets-raw/sprites/ui/whiteui.png differ
diff --git a/core/assets-raw/sprites/units/draug.png b/core/assets-raw/sprites/units/draug.png
new file mode 100644
index 0000000000..e8bd233336
Binary files /dev/null and b/core/assets-raw/sprites/units/draug.png differ
diff --git a/core/assets-raw/sprites/weapons/blaster-equip.png b/core/assets-raw/sprites/weapons/blaster-equip.png
index e8d35d7c9e..b5679122a5 100644
Binary files a/core/assets-raw/sprites/weapons/blaster-equip.png and b/core/assets-raw/sprites/weapons/blaster-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/flakgun-equip.png b/core/assets-raw/sprites/weapons/flakgun-equip.png
index c264823bb3..931b33dd1d 100644
Binary files a/core/assets-raw/sprites/weapons/flakgun-equip.png and b/core/assets-raw/sprites/weapons/flakgun-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/heal-blaster-equip.png b/core/assets-raw/sprites/weapons/heal-blaster-equip.png
index 4499364ab9..52f579ce68 100644
Binary files a/core/assets-raw/sprites/weapons/heal-blaster-equip.png and b/core/assets-raw/sprites/weapons/heal-blaster-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/shockgun-equip.png b/core/assets-raw/sprites/weapons/shockgun-equip.png
index 5710b7c655..c53587d7ee 100644
Binary files a/core/assets-raw/sprites/weapons/shockgun-equip.png and b/core/assets-raw/sprites/weapons/shockgun-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/swarmer-equip.png b/core/assets-raw/sprites/weapons/swarmer-equip.png
index 68de627f44..6d818dcaac 100644
Binary files a/core/assets-raw/sprites/weapons/swarmer-equip.png and b/core/assets-raw/sprites/weapons/swarmer-equip.png differ
diff --git a/core/assets/bloomshaders/alpha_bloom.fragment.glsl b/core/assets/bloomshaders/alpha_bloom.fragment.glsl
new file mode 100644
index 0000000000..00444c1dca
--- /dev/null
+++ b/core/assets/bloomshaders/alpha_bloom.fragment.glsl
@@ -0,0 +1,23 @@
+#ifdef GL_ES
+#define LOWP lowp
+#define MED mediump
+precision lowp float;
+#else
+#define LOWP
+#define MED
+#endif
+uniform sampler2D u_texture0;
+uniform sampler2D u_texture1;
+uniform float BloomIntensity;
+uniform float OriginalIntensity;
+
+varying MED vec2 v_texCoords;
+
+void main()
+{
+
+ vec4 original = texture2D(u_texture0, v_texCoords) * OriginalIntensity;
+ vec4 bloom = texture2D(u_texture1, v_texCoords) * BloomIntensity;
+ original = original * (vec4(1.0) - bloom);
+ gl_FragColor = original + bloom;
+}
\ No newline at end of file
diff --git a/core/assets/bloomshaders/alpha_gaussian.fragment.glsl b/core/assets/bloomshaders/alpha_gaussian.fragment.glsl
new file mode 100644
index 0000000000..e060efc278
--- /dev/null
+++ b/core/assets/bloomshaders/alpha_gaussian.fragment.glsl
@@ -0,0 +1,26 @@
+#ifdef GL_ES
+#define LOWP lowp
+#define MED mediump
+precision lowp float;
+#else
+#define LOWP
+#define MED
+#endif
+
+uniform sampler2D u_texture;
+varying MED vec2 v_texCoords0;
+varying MED vec2 v_texCoords1;
+varying MED vec2 v_texCoords2;
+varying MED vec2 v_texCoords3;
+varying MED vec2 v_texCoords4;
+const float center = 0.2270270270;
+const float close = 0.3162162162;
+const float far = 0.0702702703;
+void main()
+{
+ gl_FragColor = far * texture2D(u_texture, v_texCoords0)
+ + close * texture2D(u_texture, v_texCoords1)
+ + center * texture2D(u_texture, v_texCoords2)
+ + close * texture2D(u_texture, v_texCoords3)
+ + far * texture2D(u_texture, v_texCoords4);
+}
diff --git a/core/assets/bloomshaders/alpha_threshold.fragment.glsl b/core/assets/bloomshaders/alpha_threshold.fragment.glsl
new file mode 100644
index 0000000000..d85c0b1170
--- /dev/null
+++ b/core/assets/bloomshaders/alpha_threshold.fragment.glsl
@@ -0,0 +1,21 @@
+#ifdef GL_ES
+#define LOWP lowp
+#define MED mediump
+precision lowp float;
+#else
+#define LOWP
+#define MED
+#endif
+uniform sampler2D u_texture0;
+uniform vec2 threshold;
+varying MED vec2 v_texCoords;
+void main()
+{
+ vec4 color = texture2D(u_texture0, v_texCoords);
+ if(color.r + color.g + color.b > 0.5 * 3.0){
+ gl_FragColor = color;
+ }else{
+ gl_FragColor = vec4(0.0);
+ }
+ //gl_FragColor = (texture2D(u_texture0, v_texCoords) - vec4(threshold.r)) * threshold.g;
+}
\ No newline at end of file
diff --git a/core/assets/bloomshaders/bloom.fragment.glsl b/core/assets/bloomshaders/bloom.fragment.glsl
new file mode 100644
index 0000000000..93bbfe3737
--- /dev/null
+++ b/core/assets/bloomshaders/bloom.fragment.glsl
@@ -0,0 +1,23 @@
+#ifdef GL_ES
+#define LOWP lowp
+#define MED mediump
+precision lowp float;
+#else
+#define LOWP
+#define MED
+#endif
+uniform sampler2D u_texture0;
+uniform sampler2D u_texture1;
+uniform float BloomIntensity;
+uniform float OriginalIntensity;
+
+varying MED vec2 v_texCoords;
+
+void main()
+{
+
+ vec3 original = texture2D(u_texture0, v_texCoords).rgb;
+ vec3 bloom = texture2D(u_texture1, v_texCoords).rgb * BloomIntensity;
+ original = OriginalIntensity * (original - original * bloom);
+ gl_FragColor.rgb = original + bloom;
+}
\ No newline at end of file
diff --git a/core/assets/bloomshaders/blurspace.vertex.glsl b/core/assets/bloomshaders/blurspace.vertex.glsl
new file mode 100644
index 0000000000..1d7135d9ab
--- /dev/null
+++ b/core/assets/bloomshaders/blurspace.vertex.glsl
@@ -0,0 +1,31 @@
+#ifdef GL_ES
+#define MED mediump
+#else
+#define MED
+#endif
+
+attribute vec4 a_position;
+attribute vec2 a_texCoord0;
+uniform vec2 dir;
+uniform vec2 size;
+varying MED vec2 v_texCoords0;
+varying MED vec2 v_texCoords1;
+varying MED vec2 v_texCoords2;
+varying MED vec2 v_texCoords3;
+varying MED vec2 v_texCoords4;
+const vec2 futher = vec2(3.2307692308, 3.2307692308);
+const vec2 closer = vec2(1.3846153846, 1.3846153846);
+void main()
+{
+ vec2 sizeAndDir = dir / size;
+ vec2 f = futher*sizeAndDir;
+ vec2 c = closer*sizeAndDir;
+
+ v_texCoords0 = a_texCoord0 - f;
+ v_texCoords1 = a_texCoord0 - c;
+ v_texCoords2 = a_texCoord0;
+ v_texCoords3 = a_texCoord0 + c;
+ v_texCoords4 = a_texCoord0 + f;
+
+ gl_Position = a_position;
+}
\ No newline at end of file
diff --git a/core/assets/bloomshaders/gaussian.fragment.glsl b/core/assets/bloomshaders/gaussian.fragment.glsl
new file mode 100644
index 0000000000..5373349f85
--- /dev/null
+++ b/core/assets/bloomshaders/gaussian.fragment.glsl
@@ -0,0 +1,26 @@
+#ifdef GL_ES
+#define LOWP lowp
+#define MED mediump
+precision lowp float;
+#else
+#define LOWP
+#define MED
+#endif
+
+uniform sampler2D u_texture;
+varying MED vec2 v_texCoords0;
+varying MED vec2 v_texCoords1;
+varying MED vec2 v_texCoords2;
+varying MED vec2 v_texCoords3;
+varying MED vec2 v_texCoords4;
+const float center = 0.2270270270;
+const float close = 0.3162162162;
+const float far = 0.0702702703;
+void main()
+{
+ gl_FragColor.rgb = far * texture2D(u_texture, v_texCoords0).rgb
+ + close * texture2D(u_texture, v_texCoords1).rgb
+ + center * texture2D(u_texture, v_texCoords2).rgb
+ + close * texture2D(u_texture, v_texCoords3).rgb
+ + far * texture2D(u_texture, v_texCoords4).rgb;
+}
diff --git a/core/assets/bloomshaders/maskedtreshold.fragment.glsl b/core/assets/bloomshaders/maskedtreshold.fragment.glsl
new file mode 100644
index 0000000000..a65064e380
--- /dev/null
+++ b/core/assets/bloomshaders/maskedtreshold.fragment.glsl
@@ -0,0 +1,17 @@
+#ifdef GL_ES
+#define LOWP lowp
+#define MED mediump
+precision lowp float;
+#else
+#define LOWP
+#define MED
+#endif
+uniform sampler2D u_texture0;
+uniform vec2 threshold;
+varying MED vec2 v_texCoords;
+void main()
+{
+ vec4 tex = texture2D(u_texture0, v_texCoords);
+ vec3 colors = (tex.rgb - threshold.r) * threshold.g * tex.a;
+ gl_FragColor = vec4(colors, tex.a);
+}
\ No newline at end of file
diff --git a/core/assets/bloomshaders/screenspace.vertex.glsl b/core/assets/bloomshaders/screenspace.vertex.glsl
new file mode 100644
index 0000000000..8e521c9a75
--- /dev/null
+++ b/core/assets/bloomshaders/screenspace.vertex.glsl
@@ -0,0 +1,13 @@
+#ifdef GL_ES
+#define MED mediump
+#else
+#define MED
+#endif
+attribute vec4 a_position;
+attribute vec2 a_texCoord0;
+varying MED vec2 v_texCoords;
+void main()
+{
+ v_texCoords = a_texCoord0;
+ gl_Position = a_position;
+}
\ No newline at end of file
diff --git a/core/assets/bloomshaders/threshold.fragment.glsl b/core/assets/bloomshaders/threshold.fragment.glsl
new file mode 100644
index 0000000000..52de3f18ed
--- /dev/null
+++ b/core/assets/bloomshaders/threshold.fragment.glsl
@@ -0,0 +1,15 @@
+#ifdef GL_ES
+#define LOWP lowp
+#define MED mediump
+precision lowp float;
+#else
+#define LOWP
+#define MED
+#endif
+uniform sampler2D u_texture0;
+uniform vec2 threshold;
+varying MED vec2 v_texCoords;
+void main()
+{
+ gl_FragColor.rgb = (texture2D(u_texture0, v_texCoords).rgb - vec3(threshold.x)) * threshold.y;
+}
\ No newline at end of file
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 74c88600fc..9590daeba9 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -4,9 +4,10 @@ contributors = Translators and Contributors
discord = Join the Mindustry Discord!
link.discord.description = The official Mindustry Discord chatroom
link.github.description = Game source code
+link.changelog.description = List of update changes
link.dev-builds.description = Unstable development builds
link.trello.description = Official Trello board for planned features
-link.itch.io.description = itch.io page with PC downloads and web version
+link.itch.io.description = itch.io page with PC downloads
link.google-play.description = Google Play store listing
link.wiki.description = Official Mindustry wiki
linkfail = Failed to open link!\nThe URL has been copied to your clipboard.
@@ -35,7 +36,6 @@ level.mode = Gamemode:
showagain = Don't show again next session
coreattack = < Core is under attack! >
nearpoint = [[ [scarlet]LEAVE DROP POINT IMMEDIATELY[] ]\nannihilation imminent
-outofbounds = [[ OUT OF BOUNDS ]\n[]self-destruct in {0}
database = Core Database
savegame = Save Game
loadgame = Load Game
@@ -49,7 +49,7 @@ close = Close
quit = Quit
maps = Maps
continue = Continue
-maps.none = [LIGHT_GRAY]No maps found!
+maps.none = [lightgray]No maps found!
about.button = About
name = Name:
noname = Pick a[accent] player name[] first.
@@ -57,9 +57,9 @@ filename = File Name:
unlocked = New content unlocked!
completed = [accent]Completed
techtree = Tech Tree
-research.list = [LIGHT_GRAY]Research:
+research.list = [lightgray]Research:
research = Research
-researched = [LIGHT_GRAY]{0} researched.
+researched = [lightgray]{0} researched.
players = {0} players online
players.single = {0} player online
server.closing = [accent]Closing server...
@@ -74,8 +74,8 @@ server.kicked.nameEmpty = Your chosen name is invalid.
server.kicked.idInUse = You are already on this server! Connecting with two accounts is not permitted.
server.kicked.customClient = This server does not support custom builds. Download an official version.
server.kicked.gameover = Game over!
-host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \nAnybody on the same [LIGHT_GRAY]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[LIGHT_GRAY]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings.
-join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[LIGHT_GRAY]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP.
+host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \nAnybody on the same [lightgray]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[lightgray]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings.
+join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[lightgray]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP.
hostserver = Host Game
hostserver.mobile = Host\nGame
host = Host
@@ -98,11 +98,10 @@ server.admins = Admins
server.admins.none = No admins found!
server.add = Add Server
server.delete = Are you sure you want to delete this server?
-server.hostname = Host: {0}
server.edit = Edit Server
server.outdated = [crimson]Outdated Server![]
server.outdated.client = [crimson]Outdated Client![]
-server.version = [lightgray]Version: {0} {1}
+server.version = [gray]v{0} {1}
server.custombuild = [yellow]Custom Build
confirmban = Are you sure you want to ban this player?
confirmkick = Are you sure you want to kick this player?
@@ -119,7 +118,7 @@ server.port = Port:
server.addressinuse = Address already in use!
server.invalidport = Invalid port number!
server.error = [crimson]Error hosting server: [accent]{0}
-save.old = This save is for an older version of the game, and can no longer be used.\n\n[LIGHT_GRAY]Save backwards compatibility will be implemented in the full 4.0 release.
+save.old = This save is for an older version of the game, and can no longer be used.\n\n[lightgray]Save backwards compatibility will be implemented in the full 4.0 release.
save.new = New Save
save.overwrite = Are you sure you want to overwrite\nthis save slot?
overwrite = Overwrite
@@ -153,28 +152,21 @@ confirm = Confirm
delete = Delete
ok = OK
open = Open
-customize = Customize
+customize = Customize Rules
cancel = Cancel
openlink = Open Link
copylink = Copy Link
back = Back
quit.confirm = Are you sure you want to quit?
-changelog.title = Changelog
-changelog.loading = Getting changelog...
-changelog.error.android = [accent]Note that the changelog sometimes does not work on Android 4.4 and below!\nThis is due to an internal Android bug.
-changelog.error.ios = [accent]The changelog is currently not supported in iOS.
-changelog.error = [scarlet]Error getting changelog!\nCheck your internet connection.
-changelog.current = [yellow][[Current version]
-changelog.latest = [accent][[Latest version]
loading = [accent]Loading...
saving = [accent]Saving...
wave = [accent]Wave {0}
-wave.waiting = [LIGHT_GRAY]Wave in {0}
-wave.waveInProgress = [LIGHT_GRAY]Wave in progress
-waiting = [LIGHT_GRAY]Waiting...
+wave.waiting = [lightgray]Wave in {0}
+wave.waveInProgress = [lightgray]Wave in progress
+waiting = [lightgray]Waiting...
waiting.players = Waiting for players...
-wave.enemies = [LIGHT_GRAY]{0} Enemies Remaining
-wave.enemy = [LIGHT_GRAY]{0} Enemy Remaining
+wave.enemies = [lightgray]{0} Enemies Remaining
+wave.enemy = [lightgray]{0} Enemy Remaining
loadimage = Load Image
saveimage = Save Image
unknown = Unknown
@@ -195,7 +187,9 @@ editor.author = Author:
editor.description = Description:
editor.waves = Waves:
editor.rules = Rules:
+editor.generation = Generation:
editor.ingame = Edit In-Game
+editor.newmap = New Map
waves.title = Waves
waves.remove = Remove
waves.never =