From 19497ebb6a16bf6f13b322906cc29cef3c746b6e Mon Sep 17 00:00:00 2001
From: Hengyu <h3ngyu@gmail.com>
Date: Tue, 15 Aug 2023 04:16:31 +0800
Subject: [PATCH] Add: event page

---
 assets/share/rogue/ui/PAGE_EVENT.png  | Bin 0 -> 7184 bytes
 tasks/rogue/assets/assets_rogue_ui.py |  10 ++++++++++
 tasks/rogue/blessing.py               |   5 +++--
 tasks/rogue/curio.py                  |   4 +++-
 tasks/rogue/ui.py                     |   3 +++
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 assets/share/rogue/ui/PAGE_EVENT.png

diff --git a/assets/share/rogue/ui/PAGE_EVENT.png b/assets/share/rogue/ui/PAGE_EVENT.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9c6abbff653cc144d88e51291d78d5a0d480600
GIT binary patch
literal 7184
zcmeI1hf`Bq*M|?qOX!G5DAI+CiZrp&1(Ap#5V~}b9thGy2`FF#0i}c%iZtocF;qpG
zp$JMZp$7;MS_qvl_kQop`$xR4nKS#$IWv3qde+{*v(`Fq^d4(6Gw?6~0KohZavur+
z=P0+-KS9)#K~+GDiZal9Ld?7YfbqgV7Zs42&IJGrIxgz!dV0=qAGo(O+*9zOy1JmJ
z7u?YW<^TWz<7fka(|9tcGLG!PYOFT8S%HE*2ZTjRKwWHRAK5+twh?UXs_l`l8H_nD
zo==AueSa~;071W=%M!15y7%_=lPDvLI~xL%1vMdo#P#)~k)uX@I{vs1(a#!oo?Yzy
z(nnX|E;Le6epDb<7xKNkDUA9eWQJCdZ3+9$>0CPiY|<bCkUpPPj;YGw05#w_Bzc*=
zbM`D8qbFtp2)+kqgxT?oRB=$COVY551L)!cJ{wd$WdITY0EP%w69$TyfwkR-%IAR5
z!uUxrF#7RQAqaR!1*C{;UZz%U0Bnq&LnWwNzX4e#s=|`Atz}eUX0@`K)L~8M0KXX1
zI962~AS^{qq6ZMXLk+0&U+AR~)TYUj9&DK@wDydwhfo2n*u-Acqrn>-^@%@u{I@q}
z=7i?H!79{j!B^NE=@*34QE4I<Ab1+>J|+O*IT-kQdPgM=zqByB<cNn6ciTUnx^2RR
zm4&u&r;X9nv;f=Ve&V?G;^HukXD8KX-xjw*b70&UaK;^2-k6}zdcyEC@E{6t=UA0L
zBU`Uak?#@%BjdWLU3Qc7e3bIpjam3i6mpO9_H-g}6L^-Yno`=D6Mpi{*2Aw18iU8u
zs>yhe@gk?4k)bCsR|e+fDl8-}zTGl?Q?Dni(~0;3eScr5J8_PEB~*4xAnAlY-k%vL
zd8ym_xR$O43u{GgP*F#*m=5{@s>q$|(L9Xr0X8Q&Sp*pX;#&@4Rj*M2y{O!I0BBt1
zviOt$*6siS!2PV}S3lpQWBSTb(#n$lm9McCOl|wueO0E*t%_`Fe=USvV#wx7y2owU
zDnCkF^O=Sx>wM}gTlH6&JIweQc8li(Pw-zhTp8cE8eh`W-s=KguoaSjecmo+RJacW
zPKluvwuQ)j2+I{*dCj3O+}`DtOI@hu`rZ;EvVGl)<L)~P)x)@nE<xG1$8Q@oWfGoO
z>eKwD_Er7zNr2~VN0#@1j~uIISkgzg0iJ4prLfwM1p|+keSLtCw=wo%12Qa*(POq2
z(XTXY-k9=;b#mG-n%*>yy=l*9dfV?JZ)=7v5p<b4D(u1<$SQ*E8|+0~oTjO^sro0;
zHIZs|49J8&JVNH%-@@^qbgM-J*$=)4*vVJKnLa2H+YsUx$`G~so8^LaJmfM<_lJeY
z3__xDvJV*_x<Mu&*K-YWl?T~e(zV41aqivI3!uud5<%4ax;WN2-493IZ3}fA^6jtZ
zwCO)yhUO-)Yu$8ES)|R&lvPW~D$?&Q%=ir|dM%&%<e__(pPrP#tHKL%zNw<UX`JfV
z-0L|*KT}<tT*%H+D?S+dsc?P`)KAo)+cMn>ekFX@pNaV;b9g7jPMq6~JBYi0tBzYL
zMLYl8FH}mGq4bC>Z;DegYckx(^y=Q#;EV5nuqVnV8YdzX@kNG4-bN}zh$2SAVk6dK
zE8~#-2S!zT^M&-kIg5u1`HUJ0Z<X~y{h_gX{rc89&DJL`4(*vMUq(L2dI`xfw6E*n
zeka7)A?vVZsy6IpOhb@xOV+V7uRK`O_B(gP>n9bYZJ_R5<XGbP-Vwd@te1+Vqhe<B
z?pV53pHLrjU(j`$>nhhPhFwb?OOd6w#{<Wk$L-d=);ZS+<3wLiv?^KxO_Fz)C;QT4
zZejE>k(deJ{#E5)_5{QVJ?RIDWo2qWljOdeLjtc7hlv9Mx25Gkx8k^AGI#7Zd*bYu
z-I87E2R0*SKb^-qW8Qyv&KY=^^LM@2#w(}!n*m^D#}fD@yAru+he<a@TRRuoiQMnG
z?F-FUdK27I9WevdzkGUnx+Eq`MoYTaV(t#5yJgrmk2Ovlzl+S%NN?AQx)s%#G@cZU
zJ(r}DL@r4-RyIZ$lZ;179u8X&Bna-qCNMo-lQgC@`7~_pr_!|2?|y0SIF31v*eioq
zNCqC`GHb_c3~Q-tf34r$v)vQjbKmRd>$$|vH>}{J5bWjS+v5lGY$W8)%C!}KFKk;e
zapHB#_D1jA1m{1B!?L6NP+$Z1g0}@8nSt2EMV<}JV9hU5PFh3SWa*gu@2MW8_K@Nu
z9mzD_Zp$_$;=SEXvgzEjo_TaZTEVxSIJ}gVpOu-_Q4_yzRk~Qlu(W&E#CP+VCTx(6
zyt0zRVc!aka)&Z?W?<&4=KN-1oKmw0au}I{q&v<yQaHq(#O}AuBDOiV9-p(J`bxD(
z)%2X_c@>QtjR0*5Z64jtbMMYI{3XStd{K>wp4m*mD<0ko-sU~9zcJ|~kveek2MB%f
z3GbnFkC-<9@cEdR{U9705}tpcz0y+)dOf2FdtEQ!!kq#>2;sPLRklcSRlnN6=a~;#
zVz^|%?8vDpW-GQZ`isJZYps``Q;91K3bS8Js}HL$s(&8vYF}du#qM+AGX46Sh3})^
zmEO#IQ{!Q&H_{hU4U>HA%N8d;egQA7^kFmn70qs%#RcDqOlC(_sw{>Js_98_=`I#{
z=<r?Gj!28t)oA|s?xTK1UA>m#hb6Re;@+Jpg%I^a=a;$<d^>K?>q4&~-gAHWBC?}n
ze1CYlq<`$$*!8;!=?UpMP-d5;>T4s?b>elpj@PcmGcO>P+<)-KzxqL55IOMPnYajx
z)E>yGhL-8EaB53^x)xy0WgbuuX@WfYeFNusx_ThO_<}RIDekjg{pYID`T(=78Q~U<
z22PPE1F*lOj3pHFG{9wZFa+z2txP)6n=^$PZMz~Sw_~8;gL!%C*It;&B^D-hV?D}t
zpM0^uXq))di0FzMGB*yr3Qn{x@htgNw*UD-{nDJtW9y+{62g6ad|IpS$2tK*$R&7`
zkj+}kwVGV-4gGw%$z002^=^^Z+FfhfCp*xU6w_PX`=giUrtQsj^Pbw0iS6uLIeUTV
zP)n@wNojFi^O)H9aLbf`&<;yD-$jLKV!~Qu&9wj%w<e7clE>i2i>X*1J6=r75^}0u
z(_gneBQ_{6h;C1VNO1Lm!zRmHS}N(?p|{@gL*zXd)5756Y3r%}HJ(qdvV6O@`1NmG
zesIvd-g0(d+hkiWE+w>%1R_8X*9PTVd`qt9xMwM4HxZYkbI^QNe45R5XGo&VyuEMd
z%~+F+EVQ`N*1^Jy`1yjT1sUkaDoVdoCJ|)q;}kbbeaj{%_5KVMu+N5eoi(|8XBr=C
zx!LHsD@?YV5UqPus#K<=iS#^~g_N7a2@YiJx`|?$&#n$ZVSxB6^w70+$a`deMA9-7
z(M0T6<E`@$o4QmliXrX$?X83T88);hEdyf%%8#4JPgdy;Syw}=Pb(Z+-Dmb~T5bB<
z%vgym^sh2b6V86UnjO^a(Hs(aAo4C2Eg-<l%+s{}v@d?Ppt9gX{|}_`8G_(ljK`hK
z9X;wdJs#a;Jc#OVDMJ+QcoB;W%jG*oIt3d05K3G5$EAG}A;fwj2G`jnkRpDpdaAcG
zaA@CI@Kcwpj1N9NmLf;&9ElEQ-k@Zgg7y%o4gds-0zg<e034iA#uWhYl?H%S8vu|`
z1^_VpgLV4@064Go@cuo+fbq4dNARakPv|zuN~o(7i*6G!3Vw&Fj1b6mTDvf++%du2
ztoyGWzVlSfU)ZEFeWqX8C6O%X5XZ(YeO@iTTfAzKH!jy{aD8RNr-2VeH1hQz+74)U
z$@YGmZzt9j4PF_Vlj18p4b0pzq~s)j><@uI1pW~CL*NgA|8W8>_w{K3!1HU8v2kkA
z)wjYCKgl6lE*>5p?*CeKb%Mi~jdWLKNl{T5A^+D(fTFSjT2AMeT<=J;n1a$>HnCvu
zNXjR5=Eb6r6n<%<R_Ds1S#8tF-0<-5-1gv8*}IAXsnFD+sxrb`JLyX-b=Hj)NQWu{
zW@>7xGnU`MEa@`nOzLqM6)^L$RHEFWB2!x|Dk>^1E$udZx}<1z796`rCRddZkD3V$
zY-%7gkkHGo9UUF(6Lk$`3OunyTno<UENF;cS`lUOuO~|{cZ8U$?gT6jp=)Xq=c}5g
zGS7CMgFiUQ)FQOaeqgxld!W%Lg3LwTyPKQ!Jy;T$t}QYkz$-}&T&dUZ_>J})r8g#7
ze(!FNJ>qC@y|lPkH$xGz>0C!4@Xm51?^bR?YV+eOdB5`#?9yJb73Fisb}j~wPfo63
zj+d9kv0mr6GNPRRb;v<y6vG3D^$YO#u<-L|Jgz!8(7*L*6%*sYtM)qNJsttsxssPJ
zt_Je<X7shhovj>53s|&ZkhiAO(h(WwGj@h4y*j|+GuJ$Y=GfR+QxF-d#mLAg6p`;@
z7i}FflOlo5Xj(pMCLR?PZA>@u+6T`@g10B{{4L%}3F?>YWu;8U^ZopxUZcSXe%;kt
z4~*Dun=<ouV6sv8Pm~N(rD9$)zfZ4M3V8~#Rv?oQ^5g7iI-G>&eP*b|o)LB4835`j
zg|2wV9rR-q%0x3~z~?X&4@IOE6}j%1j`$`y6c-mW9(YP~Mcbhq#$X?Ye9?oKBR)4b
zH=k`X+P<Ksw7pOxOG`^D``E<DUX_q}|LNeJUX$7?Hnr(Gp$PKnR$Hv{;d0A{la6`Q
zVeyDn=m|;XEFNVa-Nt4gojI*?x<4O#wnFD$5Hz0{iFo+UTZWpMl0CZH+GZ0l;o;%r
z>7zP-Tu9wvDq*BtB_xotsOV>KI6NpQ$it&d{H<a?D=RB5^z4KfdiJWbv$JXp=Iw3p
zAq$`ZS{F|*W<>t>bD!!N><B$xp0++AwQT5GGwkdbC50TBm!E72oOFCzF+SXPf}hS3
zafliwJVIVce*N?mO+4A5i_N@Lo>^e%Fs3!~Us{L^JmM5q=dHC8&Whwx+sC%-_feuJ
z=m>8j8CwKejF5QY$9r>gb`!O+0xGA|L1zc?nZc=pfgqs{Qw|Nwkq;602GV_sEP>aS
zdd&-!@5)~?nUW@D6Xs5)PJXpjDfl;6$%R%*^8_FD)!>e6NWA8@$t-)UtNzocuR_lT
z78;)<Gi~3wy+(I3z7z=V^Y_mLUEr{xM6%JZ*81(#Q$_xfDZvP7aXTX;@&?k+XLpy}
zO!CUW%Oq;(`?wg7kZ{LS6Dp@$c*|NId+oNbHqy)X4HXpwBTlRW8;t*%DizbTH#fWx
z>?f}y6d}nQX_xKV20j|XlQX9e6IJRf^-V%*{P!1e%{zN7$20XSV5j077k;%%J|SG3
zQ6qj<$laN(+1cmP_o)5?!mw`Dp96gDMf-Qc=gmObgsKGS`G)SN+s@?p`S~2&NvXN}
z1d`l9MDEYxbs9`L+N--NC5j1UMMdVf;SOfCXA57)R^CX@rbP);Dh<ZkS`6|iuM~|&
z>u#)XtgrWuQ$)>bS14jMDFheGIgBZLWXrAwc_zojw7Qflfh}`Ep-`bGeTfuJ(rj4#
zI#5QLYUehDa)buPYx!b3eJ!mU{M<b}B(arT_8_7Dol1#UZL?2hSB{$9Cu-f*L3li#
zB8fT%NsD`Xdz6Fvt3cO4ixNmXS{{m)jC&$IWYLB?H(KheD>3rQfvFBxSk2bd*9=xu
zCEV;`m0Xov+oMcThMet_S;32mgq(rRU%E)E-tA_%<B(zUznfK5venxg!SrjT+I769
zrUvb%5a0bYQ2F{>;k~V5n%M*>j@&<8W@#3>UNiC_Y9}*fZ>)Rk8ICOTltKFc)qru+
zQ%DM%|A+(|u32|R?hfuf!ajObNPv#u5mp=;`Wy~sl9G}hFjz@>Ij-^9$=dG1bpHmQ
z03SJovNx0ai~b>8Ma%e)M}yl>dJYx)4JQ07O_CP-`uc{7O(-&Cz$COAf;;=T#HsNf
ze-KW`O406yG6H4;jM~nbmx`okpp<|XtJKFZf%Osp!6l8Bii!$9hinP#!9k@2wy21O
zg=KG#B{iR$<C>9Cp5&1$*(iEzd7)7HpPv|i><@uI1pY%H%=*O{H(<pqd;dPSEB!wY
OA8I_lU#4dB;{O195iZRD

literal 0
HcmV?d00001

diff --git a/tasks/rogue/assets/assets_rogue_ui.py b/tasks/rogue/assets/assets_rogue_ui.py
index f534400cd..93aaa0bb7 100644
--- a/tasks/rogue/assets/assets_rogue_ui.py
+++ b/tasks/rogue/assets/assets_rogue_ui.py
@@ -73,3 +73,13 @@ PAGE_CHOOSE_CURIO = ButtonWrapper(
         button=(988, 17, 1028, 57),
     ),
 )
+PAGE_EVENT = ButtonWrapper(
+    name='PAGE_EVENT',
+    share=Button(
+        file='./assets/share/rogue/ui/PAGE_EVENT.png',
+        area=(983, 485, 1007, 509),
+        search=(963, 465, 1027, 529),
+        color=(51, 48, 42),
+        button=(983, 485, 1007, 509),
+    ),
+)
diff --git a/tasks/rogue/blessing.py b/tasks/rogue/blessing.py
index 47a160ce3..b31c817cb 100644
--- a/tasks/rogue/blessing.py
+++ b/tasks/rogue/blessing.py
@@ -119,10 +119,11 @@ class RogueBlessingSelector(RogueSelector):
                 Case 1: back to main page
                 Case 2: choose curio
                 Case 3: another choose blessings, but no blessing is selected when the new selection page loaded
+                Case 4: event ui
             """
             return (self.main.is_in_main() or self.main.is_page_choose_curio()
-                    or (self.main.is_page_choose_blessing() and
-                        not is_card_selected(self.main, target, confirm_button=CONFIRM)))
+                    or (self.main.is_page_choose_blessing() and not is_card_selected(self.main, target, CONFIRM))
+                    or self.main.is_page_event())
 
         interval = Timer(1)
         enforce = False
diff --git a/tasks/rogue/curio.py b/tasks/rogue/curio.py
index 8589b75c5..40c874123 100644
--- a/tasks/rogue/curio.py
+++ b/tasks/rogue/curio.py
@@ -29,6 +29,7 @@ class RogueCurioOcr(Ocr):
         if self.lang == 'ch':
             replace_pattern_dict = {
                 "般": "骰",
+                "漂灭": "湮灭",
             }
             for pattern, replace in replace_pattern_dict.items():
                 result = re.sub(pattern, replace, result)
@@ -54,8 +55,9 @@ class RogueCurioSelector(RogueSelector):
         def is_select_curio_complete():
             """
                 Case 1: back to main page
+                Case 2: event page
             """
-            return self.main.is_in_main()
+            return self.main.is_in_main() or self.main.is_page_event()
 
         enforce = False
         if not target:
diff --git a/tasks/rogue/ui.py b/tasks/rogue/ui.py
index 5b6717b56..8e0a80229 100644
--- a/tasks/rogue/ui.py
+++ b/tasks/rogue/ui.py
@@ -37,3 +37,6 @@ class RogueUI(UI):
 
     def is_page_choose_bonus(self):
         return self.appear(PAGE_CHOOSE_BONUS)
+
+    def is_page_event(self):
+        return self.appear(PAGE_EVENT)