Reconstructor sprites / Bugfixes

core/assets/icons/icons.properties

@@ -247,3 +247,7 @@
 63497=reconstructor-morphism|block-reconstructor-morphism-medium
 63496=reconstructor-functor|block-reconstructor-functor-medium
 63495=reconstructor-prime|block-reconstructor-prime-medium
+63494=additive-reconstructor|block-additive-reconstructor-medium
+63493=multiplicative-reconstructor|block-multiplicative-reconstructor-medium
+63492=exponential-reconstructor|block-exponential-reconstructor-medium
+63491=tetrative-reconstructor|block-tetrative-reconstructor-medium

core/src/mindustry/content/Blocks.java

@@ -78,7 +78,7 @@ public class Blocks implements ContentList{
 
     //units
     groundFactory, airFactory, navalFactory,
-    reconstructorBasis, reconstructorMorphism, reconstructorFunctor, reconstructorPrime,
+    additiveReconstructor, multiplicativeReconstructor, exponentialReconstructor, tetrativeReconstructor,
     repairPoint,
 
     //campaign
@@ -1685,7 +1685,7 @@ public class Blocks implements ContentList{
             consumes.power(1.2f);
         }};
 
-        reconstructorBasis = new Reconstructor("reconstructor-basis"){{
+        additiveReconstructor = new Reconstructor("additive-reconstructor"){{
             requirements(Category.units, ItemStack.with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
 
             size = 3;
@@ -1702,7 +1702,7 @@ public class Blocks implements ContentList{
             };
         }};
 
-        reconstructorMorphism = new Reconstructor("reconstructor-morphism"){{
+        multiplicativeReconstructor = new Reconstructor("multiplicative-reconstructor"){{
             requirements(Category.units, ItemStack.with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
 
             size = 5;
@@ -1717,8 +1717,7 @@ public class Blocks implements ContentList{
             };
         }};
 
-        //TODO finish these
+        exponentialReconstructor = new Reconstructor("exponential-reconstructor"){{
-        reconstructorFunctor = new Reconstructor("reconstructor-functor"){{
             requirements(Category.units, ItemStack.with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
 
             size = 7;
@@ -1732,7 +1731,7 @@ public class Blocks implements ContentList{
             };
         }};
 
-        reconstructorPrime = new Reconstructor("reconstructor-prime"){{
+        tetrativeReconstructor = new Reconstructor("tetrative-reconstructor"){{
             requirements(Category.units, ItemStack.with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
 
             size = 9;

core/src/mindustry/content/Weathers.java

@@ -81,8 +81,8 @@ public class Weathers implements ContentList{
                 Core.camera.bounds(Tmp.r2);
                 int total = (int)(Tmp.r1.area() / density * state.intensity());
                 Lines.stroke(0.75f);
-                Draw.color(Color.royal, Color.white, 0.3f);
                 float alpha = Draw.getColor().a;
+                Draw.color(Color.royal, Color.white, 0.3f);
 
                 for(int i = 0; i < total; i++){
                     float scl = rand.random(0.5f, 1f);

core/src/mindustry/type/Weather.java

@@ -124,12 +124,16 @@ public abstract class Weather extends MappableContent{
             if(life < fadeTime){
                 opacity = life / fadeTime;
             }else{
-                opacity = Mathf.lerpDelta(opacity, 1f, 0.02f);
+                opacity = Mathf.lerpDelta(opacity, 1f, 0.01f);
             }
 
             life -= Time.delta();
 
             weather.update((Weatherc)this);
+
+            if(life < 0){
+                remove();
+            }
         }
 
         @Override

core/src/mindustry/world/blocks/units/Reconstructor.java

@@ -111,6 +111,7 @@ public class Reconstructor extends UnitBlock{
             }
 
             Draw.z(Layer.blockOver + 0.1f);
+            Drawf.shadow(x, y, size * tilesize, 0.5f);
             Draw.rect(topRegion, x, y);
         }
 

tools/src/mindustry/tools/Generators.java

@@ -200,8 +200,6 @@ public class Generators{
                     //encode square sprite in alpha channel
                     average.a = hasEmpty ? 0.1f : 1f;
                     colors.draw(block.id, 0, average);
-                }catch(IllegalArgumentException e){
-                    Log.info("Skipping &ly'@'", block.name);
                 }catch(NullPointerException e){
                     Log.err("Block &ly'@'&lr has an null region!", block);
                 }

tools/src/mindustry/tools/ImagePacker.java

@@ -187,6 +187,11 @@ public class ImagePacker{
             this.path = path;
         }
 
+        @Override
+        public boolean found(){
+            return !invalid;
+        }
+
         static void validate(TextureRegion region){
             if(((GenRegion)region).invalid){
                 ImagePacker.err("Region does not exist: @", ((GenRegion)region).name);