Skip to content

Add save cosplay saber force uses #77

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
Pantocyclus merged 2 commits into from
Jun 14, 2026
Merged

Add save cosplay saber force uses #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50ccfb9
Add save cosplay saber force uses
libraryaddict Jun 9, 2026
c5384fe
Don't require cosplay saber as weapon if we can't use the force
libraryaddict Jun 9, 2026
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
6 changes: 6 additions & 0 deletions src/resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,12 @@ export const otherResources: Resource[] = [
[],
get("instant_saveHeartstoneKill", false) ? 5 : 0,
),
new Resource(
"instant_saveSaberForceUses",
(n) => `Save ${n}/5 Cosplay Saber Force Uses`,
[],
get("instant_saveSaberForceUses", false) ? 5 : 0,
),
];

const allResources = [
Expand Down
10 changes: 8 additions & 2 deletions src/tasks/boozedrop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,10 @@ export const BoozeDropQuest: Quest = {
? $item`Daylight Shavings Helmet`
: undefined,
back: $item`vampyric cloake`,
weapon: $item`Fourth of May Cosplay Saber`,
weapon:
get("_saberForceUses") < 5 - get("instant_saveSaberForceUses", 0)
? $item`Fourth of May Cosplay Saber`
: undefined,
offhand: have($skill`Double-Fisted Skull Smashing`)
? $item`industrial fire extinguisher`
: undefined,
Expand All @@ -251,7 +254,10 @@ export const BoozeDropQuest: Quest = {
Macro.trySkill($skill`Bowl Straight Up`)
.trySkill($skill`Become a Bat`)
.trySkill($skill`Fire Extinguisher: Polar Vortex`)
.trySkill($skill`Use the Force`)
.externalIf(
get("_saberForceUses") < 5 - get("instant_saveSaberForceUses", 0),
Macro.trySkill($skill`Use the Force`),
)
.default(),
),
limit: { tries: 5 },
Expand Down
2 changes: 1 addition & 1 deletion src/tasks/familiarweight.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export const FamiliarWeightQuest: Quest = {
acquiredOrExcluded($effect`Meteor Showered`) ||
!have($item`Fourth of May Cosplay Saber`) ||
!have($skill`Meteor Lore`) ||
get("_saberForceUses") >= 5,
get("_saberForceUses") >= 5 - get("instant_saveSaberForceUses", 0),
do: $location`The Dire Warren`,
combat: new CombatStrategy().macro(
Macro.trySkill($skill`Meteor Shower`)
Expand Down
12 changes: 9 additions & 3 deletions src/tasks/hotres.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@ export const HotResQuest: Quest = {
outfit: () => ({
back: $item`vampyric cloake`,
shirt: $item`Jurassic Parka`,
weapon: $item`Fourth of May Cosplay Saber`,
weapon:
get("_saberForceUses") < 5 - get("instant_saveSaberForceUses", 0)
? $item`Fourth of May Cosplay Saber`
: undefined,
offhand: have($skill`Double-Fisted Skull Smashing`)
? $item`industrial fire extinguisher`
: have($effect`Everything Looks Yellow`)
Expand All @@ -108,7 +111,10 @@ export const HotResQuest: Quest = {
combat: new CombatStrategy().macro(
Macro.trySkill($skill`Become a Cloud of Mist`)
.trySkill($skill`Fire Extinguisher: Foam Yourself`)
.trySkill($skill`Use the Force`)
.externalIf(
get("_saberForceUses") < 5 - get("instant_saveSaberForceUses", 0),
Macro.trySkill($skill`Use the Force`),
)
.trySkill($skill`Shocking Lick`)
.if_(
"!haseffect Everything Looks Yellow",
Expand All @@ -130,7 +136,7 @@ export const HotResQuest: Quest = {
completed: () =>
acquiredOrExcluded($effect`Fireproof Foam Suit`) ||
!have($item`Fourth of May Cosplay Saber`) ||
get("_saberForceUses") >= 5 ||
get("_saberForceUses") >= 5 - get("instant_saveSaberForceUses", 0) ||
!have($item`industrial fire extinguisher`) ||
!have($skill`Double-Fisted Skull Smashing`),
do: $location`The Dire Warren`,
Expand Down
2 changes: 1 addition & 1 deletion src/tasks/spelldamage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ export const SpellDamageQuest: Quest = {
acquiredOrExcluded($effect`Meteor Showered`) ||
!have($item`Fourth of May Cosplay Saber`) ||
!have($skill`Meteor Lore`) ||
get("_saberForceUses") >= 5,
get("_saberForceUses") >= 5 - get("instant_saveSaberForceUses", 0),
do: $location`The Dire Warren`,
combat: new CombatStrategy().macro(
Macro.trySkill($skill`Meteor Shower`)
Expand Down
2 changes: 1 addition & 1 deletion src/tasks/weapondamage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export const WeaponDamageQuest: Quest = {
acquiredOrExcluded($effect`Meteor Showered`) ||
!have($item`Fourth of May Cosplay Saber`) ||
!have($skill`Meteor Lore`) ||
get("_saberForceUses") >= 5,
get("_saberForceUses") >= 5 - get("instant_saveSaberForceUses", 0),
do: attemptKFH ? powerlevelingLocation() : $location`The Dire Warren`,
combat: new CombatStrategy().macro(
Macro.trySkill($skill`Meteor Shower`)
Expand Down