Scrap ore / Player shadows

core/assets/bundles/bundle.properties

@@ -430,8 +430,10 @@ item.blast-compound.name = Blast Compound
 item.blast-compound.description = A volatile compound used in bombs and explosives. While it can burned as fuel, this is not advised.
 item.pyratite.name = Pyratite
 item.pyratite.description = An extremely flammable substance used in incendiary weapons.
-item.bioglass.name = Bioglass
+item.metaglass.name = Metaglass
+item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage.
 item.scrap.name = Scrap
+item.scrap.description = Leftover remnants of old structures and units. Contains trace amounts of many different metals.
 liquid.water.name = Water
 liquid.lava.name = Lava
 liquid.oil.name = Oil

core/src/io/anuke/mindustry/content/Blocks.java

@@ -312,10 +312,10 @@ public class Blocks implements ContentList{
 
         separator = new Separator("separator"){{
             results = new ItemStack[]{
-                    new ItemStack(Items.copper, 5),
-                    new ItemStack(Items.lead, 3),
-                    new ItemStack(Items.titanium, 2),
-                    new ItemStack(Items.thorium, 1)
+                new ItemStack(Items.copper, 5),
+                new ItemStack(Items.lead, 3),
+                new ItemStack(Items.titanium, 2),
+                new ItemStack(Items.thorium, 1)
             };
             hasPower = true;
             filterTime = 15f;

core/src/io/anuke/mindustry/content/Items.java

@@ -60,7 +60,7 @@ public class Items implements ContentList{
         }};
 
         scrap = new Item("scrap", Color.valueOf("777777")){{
-
+            genOre = true;
         }};
 
         silicon = new Item("silicon", Color.valueOf("53565c")){{

core/src/io/anuke/mindustry/core/GameState.java

@@ -38,7 +38,7 @@ public class GameState{
     }
 
     public boolean isPaused(){
-        return (is(State.paused) || gameOver) && !Net.active();
+        return is(State.paused) && !Net.active();
     }
 
     public boolean is(State astate){

core/src/io/anuke/mindustry/entities/Player.java

@@ -26,6 +26,7 @@ import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.graphics.Palette;
+import io.anuke.mindustry.graphics.Shaders;
 import io.anuke.mindustry.input.Binding;
 import io.anuke.mindustry.io.TypeIO;
 import io.anuke.mindustry.net.Net;
@@ -329,7 +330,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
         Floor floor = getFloorOn();
 
         Draw.color();
-        Draw.alpha(hitTime / hitDuration);
+        Draw.alpha(Draw.getShader() != Shaders.mix ? 1f : hitTime / hitDuration);
 
         if(!mech.flying){
             if(floor.isLiquid){

core/src/io/anuke/mindustry/entities/effect/Decal.java

@@ -14,7 +14,7 @@ import static io.anuke.mindustry.Vars.groundEffectGroup;
  * Class for creating block rubble on the ground.
  */
 public abstract class Decal extends TimedEntity implements BelowLiquidTrait, DrawTrait{
-    private static final Color color = Color.valueOf("52504e");
+    private static final Color color = Color.valueOf("2c2928");
 
     @Override
     public float lifetime(){

core/src/io/anuke/mindustry/entities/units/FlyingUnit.java

@@ -11,6 +11,7 @@ import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.bullet.BulletType;
 import io.anuke.mindustry.entities.traits.CarriableTrait;
 import io.anuke.mindustry.entities.traits.CarryTrait;
+import io.anuke.mindustry.graphics.Shaders;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;
@@ -151,7 +152,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{
 
     @Override
     public void draw(){
-        Draw.alpha(hitTime / hitDuration);
+        Draw.alpha(Draw.getShader() != Shaders.mix ? 1f : hitTime / hitDuration);
 
         Draw.rect(type.name, x, y, rotation - 90);
 

core/src/io/anuke/mindustry/entities/units/GroundUnit.java

@@ -12,6 +12,7 @@ import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.bullet.BulletType;
 import io.anuke.mindustry.game.Team;
+import io.anuke.mindustry.graphics.Shaders;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.Weapon;
 import io.anuke.mindustry.world.Tile;
@@ -132,7 +133,7 @@ public abstract class GroundUnit extends BaseUnit{
 
     @Override
     public void draw(){
-        Draw.alpha(hitTime / hitDuration);
+        Draw.alpha(Draw.getShader() != Shaders.mix ? 1f : hitTime / hitDuration);
 
         float ft = Mathf.sin(walkTime * type.speed*5f, 6f, 2f);
 

core/src/io/anuke/mindustry/graphics/BlockRenderer.java

@@ -4,11 +4,14 @@ 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.entities.EntityDraw;
+import io.anuke.arc.entities.EntityGroup;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.graphics.glutils.FrameBuffer;
 import io.anuke.arc.util.Tmp;
 import io.anuke.mindustry.content.Blocks;
+import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
 import io.anuke.mindustry.game.EventType.WorldLoadEvent;
 import io.anuke.mindustry.game.Team;
@@ -71,6 +74,12 @@ public class BlockRenderer{
         Core.graphics.clear(Color.CLEAR);
         Draw.color(shadowColor);
         drawBlocks(Layer.shadow);
+
+        EntityDraw.drawWith(playerGroup, player -> !player.isDead(), Unit::draw);
+        for(EntityGroup group : unitGroups){
+            EntityDraw.drawWith(group, unit -> !unit.isDead(), Unit::draw);
+        }
+
         Draw.color();
         Draw.flush();
         shadows.end();

core/src/io/anuke/mindustry/type/Zone.java

@@ -65,4 +65,5 @@ public class Zone extends UnlockableContent{
     public ContentType getContentType(){
         return ContentType.zone;
     }
+
 }