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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2022-06-26 12:10:02 -04:00
parent b25ca6ff33 0698c5dd8f
commit 02e46a9909
37 changed files with 163 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/src/mindustry/editor/MapGenerateDialog.java
View File

@@ -268,30 +268,42 @@ public class MapGenerateDialog extends BaseDialog{
t.add().growX();
ImageButtonStyle style = Styles.geni;
t.defaults().size(42f);
t.defaults().size(42f).padLeft(-5f);
t.button(Icon.refresh, style, () -> {
filter.randomize();
update();
});
}).padLeft(-16f).tooltip("@editor.randomize");
t.button(Icon.upOpen, style, () -> {
int idx = filters.indexOf(filter);
filters.swap(idx, Math.max(0, idx - 1));
if(filter != filters.first()){
t.button(Icon.upOpen, style, () -> {
int idx = filters.indexOf(filter);
filters.swap(idx, Math.max(0, idx - 1));
rebuildFilters();
update();
}).tooltip("@editor.moveup");
}
if(filter != filters.peek()){
t.button(Icon.downOpen, style, () -> {
int idx = filters.indexOf(filter);
filters.swap(idx, Math.min(filters.size - 1, idx + 1));
rebuildFilters();
update();
}).tooltip("@editor.movedown");
}
t.button(Icon.copy, style, () -> {
filters.insert(filters.indexOf(filter), filter);
rebuildFilters();
update();
});
t.button(Icon.downOpen, style, () -> {
int idx = filters.indexOf(filter);
filters.swap(idx, Math.min(filters.size - 1, idx + 1));
rebuildFilters();
update();
});
}).tooltip("@editor.copy");
t.button(Icon.cancel, style, () -> {
filters.remove(filter);
rebuildFilters();
update();
});
}).tooltip("@waves.remove");
}).growX();
c.row();

2
core/src/mindustry/logic/LogicDialog.java
View File

@@ -67,7 +67,7 @@ public class LogicDialog extends BaseDialog{
dialog.show();
}).name("edit");
if(mobile && !Core.graphics.isPortrait()) buttons.row();
if(Core.graphics.isPortrait()) buttons.row();
buttons.button("@variables", Icon.menu, () -> {
BaseDialog dialog = new BaseDialog("@variables");

27
core/src/mindustry/maps/filters/FilterOption.java
View File

@@ -105,21 +105,24 @@ public abstract class FilterOption{
public void build(Table table){
table.button(b -> b.image(supplier.get().uiIcon).update(i -> ((TextureRegionDrawable)i.getDrawable())
.setRegion(supplier.get() == Blocks.air ? Icon.none.getRegion() : supplier.get().uiIcon)).size(iconSmall), () -> {
BaseDialog dialog = new BaseDialog("");
BaseDialog dialog = new BaseDialog("@filter.option." + name);
dialog.setFillParent(false);
int i = 0;
for(Block block : Vars.content.blocks()){
if(!filter.get(block)) continue;
dialog.cont.pane(t -> {
int i = 0;
for(Block block : Vars.content.blocks()){
if(!filter.get(block)) continue;
dialog.cont.image(block == Blocks.air ? Icon.none.getRegion() : block.uiIcon).size(iconMed).pad(3).get().clicked(() -> {
consumer.get(block);
dialog.hide();
changed.run();
});
if(++i % 10 == 0) dialog.cont.row();
}
t.image(block == Blocks.air ? Icon.none.getRegion() : block.uiIcon).size(iconMed).pad(3).tooltip(block == Blocks.air ? "@none" : block.localizedName).get().clicked(() -> {
consumer.get(block);
dialog.hide();
changed.run();
});
if(++i % 10 == 0) t.row();
}
});
dialog.closeOnBack();
dialog.addCloseButton();
dialog.show();
}).pad(4).margin(12f);