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

Merge branch 'rework-sectors' of https://github.com/Anuken/Mindustry

Browse Source
This commit is contained in:
Anuken
2018-10-20 17:36:56 -04:00
parent 0555fb22ca b73dc127a3
commit e6f076306f
23 changed files with 269 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
View File

@@ -71,7 +71,7 @@ public class SectorsDialog extends FloatingDialog{
class SectorView extends Element{
float lastX, lastY;
float sectorSize = Unit.dp.scl(32*4);
float sectorSize = Unit.dp.scl(32*5);
float sectorPadding = Unit.dp.scl(14f);
boolean clicked = false;
float panX = -sectorPadding/2f, panY = -sectorSize/2f;
@@ -133,8 +133,8 @@ public class SectorsDialog extends FloatingDialog{
float drawY = y + height/2f + sectorY * padSectorSize - offsetY * padSectorSize - panY % padSectorSize;
Sector sector = world.sectors.get(sectorX, sectorY);
int width = (sector == null ? 1 : sector.width);
int height = (sector == null ? 1 : sector.height);
int width = 1;
int height = 1;
float paddingx = (width-1) * sectorPadding;
float paddingy = (height-1) * sectorPadding;

5
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -151,9 +151,7 @@ public class SettingsMenuDialog extends SettingsDialog{
dialog.addCloseButton();
dialog.content().addButton("$text.settings.clearsectors", "clear", () -> {
ui.showConfirm("$text.confirm", "$text.settings.clear.confirm", () -> {
Settings.clearBytes("sectors");
Settings.save();
world.sectors.load();
world.sectors.clear();
dialog.hide();
});
});
@@ -161,7 +159,6 @@ public class SettingsMenuDialog extends SettingsDialog{
dialog.content().addButton("$text.settings.clearunlocks", "clear", () -> {
ui.showConfirm("$text.confirm", "$text.settings.clear.confirm", () -> {
control.unlocks.reset();
Settings.save();
dialog.hide();
});
});