diff --git a/core/src/mindustry/entities/comp/StatusComp.java b/core/src/mindustry/entities/comp/StatusComp.java index cde001fab6..41276274a3 100644 --- a/core/src/mindustry/entities/comp/StatusComp.java +++ b/core/src/mindustry/entities/comp/StatusComp.java @@ -1,7 +1,6 @@ package mindustry.entities.comp; import arc.graphics.*; -import arc.math.*; import arc.struct.*; import arc.util.*; import arc.util.pooling.*; @@ -24,11 +23,6 @@ abstract class StatusComp implements Posc, Flyingc{ @Import UnitType type; - /** @return damage taken based on status armor multipliers */ - float getShieldDamage(float amount){ - return amount * Mathf.clamp(1f - armorMultiplier / 100f); - } - /** Apply a status effect for 1 tick (for permanent effects) **/ void apply(StatusEffect effect){ apply(effect, 1); diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index 6cea6e1dcb..a93a480eae 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -181,7 +181,7 @@ public class DesktopInput extends InputHandler{ } boolean panCam = false; - float camSpeed = !Core.input.keyDown(Binding.boost) ? panSpeed : panBoostSpeed; + float camSpeed = (!Core.input.keyDown(Binding.boost) ? panSpeed : panBoostSpeed) * Time.delta; if(input.keyDown(Binding.pan)){ panCam = true; diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index 10cd96366f..c4cfc02132 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -86,7 +86,7 @@ public class SettingsMenuDialog extends SettingsDialog{ dataDialog.addCloseButton(); dataDialog.cont.table(Tex.button, t -> { - t.defaults().size(270f, 60f).left(); + t.defaults().size(280f, 60f).left(); TextButtonStyle style = Styles.cleart; t.button("@settings.cleardata", Icon.trash, style, () -> ui.showConfirm("@confirm", "@settings.clearall.confirm", () -> { @@ -419,6 +419,9 @@ public class SettingsMenuDialog extends SettingsDialog{ zipped.walk(f -> f.copyTo(base.child(f.path()))); dest.delete(); + + //load data so it's saved on exit + settings.load(); } private void back(){