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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

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");