Finalized launch pad mechanics

Author: Anuken

core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-light.png

@@ -737,6 +737,8 @@ addall = Add All
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}
 launch.destination = Destination: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = Amount must be a number between 0 and {0}.
 add = Add...
 guardian = Guardian
@@ -778,6 +780,7 @@ sectors.launch = Launch
 sectors.select = Select
 sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]none (sun)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Rename Sector
 sectors.enemybase = [scarlet]Enemy Base
 sectors.vulnerable = [scarlet]Vulnerable
@@ -1748,7 +1751,10 @@ block.spectre.name = Spectre
 block.meltdown.name = Meltdown
 block.foreshadow.name = Foreshadow
 block.container.name = Container
-block.launch-pad.name = Launch Pad (Legacy)
+block.launch-pad.name = Launch Pad [lightgray](Legacy)
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
+
 block.segment.name = Segment
 block.ground-factory.name = Ground Factory
 block.air-factory.name = Air Factory
@@ -2198,7 +2204,9 @@ block.vault.description = Stores a large amount of items of each type. Expands s
 block.container.description = Stores a small amount of items of each type. Expands storage when placed next to a core. Contents can be retrieved with an unloader.
 block.unloader.description = Unloads the selected item from nearby blocks.
 block.launch-pad.description = Launches batches of items to selected sectors.
-block.launch-pad.details = Sub-orbital system for point-to-point transportation of resources. Payload pods are fragile and incapable of surviving re-entry.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Fires alternating bullets at enemies.
 block.scatter.description = Fires clumps of lead, scrap or metaglass flak at enemy aircraft.
 block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.

core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-pod.png

@@ -595,3 +595,5 @@
 63087=scathe-missile-phase|unit-scathe-missile-phase-ui
 63086=scathe-missile-surge|unit-scathe-missile-surge-ui
 63085=scathe-missile-surge-split|unit-scathe-missile-surge-split-ui
+63084=advanced-launch-pad|block-advanced-launch-pad-ui
+63083=landing-pad|block-landing-pad-ui

core/assets-raw/sprites/blocks/campaign/advanced-launch-pad.png

@@ -6364,23 +6364,26 @@ Items.surgeAlloy, new BasicBulletType(7f, 250){{
         }};
 
         advancedLaunchPad = new LaunchPad("advanced-launch-pad"){{
-            requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 350, Items.silicon, 140, Items.lead, 200, Items.titanium, 150));
+            requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 350, Items.silicon, 250, Items.lead, 300, Items.titanium, 200));
             size = 4;
             itemCapacity = 100;
             launchTime = 60f * 30;
+            liquidCapacity = 40f;
             hasPower = true;
+            drawLiquid = Liquids.oil;
             consumeLiquid(Liquids.oil, 9f/60f);
             consumePower(8f);
         }};
 
         landingPad = new LandingPad("landing-pad"){{
-            requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 350, Items.silicon, 140, Items.lead, 200, Items.titanium, 150));
+            requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 300, Items.graphite, 200, Items.titanium, 150));
             size = 4;
 
             itemCapacity = 100;
 
-            liquidCapacity = 4000f;
-            consumeLiquidAmount = 2000f;
+            coolingEffect = new RadialEffect(Fx.steamCoolSmoke, 4, 90f, 9.5f, 180f);
+            liquidCapacity = 5000f;
+            consumeLiquidAmount = 2500f;
         }};
 
         interplanetaryAccelerator = new Accelerator("interplanetary-accelerator"){{

core/assets-raw/sprites/blocks/campaign/landing-pad.png

@@ -1474,6 +1474,12 @@ public class Fx{
         Lines.circle(e.x, e.y, e.fin() * (e.rotation + 50f));
     }),
 
+    podLandShockwave = new Effect(12f, 80f, e -> {
+        color(Pal.accent);
+        stroke(e.fout() * 2f + 0.2f);
+        Lines.circle(e.x, e.y, e.fin() * 26f);
+    }),
+
     explosion = new Effect(30, e -> {
         e.scaled(7, i -> {
             stroke(3f * i.fout());
@@ -1624,6 +1630,15 @@ public class Fx{
         });
     }),
 
+    steamCoolSmoke = new Effect(35f, e -> {
+        color(Pal.water, Color.lightGray, e.fin(Interp.pow2Out));
+        alpha(e.fout(Interp.pow3Out));
+
+        randLenVectors(e.id, 4, e.finpow() * 7f, e.rotation, 30f, (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, Math.max(e.fout(), Math.min(1f, e.fin() * 8f)) * 2.8f);
+        });
+    }),
+
     smokePuff = new Effect(30, e -> {
         color(e.color);
 
@@ -2574,6 +2589,13 @@ public class Fx{
         Fill.circle(e.x + Tmp.v1.x, e.y + Tmp.v1.y, 8f * rand.random(0.6f, 1f) * e.fout(0.2f));
     }).layer(Layer.groundUnit + 1f),
 
+    podLandDust = new Effect(70f, e -> {
+        color(e.color, e.fout(0.1f));
+        rand.setSeed(e.id);
+        Tmp.v1.trns(e.rotation, e.finpow() * 35f * rand.random(0.2f, 1f));
+        Fill.circle(e.x + Tmp.v1.x, e.y + Tmp.v1.y, 5f * rand.random(0.6f, 1f) * e.fout(0.2f));
+    }).layer(Layer.groundUnit + 1f),
+
     unitShieldBreak = new Effect(35, e -> {
         if(!(e.data instanceof Unit unit)) return;
 

core/assets/bundles/bundle.properties

@@ -20,8 +20,10 @@ public static void load(){
                 node(junction, () -> {
                     node(router, () -> {
                         node(advancedLaunchPad, Seq.with(new SectorComplete(extractionOutpost)), () -> {
-                            node(interplanetaryAccelerator, Seq.with(new SectorComplete(planetaryTerminal)), () -> {
+                            node(landingPad, () -> {
+                                node(interplanetaryAccelerator, Seq.with(new SectorComplete(planetaryTerminal)), () -> {
 
+                                });
                             });
                         });
 

core/assets/icons/icons.properties

@@ -8,30 +8,35 @@
 /** Renders one particle effect repeatedly at specified angle intervals. */
 public class RadialEffect extends Effect{
     public Effect effect = Fx.none;
-    public float rotationSpacing = 90f, rotationOffset = 0f;
+    public float rotationSpacing = 90f, rotationOffset = 0f, effectRotationOffset = 0f;
     public float lengthOffset = 0f;
     public int amount = 4;
 
     public RadialEffect(){
         clip = 100f;
     }
 
-    public RadialEffect(Effect effect, int amount, float spacing, float lengthOffset){
+    public RadialEffect(Effect effect, int amount, float spacing, float lengthOffset, float effectRotationOffset){
         this();
         this.amount = amount;
         this.effect = effect;
+        this.effectRotationOffset = effectRotationOffset;
         this.rotationSpacing = spacing;
         this.lengthOffset = lengthOffset;
     }
 
+    public RadialEffect(Effect effect, int amount, float spacing, float lengthOffset){
+        this(effect, amount, spacing, lengthOffset, 0f);
+    }
+
     @Override
     public void create(float x, float y, float rotation, Color color, Object data){
         if(!shouldCreate()) return;
 
         rotation += rotationOffset;
 
         for(int i = 0; i < amount; i++){
-            effect.create(x + Angles.trnsx(rotation, lengthOffset), y + Angles.trnsy(rotation, lengthOffset), rotation, color, data);
+            effect.create(x + Angles.trnsx(rotation, lengthOffset), y + Angles.trnsy(rotation, lengthOffset), rotation + effectRotationOffset, color, data);
             rotation += rotationSpacing;
         }
     }

core/assets/logicids.dat

@@ -30,6 +30,9 @@ public class SectorInfo{
     public ObjectMap<Item, ExportStat> rawProduction = new ObjectMap<>();
     /** Export statistics. */
     public ObjectMap<Item, ExportStat> export = new ObjectMap<>();
+    //TODO: there is an obvious exploit with launch pad redirection here; pads can be redirected after leaving a sector, which doesn't update calculations.
+    /** Import statistics, based on what launch pads are actually receiving. TODO: this is not actually used or displayed anywhere (yet) */
+    public ObjectMap<Item, ExportStat> imports = new ObjectMap<>();
     /** Items stored in all cores. */
     public ItemSeq items = new ItemSeq();
     /** The best available core type. */
@@ -118,10 +121,20 @@ public void handleItemExport(Item item, int amount){
         export.get(item, ExportStat::new).counter += amount;
     }
 
+    /** Updates import statistics. */
+    public void handleItemImport(Item item, int amount){
+        imports.get(item, ExportStat::new).counter += amount;
+    }
+
     public float getExport(Item item){
         return export.get(item, ExportStat::new).mean;
     }
 
+    public boolean hasExport(Item item){
+        var exp = export.get(item);
+        return exp != null && exp.mean > 0f;
+    }
+
     public void refreshImportRates(Planet planet){
         if(importRateCache == null || importRateCache.length != content.items().size){
             importRateCache = new float[content.items().size];
@@ -140,7 +153,7 @@ public float[] getImportRates(Planet planet){
         return importRateCache;
     }
 
-    /** @return the import rate of an item as item/second. */
+    /** @return the import rate of an item as item/second. This is the *raw* max import rate, not what landing pads are actually using. */
     public float getImportRate(Planet planet, Item item){
         return getImportRates(planet)[item.id];
     }
@@ -239,19 +252,8 @@ public void update(){
         //refresh throughput
         if(time.get(refreshPeriod)){
 
-            //refresh export
-            export.each((item, stat) -> {
-                //initialize stat after loading
-                if(!stat.loaded){
-                    stat.means.fill(stat.mean);
-                    stat.loaded = true;
-                }
-
-                //add counter, subtract how many items were taken from the core during this time
-                stat.means.add(Math.max(stat.counter, 0));
-                stat.counter = 0;
-                stat.mean = stat.means.rawMean();
-            });
+            updateStats(export);
+            updateStats(imports);
 
             if(coreDeltas == null) coreDeltas = new int[content.items().size];
             if(productionDeltas == null) productionDeltas = new int[content.items().size];
@@ -268,13 +270,32 @@ public void update(){
                     //export can, at most, be the raw items being produced from factories + the items being taken from the core
                     export.get(item).mean = Math.min(export.get(item).mean, rawProduction.get(item).mean + Math.max(-production.get(item).mean, 0));
                 }
+
+                if(imports.containsKey(item)){
+                    //import can't exceed max import rate
+                    imports.get(item).mean = Math.min(imports.get(item).mean, getImportRate(state.getPlanet(), item));
+                }
             }
 
             Arrays.fill(coreDeltas, 0);
             Arrays.fill(productionDeltas, 0);
         }
     }
 
+    void updateStats(ObjectMap<Item, ExportStat> map){
+        map.each((item, stat) -> {
+            //initialize stat after loading
+            if(!stat.loaded){
+                stat.means.fill(stat.mean);
+                stat.loaded = true;
+            }
+
+            stat.means.add(Math.max(stat.counter, 0));
+            stat.counter = 0;
+            stat.mean = stat.means.rawMean();
+        });
+    }
+
     void updateDelta(Item item, ObjectMap<Item, ExportStat> map, int[] deltas){
         ExportStat stat = map.get(item, ExportStat::new);
         if(!stat.loaded){

core/src/mindustry/content/Blocks.java

@@ -5,6 +5,7 @@
 public class Pal{
     public static Color
 
+    water = Color.valueOf("596ab8"),
     darkOutline = Color.valueOf("2d2f39"),
     thoriumPink = Color.valueOf("f9a3c7"),
     coalBlack = Color.valueOf("272727"),
@@ -107,7 +108,7 @@ public class Pal{
     redderDust = Color.valueOf("ff7b69"),
 
     plasticSmoke = Color.valueOf("f1e479"),
-	
+
     adminChat = Color.valueOf("ff4000"),
 
     neoplasmOutline = Color.valueOf("2e191d"),

core/src/mindustry/content/Fx.java

@@ -962,7 +962,7 @@ void showStats(Sector sector){
 
             //import
             if(sector.hasBase()){
-                displayItems(c, 1f, sector.info.importStats(sector.planet), "@sectors.import", t -> {
+                displayItems(c, 1f, sector.info.imports, "@sectors.import", t -> {
                     sector.info.eachImport(sector.planet, other -> {
                         String ic = other.iconChar();
                         t.add(Iconc.rightOpen + " " + (ic == null || ic.isEmpty() ? "" : ic + " ") + other.name()).padLeft(10f).row();