Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into ag-improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
dsimich committed Nov 20, 2024
2 parents 1117dd7 + 29d7613 commit 3148860
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ Tokoeka (IGN: Asmodais (#2071543))

Alium (IGN: Alium (#1933235))

dsimich (IGN: erct657 (#584803))

HippoKingKoL (IGN: HippoKing (#1716533))

## Special Thanks

This script would obviously not be possible without the work of Cheesecookie and soolar.
Expand Down
6 changes: 6 additions & 0 deletions RELEASE/scripts/autoscend/quests/level_13.ash
Original file line number Diff line number Diff line change
Expand Up @@ -1835,6 +1835,12 @@ boolean L13_towerNSFinal()
abort("Freeing the king will result in a path change. Go howl at the moon some more if you want.");
}
// It is possible to keep your Yearbook Club Camera in KOLHS by having it equipped before breaking the prism
if (in_kolhs() && !have_equipped($item[Yearbook Club Camera]) && (item_amount($item[Yearbook Club Camera]) > 0))
{
equip($slot[acc3], $item[Yearbook Club Camera]);
}
if(!($classes[Seal Clubber, Turtle Tamer, Pastamancer, Sauceror, Disco Bandit, Accordion Thief] contains my_class()))
{
abort("Freeing the king will result in a path change and we can barely handle The Sleazy Back Alley. Aborting, run the script again after selecting your aftercore path in order for it to clean up.");
Expand Down
1 change: 1 addition & 0 deletions docs/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ Testing ASH scripts is tricky and generally involves you doing multiple runs wit
- [ ] I have performed a self-review of my own code.
- [ ] I have commented my code, particularly in hard-to-understand areas.
- [ ] I have based my pull request against the [main branch](https://github.com/loathers/autoscend/tree/main) or have a good reason not to.
- [ ] I have updated the GitHub wiki [path](https://github.com/loathers/autoscend/wiki/Path-Support) or [IOTM](https://github.com/loathers/autoscend/wiki/IOTM-Support) support pages, as appropriate.

0 comments on commit 3148860

Please sign in to comment.