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

Campaign tweaks

Browse Source
This commit is contained in:
Anuken
2020-10-30 11:50:38 -04:00
parent 784a280bef
commit 76ff55d7f1
9 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java
View File

@@ -38,7 +38,7 @@ public class LaunchLoadoutDialog extends BaseDialog{
addCloseListener();
ItemSeq sitems = sector.getItems();
ItemSeq sitems = sector.items();
//updates sum requirements
Runnable update = () -> {
@@ -59,7 +59,7 @@ public class LaunchLoadoutDialog extends BaseDialog{
table.image(s.item.icon(Cicon.small)).left();
int as = schems.get(s.item), al = launches.get(s.item);
String amountStr = "[lightgray]" + (al + " + [accent]" + as + "[lightgray]");
String amountStr = (al + as) + "[gray] (" + (al + " + " + as + ")");
table.add(
sitems.has(s.item, s.amount) ? amountStr :

12
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -380,6 +380,12 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
stable.row();
stable.add("[accent]" + (int)(sector.info.damage * 100) + "% damaged");
stable.row();
if(sector.info.wavesSurvived >= 0 && sector.info.wavesSurvived - sector.info.wavesPassed >= 0 && !sector.isBeingPlayed()){
boolean plus = (sector.info.wavesSurvived - sector.info.wavesPassed) >= 99;
stable.add("[accent]Will survive " + (sector.info.wavesSurvived - sector.info.wavesPassed) + (plus ? "+" : "") + " waves");
stable.row();
}
}
if(sector.save != null && sector.info.resources.any()){
@@ -416,14 +422,16 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
}
}
ItemSeq items = sector.items();
//stored resources
if(sector.hasBase() && sector.info.items.total > 0){
if(sector.hasBase() && items.total > 0){
stable.add("@sectors.stored").row();
stable.table(t -> {
t.left();
t.table(res -> {
ItemSeq items = sector.items();
int i = 0;
for(ItemStack stack : items){