From d72b9cd2086885cdfde95db2f37234d1e2caf585 Mon Sep 17 00:00:00 2001
From: Sharlotte <seeseafood@naver.com>
Date: Mon, 19 Jul 2021 16:41:24 +0900
Subject: [PATCH] add new sprite

---
 assets/bundles/bundle.properties       |   1 +
 assets/bundles/bundle_ko.properties    |   3 ++-
 assets/bundles/bundle_zh_CN.properties |   1 +
 assets/sprites/ui/barS-top.png         | Bin 267 -> 253 bytes
 assets/sprites/ui/barS.png             | Bin 254 -> 243 bytes
 assets/sprites/ui/barSSS-top.png       | Bin 0 -> 471 bytes
 assets/sprites/ui/barSSS.png           | Bin 0 -> 412 bytes
 src/UnitInfo/core/Setting.java         |   1 +
 src/UnitInfo/ui/SBar.java              |   9 +++++++--
 9 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 assets/sprites/ui/barSSS-top.png
 create mode 100644 assets/sprites/ui/barSSS.png

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 c09a4c84a7af6fbb0ea955580b580b6763d6a378..81363a34f8417ac9fc5ff7fda94e587c24ae3f67 100644
GIT binary patch
delta 196
zcmeBX`pY=Mv7R%)C&cyt|NjS%oM&KQm=<@19Y`^k1o;L3|Icv!6t5$Y%UR$NS<Jw|
zcL;<TMK!z{fP#6RE{-7<{%=nPiZv*3um+a?@8(Mh5Xohn`)u)(yO-{9McL$K+9~#`
zY9wsrP5oB$bo=p~`*Yrkn_T06K2Ou#Z|d`v@yYXTuS97dpY>*ucvy&S(eZWcW+uKo
vi=?f0>Dd&l_|%h|l`?I`<ef_wth^>S!-Z)_1%uxvpw$eXu6{1-oD!M<^V3c=

delta 210
zcmey%*v&M-v7RTuC&ZP3f#LuE{|Aqp2Qn0{a0LP>mXaX9V4xs_gVxF~Kt5-IM`SSr
z1K(i~W;~w1A_XW|;pyTSV&VVxlBZCE0uO6o%kTR)dFBeR=qKFdKK*C=(%v<K%ftSy
z?}(nom8s*(*snX)GRajk-EOzh)g1HG2=1pf-p@{LRKNAZ_G|Xr?q9!5s@^a9^fWH$
zN_lCDbM<8QGLyTKCACEgyNZ%l6m=SwCN5jlD!F83b@Cm%No*?@FH<}KbOeK^tDnm{
Hr-UW|;RII;

diff --git a/assets/sprites/ui/barS.png b/assets/sprites/ui/barS.png
index 2433420641666c6b38af0a98c2c130ffe14e8a8d..69057bd859ae3b3244e3f8ddd719a210b8c8247b 100644
GIT binary patch
delta 186
zcmeyz_?dBnV?A4dPl)UP|Nj{n7(x$St^-m`B|(0{{~4ZcH}C@TI14-?iy0XB4uLSE
zsD@VqP%y*O#WBRf|LvrMj0Y4rj+FdgsvWl?WC{0{N(Ghp=z8TV&kFdjc^Mfj6k>U|
zF5|fFdA=xP<#?A=={eS`WF%LwQU53PGhyxLKjERq&-~|o<}ve&tUEX7V%4`d)4tCv
lTz#ykvo!UcV}$VD_-*GH&CRwfnFO?y!PC{xWt~$(69B1}OD6yT

delta 197
zcmey&_>XadV?AepPlzi61H=FS|AA!jvF1V`#at5P7Yr1*eu~!-$mJ~Xh%9Dc;5!V$
zjK}j=qyPo;JzX3_Ed1YIG88+Yz`+vu_%FX~i(_EV%g;tr-{k9V4e!`2dT;u1UEbCx
z9Y@CQwc4AHcNz8Nn5A~TTzAUg`Kg_0rzQ&P+S!!<mHNHNuD(~?_TTEq^F;#g7TxwW
tUt>J$M%eXM$=!ZuL`)2tO-#aH^KSUd>ZN|a{WZ{T22WQ%mvv4FO#ni~Pz3-0

diff --git a/assets/sprites/ui/barSSS-top.png b/assets/sprites/ui/barSSS-top.png
new file mode 100644
index 0000000000000000000000000000000000000000..c22f8a1ba17c75ddb6e431ad0b3f1598f91eb487
GIT binary patch
literal 471
zcmeAS@N?(olHy`uVBq!ia0vp^)<CSr!3-pQHwzyDQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`IRkt`T>t<7fAGk8Aa7dS6?P!SToU9L{Qp10^;5h+wG5mE9+AZi419+{
znDKc2iWH!s9-c0aAs*gKCo<+8HsE2N{O|w8$sW5Fr7S-j#^ifs&brfgUVr^x@_kd)
z+7<3KeOsQ*z93<nY4Mn~yXrvXNB22`vrl@MuJbu_qvC$&J8L(cN~^FJVz#TL`&Qps
z<o~MeF`u~WmRDyESl-OLl2py+7oNOqqb+m&%TI5Vf8^H{*ILW12>Poae7nrf@v7vb
zqBDoK$<AN#_4LbaOF!INHrq7)iR~7PX<Fin)~98)O}Sj79M#gYqL$~c|9|d?&(1~a
zS5tzY5@FjqdB5ZG&llc1T%2|LW9q6D|4mo6&DC$>YWr?=GNkq5=40yHkIFsi41Ae(
zRx<JFnl~2fPP?Aq+qC*XSMQzY<-69{Kb~PIUb1o0(z2c%vk%RFy5@!F;hE3at_n0x
i3+yi`-BEw?^;hO7Ne<KGAO4`oVeoYIb6Mw<&;$U%S<~YH

literal 0
HcmV?d00001

diff --git a/assets/sprites/ui/barSSS.png b/assets/sprites/ui/barSSS.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa3902d434e8a762c6e0de7d54ba133b6e1aa87d
GIT binary patch
literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^)<CSr!3-pQHwzyDQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`*#dk*T>t<74`hZOx?BgOm`Z~Dg8wr--EQCo<Z%{wL>4nJ@ErzW#^d=b
zQh){udb&7<cz7S}X6!obz{5QGfBml%?_OP1ktjZ^30vQE_I<A2Q@!SE#X{LPJUO@P
z%X(iV?YiOpe+BdA8|u%}QmvwnimyCb9G+RAD^a;irdd!*Kh3^)&itkeGw!~1eI7aa
z!qjW~BaYwYjEy~d=+4{=_HWKbz4Ns+d9-Hkwo<3?L&rml*9c2Zz8m%PT|&#T?wk3}
z-($*j)w~#^XI*(xziWEz$3t5ap1dsLam&~<<L{ZmIxeT=vhCt?(|w)7qy8t!maCVP
zigFj1JN@5aoxRii>4lEXWw)+z#&XJspWWz};Zv6VbT`;h`+4sc-`ra9F3r+3GO#Rt
zqyL$+=W<2MBgHSb>Tcj#klkAL;OdLILzVv+%^jE*-`(N_3SkCMS3j3^P6<r_)R(OR

literal 0
HcmV?d00001

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)){