diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 5ff0327e98..d097c40cd7 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -779,6 +779,7 @@ block.meltdown.name = Meltdown block.container.name = Container block.launch-pad.name = Launch Pad block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. +block.launch-pad-large.name = Large Launch Pad team.blue.name = blue team.red.name = red team.orange.name = orange diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index df1c8c7935..2c6beccd7e 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -211,7 +211,7 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.checkPref("fps", false); graphics.checkPref("indicators", true); - graphics.checkPref("shadows", true); + graphics.checkPref("shadows", !mobile); graphics.checkPref("animatedwater", !mobile); graphics.checkPref("lasers", true); } diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java b/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java index c963f14123..af01644d1f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java @@ -2,6 +2,7 @@ package io.anuke.mindustry.world.blocks.storage; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.Lines; +import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.Fx; @@ -45,7 +46,7 @@ public class LaunchPad extends StorageBlock{ public void draw(Tile tile){ super.draw(tile); - float progress = (tile.entity.items.total() / (float)itemCapacity) * ((tile.entity.timer.getTime(timerLaunch) / (launchTime / tile.entity.timeScale))); + float progress = Mathf.clamp((tile.entity.items.total() / (float)itemCapacity) * ((tile.entity.timer.getTime(timerLaunch) / (launchTime / tile.entity.timeScale)))); float scale = size/3f; Lines.stroke(2f);