Merge branches 'lights' and 'master' of https://github.com/Anuken/Mindustry

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

@@ -48,7 +48,7 @@ public class Blocks implements ContentList{
     melter, separator, sporePress, pulverizer, incinerator, coalCentrifuge,
 
     //sandbox
-    powerSource, powerVoid, itemSource, itemVoid, liquidSource, message,
+    powerSource, powerVoid, itemSource, itemVoid, liquidSource, message, illuminator,
 
     //defense
     scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet
@@ -736,6 +736,13 @@ public class Blocks implements ContentList{
         message = new MessageBlock("message"){{
             requirements(Category.effect, ItemStack.with(Items.graphite, 5));
         }};
+        illuminator = new LightBlock("illuminator"){{
+            requirements(Category.effect, ItemStack.with(Items.graphite, 5));
+            color = Color.valueOf("7d93ff");
+            brightness = 0.6f;
+            radius = 80f;
+            consumes.power(0.05f);
+        }};
 
         //endregion
         //region defense

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

@@ -13,7 +13,7 @@ import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.Cicon;
 
-import static io.anuke.mindustry.Vars.tilesize;
+import static io.anuke.mindustry.Vars.*;
 
 public class Fx implements ContentList{
     public static Effect
@@ -456,6 +456,8 @@ public class Fx implements ContentList{
             });
 
             Draw.color();
+
+            renderer.lights.add(e.x, e.y, 20f * e.fslope(), Pal.lightFlame, 0.5f);
         });
 
         fireSmoke = new Effect(35f, e -> {