diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 2b6d2be05e..2850060061 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1824,10 +1824,10 @@ public class Blocks implements ContentList{ }}; illuminator = new LightBlock("illuminator"){{ - requirements(Category.effect, BuildVisibility.lightingOnly, with(Items.graphite, 4, Items.silicon, 2)); + requirements(Category.effect, BuildVisibility.lightingOnly, with(Items.graphite, 10, Items.silicon, 8)); brightness = 0.67f; - radius = 120f; - consumes.power(0.05f); + radius = 130f; + consumes.power(0.06f); }}; //endregion diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 198247d78e..8b53a773c5 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -304,7 +304,7 @@ public class UnitTypes implements ContentList{ immunities = ObjectSet.with(StatusEffects.burning, StatusEffects.melting); legCount = 6; legLength = 13f; - legTrns = 0.7f; + legTrns = 0.8f; legMoveSpace = 1.4f; legBaseOffset = 2f; hovering = true; diff --git a/core/src/mindustry/entities/comp/PayloadComp.java b/core/src/mindustry/entities/comp/PayloadComp.java index c655180e30..09e978cedd 100644 --- a/core/src/mindustry/entities/comp/PayloadComp.java +++ b/core/src/mindustry/entities/comp/PayloadComp.java @@ -68,7 +68,6 @@ abstract class PayloadComp implements Posc, Rotc{ } boolean dropUnit(UnitPayload payload){ - //TODO create an effect here and/or make them be at a lower elevation Unit u = payload.unit; //can't drop ground units diff --git a/core/src/mindustry/world/blocks/power/LightBlock.java b/core/src/mindustry/world/blocks/power/LightBlock.java index a4a6642bc7..8c5dbb2237 100644 --- a/core/src/mindustry/world/blocks/power/LightBlock.java +++ b/core/src/mindustry/world/blocks/power/LightBlock.java @@ -2,6 +2,7 @@ package mindustry.world.blocks.power; import arc.graphics.*; import arc.graphics.g2d.*; +import arc.math.*; import arc.scene.ui.layout.*; import arc.util.*; import arc.util.io.*; @@ -29,6 +30,7 @@ public class LightBlock extends Block{ public class LightEntity extends Building{ public int color = Pal.accent.rgba(); + public float smoothTime = 1f; @Override public void draw(){ @@ -40,6 +42,11 @@ public class LightBlock extends Block{ Draw.blend(); } + @Override + public void updateTile(){ + smoothTime = Mathf.lerpDelta(smoothTime, timeScale, 0.1f); + } + @Override public void buildConfiguration(Table table){ table.button(Icon.pencil, () -> { @@ -50,7 +57,7 @@ public class LightBlock extends Block{ @Override public void drawLight(){ - Drawf.light(team, x, y, radius, Tmp.c1.set(color), brightness * efficiency()); + Drawf.light(team, x, y, radius * Math.min(smoothTime, 2f), Tmp.c1.set(color), brightness * efficiency()); } @Override