diff --git a/RELEASE/scripts/autoscend/combat/auto_combat_default_stage2.ash b/RELEASE/scripts/autoscend/combat/auto_combat_default_stage2.ash index ebc5a102d..9f9a918b7 100644 --- a/RELEASE/scripts/autoscend/combat/auto_combat_default_stage2.ash +++ b/RELEASE/scripts/autoscend/combat/auto_combat_default_stage2.ash @@ -170,31 +170,6 @@ string auto_combatDefaultStage2(int round, monster enemy, string text) combat_status_add("phylumbanishercheck"); } - if(!combat_status_check("banishercheck") && auto_wantToBanish(monster_phylum(enemy), my_location())) - { - string banishAction = banisherCombatString(monster_phylum(enemy), my_location(), true); - if(banishAction != "") - { - auto_log_info("Looking at banishAction: " + banishAction, "green"); - combat_status_add("banisher"); - if(index_of(banishAction, "skill") == 0) - { - handleTracker(monster_phylum(enemy), to_skill(substring(banishAction, 6)), "auto_banishes"); - } - else if(index_of(banishAction, "item") == 0) - { - handleTracker(monster_phylum(enemy), to_item(substring(banishAction, 5)), "auto_banishes"); - } - else - { - auto_log_warning("Unable to track banisher behavior: " + banishAction, "red"); - } - return banishAction; - } - //we wanted to banish an enemy and failed. set a property so we do not bother trying in subsequent rounds - combat_status_add("phylumbanishercheck"); - } - // Free run in Avant Guard from Bodyguard before banishing for a few monsters if(!combat_status_check("banishercheck") && auto_wantToBanish(guardee, my_location())) { diff --git a/RELEASE/scripts/autoscend/quests/level_07.ash b/RELEASE/scripts/autoscend/quests/level_07.ash index a341eceb3..916fc855e 100644 --- a/RELEASE/scripts/autoscend/quests/level_07.ash +++ b/RELEASE/scripts/autoscend/quests/level_07.ash @@ -189,27 +189,6 @@ boolean L7_defiledAlcove() boolean L7_defiledNook() { - if (internalQuestStatus("questL07Cyrptic") != 0) - { - return false; - } - if (item_amount($item[chest of the bonerdagon]) == 1) - { - equipStatgainIncreasers(); - use(1, $item[chest of the bonerdagon]); - return false; - } - - if (isBanishedPhyla($phylum[undead]) && get_property("screechCombats").to_int() > 0) - { - set_property("screechDelay", true); - return false; //No sense in trying to go to the cyrpt if undead are banished - } - - // make sure quest status is correct before we attempt to adventure. - visit_url("crypt.php"); - use(1, $item[Evilometer]); - int evilBonus = cyrptEvilBonus(); // current mafia bug causes us to lose track of the amount of Evil Eyes in inventory so adding a refresh here @@ -412,6 +391,12 @@ boolean L7_crypt() return false; } + if (isBanishedPhyla($phylum[undead]) && get_property("screechCombats").to_int() > 0) + { + set_property("screechDelay", true); + return false; //No sense in trying to go to the cyrpt if undead are banished + } + // make sure quest status is correct before we attempt to adventure. visit_url("crypt.php"); use(1, $item[Evilometer]);