From b3d4dc06d44db962e0ae2474ab4032a9887754f9 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 20 Jan 2022 23:06:04 -0500
Subject: [PATCH] Misc

---
 .../blocks/turrets/afflict/afflict.png        | Bin 0 -> 1800 bytes
 core/src/mindustry/content/Blocks.java        |  54 +++++++++++++-----
 .../src/mindustry/content/ErekirTechTree.java |   4 +-
 .../maps/planet/ErekirPlanetGenerator.java    |   7 ++-
 .../world/blocks/production/WallCrafter.java  |   2 +-
 core/src/mindustry/world/meta/Attribute.java  |   6 +-
 6 files changed, 52 insertions(+), 21 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/turrets/afflict/afflict.png

diff --git a/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png b/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png
new file mode 100644
index 0000000000000000000000000000000000000000..69f2a1b06593b1ba8433943d54fb35a731c09c8e
GIT binary patch
literal 1800
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
N44$rjF6*2UngEUWLSp~`

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index c56e21c7cc..376e8b9794 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -490,7 +490,7 @@ public class Blocks{
         }};
 
         stoneWall = new StaticWall("stone-wall"){{
-            attributes.set(Attribute.silicate, 1f);
+            attributes.set(Attribute.sand, 1f);
         }};
 
         sporeWall = new StaticWall("spore-wall"){{
@@ -510,37 +510,37 @@ public class Blocks{
 
         duneWall = new StaticWall("dune-wall"){{
             basalt.asFloor().wall = darksandWater.asFloor().wall = darksandTaintedWater.asFloor().wall = this;
-            attributes.set(Attribute.silicate, 2f);
+            attributes.set(Attribute.sand, 2f);
         }};
 
         regolithWall = new StaticWall("regolith-wall"){{
             regolith.asFloor().wall = this;
-            attributes.set(Attribute.silicate, 1f);
+            attributes.set(Attribute.sand, 1f);
         }};
 
         yellowStoneWall = new StaticWall("yellow-stone-wall"){{
             yellowStone.asFloor().wall = slag.asFloor().wall = yellowStonePlates.asFloor().wall = this;
-            attributes.set(Attribute.silicate, 1.5f);
+            attributes.set(Attribute.sand, 1.5f);
         }};
 
         rhyoliteWall = new StaticWall("rhyolite-wall"){{
             rhyolite.asFloor().wall = rhyoliteCrater.asFloor().wall = roughRhyolite.asFloor().wall = this;
-            attributes.set(Attribute.silicate, 1f);
+            attributes.set(Attribute.sand, 1f);
         }};
 
         carbonWall = new StaticWall("carbon-wall"){{
             carbonStone.asFloor().wall = this;
-            attributes.set(Attribute.silicate, 0.7f);
+            attributes.set(Attribute.sand, 0.7f);
         }};
 
         ferricStoneWall = new StaticWall("ferric-stone-wall"){{
             ferricStone.asFloor().wall = this;
-            attributes.set(Attribute.silicate, 0.5f);
+            attributes.set(Attribute.sand, 0.5f);
         }};
 
         beryllicStoneWall = new StaticWall("beryllic-stone-wall"){{
             beryllicStone.asFloor().wall = this;
-            attributes.set(Attribute.silicate, 1.2f);
+            attributes.set(Attribute.sand, 1.2f);
         }};
 
         arkyicWall = new StaticWall("arkyic-wall"){{
@@ -559,7 +559,7 @@ public class Blocks{
 
         sandWall = new StaticWall("sand-wall"){{
             sandWater.asFloor().wall = water.asFloor().wall = deepwater.asFloor().wall = this;
-            attributes.set(Attribute.silicate, 2f);
+            attributes.set(Attribute.sand, 2f);
         }};
 
         saltWall = new StaticWall("salt-wall");
@@ -2345,7 +2345,7 @@ public class Blocks{
 
             drillTime = 110f;
             size = 2;
-            attribute = Attribute.silicate;
+            attribute = Attribute.sand;
             output = Items.sand;
         }};
 
@@ -2469,7 +2469,7 @@ public class Blocks{
             size = 4;
             thrusterLength = 34/4f;
 
-            unitCapModifier = 16;
+            unitCapModifier = 8;
             researchCostMultiplier = 0.07f;
         }};
 
@@ -2483,7 +2483,7 @@ public class Blocks{
             size = 5;
             thrusterLength = 40/4f;
 
-            unitCapModifier = 24;
+            unitCapModifier = 16;
             researchCostMultiplier = 0.11f;
         }};
 
@@ -2497,7 +2497,7 @@ public class Blocks{
             size = 6;
             thrusterLength = 48/4f;
 
-            unitCapModifier = 32;
+            unitCapModifier = 24;
             researchCostMultiplier = 0.11f;
         }};
 
@@ -3206,6 +3206,34 @@ public class Blocks{
             size = 4;
         }};
 
+        /*
+        afflict = new ContinuousTurret("afflict"){{
+            requirements(Category.turret, with(Items.carbide, 250, Items.surgeAlloy, 160, Items.silicon, 300, Items.beryllium, 400));
+
+            //TODO bullet.
+
+            shootShake = 4f;
+            recoilAmount = 1f;
+            reloadTime = 60f * 3f;
+            shootLength = 7f;
+            rotateSpeed = 2.5f;
+
+            coolantUsage = 30f / 60f;
+            coolantOverride = Liquids.water;
+
+            draw = new DrawTurret("reinforced-");
+
+            restitution = 0.02f;
+            shootWarmupSpeed = 0.08f;
+
+            outlineColor = Pal.darkOutline;
+            acceptCoolant = false;
+
+            scaledHealth = 300;
+            range = 390f;
+            size = 4;
+        }};*/
+
         //endregion
         //region units
 
diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java
index 0e1b739507..329ab7e11d 100644
--- a/core/src/mindustry/content/ErekirTechTree.java
+++ b/core/src/mindustry/content/ErekirTechTree.java
@@ -13,9 +13,9 @@ public class ErekirTechTree{
         Seq<Objective> erekirSector = Seq.with(new OnPlanet(Planets.erekir));
 
         var costMultipliers = new ObjectFloatMap<Item>();
-        costMultipliers.put(Items.silicon, 6);
+        costMultipliers.put(Items.silicon, 7);
         costMultipliers.put(Items.surgeAlloy, 4);
-        costMultipliers.put(Items.thorium, 7);
+        costMultipliers.put(Items.thorium, 8);
         costMultipliers.put(Items.graphite, 6);
 
         Planets.erekir.techTree = nodeRoot("erekir", coreBastion, true, () -> {
diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
index 6157f87579..0b0c437c71 100644
--- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
+++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
@@ -141,6 +141,9 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
         //arkycite
         //TODO arkycite biome
         //TODO ice biome
+
+        //TODO arkycite is too disruptive to terrain, needs certain conditions and sub-biomes.
+        if(false)
         pass((x, y) -> {
             if(nearWall(x, y)) return;
 
@@ -187,7 +190,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
                 if(block == Blocks.air) block = Blocks.yellowStoneWall;
             }
 
-            if(floor == Blocks.yellowStonePlates && noise(x + 78 + y, y, 3, 0.8f, 8f, 1f) > 0.38f){
+            if(floor == Blocks.yellowStonePlates && noise(x + 78 + y, y, 3, 0.8f, 7f, 1f) > 0.41f){
                 floor = Blocks.yellowStone;
             }
         });
@@ -249,7 +252,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
         //vents
         outer:
         for(Tile tile : tiles){
-            if(floor == Blocks.rhyolite && rand.chance(0.0015)){
+            if(floor == Blocks.rhyolite && rand.chance(0.0016)){
                 int radius = 2;
                 for(int x = -radius; x <= radius; x++){
                     for(int y = -radius; y <= radius; y++){
diff --git a/core/src/mindustry/world/blocks/production/WallCrafter.java b/core/src/mindustry/world/blocks/production/WallCrafter.java
index da13ed5419..352583c86b 100644
--- a/core/src/mindustry/world/blocks/production/WallCrafter.java
+++ b/core/src/mindustry/world/blocks/production/WallCrafter.java
@@ -34,7 +34,7 @@ public class WallCrafter extends Block{
     public float updateEffectChance = 0.02f;
     public float rotateSpeed = 2f;
     /** Attribute to check for wall output. */
-    public Attribute attribute = Attribute.silicate;
+    public Attribute attribute = Attribute.sand;
 
     public Item output = Items.sand;
 
diff --git a/core/src/mindustry/world/meta/Attribute.java b/core/src/mindustry/world/meta/Attribute.java
index 3b8554fd8e..5d573ed2e7 100644
--- a/core/src/mindustry/world/meta/Attribute.java
+++ b/core/src/mindustry/world/meta/Attribute.java
@@ -7,8 +7,8 @@ public class Attribute{
     public static Attribute[] all = {};
     public static ObjectMap<String, Attribute> map = new ObjectMap<>();
 
-    public static final Attribute
     /** Heat content. Used for thermal generator yield. */
+    public static final Attribute
     heat = add("heat"),
     /** Spore content. Used for cultivator yield. */
     spores = add("spores"),
@@ -18,8 +18,8 @@ public class Attribute{
     oil = add("oil"),
     /** Light coverage. Negative values decrease solar panel efficiency. */
     light = add("light"),
-    /** Silicate content. Used for sand extraction. */
-    silicate = add("silicate"),
+    /** Used for sand extraction. */
+    sand = add("sand"),
     /** Used for erekir vents only. */
     vent = add("vent");