From 497ac3307582186b9dcc66a4d510a45ced24c383 Mon Sep 17 00:00:00 2001 From: 9-9-9-9 <9-9-9-9> Date: Wed, 16 Nov 2022 22:43:48 +0700 Subject: [PATCH 01/16] replace images --- .../800x520/buttons/fishing.start-mx.bmp | Bin 3354 -> 0 bytes .../800x520/buttons/fishing.start-tp.bmp | Bin 0 -> 3354 bytes .../game-images/800x520/labels/fishing-mx.bmp | Bin 4278 -> 0 bytes .../800x520/labels/fishing.fishing-tp.bmp | Bin 0 -> 4214 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/game-images/800x520/buttons/fishing.start-mx.bmp create mode 100644 src/main/resources/game-images/800x520/buttons/fishing.start-tp.bmp delete mode 100644 src/main/resources/game-images/800x520/labels/fishing-mx.bmp create mode 100644 src/main/resources/game-images/800x520/labels/fishing.fishing-tp.bmp diff --git a/src/main/resources/game-images/800x520/buttons/fishing.start-mx.bmp b/src/main/resources/game-images/800x520/buttons/fishing.start-mx.bmp deleted file mode 100644 index d7f98b9876d676f3e101e5f68ec5f5da97428a91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3354 zcmdT_K~4iP3=DS=SHuf=K_9@41ONX3|0v$rnT``XUg)USL+jT` zo-cC0$^9tzU3-#eYajRhReGGmtF^ONnOPfxhiqe*6wK$PW~q?xaapN)K~brjo;+mA zVNx)k|7CA#_Ex>w$@B?v%t!bS-l(4+cCviG-NiLuf{tOM;31pZn)DgiD@^(D)>YOg z(ucSydp^jZ9X;r8YQ=AKt->3ttnnnMWtjFQfyo?)-k5-RE}`q4w=oY$ zOhI{CNy$kT%YwJ^xuHlBl&AG)-n7BFpZ&SP6uxp7%wm1LQB1r!O_UU!h@X*VpYie9 zbV5~@ZP>pC8$~5=2p%%+Fe#YNU*W9_O*6CQD8s0m3-2A|lt4i2jn#-O;lcN)Ecs%T z^JxslltDn5JlZ9VG%ShR|3)g-fs!J~7-1-G=)rbJ5t1c&;rBSBQGV!BDhN?Nz?RfO S#+CO0$|cCjQskR7YUdMU*P0dp diff --git a/src/main/resources/game-images/800x520/buttons/fishing.start-tp.bmp b/src/main/resources/game-images/800x520/buttons/fishing.start-tp.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7d40d8e2f3232e5f2b9334a1f9ac7d50086871e4 GIT binary patch literal 3354 zcmds3Pl!@M9Dd!4uKszwwOv>vjU+`^%tL02A%V~(I&@gVE?X!VEnZq;4HHxHloboh zN+4Z?g7zRm2Fo5?TJ7dxPhHgO9@I;H`+hLa?!33TN*na!y>a~Jd*94Azj-q+aLaT? zQp1h%0`8l*&*DBM8Bj{n&(rG9f#R2bwA*cq#bQ*$blo%c{q5AwJ6xt~ZeZKn+w4)l z-w#Boq=;ai_u}u?))pfK0s$cM^9LxS(I~@9r4kTCp-^Dp($W$TITbZ3vcuu%^?KCQ zYPEoyJeR2#rf2>KZ_KUN z>pgjI=n*kd-tOu|qtW=c-h#p4Q#A&I0gdF?Ym%l%EdPc#>Se_DEffl|$sOMtR2~b_ zY&Mzn> zBYLaX>lh~jvdWx;dU1b!ZJxG>XTUkvB_bSk2Jq+G%dJ>SErj)pCK*A#IEy;JCh5C`2qW&3L>A9C^Xv@k2o-TnveuzDOyM1! zu-okhgTZRG^6k7g9uJ4Zq|STe3GsOR=)5g2FZ29E-&_#K(Z>_`Z!R7mdSm^G6_;y2 zX+ED%Y!Z<~A|ZMcX@qF5Nj);XZxCNtSkU9}xRl9cve_&TiS_ZkK^d{Ju^|cqSzTQv y0!;+fi^ZZQd2@4McPtFe-&_Dt7b-6JJqp|6qKX6J%uZTNr-w# zusP7Lau%D8zPpbNzk6OiA&R z781NI#HG0vIT7Kag^t-4`sP>V_zh1{Hu{BwglsmY9Jm!_6oi-Kl>}>Q!TNT@%*%4{0A5@d`Ew8Qj60n zFNnS>#Ob_iB7{7557@=d^wfA(wGV2hsObnDitT7tY|@F4&7HVwSCL!)ywA>{10*Jo zN^6!=uwQ02+o&H8ydN@TvlqjC8c+fqN$7{;Idh=-S8;{zDxMLD#zs8vBA{NHRXk|7 Luofl0KOM(E)dq8! diff --git a/src/main/resources/game-images/800x520/labels/fishing.fishing-tp.bmp b/src/main/resources/game-images/800x520/labels/fishing.fishing-tp.bmp new file mode 100644 index 0000000000000000000000000000000000000000..367aafc01a7053268658e5c7656d31df663318bb GIT binary patch literal 4214 zcmd5@Zvdo+L-pt#N_hyIGkDnhEOOm*M#b*^C z)AT`6aaWY@w%;1qw|hsj*{r5%YBUy_`QpB!F}Tv{w1d6h-`|G?vbnj*Mp?PIxBy0t z=xR6uWo>PZF-J#7mMf}7bSPI>SL{lqQn1X<&awpxERdCz6*g8X6(=* zSX^90M#C^D`*1iEADwj&55P3`!EYboRP}oOe{s-mw|N=jG6#bJ+a(S(-JmOEe1575 zPCejxd=_SWWPW~rG#U~9J#f(Nb`yyNFLr%>ou5VKfPOLSuIis`8vHmwrL&5iFv(Wq z@%T6#@WkoX13nA955PezW>$6*9}ZAgQE5rGx3_^s!3yTUEcp5ikokPxnfmn2M0@T7 z)aNH?rP6FR89#YV4B%jEYYTbL&(ArXun*V<<>26891egX0SDrAm+r}d3nLEyDF=Id zdtxr=6LYY!v2l2Kcye;$3QR-18*vIDM3wkn@WhkxeQ;1Nm$7O!tcUcNc|{Bi(IfG~ zxhA4VVxz1C^anDSEidCBtZTUb?hgXaLf}3?kMvCtlLOR)uyt9D*s~nuaycP@ty)}0 zLYmzt@`IvB62Y&piDq4X0S97I(uK1?eIl0ZC*yG7H<#?C+ zD*^{QJ3H9eo%5mz82Hn-rn*ilR4=1dLmfV1r9iX zOKCJ3V{+h{$V1Qfg8hGC0uDI7tjHY57`7 Date: Wed, 16 Nov 2022 22:45:23 +0700 Subject: [PATCH 02/16] update version and fix Fishing label pos --- pom.xml | 2 +- src/main/java/bh/bot/common/types/ScreenResolutionProfile.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d5a4935f..d0bc03c0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 bh.bot 99bot - 2.10.1 + 2.11.0 diff --git a/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java b/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java index f7a9736a..fdc95d29 100644 --- a/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java +++ b/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java @@ -266,7 +266,7 @@ public Offset getOffsetButtonReconnect() { @Override public Offset getOffsetLabelFishing() { - return new Offset(355, 13); + return new Offset(356, 13); } @Override From 2cf0afa07194065b126fd495d1c2e1ef5aa45c41 Mon Sep 17 00:00:00 2001 From: 9-9-9-9 <9-9-9-9> Date: Wed, 16 Nov 2022 22:45:53 +0700 Subject: [PATCH 03/16] rename image fishing label --- src/main/java/bh/bot/common/types/images/BwMatrixMeta.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0b232da7..55609634 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -495,7 +495,7 @@ public static void load() throws IOException { // Fishing Metas.Fishing.Labels.fishing = BwMatrixMeta.from(// - "labels/fishing?", + "labels/fishing.fishing?", Configuration.screenResolutionProfile.getOffsetLabelFishing(), // 0xFFFFFF ); From add1afd32e08d469c73c0d0bbb93c0260e9032db Mon Sep 17 00:00:00 2001 From: 9-9-9-9 <9-9-9-9> Date: Wed, 16 Nov 2022 23:02:28 +0700 Subject: [PATCH 04/16] fixed fishing --- src/main/java/bh/bot/app/FishingApp.java | 30 +++++++++++------- .../bot/common/types/images/BwMatrixMeta.java | 8 ++--- .../800x520/buttons/fishing.cast-mx.bmp | Bin 2694 -> 0 bytes .../800x520/buttons/fishing.cast2-tp.bmp | Bin 0 -> 2634 bytes .../800x520/buttons/fishing.catch-mx.bmp | Bin 3354 -> 0 bytes .../800x520/buttons/fishing.catch2-tp.bmp | Bin 0 -> 3354 bytes ...ing.start-tp.bmp => fishing.start2-tp.bmp} | Bin ...fishing-tp.bmp => fishing.fishing2-tp.bmp} | Bin 8 files changed, 22 insertions(+), 16 deletions(-) delete mode 100644 src/main/resources/game-images/800x520/buttons/fishing.cast-mx.bmp create mode 100644 src/main/resources/game-images/800x520/buttons/fishing.cast2-tp.bmp delete mode 100644 src/main/resources/game-images/800x520/buttons/fishing.catch-mx.bmp create mode 100644 src/main/resources/game-images/800x520/buttons/fishing.catch2-tp.bmp rename src/main/resources/game-images/800x520/buttons/{fishing.start-tp.bmp => fishing.start2-tp.bmp} (100%) rename src/main/resources/game-images/800x520/labels/{fishing.fishing-tp.bmp => fishing.fishing2-tp.bmp} (100%) diff --git a/src/main/java/bh/bot/app/FishingApp.java b/src/main/java/bh/bot/app/FishingApp.java index 7a7ab9e4..daea8862 100644 --- a/src/main/java/bh/bot/app/FishingApp.java +++ b/src/main/java/bh/bot/app/FishingApp.java @@ -197,12 +197,12 @@ private void doLoopFishing(int loopCount, final AtomicBoolean masterSwitch, fina } else if (curScreen == screenCast) { debug("On screen CAST"); - Offset offsetScanCastingFish = Configuration.screenResolutionProfile - .getOffsetScanCastingFish(); - Size scanSizeCastingFish = Configuration.screenResolutionProfile - .getScanSizeCastingFish(); - BufferedImage sc = captureScreen(anchorPoint.x + offsetScanCastingFish.X, - anchorPoint.y + offsetScanCastingFish.Y, scanSizeCastingFish.W, scanSizeCastingFish.H); + Offset offsetScanCastingFish = Configuration.screenResolutionProfile.getOffsetScanCastingFish(); + Size scanSizeCastingFish = Configuration.screenResolutionProfile.getScanSizeCastingFish(); + BufferedImage sc = captureScreen( + anchorPoint.x + offsetScanCastingFish.X, anchorPoint.y + offsetScanCastingFish.Y, + scanSizeCastingFish.W, scanSizeCastingFish.H + ); final int black = 0x000000; try { final int offset1 = 0; @@ -336,9 +336,12 @@ private boolean isContains(BufferedImage sc, BwMatrixMeta im, @SuppressWarnings( blackPixelDRgb, // sc.getRGB(offsetX + px[0], offsetY + px[1]) & 0xFFFFFF, // colorTolerant, im.getOriginalPixelPart(px[0], px[1]))) { - optionalDebug(debug, "Fail (1) at %3d, %3d (offset=%3d, %3d, coord=%3d, %3d) with color: %d vs %d", - offsetX + px[0], offsetY + px[1], offsetX, offsetY, px[0], px[1], blackPixelRgb, - sc.getRGB(offsetX + px[0], offsetY + px[1]) & 0xFFFFFF); + optionalDebug( + debug, + "Fail (1) at %3d, %3d (offset=%3d, %3d, coord=%3d, %3d) with color: %s vs %s", + offsetX + px[0], offsetY + px[1], offsetX, offsetY, px[0], px[1], + String.format("%06X", blackPixelRgb), String.format("%06X", sc.getRGB(offsetX + px[0], offsetY + px[1]) & 0xFFFFFF) + ); return false; } } @@ -348,9 +351,12 @@ private boolean isContains(BufferedImage sc, BwMatrixMeta im, @SuppressWarnings( blackPixelRgb, // sc.getRGB(offsetX + px[0], offsetY + px[1]) & 0xFFFFFF, // colorTolerant)) { - optionalDebug(debug, "Fail (2) at %3d, %3d (offset=%3d, %3d, coord=%3d, %3d) with color: %d vs %d", - offsetX + px[0], offsetY + px[1], offsetX, offsetY, px[0], px[1], blackPixelRgb, - sc.getRGB(offsetX + px[0], offsetY + px[1]) & 0xFFFFFF); + optionalDebug( + debug, + "Fail (2) at %3d, %3d (offset=%3d, %3d, coord=%3d, %3d) with color: %s vs %s", + offsetX + px[0], offsetY + px[1], offsetX, offsetY, px[0], px[1], + String.format("%06X", blackPixelRgb), String.format("%06X", sc.getRGB(offsetX + px[0], offsetY + px[1]) & 0xFFFFFF) + ); return false; } } 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 55609634..15243091 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -495,22 +495,22 @@ public static void load() throws IOException { // Fishing Metas.Fishing.Labels.fishing = BwMatrixMeta.from(// - "labels/fishing.fishing?", + "labels/fishing.fishing2?", Configuration.screenResolutionProfile.getOffsetLabelFishing(), // 0xFFFFFF ); Metas.Fishing.Buttons.start = BwMatrixMeta.from(// - "buttons/fishing.start?", + "buttons/fishing.start2?", Configuration.screenResolutionProfile.getOffsetButtonFishingStart(), // 0xFFFFFF ); Metas.Fishing.Buttons.cast = BwMatrixMeta.from(// - "buttons/fishing.cast?", + "buttons/fishing.cast2?", Configuration.screenResolutionProfile.getOffsetButtonFishingCast(), // 0xFFFFFF ); Metas.Fishing.Buttons.catch_ = BwMatrixMeta.from(// - "buttons/fishing.catch?", + "buttons/fishing.catch2?", Configuration.screenResolutionProfile.getOffsetButtonFishingCatch(), // 0xFFFFFF ); diff --git a/src/main/resources/game-images/800x520/buttons/fishing.cast-mx.bmp b/src/main/resources/game-images/800x520/buttons/fishing.cast-mx.bmp deleted file mode 100644 index fd0147646af51beaee0f62901e9f7dccaef64c95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2694 zcmc&yL2|<|2vo1V4)GfoAg{$T%__9DR@Fz7nsR7-yEuBWC4As{mY>!VR z^Q0$|tiiNK50VyWk|QvadP!oG*i&g&Fn*(mUP4HMmtI=0$ssXu zLk~FwLPF4!kdx$IsL+BC$SG$%<=XzqEYERf)x;0_m>u4}_s`5Pvu|JWVSe_d(zXfA z!?>n!_27D;yvD33udICg#+n=sM<5XRd#CyRe#kUUYqeTTSg+R+(I?*Q@4khTN~LIl za5#(ztX8X0P<9fD1e0Mt{H|aATEI9yn!&AM7^JUMDu}FoaU-k5VzGEUPB~lWIap28 z#MUsNY%ggYvD(53!RKIQTNI1Mhp?7PrL9{`*LAGeZ4KPA*j6+erL%Y-YoSm8kgW|3 zx?H_ZnU%!0^-5X6357yW!@3jFPRto$oS*vC{$7D~gEJH#ZO`7Vz12}vAt*VOz> z6S6M0tz0hC7QB5diO i>E8cY!C(+FvPPpJ?}`X|6w^4Jq;+)CU!m^kT>k-u;|Ubb<`fzkYQ81-gezJwgy7Wy#82dA0+S07%OD`uVt}5_fri z%Ka_(o7^wyU7jiZzLp<)9LJH8T<0MyPs_;~?C{8%-zg#T=|+Mby9sSr@FKAy^H&ar42Ol?Qm)ajM-RSk3YzSk%e`yzDsD?hveId6NCz zM*ngyi*Oz?eGFb$p^LFl`c}~{od{%t3&>Xhw*bHy0(y-mf42N_sH>@|ak*SSs+!GagUneXn zYptPwY9Zh zlG3N!?Pjw}OH1%HdmlEqx-iIOGHgn-yu6%BrP#T2aH?#ku_5F%F)@Km(&@A`fm|+! zSs0YCqq0e3@y=qg_!rnFCnx!vO2^yV+b3j;$K$OPj3P>F^6Jnd%>GGD(z@|%!^6WY z5v$d@x3@>ARoI&PA4qDFeM4YFmio&^u{GScYZXOgBj(d!qfF2PvQQ{cl3QC_@W8~H zBtQB?&zp*^^+kVAepS^R*)Lk%A-0{Joq5hyR#sS?~rI)=1kA2Y7+16Zq8z{7^?)TN!!#Y1?i|zlbxT#Bru0cFL$vfJ7>bm#oCsZ zmXDkfC(nj=HL1e2WuEJ*W^)H5t zSE~2>{g`z+os{me*vf%Dkw`=ud3}AI1Qc2Iyum4F!^Cg@2RIxK3W{D)lzcuf&7ilp Xmt;Ca9R^2d)74#~3s3w%K+g6P Date: Wed, 16 Nov 2022 23:15:11 +0700 Subject: [PATCH 05/16] add TODO list on readme --- README.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 39706907..378155fc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,18 @@ # IMPORTANT: Sadly, bot no longer works with new update Nov 16th, 2022 -## I don't know if I can fix this or not, haven't know why atm +### Fixed functions: +- [x] Fishing +- [ ] PVP +- [ ] WB Solo +- [ ] WB Team +- [ ] Raid +- [ ] GVG +- [ ] Invasion +- [ ] Expedision 1 +- [ ] Expedision 2 +- [ ] Expedision 3 +- [ ] Expedision 4 +- [ ] Trials +- [ ] Gauntlet **Upgrade notes:** copy configuration files `user-config.properties` and `readonly.*.user-config.properties` from previous bot version's directory _(if you update the bot via auto-update method then no need to do this)_ ___ From 978c1191271414ac52d854efff2daecee2f77bc3 Mon Sep 17 00:00:00 2001 From: 9-9-9-9 <9-9-9-9> Date: Wed, 16 Nov 2022 23:53:51 +0700 Subject: [PATCH 06/16] update attendable place images for: PVP + World-Boss + Raid --- README.md | 1 + .../java/bh/bot/common/types/AttendablePlace.java | 14 +++++++++++++- .../800x520/labels/attendable-places/pvp-mx.bmp | Bin 702 -> 0 bytes .../800x520/labels/attendable-places/pvp2-tp.bmp | Bin 0 -> 666 bytes .../800x520/labels/attendable-places/raid-mx.bmp | Bin 810 -> 0 bytes .../800x520/labels/attendable-places/raid2-tp.bmp | Bin 0 -> 774 bytes .../labels/attendable-places/world-boss-mx.bmp | Bin 918 -> 0 bytes .../labels/attendable-places/world-boss2-tp.bmp | Bin 0 -> 918 bytes 8 files changed, 14 insertions(+), 1 deletion(-) delete mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/pvp-mx.bmp create mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/pvp2-tp.bmp delete mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/raid-mx.bmp create mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/raid2-tp.bmp delete mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/world-boss-mx.bmp create mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/world-boss2-tp.bmp diff --git a/README.md b/README.md index 378155fc..d9b470aa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # IMPORTANT: Sadly, bot no longer works with new update Nov 16th, 2022 ### Fixed functions: - [x] Fishing +- [ ] ReRun - [ ] PVP - [ ] WB Solo - [ ] WB Team diff --git a/src/main/java/bh/bot/common/types/AttendablePlace.java b/src/main/java/bh/bot/common/types/AttendablePlace.java index 9fa73965..ce9dacbf 100644 --- a/src/main/java/bh/bot/common/types/AttendablePlace.java +++ b/src/main/java/bh/bot/common/types/AttendablePlace.java @@ -21,8 +21,20 @@ public AttendablePlace(String name, int id, String imgName, boolean left) throws public AttendablePlace(String name, int id, String imgCode, boolean left, int procedureTicketMinutes) throws IOException { this.name = name; this.id = id; + + String imgFile; + switch(imgCode) { + case "pvp": + case "world-boss": + case "raid": + imgFile = imgCode + "2"; + break; + default: + imgFile = imgCode; + break; + } this.img = BwMatrixMeta.from( - String.format("labels/attendable-places/%s?", imgCode), + String.format("labels/attendable-places/%s?", imgFile), new Offset(0, 0), 0xFFFFFF ); diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/pvp-mx.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/pvp-mx.bmp deleted file mode 100644 index bbef4167e3725a5e97a11e593fa5c8b0a8c56b71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 702 zcmb_W!3}^g2tR=^!_taY3TcrNG0Z%WNbNtgVFPG k5)h8$XY-vU()#A<-xr;50?h!@!&e({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~|PDTJQ3=1&v0TK@&4&VTG{(poW+y*QY+5w4(rmk_EwCgr^mSaJlutuyNtFZyu zY;W^cOb5aYp9gV`hm4xLDD8Ae_$SZcuYHMYy?i82<$507nI;swAc)_xtNeLQCp8D3 z_pi%GUN2lnONezIk^ss-aB0pk8}&85=nt{Rr&=#$UmO*yEiwH8G{`$y^hqTrtiyrM diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/raid2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/raid2-tp.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a2c64f2a447fd47b6823cbb2337b96e28bccfb78 GIT binary patch literal 774 zcma)4v1)`s5ZxpYNS7v@=DgkGit|7SDMG+DO&Zf!YatfaRu-0ij)lJv)DH**5o}Js zKx+%l!^OiGbKHZSot=66nAx4TkJ}qE;1%|O^@w$cbwvbNLcXqt?U(8M-gVu3`AJn( z_-)%V#yro1AIGsEF+rk9lHlk#jx5U{z*iK-wrx05fItWW(0gDzuGe+lc|9($sF&yY zsArmH7>3}^^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&4BzA8=aw^`y8v;)3Mu7cQPcctv3n{tc48CYk`*o))bs{e4;1L@FEcsC3qB&h MlBX;nQFxcs2hIklg#Z8m diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/world-boss2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/world-boss2-tp.bmp new file mode 100644 index 0000000000000000000000000000000000000000..402e172c53edcd6b23789253ac623b9f84fe5463 GIT binary patch literal 918 zcmZXSJ!=9%5QZ(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 literal 0 HcmV?d00001 From 498c56b7ff50a401b5213a37613140b20d0c35a2 Mon Sep 17 00:00:00 2001 From: 9-9-9-9 <9-9-9-9> Date: Thu, 17 Nov 2022 00:01:36 +0700 Subject: [PATCH 07/16] update attendable place images for: GVG + Trials --- README.md | 8 ++++---- .../bh/bot/common/types/AttendablePlace.java | 5 +++++ .../800x520/labels/attendable-places/gvg-mx.bmp | Bin 702 -> 0 bytes .../800x520/labels/attendable-places/gvg2-tp.bmp | Bin 0 -> 666 bytes .../labels/attendable-places/trials-mx.bmp | Bin 1242 -> 0 bytes .../labels/attendable-places/trials2-tp.bmp | Bin 0 -> 1242 bytes 6 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/gvg-mx.bmp create mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/gvg2-tp.bmp delete mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/trials-mx.bmp create mode 100644 src/main/resources/game-images/800x520/labels/attendable-places/trials2-tp.bmp diff --git a/README.md b/README.md index d9b470aa..96b08fda 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ - [ ] Raid - [ ] GVG - [ ] Invasion -- [ ] Expedision 1 -- [ ] Expedision 2 -- [ ] Expedision 3 -- [ ] Expedision 4 +- [ ] Expedition 1 +- [ ] Expedition 2 +- [ ] Expedition 3 +- [ ] Expedition 4 - [ ] Trials - [ ] Gauntlet diff --git a/src/main/java/bh/bot/common/types/AttendablePlace.java b/src/main/java/bh/bot/common/types/AttendablePlace.java index ce9dacbf..48bda573 100644 --- a/src/main/java/bh/bot/common/types/AttendablePlace.java +++ b/src/main/java/bh/bot/common/types/AttendablePlace.java @@ -27,8 +27,13 @@ public AttendablePlace(String name, int id, String imgCode, boolean left, int pr case "pvp": case "world-boss": case "raid": + case "gvg": + case "trials": imgFile = imgCode + "2"; break; + case "expedition": + case "gauntlet": + case "invasion": default: imgFile = imgCode; break; diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/gvg-mx.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/gvg-mx.bmp deleted file mode 100644 index 81f4763d2740db23ab171df7136d6463e6740f7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 702 zcmbtQ!3}^w2t$8Ppd&be1Ne6@r*bvzf!7cq@gWJM^k_l%;~GU{LtT+GazYNWpo*OD zyEZI0kpmz--&zah{gV?FF!*4?`xJssnUISLAG6YXOcW#~Ngo1?1z~8tk6}s(AhF1{ l{iPTH#rgJI(zj$!y4i53&G5^|Z{Y!de4x$2E#*Ch3wS zF4&B~z`%lng6isOG&7bhTUK6P4ip3epscgAGu#Xr85y7m#LF-<>gwtsYLVTsWXTe3 zZEc`QZ{EBC%DTF`BAc;w>sE*sBr`69!KF)=;9&|h!_i7rPFCu{g9lj6fM|i40Sq-b zP*ahGI1*@vr-M2!GvMmMW*k5Q`}glhb_Z57fNnz4ae#pVPx=75BR)P}K|ulT7Y7H2 P#Kgp3zkWeN0u~+s{=0^~ literal 0 HcmV?d00001 diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/trials-mx.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/trials-mx.bmp deleted file mode 100644 index 00a6bc505b996a22a12a920358a30a79735d36d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1242 zcmcIg!3_d23=0w;HeduEycvK$TQU{P98TRDUpP1kaZwwksbjmn-X8mCaX~&|pRo_v zyEr08-1~hy^fXOV1Qr9QjMDMrs2%1tcsMT3!QJ~hs;J|6{*MPqsPLz$nZ>(e>5O-A zN<41W>!fVU@$4+-gcZf4oBzWSA?Ktea@XxO2|W*!8ejE5DksM*qF5z>`9)5c44C>1 z4?w%>J797E 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 new file mode 100644 index 0000000000000000000000000000000000000000..efe4f2fad428075db8b6d9cf771ac028d84d86fb GIT binary patch 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+1mHjo Date: Thu, 17 Nov 2022 00:12:39 +0700 Subject: [PATCH 08/16] fixed ReRun --- README.md | 2 +- .../bh/bot/common/types/images/BwMatrixMeta.java | 4 ++-- .../800x520/buttons/dungeons.rerun-mx.bmp | Bin 3054 -> 0 bytes .../800x520/buttons/dungeons.rerun2-tp.bmp | Bin 0 -> 2654 bytes .../game-images/800x520/buttons/raid.town-mx.bmp | Bin 2406 -> 0 bytes .../800x520/buttons/raid.town2-tp.bmp | Bin 0 -> 2406 bytes 6 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 src/main/resources/game-images/800x520/buttons/dungeons.rerun-mx.bmp create mode 100644 src/main/resources/game-images/800x520/buttons/dungeons.rerun2-tp.bmp delete mode 100644 src/main/resources/game-images/800x520/buttons/raid.town-mx.bmp create mode 100644 src/main/resources/game-images/800x520/buttons/raid.town2-tp.bmp diff --git a/README.md b/README.md index 96b08fda..fc97a481 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # IMPORTANT: Sadly, bot no longer works with new update Nov 16th, 2022 ### Fixed functions: - [x] Fishing -- [ ] ReRun +- [x] ReRun - [ ] PVP - [ ] WB Solo - [ ] WB Team 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 15243091..e7ec19bb 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -442,7 +442,7 @@ public static void load() throws IOException { 0xFFFFFF ); Metas.Dungeons.Buttons.rerun = BwMatrixMeta.from(// - "buttons/dungeons.rerun?", + "buttons/dungeons.rerun2?", Configuration.screenResolutionProfile.getOffsetButtonDungeonReRun(), // 0xFFFFFF); @@ -756,7 +756,7 @@ public static void load() throws IOException { // Raid Metas.Raid.Buttons.town = BwMatrixMeta.from(// - "buttons/raid.town?", // + "buttons/raid.town2?", // Configuration.screenResolutionProfile.getOffsetButtonTownWhenDefeatedInRaid(), // 0xFFFFFF ); diff --git a/src/main/resources/game-images/800x520/buttons/dungeons.rerun-mx.bmp b/src/main/resources/game-images/800x520/buttons/dungeons.rerun-mx.bmp deleted file mode 100644 index f6606c3650e0418e3df66afb3d6c60d3ad32b72e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3054 zcmbW0!F9th3`5m(550DTPS62z@4lU?E2N~UNB|+)O7xy>1_D1Q`{nlY_uh{6ZTBy` zZgzdx_0~S^-r8^9KYr-#9;>xG>~+x|tb?VO?qpBZTj|KGJe3Z;-J-J`N}3V+UOLAW zGva(CohJrm9p*Vd2N>7oex^FtM4QwW&+AGo)`8Gp0q=VcE7pO|S&MV@Cc@AmoR~vb zrz^2!sz+B!3)y?5qm%T(&SkG*RriQkSA=e}2Rk2!a6IqCPw!)WI9*SRot+>N%AA-) zunkqh%{qjnvSOocdiL1U&r_V~drq8+>;5(^f=TF_`BBx*=&G2L!vxn=*~`K?jUgo5 z58}LYCOWZJW<}U{0>8g3o<&L4F`aXOqe{K##31t~=isQWN|;$s_+^50jMQAP(}#_f zbQ4wCbQVlJ$H87Ca3*~ZXz@8tog+$}afY?N#~kpYPlDP#x%&(E5Bn z#%na>PIbI^qI+otMAnf`r`zo|kCPoW9lBRfl{J&B!)P?tYBe>^Znujruh)yo+*}6+ zZA@&g4w`$j+5A4wqR}XZ!)Ee<2q?F=w^=&n13E4*FDaPI<(Ts1G5kDg8ASAWu zGJJHd9DDH4-V*acnBj0pQ;WyrAPfWo7$xR|bgX=OujqBR)4@x?PBxq6H4=3&01jac z-o4e*S3LT6Z-8VSB9i=YI6UPv8vd7#VzGz=0Y<;f`4DGEI@S*NpO?Skd2q0^SVt@t z1EI&`0Zi7h9`r7mkM%EyU;q_Q=IXrSz>FjB4-s%v9W+*LfBX#{ICpmiTX0@sp9{cU ztc%(A_R;YXp8NZ+#eCrY5Rtq9|5yj^LCk_|v5qU$?BBWP6@lj7AAIi8K7Y7$T@mNJ zx*Cl}r-F4l9a=uQu3D{@0K9fl`$W(Cyj(6{cb}gAHXqCAI6psU&a<;K=3KZxFlA8( zK6#w%i1)b~5?3_3)aq)1jz*)Q#)+h&OI=4kpP#K8MOpm+l~${zA$q;OUa!kqBasMm Y%IB3?rLJg*!{Lw#5plcS0BAHn0m8P0wEzGB literal 0 HcmV?d00001 diff --git a/src/main/resources/game-images/800x520/buttons/raid.town-mx.bmp b/src/main/resources/game-images/800x520/buttons/raid.town-mx.bmp deleted file mode 100644 index a01dd9ac1069214e57f142db7b7c09f025e892ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2406 zcma)+J+i_u41`TdL(LIhNySjpa}Dl)13&pEi>#HbcqWPSX?LZ#$ouoXmcE{H|C8$_ z*G;ZVxy!wj$E^34d8@}Nr7C{V^|@-4ysWw^Q94a4_5SBt^^OTz-03iSX diff --git a/src/main/resources/game-images/800x520/buttons/raid.town2-tp.bmp b/src/main/resources/game-images/800x520/buttons/raid.town2-tp.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c60fc2523fb12eac98e220b80f81434a0ccec58d GIT binary patch literal 2406 zcmZ?rP2*$$12Z700mK$S%m>7b3=%++fx!SO59UCLF#oq+E{7#0B{MTK|HD8;M1+)- zw4eJ0plq=36EzhVpaLK$E-r>CLC`;c{xmc+geXvuH-IpDdwUTou(6IEI|fk+AvbT{ z3{iFC#too|o_2zUny<35^6S^HA>stx>Fo+KFf}!G_Uze<7A?YN=YOCS5GW`p097_L zGyvHfH*UnL5-xb*!UdqR>C>lE-JNhNzJ2@l6$apfZ{ECtxU;#r87>G>1?K`8Xd*jy z?4X@HV`F30U||0I`4DGdb*G1i2TALGJ7IU2KEN{+b#lud{{1(XHmcSwo?lECx{ z6!CTgWmOu*yP0vKo{k@Kxs;K3AD26mVlDz@2Z=kSrR9MLYj{GWloa)_h9^YVe7yOc z?0f{V8aX^;V4$d|2p+R3DJd}F7;SBBG Date: Thu, 17 Nov 2022 00:19:24 +0700 Subject: [PATCH 09/16] update reconnect button --- .../bh/bot/common/types/images/BwMatrixMeta.java | 2 +- .../800x520/buttons/globally.reconnect-mx.bmp | Bin 4422 -> 0 bytes .../800x520/buttons/globally.reconnect2-tp.bmp | Bin 0 -> 4422 bytes 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 src/main/resources/game-images/800x520/buttons/globally.reconnect-mx.bmp create mode 100644 src/main/resources/game-images/800x520/buttons/globally.reconnect2-tp.bmp 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 e7ec19bb..eb9be099 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -377,7 +377,7 @@ public static void load() throws IOException { 0x000000 ); Metas.Globally.Buttons.reconnect = BwMatrixMeta.from(// - "buttons/globally.reconnect?", + "buttons/globally.reconnect2?", Configuration.screenResolutionProfile.getOffsetButtonReconnect(), // 0xFFFFFF ); diff --git a/src/main/resources/game-images/800x520/buttons/globally.reconnect-mx.bmp b/src/main/resources/game-images/800x520/buttons/globally.reconnect-mx.bmp deleted file mode 100644 index 86f1315991e87b481a6782730d85881865b59932..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4422 zcmcJPK~5_{3`BO(rO@l%%`-T&@|u{^$4C>oMvB z-|zVR;PZ^n)A5Gy<9Mq}f$5VwCoq5amqcVDhI>)PnHMw;y+T3i!}TDx29r!>JLtu0u)Rr`p78rp=^ zK&6x_5-UA7Y%f=!3(an8)|%$fV! zx#!`_%X&E`B$v^;@b@|XUc}!EF|VMFiFqmP4|T%L-yzxG-*>y+?_ER-d`$N2>}-H5D=VoxH#diF$qm)1nTm>v$hf_|ZMWN9 z7xWn+v$L}tQ&c7|2M#|lehVri=fx*}Xif~A8z+T@_+*$7Gdw(u#Hy;QfN8&PeRe*9hluq_eAd?1@+^NDWN~qk z`0VTJGs4)?-QA7g;FAeII5^;746CWB0qlJF?Ck91_&g&kV`F3bYnx0=_~GFpdwF18 zT^%rIXCm7oD@^Z6kdiX$JPrfU)04eeL{Z|%;{Uk)_KbCYOpQQzQ+Ruki zeof?`pP%nZR**a%Y-Gqm;`4`F`b&x8epTsfe5Uo2X=DX^P+?(VN=ga>ihMF4DxW`p zV|j4fa_6%rPi}_tzw^oYN9FVPpR7MtK1m)g^6Nbd@gH@6=UF60`rbva&ZpTl)cVHE zAKu!p6G6LFpY^xh$w~kEiS0I-PtBp0f9S&4$n}|>;dtk&BkFl6_(6QUri$k!+TX?f zh+hGGzL{c0@^~;1IY{-{boVufU9Ve~G>>hp!vp*;_mg3i&P(^cOoWT#qyBLwyb_W? zAi$GKd}2Q$4BGVc^ouU@txpp0d|IG$BJl}3jP>>PSVAF~9bKtD!DsPJ{awz5&yTM= zBl8JjIe&b5zEnHq|9(J24icYVe5B{!+}uq0)B5>s=|vg>m&7O8nNOVOfq_IgFM&_O zoZ3o!5+?Hg&T%61NwBE(Nw5g@2|js7qayK10BL_0M@f8=i%aoOLD(qO=h4xTfC{VA z)6>%Vb9HrLm0;r9Y;cXwBU;X(>~ zLqh}7#`g{#B4N^MJ6FS$n2!;_Z<`a5MI9d-!ui8TlM($bO<1`FShLL*K| zY;tlEF6Q&pAW@CMV32;b#033319{s0eRFdYY1^#&5iY|09bPRibdfeiy1xUKbTT8( u7{)wt^#cZym=NA9IyyRxFu&hVFsBxVMZUiiIKurM07tBX`ZUfZTK)lJgn;S* literal 0 HcmV?d00001 From cf295c81b824e1603bd1644287c3d3a237ddd30e Mon Sep 17 00:00:00 2001 From: 9-9-9-9 <9-9-9-9> Date: Thu, 17 Nov 2022 00:30:27 +0700 Subject: [PATCH 10/16] fix auto buttons --- .../bh/bot/common/types/images/BwMatrixMeta.java | 4 ++-- .../800x520/buttons/globally.auto-green-mx.bmp | Bin 2430 -> 0 bytes ...-green-tp.bmp => globally.auto-green2-tp.bmp} | Bin .../800x520/buttons/globally.auto-red-mx.bmp | Bin 2430 -> 0 bytes ...auto-red-tp.bmp => globally.auto-red2-tp.bmp} | Bin 5 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 src/main/resources/game-images/800x520/buttons/globally.auto-green-mx.bmp rename src/main/resources/game-images/800x520/buttons/{globally.auto-green-tp.bmp => globally.auto-green2-tp.bmp} (100%) delete mode 100644 src/main/resources/game-images/800x520/buttons/globally.auto-red-mx.bmp rename src/main/resources/game-images/800x520/buttons/{globally.auto-red-tp.bmp => globally.auto-red2-tp.bmp} (100%) 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 eb9be099..16c05de8 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -382,12 +382,12 @@ public static void load() throws IOException { 0xFFFFFF ); Metas.Globally.Buttons.autoG = BwMatrixMeta.from(// - "buttons/globally.auto-green?", + "buttons/globally.auto-green2?", Configuration.screenResolutionProfile.getOffsetButtonAuto(), // 0xFFFFFF ); Metas.Globally.Buttons.autoR = BwMatrixMeta.from(// - "buttons/globally.auto-red?", + "buttons/globally.auto-red2?", Configuration.screenResolutionProfile.getOffsetButtonAuto(), // 0xFFFFFF ); diff --git a/src/main/resources/game-images/800x520/buttons/globally.auto-green-mx.bmp b/src/main/resources/game-images/800x520/buttons/globally.auto-green-mx.bmp deleted file mode 100644 index 7a046ae5536ded14ffddfaa99f310c74a4f7c01f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2430 zcmdr~!41MN3^Y$924DmxV1T~(uo9~mJ9d+EolulY5H)Jj`h0cHmrT#snbNrPdgFQF zIq^Kvl~G zz+qD!WrF|Z#8fH%i}#`tPqeu!aA-KdRh4*hR7fj+Me3qSORNUkYXUtHRL~ zQ)A8}Qq3bViX8M@`4x^pQasn!5bGz#K{)6M_GP$1BfXaU;}jyuV)3*%rQ&kz)@0wJ+7+m6k}2-{!mlor&~h diff --git a/src/main/resources/game-images/800x520/buttons/globally.auto-green-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.auto-green2-tp.bmp similarity index 100% rename from src/main/resources/game-images/800x520/buttons/globally.auto-green-tp.bmp rename to src/main/resources/game-images/800x520/buttons/globally.auto-green2-tp.bmp diff --git a/src/main/resources/game-images/800x520/buttons/globally.auto-red-mx.bmp b/src/main/resources/game-images/800x520/buttons/globally.auto-red-mx.bmp deleted file mode 100644 index 97f430f92689198e47d5b4796ad2be9cc45b4472..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2430 zcmdr~K@x*72*hJ&d_bSj7xV$1dhtvBx>x9VS2_F>CTbGzmEsny tW|`iPF;rf&VBXz$uRN3f4#NZ{srory>JhGg_Pvw?I)BWvi6#)kfDcS_Llyu4 diff --git a/src/main/resources/game-images/800x520/buttons/globally.auto-red-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.auto-red2-tp.bmp similarity index 100% rename from src/main/resources/game-images/800x520/buttons/globally.auto-red-tp.bmp rename to src/main/resources/game-images/800x520/buttons/globally.auto-red2-tp.bmp From 92b1c09434ace57fc787d529ca63d7de44240e7d Mon Sep 17 00:00:00 2001 From: 9-9-9-9 <9-9-9-9> Date: Thu, 17 Nov 2022 00:32:51 +0700 Subject: [PATCH 11/16] removed an un-used button "close" --- .../bh/bot/common/types/images/BwMatrixMeta.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 16c05de8..b1aab2f4 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -209,7 +209,7 @@ public static class Buttons { public static BwMatrixMeta autoG; public static BwMatrixMeta autoR; public static BwMatrixMeta radioButton; - public static BwMatrixMeta close; + // public static BwMatrixMeta close; public static BwMatrixMeta mapButtonOnFamiliarUi; public static BwMatrixMeta persuade; public static BwMatrixMeta persuadeBribe; @@ -396,11 +396,13 @@ public static void load() throws IOException { Offset.none(), // 0x000000 ); - Metas.Globally.Buttons.close = BwMatrixMeta.from(// - "buttons/globally.close?", - Offset.none(), // - 0x000000 - ); + /* + Metas.Globally.Buttons.close = BwMatrixMeta.from(// + "buttons/globally.close?", + Offset.none(), // + 0x000000 + ); + */ Metas.Globally.Buttons.mapButtonOnFamiliarUi = BwMatrixMeta.from(// "buttons/globally.map-on-familiar-ui?", Configuration.screenResolutionProfile.getOffsetButtonMapOnFamiliarUi(), // From 1eb1db70eccd843cac80dcbbe4dd667eda7e47aa Mon Sep 17 00:00:00 2001 From: 9-9-9-9 <9-9-9-9> Date: Thu, 17 Nov 2022 00:37:49 +0700 Subject: [PATCH 12/16] fix button talkRightArrow --- src/main/java/bh/bot/app/dev/TestApp.java | 2 ++ .../bh/bot/common/types/images/BwMatrixMeta.java | 2 +- ...Arrow-mx.bmp => globally.talkRightArrow2-mx.bmp} | Bin 3 files changed, 3 insertions(+), 1 deletion(-) rename src/main/resources/game-images/800x520/buttons/{globally.talkRightArrow-mx.bmp => globally.talkRightArrow2-mx.bmp} (100%) diff --git a/src/main/java/bh/bot/app/dev/TestApp.java b/src/main/java/bh/bot/app/dev/TestApp.java index 52a52e28..24a4a10a 100644 --- a/src/main/java/bh/bot/app/dev/TestApp.java +++ b/src/main/java/bh/bot/app/dev/TestApp.java @@ -39,6 +39,8 @@ public class TestApp extends AbstractApplication { @Override protected void internalRun(String[] args) { adjustScreenOffset(); + + System.out.println("Clicked = " + clickImage(BwMatrixMeta.Metas.Globally.Buttons.talkRightArrow)); // } 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 b1aab2f4..fa34678f 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -372,7 +372,7 @@ public static class Dialogs { public static void load() throws IOException { Metas.Globally.Buttons.talkRightArrow = BwMatrixMeta.from(// - "buttons/globally.talkRightArrow?", + "buttons/globally.talkRightArrow2?", Configuration.screenResolutionProfile.getOffsetButtonTalkRightArrow(), // 0x000000 ); diff --git a/src/main/resources/game-images/800x520/buttons/globally.talkRightArrow-mx.bmp b/src/main/resources/game-images/800x520/buttons/globally.talkRightArrow2-mx.bmp similarity index 100% rename from src/main/resources/game-images/800x520/buttons/globally.talkRightArrow-mx.bmp rename to src/main/resources/game-images/800x520/buttons/globally.talkRightArrow2-mx.bmp From 2423b53cbb00f715aece916133e136bca502b05a Mon Sep 17 00:00:00 2001 From: 9-9-9-9 <9-9-9-9> Date: Thu, 17 Nov 2022 00:51:22 +0700 Subject: [PATCH 13/16] fix persuade buttons --- src/main/java/bh/bot/app/dev/TestApp.java | 5 +++-- .../bh/bot/common/types/images/BwMatrixMeta.java | 4 ++-- .../buttons/globally.persuade-bribe-tp.bmp | Bin 3190 -> 0 bytes .../800x520/buttons/globally.persuade-tp.bmp | Bin 5814 -> 0 bytes 4 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 src/main/resources/game-images/800x520/buttons/globally.persuade-bribe-tp.bmp delete mode 100644 src/main/resources/game-images/800x520/buttons/globally.persuade-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 24a4a10a..63f68c78 100644 --- a/src/main/java/bh/bot/app/dev/TestApp.java +++ b/src/main/java/bh/bot/app/dev/TestApp.java @@ -39,8 +39,9 @@ public class TestApp extends AbstractApplication { @Override protected void internalRun(String[] args) { adjustScreenOffset(); - - System.out.println("Clicked = " + clickImage(BwMatrixMeta.Metas.Globally.Buttons.talkRightArrow)); + + System.out.println("Clicked = " + clickImage(BwMatrixMeta.Metas.Globally.Buttons.persuade)); + System.out.println("Clicked = " + clickImage(BwMatrixMeta.Metas.Globally.Buttons.mapButtonOnFamiliarUi)); // } 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 fa34678f..b78ecea0 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -409,12 +409,12 @@ public static void load() throws IOException { 0x000000 ); Metas.Globally.Buttons.persuade = BwMatrixMeta.from(// - "buttons/globally.persuade?", + "buttons/globally.persuade2?", Configuration.screenResolutionProfile.getOffsetButtonPersuade(), // 0xFFFFFF ); Metas.Globally.Buttons.persuadeBribe = BwMatrixMeta.from(// - "buttons/globally.persuade-bribe?", + "buttons/globally.persuade-bribe2?", Configuration.screenResolutionProfile.getOffsetButtonBribePersuade(), // 0xFFFFFF ); diff --git a/src/main/resources/game-images/800x520/buttons/globally.persuade-bribe-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.persuade-bribe-tp.bmp deleted file mode 100644 index fb92958e63306d11afae919a775e9b2a4fd21892..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3190 zcmc&$O-LI-6yDx@=&_qbYh9Z*nm`gXSQ<1Y4FRde7J5i1^bjcYBvi16QlZjQ3H0D4 z;zhiK7S9qw4k3C-{5!;J4!I;06~qL=LumW4PhV%2wm({?sGeY^3k)?did6kxV&EszSbQ zfCCNZ^?GSUs$Po&aa~?s?!rLSWOJ1_yXxG378mKF(mb+l^8Bzf9q$;qXfpo)Z*4m*ieM`iLAv80p1gk!Ej^ zgWdyM^!va~q$CmvjN<(M#@qO);cy9uDsdS6@NDq?q$!7ujSZv+2c8EjJ3Bk& zaygw&Q_LVAP!$)9kx))fPS6S=u<89E_GO(sa6V8KAyWk+cTjiefM=N}qy!miA;GxnW5FWw75Kj;6`_D&|SC0V$ q2Zj|21y~?>d$Z9{!Q0#Zuy5dXaOm^Pfn=yJ=0~rstt~?^8Kpm+WkW*% diff --git a/src/main/resources/game-images/800x520/buttons/globally.persuade-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.persuade-tp.bmp deleted file mode 100644 index 98e20582a89892adf5d6cacfdf99fd7c7d0c42a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5814 zcmdUzOH3qH6oyMzPGDpdp{YS;cxD(tn+|rP(A@&l(*rSNW(;afjM^cFfQE$|jR|1_ z1jdk{J6*8A6(NQV0s#^eB$3C02tzQD_nXA<3=5u#{?&&*xl^w$2R7bRSD!lfzvtfi z>eQ`URaDv=D+P-S`*i%i!tWY>&q;CEOVXqB`ryI&?(a~ksi~1=x#4qZs$FM$R4I8~ z*W%-4yWPILyc}wz^Iut6i8v_Z#haU(B_$=$W5ABg7#PFD!zA0-*zoy$@X$!g z%gecWdwV|5)6>v6vSRMKBLWYl!Z)K*l59yyN%QmbS}}XT`kzoS;oQ}t z@S);#Iu8#ILydI)Mb2EU;>>=LGdr~gai#%WzkWUvT=D(=eXSTC;(V?Pa%P!|Gy6r( z?9>{>nIgxBMv{?{0i;?ndn|JP`CEl^adGj|($dPx3OCm^OgJM45C{3p4J~qp9{tYD z%*5l4lI6m}LS(YZNKl0m2m}ZS@|k;3k}Lj%bDXnZ>&EMsssB2Tw>y!1PXfUCt8|6D(F4TFxo~4nHWd#2F8rcM2k~ zeet1`n;ngYx}5pE=H}*b_Yr50Q)#R18Xk+B@8n&j2o^b0Ulutda#nimGjMj=qtO;NT#}Q|yhrAH4dQpP3RKK%&;+a9{!O>yPIP6`VC1ikwM|E;s^mn@$#c zzx&1a?mZ8qy1H5nOExz#$!EVi^3w;(LnJI`F+MVogPY{@*X7ddx5INjIXMx7d%a$a z=a=skCL(9CY}@^SNzkC2|(^WY^Wzabz~YS*s)u zAdAmImeIW7_u2wwQHT?kGdENjCY-;ikY3A(3!BfXfW*1y2L*^ZXH1O02MckyT+ZNw z*sZOt6ddbk9FC5TszytPxMX}SU|_w$vi}|D-Q8V)<-#X|6_hS#R^qiKY(BFX#?H55Ej|Z7c{kF^yn)$1F)@*YV=!5_Wnv=E8}vSiT9nMp%&?qEsk={jRe4hq=Vw~i zk=P1n-LUMu2xodvp->h%lNbOmWnI_T*ViQ!&Mw`2#_PPGeaft;sGxy~oJB=%Z!ZVe zoj3aX`$fHIYu{5s^Rv}_7Nhm_^zcY@=Z%4Z0a1??1?hFy&-kt)ibY$@XYNsDV4+Lg z@EklkI#ShY4|U%MwKDSPayAm1t?RtefwC(YXV`heD7Y?XBQd^=@%!N3-ky<+{pOsp zuFDP<;+&S2hNFUl0*l{~sBL$5H+Lr*O-)T=aC{WPp~<=qZJ(Jlb=29}DGq?`mX;QA zB=}y(Rayhzk#cf!peH7{zhLL*=Ue}dq>V}I=j22=JIhvj=jD`SB{qOyJ)jk{hw?e& zmYkBTtPM;!qZXRNw_<$m7!sRv#=?f@jnmUp>M=BL80Iq`VHDhiGmQkN2_r0LXl~w6 Yo^hqVmu{uX_ Date: Thu, 17 Nov 2022 00:54:17 +0700 Subject: [PATCH 14/16] fix persuade buttons and map on fam ui button --- .../bh/bot/common/types/images/BwMatrixMeta.java | 2 +- ...p.bmp => globally.map-on-familiar-ui2-tp.bmp} | Bin .../buttons/globally.persuade-bribe2-tp.bmp | Bin 0 -> 2934 bytes .../800x520/buttons/globally.persuade2-tp.bmp | Bin 0 -> 5814 bytes 4 files changed, 1 insertion(+), 1 deletion(-) rename src/main/resources/game-images/800x520/buttons/{globally.map-on-familiar-ui-tp.bmp => globally.map-on-familiar-ui2-tp.bmp} (100%) create mode 100644 src/main/resources/game-images/800x520/buttons/globally.persuade-bribe2-tp.bmp create mode 100644 src/main/resources/game-images/800x520/buttons/globally.persuade2-tp.bmp 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 b78ecea0..cfbbb3a1 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -404,7 +404,7 @@ public static void load() throws IOException { ); */ Metas.Globally.Buttons.mapButtonOnFamiliarUi = BwMatrixMeta.from(// - "buttons/globally.map-on-familiar-ui?", + "buttons/globally.map-on-familiar-ui2?", Configuration.screenResolutionProfile.getOffsetButtonMapOnFamiliarUi(), // 0x000000 ); diff --git a/src/main/resources/game-images/800x520/buttons/globally.map-on-familiar-ui-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.map-on-familiar-ui2-tp.bmp similarity index 100% rename from src/main/resources/game-images/800x520/buttons/globally.map-on-familiar-ui-tp.bmp rename to src/main/resources/game-images/800x520/buttons/globally.map-on-familiar-ui2-tp.bmp diff --git a/src/main/resources/game-images/800x520/buttons/globally.persuade-bribe2-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.persuade-bribe2-tp.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ec8f7eff8a3526ec3baf47c2442e2f2d52dcd948 GIT binary patch literal 2934 zcmcguzl$1C5WdtY(#BnrAbR0WG3F#FQ6v(v$q#IWyUu?gAW0hkfK-xBqE=U2XJbGM zwbDjG2nIo{6fGno;tv#5Og?wc$2;9~m%Su|`*z;EZ)d(YJ8#_A??2r?lEi`W1eX`r z16=ox9%97&dR>}a55I4h%galhB%@9Sit{{B;@Kp@TYK;0h`T6Q_cKo zkGWj#HvT%jxXIOD%0Gph&1M#h1#UeakD4SiOfs4Lwv~81&g=*H8w>`o*X#57G}KQj zmD)zz+*_>{MV!y)`~2(mIuGV`#xocUQl2pe0s&?}z~64SPp4CcgrdIwW3d2z-4jt!q&u^4JDm9`@z*~)HN1VL$R7`` zR;zBetFnIhK)kM)e}HBAXS3N1CxB5g6Q3Rag+hVDX4olEe}0R_BJW`|8qqFf`S*G~ z9xTgWw*O2flLP&SN<~}$zhnQ=o1Z>%*zjZT4*bD{L{0zPVg<9=tfBvdKl6ZBtk{1< zQDk^tVf=sH6lRyrf4|@7;S8+4et?wqAX`81&x3iLh2B>hjYhd#PN&mUC+I(zRw|W! zBrMD2604BAoL}<5{(osI8%~XJr~lI~LZOiCv)C*FXw=X@Z+w4>n=dPf;`iqtB@D33 literal 0 HcmV?d00001 diff --git a/src/main/resources/game-images/800x520/buttons/globally.persuade2-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.persuade2-tp.bmp new file mode 100644 index 0000000000000000000000000000000000000000..872f4e951b99834c9478b2a8c2b57461be58ec2f GIT binary patch literal 5814 zcmdUz&r2jn6vxefkW;X`XPn8zbrqF$U4N_?ac5i;%}ykd#m$gIK!OJ$%Ob=;JeWX8 zf`T6QVpM{M93&CJsKIy;MZ}9FYE=9QD)=k-0~A3}NxtoK9+j?|nvUj@Vy5Tyt8cw} z{h6BA)f0O6m)8=mS{{z6cz=fXt9ZYXkceYK!WY;5S0~qpKcj7MaL_P}s&Z@kC!hR! z+2AdG(|nL=LNhx%8y%$hY-wqM25n$qfV-=zs^Izhg$KvV%1ZVR4Gq~+!)R=5WT$M* z&(A}Xm2N&RG(W7citFc^d$vb)K4@TH|ClC7_=XJ%&lea2VM zz3?|QH1P1&)>d0;7~S37?39h3o*rlrxuV31gzZdl8i_8W264vhiHV8PER5XT+_SSYSqx7o6k-{SwY4>pot~aL zIP-9kGdpF2IE%qygR`s@JuW#<{@_bbHGMwc^71mi9WjDzYdB*yA}g$C9_5lV^q6;L zWySCJBSLw3Iaa176Lg{B@*zh14>_NloFMYV!~{jItE;=3Dh`u>%Xx2aj}c*2E1QNh z7@Mr~~^N+lZmc|9v5!0GXLwzs!QujD*7HYSek>+9p-8qT;z zj6!{8v9fMdS66fJ($Z2ED>=8dwXxV?$ebMloMxsOzkZiQbwk7XPQWOCWa3r%wpIMl zz6vF0PW9m60Cj*k=iIXg%2UJRl5<(HMG@R^=80T#rpPzo{J|4DE4)O`_{IG$wVa$B z%QW79%ewQ1U7wjVaEV%4t{q=`X`_Noi-Ys@^fdH1GUtwt4!+)^T=Qv}J*1|lMhr_f z57DgWCqWArg$R1ijqLH3$8bBB4?hFjf;y5a3&h2 z>Ez5Z7{vMeZ?gUvD8TDk*xpWw>sb_&-QM0#k;Nl8%S!TKx3;>vD%WSK8{v{bq{5yw zF6UVBHJrcwGy{?2auy>4IEI7@{RBkM83R#>&~SgpD93sh!`^^1iUuP0_Vyw&8urgP zot&H$!?KNion_g}l^XKluKy!v)J$%CAuyDjS&5%>T+WAwhpdOq!TCN2&g?uoI$|*y zw12*r?k#wb1k|_TEJnseJn8M%Gq!vjd}?Y6c`Da4o>RO+8yOkl9AwTY)OZ|YIbx!W zfBY;NuTMToDJ!;jxnkYG7s29K`#PSkxw)CeY#?B9fiF@KfT802I(6ym2A)&$^Yb~T z%ljZM3X{gI8`y7fWEdFo^ql}P5$gs$52BY^T+TPx*HL6QoTFK&KX1bs&x0J)C1=vR z;mna8hRAttZtiEH;n9y5n7p1ZFE0h{Kg_14CYnWD&#+n4-`~%Xm33oyc$mcwBldmJ z)q2LfVnEE!nJDW9)}E+mF>WPvjd&hp=jiCDC>CvzGwU73`T03>#xtg)S3Xrf56Uv~ zC^^RxYxZ^F62GQy;GP>RCi|6~xz}MRIXg7ssh%_Tb@<~8bvPv@g}y%6+1c6R6Q~%C zY~~CxT4!gctbwPitBV8_89!&7YW8&)as$rTjv_uy1USk}>g(&pOz?l5Qbtbvk0gpS zGBR+A2T#oqbm=+cuLIgYCkL#uNB)d7k1xqi+YRTmyB0=4tl^AaXdY&JLxnyP>pAc2 p?8L4cG1oIP3Ha@_HJmAv^i(_HxSUCxci;QC=sImZXY513`EQ_!Q)d7G literal 0 HcmV?d00001 From 6359d5f4184f8504d201b4287fce065ec08abeaf Mon Sep 17 00:00:00 2001 From: 9-9-9-9 <9-9-9-9> Date: Thu, 17 Nov 2022 01:12:32 +0700 Subject: [PATCH 15/16] fix buttons raid accept and label --- .../java/bh/bot/app/AbstractApplication.java | 27 +++++++++++++----- src/main/java/bh/bot/app/dev/TestApp.java | 4 +-- .../bot/common/types/images/BwMatrixMeta.java | 6 ++-- ...n-mx.bmp => globally.radio-button2-mx.bmp} | Bin .../800x520/buttons/raid.accept-tp.bmp | Bin 4074 -> 0 bytes .../800x520/buttons/raid.accept2-tp.bmp | Bin 0 -> 4014 bytes .../game-images/800x520/labels/raid-tp.bmp | Bin 4542 -> 0 bytes .../800x520/labels/raid.raid2-tp.bmp | Bin 0 -> 4542 bytes 8 files changed, 25 insertions(+), 12 deletions(-) rename src/main/resources/game-images/800x520/buttons/{globally.radio-button-mx.bmp => globally.radio-button2-mx.bmp} (100%) delete mode 100644 src/main/resources/game-images/800x520/buttons/raid.accept-tp.bmp create mode 100644 src/main/resources/game-images/800x520/buttons/raid.accept2-tp.bmp delete mode 100644 src/main/resources/game-images/800x520/labels/raid-tp.bmp create mode 100644 src/main/resources/game-images/800x520/labels/raid.raid2-tp.bmp diff --git a/src/main/java/bh/bot/app/AbstractApplication.java b/src/main/java/bh/bot/app/AbstractApplication.java index 89b88d54..0e70ecfa 100644 --- a/src/main/java/bh/bot/app/AbstractApplication.java +++ b/src/main/java/bh/bot/app/AbstractApplication.java @@ -1237,7 +1237,8 @@ protected boolean tryEnterRaid(boolean doRaid, UserConfig userConfig, Supplier result = detectRadioButtons( - Configuration.screenResolutionProfile.getRectangleRadioButtonsOfRaid()); + Configuration.screenResolutionProfile.getRectangleRadioButtonsOfRaid() + ); Point[] points = result._1; int selectedLevel = result._2 + 1; info("Found %d raid levels, selected %s", points.length, UserConfig.getRaidLevelDesc(selectedLevel)); @@ -1265,16 +1266,28 @@ protected boolean tryEnterRaid(boolean doRaid, UserConfig userConfig, Suppliervm>Pnha~Fx^ z)shs1Eoy=hrql9QUfW$4BSJy(LJ-8B?a{}l_q>}k3Ou|!Jm)!|bKd8CcYeJ^6~8X4 zA}I%Q34RaZ7j|7zU4dMsdUsqODI8}=6g0>_{J3BkXh(^HkZMayOTlUR*nBP2 z9pg#;&;(dzWhFJ7ot*_wLX8z$si-0zEjlAv4mmqHG*0g`>WJxMuWk?*e={J_!?PRSz&=Rn9XLj zUT5;wncmc=eQ8aox*^ko!(;=K^!#@Ew+@oy99q!GMI(k5lFy;dHsRo9xuO<{jrlSR zi(CsHz~SMc&1M58?Q0v3O4Ne$Xb%n!9>2wsWb)Qy!~d>DZt$u7Q)iZ^oqsJ(%)naG zVr*;-Jd2BqG7O88lao;EcDr%b!F~Znuh**xZ*Fd4=X3|h;=#dzB9BheVsvyA__?_` zMR;mz3Tj72Mlh0iwAkC*QvscsnYq8euh=PUirAe-uR{a!xV}?Q=y<+UH7R<;%N~_UZj1!o{n_Z$|K%CIA2c diff --git a/src/main/resources/game-images/800x520/buttons/raid.accept2-tp.bmp b/src/main/resources/game-images/800x520/buttons/raid.accept2-tp.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a96f8d6e61fb35132fafeef05687e4c5c298c1c6 GIT binary patch literal 4014 zcmd6q&r4KM6vyo^XxqG*_nu~kisL9uli?yv{6$EJqJf}p#6-#xbHqRwLK;|FS*B)6 zYPpa$N;pweqPSH9S1#PRQQZ1tRo|I2b2_~He2zij;mw_M@A~wr-Q8$m8yy|x zkaQ*{CRpRTXp&!FUoSQ6Z)|LkK!c^Hkni*P4h{}jqdJX^jilV%+@$FK{=V1ib(x0w z?U}jy*5T57@8I6Hwl;q3;NT!yJk6E33oNKT9uBP$o1C2FM@eU9W`+cmYC}TV)<8 z_jA{Hom4q^9ycI`l9G~kVU(1d7sSEyuv*JZMO0|pX?>9MVrgkfBvKa^Bq!>xTl6=r z#+N=V;KdUp2Pr1MqM`yCT;Z#si`}9_SoJT|jv@_X|DXb6-wIdORjEExV)=LJP2hr+_b{FueVA*RibXWwLTK|#TZ`zDJmj^7_$lO>0uq9T^59MDaU z!m)7R5OZLRs$)AZR2j9{o}-Qv+n%G26Qf-{PdbQcUVy{w?5u-~Lf|kyKF)Y8`swLu zM41DQg{aQY&s$_vU07H^ba;4}MjF-!RHvqx1g_SqL>Cuhoq(yn%Zvp6Wp9TIXQ_S=-`mWrJE=Y{s8d@ zii2BFLg(Ascb z;CzAendK!~izRgL*DvmyTVd^X`;~6zr>Ab$dqAtzIvfr~$Za4Hpcu4?L_)gi^*Xse zpPji5kAO8zlL5efzn|%;R7!fY*(|$!KA&_caIsh<7WCW+>vTHQFSU$DBN1}9qD8tI zjRw)Bmf373W2BaJIxStfT#o2yp+&kBxKt_;>j`M7R;!n~8EJXFw}+<-deQE9UASaM zTDaCvL(7k)O(ql84)7rJWwBUzz22{XTdh`;15?zc)oRH|#%8o|S@9m*%G`$*r_;%4 z36#ra9u-BDQQ_L5mTFCxg zs0)whv1l0#2G?sgolaQ@fI>BQkUv}-h~OeUjF!dgJbL9AplDOpIu Rda>V^E(Ol#^Ta}3egpdsyJi3Y diff --git a/src/main/resources/game-images/800x520/labels/raid.raid2-tp.bmp b/src/main/resources/game-images/800x520/labels/raid.raid2-tp.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fa2c5b9eff2f15a192b71594732f2a6fab2e6cd7 GIT binary patch literal 4542 zcmd^@J8L3Q6vxd+*k*|ei68`xOUwhDz-AvYY?H8MzDoQErmztk1;rvDDn393tfBpCl0xX};(-6Pk&-$VDcs$fqE|;0he)3f~ zIs|Pn82bG_jd3^}n4ZmMsVf`~qs!@ZQWr=2d_I;1JP*XiRjXB2 zma+^60~$kFa=9FJMIsT(LR}pFkywJk;JIjO2;uh;wDS#ZK|o_&nrh*z6q z)9DnpH!`c&>-5? Date: Thu, 17 Nov 2022 01:21:18 +0700 Subject: [PATCH 16/16] disable functions on old versions --- web/json/reject-versions-2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/json/reject-versions-2.json b/web/json/reject-versions-2.json index 38f0a77f..e716080a 100644 --- a/web/json/reject-versions-2.json +++ b/web/json/reject-versions-2.json @@ -1 +1 @@ -{"bv":["2.8.3"],"bf":{"0.0.2":["tp"],"2.3.0":["afk","expedition"],"2.4.0":["afk","expedition"],"2.8.0":["world-boss-team"]}} +{"bv":["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"],"bf":{"0.0.2":["tp"],"2.3.0":["afk","expedition"],"2.4.0":["afk","expedition"],"2.11.0":["afk","pvp","world-boss","world-boss-team","raid","expedition","invasion","gvg","trials","gauntlet"]}}