diff --git a/pom.xml b/pom.xml index 93cd766a..fd2bdf95 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 bh.bot 99bot - 3.0.0 + 3.1.0 diff --git a/src/main/java/bh/bot/common/types/AttendablePlace.java b/src/main/java/bh/bot/common/types/AttendablePlace.java index 48bda573..4ed9e787 100644 --- a/src/main/java/bh/bot/common/types/AttendablePlace.java +++ b/src/main/java/bh/bot/common/types/AttendablePlace.java @@ -29,11 +29,11 @@ public AttendablePlace(String name, int id, String imgCode, boolean left, int pr case "raid": case "gvg": case "trials": + case "gauntlet": + case "invasion": imgFile = imgCode + "2"; break; case "expedition": - case "gauntlet": - case "invasion": default: imgFile = imgCode; break; diff --git a/src/main/resources/game-images/800x520/buttons/gauntlet.play2-tp.bmp b/src/main/resources/game-images/800x520/buttons/gauntlet.play2-tp.bmp index e0d80da9..3f2fcc3b 100644 Binary files a/src/main/resources/game-images/800x520/buttons/gauntlet.play2-tp.bmp and b/src/main/resources/game-images/800x520/buttons/gauntlet.play2-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/buttons/invasion.play2-tp.bmp b/src/main/resources/game-images/800x520/buttons/invasion.play2-tp.bmp index 84057800..9db9253a 100644 Binary files a/src/main/resources/game-images/800x520/buttons/invasion.play2-tp.bmp and b/src/main/resources/game-images/800x520/buttons/invasion.play2-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/gauntlet-mx.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/gauntlet-mx.bmp deleted file mode 100644 index 28294c39..00000000 Binary files a/src/main/resources/game-images/800x520/labels/attendable-places/gauntlet-mx.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/gauntlet2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/gauntlet2-tp.bmp new file mode 100644 index 00000000..c809962d Binary files /dev/null and b/src/main/resources/game-images/800x520/labels/attendable-places/gauntlet2-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/invasion-mx.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/invasion-mx.bmp deleted file mode 100644 index a9623b6a..00000000 Binary files a/src/main/resources/game-images/800x520/labels/attendable-places/invasion-mx.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/invasion2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/invasion2-tp.bmp new file mode 100644 index 00000000..0c3578c1 Binary files /dev/null and b/src/main/resources/game-images/800x520/labels/attendable-places/invasion2-tp.bmp differ diff --git a/web/json/reject-versions-2.json b/web/json/reject-versions-2.json index aeb02140..70043762 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.1.0": ["expedition"], "3.0.0": ["expedition","invasion","gauntlet"] } }