From 3795d3f366429bede52ac20eb579a918d03a6956 Mon Sep 17 00:00:00 2001 From: 9-9-9-9 <9-9-9-9> Date: Wed, 30 Nov 2022 08:03:45 +0700 Subject: [PATCH 1/6] update version 3.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index df22675..8d0029b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 bh.bot 99bot - 3.3.0 + 3.4.0 From d99e338a83dd2a9cb6735002aefcef01ef7ef8b3 Mon Sep 17 00:00:00 2001 From: 9-9-9-9 <9-9-9-9> Date: Wed, 30 Nov 2022 08:03:55 +0700 Subject: [PATCH 2/6] fix Auto button --- .../common/types/ScreenResolutionProfile.java | 2 +- .../buttons/globally.auto-green2-tp.bmp | Bin 2430 -> 2394 bytes .../800x520/buttons/globally.auto-red2-tp.bmp | Bin 2430 -> 2394 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java b/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java index 1b8f65b..fb082f4 100644 --- a/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java +++ b/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java @@ -510,7 +510,7 @@ public Offset getOffsetButtonTownAfterCompetedGauntlet() { @Override public Offset getOffsetButtonAuto() { - return new Offset(778, 213); + return new Offset(777, 214); } @Override diff --git a/src/main/resources/game-images/800x520/buttons/globally.auto-green2-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.auto-green2-tp.bmp index afd07199c15a693315396ba84464f8c31f95b949..5a129f20297f1b881664d67b95346ccdefdaf25b 100644 GIT binary patch literal 2394 zcmZ?rjpAeg12Z700mR%u>{{6=QiHV6oS)jTT zV1OYH5`ahn)qMW^8KPj>vSssNVDaL`a9zl1+S=NHCPP4FWhEXps&iX`$_9@b{BAyc z`0yblfb6d&U;r0EW-ML06etM{AE4pDxcK|`FS0Cz4UY>M3nOP|=Rj=0!^1;b8x-$q z%X;Kv1Lb1^up-rYZ9p};|F7al2sOVhY8+dJjC4MqhUkT;(RqJDF2V;AGH_DP-&Om` zexNdl8m%jvq%_qM5)!t;KyGfXl&p-#i4~Y?;NBl0YLx17fCv&kXnu!C0mD!q27qCR ztOh2m4^;Ez%NJncfdIG~VAh6+{Q2_-sOIp2_wV1sbs?((mUZ$lfWI75?yCd_CVn-8tvsZudw>Na z1VHKwxLq*erND4TPJXhU4jP9R%LREL3j)<>Ufm2wI^WL$6P3=NOK=e&1E_|WbSUTJ z3`dI9ncB||Dm53tMSu*TIY}@O7Z(R~2E@&gk&!UrB%m62`a$y-uJi*phw`)`rK$`x z4VO97r%&&Ifyt96V|5Q)5RHNCFElAQ7g^2BnKQd#VCvMVSk(~IPT0J8^Ew#Vv}qHv VIXl1rE`rQ}NCDjg3=M+q9{|xiX4U`z literal 2430 zcmZ?rt>a_>12Z700mM8&>;%M&3=%++fx!bR59UCLe_(Lp#EIizaO~KzqeqV(K79Dl zp+g4`9^Aiw|K7cOiC6O%4F3H2^ZWPjpFe;8`0?Z0w{Ks*d_gvccs0oG#AOaW)lkb{ zl$e9;UrN}$Jvbg*O5r^bK%)En{PsvjQ$zPv7 zefsd>11`Ie)nK}uJP}gU82+@1%MF<62U8_P4MZGQd5EkFzZ(2uNNRZqu?yLD%<^z# zszDAD?PD E09*beJOBUy diff --git a/src/main/resources/game-images/800x520/buttons/globally.auto-red2-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.auto-red2-tp.bmp index f13840189c58c91ad03ef611c71b40645f671ede..71a55def1322e67d79c2b786959d2c29362a4ad7 100644 GIT binary patch literal 2394 zcmd^>zl#$=6vtyJ_Yb)9BiXx6f?#olVkzn(q&e^)O)NrkonXL5B&3xfh*bz7jZH2Q zK`gQemTDRW;ouG|Q`k!)NtYk`-JQ(4G1*-YL^$xv+hO*-&rW9Eyq)ary?YlEfv%&y zjB5+mEnF88m(V5>=~XXMLoM>GM|~)Q<BHpS5*G)envH_qD;8gVCbKX|-BUwHl2^=zPez w)-l($7NT2|X}8~J`Wk~rE8_L z)LH8+nY3VYylzU#u$)QyIULWp64jiqB4z{)UJ_k{*^Q;)u?#P*6pyeim zH%3I!C&SpE1IEp~Xx%5jdC(hMH(K_O%^4zAh56Jz$BKIV>DdF*%Jok={FeBK7Duq- q?t(Wy%bahqrOAHAtPekbJ9v-i%%H~lj8k$k--A Date: Wed, 30 Nov 2022 08:16:34 +0700 Subject: [PATCH 3/6] fix pvp badge --- src/main/java/bh/bot/app/dev/TestApp.java | 1 + .../java/bh/bot/common/types/AttendablePlace.java | 4 +++- .../bh/bot/common/types/images/BwMatrixMeta.java | 4 ++-- ...-green2-tp.bmp => globally.auto-green3-tp.bmp} | Bin ...auto-red2-tp.bmp => globally.auto-red3-tp.bmp} | Bin .../800x520/labels/attendable-places/pvp2-tp.bmp | Bin 666 -> 0 bytes .../800x520/labels/attendable-places/pvp3-tp.bmp | Bin 0 -> 474 bytes 7 files changed, 6 insertions(+), 3 deletions(-) rename src/main/resources/game-images/800x520/buttons/{globally.auto-green2-tp.bmp => globally.auto-green3-tp.bmp} (100%) rename src/main/resources/game-images/800x520/buttons/{globally.auto-red2-tp.bmp => globally.auto-red3-tp.bmp} (100%) delete mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/pvp2-tp.bmp create mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/pvp3-tp.bmp diff --git a/src/main/java/bh/bot/app/dev/TestApp.java b/src/main/java/bh/bot/app/dev/TestApp.java index 3161a2f..0d2366b 100644 --- a/src/main/java/bh/bot/app/dev/TestApp.java +++ b/src/main/java/bh/bot/app/dev/TestApp.java @@ -41,6 +41,7 @@ protected void internalRun(String[] args) { adjustScreenOffset(); // + findAttendablePlaces(); } private static void testParseTime() { diff --git a/src/main/java/bh/bot/common/types/AttendablePlace.java b/src/main/java/bh/bot/common/types/AttendablePlace.java index 0619e87..d3c1647 100644 --- a/src/main/java/bh/bot/common/types/AttendablePlace.java +++ b/src/main/java/bh/bot/common/types/AttendablePlace.java @@ -24,7 +24,6 @@ public AttendablePlace(String name, int id, String imgCode, boolean left, int pr String imgFile; switch(imgCode) { - case "pvp": case "world-boss": case "raid": case "gvg": @@ -34,6 +33,9 @@ public AttendablePlace(String name, int id, String imgCode, boolean left, int pr case "expedition": imgFile = imgCode + "2"; break; + case "pvp": + imgFile = imgCode + "3"; + break; default: imgFile = imgCode; break; diff --git a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java index fc6710c..78bc312 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -383,12 +383,12 @@ public static void load() throws IOException { 0xFFFFFF ); Metas.Globally.Buttons.autoG = BwMatrixMeta.from(// - "buttons/globally.auto-green2?", + "buttons/globally.auto-green3?", Configuration.screenResolutionProfile.getOffsetButtonAuto(), // 0xFFFFFF ); Metas.Globally.Buttons.autoR = BwMatrixMeta.from(// - "buttons/globally.auto-red2?", + "buttons/globally.auto-red3?", Configuration.screenResolutionProfile.getOffsetButtonAuto(), // 0xFFFFFF ); diff --git a/src/main/resources/game-images/800x520/buttons/globally.auto-green2-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.auto-green3-tp.bmp similarity index 100% rename from src/main/resources/game-images/800x520/buttons/globally.auto-green2-tp.bmp rename to src/main/resources/game-images/800x520/buttons/globally.auto-green3-tp.bmp diff --git a/src/main/resources/game-images/800x520/buttons/globally.auto-red2-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.auto-red3-tp.bmp similarity index 100% rename from src/main/resources/game-images/800x520/buttons/globally.auto-red2-tp.bmp rename to src/main/resources/game-images/800x520/buttons/globally.auto-red3-tp.bmp diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/pvp2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/pvp2-tp.bmp deleted file mode 100644 index a0519f1144b615cf2cfc916f1abc7d2ad466153d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 666 zcmZ?royEie24+A~1Bk_dm=lN@86({SKN=iBy zN)-D;&G`KJGd44VY{Vfb&sPlD9Y7m^#;jhw+Qh`f*+?AX4u~0WEns(4BLO1~30r*$ zh+md1TUK6P4m1V`fJ&U5ogrp?`SJy>qpYk9Yz9OXkleR#pO24^tc)bYj3rB!XlrW& zO?va@4N%tA)fHj}Ts@G{*473#<1!2Y#qQs~FD->I!%9~|PDTq~286`hB6 z>%V{h0>y9Nz8xAGs&8Z8di0`eVa@E>vw?#7`T1G1m&|zb38)yZw|3`YAVSs)lzRO5 zaY#sru7#CXdM>iw+MP#$iXnP~VIZ`s0b=jHd-s+tTlV(t+c$6C040^xHQ;(-YJ-7# z;h?*_+sDVp!qO7x=1Z3@8Ch5^U%vd=vu9tvd{NVY>V+%r=;#2lSHJ*}-P+n}VFA Date: Wed, 30 Nov 2022 08:21:56 +0700 Subject: [PATCH 4/6] update readme and block out-dated versions --- README.md | 4 +++- web/json/reject-versions-2.json | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b4ccf34..1a3e14c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ ## Welcome Bit Verse -### and new BH update at Nov 16 2022 +### and new BH update at Nov 16th 2022 & Nov 28th 2022 ### Almost functions were fixed and back to work. Expedition will be fixed as soon as possible +- [ ] Invasion +- [ ] Gauntlet - [ ] Idol Dimension (Expedition) - [ ] Hallowed Dimension (Expedition) - [ ] Jammie Dimension (Expedition) diff --git a/web/json/reject-versions-2.json b/web/json/reject-versions-2.json index 2a7cba3..9bc2858 100644 --- a/web/json/reject-versions-2.json +++ b/web/json/reject-versions-2.json @@ -1,8 +1,6 @@ { - "bv": ["2.12.0","2.11.0","2.10.1","2.10.0","2.9.3","2.9.2","2.9.1","2.9.0","2.8.6","2.8.5","2.8.4","2.8.3","2.8.2","2.8.1","2.8.0","2.7.0","2.6.0","2.5.0","2.4.0","2.3.0","2.2.0","2.1.0","2.0.1","2.0.0"], + "bv": ["3.3.0","3.2.0","3.1.0","3.0.0","2.12.0","2.11.0","2.10.1","2.10.0","2.9.3","2.9.2","2.9.1","2.9.0","2.8.6","2.8.5","2.8.4","2.8.3","2.8.2","2.8.1","2.8.0","2.7.0","2.6.0","2.5.0","2.4.0","2.3.0","2.2.0","2.1.0","2.0.1","2.0.0"], "bf": { - "3.2.0": ["expedition"], - "3.1.0": ["expedition"], - "3.0.0": ["expedition","invasion","gauntlet"] + "3.4.0": ["invasion","gauntlet"] } } From 7ef333a8ad71659751a2ea3bb54c511e0518836e Mon Sep 17 00:00:00 2001 From: 9-9-9-9 <9-9-9-9> Date: Wed, 30 Nov 2022 08:36:28 +0700 Subject: [PATCH 5/6] fix attendable places --- README.md | 3 ++- .../bh/bot/common/types/AttendablePlace.java | 8 ++++---- .../labels/attendable-places/expedition2-tp.bmp | Bin 1998 -> 0 bytes .../labels/attendable-places/expedition3-tp.bmp | Bin 0 -> 1134 bytes .../labels/attendable-places/raid2-tp.bmp | Bin 774 -> 0 bytes .../labels/attendable-places/raid3-tp.bmp | Bin 0 -> 558 bytes .../labels/attendable-places/trials2-tp.bmp | Bin 1242 -> 0 bytes .../labels/attendable-places/trials3-tp.bmp | Bin 0 -> 1134 bytes .../labels/attendable-places/world-boss2-tp.bmp | Bin 918 -> 0 bytes .../labels/attendable-places/world-boss3-tp.bmp | Bin 0 -> 642 bytes 10 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/expedition2-tp.bmp create mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/expedition3-tp.bmp delete mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/raid2-tp.bmp create mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/raid3-tp.bmp delete mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/trials2-tp.bmp create mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/trials3-tp.bmp delete mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/world-boss2-tp.bmp create mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/world-boss3-tp.bmp diff --git a/README.md b/README.md index 1a3e14c..dac5095 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ ## Welcome Bit Verse ### and new BH update at Nov 16th 2022 & Nov 28th 2022 -### Almost functions were fixed and back to work. Expedition will be fixed as soon as possible +### Remaining features need to be updated - [ ] Invasion - [ ] Gauntlet +- [ ] GVG - [ ] Idol Dimension (Expedition) - [ ] Hallowed Dimension (Expedition) - [ ] Jammie Dimension (Expedition) diff --git a/src/main/java/bh/bot/common/types/AttendablePlace.java b/src/main/java/bh/bot/common/types/AttendablePlace.java index d3c1647..969999f 100644 --- a/src/main/java/bh/bot/common/types/AttendablePlace.java +++ b/src/main/java/bh/bot/common/types/AttendablePlace.java @@ -24,16 +24,16 @@ public AttendablePlace(String name, int id, String imgCode, boolean left, int pr String imgFile; switch(imgCode) { - case "world-boss": - case "raid": case "gvg": - case "trials": case "gauntlet": case "invasion": - case "expedition": imgFile = imgCode + "2"; break; case "pvp": + case "world-boss": + case "raid": + case "trials": + case "expedition": imgFile = imgCode + "3"; break; default: diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/expedition2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/expedition2-tp.bmp deleted file mode 100644 index 66709945b65c4eefb43ed4c6e0653fea4cdd3ed7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1998 zcmc(gUr1AN6vx+7^ycI4zwK^r_UF208pD*4wek{B+;h(F{O;%ee&_6B z#h0U+q}VW?z*UOt7_K84Ek=#zRmz`yNDW@EcYD8-l$4Z}mBF^Mvchqka;`KO4C1k` zua6hR$;nCRO-)S|-Y1^;cluR$AB#GDeSQ7@Oxq0&4OXi)&Dhh^BZ!hN(=<3Z2v;Bw zaNNBAFrH8fFANL}z|zstVXLZj^+qg3#aI-U?(S|*k~v-&9v;Rc$;ikEESzNQ?CgZ4 zzrSBn3VBJMot?$w^z?KpZuiExR##WSWy-c4%H?QmX=`hnnwr|pk-8tqH9tQekH_&H zexIwWtBd1!A`V@s^Bufu{jJdg`vp->1cOpHb&?bp`U*1M!cqfvz6)8RX_{mMFX zzUanX{I2+(5*K1(u^7t(1)Ih8i|jt14`D+?Ly~OxQ?7-D1e73i@!@{`yem_mYXgrl|tGtH&A}+Fgwu4xex$ZUS0MK8gXI%*EhtM;X(?-QY{gC)hJi&;I{^VDFno)`RiF{@~kDy4Wah$NMNfuLC1S}8Vy z*aYlE{LzS@g;FB^@e~wHI-Te=1!;cV=wpv zpIIbhNE1>XFk?3wjdH#UB~6$EfdG`*Y!(Lp&YaKZVefXkS=QBVw|l+b-(L=^hQ22@CY;R3ziVv!tL!XVIGgi z(11CSNW|lDjyV(x5oWDcOKQXAa^e5MV35>?)9EZ0i$0%^s|}LpKQddbR=eHKF{3uH zgxL0?QeT2$Hk%<*$Zoge*9O7?48r7?Q5#S?91eIh48t*F`GDDIG?F7YW-JW`!|%+L zT8pFkwE;^I5@uX0CMXXgc!PSqp1eVn3jYnlaiNhVtNg_vPLoQEs3}^^i~pGtvA#9W_nqcy$^_@2&q9Y2m;^taXKE4==4+{WDp0^G)0#8`&VzX z-R+-WCVHF#TNH(+X`(3d_dCV8bFtp{2;7_YTh}$uG);rl#d`P;)U@~?hy&-}Z%x^D zf0*?9Ibv2{S(ZFgRn>p>p$E=EC*TbKft>^IXIU1d)G&|otKYuo{w6qV8-m_;9#2h$z z`t<3bpdcj;O^CnX;y?zbzc9@?a^%PgFaWAY4j+i%#*G_^GzaLf05CucA7JPKh4J_c jq6^bsw{G29wQ7~Tsv3|yeE2ZjUqCLVzu>Y!22cS2rFU8N literal 0 HcmV?d00001 diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/trials2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/trials2-tp.bmp deleted file mode 100644 index efe4f2fad428075db8b6d9cf771ac028d84d86fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1242 zcma)5J!rx}6t>W%yFarTK#oQuoWj;Vlu9LF2nHne0RcGp&e)6Qr15(1cvhVOpFm*phj0LfOxJZ)RdJyI z^{{~$&p#Y+)->Kzc1Q@DwA*d71Tp&XVX4X9#!$8EEc*REp=jq_9Nr!s_yy9#X4f8R zGT>tuqF~+&EHN&n-+O_=y_y7Os~&I`W*>MCnx>(I41M@s8}y04ptx46dEEvF%D`Ln zfyV%LNFU4+1mHjo8_j-{pJmJ@>A2r+ zx1j|=$mjDAxm@o3xfGAbp{v!Zm$R#qtK03uB@;!lP$-ZKQK?kG{%*cHd*K3iv)O?A z< zhJ1-To6QD;fg-wmk`qG{9j8y6ir`RXPLckML?VIU>$%J2ayT3!tkG!T$jQ+I)EO@2 ziz^|3#jt#LT<=lqTew|&^W&?LN%tMe9 zexCvkb4??4E~CG|Q84STEZ8xqzt93_rT(fCcYS{~nLkix%J(l9H_v1;tkjs1FG`1- ztX3;*LBN8+Ah>ALVzFQ=>-G9-zDNNvEMPjF-k2{1;|SwY<(Y^?BIsZ=8m0ASv#F{o z&-1t>7G+t+SDH?zDZn&M1b93ie7E?I6h-NDIzP8oEEY9Q+wU((1nzq=ke5RHj`4~3@+~X`}uqhz1Qn4mrI^nEEcI$ z>XE-%t@`~ww%qYgrxUgizf>w^G8xx(0o-ghQX1eRhKCN@?RNMCKaog~LcZN@LkAzf z!1Y3*0R4D862Dff)$8?Uvx)v7md1_$CQQ^u{9>{AD$H0chLvR9ZkPDFG<4GnWPj#- z#AM*>MkHiLRsEcg`W?r~=kvjGe;y8polXb+hdvsORBF534h93NAFU$;-?r^A>(9Gs ztNMBWgB>33SI2t@`mglKWD<`0?+Yj9aydZCQD#p@4t_%nY$Tt`fN)im^{QmNo);qTr*lw>lQPNxy5 R^%Q__Sr&BOf28RB`~wGH99IAU diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/world-boss3-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/world-boss3-tp.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c01b3c185b4a91af306cc8c16fb335c77c9be24d GIT binary patch literal 642 zcmZXQ&1!>C5QS|weT6Q%Nvg&)rQL-}OQc;Tl8QzwL=YEl-1H^-C_=ReS&Ki}1PLhF zNFJy?b<)d)9=OBY?;eiMyu5y#3%#bO3eFYI1+#M1Oqv~L zEQ-vi`18s1f%eHDmJA!sj`7j+`vie#c9t1M5pk-LBvB?0k;8;nBw(MYUDq*=D`iqX P Date: Wed, 30 Nov 2022 10:52:09 +0700 Subject: [PATCH 6/6] fixed Raid selection --- src/main/java/bh/bot/app/AbstractApplication.java | 7 +++++-- src/main/java/bh/bot/app/dev/TestApp.java | 11 ++++++++++- .../bh/bot/common/types/images/BwMatrixMeta.java | 2 +- .../java/bh/bot/common/utils/InteractionUtil.java | 2 +- .../800x520/buttons/globally.radio-button2-mx.bmp | Bin 774 -> 0 bytes .../800x520/buttons/globally.radio-button3-mx.bmp | Bin 0 -> 714 bytes 6 files changed, 17 insertions(+), 5 deletions(-) delete mode 100644 src/main/resources/game-images/800x520/buttons/globally.radio-button2-mx.bmp create mode 100644 src/main/resources/game-images/800x520/buttons/globally.radio-button3-mx.bmp diff --git a/src/main/java/bh/bot/app/AbstractApplication.java b/src/main/java/bh/bot/app/AbstractApplication.java index b320a7f..3fbc4ab 100644 --- a/src/main/java/bh/bot/app/AbstractApplication.java +++ b/src/main/java/bh/bot/app/AbstractApplication.java @@ -605,7 +605,9 @@ protected Tuple2 detectRadioButtons(Rectangle scanRect) { try (ScreenCapturedResult screenCapturedResult = captureElementInEstimatedArea( new Offset(Math.max(0, scanRect.x - positionTolerant), Math.max(0, scanRect.y - positionTolerant)), - scanRect.width + positionTolerant * 2, scanRect.height + positionTolerant * 2)) { + scanRect.width + positionTolerant * 2, + scanRect.height + positionTolerant * 2 + )) { BufferedImage sc = screenCapturedResult.image; saveDebugImage(sc, "detectRadioButtons"); @@ -675,7 +677,7 @@ protected Tuple2 detectRadioButtons(Rectangle scanRect) { else { if (selectedRadioButtonIndex != curRadioButtonIndex) throw new InvalidDataException( - "Found more than one selected radio button which is absolutely wrong!" + String.format("Found more than one selected radio button which is absolutely wrong! (no.%d conflicts with no.%d)", curRadioButtonIndex + 1, selectedRadioButtonIndex + 1) ); } break; @@ -687,6 +689,7 @@ protected Tuple2 detectRadioButtons(Rectangle scanRect) { x, y ); startingCoords.add(new Point(x, y)); + x += Math.max(0, im.getWidth() - 2); } } diff --git a/src/main/java/bh/bot/app/dev/TestApp.java b/src/main/java/bh/bot/app/dev/TestApp.java index 0d2366b..b18ae46 100644 --- a/src/main/java/bh/bot/app/dev/TestApp.java +++ b/src/main/java/bh/bot/app/dev/TestApp.java @@ -41,7 +41,16 @@ protected void internalRun(String[] args) { adjustScreenOffset(); // - findAttendablePlaces(); + Tuple2 result = detectRadioButtons( + Configuration.screenResolutionProfile.getRectangleRadioButtonsOfRaid() + ); + Point[] points = result._1; + int selectedLevel = result._2 + 1; + info("Selected %d", selectedLevel); + for (int i = 0; i < points.length; i++) { + Point p = points[i]; + info("[%d] %d,%d", i + 1, p.x - Configuration.gameScreenOffset.X.get(), p.y - Configuration.gameScreenOffset.Y.get()); + } } private static void testParseTime() { diff --git a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java index 78bc312..1972cdf 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -393,7 +393,7 @@ public static void load() throws IOException { 0xFFFFFF ); Metas.Globally.Buttons.radioButton = BwMatrixMeta.from(// - "buttons/globally.radio-button2?", + "buttons/globally.radio-button3?", Offset.none(), // 0x000000 ); diff --git a/src/main/java/bh/bot/common/utils/InteractionUtil.java b/src/main/java/bh/bot/common/utils/InteractionUtil.java index 36d8ca8..261f70c 100644 --- a/src/main/java/bh/bot/common/utils/InteractionUtil.java +++ b/src/main/java/bh/bot/common/utils/InteractionUtil.java @@ -77,7 +77,7 @@ public static void hideCursor() { public static void clickRadioButton(int level, Point[] points, String evName) { if (level < 1 || level > points.length) throw new InvalidDataException( - "Can not select level %d of %s because it's not exists, do you setup wrongly?", level, evName + "Can not select level %d/%d of %s because it's not exists, do you setup wrongly?", level, points.length, evName ); Point p = points[level - 1]; moveCursor(new Point(p.x + 7, p.y + 7)); diff --git a/src/main/resources/game-images/800x520/buttons/globally.radio-button2-mx.bmp b/src/main/resources/game-images/800x520/buttons/globally.radio-button2-mx.bmp deleted file mode 100644 index 3654b4059af6f299bd3a98fadaa6c6a3ba84d343..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 774 zcmb7?yAH!33`I#RW$oILu?v>1&;V=q{(Jt2P=u{oB7-gb;BsW~`h3^B>$bP}YW^6$ zxM$aoTTd!fHl^wbBXy5KYK^FwFeTae;De6^X5`a q`=OjnJi_nmuw7k#(}z)v^46?PvM_*~)Dw;+VLXD=yg13iWZX^>=Elze diff --git a/src/main/resources/game-images/800x520/buttons/globally.radio-button3-mx.bmp b/src/main/resources/game-images/800x520/buttons/globally.radio-button3-mx.bmp new file mode 100644 index 0000000000000000000000000000000000000000..71af434c808b42ddbca5ec3db40babe8f812a06a GIT binary patch literal 714 zcmZ?rJ;lTT24+A~1Bm&6m>-B486