Fix bot for new BH version (Invasion + Gauntlet) (#84)

* fix gauntlet * fixed invasion * update version to v3.1.0 Co-authored-by: 9-9-9-9 <9-9-9-9>
9-9-9-9 · Nov 18, 2022 · 55906b9 · 55906b9
1 parent d866086
commit 55906b9
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>bh.bot</groupId>
 	<artifactId>99bot</artifactId>
-	<version>3.0.0</version>
+	<version>3.1.0</version>
 
 	<dependencies>
 		<dependency>

diff --git 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
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
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
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
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
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
diff --git 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"]
 	}
 }