Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Anuken
2019-03-28 11:00:34 -04:00
parent 50959317e9
commit 07c28c3f6d
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@@ -779,6 +779,7 @@ block.meltdown.name = Meltdown
block.container.name = Container block.container.name = Container
block.launch-pad.name = Launch Pad 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.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.blue.name = blue
team.red.name = red team.red.name = red
team.orange.name = orange team.orange.name = orange

2
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -211,7 +211,7 @@ public class SettingsMenuDialog extends SettingsDialog{
graphics.checkPref("fps", false); graphics.checkPref("fps", false);
graphics.checkPref("indicators", true); graphics.checkPref("indicators", true);
graphics.checkPref("shadows", true); graphics.checkPref("shadows", !mobile);
graphics.checkPref("animatedwater", !mobile); graphics.checkPref("animatedwater", !mobile);
graphics.checkPref("lasers", true); graphics.checkPref("lasers", true);
} }

3
core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java
View File

@@ -2,6 +2,7 @@ package io.anuke.mindustry.world.blocks.storage;
import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.graphics.g2d.Lines;
import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.Time; import io.anuke.arc.util.Time;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.content.Fx;
@@ -45,7 +46,7 @@ public class LaunchPad extends StorageBlock{
public void draw(Tile tile){ public void draw(Tile tile){
super.draw(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; float scale = size/3f;
Lines.stroke(2f); Lines.stroke(2f);