From 5cf249c8e75e7d2a9f0b1ea3eccee86782705db7 Mon Sep 17 00:00:00 2001
From: heipen <126669219+Heipen@users.noreply.github.com>
Date: Fri, 3 Apr 2026 22:44:37 +0800
Subject: [PATCH] Merge pull request #5595 from Heipen/ui_update

Upd: Battle UI ElvenVine
---
 assets/cn/combat_ui/PAUSE_ElvenVine.png | Bin 0 -> 3761 bytes
 module/combat/combat.py                 |   2 ++
 module/combat_ui/assets.py              |   1 +
 module/exercise/hp_daemon.py            |   1 +
 4 files changed, 4 insertions(+)
 create mode 100644 assets/cn/combat_ui/PAUSE_ElvenVine.png

diff --git a/assets/cn/combat_ui/PAUSE_ElvenVine.png b/assets/cn/combat_ui/PAUSE_ElvenVine.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bd0797ed1bcc02524120d68faf3bd3ee5fe3b0d
GIT binary patch
literal 3761
zcmeIw`8V5H6aerqrHnzxm@323F-r%nt>;*SG?r?uwZu}BTHA6giN+FZQ<N&DEz^XN
zrj<@LXpoW;wa?MgCN*P1o7jyYA+bbaO()VnV&;e3U*0?Kz4P9^pZkg~c)O{oe5(Qg
zfZF+UE`9)@D4EI+E6YoUGsoTK06-me-USkXVy;Yh73;ZbE3J|^yh>VEw5G+`=%bph
zPU?_XTXG6!xl<4b#35b7EC)C;+nYDdcyYY19JThHEmq-2{Van&+Xkz$D|sYx=BP5K
z<TmAW;Z&Ipc7=4Ys&WKh%OTcC-uo|N>$*aiq)6b0j1_{&J3c<KA}*y`FU(feE9i;1
zU(CaqKX+C&S|A%zNnSIU;ER?9LX8y1x#`t#zK~aF)@8}dgXZW;E;!rLoO1fXWe{j@
zr#LPXyetf2*3i<Gdp389l*}A_^RZ0fYVAJXvAc@NLj`(2zBO~N*0lP=<hXr$UD+@J
zj0IEypa&aS;;KQ)S`V3Ifx9<Wze+@=>7l{hJM)9M7hDmZr@0=4&!QkXf>EJxt--3W
zL#Z&xQ7jl-z{g&3+Xv*d0Ra7LpwCm-7`ysC-(Dc(nu&s(7DwPbu>J13E~BONa!e^R
z4+QSq8T!)a5^4_>s9E<G)A(wex7+<>@!DRSF>nX~%<C=)maJ*i@nl=olhqrYp!Qf+
zKjE%bZMhwr>@%=EsXuL()~u4?>sde8@JY$&iynzU14?Y-NB2m)Idjy>688sLH3AaF
zwtwdZ8zO*%1uV%4^P2RWmDw6ZX4cofhEW>gWzQN%c}&t?Tb=wt@z3OJekY$gHi~w(
zX#6zrfqo_X9KHDPriewM%^gES(ULxCL-Fuk;FnXzYpFz^*F>CUcGo_v$VM#=kF2~M
z@&*dSKok!Q7^%t0-(VUL>Ko4Y3!Zmhht0GqN!K4Bd43o5!grTDo`@KHH%6<J-MyY`
zXIj=~Q83#mkI>IJQ-6Ta#Jt8*r;)T2CnDg8A+9dByw13Osv@_)bB5>vV`<Ul4g)|q
z<7Nbbe;;J<pgEz+V39IG#`Pq{eD9E>7z`Y2dp0)|Xa#!E<w_ZMot>fLkla$|pJSzc
zVyO2(D?3`6sG#H<rcst~1mj33MaL$8D=YxLBE8!)C4}x{r{dukQ{uW9=DI`kbu+*;
zKjQ=^#3u$`C-@7%kEC!|YWjBCqHs^iXn{R#{tjdP`X{5bHtmJA&pEWtlSzFwj=}wX
zY%$JXd1JK$@f)Hf1sXKJm5DaFAx$&8#mmT~f%o+9t8-La8%~u~O6*4gB@VNBPi!3^
zl^?l;Oe0%OWK0VfC&%!aOLq)J?23g>oHc){bcFhr_-3gK34(WR^fq>qoh+i+yZR2H
zr1=x6X+n`gxTN`k%$H*%yzNV*a5gIR>id5(sT30~^`Z9(R_NmrqDPs1_EK+g*?a|)
z@UdyRofM_INnDx;eF@LmrLFMcpMO}({sah|gN)*iZ@2n~GNNtP4D*Ne=tER@7{-tD
ziC2|MO^T#;jZWQ3vJn`zv_JH`-5Mzxpml)9#b(qqlBUW+CLj}#3CILw0x|)afK1^3
dDX<p@K7<`c{&nk7h|WQV=Uu&BNKWCo{{mQhLJ$A|

literal 0
HcmV?d00001

diff --git a/module/combat/combat.py b/module/combat/combat.py
index 342aa9e71..c6f21836b 100644
--- a/module/combat/combat.py
+++ b/module/combat/combat.py
@@ -128,6 +128,8 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
             return PAUSE_Ancient
         if PAUSE_SpringInn.match_template_color(self.device.image, offset=(10, 10)):
             return PAUSE_SpringInn
+        if PAUSE_ElvenVine.match_template_color(self.device.image, offset=(10, 10)):
+            return PAUSE_ElvenVine
         return False
 
     def handle_combat_quit(self, offset=(20, 20), interval=3):
diff --git a/module/combat_ui/assets.py b/module/combat_ui/assets.py
index e8de38bc1..79da853a0 100644
--- a/module/combat_ui/assets.py
+++ b/module/combat_ui/assets.py
@@ -10,6 +10,7 @@ PAUSE_Christmas = Button(area={'cn': (1234, 35, 1250, 56), 'en': (1234, 35, 1250
 PAUSE_Cyber = Button(area={'cn': (1231, 32, 1253, 59), 'en': (1231, 32, 1253, 59), 'jp': (1231, 32, 1253, 59), 'tw': (1231, 32, 1253, 59)}, color={'cn': (40, 140, 157), 'en': (40, 140, 157), 'jp': (40, 140, 157), 'tw': (40, 140, 157)}, button={'cn': (1231, 32, 1253, 59), 'en': (1231, 32, 1253, 59), 'jp': (1231, 32, 1253, 59), 'tw': (1231, 32, 1253, 59)}, file={'cn': './assets/cn/combat_ui/PAUSE_Cyber.png', 'en': './assets/cn/combat_ui/PAUSE_Cyber.png', 'jp': './assets/cn/combat_ui/PAUSE_Cyber.png', 'tw': './assets/cn/combat_ui/PAUSE_Cyber.png'})
 PAUSE_DOUBLE_CHECK = Button(area={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, color={'cn': (96, 104, 136), 'en': (83, 98, 118), 'jp': (97, 102, 120), 'tw': (96, 104, 136)}, button={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, file={'cn': './assets/cn/combat_ui/PAUSE_DOUBLE_CHECK.png', 'en': './assets/en/combat_ui/PAUSE_DOUBLE_CHECK.png', 'jp': './assets/jp/combat_ui/PAUSE_DOUBLE_CHECK.png', 'tw': './assets/tw/combat_ui/PAUSE_DOUBLE_CHECK.png'})
 PAUSE_Devil = Button(area={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, color={'cn': (193, 98, 108), 'en': (193, 98, 108), 'jp': (193, 98, 108), 'tw': (193, 98, 108)}, button={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Devil.png', 'en': './assets/cn/combat_ui/PAUSE_Devil.png', 'jp': './assets/cn/combat_ui/PAUSE_Devil.png', 'tw': './assets/cn/combat_ui/PAUSE_Devil.png'})
+PAUSE_ElvenVine = Button(area={'cn': (1229, 32, 1253, 55), 'en': (1229, 32, 1253, 55), 'jp': (1229, 32, 1253, 55), 'tw': (1229, 32, 1253, 55)}, color={'cn': (152, 189, 166), 'en': (152, 189, 166), 'jp': (152, 189, 166), 'tw': (152, 189, 166)}, button={'cn': (1229, 32, 1253, 55), 'en': (1229, 32, 1253, 55), 'jp': (1229, 32, 1253, 55), 'tw': (1229, 32, 1253, 55)}, file={'cn': './assets/cn/combat_ui/PAUSE_ElvenVine.png', 'en': './assets/cn/combat_ui/PAUSE_ElvenVine.png', 'jp': './assets/cn/combat_ui/PAUSE_ElvenVine.png', 'tw': './assets/cn/combat_ui/PAUSE_ElvenVine.png'})
 PAUSE_HolyLight = Button(area={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, color={'cn': (54, 40, 27), 'en': (54, 40, 27), 'jp': (54, 40, 27), 'tw': (54, 40, 27)}, button={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'en': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'jp': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'tw': './assets/cn/combat_ui/PAUSE_HolyLight.png'})
 PAUSE_Iridescent_Fantasy = Button(area={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, color={'cn': (124, 139, 190), 'en': (124, 139, 190), 'jp': (124, 139, 190), 'tw': (124, 139, 190)}, button={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Iridescent_Fantasy.png', 'en': './assets/en/combat_ui/PAUSE_Iridescent_Fantasy.png', 'jp': './assets/jp/combat_ui/PAUSE_Iridescent_Fantasy.png', 'tw': './assets/tw/combat_ui/PAUSE_Iridescent_Fantasy.png'})
 PAUSE_MaidCafe = Button(area={'cn': (1230, 35, 1248, 54), 'en': (1230, 35, 1248, 54), 'jp': (1230, 35, 1248, 54), 'tw': (1230, 35, 1248, 54)}, color={'cn': (159, 145, 139), 'en': (159, 145, 139), 'jp': (159, 145, 139), 'tw': (159, 145, 139)}, button={'cn': (1230, 35, 1248, 54), 'en': (1230, 35, 1248, 54), 'jp': (1230, 35, 1248, 54), 'tw': (1230, 35, 1248, 54)}, file={'cn': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'en': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'jp': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'tw': './assets/cn/combat_ui/PAUSE_MaidCafe.png'})
diff --git a/module/exercise/hp_daemon.py b/module/exercise/hp_daemon.py
index 0170498b4..3320d1fa4 100644
--- a/module/exercise/hp_daemon.py
+++ b/module/exercise/hp_daemon.py
@@ -78,6 +78,7 @@ class HpDaemon(ModuleBase):
             PAUSE_MaidCafe,
             PAUSE_Ancient,
             PAUSE_SpringInn,
+            PAUSE_ElvenVine,
         ]:
             self.attacker_hp = self._calculate_hp(image, area=ATTACKER_HP_AREA_New.area, reverse=True)
             self.defender_hp = self._calculate_hp(image, area=DEFENDER_HP_AREA_New.area, reverse=True)