Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added schematics dialog to desktop menu

Browse Source
This commit is contained in:
Anuken
2019-11-03 08:59:51 -05:00
parent 7ca8ac64a3
commit cf6d2c7593
7 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -27,7 +27,7 @@ allprojects{
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.10' gdxVersion = '1.9.10'
roboVMVersion = '2.3.8-SNAPSHOT' roboVMVersion = '2.3.8-SNAPSHOT'
steamworksVersion = 'ffa83e14c90be0c1977fc75b167bb8d6f3f94057' steamworksVersion = '1e1bd5c7c042f8eb0c23a6daaa373d562f82539a'
arcHash = null arcHash = null
debugged = { debugged = {

2
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -254,7 +254,7 @@ public class DesktopInput extends InputHandler{
table.row(); table.row();
table.left().margin(0f).defaults().size(48f).left(); table.left().margin(0f).defaults().size(48f).left();
table.addImageButton(Icon.wikiSmall, Styles.clearPartiali, () -> { table.addImageButton(Icon.pasteSmall, Styles.clearPartiali, () -> {
ui.schematics.show(); ui.schematics.show();
}); });
} }

2
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@@ -205,7 +205,7 @@ public class MobileInput extends InputHandler implements GestureListener{
boolean arrow = block != null && block.rotate; boolean arrow = block != null && block.rotate;
i.getImage().setRotationOrigin(!arrow ? 0 : rotation * 90, Align.center); i.getImage().setRotationOrigin(!arrow ? 0 : rotation * 90, Align.center);
i.getStyle().imageUp = arrow ? Icon.arrowSmall : Icon.wikiSmall; i.getStyle().imageUp = arrow ? Icon.arrowSmall : Icon.pasteSmall;
i.setChecked(!arrow && schematicMode); i.setChecked(!arrow && schematicMode);
}); });

2
core/src/io/anuke/mindustry/input/Placement.java
View File

@@ -58,7 +58,7 @@ public class Placement{
private static float tileHeuristic(Tile tile, Tile other){ private static float tileHeuristic(Tile tile, Tile other){
Block block = control.input.block; Block block = control.input.block;
if(!other.block().alwaysReplace && !(block != null && block.canReplace(other.block()))){ if((!other.block().alwaysReplace && !(block != null && block.canReplace(other.block()))) || other.floor().isDeep()){
return 20; return 20;
}else{ }else{
if(parents.containsKey(tile.pos())){ if(parents.containsKey(tile.pos())){

10
core/src/io/anuke/mindustry/ui/dialogs/SchematicsDialog.java
View File

@@ -11,12 +11,12 @@ import io.anuke.arc.scene.ui.ImageButton.*;
import io.anuke.arc.scene.ui.TextButton.*; import io.anuke.arc.scene.ui.TextButton.*;
import io.anuke.arc.scene.ui.layout.*; import io.anuke.arc.scene.ui.layout.*;
import io.anuke.arc.util.*; import io.anuke.arc.util.*;
import io.anuke.mindustry.core.GameState.*;
import io.anuke.mindustry.game.*; import io.anuke.mindustry.game.*;
import io.anuke.mindustry.gen.*; import io.anuke.mindustry.gen.*;
import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.type.*; import io.anuke.mindustry.type.*;
import io.anuke.mindustry.ui.*; import io.anuke.mindustry.ui.*;
import io.anuke.mindustry.ui.Cicon;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -118,8 +118,12 @@ public class SchematicsDialog extends FloatingDialog{
})).size(200f); })).size(200f);
}, () -> { }, () -> {
if(sel[0].childrenPressed()) return; if(sel[0].childrenPressed()) return;
control.input.useSchematic(s); if(state.is(State.menu)){
hide(); showInfo(s);
}else{
control.input.useSchematic(s);
hide();
}
}).pad(4).style(Styles.cleari).get(); }).pad(4).style(Styles.cleari).get();
sel[0].getStyle().up = Tex.pane; sel[0].getStyle().up = Tex.pane;

2
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -68,7 +68,7 @@ public class HudFragment extends Fragment{
select.addImageButton(Icon.menuLargeSmall, style, ui.paused::show); select.addImageButton(Icon.menuLargeSmall, style, ui.paused::show);
flip = select.addImageButton(Icon.arrowUpSmall, style, this::toggleMenus).get(); flip = select.addImageButton(Icon.arrowUpSmall, style, this::toggleMenus).get();
select.addImageButton(Icon.wikiSmall, style, () -> { select.addImageButton(Icon.pasteSmall, style, () -> {
ui.schematics.show(); ui.schematics.show();
}); });

1
core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
View File

@@ -164,6 +164,7 @@ public class MenuFragment extends Fragment{
), ),
new Buttoni("$editor", Icon.editorSmall, ui.maps::show), steam ? new Buttoni("$workshop", Icon.saveSmall, platform::openWorkshop) : null, new Buttoni("$editor", Icon.editorSmall, ui.maps::show), steam ? new Buttoni("$workshop", Icon.saveSmall, platform::openWorkshop) : null,
new Buttoni(Core.bundle.get("mods") + "\n" + Core.bundle.get("mods.alpha"), Icon.wikiSmall, ui.mods::show), new Buttoni(Core.bundle.get("mods") + "\n" + Core.bundle.get("mods.alpha"), Icon.wikiSmall, ui.mods::show),
new Buttoni("$schematics", Icon.pasteSmall, ui.schematics::show),
new Buttoni("$settings", Icon.toolsSmall, ui.settings::show), new Buttoni("$settings", Icon.toolsSmall, ui.settings::show),
new Buttoni("$about.button", Icon.infoSmall, ui.about::show), new Buttoni("$about.button", Icon.infoSmall, ui.about::show),
new Buttoni("$quit", Icon.exitSmall, Core.app::exit) new Buttoni("$quit", Icon.exitSmall, Core.app::exit)