New unfinished environment blocks / Bugfixes / Tech tree tweak

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

@@ -36,7 +36,7 @@ public class Blocks implements ContentList{
     //environment
     air, part, spawn, deepwater, water, tar, stone, craters, charr, sand, ice, snow,
     holostone, rocks, icerocks, cliffs, pine, whiteTree, whiteTreeDead, sporeCluster,
-    iceSnow, sandWater, duneRocks, sandRocks, stainedRocks, stainedStone, stainedRocksRed, stainedStoneRed, stainedRocksYellow, stainedStoneYellow, stainedBoulder,  grass,
+    iceSnow, sandWater, duneRocks, sandRocks, stainedRocks, moss, stainedRocksRed, stainedStoneRed, stainedRocksYellow, stainedStoneYellow, stainedBoulder,  grass, salt,
     metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, ignarock, magmarock, hotrock, snowrocks,
 
     //crafting
@@ -183,6 +183,10 @@ public class Blocks implements ContentList{
 
         }};
 
+        salt = new Floor("salt"){{
+            variants = 0;
+        }};
+
         iceSnow = new Floor("ice-snow"){{
             variants = 3;
         }};
@@ -240,9 +244,8 @@ public class Blocks implements ContentList{
             variants = 2;
         }};
 
-        stainedStone = new Floor("stained-stone"){{
-            edgeStyle = "blocky";
-            hasOres = true;
+        moss = new Floor("moss"){{
+            variants = 3;
         }};
 
         stainedRocksRed = new StaticWall("stained-rocks-red"){{
@@ -250,8 +253,8 @@ public class Blocks implements ContentList{
         }};
 
         stainedStoneRed = new Floor("stained-stone-red"){{
-            edgeStyle = "blocky";
             hasOres = true;
+            variants = 1;
         }};
 
         stainedRocksYellow = new StaticWall("stained-rocks-yellow"){{
@@ -259,7 +262,7 @@ public class Blocks implements ContentList{
         }};
 
         stainedStoneYellow = new Floor("stained-stone-yellow"){{
-            edgeStyle = "blocky";
+            variants = 1;
         }};
 
         stainedBoulder = new Rock("stained-boulder"){{

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

@@ -609,6 +609,11 @@ public class Bullets implements ContentList{
                 keepVelocity = false;
             }
 
+            @Override
+            public float range(){
+                return 70f;
+            }
+
             @Override
             public void draw(Bullet b){
             }

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

@@ -15,9 +15,6 @@ public class TechTree implements ContentList{
         root = node(coreShard, () -> {
 
             node(conveyor, () -> {
-                node(launchPad, () -> {
-
-                });
 
                 node(junction, () -> {
                     node(itemBridge);
@@ -28,7 +25,9 @@ public class TechTree implements ContentList{
                         node(container, () -> {
                             node(unloader);
                             node(vault, () -> {
+                                node(launchPad, () -> {
 
+                                });
                             });
                         });
 
@@ -100,25 +99,25 @@ public class TechTree implements ContentList{
             });
 
             node(mechanicalDrill, () -> {
-                node(pneumaticDrill, () -> {
-                    node(cultivator, () -> {
-
-                    });
-
-                    node(laserDrill, () -> {
-                        node(blastDrill, () -> {
+                node(graphitePress, () -> {
+                    node(pneumaticDrill, () -> {
+                        node(cultivator, () -> {
 
                         });
 
-                        node(waterExtractor, () -> {
-                            node(oilExtractor, () -> {
+                        node(laserDrill, () -> {
+                            node(blastDrill, () -> {
 
                             });
+
+                            node(waterExtractor, () -> {
+                                node(oilExtractor, () -> {
+
+                                });
+                            });
                         });
                     });
-                });
 
-                node(graphitePress, () -> {
                     node(pyratiteMixer, () -> {
                         node(blastMixer, () -> {
 
@@ -185,68 +184,68 @@ public class TechTree implements ContentList{
                         });
                     });
                 });
-            });
 
-            node(powerNode, () -> {
                 node(combustionGenerator, () -> {
-                    node(powerNodeLarge, () -> {
-                        node(battery, () -> {
-                            node(batteryLarge, () -> {
-                                node(surgeTower, () -> {
+                    node(powerNode, () -> {
+                        node(powerNodeLarge, () -> {
+                            node(battery, () -> {
+                                node(batteryLarge, () -> {
+                                    node(surgeTower, () -> {
+
+                                    });
+                                });
+                            });
+
+                            node(mendProjector, () -> {
+                                node(forceProjector, () -> {
+                                    node(overdriveProjector, () -> {
+
+                                    });
+                                });
+
+                                node(repairPoint, () -> {
 
                                 });
                             });
                         });
 
-                        node(mendProjector, () -> {
-                            node(forceProjector, () -> {
-                                node(overdriveProjector, () -> {
-
-                                });
-                            });
-
-                            node(repairPoint, () -> {
-
-                            });
-                        });
-                    });
-
-                    node(turbineGenerator, () -> {
-                        node(thermalGenerator, () -> {
-                            node(rtgGenerator, () -> {
-                                node(differentialGenerator, () -> {
-                                    node(thoriumReactor, () -> {
-                                        node(impactReactor, () -> {
+                        node(turbineGenerator, () -> {
+                            node(thermalGenerator, () -> {
+                                node(rtgGenerator, () -> {
+                                    node(differentialGenerator, () -> {
+                                        node(thoriumReactor, () -> {
+                                            node(impactReactor, () -> {
 
+                                            });
                                         });
                                     });
                                 });
                             });
                         });
-                    });
 
-                    node(solarPanel, () -> {
-                        node(largeSolarPanel, () -> {
+                        node(solarPanel, () -> {
+                            node(largeSolarPanel, () -> {
 
-                        });
-                    });
-                });
-
-                node(alphaDartPad, () -> {
-                    node(deltaPad, () -> {
-                        node(spiritFactory, () -> {
-                            node(phantomFactory);
-                        });
-
-                        node(javelinPad, () -> {
-                            node(tridentPad, () -> {
-                                node(glaivePad);
                             });
                         });
+                    });
 
-                        node(tauPad, () -> {
-                            node(omegaPad, () -> {
+                    node(alphaDartPad, () -> {
+                        node(deltaPad, () -> {
+                            node(spiritFactory, () -> {
+                                node(phantomFactory);
+                            });
 
+                            node(javelinPad, () -> {
+                                node(tridentPad, () -> {
+                                    node(glaivePad);
+                                });
+                            });
+
+                            node(tauPad, () -> {
+                                node(omegaPad, () -> {
+
+                                });
                             });
                         });
                     });
@@ -258,7 +257,7 @@ public class TechTree implements ContentList{
     private TechNode node(Block block, Runnable children){
         ItemStack[] requirements = new ItemStack[block.buildRequirements.length];
         for(int i = 0; i < requirements.length; i++){
-            requirements[i] = new ItemStack(block.buildRequirements[i].item, block.buildRequirements[i].amount * 30);
+            requirements[i] = new ItemStack(block.buildRequirements[i].item, block.buildRequirements[i].amount * 8);
         }
         
         return new TechNode(block, requirements, children);

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

@@ -199,7 +199,7 @@ public class Zones implements ContentList{
             rules = () -> new Rules(){{
                 waves = true;
                 waveTimer = true;
-                waveSpacing = 60 * 60;
+                waveSpacing = 60 * 80;
                 spawns = Array.with(
                     new SpawnGroup(UnitTypes.wraith){{
                         unitScaling = 2;
@@ -279,7 +279,7 @@ public class Zones implements ContentList{
 
         stainedMountains = new Zone("stainedMountains", new MapGenerator("stainedMountains", 2)
             .dist(2.5f, true)
-            .decor(new Decoration(Blocks.stainedStone, Blocks.stainedBoulder, 0.01))){{
+            .decor(new Decoration(Blocks.moss, Blocks.stainedBoulder, 0.01))){{
             loadout = Loadouts.basicFoundation;
             baseLaunchCost = ItemStack.with(Items.copper, 100, Items.lead, 200, Items.silicon, 100);
             startingItems = ItemStack.list(Items.copper, 400, Items.lead, 100);