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-04-07 14:08:42 -04:00
parent 5fbe925429
commit 7b25b09c18
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/mod/ContentParser.java
View File

@@ -90,6 +90,8 @@ public class ContentParser{
String name = "sounds/" + data.asString(); String name = "sounds/" + data.asString();
String path = Vars.tree.get(name + ".ogg").exists() && !Vars.ios ? name + ".ogg" : name + ".mp3"; String path = Vars.tree.get(name + ".ogg").exists() && !Vars.ios ? name + ".ogg" : name + ".mp3";
if(Core.assets.contains(path, Sound.class)) return Core.assets.get(path, Sound.class);
ModLoadingSound sound = new ModLoadingSound(); ModLoadingSound sound = new ModLoadingSound();
AssetDescriptor<?> desc = Core.assets.load(path, Sound.class); AssetDescriptor<?> desc = Core.assets.load(path, Sound.class);
desc.loaded = result -> sound.sound = (Sound)result; desc.loaded = result -> sound.sound = (Sound)result;

2
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -94,7 +94,7 @@ public class PlanetDialog extends FloatingDialog{
//TODO names //TODO names
buttons.addImageTextButton("$back", Icon.left, style, this::hide).margin(bmargin); buttons.addImageTextButton("$back", Icon.left, style, this::hide).margin(bmargin);
buttons.addImageTextButton("Tech", Icon.tree, style, () -> ui.tech.show()).margin(bmargin); buttons.addImageTextButton("Tech", Icon.tree, style, () -> ui.tech.show()).margin(bmargin);
buttons.addImageTextButton("Launch", Icon.upOpen, style, this::hide).margin(bmargin); //buttons.addImageTextButton("Launch", Icon.upOpen, style, this::hide).margin(bmargin);
buttons.addImageTextButton("Database", Icon.book, style, () -> ui.database.show()).margin(bmargin); buttons.addImageTextButton("Database", Icon.book, style, () -> ui.database.show()).margin(bmargin);
buttons.addImageTextButton("Resources", Icon.file, style, this::hide).margin(bmargin); buttons.addImageTextButton("Resources", Icon.file, style, this::hide).margin(bmargin);

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

@@ -327,7 +327,7 @@ public class SettingsMenuDialog extends SettingsDialog{
graphics.checkPref("blockselectkeys", true); graphics.checkPref("blockselectkeys", true);
} }
graphics.checkPref("indicators", true); graphics.checkPref("indicators", true);
graphics.checkPref("animatedwater", !mobile); graphics.checkPref("animatedwater", true);
if(Shaders.shield != null){ if(Shaders.shield != null){
graphics.checkPref("animatedshields", !mobile); graphics.checkPref("animatedshields", !mobile);
} }

2
core/src/mindustry/world/blocks/defense/SurgeWall.java
View File

@@ -19,7 +19,7 @@ public class SurgeWall extends Wall{
public void collision(Bulletc bullet){ public void collision(Bulletc bullet){
super.collision(bullet); super.collision(bullet);
if(Mathf.chance(lightningChance)){ if(Mathf.chance(lightningChance)){
Lightning.create(team(), Pal.surge, lightningDamage, bullet.x(), bullet.y(), bullet.rotation() + 180f, lightningLength); Lightning.create(team(), Pal.surge, lightningDamage, x, y, bullet.rotation() + 180f, lightningLength);
} }
} }
} }