From 0cfae19abb6bf41af5d676eacc6c1a0b3d1d6879 Mon Sep 17 00:00:00 2001 From: yayza <80866371+yayza@users.noreply.github.com> Date: Thu, 15 Apr 2021 15:09:29 -0700 Subject: [PATCH 1/6] HoTW from Wisp Support --- kolbot/libs/bots/Mapper.js | 2 +- kolbot/libs/common/Precast.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kolbot/libs/bots/Mapper.js b/kolbot/libs/bots/Mapper.js index b32b86a..eeb2f6f 100644 --- 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/common/Precast.js b/kolbot/libs/common/Precast.js index 6d68074..0c259e2 100644 --- 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 } } From 1cb2ade570ece80208d63d3765b368c987aafbe4 Mon Sep 17 00:00:00 2001 From: yayza <80866371+yayza@users.noreply.github.com> Date: Thu, 15 Apr 2021 21:14:20 -0700 Subject: [PATCH 2/6] Update Storage.js Faster stack placement --- kolbot/libs/common/Storage.js | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/kolbot/libs/common/Storage.js b/kolbot/libs/common/Storage.js index 1bf4bcc..bdb734d 100644 --- 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]; } } From cf0eb0a4d10546e207f613d5da05401a796790d8 Mon Sep 17 00:00:00 2001 From: yayza <80866371+yayza@users.noreply.github.com> Date: Thu, 15 Apr 2021 21:18:17 -0700 Subject: [PATCH 3/6] Update Mausoleum.js --- kolbot/libs/bots/Mausoleum.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kolbot/libs/bots/Mausoleum.js b/kolbot/libs/bots/Mausoleum.js index 98dcfc9..3388f67 100644 --- 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(); } From 2e974d3ea784c388e1937d43192d266a54ead639 Mon Sep 17 00:00:00 2001 From: iriFiri <82155523+iriFiri@users.noreply.github.com> Date: Fri, 16 Apr 2021 00:27:25 -0400 Subject: [PATCH 4/6] Fixed missing StoneyTomb (#21) * Update Amazon.js * Update Assassin.js * Update Barbarian.js * Update Druid.js * Update Necromancer.js * Update Paladin.js --- kolbot/libs/config/Amazon.js | 4 +++- kolbot/libs/config/Assassin.js | 4 +++- kolbot/libs/config/Barbarian.js | 4 +++- kolbot/libs/config/Druid.js | 2 ++ kolbot/libs/config/Necromancer.js | 4 +++- kolbot/libs/config/Paladin.js | 4 +++- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/kolbot/libs/config/Amazon.js b/kolbot/libs/config/Amazon.js index 93d7f0c..f9a2991 100644 --- 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 -} \ No newline at end of file +} diff --git a/kolbot/libs/config/Assassin.js b/kolbot/libs/config/Assassin.js index ed1b7dd..e0c2b38 100644 --- 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 -} \ No newline at end of file +} diff --git a/kolbot/libs/config/Barbarian.js b/kolbot/libs/config/Barbarian.js index ec3387c..e6edba0 100644 --- 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 -} \ No newline at end of file +} diff --git a/kolbot/libs/config/Druid.js b/kolbot/libs/config/Druid.js index e3cd572..84c3e46 100644 --- 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 index 0564123..8b23a7e 100644 --- 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 -} \ No newline at end of file +} diff --git a/kolbot/libs/config/Paladin.js b/kolbot/libs/config/Paladin.js index 3f68ee4..6ed638b 100644 --- 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 -} \ No newline at end of file +} From 8bba853431d9a141f51eebc6a304c1ebe4ac8186 Mon Sep 17 00:00:00 2001 From: yayza <80866371+yayza@users.noreply.github.com> Date: Fri, 16 Apr 2021 18:13:40 -0700 Subject: [PATCH 5/6] Update Misc.nip --- kolbot/pickit/Misc.nip | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kolbot/pickit/Misc.nip b/kolbot/pickit/Misc.nip index 2e218c7..0abb59d 100644 --- a/kolbot/pickit/Misc.nip +++ b/kolbot/pickit/Misc.nip @@ -160,6 +160,6 @@ [Name] == primeevilsoul //MAPS -//[Name] == tieronemap && [Quality] == Rare -//[Name] == tiertwomap && [Quality] == Rare -//[Name] == tierthreemap && [Quality] == Rare \ No newline at end of file +[type] == t1map && [Quality] == Rare +[type] == t2map && [Quality] == Rare +[type] == t3map && [Quality] == Rare \ No newline at end of file From 050c0bb254cc6304209d2dbf295cf8a1c58720e4 Mon Sep 17 00:00:00 2001 From: yayza <80866371+yayza@users.noreply.github.com> Date: Fri, 16 Apr 2021 19:58:54 -0700 Subject: [PATCH 6/6] Update Misc.nip All maps, since we can upgrade them later --- kolbot/pickit/Misc.nip | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kolbot/pickit/Misc.nip b/kolbot/pickit/Misc.nip index 0abb59d..0b7c89f 100644 --- a/kolbot/pickit/Misc.nip +++ b/kolbot/pickit/Misc.nip @@ -160,6 +160,4 @@ [Name] == primeevilsoul //MAPS -[type] == t1map && [Quality] == Rare -[type] == t2map && [Quality] == Rare -[type] == t3map && [Quality] == Rare \ No newline at end of file +[type] >= t1map && [type] <= t3map \ No newline at end of file