From 7612a22480abd7e3d6f018459d4b6a6725f9d616 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 19 Nov 2020 11:55:46 -0500 Subject: [PATCH] Implemented legacy (V5) research loading --- core/src/mindustry/game/Universe.java | 11 +++++++---- core/src/mindustry/ui/dialogs/SettingsMenuDialog.java | 1 + fastlane/metadata/android/en-US/changelogs/29716.txt | 9 +++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/29716.txt diff --git a/core/src/mindustry/game/Universe.java b/core/src/mindustry/game/Universe.java index dab11c28dc..c7e8536cf4 100644 --- a/core/src/mindustry/game/Universe.java +++ b/core/src/mindustry/game/Universe.java @@ -27,6 +27,13 @@ public class Universe{ public Universe(){ load(); + //load legacy research + Events.on(ClientLoadEvent.class, e -> { + if(Core.settings.has("unlocks")){ + LegacyIO.readResearch(); + } + }); + //update base coverage on capture Events.on(SectorCaptureEvent.class, e -> { if(state.isCampaign()){ @@ -273,10 +280,6 @@ public class Universe{ private void load(){ seconds = Core.settings.getInt("utimei"); turn = Core.settings.getInt("turn"); - - if(Core.settings.has("unlocks")){ - LegacyIO.readResearch(); - } } } diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index a2ddea1b10..240a1ef544 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -130,6 +130,7 @@ public class SettingsMenuDialog extends SettingsDialog{ u.clearUnlock(); } }); + settings.remove("unlocks"); }); }).marginLeft(4); diff --git a/fastlane/metadata/android/en-US/changelogs/29716.txt b/fastlane/metadata/android/en-US/changelogs/29716.txt new file mode 100644 index 0000000000..bcf3708d75 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29716.txt @@ -0,0 +1,9 @@ +Yes, it's another one. Get ready for more rapid-fire releases. + +- Fixed sound not working [Android] +- Fixed sound being muffled at start of game +- Fixed continuous lasers setting shooters on fire +- Fixed deconstruction area not being queued [Mobile] +- Limited logic symbols to 40 characters +- Added "Launching From" info to sector launch dialog +- Added final campaign sector (untested!)