Implemented shore map / New blocks / Bugfixes

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,
     grass, holostone, rocks, icerocks, cliffs, pine, whiteTree, whiteTreeDead, sporeCluster,
-    iceSnow,
+    iceSnow, sandWater, dunerocks,
 
     //crafting
     siliconSmelter, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
@@ -46,6 +46,7 @@ public class Blocks implements ContentList{
     powerVoid, powerSource, itemSource, liquidSource, itemVoid,
 
     //defense
+    scrapWall, scrapWallLarge,
     copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
     phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mendProjector, overdriveProjector, forceProjector, shockMine,
 
@@ -158,6 +159,18 @@ public class Blocks implements ContentList{
             minimapColor = Color.valueOf("323232");
         }};
 
+        sandWater = new Floor("sand-water"){{
+            liquidColor = Color.valueOf("596ab8");
+            speedMultiplier = 0.8f;
+            variants = 0;
+            status = StatusEffects.wet;
+            statusDuration = 50f;
+            liquidDrop = Liquids.water;
+            isLiquid = true;
+            cacheLayer = CacheLayer.water;
+            minimapColor = Color.valueOf("506eb4");
+        }};
+
         sand = new Floor("sand"){{
             itemDrop = Items.sand;
             minimapColor = Color.valueOf("988a67");
@@ -202,6 +215,10 @@ public class Blocks implements ContentList{
             variants = 2;
         }};
 
+        dunerocks = new StaticWall("dunerocks"){{
+            variants = 2;
+        }};
+
         pine = new StaticWall("pine"){{
             //fillsTile = false;
             variants = 0;
@@ -433,6 +450,16 @@ public class Blocks implements ContentList{
 
         int wallHealthMultiplier = 3;
 
+        scrapWall = new Wall("scrap-wall"){{
+            health = 80;
+            variants = 3;
+        }};
+
+        scrapWallLarge = new Wall("scrap-wall-large"){{
+            health = 80 * 4;
+            size = 2;
+        }};
+
         copperWall = new Wall("copper-wall"){{
             requirements(Category.defense, ItemStack.with(Items.copper, 12));
             health = 80 * wallHealthMultiplier;
@@ -440,7 +467,6 @@ public class Blocks implements ContentList{
 
         copperWallLarge = new Wall("copper-wall-large"){{
             requirements(Category.defense, ItemStack.with(Items.copper, 12 * 4));
-            requirements(Category.defense, ItemStack.with(Items.copper, 12));
             health = 80 * 4 * wallHealthMultiplier;
             size = 2;
         }};

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

@@ -168,16 +168,61 @@ public class Zones implements ContentList{
             }};
         }};
 
-        ruinousShores = new Zone("ruinousShores", new MapGenerator("ruinousShores")){{ //TODO implement
-            deployCost = ItemStack.with(Items.copper, 300);
-            startingItems = ItemStack.with(Items.copper, 200);
-            conditionWave = 15;
+        ruinousShores = new Zone("ruinousShores", new MapGenerator("ruinousShores", 1)){{ //TODO implement
+            deployCost = ItemStack.with(Items.copper, 600, Items.graphite, 50);
+            startingItems = ItemStack.with(Items.copper, 400);
+            conditionWave = 20;
+            launchPeriod = 20;
             zoneRequirements = new Zone[]{frozenForest};
-            blockRequirements = new Block[]{Blocks.copperWall};
+            itemRequirements = ItemStack.with(Items.lead, 6000, Items.graphite, 2000);
+            blockRequirements = new Block[]{Blocks.graphitePress, Blocks.combustionGenerator};
             rules = () -> new Rules(){{
                 waves = true;
                 waveTimer = true;
-                waveSpacing = 60 * 80;
+                waveSpacing = 60 * 60;
+                spawns = Array.with(
+                    new SpawnGroup(UnitTypes.wraith){{
+                        unitScaling = 2;
+                        spacing = 2;
+                        end = 10;
+                    }},
+
+                    new SpawnGroup(UnitTypes.dagger){{
+                        begin = 2;
+                        spacing = 2;
+                        unitScaling = 2;
+                    }},
+
+                    new SpawnGroup(UnitTypes.wraith){{
+                        begin = 10;
+                        unitScaling = 0.5f;
+                        unitAmount = 6;
+                        spacing = 10;
+                    }},
+
+                    new SpawnGroup(UnitTypes.crawler){{
+                        begin = 5;
+                        unitScaling = 1;
+                        spacing = 5;
+                        unitAmount = 1;
+                        effect = StatusEffects.overdrive;
+                    }},
+
+                    new SpawnGroup(UnitTypes.crawler){{
+                        begin = 22;
+                        unitScaling = 1;
+                        spacing = 20;
+                        unitScaling = 0.5f;
+                        unitAmount = 10;
+                    }},
+
+                    new SpawnGroup(UnitTypes.dagger){{
+                        begin = 11;
+                        spacing = 2;
+                        unitScaling = 2;
+                        unitAmount = 2;
+                    }}
+                );
             }};
         }};