From 2d6c32fdba4005d2b663a6fd4f088be19a312db9 Mon Sep 17 00:00:00 2001 From: dsimich <21962115+dsimich@users.noreply.github.com> Date: Sun, 10 Sep 2023 10:29:18 -0400 Subject: [PATCH] D1 shen (#1355) * D1 Shen is now enabled --- BUILD/task_order/Avatar of Jarlsberg.dat | 1 - BUILD/task_order/Legacy of Loathing.dat | 1 - BUILD/task_order/Quantum Terrarium.dat | 1 - BUILD/task_order/Zombie Slayer.dat | 1 - BUILD/task_order/default.dat | 1 - RELEASE/data/autoscend_task_order.txt | 61 +++++++++---------- RELEASE/scripts/autoscend.ash | 1 - RELEASE/scripts/autoscend/auto_util.ash | 21 ------- .../scripts/autoscend/autoscend_header.ash | 2 - .../paths/actually_ed_the_undying.ash | 10 --- .../autoscend/paths/low_key_summer.ash | 7 --- RELEASE/scripts/autoscend/quests/level_11.ash | 18 +----- 12 files changed, 31 insertions(+), 94 deletions(-) diff --git a/BUILD/task_order/Avatar of Jarlsberg.dat b/BUILD/task_order/Avatar of Jarlsberg.dat index bc94d8753..33afc0ba7 100644 --- a/BUILD/task_order/Avatar of Jarlsberg.dat +++ b/BUILD/task_order/Avatar of Jarlsberg.dat @@ -54,6 +54,5 @@ L5_slayTheGoblinKing L4_batCave L3_tavern setSoftblockDelay allowSoftblockDelay -setSoftblockShen allowSoftblockShen L13_towerAscent LX_attemptPowerLevel diff --git a/BUILD/task_order/Legacy of Loathing.dat b/BUILD/task_order/Legacy of Loathing.dat index b371080d2..707fe04a5 100644 --- a/BUILD/task_order/Legacy of Loathing.dat +++ b/BUILD/task_order/Legacy of Loathing.dat @@ -91,7 +91,6 @@ L12_finalizeWar L12_clearBattlefield LX_koeInvaderHandler setSoftblockDelay allowSoftblockDelay -setSoftblockShen allowSoftblockShen LX_getDigitalKey LX_getStarKey L12_lastDitchFlyer diff --git a/BUILD/task_order/Quantum Terrarium.dat b/BUILD/task_order/Quantum Terrarium.dat index e4345a13d..8664fa4ed 100644 --- a/BUILD/task_order/Quantum Terrarium.dat +++ b/BUILD/task_order/Quantum Terrarium.dat @@ -58,6 +58,5 @@ L5_slayTheGoblinKing L4_batCave L3_tavern setSoftblockDelay allowSoftblockDelay -setSoftblockShen allowSoftblockShen L13_towerAscent LX_attemptPowerLevel diff --git a/BUILD/task_order/Zombie Slayer.dat b/BUILD/task_order/Zombie Slayer.dat index ea5e0fe14..2979dc173 100644 --- a/BUILD/task_order/Zombie Slayer.dat +++ b/BUILD/task_order/Zombie Slayer.dat @@ -54,6 +54,5 @@ L5_slayTheGoblinKing L4_batCave L3_tavern setSoftblockDelay allowSoftblockDelay -setSoftblockShen allowSoftblockShen L13_towerAscent LX_attemptPowerLevel diff --git a/BUILD/task_order/default.dat b/BUILD/task_order/default.dat index 8c94c9441..cbbb695db 100644 --- a/BUILD/task_order/default.dat +++ b/BUILD/task_order/default.dat @@ -83,7 +83,6 @@ L12_finalizeWar L12_clearBattlefield LX_koeInvaderHandler setSoftblockDelay allowSoftblockDelay -setSoftblockShen allowSoftblockShen LX_getDigitalKey LX_getStarKey L12_lastDitchFlyer diff --git a/RELEASE/data/autoscend_task_order.txt b/RELEASE/data/autoscend_task_order.txt index 16f737bf8..90dd48277 100644 --- a/RELEASE/data/autoscend_task_order.txt +++ b/RELEASE/data/autoscend_task_order.txt @@ -60,9 +60,8 @@ Avatar of Jarlsberg 52 L5_slayTheGoblinKing Avatar of Jarlsberg 53 L4_batCave Avatar of Jarlsberg 54 L3_tavern Avatar of Jarlsberg 55 setSoftblockDelay allowSoftblockDelay -Avatar of Jarlsberg 56 setSoftblockShen allowSoftblockShen -Avatar of Jarlsberg 57 L13_towerAscent -Avatar of Jarlsberg 58 LX_attemptPowerLevel +Avatar of Jarlsberg 56 L13_towerAscent +Avatar of Jarlsberg 57 LX_attemptPowerLevel Legacy of Loathing 0 LX_freeCombatsTask Legacy of Loathing 1 LX_unlockPirateRealm @@ -157,18 +156,17 @@ Legacy of Loathing 81 L12_finalizeWar Legacy of Loathing 82 L12_clearBattlefield Legacy of Loathing 83 LX_koeInvaderHandler Legacy of Loathing 84 setSoftblockDelay allowSoftblockDelay -Legacy of Loathing 85 setSoftblockShen allowSoftblockShen -Legacy of Loathing 86 LX_getDigitalKey -Legacy of Loathing 87 LX_getStarKey -Legacy of Loathing 88 L12_lastDitchFlyer -Legacy of Loathing 89 LX_bugbearInvasionFinale -Legacy of Loathing 90 L13_towerNSContests -Legacy of Loathing 91 L13_towerNSHedge -Legacy of Loathing 92 L13_sorceressDoor -Legacy of Loathing 93 L13_towerNSTower -Legacy of Loathing 94 L13_towerNSNagamar -Legacy of Loathing 95 L13_towerNSFinal -Legacy of Loathing 96 LX_attemptPowerLevel +Legacy of Loathing 85 LX_getDigitalKey +Legacy of Loathing 86 LX_getStarKey +Legacy of Loathing 87 L12_lastDitchFlyer +Legacy of Loathing 88 LX_bugbearInvasionFinale +Legacy of Loathing 89 L13_towerNSContests +Legacy of Loathing 90 L13_towerNSHedge +Legacy of Loathing 91 L13_sorceressDoor +Legacy of Loathing 92 L13_towerNSTower +Legacy of Loathing 93 L13_towerNSNagamar +Legacy of Loathing 94 L13_towerNSFinal +Legacy of Loathing 95 LX_attemptPowerLevel Quantum Terrarium 0 LX_freeCombatsTask Quantum Terrarium 1 LX_unlockPirateRealm @@ -230,9 +228,8 @@ Quantum Terrarium 56 L5_slayTheGoblinKing Quantum Terrarium 57 L4_batCave Quantum Terrarium 58 L3_tavern Quantum Terrarium 59 setSoftblockDelay allowSoftblockDelay -Quantum Terrarium 60 setSoftblockShen allowSoftblockShen -Quantum Terrarium 61 L13_towerAscent -Quantum Terrarium 62 LX_attemptPowerLevel +Quantum Terrarium 60 L13_towerAscent +Quantum Terrarium 61 LX_attemptPowerLevel Zombie Slayer 0 LM_zombieSlayer Zombie Slayer 1 LX_unlockPirateRealm @@ -290,9 +287,8 @@ Zombie Slayer 52 L5_slayTheGoblinKing Zombie Slayer 53 L4_batCave Zombie Slayer 54 L3_tavern Zombie Slayer 55 setSoftblockDelay allowSoftblockDelay -Zombie Slayer 56 setSoftblockShen allowSoftblockShen -Zombie Slayer 57 L13_towerAscent -Zombie Slayer 58 LX_attemptPowerLevel +Zombie Slayer 56 L13_towerAscent +Zombie Slayer 57 LX_attemptPowerLevel default 0 LX_freeCombatsTask default 1 LX_unlockPirateRealm @@ -379,16 +375,15 @@ default 81 L12_finalizeWar default 82 L12_clearBattlefield default 83 LX_koeInvaderHandler default 84 setSoftblockDelay allowSoftblockDelay -default 85 setSoftblockShen allowSoftblockShen -default 86 LX_getDigitalKey -default 87 LX_getStarKey -default 88 L12_lastDitchFlyer -default 89 LX_bugbearInvasionFinale -default 90 L13_towerNSContests -default 91 L13_towerNSHedge -default 92 L13_sorceressDoor -default 93 L13_towerNSTower -default 94 L13_towerNSNagamar -default 95 L13_towerNSFinal -default 96 LX_attemptPowerLevel +default 85 LX_getDigitalKey +default 86 LX_getStarKey +default 87 L12_lastDitchFlyer +default 88 LX_bugbearInvasionFinale +default 89 L13_towerNSContests +default 90 L13_towerNSHedge +default 91 L13_sorceressDoor +default 92 L13_towerNSTower +default 93 L13_towerNSNagamar +default 94 L13_towerNSFinal +default 95 LX_attemptPowerLevel diff --git a/RELEASE/scripts/autoscend.ash b/RELEASE/scripts/autoscend.ash index 8f3a6d6f6..23ea0ce0f 100644 --- a/RELEASE/scripts/autoscend.ash +++ b/RELEASE/scripts/autoscend.ash @@ -220,7 +220,6 @@ void initializeSettings() { set_property("auto_pulls", ""); // Last level during which we ran out of stuff to do without pre-completing some Shen quests. - set_property("auto_shenSkipLastLevel", 0); remove_property("auto_shenZonesTurnsSpent"); remove_property("auto_lastShenTurn"); diff --git a/RELEASE/scripts/autoscend/auto_util.ash b/RELEASE/scripts/autoscend/auto_util.ash index 40d710c86..205f42bbf 100644 --- a/RELEASE/scripts/autoscend/auto_util.ash +++ b/RELEASE/scripts/autoscend/auto_util.ash @@ -1619,27 +1619,6 @@ boolean inGnomeSign() return $strings[Blender, Packrat, Wombat] contains my_sign(); } -boolean allowSoftblockShen() -{ - //Some quests have a softblock on doing them because shen might need them. When we run out of things to do this softblock is released. - //Return true means the softblock is active. Return false means the softblock is released. - if(get_property("questL11Shen") == "finished") - { - return false; //shen quest is over. softblock not needed - } - - //We tell users to disable the shen softblock by setting auto_shenSkipLastLevel to 999. - //This is why we want to return < my_level() and not != my_level() - return get_property("auto_shenSkipLastLevel").to_int() < my_level(); -} - -boolean setSoftblockShen() -{ - auto_log_warning("I was trying to avoid zones that Shen might need, but I've run out of stuff to do. Releasing softblock.", "red"); - set_property("auto_shenSkipLastLevel", my_level()); - return true; -} - boolean instakillable(monster mon) { if(mon.boss) diff --git a/RELEASE/scripts/autoscend/autoscend_header.ash b/RELEASE/scripts/autoscend/autoscend_header.ash index acc6a13c9..753110728 100644 --- a/RELEASE/scripts/autoscend/autoscend_header.ash +++ b/RELEASE/scripts/autoscend/autoscend_header.ash @@ -1671,8 +1671,6 @@ boolean isDesertAvailable(); boolean inKnollSign(); boolean inCanadiaSign(); boolean inGnomeSign(); -boolean allowSoftblockShen(); -boolean setSoftblockShen(); boolean instakillable(monster mon); boolean stunnable(monster mon); float combatItemDamageMultiplier(); diff --git a/RELEASE/scripts/autoscend/paths/actually_ed_the_undying.ash b/RELEASE/scripts/autoscend/paths/actually_ed_the_undying.ash index 9537158eb..9472dda50 100644 --- a/RELEASE/scripts/autoscend/paths/actually_ed_the_undying.ash +++ b/RELEASE/scripts/autoscend/paths/actually_ed_the_undying.ash @@ -1544,16 +1544,6 @@ boolean LM_edTheUndying() return true; } - if (!have_skill($skill[Even More Elemental Wards])) { - // if we don't have the last Elemental Resistance Upgrade, we still need Ka - // Thus we shouldn't block quests that Shen might request as almost all of them are Ka zones. - if(allowSoftblockShen()) { - auto_log_warning("I was trying to avoid zones that Shen might need, but I still need Ka for upgrades.", "red"); - set_property("auto_shenSkipLastLevel", my_level()); - return true; - } - } - // Crush the jackass adventurer! if (L13_ed_towerHandler()) { diff --git a/RELEASE/scripts/autoscend/paths/low_key_summer.ash b/RELEASE/scripts/autoscend/paths/low_key_summer.ash index c471ccd50..4d58b80e0 100644 --- a/RELEASE/scripts/autoscend/paths/low_key_summer.ash +++ b/RELEASE/scripts/autoscend/paths/low_key_summer.ash @@ -600,13 +600,6 @@ boolean LX_lowkeySummer() { // Make sure to unlock Menagerie if it wasn't done while getting Knob labinet key if (LX_unlockKnobMenagerie()) { return true; } - // Release the softblock on quests that are waiting for Shen quest. - // If anyone ever gets this far in this path I will be both surprised and weirdly impressed. - if (my_level() > get_property("auto_shenSkipLastLevel").to_int() && get_property("questL11Shen") != "finished") { - auto_log_warning("I was trying to avoid zones that Shen might need, but I've run out of stuff to do.", "red"); - set_property("auto_shenSkipLastLevel", my_level()); - return true; - } // Make sure to go to war if (L12_lastDitchFlyer()) { return true; } diff --git a/RELEASE/scripts/autoscend/quests/level_11.ash b/RELEASE/scripts/autoscend/quests/level_11.ash index c1b48d23b..c1284a138 100644 --- a/RELEASE/scripts/autoscend/quests/level_11.ash +++ b/RELEASE/scripts/autoscend/quests/level_11.ash @@ -169,11 +169,6 @@ boolean[location] shenSnakeLocations(int day, int n_items_returned) boolean[location] shenZonesToAvoidBecauseMaybeSnake() { - if (!allowSoftblockShen()) - { - boolean[location] empty; - return empty; - } if (get_property("shenInitiationDay").to_int() > 0) { int day = get_property("shenInitiationDay").to_int(); @@ -186,11 +181,9 @@ boolean[location] shenZonesToAvoidBecauseMaybeSnake() boolean[location] zones_to_avoid; if (my_level() < 11) { - //if it's day 1, don't count this day's snakes since it's leaving it until day 2 - int fromThisDay = (my_daycount() == 1) ? 1 : 0; //if level 10, assume shen today or tomorrow, otherwise up to two days from now int beforeThatDay = (my_level() >= 10) ? 2 : 3; - for (int day=fromThisDay; day