From e0f79d13ca1cc8b628d5b1f1ea46070eb6dae086 Mon Sep 17 00:00:00 2001 From: nEEtdo0d Date: Fri, 30 Jun 2023 17:38:52 -0400 Subject: [PATCH] Add: Gorizia raid ex ocr clause and remain asset --- assets/cn/raid/GORIZIA_OCR_REMAIN_EX.png | Bin 0 -> 4021 bytes assets/en/raid/GORIZIA_OCR_REMAIN_EX.png | Bin 0 -> 4021 bytes module/raid/assets.py | 1 + module/raid/raid.py | 5 ++++- 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 assets/cn/raid/GORIZIA_OCR_REMAIN_EX.png create mode 100644 assets/en/raid/GORIZIA_OCR_REMAIN_EX.png diff --git a/assets/cn/raid/GORIZIA_OCR_REMAIN_EX.png b/assets/cn/raid/GORIZIA_OCR_REMAIN_EX.png new file mode 100644 index 0000000000000000000000000000000000000000..5d68c39d8bdb3c2815c73927284d4f406e33e651 GIT binary patch literal 4021 zcmeH{`#aQG9LK-dSVb0zajR!#T{e_ql{8YrFohD$BA233Du%gGGlQCyBxGIYDN-R~ zs#zoE(PU7lOhcnw$Cz;)*Fi3`?)%mL2m9kb^LfsBKIb{l^Eu~zUgv#I@<|Vb>Q>#Y z005}Exx&2wU<){u|NNson2zj1%7IB4FmVS=AsJJEM8(y(hEh_U%zZI_vgtmziWDwAZA7z-tIv zUp1*6`w~t9dDLk?n{2Mq$3<>`)WJGxSSko6YOC{bWK?8Y9xoeBtn(rddrni?AT!an z@xG|;{I075vlyT}xecze(QqI;*Hqm%rko3zIRxqum%+jrlL4Rfl|C-d+_5}`%*7X6 zsUT$VB{hczKX$nQ3IK3@xEyQ0cnrsgThXIb)IMRRrD4~;4aC$wbk8sH7jwDc>ueUY zM!gPP&#^jM#|3{r$(l{Jo2W{n2WCxBwKEZcam~zWXaT35HK3FVHA(<)GVaRqNT6b8 zl(O3OSR52nOa94AV2`4)N~$Nn2`RDLwH>zw13&`Qw7+Ws1IfW0j*G-p1f80T5pXA* zceO#v&*I6)!-87!689ab~<?OWA49^!x ziYb!SyYisXMB*>Z2{eJ$%PF*PKY{P{9Hc$As=Wj@KI8DrFbZ-%o-9zM!pzU@9IX&( zTm&oPoydRO+KZ^lIwz5&&TjX3fM2Fqz;K+#DgxiPdiDBmxs`>`vLHDX0GNU5r8SS7 z)9OrK!%9UGi4d(lWV>_MYdhhKk?EW@B3~ReONtq4l6MVjF#ZfWf!bzCoC}yLxny8F zgXR_TLV32xhHwKrIx13#hG&J9FT)}o@!BZVT4>u-h=ILHYa*Zs0Dq5VQB1j%C!+p8 zUEej{Lpti79VGA?&pVX*7&I(Ya3uk^QXXyD2X1is14Sb(YPkuMSY*#@h3x+|YArW~ z#$j}e7eiWv7A7UJY*whB;`fVcJ*l>}820#*;z|~UVX=QU7V3o4zi&fxh@{8+1hQXu zMO6E?IKGyP`7q&IadGoz^;57T;LeVyT5mD419@ZLK5MQse1mba}|!h)F+7ZfBEhS?jOo z5dkj?{Sh6bCiT`^UTu;(PQaeY6zq+41(qVLa~dq^X$;aD88gXqW9-!qHhMDuE{)!fmg)<*EX zdb$^}mYqwB=%v>9=Zls^%P0RHZEXIkVYMF;{xw-E0bAxRrMmYBQu82lQck;hSiF_C zRY8`9ZS+H?P&`$@SrB;pKlPZ0e)lF@=Ox0v7-kxgwlI}!K|EG}VV_pV)O!hmm(4hY zcj;I&qchNE#x(WdO|xM-SS^u)atf9Z6H6jnmk4O%Z}PYAlz%$e}e z)1TzYuoE}IZzqq&T8UFiS%#5z&?RcDoTz0(?bM}D0JQ{rSA23zG2><{9 literal 0 HcmV?d00001 diff --git a/assets/en/raid/GORIZIA_OCR_REMAIN_EX.png b/assets/en/raid/GORIZIA_OCR_REMAIN_EX.png new file mode 100644 index 0000000000000000000000000000000000000000..5d68c39d8bdb3c2815c73927284d4f406e33e651 GIT binary patch literal 4021 zcmeH{`#aQG9LK-dSVb0zajR!#T{e_ql{8YrFohD$BA233Du%gGGlQCyBxGIYDN-R~ zs#zoE(PU7lOhcnw$Cz;)*Fi3`?)%mL2m9kb^LfsBKIb{l^Eu~zUgv#I@<|Vb>Q>#Y z005}Exx&2wU<){u|NNson2zj1%7IB4FmVS=AsJJEM8(y(hEh_U%zZI_vgtmziWDwAZA7z-tIv zUp1*6`w~t9dDLk?n{2Mq$3<>`)WJGxSSko6YOC{bWK?8Y9xoeBtn(rddrni?AT!an z@xG|;{I075vlyT}xecze(QqI;*Hqm%rko3zIRxqum%+jrlL4Rfl|C-d+_5}`%*7X6 zsUT$VB{hczKX$nQ3IK3@xEyQ0cnrsgThXIb)IMRRrD4~;4aC$wbk8sH7jwDc>ueUY zM!gPP&#^jM#|3{r$(l{Jo2W{n2WCxBwKEZcam~zWXaT35HK3FVHA(<)GVaRqNT6b8 zl(O3OSR52nOa94AV2`4)N~$Nn2`RDLwH>zw13&`Qw7+Ws1IfW0j*G-p1f80T5pXA* zceO#v&*I6)!-87!689ab~<?OWA49^!x ziYb!SyYisXMB*>Z2{eJ$%PF*PKY{P{9Hc$As=Wj@KI8DrFbZ-%o-9zM!pzU@9IX&( zTm&oPoydRO+KZ^lIwz5&&TjX3fM2Fqz;K+#DgxiPdiDBmxs`>`vLHDX0GNU5r8SS7 z)9OrK!%9UGi4d(lWV>_MYdhhKk?EW@B3~ReONtq4l6MVjF#ZfWf!bzCoC}yLxny8F zgXR_TLV32xhHwKrIx13#hG&J9FT)}o@!BZVT4>u-h=ILHYa*Zs0Dq5VQB1j%C!+p8 zUEej{Lpti79VGA?&pVX*7&I(Ya3uk^QXXyD2X1is14Sb(YPkuMSY*#@h3x+|YArW~ z#$j}e7eiWv7A7UJY*whB;`fVcJ*l>}820#*;z|~UVX=QU7V3o4zi&fxh@{8+1hQXu zMO6E?IKGyP`7q&IadGoz^;57T;LeVyT5mD419@ZLK5MQse1mba}|!h)F+7ZfBEhS?jOo z5dkj?{Sh6bCiT`^UTu;(PQaeY6zq+41(qVLa~dq^X$;aD88gXqW9-!qHhMDuE{)!fmg)<*EX zdb$^}mYqwB=%v>9=Zls^%P0RHZEXIkVYMF;{xw-E0bAxRrMmYBQu82lQck;hSiF_C zRY8`9ZS+H?P&`$@SrB;pKlPZ0e)lF@=Ox0v7-kxgwlI}!K|EG}VV_pV)O!hmm(4hY zcj;I&qchNE#x(WdO|xM-SS^u)atf9Z6H6jnmk4O%Z}PYAlz%$e}e z)1TzYuoE}IZzqq&T8UFiS%#5z&?RcDoTz0(?bM}D0JQ{rSA23zG2><{9 literal 0 HcmV?d00001 diff --git a/module/raid/assets.py b/module/raid/assets.py index 3ce95f74c..83146c126 100644 --- a/module/raid/assets.py +++ b/module/raid/assets.py @@ -25,6 +25,7 @@ ESSEX_RAID_HARD = Button(area={'cn': (1155, 271, 1215, 313), 'en': (1155, 264, 1 ESSEX_RAID_NORMAL = Button(area={'cn': (1111, 385, 1176, 428), 'en': (1132, 385, 1185, 421), 'jp': (1118, 381, 1188, 404), 'tw': (1120, 381, 1175, 428)}, color={'cn': (123, 173, 242), 'en': (126, 182, 241), 'jp': (163, 190, 224), 'tw': (130, 178, 239)}, button={'cn': (1111, 385, 1176, 428), 'en': (1132, 385, 1185, 421), 'jp': (1118, 381, 1188, 404), 'tw': (1120, 381, 1175, 428)}, file={'cn': './assets/cn/raid/ESSEX_RAID_NORMAL.png', 'en': './assets/en/raid/ESSEX_RAID_NORMAL.png', 'jp': './assets/jp/raid/ESSEX_RAID_NORMAL.png', 'tw': './assets/tw/raid/ESSEX_RAID_NORMAL.png'}) GORIZIA_OCR_PT = Button(area={'cn': (1160, 605, 1280, 637), 'en': (1160, 605, 1280, 637), 'jp': (1160, 605, 1280, 637), 'tw': (1160, 605, 1280, 637)}, color={'cn': (216, 220, 171), 'en': (216, 220, 171), 'jp': (216, 220, 171), 'tw': (216, 220, 171)}, button={'cn': (1160, 605, 1280, 637), 'en': (1160, 605, 1280, 637), 'jp': (1160, 605, 1280, 637), 'tw': (1160, 605, 1280, 637)}, file={'cn': './assets/cn/raid/GORIZIA_OCR_PT.png', 'en': './assets/en/raid/GORIZIA_OCR_PT.png', 'jp': './assets/jp/raid/GORIZIA_OCR_PT.png', 'tw': './assets/tw/raid/GORIZIA_OCR_PT.png'}) GORIZIA_OCR_REMAIN_EASY = Button(area={'cn': (1138, 513, 1194, 539), 'en': (1138, 513, 1194, 539), 'jp': (1138, 513, 1194, 539), 'tw': (1138, 513, 1194, 539)}, color={'cn': (205, 208, 201), 'en': (205, 208, 201), 'jp': (205, 208, 201), 'tw': (205, 208, 201)}, button={'cn': (1138, 513, 1194, 539), 'en': (1138, 513, 1194, 539), 'jp': (1138, 513, 1194, 539), 'tw': (1138, 513, 1194, 539)}, file={'cn': './assets/cn/raid/GORIZIA_OCR_REMAIN_EASY.png', 'en': './assets/en/raid/GORIZIA_OCR_REMAIN_EASY.png', 'jp': './assets/jp/raid/GORIZIA_OCR_REMAIN_EASY.png', 'tw': './assets/tw/raid/GORIZIA_OCR_REMAIN_EASY.png'}) +GORIZIA_OCR_REMAIN_EX = Button(area={'cn': (1082, 16, 1151, 42), 'en': (1082, 16, 1151, 42), 'jp': (1082, 16, 1151, 42), 'tw': (1082, 16, 1151, 42)}, color={'cn': (80, 93, 94), 'en': (80, 93, 94), 'jp': (80, 93, 94), 'tw': (80, 93, 94)}, button={'cn': (1082, 16, 1151, 42), 'en': (1082, 16, 1151, 42), 'jp': (1082, 16, 1151, 42), 'tw': (1082, 16, 1151, 42)}, file={'cn': './assets/cn/raid/GORIZIA_OCR_REMAIN_EX.png', 'en': './assets/en/raid/GORIZIA_OCR_REMAIN_EX.png', 'jp': './assets/cn/raid/GORIZIA_OCR_REMAIN_EX.png', 'tw': './assets/cn/raid/GORIZIA_OCR_REMAIN_EX.png'}) GORIZIA_OCR_REMAIN_HARD = Button(area={'cn': (1138, 346, 1195, 372), 'en': (1138, 346, 1195, 372), 'jp': (1138, 346, 1195, 372), 'tw': (1138, 346, 1195, 372)}, color={'cn': (206, 208, 202), 'en': (206, 208, 202), 'jp': (206, 208, 202), 'tw': (206, 208, 202)}, button={'cn': (1138, 346, 1195, 372), 'en': (1138, 346, 1195, 372), 'jp': (1138, 346, 1195, 372), 'tw': (1138, 346, 1195, 372)}, file={'cn': './assets/cn/raid/GORIZIA_OCR_REMAIN_HARD.png', 'en': './assets/en/raid/GORIZIA_OCR_REMAIN_HARD.png', 'jp': './assets/jp/raid/GORIZIA_OCR_REMAIN_HARD.png', 'tw': './assets/tw/raid/GORIZIA_OCR_REMAIN_HARD.png'}) GORIZIA_OCR_REMAIN_NORMAL = Button(area={'cn': (1174, 428, 1231, 455), 'en': (1174, 428, 1231, 455), 'jp': (1174, 428, 1231, 455), 'tw': (1174, 428, 1231, 455)}, color={'cn': (208, 210, 204), 'en': (208, 210, 204), 'jp': (208, 210, 204), 'tw': (208, 210, 204)}, button={'cn': (1174, 428, 1231, 455), 'en': (1174, 428, 1231, 455), 'jp': (1174, 428, 1231, 455), 'tw': (1174, 428, 1231, 455)}, file={'cn': './assets/cn/raid/GORIZIA_OCR_REMAIN_NORMAL.png', 'en': './assets/en/raid/GORIZIA_OCR_REMAIN_NORMAL.png', 'jp': './assets/jp/raid/GORIZIA_OCR_REMAIN_NORMAL.png', 'tw': './assets/tw/raid/GORIZIA_OCR_REMAIN_NORMAL.png'}) GORIZIA_RAID_EASY = Button(area={'cn': (1071, 515, 1118, 538), 'en': (1071, 520, 1118, 541), 'jp': (1071, 515, 1118, 538), 'tw': (1071, 515, 1118, 538)}, color={'cn': (183, 185, 177), 'en': (206, 208, 202), 'jp': (183, 185, 177), 'tw': (183, 185, 177)}, button={'cn': (1071, 515, 1118, 538), 'en': (1071, 520, 1118, 541), 'jp': (1071, 515, 1118, 538), 'tw': (1071, 515, 1118, 538)}, file={'cn': './assets/cn/raid/GORIZIA_RAID_EASY.png', 'en': './assets/en/raid/GORIZIA_RAID_EASY.png', 'jp': './assets/cn/raid/GORIZIA_RAID_EASY.png', 'tw': './assets/cn/raid/GORIZIA_RAID_EASY.png'}) diff --git a/module/raid/raid.py b/module/raid/raid.py index 836967d67..bc972cefd 100644 --- a/module/raid/raid.py +++ b/module/raid/raid.py @@ -105,7 +105,10 @@ def raid_ocr(raid, mode): else: return DigitCounter(button, letter=(231, 239, 247), threshold=128) elif raid == 'GORIZIA': - return DigitCounter(button, letter=(82, 89, 66), threshold=128) + if mode == 'ex': + return Digit(button, letter=(198, 223, 140), threshold=128) + else: + return DigitCounter(button, letter=(82, 89, 66), threshold=128) except KeyError: raise ScriptError(f'Raid entrance asset not exists: {key}')