-
Notifications
You must be signed in to change notification settings - Fork 70
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
dsimich
wants to merge
117
commits into
main
Choose a base branch
from
EagleScepter
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+839
−163
Open
Eagle scepter #1403
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 4ae78a2
Assemble the dat files into txts
dsimich 27d8571
Silly fixes
dsimich ba0375b
More minor fixes
dsimich 7b389b2
Bad parentheses
dsimich 41c61fd
More parens issues
dsimich 421ab1e
Fixed all of the errors
dsimich a20e4b5
get citizen of a zone
dsimich 0c50f3b
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich cf2bd3b
Citizen of a Zone changes
dsimich 5e6cd95
Properly track Citizen and fix phylum banishes
dsimich dbd3246
Don't care about monster banishes used re: phylums
dsimich 9ec054a
Forgot a return
dsimich a15fcc4
Too many spaces
dsimich 848611f
Small changes
dsimich 96198fc
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich 535e308
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich 7b9d8a8
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich fdbc645
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich 4389980
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich 0d7f826
If didn't uneffect, don't try to get new Citizen
dsimich 641745a
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich 5f31597
Account for not being able to uneffect Citizen
dsimich 8f0b340
Merge remote-tracking branch 'upstream/main' into EagleCMC
dsimich d4d1de0
Get rid of my implementation of underground delay
dsimich ff679de
Use all scepter charges
dsimich b034b13
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 5c4a193
Phylum banish attempt
dsimich 77c86c1
Try using monster_phylum instead of .phylum
dsimich d929aac
Missed a couple .phylums
dsimich 923e867
Plurals and tabs are hard
dsimich e68c9a9
vscode, tabs are not spaces
dsimich 96b3521
Force eagle
dsimich 399582d
Fixing inifinite loop screeching
dsimich 812d5a6
Need to visit the buff in order to know the mods
dsimich 3a17f04
Try 2
dsimich 12b3636
Add RWBBlast
dsimich 4b4398d
More RWBBlast stuff
dsimich 03b6764
Boolean fix
dsimich 23722f9
Force Eagle if need combats to screech again
dsimich 6774cff
Update phylum banish list and eagle force
dsimich 7b446a5
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich c5bff03
Move forceEagle call to auto_familiar
dsimich 205c5fb
Better RWBBlast control
dsimich 71037e4
Backslash is useful
dsimich 579cf06
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich f33211b
Banish dudes in Zeppelin. Some zone-phyla checks
dsimich dcfeb03
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 8a6621b
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich c6b5f0c
One more condition to the Butler phylum banish
dsimich cafc861
Dr. Awkward fix
dsimich 6aab0aa
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 9ceff66
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 6fb5c51
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 12d38eb
Some updates after comments
dsimich e951e17
Added multiple locs for each Cit Zone Goal
dsimich a4a7617
Actually check for banished phyla
dsimich ee8fb5a
More mp regen zones
dsimich 2518cf8
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 7031733
Comments and no need to check locations for Pledge
dsimich 30c77e3
Quotes and variables are hard
dsimich 38c9d37
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 8d16249
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 53902d2
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich e8d4426
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 485efe2
Get mainstat if still have August Scepter cast
dsimich 713f525
Don't change pledge if low on meat
dsimich 83065d3
Parentheses are hard
dsimich 6441fb0
updated meat in switch statement for proposal. Removed oasis
Alium58 ee9cbbb
Simplifications after partial review
dsimich 8ef1948
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 1f74ccd
Force update of _citizenZoneMods
dsimich d9dbb7e
Putting phylum banish above individual monster banish
dsimich 8b5a723
Put phylum banish at top of adjustForBanish
dsimich e6667f7
Adding appearance rates based on monster code
dsimich 3ee0fef
Revert "Adding appearance rates based on monster code"
dsimich e2ced8d
Use quest not prop
dsimich c6d3391
Force freeruns if Pledging Allegiance to avoid wasting a turn
dsimich cd85544
Better boolean
dsimich 9509333
Need to set activeCitZoneMod with activeCitZoneMod for it to be track…
dsimich efe45c4
Small queue ignore refactor for easier tracking
dsimich 09b0e0f
Missed a variable
dsimich 79711a4
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 9e0fa35
Changes after comments
dsimich 46d10d0
Dumb error
dsimich 2501880
Update Palindome phylum banish block
dsimich f3005d3
Initial pass at running down screechCombats
dsimich 215ea73
Forgotten semi-colon
dsimich c520a5c
Add the screechDelay check to the other isBanishedPhyla checks
dsimich 524d0e7
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 30d0983
Better? screech delay handling
dsimich 53fa359
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich c950b2d
Delay black forest if beasts are banished and can't clear banish
dsimich eb5fc80
Delay Copperhead Club if dudes are banished
dsimich c5e2839
Better Copperhead delay
dsimich 2d5cc5f
Need beasts in Whitey's Grove
dsimich 61a033a
Move screech delay back to top of powerlevel
dsimich e8eaba1
Needs to be above the level check
dsimich 592931f
Back below level check, but that check now considers disregarding Ins…
dsimich 0e295aa
Do free combats to burn down screech delay too
dsimich 26d04d9
Add a lastChance function for things that aren't powerlevelling
dsimich 38f412b
fn\, for RWB Blast
dsimich c844e7b
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 275f8d8
Free Combats don't decrement screechCombat
dsimich c9ff9b5
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 72d5501
Make sure we don't run out of adventures
dsimich 214565a
Fix bad banish cycle at Haunted Library
dsimich 12a68f3
Merge remote-tracking branch 'upstream/main' into EagleScepter
dsimich 4337290
handleFam instead of useFam
dsimich d4f17d0
Fix scepter after merging in AG changes
dsimich 72c1936
Hopefully fix screech used without Eagle as fam
dsimich 33bf252
Merge remote-tracking branch 'origin/main' into EagleScepter
dsimich ecbdfd1
Merge branch 'main' into EagleScepter
dsimich fa49b4e
Merge branch 'main' into EagleScepter
dsimich af67c8a
Merge branch 'main' into EagleScepter
dsimich 37dd1be
Fix task order after merge
dsimich 5adb109
Fixes after En Garde, Avant Guard committed
dsimich File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
# See auto_check_conditions for conditional options |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -98,4 +98,5 @@ L13_sorceressDoor | |
L13_towerNSTower | ||
L13_towerNSNagamar | ||
L13_towerNSFinal | ||
LX_lastChance | ||
LX_attemptPowerLevel |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.