From ba475b681ca6b86946b87d111b9cae8446a61ee5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 17 Feb 2022 13:42:17 -0500
Subject: [PATCH] Better stell cell

---
 core/assets-raw/sprites/units/stell-cell.png  | Bin 303 -> 404 bytes
 core/assets/logicids.dat                      | Bin 4190 -> 4170 bytes
 core/src/mindustry/ai/ControlPathfinder.java  |   2 ++
 core/src/mindustry/ai/Pathfinder.java         |   2 ++
 core/src/mindustry/content/Blocks.java        |  24 +++++++++++++-----
 core/src/mindustry/content/UnitTypes.java     |   2 +-
 .../world/blocks/payloads/BlockProducer.java  |   5 ++++
 7 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/core/assets-raw/sprites/units/stell-cell.png b/core/assets-raw/sprites/units/stell-cell.png
index 4483672996dd8aae93f3c167b02663d3796bf103..c0909f4df517cd03d2a78ee57fc6314ee80906dd 100644
GIT binary patch
delta 365
zcmZ3_G=+JBK|Q0Nr;B4q#hkY@y@L)L2)MY%sKy-HS+6?1VRHxT3?V12>N+#Md(o+i
zzT2(7olxy$fPw@67iF;Rx0NgX`?qTU>St-mU$<2!XeS7sI`TO8`htlKVH(`)w~P1x
z$c<cb&B}Cw@7k^RrX3AEEaRYE<HoUenL0}_gYrRT=X#0ENaq0agSrcYyt4dnaQ*uG
zQ)J=;wH@IxPyR4$kqcSx@a>V(g{qM64f|!9j?S($T<rdFMZvi%Y#?XM2-v^F>+Xg3
z&+jE%`Cb_oJMjQR+W)@mIbnC-TM4>ulk;7DbImUMtP1WowfbArHoy8e>;23*wSE${
z|I82BY}`L#M(c#MtIXGqu8(jw@SSz{*cZi=w@iN@h3hEp$ZM;LN?sTp8l1hYLVF=&
zM~&1Oi}~71r@T1Yt->;)GICa+^%~ADnet$nm9m?7t9W7pr9m!YSa+U%NBORjh?|pD
OL3~eFKbLh*2~7YnL!~?b

delta 264
zcmbQjyq;--K|RAuPZ!6KiaBp@MDsNn2(&&7e(YBwyy5>8-v?2zg0CvA6?)O5_W!$w
z*KFf2Odbpf@PMPZC$rD+Yu0}E7q$nCPL#^bPR`5SAAbE@w*N-4tnA;)bE-=3ObV*v
z-c@$C>8H>Rp2Ni-1e!wH_WK4G{*Tvh)DeGZT2t?>=k)%=q(H_cZ-Z^l_uV`5t>Nhv
zyH#)Fmd$=(eo*JIH{Wsx?FFS3Ctpg$aK93aE7EERVf)6V@0q@R;!|lGV{5jhzgEAS
zboA%^nPLvVVpvXpnB>f;GQWSG)O03~Z}a!spZs*39qj0e9n4M!xuQuz%aTBRPgg&e
JbxsM4O#q^XbUOe5

diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index c913b981062bb2518430d59f729b3405dc369c6a..332785ba541bb7bb9edd455d0caf7b81cb94322d 100644
GIT binary patch
delta 16
Xcmcboa7uxR;lW0xJl@SMytkMDHdzK4

delta 35
qcmX@5a8H4W;o(N6JYFH8f}+gaRNdtKypp2)9NpynqRn}{cbEX<Zw%%D

diff --git a/core/src/mindustry/ai/ControlPathfinder.java b/core/src/mindustry/ai/ControlPathfinder.java
index 0de27c3b01..45f70c163f 100644
--- a/core/src/mindustry/ai/ControlPathfinder.java
+++ b/core/src/mindustry/ai/ControlPathfinder.java
@@ -266,6 +266,8 @@ public class ControlPathfinder{
     private void start(){
         stop();
 
+        if(net.client()) return;
+
         //TODO currently capped at 6 threads, might be a good idea to make it more?
         threads = new PathfindThread[Mathf.clamp(Runtime.getRuntime().availableProcessors() - 2, 1, 6)];
         for(int i = 0; i < threads.length; i ++){
diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java
index 765b3d69f1..ebe33bc317 100644
--- a/core/src/mindustry/ai/Pathfinder.java
+++ b/core/src/mindustry/ai/Pathfinder.java
@@ -149,6 +149,8 @@ public class Pathfinder implements Runnable{
     /** Starts or restarts the pathfinding thread. */
     private void start(){
         stop();
+        if(net.client()) return;
+
         thread = Threads.daemon("Pathfinder", this);
     }
 
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index fd43ca6d4a..b68aff3c3d 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -146,8 +146,7 @@ public class Blocks{
 
     //payloads
     payloadConveyor, payloadRouter, reinforcedPayloadConveyor, reinforcedPayloadRouter, payloadMassDriver, payloadPropulsionTower, smallDeconstructor, deconstructor, constructor, largeConstructor, payloadLoader, payloadUnloader,
-
-
+    
     //logic
     message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, memoryCell, memoryBank,
     worldProcessor, worldCell,
@@ -1238,6 +1237,7 @@ public class Blocks{
             drawer.iconOverride = new String[]{""};
             size = 2;
             heatOutput = 3f;
+            regionRotated1 = 1;
             consumePower(50f / 60f);
         }};
 
@@ -1260,6 +1260,7 @@ public class Blocks{
 
             size = 3;
             drawer = new DrawMulti(new DrawHeatOutput(true), new DrawHeatInput("-heat"));
+            regionRotated1 = 1;
         }};
 
         slagIncinerator = new ItemIncinerator("slag-incinerator"){{
@@ -1869,32 +1870,37 @@ public class Blocks{
             requirements(Category.distribution, with(Items.graphite, 1));
             //TODO bad idea? should this just require 1 beryllium?
             buildVisibility = BuildVisibility.berylliumOnly;
+            health = 90;
             speed = 4f;
         }};
 
         ductRouter = new DuctRouter("duct-router"){{
             requirements(Category.distribution, with(Items.graphite, 8, Items.beryllium, 4));
+            health = 90;
             speed = 4f;
         }};
 
         overflowDuct = new OverflowDuct("overflow-duct"){{
             requirements(Category.distribution, with(Items.graphite, 8, Items.beryllium, 8));
+            health = 90;
             speed = 4f;
         }};
 
         ductBridge = new DuctBridge("duct-bridge"){{
             requirements(Category.distribution, with(Items.graphite, 15, Items.beryllium, 10));
+            health = 90;
             speed = 4f;
         }};
 
         ductUnloader = new DirectionalUnloader("duct-unloader"){{
             requirements(Category.distribution, with(Items.graphite, 20, Items.silicon, 20, Items.tungsten, 10));
+            health = 90;
             speed = 4f;
         }};
 
         surgeConveyor = new StackConveyor("surge-conveyor"){{
             requirements(Category.distribution, with(Items.surgeAlloy, 3, Items.oxide, 5));
-            health = 90;
+            health = 130;
             //TODO different base speed/item capacity?
             speed = 5f / 60f;
             itemCapacity = 10;
@@ -1909,6 +1915,7 @@ public class Blocks{
 
         surgeRouter = new StackRouter("surge-router"){{
             requirements(Category.distribution, with(Items.oxide, 10, Items.surgeAlloy, 10));
+            health = 130;
 
             speed = 6f;
 
@@ -2138,6 +2145,7 @@ public class Blocks{
         beamNode = new BeamNode("beam-node"){{
             requirements(Category.power, with(Items.graphite, 5, Items.beryllium, 3));
             consumesPower = outputsPower = true;
+            health = 90;
             consumePowerBuffered(1000f);
             range = 10;
             researchCostMultiplier = 0.8f;
@@ -2150,6 +2158,7 @@ public class Blocks{
             consumesPower = outputsPower = true;
             consumePowerBuffered(40000f);
             range = 23;
+            scaledHealth = 90;
         }};
 
         beamLink = new LongPowerNode("beam-link"){{
@@ -2160,6 +2169,7 @@ public class Blocks{
             autolink = false;
             laserColor2 = Color.valueOf("ffd9c2");
             laserScale = 0.8f;
+            scaledHealth = 130;
         }};
 
         combustionGenerator = new BurnerGenerator("combustion-generator"){{
@@ -2602,7 +2612,7 @@ public class Blocks{
             //TODO should this be higher?
             buildCostMultiplier = 0.75f;
 
-            unitCapModifier = 5;
+            unitCapModifier = 30;
             researchCostMultiplier = 0.07f;
         }};
 
@@ -2616,7 +2626,7 @@ public class Blocks{
             thrusterLength = 40/4f;
             armor = 10f;
 
-            unitCapModifier = 10;
+            unitCapModifier = 30;
             researchCostMultipliers.put(Items.silicon, 0.4f);
             researchCostMultiplier = 0.14f;
         }};
@@ -2632,7 +2642,7 @@ public class Blocks{
             thrusterLength = 48/4f;
             armor = 15f;
 
-            unitCapModifier = 15;
+            unitCapModifier = 30;
             researchCostMultipliers.put(Items.silicon, 0.3f);
             researchCostMultiplier = 0.2f;
         }};
@@ -3696,7 +3706,7 @@ public class Blocks{
             //TODO 500 or 400? does it need to be better than the standard mass driver?
             range = 450f;
             maxPayloadSize = 2.5f;
-            consumePower(2f);
+            consumePower(0.5f);
         }};
 
         payloadPropulsionTower = new PayloadMassDriver("payload-propulsion-tower"){{
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 8ae8068708..597d9967e1 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -3369,7 +3369,7 @@ public class UnitTypes{
             speed = 2f;
             rotateSpeed = 9f;
             accel = 0.1f;
-            itemCapacity = 60;
+            itemCapacity = 50;
             health = 200f;
             hitSize = 11f;
             engineSize = 2.3f;
diff --git a/core/src/mindustry/world/blocks/payloads/BlockProducer.java b/core/src/mindustry/world/blocks/payloads/BlockProducer.java
index 969aae4f95..923de7e595 100644
--- a/core/src/mindustry/world/blocks/payloads/BlockProducer.java
+++ b/core/src/mindustry/world/blocks/payloads/BlockProducer.java
@@ -79,6 +79,11 @@ public abstract class BlockProducer extends PayloadBlock{
             return false;
         }
 
+        @Override
+        public boolean shouldConsume(){
+            return super.shouldConsume() && recipe() != null;
+        }
+
         @Override
         public void updateTile(){
             super.updateTile();