diff --git a/README.md b/README.md index 2792ecaa..b4ccf34f 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ ### and new BH update at Nov 16 2022 ### Almost functions were fixed and back to work. Expedition will be fixed as soon as possible - [ ] Idol Dimension (Expedition) -- [ ] Inferno Dimension (Expedition) - [ ] Hallowed Dimension (Expedition) - [ ] Jammie Dimension (Expedition) - [ ] Battle Bards (Expedition) +- [x] Inferno Dimension (Expedition) ## To the folks who are using this bot but not giving this repository a Star: **Fvck U! from the 8 pixels world to the 4D reality!** ___ @@ -76,4 +76,4 @@ _(Example for Windows only, you can save into a bat file to be able to click-to- > call steam.bot.bat rerun - Explore the `./sample-scripts/` folder -[Learn more about how to create script files here](https://github.com/9-9-9-9/Bit-Heroes-bot/wiki/Script-example) \ No newline at end of file +[Learn more about how to create script files here](https://github.com/9-9-9-9/Bit-Heroes-bot/wiki/Script-example) diff --git a/pom.xml b/pom.xml index 0f54c21b..df22675a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 bh.bot 99bot - 3.2.0 + 3.3.0 diff --git a/src/main/java/bh/bot/common/types/AttendablePlace.java b/src/main/java/bh/bot/common/types/AttendablePlace.java index 4ed9e787..0619e877 100644 --- a/src/main/java/bh/bot/common/types/AttendablePlace.java +++ b/src/main/java/bh/bot/common/types/AttendablePlace.java @@ -31,9 +31,9 @@ public AttendablePlace(String name, int id, String imgCode, boolean left, int pr case "trials": case "gauntlet": case "invasion": + case "expedition": imgFile = imgCode + "2"; break; - case "expedition": 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 cdb86799..fc6710c6 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -659,7 +659,7 @@ public static void load() throws IOException { 0xFFFFFF ); Metas.Expedition.Buttons.enter = BwMatrixMeta.from(// - "buttons/expedition.enter?", + "buttons/expedition.enter2?", Configuration.screenResolutionProfile.getOffsetButtonEnterExpedition(), // 0xFFFFFF ); @@ -684,7 +684,7 @@ public static void load() throws IOException { 0xFFFFFF ); Metas.Expedition.Labels.infernoDimension = BwMatrixMeta.from(// - "labels/expedition.inferno-dimension?", + "labels/expedition.inferno-dimension2?", Configuration.screenResolutionProfile.getOffsetLabelInfernoDimension(), // 0xFFFFFF ); diff --git a/src/main/resources/game-images/800x520/buttons/expedition.enter-tp.bmp b/src/main/resources/game-images/800x520/buttons/expedition.enter-tp.bmp deleted file mode 100644 index 7b76f7d1..00000000 Binary files a/src/main/resources/game-images/800x520/buttons/expedition.enter-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/buttons/expedition.enter2-tp.bmp b/src/main/resources/game-images/800x520/buttons/expedition.enter2-tp.bmp new file mode 100644 index 00000000..17b8d6b3 Binary files /dev/null and b/src/main/resources/game-images/800x520/buttons/expedition.enter2-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/buttons/expedition.play2-tp.bmp b/src/main/resources/game-images/800x520/buttons/expedition.play2-tp.bmp index 84057800..7ab89a37 100644 Binary files a/src/main/resources/game-images/800x520/buttons/expedition.play2-tp.bmp and b/src/main/resources/game-images/800x520/buttons/expedition.play2-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/expedition-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/expedition-tp.bmp deleted file mode 100644 index b578e436..00000000 Binary files a/src/main/resources/game-images/800x520/labels/attendable-places/expedition-tp.bmp and /dev/null differ 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 new file mode 100644 index 00000000..66709945 Binary files /dev/null and b/src/main/resources/game-images/800x520/labels/attendable-places/expedition2-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/labels/expedition.inferno-dimension-tp.bmp b/src/main/resources/game-images/800x520/labels/expedition.inferno-dimension-tp.bmp deleted file mode 100644 index 54f4c769..00000000 Binary files a/src/main/resources/game-images/800x520/labels/expedition.inferno-dimension-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/labels/expedition.inferno-dimension2-tp.bmp b/src/main/resources/game-images/800x520/labels/expedition.inferno-dimension2-tp.bmp new file mode 100644 index 00000000..d5269a9c Binary files /dev/null and b/src/main/resources/game-images/800x520/labels/expedition.inferno-dimension2-tp.bmp differ diff --git a/web/json/reject-versions-2.json b/web/json/reject-versions-2.json index 70043762..2a7cba31 100644 --- a/web/json/reject-versions-2.json +++ b/web/json/reject-versions-2.json @@ -1,6 +1,7 @@ { "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"], "bf": { + "3.2.0": ["expedition"], "3.1.0": ["expedition"], "3.0.0": ["expedition","invasion","gauntlet"] }