Adding a way for some follower to not make some mfleader area run

Readme.txt

@@ -1,4 +1,6 @@
-This is the MASTER (also known as TRUNK) branch.
+This is the CORE15 branch.
+It will contain most recent D2BS 1.5 core changes.
+The rest will be the same as in MASTER branch.
 
 The package contains 3 distinct components:
 D2BS - core

d2bs/kolbot/D2BotChannel.dbj

@@ -67,8 +67,8 @@ var gameStart, handle, ingame, firstLogin, useChat,
 	channelTick = getTickCount(),
 	lastGameStatus = "ready",
 	fListTick = 0,
-	loginFail = 0,
 	retry = 0,
+	badGames = [],
 	joinInfo = {
 		gameName: "",
 		gamePass: "",
@@ -177,7 +177,9 @@ function ScriptMsgEvent(msg) {
 
 		break;
 	case "getMuleMode":
-		if (AutoMule.torchCheck) {
+		if (AutoMule.torchAnniCheck === 2) {
+			scriptBroadcast("2");
+		} else if (AutoMule.torchAnniCheck === 1) {
 			scriptBroadcast("1");
 		} else if (AutoMule.check) {
 			scriptBroadcast("0");
@@ -226,20 +228,29 @@ function main() {
 		delay(500);
 	}
 
-	if (gameInfo.error === "@error") {
-		timeoutDelay("Crash Delay", StarterConfig.CrashDelay * 1e3);
+	if (gameInfo.error) {
+		if (!!DataFile.getStats().debugInfo) {
+			gameInfo.crashInfo = DataFile.getStats().debugInfo;
+
+			D2Bot.printToConsole("Crash Info: Script: " + JSON.parse(gameInfo.crashInfo).currScript + " Area: " + JSON.parse(gameInfo.crashInfo).area, 10);
+		}
+
+		ControlAction.timeoutDelay("Crash Delay", StarterConfig.CrashDelay * 1e3);
 		D2Bot.updateRuns();
 	}
 
+	DataFile.updateStats("debugInfo", JSON.stringify({currScript: "none", area: "out of game"}));
+
 	while (true) {
 		while (me.ingame) { // returns true before actually in game so we can't only use this check
 			if (me.gameReady) { // returns false when switching acts so we can't use while
 				joinInfo.inGame = true;
 
 				if (!ingame) {
 					print("Updating Status");
-					D2Bot.updateStatus("Game: " + me.gamename);
+					//D2Bot.updateStatus("Game: " + me.gamename);
 
+					badGames.push(joinInfo.gameName);
 					joinInfo.oldGame = me.gamename;
 					lastGameStatus = "ingame";
 					ingame = true;
@@ -248,6 +259,7 @@ function main() {
 					DataFile.updateStats("runs", gameCount);
 				}
 
+				D2Bot.updateStatus("Game: " + me.gamename + timer(gameStart));
 			}
 
 			delay(1000);
@@ -270,7 +282,9 @@ MainSwitch:
 	case 1:	// Lobby
 		D2Bot.updateStatus("Lobby");
 
-		loginFail = 0;
+		if (!firstLogin) {
+			firstLogin = true;
+		}
 
 		ControlAction.click(6, 27, 480, 120, 20);
 
@@ -359,6 +373,28 @@ MainSwitch:
 
 		switch (lastGameStatus) {
 		case "pending": // Most likely FTJ (can't detect it directly)
+			string = "";
+			text = ControlAction.getText(4, 438, 300, 326, 150);
+
+			if (text) {
+				for (i = 0; i < text.length; i += 1) {
+					string += text[i];
+
+					if (i !== text.length - 1) {
+						string += " ";
+					}
+				}
+
+				// Didn't meet level restriction
+				if (string === getLocaleString(5162)) {
+					print(string);
+
+					retry = 3;
+
+					break;
+				}
+			}
+
 			retry += 1;
 
 			D2Bot.updateRuns();
@@ -382,7 +418,8 @@ MainSwitch:
 
 		if (retry >= 3) {
 			//print("reset game");
-			D2Bot.printToConsole("Failed to join 3 times. Aborting.");
+			D2Bot.printToConsole("Failed to join " + joinInfo.gameName + ". Aborting.");
+			badGames.push(joinInfo.gameName);
 
 			lastGameStatus = "ready";
 			joinInfo.oldGame = joinInfo.gameName;
@@ -407,7 +444,7 @@ MainLoop:
 				joinInfo.gameName = joinInfo.gameName[joinInfo.gameName.length - 1].toString().replace(/^\W*/, ""); // use last match and trim it
 				joinInfo.gamePass = StarterConfig.Passwords[n] || "";
 
-				if (joinInfo.gameName !== joinInfo.oldGame) {
+				if (joinInfo.gameName && joinInfo.gameName !== joinInfo.oldGame && badGames.indexOf(joinInfo.gameName) === -1) {
 					ControlAction.click(6, 652, 469, 120, 20);
 
 					break MainLoop;
@@ -419,14 +456,16 @@ MainLoop:
 	case 4: // Create Game
 		break;
 	case 5: // Join Game
-		if (joinInfo.oldGame === joinInfo.gameName) {
+		if (joinInfo.oldGame === joinInfo.gameName || badGames.indexOf(joinInfo.gameName) > -1) {
 			ControlAction.click(6, 433, 433, 96, 32);
 		}
 
 		D2Bot.updateStatus("Join Game");
 
 		if (joinInfo.gameName !== "") {
-			print("�c2Joining �c0" + joinInfo.gameName);
+			print("�c2Joining �c0" + joinInfo.gameName);
+			ControlAction.setText(1, 606, 148, 155, 20, joinInfo.gamePass);
+			ControlAction.setText(1, 432, 148, 155, 20, joinInfo.gameName);
 
 			if (typeof AdvancedConfig[me.profile] === "object" && typeof AdvancedConfig[me.profile].AnnounceGame === "boolean" && typeof AdvancedConfig[me.profile].AnnounceMessage === "string") {
 				sayMsg(AdvancedConfig[me.profile].AnnounceMessage + " " + joinInfo.gameName);
@@ -442,11 +481,7 @@ MainLoop:
 
 			me.blockmouse = true;
 
-			try {
-				joinGame(joinInfo.gameName, joinInfo.gamePass);
-			} catch (joinErr) {
-
-			}
+			ControlAction.click(6, 594, 433, 172, 32);
 
 			me.blockmouse = false;
 			lastGameStatus = "pending";
@@ -474,10 +509,6 @@ MainLoop:
 			ControlAction.click(6, 33, 572, 128, 35);
 		}
 
-		if (!firstLogin) {
-			firstLogin = true;
-		}
-
 		D2Bot.updateStatus("Logging In");
 
 		try {
@@ -507,26 +538,44 @@ MainLoop:
 
 				break;
 			case getLocaleString(5208):
-				loginFail += 1;
+				D2Bot.updateStatus("Invalid Account");
+				D2Bot.printToConsole("Invalid Account");
 
-				if (loginFail < 2) {
-					timeoutDelay("Login retry", 3000);
-					ControlAction.click(6, 335, 412, 128, 35);
+				break;
+			case getLocaleString(5202): // cd key intended for another product
+			case getLocaleString(10915): // lod key intended for another product
+				D2Bot.updateStatus("Invalid CDKey");
+				D2Bot.printToConsole("Invalid CDKey: " + gameInfo.mpq, 6);
+				D2Bot.CDKeyDisabled();
 
-					break MainSwitch;
+				if (gameInfo.switchKeys) {
+					ControlAction.timeoutDelay("Key switch delay", StarterConfig.SwitchKeyDelay * 1000);
+					D2Bot.restart(true);
+				} else {
+					D2Bot.stop();
 				}
 
-				D2Bot.updateStatus("Invalid Account");
-				D2Bot.printToConsole("Invalid Account");
-
 				break;
 			case getLocaleString(5199):
 				D2Bot.updateStatus("Disabled CDKey");
-				D2Bot.printToConsole("Disabled CDKey");
+				D2Bot.printToConsole("Disabled CDKey: " + gameInfo.mpq, 6);
 				D2Bot.CDKeyDisabled();
 
 				if (gameInfo.switchKeys) {
-					timeoutDelay("Key switch delay", StarterConfig.SwitchKeyDelay * 1000);
+					ControlAction.timeoutDelay("Key switch delay", StarterConfig.SwitchKeyDelay * 1000);
+					D2Bot.restart(true);
+				} else {
+					D2Bot.stop();
+				}
+
+				break;
+			case getLocaleString(10913):
+				D2Bot.updateStatus("Disabled LoD CDKey");
+				D2Bot.printToConsole("Disabled LoD CDKey: " + gameInfo.mpq, 6);
+				D2Bot.CDKeyDisabled();
+
+				if (gameInfo.switchKeys) {
+					ControlAction.timeoutDelay("Key switch delay", StarterConfig.SwitchKeyDelay * 1000);
 					D2Bot.restart(true);
 				} else {
 					D2Bot.stop();
@@ -543,6 +592,13 @@ MainLoop:
 				D2Bot.updateStatus("Login Error");
 				D2Bot.printToConsole("Login Error - " + string);
 
+				if (gameInfo.switchKeys) {
+					ControlAction.timeoutDelay("Key switch delay", StarterConfig.SwitchKeyDelay * 1000);
+					D2Bot.restart(true);
+				} else {
+					D2Bot.stop();
+				}
+
 				break;
 			}
 		}
@@ -605,15 +661,15 @@ MainLoop:
 		ControlAction.click(6, 351, 337, 96, 32);
 		break;
 	case 19: // Login - Cdkey In Use
-		D2Bot.printToConsole("CD-Key in use by " + ControlAction.getText(4, 158, 310, 485, 40));
+		D2Bot.printToConsole(gameInfo.mpq + " is in use by " + ControlAction.getText(4, 158, 310, 485, 40), 6);
 		D2Bot.CDKeyInUse();
 
 		if (gameInfo.switchKeys) {
-			timeoutDelay("Key switch delay", StarterConfig.SwitchKeyDelay * 1000);
+			ControlAction.timeoutDelay("Key switch delay", StarterConfig.SwitchKeyDelay * 1000);
 			D2Bot.restart(true);
 		} else {
-			timeoutDelay("CD-Key in use", StarterConfig.CDKeyInUseDelay * 6e4);
 			ControlAction.click(6, 335, 450, 128, 35);
+			ControlAction.timeoutDelay("CD-Key in use", StarterConfig.CDKeyInUseDelay * 6e4);
 		}
 
 		break;
@@ -641,26 +697,26 @@ MainLoop:
 
 		switch (string) {
 		case getLocaleString(10914):
-			D2Bot.printToConsole("LoD key in use by " + ControlAction.getText(4, 158, 310, 485, 40));
+			D2Bot.printToConsole(gameInfo.mpq + " LoD key in use by " + ControlAction.getText(4, 158, 310, 485, 40), 6);
 			D2Bot.CDKeyInUse();
 
 			if (gameInfo.switchKeys) {
-				timeoutDelay("Key switch delay", StarterConfig.SwitchKeyDelay * 1000);
+				ControlAction.timeoutDelay("Key switch delay", StarterConfig.SwitchKeyDelay * 1000);
 				D2Bot.restart(true);
 			} else {
 				ControlAction.click(6, 335, 450, 128, 35);
-				timeoutDelay("LoD key in use", StarterConfig.CDKeyInUseDelay * 6e4);
+				ControlAction.timeoutDelay("LoD key in use", StarterConfig.CDKeyInUseDelay * 6e4);
 			}
 
 			break;
 		default:
 			if (gameInfo.switchKeys) {
 				D2Bot.printToConsole("Invalid CD-Key");
-				timeoutDelay("Key switch delay", StarterConfig.SwitchKeyDelay * 1000);
+				ControlAction.timeoutDelay("Key switch delay", StarterConfig.SwitchKeyDelay * 1000);
 				D2Bot.restart(true);
 			} else {
 				ControlAction.click(6, 335, 450, 128, 35);
-				timeoutDelay("Invalid CD-Key", StarterConfig.CDKeyInUseDelay * 6e4);
+				ControlAction.timeoutDelay("Invalid CD-Key", StarterConfig.CDKeyInUseDelay * 6e4);
 			}
 
 			break;
@@ -669,13 +725,38 @@ MainLoop:
 		break;
 	case 23: // Character Select - Connecting
 	case 42: // Empty character screen
+		string = "";
+		text = ControlAction.getText(4, 45, 318, 531, 140);
+
+		if (text) {
+			for (i = 0; i < text.length; i += 1) {
+				string += text[i];
+
+				if (i !== text.length - 1) {
+					string += " ";
+				}
+			}
+
+			if (string === getLocaleString(11161)) { // CDKey disabled from realm play
+				D2Bot.updateStatus("Realm Disabled CDKey");
+				D2Bot.printToConsole("Realm Disabled CDKey: " + gameInfo.mpq, 6);
+				D2Bot.CDKeyDisabled();
+
+				if (gameInfo.switchKeys) {
+					ControlAction.timeoutDelay("Key switch delay", StarterConfig.SwitchKeyDelay * 1000);
+					D2Bot.restart(true);
+				} else {
+					D2Bot.stop();
+				}
+			}
+		}
+
 		if (!locationTimeout(StarterConfig.ConnectingTimeout * 1e3, location)) {
-			//print("QQQ");
 			ControlAction.click(6, 33, 572, 128, 35);
-		}
 
-		if (gameInfo.rdBlocker) {
-			D2Bot.restart();
+			if (gameInfo.rdBlocker) {
+				D2Bot.restart();
+			}
 		}
 
 		break;
@@ -703,7 +784,7 @@ MainLoop:
 
 		break;
 	case 38: // Game is full
-		//D2Bot.printToConsole("Game is full");
+		badGames.push(joinInfo.gameName);
 		ControlAction.click(6, 652, 469, 120, 20);
 		ControlAction.click(6, 433, 433, 96, 32);
 
@@ -719,4 +800,4 @@ MainLoop:
 
 		break;
 	}
-}
+}