Add code check for items and fix moveToExit (#1367)

-add unit code check for possible base stat name duplicates -fix movetoExit to work properly for array of target areas -fix gate opening in a5 which continued to re-click when it was already in opening animation
kolton · Mar 23, 2019 · 71e502f · 71e502f
1 parent c3bf745
commit 71e502f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/d2bs/kolbot/libs/GameAction.js b/d2bs/kolbot/libs/GameAction.js
@@ -376,7 +376,7 @@ var GameAction = {
 			break;
 		case 7: // Unique
 			for (i = 0; i < 401; i += 1) {
-				if (unit.fname.split("\n").reverse()[0].indexOf(getLocaleString(getBaseStat(17, i, 2))) > -1) {
+				if (unit.code === getBaseStat(17, i, 4).trim() && unit.fname.split("\n").reverse()[0].indexOf(getLocaleString(getBaseStat(17, i, 2))) > -1) {
 					code = getBaseStat(17, i, "invfile");
 
 					break;

diff --git a/d2bs/kolbot/libs/MuleLogger.js b/d2bs/kolbot/libs/MuleLogger.js
@@ -251,7 +251,7 @@ var MuleLogger = {
 			break;
 		case 7: // Unique
 			for (i = 0; i < 401; i += 1) {
-				if (unit.fname.split("\n").reverse()[0].indexOf(getLocaleString(getBaseStat(17, i, 2))) > -1) {
+				if (unit.code === getBaseStat(17, i, 4).trim() && unit.fname.split("\n").reverse()[0].indexOf(getLocaleString(getBaseStat(17, i, 2))) > -1) {
 					code = getBaseStat(17, i, "invfile");
 
 					break;

diff --git a/d2bs/kolbot/libs/bots/Travincal.js b/d2bs/kolbot/libs/bots/Travincal.js
@@ -58,10 +58,7 @@ function Travincal() {
 
 		// Stack Merc
 		if (me.classid === 4 && !me.getSkill(54, 1) && me.gametype === 1) {
-			// WAR - moveToExit needs to be fixed
-			Pather.moveToExit(100, true);
-			delay(me.ping*2 + 100);
-			Pather.moveToExit(83, true);
+			Pather.moveToExit([100, 83], true);
 		}
 
 		if (Config.MFLeader) {

diff --git a/d2bs/kolbot/libs/common/Misc.js b/d2bs/kolbot/libs/common/Misc.js
@@ -1503,7 +1503,7 @@ var Misc = {
 				break;
 			case 7: // Unique
 				for (i = 0; i < 401; i += 1) {
-					if (unit.fname.split("\n").reverse()[0].indexOf(getLocaleString(getBaseStat(17, i, 2))) > -1) {
+					if (unit.code === getBaseStat(17, i, 4).trim() && unit.fname.split("\n").reverse()[0].indexOf(getLocaleString(getBaseStat(17, i, 2))) > -1) {
 						code = getBaseStat(17, i, "invfile");
 
 						break;
@@ -2194,7 +2194,7 @@ var Packet = {
 					return true;
 				}
 
-				if (getInteractedNPC()) {
+				if (getInteractedNPC() && getTickCount() - tick > 1000) {
 					me.cancel();
 				}
 

diff --git a/d2bs/kolbot/libs/common/Pather.js b/d2bs/kolbot/libs/common/Pather.js
@@ -639,7 +639,7 @@ ModeLoop:
 
 							break;
 						case 2: // stairs
-							if (!this.openExit(targetArea) && !this.useUnit(5, currExit.tileid, areas[i])) {
+							if (!this.openExit(areas[i]) && !this.useUnit(5, currExit.tileid, areas[i])) {
 								return false;
 							}
 
@@ -1394,13 +1394,17 @@ MainLoop:
 
 				if (unit) {
 					for (i = 0; i < 3; i += 1) {
+						if (unit.mode) {
+							break;
+						}
+
 						Misc.click(0, 0, unit);
 						//unit.interact();
 
 						tick = getTickCount();
 
 						while (getTickCount() - tick < 3000) {
-							if (unit.mode === 2) {
+							if (unit.mode) {
 								delay(1000);
 
 								break;

diff --git a/d2bs/kolbot/libs/common/Prototypes.js b/d2bs/kolbot/libs/common/Prototypes.js
@@ -120,7 +120,7 @@ Unit.prototype.openMenu = function (addDelay) {
 				return true;
 			}
 
-			if (getInteractedNPC()) {
+			if (getInteractedNPC() && getTickCount() - tick > 1000) {
 				me.cancel();
 			}
 
@@ -1018,7 +1018,7 @@ Unit.prototype.getColor = function () {
 		}
 	} else if (this.quality === 7) { // Unique
 		for (i = 0; i < 401; i += 1) {
-			if (this.fname.split("\n").reverse()[0].indexOf(getLocaleString(getBaseStat(17, i, 2))) > -1) {
+			if (this.code === getBaseStat(17, i, 4).replace(/^\s+|\s+$/g, "") && this.fname.split("\n").reverse()[0].indexOf(getLocaleString(getBaseStat(17, i, 2))) > -1) {
 				return getBaseStat(17, i, 13) > 20 ? -1 : getBaseStat(17, i, 13);
 			}
 		}