diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index 201f4ee..eac90a0 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -45,6 +45,7 @@ setting.weaponui.name = Display weapon info UI setting.select.name = Display select Arrow setting.unithealthui.name = Display Unit Bar setting.ssim.name = Change Bar style [lightgray](made by ssim)[] +setting.shar.name = Change Bar style [lightgray](made by shar)[] setting.gaycursor.name = Enable mouse trail effect. [lightgray](only for desktop)[] #Dialog diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties index 263c8f3..dcb81b4 100644 --- a/assets/bundles/bundle_ko.properties +++ b/assets/bundles/bundle_ko.properties @@ -46,7 +46,8 @@ setting.infoui.name = 정보 UI 표시 setting.weaponui.name = 무기 정보 UI 표시 setting.select.name = 선택 화살표 표시 setting.unithealthui.name = 유닛 바 표시 -setting.ssim.name = 바 스타일 변경 [lightgray](ssim님이 만듬)[] +setting.ssim.name = 바 스타일 변경 [lightgray](ssim 만듬)[] +setting.shar.name = 바 스타일 변경 [lightgray](shar 만듬)[] setting.gaycursor.name = 마우스 꼬리효과 [lightgray](PC 전용)[] #Dialog diff --git a/assets/bundles/bundle_zh_CN.properties b/assets/bundles/bundle_zh_CN.properties index 903015d..be2a005 100644 --- a/assets/bundles/bundle_zh_CN.properties +++ b/assets/bundles/bundle_zh_CN.properties @@ -13,6 +13,7 @@ shar-stat.power = 可控制数?: {0} / {1} # Settings setting.ssim.name = 更改条形图样式 [lightgray](made by ssim)[] +setting.shar.name = 更改条形图样式 [lightgray](made by shar)[] setting.select.name = 显示选择箭头 setting.gaycursor.name = 启用鼠标轨迹效果。仅适用于电脑 setting.wavemax.name = 要显示的波数 diff --git a/assets/sprites/ui/barS-top.png b/assets/sprites/ui/barS-top.png index c09a4c8..81363a3 100644 Binary files a/assets/sprites/ui/barS-top.png and b/assets/sprites/ui/barS-top.png differ diff --git a/assets/sprites/ui/barS.png b/assets/sprites/ui/barS.png index 2433420..69057bd 100644 Binary files a/assets/sprites/ui/barS.png and b/assets/sprites/ui/barS.png differ diff --git a/assets/sprites/ui/barSSS-top.png b/assets/sprites/ui/barSSS-top.png new file mode 100644 index 0000000..c22f8a1 Binary files /dev/null and b/assets/sprites/ui/barSSS-top.png differ diff --git a/assets/sprites/ui/barSSS.png b/assets/sprites/ui/barSSS.png new file mode 100644 index 0000000..fa3902d Binary files /dev/null and b/assets/sprites/ui/barSSS.png differ diff --git a/src/UnitInfo/core/Setting.java b/src/UnitInfo/core/Setting.java index 82d2443..d6d919e 100644 --- a/src/UnitInfo/core/Setting.java +++ b/src/UnitInfo/core/Setting.java @@ -288,6 +288,7 @@ public class Setting { addGraphicCheckSetting("select", false); addGraphicCheckSetting("unithealthui", true); addGraphicCheckSetting("ssim", false); + addGraphicCheckSetting("shar", false); addGraphicCheckSetting("gaycursor", false); } } diff --git a/src/UnitInfo/ui/SBar.java b/src/UnitInfo/ui/SBar.java index ca7b34f..51f8d48 100644 --- a/src/UnitInfo/ui/SBar.java +++ b/src/UnitInfo/ui/SBar.java @@ -58,6 +58,7 @@ public class SBar extends Element{ boolean valid = true; if(fraction == null || !valid) return; boolean ssim = Core.settings.getBool("ssim"); + boolean shar = Core.settings.getBool("shar"); float computed; try{ @@ -81,12 +82,16 @@ public class SBar extends Element{ blink = Mathf.lerpDelta(blink, 0f, 0.2f); value = Mathf.lerpDelta(value, computed, 0.05f); - NinePatchDrawable bar = ssim ? (NinePatchDrawable) drawable("unitinfo-barSS", 14, 14, 19, 19) : (NinePatchDrawable) drawable("unitinfo-barS", 10, 10, 9, 9); + NinePatchDrawable bar = (NinePatchDrawable) drawable("unitinfo-barS", 10, 10, 9, 9); + if(ssim) bar = (NinePatchDrawable) drawable("unitinfo-barSS", 14, 14, 19, 19); + if(shar) bar = (NinePatchDrawable) drawable("unitinfo-barSSS", 25, 25, 17, 17); Draw.colorl(0.1f); bar.draw(x, y, width, height); Draw.color(color.cpy().mul(Pal.lightishGray), blinkColor, blink); - NinePatchDrawable top = ssim ? (NinePatchDrawable) drawable("unitinfo-barSS-top", 14, 14, 19, 19) : (NinePatchDrawable) drawable("unitinfo-barS-top", 10, 10, 9, 9); + NinePatchDrawable top = (NinePatchDrawable) drawable("unitinfo-barS-top", 10, 10, 9, 9); + if(ssim) top = (NinePatchDrawable) drawable("unitinfo-barSS-top", 14, 14, 19, 19); + if(shar) top = (NinePatchDrawable) drawable("unitinfo-barSSS-top", 25, 25, 17, 17); float topWidth = width * value; if(topWidth > (ssim ? Core.atlas.find("unitinfo-barSS-top").width : Core.atlas.find("unitinfo-barS-top").width)){