diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index 09da95f..70e557c 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -30,7 +30,7 @@ setting.uiopacity.name = UI background Opacity setting.baropacity.name = Health Bar Opacity setting.coreuiscaling.name = Core UI Scaling [lightgray](need re-load the world)[] setting.waveuiscaling.name = Wave UI Scaling [lightgray](need re-load the world)[] -setting.uiscaling.name = UI Scaling [lightgray](need re-load the world)[] +setting.uiscaling.name = UI Scaling [lightgray](need restart game)[] #Dialog editmaxwave = edit waves(int) diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties index f6a5e1c..7ddcd7e 100644 --- a/assets/bundles/bundle_ko.properties +++ b/assets/bundles/bundle_ko.properties @@ -30,7 +30,7 @@ setting.uiopacity.name = UI 배경 투명도 setting.baropacity.name = 유닛 바 투명도 setting.coreuiscaling.name = 코어 정보 UI 스케일링 [lightgray](월드를 다시 로드해야 합니다)[] setting.waveuiscaling.name = 단계 정보 UI 스케일링 [lightgray](월드를 다시 로드해야 합니다)[] -setting.uiscaling.name = UI 스케일링 [lightgray](월드를 다시 로드해야 합니다)[] +setting.uiscaling.name = UI 스케일링 [lightgray](게임을 다시 시작해야 합니다)[] #Dialog editmaxwave = 최대 단계 수정하기(정수) diff --git a/src/UnitInfo/core/HudUi.java b/src/UnitInfo/core/HudUi.java index 2c5d064..3e4bb2b 100644 --- a/src/UnitInfo/core/HudUi.java +++ b/src/UnitInfo/core/HudUi.java @@ -614,6 +614,8 @@ public class HudUi { t.table(tt -> { tt.defaults().width(Scl.scl(23 * 8f * (settings.getInt("uiscaling") / 100f))).height(Scl.scl(4f * 8f * (settings.getInt("uiscaling") / 100f))).top(); for(Element bar : bars){ + bar.setWidth(bar.getWidth() * (settings.getInt("uiscaling") / 100f)); + bar.setHeight(bar.getHeight() * (settings.getInt("uiscaling") / 100f)); tt.add(bar).growX().left(); tt.row(); } diff --git a/src/UnitInfo/core/Main.java b/src/UnitInfo/core/Main.java index c98f861..a893e74 100644 --- a/src/UnitInfo/core/Main.java +++ b/src/UnitInfo/core/Main.java @@ -50,7 +50,7 @@ public class Main extends Mod { Groups.unit.each(unit -> new FreeBar().draw(unit)); if(Core.settings.getBool("scan")){ - float range = settings.getInt("wavemax"); + float range = settings.getInt("rangemax") * 8f; for(Team team : Team.all) { indexer.eachBlock(team, Core.input.mouseWorldX(), Core.input.mouseWorldY(), range, b -> true, b -> new FreeBar().draw(b)); diff --git a/src/UnitInfo/core/Setting.java b/src/UnitInfo/core/Setting.java index 2fe4c8b..83d0094 100644 --- a/src/UnitInfo/core/Setting.java +++ b/src/UnitInfo/core/Setting.java @@ -165,7 +165,7 @@ public class Setting { addGraphicSetting("commandedunitui"); addGraphicSetting("unithealthui"); addGraphicTypeSetting("wavemax", 100, "@editmaxwave","@invalid", 200); - addGraphicTypeSetting("rangemax", 10, "@editrange","@invalid", 1000); + addGraphicTypeSetting("rangemax", 10, "@editrange","@invalid", 100); ui.settings.graphics.sliderPref("coreuiscaling", 100, 0, 100, 5, s -> s + "%"); ui.settings.graphics.sliderPref("waveuiscaling", 100, 0, 100, 5, s -> s + "%"); diff --git a/src/UnitInfo/ui/SBar.java b/src/UnitInfo/ui/SBar.java index 17a99cd..7194c43 100644 --- a/src/UnitInfo/ui/SBar.java +++ b/src/UnitInfo/ui/SBar.java @@ -12,6 +12,8 @@ import arc.util.pooling.*; import mindustry.gen.*; import mindustry.ui.Fonts; +import static arc.Core.settings; + public class SBar extends Element{ private static Rect scissor = new Rect(); @@ -149,10 +151,11 @@ public class SBar extends Element{ Font font = Fonts.outline; GlyphLayout lay = Pools.obtain(GlyphLayout.class, GlyphLayout::new); + font.getData().setScale(Scl.scl() * (settings.getInt("uiscaling") / 100f)); lay.setText(font, name); - font.getData().setScale(Scl.scl()); font.setColor(Color.white); font.draw(name, x + width / 2f - lay.width / 2f, y + height / 2f + lay.height / 2f + 1); + font.getData().setScale(Scl.scl()); Pools.free(lay); }