Skip to content

Fix Sinnaj stuff #15

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.

Sign up for GitHub

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

Merged
Ignose merged 1 commit into from
Oct 21, 2026
Merged

Fix Sinnaj stuff #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/tasks/4 postrunleg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ export function PostRunQuests(): Quest {
...sWordSetup(),
...cupOf13sDrink(),
...sealClubberFishySetup(),
...seaPearls(),
...fixScreech(),
//...noBarf(),
//...garboWeen(),
Expand Down
9 changes: 6 additions & 3 deletions src/tasks/repeatableTasks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,11 +580,13 @@ export function sWordSetup(): Task[] {
{
name: "Set up S Word",
ready: () => have($familiar`Sword of S Words`),
completed: () => get("swordOfSWordsMonster", Monster.none) === getSWordMonster(),
completed: () => get("swordOfSWordsMonster", Monster.none) === getSWordMonster() || true,
do: () => CombatLoversLocket.reminisce(getSWordMonster()),
outfit: () => {
return {
pants: $item`Greatest American Pants`,
pants: have($item`Greatest American Pants`)
? $item`Greatest American Pants`
: undefined,
familiar: $familiar`Sword of S Words`,
};
},
Expand Down Expand Up @@ -661,7 +663,7 @@ export function fixScreech(): Task[] {
do: $location`Pandamonium Slums`,
outfit: {
familiar: $familiar`Patriotic Eagle`,
pants: $item`Greatest American Pants`,
pants: have($item`Greatest American Pants`) ? $item`Greatest American Pants` : undefined,
},
combat: new CombatStrategy().macro(
Macro.trySkill($skill`%fn, Release the Patriotic Screech!`).runaway(),
Expand Down Expand Up @@ -842,6 +844,7 @@ function getSeaPearlOutfit(elementModifier: string) {
modifier: elementModifier,
back: needsScuba ? $item`Elf Guard SCUBA tank` : undefined,
weapon: myClass() === $class`Seal Clubber` ? $item`Monodent of the Sea` : undefined,
offhand: myInebriety() > inebrietyLimit() ? $item`Drunkula's wineglass` : undefined,
famequip: !isUnderwaterFam && needsScuba ? $item`das boot` : undefined,
pants: $item`tearaway pants`,
...getNextFreeKill()?.equip, // Dynamically equips the item needed for the available free kill
Expand Down