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

Various blocks added / Crater map updated / Fixed status effect bugs

Browse Source
This commit is contained in:
Anuken
2019-01-23 20:08:28 -05:00
parent 895725df64
commit 9dd6a77c76
142 changed files with 1382 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java
+7 -3
View File
@@ -26,7 +26,7 @@ public class DeployDialog extends FloatingDialog{
shown(this::setup);
}
void setup(){
public void setup(){
buttons.clear();
cont.clear();
@@ -106,8 +106,8 @@ public class DeployDialog extends FloatingDialog{
for(Zone other : zone.zoneRequirements){
r.addImage("icon-zone").padRight(4);
r.add(other.localizedName()).color(Color.LIGHT_GRAY);
r.addImage(data.isCompleted(zone) ? "icon-check-2" : "icon-cancel-2")
.color(data.isCompleted(zone) ? Color.LIGHT_GRAY : Color.SCARLET).padLeft(3);
r.addImage(data.isCompleted(other) ? "icon-check-2" : "icon-cancel-2")
.color(data.isCompleted(other) ? Color.LIGHT_GRAY : Color.SCARLET).padLeft(3);
r.row();
}
});
@@ -205,6 +205,10 @@ public class DeployDialog extends FloatingDialog{
}
boolean canUnlock(Zone zone){
if(data.isUnlocked(zone)){
return true;
}
for(Zone other : zone.zoneRequirements){
if(!data.isCompleted(other)){
return false;
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class PausedDialog extends FloatingDialog{
cont.addButton("$back", this::hide).colspan(2).width(dw*2 + 20f);
cont.row();
cont.addButton("database", ui.database::show);
cont.addButton("$database", ui.database::show);
cont.addButton("$settings", ui.settings::show);
if(!world.isZone()){
core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java
+1
View File
@@ -64,6 +64,7 @@ public class TechTreeDialog extends FloatingDialog{
}
shown(() -> checkNodes(root));
hidden(ui.deploy::setup);
addCloseButton();
}