diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 59a147aff1..a5e15cc7e3 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1114,6 +1114,7 @@ bar.capacity = Capacity: {0} bar.unitcap = {0} {1}/{2} bar.liquid = Liquid bar.heat = Heat +bar.cooldown = Cooldown bar.instability = Instability bar.heatamount = Heat: {0} bar.heatpercent = Heat: {0} ({1}%) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 3455a893a9..fc95d69164 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -6376,7 +6376,7 @@ public class Blocks{ }}; landingPad = new LandingPad("landing-pad"){{ - requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 300, Items.graphite, 200, Items.titanium, 150)); + requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 200, Items.graphite, 100, Items.titanium, 100)); size = 4; itemCapacity = 100; diff --git a/core/src/mindustry/world/blocks/campaign/LandingPad.java b/core/src/mindustry/world/blocks/campaign/LandingPad.java index 8ff6367c0e..ab8a621352 100644 --- a/core/src/mindustry/world/blocks/campaign/LandingPad.java +++ b/core/src/mindustry/world/blocks/campaign/LandingPad.java @@ -38,7 +38,7 @@ public class LandingPad extends Block{ public @Load(value = "@-pod", fallback = "advanced-launch-pad-pod") TextureRegion podRegion; public float arrivalDuration = 150f; - public float cooldownTime = 180f; + public float cooldownTime = 150f; public float consumeLiquidAmount = 100f; public Liquid consumeLiquid = Liquids.water; @@ -95,7 +95,7 @@ public class LandingPad extends Block{ addLiquidBar(consumeLiquid); //TODO: does cooldown even need to exist? - addBar("heat", (LandingPadBuild entity) -> new Bar("bar.heat", Pal.lightOrange, () -> entity.cooldown)); + addBar("cooldown", (LandingPadBuild entity) -> new Bar("bar.cooldown", Pal.lightOrange, () -> entity.cooldown)); } @Override @@ -377,12 +377,23 @@ public class LandingPad extends Block{ return config; } + @Override + public byte version(){ + return 1; + } + @Override public void read(Reads read, byte revision){ super.read(read, revision); config = TypeIO.readItem(read); priority = read.i(); cooldown = read.f(); + + if(revision >= 1){ + arriving = TypeIO.readItem(read); + arrivingTimer = read.f(); + liquidRemoved = read.f(); + } } @Override @@ -391,6 +402,10 @@ public class LandingPad extends Block{ TypeIO.writeItem(write, config); write.i(priority); write.f(cooldown); + + TypeIO.writeItem(write, arriving); + write.f(arrivingTimer); + write.f(liquidRemoved); } } }