From a7378bb107bcfeaeb4a53ed6acbceb2b9c428e6f Mon Sep 17 00:00:00 2001 From: rugrat Date: Sun, 14 Jul 2019 09:27:24 -0400 Subject: [PATCH 1/7] Optimize- Asdon Usage on oil peak Optimize- Asdon and ML usage in Tavern (except Ed The Undying) Optimize- Grouped Tavern w/ Oil Peak (for high ML) and Pyramid (for Rat Tails) BugFix - Check for TCRS before wasting Bedtime crafting BugFix - Check for TCRS before food farming --- RELEASE/scripts/sl_ascend.ash | 46 ++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/RELEASE/scripts/sl_ascend.ash b/RELEASE/scripts/sl_ascend.ash index d92e1277f..74b0f2f19 100644 --- a/RELEASE/scripts/sl_ascend.ash +++ b/RELEASE/scripts/sl_ascend.ash @@ -1,6 +1,6 @@ script "sl_ascend.ash"; notify soolar the second; -since r19375; // beach comb +since r19335; // monster.copyable /*** Killing is wrong, and bad. There should be a new, stronger word for killing like badwrong or badong. YES, killing is badong. From this moment, I will stand for the opposite of killing, gnodab. @@ -146,6 +146,7 @@ void initializeSettings() set_property("sl_eaten", ""); set_property("sl_familiarChoice", $familiar[none]); set_property("sl_fcle", ""); + set_property("sl_forceTavern", false); set_property("sl_friars", ""); set_property("sl_funTracker", ""); set_property("sl_getBoningKnife", false); @@ -2640,7 +2641,12 @@ boolean doBedtime() use(1, $item[resolution: be more adventurous]); } - if((my_daycount() <= 2) && (freeCrafts() > 0)) + if(in_tcrs()) + { + print("Using My Free Crafts will have no benefit.", "red"); + print("Consider manually using your "+freeCrafts()+" free crafts"), "red"); + } + else if((my_daycount() <= 2) && (freeCrafts() > 0)) { // Check for rapid prototyping while((freeCrafts() > 0) && (item_amount($item[Scrumptious Reagent]) > 0) && (item_amount($item[Cranberries]) > 0) && (item_amount($item[Cranberry Cordial]) < 2) && have_skill($skill[Advanced Saucecrafting])) @@ -6976,6 +6982,8 @@ boolean L11_unlockEd() if(get_property("sl_tavern") != "finished") { print("Uh oh, didn\'t do the tavern and we are at the pyramid....", "red"); + set_property("sl_forceTavern", true); + L3_tavern() } print("In the pyramid (W:" + item_amount($item[crumbling wooden wheel]) + ") (R:" + item_amount($item[tomb ratchet]) + ") (U:" + get_property("controlRoomUnlock") + ")", "blue"); @@ -9393,6 +9401,11 @@ boolean L7_crypt() boolean LX_hardcoreFoodFarm() { + if(in_tcrs()) + { + print("Food farming pointless in my path.", "orange"); + return false; + } if(!in_hardcore() || !isGuildClass()) { return false; @@ -12566,6 +12579,15 @@ boolean L9_oilPeak() { buffMaintain($effect[Ceaseless Snarling], 0, 1, 1); } + // Maximize Asdon usage + if(((monster_level_adjustment() >= 75) && (monster_level_adjustment() <= 99)) || ((monster_level_adjustment() >= 25) && (monster_level_adjustment() <= 49)) || (monster_level_adjustment() <= 11)) + { + asdonBuff($effect[Driving Recklessly]); + } + else + { + asdonBuff($effect[Driving Wastefully]); + } if((monster_level_adjustment() < 60)) { if (item_amount($item[Dress Pants]) > 0) @@ -12586,6 +12608,11 @@ boolean L9_oilPeak() if(get_property("lastAdventure") == "Unimpressed with Pressure") { set_property("oilPeakProgress", 0.0); + // Brute Force grouping with tavern (if not done) to maximize tangles while we have a high ML. + print("Checking to see if we should do the tavern while we are running high ML.", "green"); + set_property("sl_forceTavern", true); + L3_tavern() + } handleFamiliar("item"); return true; @@ -13914,6 +13941,19 @@ boolean sl_tavern() providePlusNonCombat(25); } + // Maximize ML First by using equipment + if((monster_level_adjustment() <= 150) && (!my_path() == "Actually Ed the Undying")) + { + string to_max = "ML"; + maximize(to_max, false); + } + + // Asdon usage increases Rat King chance by 8.3% + if((monster_level_adjustment() <= 150) && (!my_path() == "Actually Ed the Undying")) + { + asdonBuff($effect[Driving Recklessly]); + } + tavern = get_property("tavernLayout"); if(tavern == "0000000000000000000000000") { @@ -14033,7 +14073,7 @@ boolean L3_tavern() delayTavern = false; } - if(delayTavern) + if((delayTavern) && (!get_property("sl_forceTavern").to_boolean())) { return false; } From a4a8129237d4275a7463c496dcb44f7161c39940 Mon Sep 17 00:00:00 2001 From: rugrat Date: Sun, 14 Jul 2019 09:38:32 -0400 Subject: [PATCH 2/7] Fixed Beachcomb note which was missing --- RELEASE/scripts/sl_ascend.ash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE/scripts/sl_ascend.ash b/RELEASE/scripts/sl_ascend.ash index 74b0f2f19..b18e3432b 100644 --- a/RELEASE/scripts/sl_ascend.ash +++ b/RELEASE/scripts/sl_ascend.ash @@ -1,6 +1,6 @@ script "sl_ascend.ash"; notify soolar the second; -since r19335; // monster.copyable +since r19375; // beach comb /*** Killing is wrong, and bad. There should be a new, stronger word for killing like badwrong or badong. YES, killing is badong. From this moment, I will stand for the opposite of killing, gnodab. From c2d276103f2b7581be3c647d9f1088301825a675 Mon Sep 17 00:00:00 2001 From: rugrat Date: Sun, 14 Jul 2019 11:57:04 -0400 Subject: [PATCH 3/7] Fixed missing semicolons where I removed diagnostic comments from my previously submitted script. Also added in more +ML checking to Oil Peak --- RELEASE/scripts/sl_ascend.ash | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/RELEASE/scripts/sl_ascend.ash b/RELEASE/scripts/sl_ascend.ash index b18e3432b..65d415ea1 100644 --- a/RELEASE/scripts/sl_ascend.ash +++ b/RELEASE/scripts/sl_ascend.ash @@ -6983,7 +6983,7 @@ boolean L11_unlockEd() { print("Uh oh, didn\'t do the tavern and we are at the pyramid....", "red"); set_property("sl_forceTavern", true); - L3_tavern() + L3_tavern(); } print("In the pyramid (W:" + item_amount($item[crumbling wooden wheel]) + ") (R:" + item_amount($item[tomb ratchet]) + ") (U:" + get_property("controlRoomUnlock") + ")", "blue"); @@ -12521,7 +12521,6 @@ boolean L9_oilPeak() return false; } - print("Oil Peak with ML: " + monster_level_adjustment(), "blue"); if(contains_text(visit_url("place.php?whichplace=highlands"), "fire3.gif")) { @@ -12579,6 +12578,14 @@ boolean L9_oilPeak() { buffMaintain($effect[Ceaseless Snarling], 0, 1, 1); } + + // Never puddle jump, but don't deliberately go crowd-punching the Cartels + if(((monster_level_adjustment() >= 25) && (monster_level_adjustment() <= 49)) || (monster_level_adjustment() <= 11)) + { + string to_max = "ML"; + maximize(to_max, false); + } + // Maximize Asdon usage if(((monster_level_adjustment() >= 75) && (monster_level_adjustment() <= 99)) || ((monster_level_adjustment() >= 25) && (monster_level_adjustment() <= 49)) || (monster_level_adjustment() <= 11)) { @@ -12588,6 +12595,7 @@ boolean L9_oilPeak() { asdonBuff($effect[Driving Wastefully]); } + if((monster_level_adjustment() < 60)) { if (item_amount($item[Dress Pants]) > 0) @@ -12603,6 +12611,9 @@ boolean L9_oilPeak() } } } + + print("Oil Peak with ML: " + monster_level_adjustment(), "blue"); + addToMaximize("1000ml 100max"); slAdv(1, $location[Oil Peak]); if(get_property("lastAdventure") == "Unimpressed with Pressure") @@ -12611,7 +12622,7 @@ boolean L9_oilPeak() // Brute Force grouping with tavern (if not done) to maximize tangles while we have a high ML. print("Checking to see if we should do the tavern while we are running high ML.", "green"); set_property("sl_forceTavern", true); - L3_tavern() + L3_tavern(); } handleFamiliar("item"); From 46d3ee1462302739cd58b6ce10880b8534d45539 Mon Sep 17 00:00:00 2001 From: rugrat Date: Mon, 15 Jul 2019 18:23:58 -0400 Subject: [PATCH 4/7] Removed extra parenthesis --- RELEASE/scripts/sl_ascend.ash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE/scripts/sl_ascend.ash b/RELEASE/scripts/sl_ascend.ash index 65d415ea1..79fc65165 100644 --- a/RELEASE/scripts/sl_ascend.ash +++ b/RELEASE/scripts/sl_ascend.ash @@ -2644,7 +2644,7 @@ boolean doBedtime() if(in_tcrs()) { print("Using My Free Crafts will have no benefit.", "red"); - print("Consider manually using your "+freeCrafts()+" free crafts"), "red"); + print("Consider manually using your "+freeCrafts()+" free crafts", "red"); } else if((my_daycount() <= 2) && (freeCrafts() > 0)) { From 636cad7c9d4ec98c88770c877a3219a8b0702da5 Mon Sep 17 00:00:00 2001 From: rugrat Date: Mon, 15 Jul 2019 18:30:27 -0400 Subject: [PATCH 5/7] Changed the Tavern Optimization to look for AEtUD path once --- RELEASE/scripts/sl_ascend.ash | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/RELEASE/scripts/sl_ascend.ash b/RELEASE/scripts/sl_ascend.ash index 79fc65165..0c4849a35 100644 --- a/RELEASE/scripts/sl_ascend.ash +++ b/RELEASE/scripts/sl_ascend.ash @@ -13952,17 +13952,20 @@ boolean sl_tavern() providePlusNonCombat(25); } - // Maximize ML First by using equipment - if((monster_level_adjustment() <= 150) && (!my_path() == "Actually Ed the Undying")) + if(my_path() != "Actually Ed the Undying") { - string to_max = "ML"; - maximize(to_max, false); - } - - // Asdon usage increases Rat King chance by 8.3% - if((monster_level_adjustment() <= 150) && (!my_path() == "Actually Ed the Undying")) - { - asdonBuff($effect[Driving Recklessly]); + // Maximize ML First by using equipment + if(monster_level_adjustment() <= 150) + { + string to_max = "ML"; + maximize(to_max, false); + } + + // Asdon usage increases Rat King chance by 8.3% + if(monster_level_adjustment() <= 150) + { + asdonBuff($effect[Driving Recklessly]); + } } tavern = get_property("tavernLayout"); From e46e0b4f21c6a4d6acbf19d34ddc435256471d55 Mon Sep 17 00:00:00 2001 From: rugrat Date: Mon, 15 Jul 2019 20:04:18 -0400 Subject: [PATCH 6/7] Minor Edits --- RELEASE/scripts/sl_ascend.ash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE/scripts/sl_ascend.ash b/RELEASE/scripts/sl_ascend.ash index 0c4849a35..2b346e896 100644 --- a/RELEASE/scripts/sl_ascend.ash +++ b/RELEASE/scripts/sl_ascend.ash @@ -2641,7 +2641,7 @@ boolean doBedtime() use(1, $item[resolution: be more adventurous]); } - if(in_tcrs()) + if((in_tcrs()) && (freeCrafts() > 0)) { print("Using My Free Crafts will have no benefit.", "red"); print("Consider manually using your "+freeCrafts()+" free crafts", "red"); @@ -9403,7 +9403,7 @@ boolean LX_hardcoreFoodFarm() { if(in_tcrs()) { - print("Food farming pointless in my path.", "orange"); + print("Food farming pointless in my path."); return false; } if(!in_hardcore() || !isGuildClass()) From 918e78e14ace82e6a4e665c9e585347dfe2c2ab5 Mon Sep 17 00:00:00 2001 From: rugrat Date: Mon, 15 Jul 2019 20:48:10 -0400 Subject: [PATCH 7/7] Realized Oil Peak uses maximizer, removed my equipping lines Added - Maximizer added to Tavern. --- RELEASE/scripts/sl_ascend.ash | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/RELEASE/scripts/sl_ascend.ash b/RELEASE/scripts/sl_ascend.ash index 2b346e896..60ad7ccb0 100644 --- a/RELEASE/scripts/sl_ascend.ash +++ b/RELEASE/scripts/sl_ascend.ash @@ -12579,13 +12579,6 @@ boolean L9_oilPeak() buffMaintain($effect[Ceaseless Snarling], 0, 1, 1); } - // Never puddle jump, but don't deliberately go crowd-punching the Cartels - if(((monster_level_adjustment() >= 25) && (monster_level_adjustment() <= 49)) || (monster_level_adjustment() <= 11)) - { - string to_max = "ML"; - maximize(to_max, false); - } - // Maximize Asdon usage if(((monster_level_adjustment() >= 75) && (monster_level_adjustment() <= 99)) || ((monster_level_adjustment() >= 25) && (monster_level_adjustment() <= 49)) || (monster_level_adjustment() <= 11)) { @@ -12612,9 +12605,10 @@ boolean L9_oilPeak() } } + addToMaximize("1000ml 100max"); + print("Oil Peak with ML: " + monster_level_adjustment(), "blue"); - addToMaximize("1000ml 100max"); slAdv(1, $location[Oil Peak]); if(get_property("lastAdventure") == "Unimpressed with Pressure") { @@ -13952,17 +13946,22 @@ boolean sl_tavern() providePlusNonCombat(25); } - if(my_path() != "Actually Ed the Undying") + if((my_path() != "Actually Ed the Undying") && (monster_level_adjustment() <= 299)) { // Maximize ML First by using equipment - if(monster_level_adjustment() <= 150) + if(useMaximizeToEquip()) { + addToMaximize("1000ml 300max"); + } + else + { + string to_max = "ML"; maximize(to_max, false); } // Asdon usage increases Rat King chance by 8.3% - if(monster_level_adjustment() <= 150) + if(monster_level_adjustment() <= 299) { asdonBuff($effect[Driving Recklessly]); }