Skip to content

Commit

Permalink
Cleanup and routing optimize
Browse files Browse the repository at this point in the history
  • Loading branch information
Ignose committed Oct 20, 2023
1 parent 3fb97af commit 540098c
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 29 deletions.
2 changes: 1 addition & 1 deletion src/combat.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mpCost, myPrimestat, toInt } from "kolmafia";
import { $item, $skill, $stat, get, have, StrictMacro } from "libram";
import { $item, $skill, get, have, StrictMacro } from "libram";

//export const mainStat = myClass().primestat;
export const mainStat = myPrimestat(); //Update to select mainstat based on class derived from Libram
Expand Down
4 changes: 0 additions & 4 deletions src/lib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@ import {
Effect,
getCampground,
getClanName,
handlingChoice,
haveEffect,
holiday,
Item,
itemAmount,
lastChoice,
mallPrice,
monkeyPaw,
mpCost,
myBasestat,
Expand Down Expand Up @@ -57,7 +54,6 @@ import {
import { printModtrace } from "libram/dist/modifier";
import { forbiddenEffects } from "./resources";
import { mainStat } from "./combat";
import { ShuffleTruffle } from "libram/dist/resources/2013/Florist";

export const startingClan = getClanName();

Expand Down
7 changes: 1 addition & 6 deletions src/tasks/boozedrop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
cliExecute,
create,
drink,
eat,
Effect,
equip,
faxbot,
Expand All @@ -16,11 +15,8 @@ import {
inMuscleSign,
itemAmount,
myInebriety,
myMaxhp,
myMeat,
print,
restoreHp,
restoreMp,
retrieveItem,
use,
useFamiliar,
Expand All @@ -30,14 +26,12 @@ import {
import {
$coinmaster,
$effect,
$effects,
$familiar,
$item,
$location,
$monster,
$skill,
$slot,
clamp,
CombatLoversLocket,
CommunityService,
DaylightShavings,
Expand Down Expand Up @@ -85,6 +79,7 @@ export const BoozeDropQuest: Quest = {
completed: () =>
(getWorkshed() === $item`model train set` && !canConfigure()) ||
!TrainSet.have() ||
get("instant_ExperimentalRouting", false) ||
getWorkshed() === $item`Asdon Martin keyfob`,
do: (): void => {
const offset = get("trainsetPosition") % 8;
Expand Down
15 changes: 1 addition & 14 deletions src/tasks/hotres.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
import { CombatStrategy } from "grimoire-kolmafia";
import {
buy,
cliExecute,
create,
drink,
Effect,
inebrietyLimit,
myInebriety,
print,
use,
useFamiliar,
useSkill,
} from "kolmafia";
import { buy, cliExecute, create, Effect, print, use, useFamiliar, useSkill } from "kolmafia";
import {
$effect,
$familiar,
Expand All @@ -23,7 +11,6 @@ import {
CommunityService,
get,
have,
uneffect,
} from "libram";
import { Quest } from "../engine/task";
import { logTestSetup, tryAcquiringEffect, wishFor } from "../lib";
Expand Down
1 change: 0 additions & 1 deletion src/tasks/leveling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
drink,
eat,
Effect,
effectModifier,
equip,
equippedItem,
getMonsters,
Expand Down
1 change: 0 additions & 1 deletion src/tasks/runstart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import {
takeStorage,
toInt,
totalFreeRests,
turnsPlayed,
use,
useFamiliar,
useSkill,
Expand Down
1 change: 0 additions & 1 deletion src/tasks/spelldamage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
restoreHp,
restoreMp,
retrieveItem,
use,
useSkill,
visitUrl,
} from "kolmafia";
Expand Down
2 changes: 1 addition & 1 deletion src/tasks/weapondamage.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CombatStrategy, OutfitSpec } from "grimoire-kolmafia";
import { CombatStrategy } from "grimoire-kolmafia";
import {
buy,
cliExecute,
Expand Down

0 comments on commit 540098c

Please sign in to comment.