From bd329f57d6a15ca58f525e565a58b5f8572f02bf Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 16 Oct 2021 10:22:20 -0400 Subject: [PATCH] Add sensing of reconstructor config --- core/src/mindustry/content/Planets.java | 4 ++-- core/src/mindustry/type/Planet.java | 6 ++++++ core/src/mindustry/world/blocks/units/Reconstructor.java | 6 ++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java index e7778e4f61..801e4e6852 100644 --- a/core/src/mindustry/content/Planets.java +++ b/core/src/mindustry/content/Planets.java @@ -14,7 +14,7 @@ public class Planets implements ContentList{ @Override public void load(){ - sun = new Planet("sun", null, 4){{ + sun = new Planet("sun", null, 4f){{ bloom = true; accessible = false; @@ -31,7 +31,7 @@ public class Planets implements ContentList{ ); }}; - serpulo = new Planet("serpulo", sun, 1, 3){{ + serpulo = new Planet("serpulo", sun, 1f, 3){{ generator = new SerpuloPlanetGenerator(); meshLoader = () -> new HexMesh(this, 6); cloudMeshLoader = () -> new MultiMesh( diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index adfc406768..31a392c613 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -132,6 +132,12 @@ public class Planet extends UnlockableContent{ } } + /** @deprecated confusing parameter orer, use the other constructor instead */ + @Deprecated + public Planet(String name, Planet parent, int sectorSize, float radius){ + this(name, parent, radius, sectorSize); + } + public @Nullable Sector getLastSector(){ if(sectors.isEmpty()){ return null; diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java index 0d84db2fb5..b73b51547c 100644 --- a/core/src/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/mindustry/world/blocks/units/Reconstructor.java @@ -185,6 +185,12 @@ public class Reconstructor extends UnitBlock{ Draw.rect(topRegion, x, y); } + @Override + public Object senseObject(LAccess sensor){ + if(sensor == LAccess.config) return unit(); + return super.senseObject(sensor); + } + @Override public void updateTile(){ boolean valid = false;