From 540098c69293dc7af2f2af872dfb2bd494f1204d Mon Sep 17 00:00:00 2001
From: Ignose <ihpares@gmail.com>
Date: Thu, 19 Oct 2023 23:15:02 -0400
Subject: [PATCH] Cleanup and routing optimize

---
 src/combat.ts             |  2 +-
 src/lib.ts                |  4 ----
 src/tasks/boozedrop.ts    |  7 +------
 src/tasks/hotres.ts       | 15 +--------------
 src/tasks/leveling.ts     |  1 -
 src/tasks/runstart.ts     |  1 -
 src/tasks/spelldamage.ts  |  1 -
 src/tasks/weapondamage.ts |  2 +-
 8 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/src/combat.ts b/src/combat.ts
index bd142ee..e1349ac 100644
--- a/src/combat.ts
+++ b/src/combat.ts
@@ -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
diff --git a/src/lib.ts b/src/lib.ts
index e41efd9..c17de86 100644
--- a/src/lib.ts
+++ b/src/lib.ts
@@ -6,13 +6,10 @@ import {
   Effect,
   getCampground,
   getClanName,
-  handlingChoice,
   haveEffect,
   holiday,
   Item,
   itemAmount,
-  lastChoice,
-  mallPrice,
   monkeyPaw,
   mpCost,
   myBasestat,
@@ -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();
 
diff --git a/src/tasks/boozedrop.ts b/src/tasks/boozedrop.ts
index bb26f7b..4e7d20a 100644
--- a/src/tasks/boozedrop.ts
+++ b/src/tasks/boozedrop.ts
@@ -6,7 +6,6 @@ import {
   cliExecute,
   create,
   drink,
-  eat,
   Effect,
   equip,
   faxbot,
@@ -16,11 +15,8 @@ import {
   inMuscleSign,
   itemAmount,
   myInebriety,
-  myMaxhp,
   myMeat,
   print,
-  restoreHp,
-  restoreMp,
   retrieveItem,
   use,
   useFamiliar,
@@ -30,14 +26,12 @@ import {
 import {
   $coinmaster,
   $effect,
-  $effects,
   $familiar,
   $item,
   $location,
   $monster,
   $skill,
   $slot,
-  clamp,
   CombatLoversLocket,
   CommunityService,
   DaylightShavings,
@@ -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;
diff --git a/src/tasks/hotres.ts b/src/tasks/hotres.ts
index baebaf5..24a4a63 100644
--- a/src/tasks/hotres.ts
+++ b/src/tasks/hotres.ts
@@ -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,
@@ -23,7 +11,6 @@ import {
   CommunityService,
   get,
   have,
-  uneffect,
 } from "libram";
 import { Quest } from "../engine/task";
 import { logTestSetup, tryAcquiringEffect, wishFor } from "../lib";
diff --git a/src/tasks/leveling.ts b/src/tasks/leveling.ts
index bcb730e..ee39ddc 100644
--- a/src/tasks/leveling.ts
+++ b/src/tasks/leveling.ts
@@ -8,7 +8,6 @@ import {
   drink,
   eat,
   Effect,
-  effectModifier,
   equip,
   equippedItem,
   getMonsters,
diff --git a/src/tasks/runstart.ts b/src/tasks/runstart.ts
index 072ff28..69e1604 100644
--- a/src/tasks/runstart.ts
+++ b/src/tasks/runstart.ts
@@ -33,7 +33,6 @@ import {
   takeStorage,
   toInt,
   totalFreeRests,
-  turnsPlayed,
   use,
   useFamiliar,
   useSkill,
diff --git a/src/tasks/spelldamage.ts b/src/tasks/spelldamage.ts
index 99ed0ac..e8d01f0 100644
--- a/src/tasks/spelldamage.ts
+++ b/src/tasks/spelldamage.ts
@@ -18,7 +18,6 @@ import {
   restoreHp,
   restoreMp,
   retrieveItem,
-  use,
   useSkill,
   visitUrl,
 } from "kolmafia";
diff --git a/src/tasks/weapondamage.ts b/src/tasks/weapondamage.ts
index 555d3ff..6459862 100644
--- a/src/tasks/weapondamage.ts
+++ b/src/tasks/weapondamage.ts
@@ -1,4 +1,4 @@
-import { CombatStrategy, OutfitSpec } from "grimoire-kolmafia";
+import { CombatStrategy } from "grimoire-kolmafia";
 import {
   buy,
   cliExecute,