Atolls sector map submission / Windswept Islands rework submission

core/src/mindustry/ai/types/CommandAI.java

@@ -326,7 +326,7 @@ public class CommandAI extends AIController{
 
     void finishPath(){
         //the enter payload command never finishes until they are actually accepted
-        if(command == UnitCommand.enterPayloadCommand && commandQueue.size == 0 && targetPos != null && world.buildWorld(targetPos.x, targetPos.y) != null && world.buildWorld(targetPos.x, targetPos.y).block.acceptsPayloads){
+        if(command == UnitCommand.enterPayloadCommand && commandQueue.size == 0 && targetPos != null && world.buildWorld(targetPos.x, targetPos.y) != null && world.buildWorld(targetPos.x, targetPos.y).block.acceptsUnitPayloads){
             return;
         }
 

core/src/mindustry/content/SectorPresets.java

@@ -8,7 +8,7 @@ public class SectorPresets{
     public static SectorPreset
     groundZero,
     craters, biomassFacility, taintedWoods, frozenForest, ruinousShores, facility32m, windsweptIslands, stainedMountains, tarFields,
-    fungalPass, infestedCanyons, extractionOutpost, polarAerodrome, saltFlats, overgrowth,
+    fungalPass, infestedCanyons, atolls, extractionOutpost, polarAerodrome, saltFlats, overgrowth,
     impact0078, desolateRift, nuclearComplex, planetaryTerminal,
     coastline, navalFortress,
 
@@ -97,6 +97,10 @@ public class SectorPresets{
             difficulty = 4;
         }};
 
+        atolls = new SectorPreset("atolls", serpulo, 1){{
+            difficulty = 7;
+        }};
+
         overgrowth = new SectorPreset("overgrowth", serpulo, 134){{
             difficulty = 5;
         }};

core/src/mindustry/content/SerpuloTechTree.java

@@ -427,8 +427,8 @@ public class SerpuloTechTree{
                 });
 
                 node(additiveReconstructor, Seq.with(new SectorComplete(biomassFacility)), () -> {
-                    node(multiplicativeReconstructor, () -> {
-                        node(exponentialReconstructor, Seq.with(new SectorComplete(overgrowth)), () -> {
+                    node(multiplicativeReconstructor, Seq.with(new SectorComplete(overgrowth)), () -> {
+                        node(exponentialReconstructor, () -> {
                             node(tetrativeReconstructor, () -> {
 
                             });
@@ -565,7 +565,13 @@ public class SerpuloTechTree{
                         new Research(UnitTypes.mace),
                         new Research(UnitTypes.flare)
                         ), () -> {
+                            node(atolls, Seq.with(
+                            new SectorComplete(windsweptIslands),
+                            new Research(multiplicativeReconstructor),
+                            new Research(mega)
+                            ), () -> {
 
+                            });
                         });
                     });
 

core/src/mindustry/input/InputHandler.java

@@ -1058,7 +1058,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
                         if(ai.currentCommand() == UnitCommand.enterPayloadCommand){
                             var build = world.buildWorld(lineDest.getX(), lineDest.getY());
-                            if(build != null && build.block.acceptsPayloads && build.team == unit.team){
+                            if(build != null && build.block.acceptsUnitPayloads && build.team == unit.team){
                                 Drawf.selected(build, Pal.accent);
                             }
                         }

core/src/mindustry/world/Block.java

@@ -58,7 +58,7 @@ public class Block extends UnlockableContent implements Senseable{
     /** If true, this block can output payloads; affects blending. */
     public boolean outputsPayload = false;
     /** If true, this block can input payloads; affects unit payload enter behavior. */
-    public boolean acceptsPayloads = false;
+    public boolean acceptsUnitPayloads = false;
     /** If true, payloads will attempt to move into this block. */
     public boolean acceptsPayload = false;
     /** Visual flag use for blending of certain transportation blocks. */

core/src/mindustry/world/blocks/payloads/BlockProducer.java

@@ -30,7 +30,7 @@ public abstract class BlockProducer extends PayloadBlock{
         hasItems = true;
         solid = true;
         hasPower = true;
-        acceptsPayloads = false;
+        acceptsUnitPayloads = false;
         rotate = true;
         regionRotated1 = 1;
 
@@ -69,7 +69,7 @@ public abstract class BlockProducer extends PayloadBlock{
 
         addBar("progress", (BlockProducerBuild entity) -> new Bar("bar.progress", Pal.ammo, () -> entity.recipe() == null ? 0f : (entity.progress / entity.recipe().buildCost)));
     }
-    
+
     public abstract class BlockProducerBuild extends PayloadBlockBuild<BuildPayload>{
         public float progress, time, heat;
 

core/src/mindustry/world/blocks/payloads/PayloadBlock.java

@@ -25,7 +25,7 @@ public class PayloadBlock extends Block{
         update = true;
         sync = true;
         group = BlockGroup.payloads;
-        acceptsPayloads = true;
+        acceptsUnitPayloads = true;
         envEnabled |= Env.space | Env.underwater;
     }
 

core/src/mindustry/world/blocks/payloads/PayloadConveyor.java

@@ -31,7 +31,7 @@ public class PayloadConveyor extends Block{
         update = true;
         outputsPayload = true;
         noUpdateDisabled = true;
-        acceptsPayloads = true;
+        acceptsUnitPayloads = true;
         priority = TargetPriority.transport;
         envEnabled |= Env.space | Env.underwater;
         sync = true;

core/src/mindustry/world/blocks/payloads/PayloadSource.java

@@ -37,7 +37,7 @@ public class PayloadSource extends PayloadBlock{
         noUpdateDisabled = true;
         clearOnDoubleTap = true;
         regionRotated1 = 1;
-        acceptsPayloads = false;
+        acceptsUnitPayloads = false;
         commandable = true;
 
         config(Block.class, (PayloadSourceBuild build, Block block) -> {