From 7b25b09c18b9a3f53a9b9d0ae50e8a0355189d34 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 7 Apr 2020 14:08:42 -0400 Subject: [PATCH] Bugfixes --- core/src/mindustry/mod/ContentParser.java | 2 ++ core/src/mindustry/ui/dialogs/PlanetDialog.java | 2 +- core/src/mindustry/ui/dialogs/SettingsMenuDialog.java | 2 +- core/src/mindustry/world/blocks/defense/SurgeWall.java | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 445ff64828..470cbd4e4e 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -90,6 +90,8 @@ public class ContentParser{ String name = "sounds/" + data.asString(); 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(); AssetDescriptor desc = Core.assets.load(path, Sound.class); desc.loaded = result -> sound.sound = (Sound)result; diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 65cc070185..fead7db567 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -94,7 +94,7 @@ public class PlanetDialog extends FloatingDialog{ //TODO names buttons.addImageTextButton("$back", Icon.left, style, this::hide).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("Resources", Icon.file, style, this::hide).margin(bmargin); diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index 3a16b70b14..77f70f2195 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -327,7 +327,7 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.checkPref("blockselectkeys", true); } graphics.checkPref("indicators", true); - graphics.checkPref("animatedwater", !mobile); + graphics.checkPref("animatedwater", true); if(Shaders.shield != null){ graphics.checkPref("animatedshields", !mobile); } diff --git a/core/src/mindustry/world/blocks/defense/SurgeWall.java b/core/src/mindustry/world/blocks/defense/SurgeWall.java index 67f93fd9dd..e2013bef6b 100644 --- a/core/src/mindustry/world/blocks/defense/SurgeWall.java +++ b/core/src/mindustry/world/blocks/defense/SurgeWall.java @@ -19,7 +19,7 @@ public class SurgeWall extends Wall{ public void collision(Bulletc bullet){ super.collision(bullet); 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); } } }