Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files

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){
{
drillPower = 1;
mineSpeed = 0.9f;
mineSpeed = 3f;
speed = 0.5f;
drag = 0.09f;
health = 200f;

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

@@ -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();