Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eagle scepter #1403

Open
wants to merge 117 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 112 commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
baa01e7
Initial Eagle Support, CMC change, and bug fix
dsimich Oct 7, 2023
4ae78a2
Assemble the dat files into txts
dsimich Oct 7, 2023
27d8571
Silly fixes
dsimich Oct 7, 2023
ba0375b
More minor fixes
dsimich Oct 7, 2023
7b389b2
Bad parentheses
dsimich Oct 7, 2023
41c61fd
More parens issues
dsimich Oct 7, 2023
421ab1e
Fixed all of the errors
dsimich Oct 7, 2023
a20e4b5
get citizen of a zone
dsimich Oct 7, 2023
0c50f3b
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich Oct 10, 2023
cf2bd3b
Citizen of a Zone changes
dsimich Oct 10, 2023
5e6cd95
Properly track Citizen and fix phylum banishes
dsimich Oct 11, 2023
dbd3246
Don't care about monster banishes used re: phylums
dsimich Oct 11, 2023
9ec054a
Forgot a return
dsimich Oct 11, 2023
a15fcc4
Too many spaces
dsimich Oct 11, 2023
848611f
Small changes
dsimich Oct 12, 2023
96198fc
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich Oct 13, 2023
535e308
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich Oct 13, 2023
7b9d8a8
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich Oct 14, 2023
fdbc645
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich Oct 30, 2023
4389980
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich Oct 31, 2023
0d7f826
If didn't uneffect, don't try to get new Citizen
dsimich Nov 2, 2023
641745a
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich Nov 4, 2023
5f31597
Account for not being able to uneffect Citizen
dsimich Nov 4, 2023
8f0b340
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich Nov 15, 2023
d4d1de0
Get rid of my implementation of underground delay
dsimich Nov 15, 2023
ff679de
Use all scepter charges
dsimich Nov 22, 2023
b034b13
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Dec 13, 2023
5c4a193
Phylum banish attempt
dsimich Dec 15, 2023
77c86c1
Try using monster_phylum instead of .phylum
dsimich Dec 15, 2023
d929aac
Missed a couple .phylums
dsimich Dec 15, 2023
923e867
Plurals and tabs are hard
dsimich Dec 15, 2023
e68c9a9
vscode, tabs are not spaces
dsimich Dec 15, 2023
96b3521
Force eagle
dsimich Dec 15, 2023
399582d
Fixing inifinite loop screeching
dsimich Dec 15, 2023
812d5a6
Need to visit the buff in order to know the mods
dsimich Dec 15, 2023
3a17f04
Try 2
dsimich Dec 15, 2023
12b3636
Add RWBBlast
dsimich Jan 1, 2024
4b4398d
More RWBBlast stuff
dsimich Jan 2, 2024
03b6764
Boolean fix
dsimich Jan 2, 2024
23722f9
Force Eagle if need combats to screech again
dsimich Jan 3, 2024
6774cff
Update phylum banish list and eagle force
dsimich Jan 5, 2024
7b446a5
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Jan 5, 2024
c5bff03
Move forceEagle call to auto_familiar
dsimich Jan 5, 2024
205c5fb
Better RWBBlast control
dsimich Jan 6, 2024
71037e4
Backslash is useful
dsimich Jan 6, 2024
579cf06
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Jan 9, 2024
f33211b
Banish dudes in Zeppelin. Some zone-phyla checks
dsimich Jan 18, 2024
dcfeb03
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Jan 18, 2024
8a6621b
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Jan 22, 2024
c6b5f0c
One more condition to the Butler phylum banish
dsimich Jan 23, 2024
cafc861
Dr. Awkward fix
dsimich Jan 23, 2024
6aab0aa
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Jan 27, 2024
9ceff66
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Jan 30, 2024
6fb5c51
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Feb 20, 2024
12d38eb
Some updates after comments
dsimich Feb 20, 2024
e951e17
Added multiple locs for each Cit Zone Goal
dsimich Feb 23, 2024
a4a7617
Actually check for banished phyla
dsimich Feb 26, 2024
ee8fb5a
More mp regen zones
dsimich Feb 26, 2024
2518cf8
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Feb 26, 2024
7031733
Comments and no need to check locations for Pledge
dsimich Feb 26, 2024
30c77e3
Quotes and variables are hard
dsimich Feb 26, 2024
38c9d37
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Feb 28, 2024
8d16249
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Mar 5, 2024
53902d2
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Jun 17, 2024
e8d4426
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Jul 23, 2024
485efe2
Get mainstat if still have August Scepter cast
dsimich Jul 23, 2024
713f525
Don't change pledge if low on meat
dsimich Jul 23, 2024
83065d3
Parentheses are hard
dsimich Jul 23, 2024
6441fb0
updated meat in switch statement for proposal. Removed oasis
Alium58 Jul 29, 2024
ee9cbbb
Simplifications after partial review
dsimich Jul 29, 2024
8ef1948
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Jul 29, 2024
1f74ccd
Force update of _citizenZoneMods
dsimich Jul 29, 2024
d9dbb7e
Putting phylum banish above individual monster banish
dsimich Jul 30, 2024
8b5a723
Put phylum banish at top of adjustForBanish
dsimich Jul 30, 2024
e6667f7
Adding appearance rates based on monster code
dsimich Jul 30, 2024
3ee0fef
Revert "Adding appearance rates based on monster code"
dsimich Jul 30, 2024
e2ced8d
Use quest not prop
dsimich Jul 30, 2024
c6d3391
Force freeruns if Pledging Allegiance to avoid wasting a turn
dsimich Jul 31, 2024
cd85544
Better boolean
dsimich Jul 31, 2024
9509333
Need to set activeCitZoneMod with activeCitZoneMod for it to be track…
dsimich Jul 31, 2024
efe45c4
Small queue ignore refactor for easier tracking
dsimich Jul 31, 2024
09b0e0f
Missed a variable
dsimich Jul 31, 2024
79711a4
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Aug 2, 2024
9e0fa35
Changes after comments
dsimich Aug 2, 2024
46d10d0
Dumb error
dsimich Aug 2, 2024
2501880
Update Palindome phylum banish block
dsimich Aug 4, 2024
f3005d3
Initial pass at running down screechCombats
dsimich Aug 5, 2024
215ea73
Forgotten semi-colon
dsimich Aug 5, 2024
c520a5c
Add the screechDelay check to the other isBanishedPhyla checks
dsimich Aug 5, 2024
524d0e7
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Aug 11, 2024
30d0983
Better? screech delay handling
dsimich Aug 18, 2024
53fa359
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Aug 18, 2024
c950b2d
Delay black forest if beasts are banished and can't clear banish
dsimich Aug 20, 2024
eb5fc80
Delay Copperhead Club if dudes are banished
dsimich Aug 20, 2024
c5e2839
Better Copperhead delay
dsimich Aug 20, 2024
2d5cc5f
Need beasts in Whitey's Grove
dsimich Aug 21, 2024
61a033a
Move screech delay back to top of powerlevel
dsimich Aug 21, 2024
e8eaba1
Needs to be above the level check
dsimich Aug 21, 2024
592931f
Back below level check, but that check now considers disregarding Ins…
dsimich Aug 21, 2024
0e295aa
Do free combats to burn down screech delay too
dsimich Aug 21, 2024
26d04d9
Add a lastChance function for things that aren't powerlevelling
dsimich Aug 22, 2024
38f412b
fn\, for RWB Blast
dsimich Aug 22, 2024
c844e7b
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Aug 22, 2024
275f8d8
Free Combats don't decrement screechCombat
dsimich Aug 22, 2024
c9ff9b5
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Aug 24, 2024
72d5501
Make sure we don't run out of adventures
dsimich Aug 25, 2024
214565a
Fix bad banish cycle at Haunted Library
dsimich Aug 25, 2024
12a68f3
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich Oct 3, 2024
4337290
handleFam instead of useFam
dsimich Oct 3, 2024
d4f17d0
Fix scepter after merging in AG changes
dsimich Oct 3, 2024
72c1936
Hopefully fix screech used without Eagle as fam
dsimich Oct 3, 2024
33bf252
Merge remote-tracking branch 'origin/main' into EagleScepter
dsimich Oct 7, 2024
ecbdfd1
Merge branch 'main' into EagleScepter
dsimich Nov 13, 2024
fa49b4e
Merge branch 'main' into EagleScepter
dsimich Nov 20, 2024
af67c8a
Merge branch 'main' into EagleScepter
dsimich Dec 14, 2024
37dd1be
Fix task order after merge
dsimich Dec 14, 2024
5adb109
Fixes after En Garde, Avant Guard committed
dsimich Dec 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions BUILD/phylums/banish.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
dude loc:The Black Forest
dude loc:Twin Peak
dude loc:The Red Zeppelin;sniffed:Red Butler;item:Glark Cable>2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

banishes override tracks (after nerf day 2024), so sniffing the red butler won't help.

dude loc:Whitey's Grove;quest:questL11Palindome<=3
beast loc:The Hidden Park
beast loc:Inside the Palindome;quest:questL11Palindome<=3
beast loc:The Penultimate Fantasy Airship
undead loc:The Haunted Library item:Killing Jar>0
undead loc:The Haunted Wine Cellar
undead loc:The Haunted Boiler Room
undead loc:The Middle Chamber
construct loc:Noob Cave
1 change: 1 addition & 0 deletions BUILD/phylums/header.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# See auto_check_conditions for conditional options
2 changes: 2 additions & 0 deletions BUILD/task_order/A Shrunken Adventurer am I.dat
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,7 @@ setSoftblockDelay allowSoftblockDelay
setSoftblockUndergroundAdvs allowSoftblockUndergroundAdvs
# "win" the contests, navigate the maze, unlock the door, climb the tower, commit sorceresscide.
L13_towerAscent
# not powerlevelling but something that needs to be done if nothing else is available
LX_lastChance
# if all else fails, powerlevel like there's no tomorrow.
LX_attemptPowerLevel
1 change: 1 addition & 0 deletions BUILD/task_order/Avatar of Jarlsberg.dat
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,5 @@ L3_tavern
setSoftblockDelay allowSoftblockDelay
setSoftblockUndergroundAdvs allowSoftblockUndergroundAdvs
L13_towerAscent
LX_lastChance
LX_attemptPowerLevel
1 change: 1 addition & 0 deletions BUILD/task_order/Legacy of Loathing.dat
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,5 @@ L13_sorceressDoor
L13_towerNSTower
L13_towerNSNagamar
L13_towerNSFinal
LX_lastChance
LX_attemptPowerLevel
2 changes: 2 additions & 0 deletions BUILD/task_order/Quantum Terrarium.dat
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,6 @@ L3_tavern
setSoftblockDelay allowSoftblockDelay
setSoftblockUndergroundAdvs allowSoftblockUndergroundAdvs
L13_towerAscent
# not powerlevelling but something that needs to be done if nothing else is available
LX_lastChance
LX_attemptPowerLevel
2 changes: 2 additions & 0 deletions BUILD/task_order/WereProfessor.dat
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,7 @@ LX_getStarKey
LX_getDigitalKey
# "win" the contests, navigate the maze, unlock the door, climb the tower, commit sorceresscide.
L13_towerAscent
# not powerlevelling but something that needs to be done if nothing else is available
LX_lastChance
# if all else fails, powerlevel like there's no tomorrow.
LX_attemptPowerLevel
2 changes: 2 additions & 0 deletions BUILD/task_order/Zombie Slayer.dat
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,6 @@ L3_tavern
setSoftblockDelay allowSoftblockDelay
setSoftblockUndergroundAdvs allowSoftblockUndergroundAdvs
L13_towerAscent
# not powerlevelling but something that needs to be done if nothing else is available
LX_lastChance
LX_attemptPowerLevel
2 changes: 2 additions & 0 deletions BUILD/task_order/default.dat
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,7 @@ setSoftblockUndergroundAdvs allowSoftblockUndergroundAdvs
LX_koeInvaderHandler
# "win" the contests, navigate the maze, unlock the door, climb the tower, commit sorceresscide.
L13_towerAscent
# not powerlevelling but something that needs to be done if nothing else is available
LX_lastChance
# if all else fails, powerlevel like there's no tomorrow.
LX_attemptPowerLevel
17 changes: 17 additions & 0 deletions RELEASE/data/autoscend_phylums.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# THIS FILE IS GENERATED BY BUILD/assemble.sh
# DO NOT EDIT THIS FILE DIRECTLY. EDIT THE .DAT FILES IN THE /BUILD/ FOLDER THEN RUN assemble.sh

# See auto_check_conditions for conditional options
banish 0 dude loc:The Black Forest
banish 1 dude loc:Twin Peak
banish 2 dude loc:The Red Zeppelin;sniffed:Red Butler;item:Glark Cable>2
banish 3 dude loc:Whitey's Grove;quest:questL11Palindome<=3
banish 4 beast loc:The Hidden Park
banish 5 beast loc:Inside the Palindome;quest:questL11Palindome<=3
banish 6 beast loc:The Penultimate Fantasy Airship
banish 7 undead loc:The Haunted Library item:Killing Jar>0
banish 8 undead loc:The Haunted Wine Cellar
banish 9 undead loc:The Haunted Boiler Room
banish 10 undead loc:The Middle Chamber
banish 11 construct loc:Noob Cave

1 change: 1 addition & 0 deletions RELEASE/data/autoscend_settings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,4 @@ post 6 auto_wandOfNagamar boolean Do we need to get a Wand of Nagamar in this as
pre 0 auto_getSteelOrgan_initialize boolean When we initialize an ascension this will be copied to auto_getSteelOrgan

sharing 0 auto_disableExcavator boolean When set to true will disable automatically sending spading data via the Extractor script

26 changes: 19 additions & 7 deletions RELEASE/data/autoscend_task_order.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,10 @@ A Shrunken Adventurer am I 56 setSoftblockDelay allowSoftblockDelay
A Shrunken Adventurer am I 57 setSoftblockUndergroundAdvs allowSoftblockUndergroundAdvs
# "win" the contests, navigate the maze, unlock the door, climb the tower, commit sorceresscide.
A Shrunken Adventurer am I 58 L13_towerAscent
# not powerlevelling but something that needs to be done if nothing else is available
A Shrunken Adventurer am I 59 LX_lastChance
# if all else fails, powerlevel like there's no tomorrow.
A Shrunken Adventurer am I 59 LX_attemptPowerLevel
A Shrunken Adventurer am I 60 LX_attemptPowerLevel

Avatar of Jarlsberg 0 LM_jarlsberg
Avatar of Jarlsberg 1 LX_freeCombatsTask
Expand Down Expand Up @@ -153,7 +155,8 @@ Avatar of Jarlsberg 52 L3_tavern
Avatar of Jarlsberg 53 setSoftblockDelay allowSoftblockDelay
Avatar of Jarlsberg 54 setSoftblockUndergroundAdvs allowSoftblockUndergroundAdvs
Avatar of Jarlsberg 55 L13_towerAscent
Avatar of Jarlsberg 56 LX_attemptPowerLevel
Avatar of Jarlsberg 56 LX_lastChance
Avatar of Jarlsberg 57 LX_attemptPowerLevel

Legacy of Loathing 0 LX_freeCombatsTask
Legacy of Loathing 1 woods_questStart
Expand Down Expand Up @@ -255,7 +258,8 @@ Legacy of Loathing 88 L13_sorceressDoor
Legacy of Loathing 89 L13_towerNSTower
Legacy of Loathing 90 L13_towerNSNagamar
Legacy of Loathing 91 L13_towerNSFinal
Legacy of Loathing 92 LX_attemptPowerLevel
Legacy of Loathing 92 LX_lastChance
Legacy of Loathing 93 LX_attemptPowerLevel

Quantum Terrarium 0 LX_freeCombatsTask
Quantum Terrarium 1 woods_questStart
Expand Down Expand Up @@ -317,7 +321,9 @@ Quantum Terrarium 56 L3_tavern
Quantum Terrarium 57 setSoftblockDelay allowSoftblockDelay
Quantum Terrarium 58 setSoftblockUndergroundAdvs allowSoftblockUndergroundAdvs
Quantum Terrarium 59 L13_towerAscent
Quantum Terrarium 60 LX_attemptPowerLevel
# not powerlevelling but something that needs to be done if nothing else is available
Quantum Terrarium 60 LX_lastChance
Quantum Terrarium 61 LX_attemptPowerLevel

WereProfessor 0 LM_wereprof
WereProfessor 1 LX_freeCombatsTask
Expand Down Expand Up @@ -425,8 +431,10 @@ WereProfessor 68 LX_getStarKey
WereProfessor 69 LX_getDigitalKey
# "win" the contests, navigate the maze, unlock the door, climb the tower, commit sorceresscide.
WereProfessor 70 L13_towerAscent
# not powerlevelling but something that needs to be done if nothing else is available
WereProfessor 71 LX_lastChance
# if all else fails, powerlevel like there's no tomorrow.
WereProfessor 71 LX_attemptPowerLevel
WereProfessor 72 LX_attemptPowerLevel

Zombie Slayer 0 LM_zombieSlayer
Zombie Slayer 1 woods_questStart
Expand Down Expand Up @@ -484,7 +492,9 @@ Zombie Slayer 52 L3_tavern
Zombie Slayer 53 setSoftblockDelay allowSoftblockDelay
Zombie Slayer 54 setSoftblockUndergroundAdvs allowSoftblockUndergroundAdvs
Zombie Slayer 55 L13_towerAscent
Zombie Slayer 56 LX_attemptPowerLevel
# not powerlevelling but something that needs to be done if nothing else is available
Zombie Slayer 56 LX_lastChance
Zombie Slayer 57 LX_attemptPowerLevel

default 0 LX_freeCombatsTask
default 1 woods_questStart
Expand Down Expand Up @@ -582,6 +592,8 @@ default 60 setSoftblockUndergroundAdvs allowSoftblockUndergroundAdvs
default 61 LX_koeInvaderHandler
# "win" the contests, navigate the maze, unlock the door, climb the tower, commit sorceresscide.
default 62 L13_towerAscent
# not powerlevelling but something that needs to be done if nothing else is available
default 63 LX_lastChance
# if all else fails, powerlevel like there's no tomorrow.
default 63 LX_attemptPowerLevel
default 64 LX_attemptPowerLevel

2 changes: 1 addition & 1 deletion RELEASE/scripts/autoscend.ash
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@ boolean adventureFailureHandler()
}
}

if(last_monster() == $monster[Crate] && (in_wereprof() && !($location[Noob Cave].turns_spent < 8))) //want 7 turns of Noob Cave in Wereprof for Smashed Scientific Equipment
if(last_monster() == $monster[Crate] && !(get_property("screechDelay").to_boolean()) && (in_wereprof() && !($location[Noob Cave].turns_spent < 8))) //want 7 turns of Noob Cave in Wereprof for Smashed Scientific Equipment
{
if(get_property("auto_newbieOverride").to_boolean())
{
Expand Down
1 change: 1 addition & 0 deletions RELEASE/scripts/autoscend/auto_bedtime.ash
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,7 @@ boolean doBedtime()
}

//We are committing to end of day now...
auto_scepterRollover(); //Use the rest of the August Scepter's charges
getSpaceJelly();
while(acquireHermitItem($item[11-leaf Clover]));

Expand Down
4 changes: 3 additions & 1 deletion RELEASE/scripts/autoscend/auto_familiar.ash
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,8 @@ boolean autoChooseFamiliar(location place)
}
}
}

famChoice = auto_forceEagle(); // force Patriotic Eagle if we have a >0 combats until we can screech again

// Gremlins have special familiar handling.
if ($locations[Next to that Barrel with Something Burning in it, Out By that Rusted-Out Car, Over Where the Old Tires Are, Near an Abandoned Refrigerator] contains place) {
Expand Down Expand Up @@ -725,7 +727,7 @@ void preAdvUpdateFamiliar(location place)
{
handleFamiliar(get_property("auto_100familiar").to_familiar()); //do not break 100 familiar runs
}

//familiar requirement to adventure in a zone, override everything else.
if(place == $location[The Deep Machine Tunnels])
{
Expand Down
7 changes: 2 additions & 5 deletions RELEASE/scripts/autoscend/auto_powerlevel.ash
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ boolean LX_attemptPowerLevel()
{
return LX_robot_powerlevel(); //leveling works very differently in You, Robot path
}

if (my_level() > 12)
{
return false;
Expand Down Expand Up @@ -91,11 +92,6 @@ boolean LX_attemptPowerLevel()
//The Source path specific powerleveling
LX_attemptPowerLevelTheSource();

if (LX_getDigitalKey() || LX_getStarKey())
{
return true;
}

//August Scepter Power Levelling
if(auto_haveAugustScepter() && get_property("_augSkillsCast").to_int() < 5){
if(my_primestat() == $stat[Muscle])
Expand Down Expand Up @@ -189,6 +185,7 @@ boolean LX_attemptPowerLevel()
if(autoAdv($location[The Haunted Gallery])) return true;
}
}

return false;
}

Expand Down
14 changes: 10 additions & 4 deletions RELEASE/scripts/autoscend/auto_pre_adv.ash
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,10 @@ boolean auto_pre_adventure()
}

// this calls the appropriate provider for +combat or -combat depending on the zone we are about to adventure in..
boolean burningDelay = ((auto_voteMonster(true) || isOverdueDigitize() || auto_sausageGoblin() || auto_backupTarget() || auto_voidMonster()) && place == solveDelayZone());
boolean gettingLucky = (have_effect($effect[Lucky!]) > 0 && zone_hasLuckyAdventure(place));
boolean burningDelay = auto_burningDelay();
boolean gettingLucky = auto_gettingLucky();
boolean forcedNonCombat = auto_haveQueuedForcedNonCombat();
boolean zoneQueueIgnored = (burningDelay || gettingLucky || forcedNonCombat);
boolean zoneQueueIgnored = auto_queueIgnore();
generic_t combatModifier = zone_combatMod(place);
if (combatModifier._boolean && !zoneQueueIgnored) {
acquireCombatMods(combatModifier._int, true);
Expand Down Expand Up @@ -408,8 +408,14 @@ boolean auto_pre_adventure()
adjustForYellowRayIfPossible(mon);
zoneHasWantedMonsters = true;
}
if(auto_wantToBanish(monster_phylum(mon), place))
{
// attempt to prepare for banishing, but if we can not try free running
dsimich marked this conversation as resolved.
Show resolved Hide resolved
boolean canBanish = adjustForBanishIfPossible(monster_phylum(mon), place);
zoneHasUnwantedMonsters = true;
}
boolean wantToBanish = auto_wantToBanish(mon, place);
boolean wantToFreeRun = auto_wantToFreeRun(mon, place);
boolean wantToFreeRun = auto_wantToFreeRun(mon, place) || auto_forceFreeRun(false);
if(wantToBanish || wantToFreeRun)
{
// attempt to prepare for banishing, but if we can not try free running
Expand Down
Loading
Loading