Merge branch 'main' of https://github.com/Borega/pd2bs-scripts

Synced with upstream repository
yayza · Apr 11, 2021 · 69c505e · 69c505e
2 parents 9073fa7 + 4cf49a1
commit 69c505e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/kolbot/libs/bots/Mapper.js b/kolbot/libs/bots/Mapper.js
@@ -32,19 +32,30 @@ function Mapper() {
 	};
 
 	this.upgradeMaps = function () {
-		var map, maps, roll,
+		var map, maps, roll, minGold,
 			ids = Config.Mapper.Maps,
 			mapids = [];
+
+		if(!me.getQuest(35, 0)){ // Orbs cost more if Siege quest isn't done
+			minGold = 400000;
+		} else {
+			minGold = 200000;
+		}			
+
+		if (!me.getQuest(37, 0)) { // Check Anya Quest
+			print("Anya quest incomplete!");
+			return false;
+		}			
 
-		if(!this.buildRecipes("Rune")){
+		if (!this.buildRecipes("Rune")){ // Check if we have low runes
 			return false;
 		}		
 
 		for (var i = 0; i < ids.length; i++){ 
 			mapids.push(NTIPAliasClassID[ids[i]]);
 		}
 
-		if (me.getStat(14) + me.getStat(15) > 200000){
+		if (me.getStat(14) + me.getStat(15) > minGold){
 			maps = me.findItems(-1, 0).filter( function(x) { return mapids.indexOf(x.classid) > -1 && !this.checkMap(x)});
 		} else {
 			print("ÿc8Upgrading maps requiresÿc7 gold.ÿc8 Get your shit together!");

diff --git a/kolbot/libs/common/Attack.js b/kolbot/libs/common/Attack.js
@@ -530,9 +530,10 @@ var Attack = {
 
 						break;
 					}
-
-					// Skip non-unique monsters after 15 attacks, except in Throne of Destruction
-					if (me.area !== 131 && !(target.spectype & 0x7) && gidAttack[i].attacks > 15) {
+
+					if([746, 750, 755, 800, 809, 826, 861, 870, 879, 882, 883, 884].indexOf(target.classid) > -1 && gidAttack[i].attacks > 64) {
+						monsterList.shift();
+					} else if (me.area !== 131 && !(target.spectype & 0x7) && gidAttack[i].attacks > 15) { // Skip non-unique monsters after 15 attacks, except in Throne of Destruction
 						print("ÿc1Skipping " + target.name + " " + target.gid + " " + gidAttack[i].attacks);
 						monsterList.shift();
 					}

diff --git a/kolbot/libs/common/Attacks/Paladin.js b/kolbot/libs/common/Attacks/Paladin.js
@@ -184,7 +184,6 @@ var ClassAttack = {
 
 			return 1;
 		case 121: // FoH
-			if (!me.getState(121)) {
 				if (getDistance(me, unit) > Skill.getRange(attackSkill) || CollMap.checkColl(me, unit, 0x2004, 2)) {
 					if (!Attack.getIntoPosition(unit, Skill.getRange(attackSkill), 0x2004, true)) {
 						return 0;
@@ -200,7 +199,6 @@ var ClassAttack = {
 
 					return 1;
 				}
-			}
 
 			break;
 		default:

diff --git a/kolbot/libs/common/Pather.js b/kolbot/libs/common/Pather.js
@@ -28,19 +28,11 @@ var NodeAction = {
 				Attack.clearList(monList);
 			}
 		}
-
-		if (!me.inTown && !Config.ManualPlayPick) {
-			Attack.clear(7, 0);
-		}		
-
-/* 		if (Config.ClearPathingUniques) { //
-            Attack.clear(30); //clear all mobs in 30 yards, no spectype - either this line OR the one above
-        } */
 
 		if ((typeof Config.ClearPath === "number" || typeof Config.ClearPath === "object") && arg.clearPath === false) {
 			switch (typeof Config.ClearPath) {
 			case "number":
-				Attack.clear(30, Config.ClearPath);
+				Attack.clear(15, Config.ClearPath);
 
 				break;
 			case "object":

diff --git a/kolbot/test file - remove this.txt b/kolbot/test file - remove this.txt