From bc6017d6f8225f1cf7b8479fb990de7aacb9aed7 Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Fri, 29 Nov 2024 15:28:23 +0800 Subject: [PATCH] Fix: exiting combat status properly using MAP_SWITCHING --- assets/cn/os/MAP_SWITCHING.png | Bin 0 -> 12881 bytes module/os/assets.py | 1 + module/os_handler/enemy_searching.py | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 assets/cn/os/MAP_SWITCHING.png diff --git a/assets/cn/os/MAP_SWITCHING.png b/assets/cn/os/MAP_SWITCHING.png new file mode 100644 index 0000000000000000000000000000000000000000..ff93f989344a363332d27efca828c34c830b001f GIT binary patch literal 12881 zcmeHt2~^Y9)^F&bw@x&8y^6|UC{-vVkT8$71gv1B3<0SG8j^qk5+DNs8DeWIVGybU zVNxnQKn9_R5=kJ~GRa(x3>rg3W@CtvnGo{+K-=59-nZ6Ucdd87_15|f3-bS;v(NAB z{X6^Yv(Moqe|7rA?i~krfIy(#C%;5`fSo=}j`ZZg zkIbw!2F^VC{MgC2r6t+#Z7cUI_bYyJ?jjif2Dyj+NT7DSSnt}fA@63}XQvakIkyF4 z_#ez5(h|%oV)T_Cy$$HNqLb5C zC!L)Bum`ZBAmNJrmo3K+w*`8Y6z$t?%Q_Z(>vXgSxWlsza^@K62Oq6dP~~@@?mn54 zTKwYc$Tzs!S1(>xRbH&r{afM%D_biA?w83bw;jeoc2=_;ytoV=YE zmAk*0y*7XT>`ooE_k|DI=x47jUFg>OX8I(1SLc;Avmd@ti*YQD=u*4LIWEf+o(9?P zM1aPSA_2z(f$SV(BC)tI0!=rF5JDu|Lu9;Wh%OOt5AiienV=$_2OBX?lN!z~laG zA4#W#Z<>S0!3g055+F(idNuu*E>E09ef4LH4GKbtq{z)y0NMW{Nh1dTldONyZKGz> zoWCjpH2)L#U!?!AeNz~aLZNJs5jgsWdMAY zOTG%n(t?2oz#Jfw@evH_KdZcnB!U+WyTPZaB?4|`VFp-kX<=^uyWyLNJ_HIC@Wl;O zQxhn{Y_s{sz}Nuh0MuePJQV=gEC;NyaiS2gv5b{5YqvG%UlOT6|FN4z zTXV{b5ViHT^%_pxoJ_j9o72Jui`z1Rij5}VH}wRtwyJRFu;dT|5I=r**gwjN|CKYC z!Go;{<|f9bCRRblW@bUA##X_=pCD6$H5_4qutZpGk@qJ$H6obCz)}dGhX6bRTmcTc z$(8Q0--pWJU$tSJBW#QVK$)?rsqtSZgTQ__7Pb*F{;<{#_J8nUw<++K5CgQ^Dg#0n z5D8&_hQiLgX$Az+1)W5G?j7^&wMbm~Nl2c~a)|Ke#O^PR!QEi|@lNmK zVIF%#BMv|0YwgoM^O1V@j`&(!JXSrfHb9)SvOm5-^{wg7)DFw`#UC_xS6!YA`suE& zo+h^(@so?eSGBRn+g!fTviJ`DGUm*OzwXbSI&rc@yYl?xuhVlL9yUi25Jczxl%?)D ze*dA3Q;K(=cMQB^;2i`14Gg>~ELZ*N3j(b@uwP43&9}LGGZF*HI!5Tuhn`uszJndA zCCuC`vpKo`&?PLRL8sIdQX1j~os+gD+2HsIzvSyc^nw!C^`403xsIzHss|6$;sdj4 zK%f^c1|^v`**Sa0uAf`=*XVmFD{w-W%?vDdCN9w)TI=zzhcd6*bglWXqAtFt3wj^4 zR&pxc)d1{~eKoh=UYnyYUQ74?y5jL&!czF*>UQGc8Yg<=y_r%ca`ORq*u5uyy|6vQ zV$8yaFD&Qv0@XkdZtGJzy^e5J2gjlm%QHg}AH2{I`6;A$#fuIMvqmvTA`+ifUxd4Y;@nlfO)W6M+N)x_$u)0*Ik$*1~yLH_XU=^+x+$I@-w3ORoL zJF*g{5<#0&{9jS3w0*%H4rkCk{R6pfMt;pduMEnkLg5$R|M-F$D8Mte1i2937M;wx z<(8~JsV^~H9TIX92i=oau!28&coQ}d-wkGY|o0EJ>o|nS61smrdG)F_Px#7 ztXpHJb*lK~ZkYNOs}SVAg_`Td^pM*g@5g+U_l+9Jkv2A9_IkNw#>&$S5OXVM{EIU8WBgn@8}|&O3*d87j7MI*x5ul; z=A_trRd~(1qqRmLY5HR9lLhfuyuL@bc)><;$RW++jp> zY`jOo*GO1wg-&2|xBI^u zJ&PoH^~v&XQ}!|N%Iyz31*7>V?|JK2uzLI<0m+hG{wI3mT?R^*)|iKD1LVfMQrn}( zy&d&uh6cXb)JE*B)iLYUT;Ih-LajrPnWaeNc(3V~mV}Y}4hx)=`X?R()V|!<@bv<) z+!cxG(pVvkvvJ6?h2|wGE1}QGNwQTCRXgKTpAWWeI(S!n(@0EuRi!7}>$e1QJ59^B z%!$nLg4Q~ObyboQ&DqCD`#hZeoRy)-x+|* zt`T$EqtQhb9HD!01>z3UrS&deaF>vqk)J3_tj}N85_{xrI}X|gTAn+KlvWs&oD!IY z4EphNP1!6Kr;m55Yc@5ixv;AOkL;P_lzCfnEKs86L9>!HG!n@(%%{hVFoXt|DzQ0t zyfvfz!CLIVT~rr*bY;Ca-TR7R)28zVb`?yY|Jv-thzMkNqV*~rZQ&SjqLpTTW6vlC z&P*_kP9E(xfKm^atyhtJO2YD`Ca)J;qJ)u9zgJ$BGoC}el^#AMyVMzz5ma-2oHT;o zo3k=~?U&)VYcPH+CwtUX2CrVR+ zZfH)KOB5B}YiKQ&k_$@5By7VVboyD=kfgL(JfQEOTyi?qZ~P$fzF+g)H8Q6VaIp;+ zvGnvM^fih|yw*m1rkCC{E~JVTBXh6kEE$1wYtL7|_q^)WY?T((;U6(&PJ`(AkY1jn zR3h0awwEm>El<~Bpnese)njy?A;~KsW-^jf(fwHzZ~y(rI}dKq9%C?vt#DfjmQ9pA z$L!bYNc47lQeuV@(COZ$I+HWqX)I4hlugIE8}MlNj+q}ZUL#zwa^(8_Au!2+shU#8 zKa{T1e)A}YK;Hh?dqihZ5+w>CGpNA{u0ty@hqd{@HAty}UfE<~AP~#yJhp;o0H&*a z?U0A>#G$<Y(rl3yW)khOd&-8RHo!+^z#57iUX8GUA^m43toLMbN z!rr$|Tbg}R?yavr_lCxL^2DVe%iNA0v4 zkB)29b={{4c562+&YpHlu1Hi}8+}Qc&RdkC81fbJ+<8WPvcXGrm2y_SqIX3?I@{s6 z5^0HVzbeQS{2g3!m$cXPa>B6>A^bP6|g&NV7GT3H!k^=Kb3>`;SaTiDh%wO2_Vu z(}gtDbuh28)>gtr8&p~#R8QO9Jev5;QhGL@4qcHaz6uDVB$pd1l@5pzMYttezIaHa zQ`MzfWHwrgI=O@a0utImdT@pDHWnHix{b7L`zCkak7-P^rg^iY`3cZk(QZYhe@%W* zL1`K*7!60rs#pP>-WE$muM*0RpRW|P6wc@KyL+Spd2#nm?*+g)0tbYZu|2li_iM#D zz-oo=y_E#2PqSih@)4|FQ8}}`W_H=KTw!ay?V}eZYY&06>0@*<%b&t9pS`gs7YJn| z)~egM&+mIbY8o*|QD2=$w{c0&O8Xw3xg#5tt;Y+R2a)?4THg>(=O%br)MTaIUk>WZ z(F^K1EPJgvf@(Na>Y25DDxWXQ8zB8+Jr*sC0&*x@<*j|N&6v#2?k4^)H=8;NXp;f0 zZyE4@HJ$f30QP;l;mfSmPnm=0OxCC&M^WqjsD_8_!O82Ziwp>LE;1EjjqL(k>3cQAlYi75-n0kit4KjJ)_O|~h=#A5mnZCMT#jvzY z^7n)6z*Ee5S-o|C$M=m&JR`0}gNJ=KPp?by8dwS)mL{>P{hW^6QR@OfMVclWOZG`CtRer-9Wd_#M_{**i{6%OU4_D4%fi4qD^L=FgC zLh+go!uUCtTKtQugr(kuo*w-^8C_`5(QV*XU&+$1cVAlQ0E3m>*q>*#Vb&N_tN>bh z{+GNdo0P4%$max$%tPifW9@d$jQ9QG+(EtSYJd@w66>FaugXIkmt#0h!xI`FZOh@q zjUx+7Tp-&*M+2E%yy}r4$_8I&nBWyMp4cV-u_V)z0M*2$b<>{X)|NXRAa5IGGP+ad zT3Z_l6u@7I?Rl}~pmQA6h;YtV?k}PzkA~U>_xZ!s1y<=&iD;$YLg}us8*fVzilUjX z&)pOEOX@TR%8hJcD74x9(aFhRVOz^DSTS>!shtEeid=lN{A^xDmGH=f}H*9cJ8quoDy zb^hUk6b!!7l6YQqF+=PSCL9{d7bhG*KUF@p$nF6k%Y7H#(2iBM&+pz`XHP0bKUPxY zo#gumlPaTD;rYJZv%ZQo!&S>ci2^m*sKDo!dA_;JI~>g(laFwppaie?JiYB|V5ah!=PY^FZs$;*#lP%^ez~F9a z{kR?A4+~8eMLkKKx3<!q@LqOe{vPrM!~RNas0dnPiI z0*N%E%>QdwVnEnZ|D>Yk9^C+J4XaJOEgh0_0f)=;b@MhoC8+)RFt`DESRm8za2~on zRda_3ub^wmm;0kzLU@mFEIEoY(NzEU?4?Qa&=i(cSW!x2SE@?%)0QgW3+&<3vZ`y{L`DT>}Q``FKxU(?1I#WvyVlIhAM2bzRQU2Z)d*k(8+MKb{Hpd|(OnFC@dAhV*KPfWqEll!$RL8qHt*{f3yx0fD&=LodW#*4i@6xibF*GE6u4t=8XV!??^E{O8>*m^;Be!J zKcvWTZpN%Q?HG7Scu}wW?emU@Jt9GZOQ!FuGePN9YQO(?-(@d~*p z^D&YZf>{ek#PjoS?5f2#9WdK8SP?fB;gH5!T3;!~TAmWj#Egg%b)pgmA6*rgY4I%C z70A7k(%e$J#g3GXgNlmQ+K2hEb(n5ZKYhH zJe06BIeEQ#VOF79R`=R&bb-CFaccACecxAar!S^T+n{qcSD+oyK7JMF@;-%Jsw5V) z%S~Kbm5L>uf+a~D%Ao8e36n)hz$NP4gf=wW{4gas@p4#hJ+?CV8@Pmfxm6RKt5E)| z7+8GSl5wfOUV;*<+-2GHkcXgv^c^NZKEsHrO_-NEU$5m4wR$d^P8`uI%Dgi(L>LH& zzoWI(GV^!wRcR%?&X9yDedRqs^3jLDGn_>fPMi-i%@;R$7(911Hm8QOo~;2pHkmDP zr5NRc8^kAC-_Qb~^~(M}g-U)sHg8d<&t>-u{k46Y*0Fm7Q)|YuYKp6TYU=50w`@)& zu_i_W?G-xfyyob2apU^@Q>!&c!P^B5u$+E)k97cw?OxWxydUtY(NIp$yw$}--_A#` ztGe$Pfgd%kKbve$7<(z`Z(eS0KEn@iMF(OqXg6;UXMDV}NWE_S?Sf~bH(Etlcomuz z2$KV-x!v=s)4ioNDv5=vnW&gnnMH!c>`g*^-EqWcw}MnONBhgSAQcCws*RoFXs@p|T8E7&uBk`6C$V}AVCyv*LX^0f?x4JDxpfY-eHzu%s(W7_q2YP4{9g`dVvUVzE5QdtAC$#I7^&x?R3cGl>Z`B1f&MKw)oeL8-2r z%%-fnupd2tl2pj<;2ZgX4EiyDVDx*^43OZT;k}~EsJR$9VKgKJo-XLFxlh6z;(JnKE*00dI z##UOaWs3r`?b>Q@3uq&6XI4voXQTtOZm*2*q@1g;&8Zd#YDE`rF|o{SkteX zvx8l4T$8QbuUIj;u^NspTl`vlx*6=@GqJ8rtRuSZBcNT0OG{jl1Fn-b>@JAY2?#Gt zkA3Kw^60(IGpj*L&jb0dz}ZA^h25~(l;ccMO7(`L&88CX^W2v+za6tNVc#(vJ33~D zDlu%xWF6Bl${h22<=JKWk(f4I;aiePS-a<5Ld?%+Yn2`@#Q;Z(#QgS1wZ`vtR)A~D z0ms-8Q=<>{A-Ee3QdwgIm+vsgeHmFX;ewp>u9%k5)kj|Q=y7%v#}Ev6D1+^U z%w)}w_r9`)2`zfhOAmbV-|#r*<9lrH7}smryq9B)L3kW)057pk=0*(^WFajbEEzv literal 0 HcmV?d00001 diff --git a/module/os/assets.py b/module/os/assets.py index 550dd2522b..13456e8d2c 100644 --- a/module/os/assets.py +++ b/module/os/assets.py @@ -16,6 +16,7 @@ MAP_GOTO_GLOBE = Button(area={'cn': (1069, 641, 1260, 695), 'en': (1069, 641, 1260, 691), 'jp': (1064, 636, 1265, 699), 'tw': (1069, 641, 1260, 694)}, color={'cn': (212, 140, 140), 'en': (212, 140, 140), 'jp': (207, 132, 132), 'tw': (213, 143, 143)}, button={'cn': (1069, 641, 1260, 695), 'en': (1069, 641, 1260, 691), 'jp': (1064, 636, 1265, 699), 'tw': (1069, 641, 1260, 694)}, file={'cn': './assets/cn/os/MAP_GOTO_GLOBE.png', 'en': './assets/en/os/MAP_GOTO_GLOBE.png', 'jp': './assets/jp/os/MAP_GOTO_GLOBE.png', 'tw': './assets/tw/os/MAP_GOTO_GLOBE.png'}) MAP_GOTO_GLOBE_FOG = Button(area={'cn': (1074, 644, 1114, 691), 'en': (1074, 644, 1114, 691), 'jp': (1074, 644, 1114, 691), 'tw': (1074, 644, 1114, 691)}, color={'cn': (50, 34, 32), 'en': (50, 34, 32), 'jp': (50, 34, 32), 'tw': (50, 34, 32)}, button={'cn': (1074, 644, 1114, 691), 'en': (1074, 644, 1114, 691), 'jp': (1074, 644, 1114, 691), 'tw': (1074, 644, 1114, 691)}, file={'cn': './assets/cn/os/MAP_GOTO_GLOBE_FOG.png', 'en': './assets/en/os/MAP_GOTO_GLOBE_FOG.png', 'jp': './assets/jp/os/MAP_GOTO_GLOBE_FOG.png', 'tw': './assets/tw/os/MAP_GOTO_GLOBE_FOG.png'}) MAP_NAME = Button(area={'cn': (120, 9, 400, 41), 'en': (116, 6, 549, 39), 'jp': (115, 14, 421, 41), 'tw': (120, 9, 400, 41)}, color={'cn': (60, 66, 77), 'en': (43, 50, 60), 'jp': (94, 104, 120), 'tw': (60, 66, 77)}, button={'cn': (120, 9, 400, 41), 'en': (116, 6, 549, 39), 'jp': (115, 14, 421, 41), 'tw': (120, 9, 400, 41)}, file={'cn': './assets/cn/os/MAP_NAME.png', 'en': './assets/en/os/MAP_NAME.png', 'jp': './assets/jp/os/MAP_NAME.png', 'tw': './assets/tw/os/MAP_NAME.png'}) +MAP_SWITCHING = Button(area={'cn': (773, 305, 833, 365), 'en': (773, 305, 833, 365), 'jp': (773, 305, 833, 365), 'tw': (773, 305, 833, 365)}, color={'cn': (85, 130, 164), 'en': (85, 130, 164), 'jp': (85, 130, 164), 'tw': (85, 130, 164)}, button={'cn': (773, 305, 833, 365), 'en': (773, 305, 833, 365), 'jp': (773, 305, 833, 365), 'tw': (773, 305, 833, 365)}, file={'cn': './assets/cn/os/MAP_SWITCHING.png', 'en': './assets/cn/os/MAP_SWITCHING.png', 'jp': './assets/cn/os/MAP_SWITCHING.png', 'tw': './assets/cn/os/MAP_SWITCHING.png'}) MEOWFFICER_SEARCHING = Button(area={'cn': (172, 606, 220, 619), 'en': (172, 607, 221, 616), 'jp': (173, 606, 220, 619), 'tw': (173, 605, 221, 619)}, color={'cn': (67, 131, 149), 'en': (75, 132, 150), 'jp': (76, 138, 158), 'tw': (78, 152, 173)}, button={'cn': (172, 606, 220, 619), 'en': (172, 607, 221, 616), 'jp': (173, 606, 220, 619), 'tw': (173, 605, 221, 619)}, file={'cn': './assets/cn/os/MEOWFFICER_SEARCHING.png', 'en': './assets/en/os/MEOWFFICER_SEARCHING.png', 'jp': './assets/jp/os/MEOWFFICER_SEARCHING.png', 'tw': './assets/tw/os/MEOWFFICER_SEARCHING.png'}) MEOWFFICER_SEARCHING_PERCENTAGE = Button(area={'cn': (144, 621, 223, 623), 'en': (144, 621, 223, 623), 'jp': (144, 621, 223, 623), 'tw': (144, 621, 223, 623)}, color={'cn': (52, 167, 190), 'en': (52, 167, 190), 'jp': (52, 167, 190), 'tw': (52, 167, 190)}, button={'cn': (144, 621, 223, 623), 'en': (144, 621, 223, 623), 'jp': (144, 621, 223, 623), 'tw': (144, 621, 223, 623)}, file={'cn': './assets/cn/os/MEOWFFICER_SEARCHING_PERCENTAGE.png', 'en': './assets/en/os/MEOWFFICER_SEARCHING_PERCENTAGE.png', 'jp': './assets/jp/os/MEOWFFICER_SEARCHING_PERCENTAGE.png', 'tw': './assets/tw/os/MEOWFFICER_SEARCHING_PERCENTAGE.png'}) SELECT_ABYSSAL = Button(area={'cn': (89, 251, 167, 269), 'en': (93, 254, 161, 268), 'jp': (89, 251, 167, 269), 'tw': (88, 250, 167, 270)}, color={'cn': (107, 110, 112), 'en': (100, 103, 104), 'jp': (115, 118, 119), 'tw': (98, 101, 102)}, button={'cn': (89, 251, 167, 269), 'en': (93, 254, 161, 268), 'jp': (89, 251, 167, 269), 'tw': (88, 250, 167, 270)}, file={'cn': './assets/cn/os/SELECT_ABYSSAL.png', 'en': './assets/en/os/SELECT_ABYSSAL.png', 'jp': './assets/jp/os/SELECT_ABYSSAL.png', 'tw': './assets/tw/os/SELECT_ABYSSAL.png'}) diff --git a/module/os_handler/enemy_searching.py b/module/os_handler/enemy_searching.py index 383e61a318..54fc3f3dcb 100644 --- a/module/os_handler/enemy_searching.py +++ b/module/os_handler/enemy_searching.py @@ -2,7 +2,7 @@ from module.handler.enemy_searching import \ EnemySearchingHandler as EnemySearchingHandler_ from module.logger import logger -from module.os.assets import MAP_GOTO_GLOBE_FOG +from module.os.assets import MAP_GOTO_GLOBE_FOG, MAP_SWITCHING from module.os_handler.assets import AUTO_SEARCH_REWARD, IN_MAP, ORDER_ENTER @@ -12,6 +12,8 @@ def is_in_map(self): return True if self.appear(MAP_GOTO_GLOBE_FOG, offset=(5, 5)) and MAP_GOTO_GLOBE_FOG.match_appear_on(self.device.image): return True + if self.appear(MAP_SWITCHING, offset=(5, 5)) and MAP_SWITCHING.match_appear_on(self.device.image): + return True return False