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

Fixed #4474 / Fixed #4475 / Fixed #4476 / Fixed #4483

Browse Source
This commit is contained in:
Anuken
2021-01-31 15:51:42 -05:00
parent f1a5aae30a
commit 3d201f7042
5 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/editor/MapEditorDialog.java
View File

@@ -263,7 +263,9 @@ public class MapEditorDialog extends Dialog implements Disposable{
if(player.team().core() == null){
player.set(world.width() * tilesize/2f, world.height() * tilesize/2f);
player.unit(UnitTypes.alpha.spawn(player.team(), player.x, player.y));
var unit = UnitTypes.alpha.spawn(player.team(), player.x, player.y);
unit.spawnedByCore = true;
player.unit(unit);
}
});
}

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

@@ -285,30 +285,32 @@ public class MapGenerateDialog extends BaseDialog{
void showAdd(){
BaseDialog selection = new BaseDialog("@add");
selection.setFillParent(false);
selection.cont.defaults().size(210f, 60f);
int i = 0;
for(Prov<GenerateFilter> gen : filterTypes){
GenerateFilter filter = gen.get();
selection.cont.pane(p -> {
p.marginRight(14);
p.defaults().size(210f, 60f);
int i = 0;
for(Prov<GenerateFilter> gen : filterTypes){
GenerateFilter filter = gen.get();
if((filter.isPost() && applied)) continue;
if((filter.isPost() && applied)) continue;
selection.cont.button(filter.name(), () -> {
filters.add(filter);
p.button(filter.name(), () -> {
filters.add(filter);
rebuildFilters();
update();
selection.hide();
});
if(++i % 2 == 0) p.row();
}
p.button("@filter.defaultores", () -> {
maps.addDefaultOres(filters);
rebuildFilters();
update();
selection.hide();
});
if(++i % 2 == 0) selection.cont.row();
}
selection.cont.button("@filter.defaultores", () -> {
maps.addDefaultOres(filters);
rebuildFilters();
update();
selection.hide();
});
}).get().setScrollingDisabled(true, false);
F
selection.addCloseButton();
selection.show();
}