mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 20:33:50 +07:00
Code Issues Packages Projects Releases Wiki Activity

Workshop crash fix / Mine balancing

Browse Source
This commit is contained in:
Anuken 2019-09-28 15:14:29 -04:00
parent 438b3d9752
commit 000b23d703
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@ -933,7 +933,7 @@ unit.eradicator.name = Eradicator
unit.lich.name = Lich unit.lich.name = Lich
unit.reaper.name = Reaper unit.reaper.name = Reaper
tutorial.next = [lightgray]<Tap to continue> tutorial.next = [lightgray]<Tap to continue>
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 = 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.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.[] 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.[]

2
core/src/io/anuke/mindustry/content/Mechs.java
View File

@ -220,7 +220,7 @@ public class Mechs implements ContentList{
dart = new Mech("dart-ship", true){ dart = new Mech("dart-ship", true){
{ {
drillPower = 1; drillPower = 1;
mineSpeed = 0.9f; mineSpeed = 3f;
speed = 0.5f; speed = 0.5f;
drag = 0.09f; drag = 0.09f;
health = 200f; health = 200f;

11
core/src/io/anuke/mindustry/editor/MapEditorDialog.java
View File

@ -1,5 +1,6 @@
package io.anuke.mindustry.editor; package io.anuke.mindustry.editor;
import io.anuke.annotations.Annotations.*;
import io.anuke.arc.*; import io.anuke.arc.*;
import io.anuke.arc.collection.*; import io.anuke.arc.collection.*;
import io.anuke.arc.files.*; import io.anuke.arc.files.*;
@ -147,9 +148,15 @@ public class MapEditorDialog extends Dialog implements Disposable{
if(steam){ if(steam){
menu.cont.addImageTextButton("$editor.publish.workshop", Icon.linkSmall, () -> { 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(); Map map = save();
if(editor.getTags().containsKey("steamid")){ if(editor.getTags().containsKey("steamid") && map != null){
platform.viewMapListingInfo(map); platform.viewMapListingInfo(map);
return; return;
} }
@ -287,7 +294,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
}); });
} }
public Map save(){ public @Nullable Map save(){
boolean isEditor = state.rules.editor; boolean isEditor = state.rules.editor;
state.rules.editor = false; state.rules.editor = false;
String name = editor.getTags().get("name", "").trim(); String name = editor.getTags().get("name", "").trim();

1
desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java
View File

@ -76,7 +76,6 @@ public class SWorkshop implements SteamUGCCallback{
} }
public void viewMapListingInfo(Map map){ public void viewMapListingInfo(Map map){
String id = map.tags.get("steamid"); String id = map.tags.get("steamid");
long handle = Strings.parseLong(id, -1); long handle = Strings.parseLong(id, -1);
SteamPublishedFileID fid = new SteamPublishedFileID(handle); SteamPublishedFileID fid = new SteamPublishedFileID(handle);