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

Reset UI scale to 100% when broken

Browse Source
This commit is contained in:
Anuken
2023-04-08 10:29:42 -04:00
parent f4fabecce7
commit 11ad5a0373
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/Vars.java
View File

@@ -431,6 +431,11 @@ public class Vars implements Loadable{
settings.setAutosave(false);
settings.load();
//https://github.com/Anuken/Mindustry/issues/8483
if(settings.getInt("uiscale") == 5){
settings.put("uiscale", 100);
}
Scl.setProduct(Math.max(settings.getInt("uiscale", 100), 25) / 100f);
if(!loadLocales) return;

4
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -1433,7 +1433,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
l.left();
for(Item item : content.items()){
if(flowItems.hasFlowItem(item)){
l.image(item.uiIcon).padRight(3f);
l.image(item.uiIcon).scaling(Scaling.fit).padRight(3f);
l.label(() -> flowItems.getFlowRate(item) < 0 ? "..." : Strings.fixed(flowItems.getFlowRate(item), 1) + ps).color(Color.lightGray);
l.row();
}
@@ -1463,7 +1463,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
l.left();
for(var liquid : content.liquids()){
if(liquids.hasFlowLiquid(liquid)){
l.image(liquid.uiIcon).padRight(3f);
l.image(liquid.uiIcon).scaling(Scaling.fit).size(32f).padRight(3f);
l.label(() -> liquids.getFlowRate(liquid) < 0 ? "..." : Strings.fixed(liquids.getFlowRate(liquid), 1) + ps).color(Color.lightGray);
l.row();
}

7
core/src/mindustry/ui/fragments/HudFragment.java
View File

@@ -794,7 +794,7 @@ public class HudFragment{
if(!obj.qualified()) continue;
String text = obj.text();
if(text != null){
if(text != null && !text.isEmpty()){
if(!first) builder.append("\n[white]");
builder.append(text);
@@ -802,7 +802,10 @@ public class HudFragment{
}
}
return builder;
//TODO: display standard status when empty objective?
if(builder.length() > 0){
return builder;
}
}
if(!state.rules.waves && state.rules.attackMode){