diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 2a945de6d5..faef9c3e8c 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -933,7 +933,7 @@ unit.eradicator.name = Eradicator unit.lich.name = Lich unit.reaper.name = Reaper tutorial.next = [lightgray] -tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper +tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Use [[WASD] to move, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nClick the drill tab in the bottom right.\nSelect the[accent] mechanical drill[]. Place it on a copper vein by clicking.\n[accent]Right-click[] to stop building, and[accent] Hold Ctrl while scrolling[] to zoom in and out. tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement. tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[] diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index 57dcf5afd3..b9dd4c80c9 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -220,7 +220,7 @@ public class Mechs implements ContentList{ dart = new Mech("dart-ship", true){ { drillPower = 1; - mineSpeed = 0.9f; + mineSpeed = 3f; speed = 0.5f; drag = 0.09f; health = 200f; diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 517f503c7a..717006653e 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.editor; +import io.anuke.annotations.Annotations.*; import io.anuke.arc.*; import io.anuke.arc.collection.*; import io.anuke.arc.files.*; @@ -147,9 +148,15 @@ public class MapEditorDialog extends Dialog implements Disposable{ if(steam){ menu.cont.addImageTextButton("$editor.publish.workshop", Icon.linkSmall, () -> { + Map builtin = maps.all().find(m -> m.name().equals(editor.getTags().get("name", "").trim())); + if(editor.getTags().containsKey("steamid") && builtin != null && !builtin.custom){ + platform.viewMapListing(editor.getTags().get("steamid")); + return; + } + Map map = save(); - if(editor.getTags().containsKey("steamid")){ + if(editor.getTags().containsKey("steamid") && map != null){ platform.viewMapListingInfo(map); return; } @@ -287,7 +294,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ }); } - public Map save(){ + public @Nullable Map save(){ boolean isEditor = state.rules.editor; state.rules.editor = false; String name = editor.getTags().get("name", "").trim(); diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java b/desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java index 915d585e77..578b00de3c 100644 --- a/desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java +++ b/desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java @@ -76,7 +76,6 @@ public class SWorkshop implements SteamUGCCallback{ } public void viewMapListingInfo(Map map){ - String id = map.tags.get("steamid"); long handle = Strings.parseLong(id, -1); SteamPublishedFileID fid = new SteamPublishedFileID(handle);