Merge pull request #3 from Borega/main

update
yayza · Apr 17, 2021 · 93b30a2 · 93b30a2
2 parents a8850ea + 050c0bb
commit 93b30a2
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 23 deletions.
diff --git a/kolbot/libs/bots/Mapper.js b/kolbot/libs/bots/Mapper.js
@@ -54,7 +54,7 @@ function Mapper() {
 	};
 
 	this.upgradeMaps = function () {
-		var map, maps, roll, tome, minGold,
+		var map, maps, roll, minGold,
 			ids = Config.Mapper.Maps,
 			mapids = [];
 

diff --git a/kolbot/libs/bots/Mausoleum.js b/kolbot/libs/bots/Mausoleum.js
@@ -14,7 +14,7 @@ function Mausoleum() {
 	}
 
 	if (Config.Mausoleum.KillBloodRaven) {
-		Pather.moveToPreset(17, 1, 957);
+		Pather.moveToPreset(17, 1, 958);
 		Attack.kill(getLocaleString(3111)); // Blood Raven
 		Pickit.pickItems();
 	}

diff --git a/kolbot/libs/common/Precast.js b/kolbot/libs/common/Precast.js
@@ -134,8 +134,10 @@ var Precast = new function () {
 		var buffSummons = false;
 
 		if (me.classid != 5){
-			if (me.getSkill(226, 1)&& !me.getState(149)) {
+			if (me.getSkill(226, 1) && !me.getState(149)) {
 				Skill.cast(226, 0); // Oak Sage
+			} else if (me.getSkill(236, 1) && !me.getState(148)){
+				Skill.cast(236, 0); // Heart of the Wolverine
 			}
 		}
 

diff --git a/kolbot/libs/common/Storage.js b/kolbot/libs/common/Storage.js
@@ -191,20 +191,13 @@ var Container = function (name, width, height, location) {
             var quant_types = [118, 120, 121, 122, 123, 124, 137, 104, 194, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 197];
 
             if ((this.location === 3 || this.location === 7) && quant_types.indexOf(item.itemType) > -1) {
-                var stack = find_eligible_stack(item.classid, 50, this.location);
+                var stack = find_eligible_stack(item.classid, item.getStat(70), this.location);
 
                 if (stack) {
                     for (var i = 0; i < 3; i++) {
                         clickItem(0, stack);
-                        var max_wait = Date.now() + 500 + me.ping;
-                        while (Date.now() < max_wait) {
-                            delay(10);
-                            if (!me.itemoncursor) {
-                                // successfully stacked?
-                                delay(41);
-                                return true;
-                            }
-                        }
+						delay(100 + me.ping);
+						return true;						 
                     }
                 }
             }
@@ -413,13 +406,13 @@ var Storage = new function () {
     };
 };
 
-function find_eligible_stack(item_index, max_quant, loc) {
+function find_eligible_stack(item_index, currentStack, loc) {
     var stacks = me.findItems(item_index, 0, loc);
     if (!stacks) {
         return false;
     }
     for (var i = 0; i < stacks.length; i++) {
-        if (stacks[i].getStat(70) >= 1 && stacks[i].getStat(70) < max_quant) {
+        if (stacks[i].getStat(70) + currentStack <= 50) {
             return stacks[i];
         }
     }

diff --git a/kolbot/libs/config/Amazon.js b/kolbot/libs/config/Amazon.js
@@ -55,6 +55,8 @@ function LoadConfig() {
 	Scripts.Cows = false;
 
 	// *** act 2 ***
+	Scripts.StonyTomb = false;
+        Config.StonyTomb.ClearType = 0; // 0xF = skip normal, 0x7 = champions/bosses, 0 = all	
 	Scripts.Radament = false;
 	Scripts.Coldworm = false;
 		Config.Coldworm.KillBeetleburst = false;
@@ -663,4 +665,4 @@ function LoadConfig() {
 	Config.AutoBuild.DebugMode = true;			//	Debug mode prints a little more information to console and
 												//	logs activity to /logs/AutoBuild.CharacterName._MM_DD_YYYY.log
 												//	It automatically enables Config.AutoBuild.Verbose
-}
+}
diff --git a/kolbot/libs/config/Assassin.js b/kolbot/libs/config/Assassin.js
@@ -55,6 +55,8 @@ function LoadConfig() {
 	Scripts.Cows = false;
 
 	// *** act 2 ***
+	Scripts.StonyTomb = false;
+        Config.StonyTomb.ClearType = 0; // 0xF = skip normal, 0x7 = champions/bosses, 0 = all	
 	Scripts.Radament = false;
 	Scripts.Coldworm = false;
 		Config.Coldworm.KillBeetleburst = false;
@@ -671,4 +673,4 @@ function LoadConfig() {
 	Config.AutoBuild.DebugMode = true;			//	Debug mode prints a little more information to console and
 												//	logs activity to /logs/AutoBuild.CharacterName._MM_DD_YYYY.log
 												//	It automatically enables Config.AutoBuild.Verbose
-}
+}
diff --git a/kolbot/libs/config/Barbarian.js b/kolbot/libs/config/Barbarian.js
@@ -55,6 +55,8 @@ function LoadConfig() {
 	Scripts.Cows = false;
 
 	// *** act 2 ***
+	Scripts.StonyTomb = false;
+        Config.StonyTomb.ClearType = 0; // 0xF = skip normal, 0x7 = champions/bosses, 0 = all	
 	Scripts.Radament = false;
 	Scripts.Coldworm = false;
 		Config.Coldworm.KillBeetleburst = false;
@@ -656,4 +658,4 @@ function LoadConfig() {
 	Config.AutoBuild.DebugMode = true;			//	Debug mode prints a little more information to console and
 												//	logs activity to /logs/AutoBuild.CharacterName._MM_DD_YYYY.log
 												//	It automatically enables Config.AutoBuild.Verbose
-}
+}
diff --git a/kolbot/libs/config/Druid.js b/kolbot/libs/config/Druid.js
@@ -55,6 +55,8 @@ function LoadConfig() {
 	Scripts.Cows = false;
 
 	// *** act 2 ***
+	Scripts.StonyTomb = false;
+        Config.StonyTomb.ClearType = 0; // 0xF = skip normal, 0x7 = champions/bosses, 0 = all	
 	Scripts.Radament = false;
 	Scripts.Coldworm = false;
 		Config.Coldworm.KillBeetleburst = false;

diff --git a/kolbot/libs/config/Necromancer.js b/kolbot/libs/config/Necromancer.js
@@ -55,6 +55,8 @@ function LoadConfig() {
 	Scripts.Cows = false;
 
 	// *** act 2 ***
+	Scripts.StonyTomb = false;
+        Config.StonyTomb.ClearType = 0; // 0xF = skip normal, 0x7 = champions/bosses, 0 = all	
 	Scripts.Radament = false;
 	Scripts.Coldworm = false;
 		Config.Coldworm.KillBeetleburst = false;
@@ -673,4 +675,4 @@ function LoadConfig() {
 	Config.AutoBuild.DebugMode = true;			//	Debug mode prints a little more information to console and
 												//	logs activity to /logs/AutoBuild.CharacterName._MM_DD_YYYY.log
 												//	It automatically enables Config.AutoBuild.Verbose
-}
+}
diff --git a/kolbot/libs/config/Paladin.js b/kolbot/libs/config/Paladin.js
@@ -55,6 +55,8 @@ function LoadConfig() {
 	Scripts.Cows = false;
 
 	// *** act 2 ***
+	Scripts.StonyTomb = false;
+        	Config.StonyTomb.ClearType = 0; // 0xF = skip normal, 0x7 = champions/bosses, 0 = all
 	Scripts.Radament = false;
 	Scripts.Coldworm = false;
 		Config.Coldworm.KillBeetleburst = false;
@@ -663,4 +665,4 @@ function LoadConfig() {
 	Config.AutoBuild.DebugMode = true;			//	Debug mode prints a little more information to console and
 												//	logs activity to /logs/AutoBuild.CharacterName._MM_DD_YYYY.log
 												//	It automatically enables Config.AutoBuild.Verbose
-}
+}
diff --git a/kolbot/pickit/Misc.nip b/kolbot/pickit/Misc.nip
@@ -160,6 +160,4 @@
 [Name] == primeevilsoul
 
 //MAPS
-//[Name] == tieronemap && [Quality] == Rare
-//[Name] == tiertwomap && [Quality] == Rare
-//[Name] == tierthreemap && [Quality] == Rare
+[type] >= t1map && [type] <= t3map