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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-09-13 10:02:10 -04:00
parent 1fd98fe07c
commit bab43859f5
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/entities/comp/StatusComp.java
View File

@@ -1,7 +1,6 @@
package mindustry.entities.comp; package mindustry.entities.comp;
import arc.graphics.*; import arc.graphics.*;
import arc.math.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import arc.util.pooling.*; import arc.util.pooling.*;
@@ -24,11 +23,6 @@ abstract class StatusComp implements Posc, Flyingc{
@Import UnitType type; @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) **/ /** Apply a status effect for 1 tick (for permanent effects) **/
void apply(StatusEffect effect){ void apply(StatusEffect effect){
apply(effect, 1); apply(effect, 1);

2
core/src/mindustry/input/DesktopInput.java
View File

@@ -181,7 +181,7 @@ public class DesktopInput extends InputHandler{
} }
boolean panCam = false; 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)){ if(input.keyDown(Binding.pan)){
panCam = true; panCam = true;

5
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -86,7 +86,7 @@ public class SettingsMenuDialog extends SettingsDialog{
dataDialog.addCloseButton(); dataDialog.addCloseButton();
dataDialog.cont.table(Tex.button, t -> { dataDialog.cont.table(Tex.button, t -> {
t.defaults().size(270f, 60f).left(); t.defaults().size(280f, 60f).left();
TextButtonStyle style = Styles.cleart; TextButtonStyle style = Styles.cleart;
t.button("@settings.cleardata", Icon.trash, style, () -> ui.showConfirm("@confirm", "@settings.clearall.confirm", () -> { 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()))); zipped.walk(f -> f.copyTo(base.child(f.path())));
dest.delete(); dest.delete();
//load data so it's saved on exit
settings.load();
} }
private void back(){ private void back(){