Skip to content

Commit 29c2941

Browse files
spaghetti-squashspaghetti-squash
committed
Actually name what the macro was created for (#1819)
1 parent 5d37802 commit 29c2941

File tree

1 file changed

+35
-20
lines changed

1 file changed

+35
-20
lines changed

‎scripts/garbage-collector/garbo.js

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18621,12 +18621,12 @@ var init_CommunityService = __esm({
1862118621
}, {
1862218622
key: "logTask",
1862318623
value: function logTask(name, action) {
18624-
var _this$taskTimers$get, _action;
18624+
var _this$taskTimers$get, _action2;
1862518625
var _ref2 = (_this$taskTimers$get = this.taskTimers.get(name)) !== null && _this$taskTimers$get !== void 0 ? _this$taskTimers$get : {
1862618626
time: Date.now(),
1862718627
turns: (0, import_kolmafia66.myTurncount)()
1862818628
}, time = _ref2.time, turns2 = _ref2.turns;
18629-
var estimatedTurns = (_action = action()) !== null && _action !== void 0 ? _action : 0;
18629+
var estimatedTurns = (_action2 = action()) !== null && _action2 !== void 0 ? _action2 : 0;
1863018630
CommunityService2.log[name] = {
1863118631
type: "task",
1863218632
turnCost: (0, import_kolmafia66.myTurncount)() - turns2,
@@ -27407,17 +27407,17 @@ var CombatStrategy = /* @__PURE__ */ function() {
2740727407
*/
2740827408
}, {
2740927409
key: "action",
27410-
value: function action(_action, monsters) {
27410+
value: function action(_action2, monsters) {
2741127411
if (monsters === void 0) {
27412-
this.default_action = _action;
27412+
this.default_action = _action2;
2741327413
} else if (monsters instanceof import_kolmafia76.Monster) {
27414-
this.actions.set(monsters, _action);
27414+
this.actions.set(monsters, _action2);
2741527415
} else {
2741627416
var _iterator3 = _createForOfIteratorHelper19(monsters), _step3;
2741727417
try {
2741827418
for (_iterator3.s(); !(_step3 = _iterator3.n()).done; ) {
2741927419
var monster = _step3.value;
27420-
this.actions.set(monster, _action);
27420+
this.actions.set(monster, _action2);
2742127421
}
2742227422
} catch (err) {
2742327423
_iterator3.e(err);
@@ -28761,8 +28761,8 @@ var Outfit = /* @__PURE__ */ function() {
2876128761
var _iterator9 = _createForOfIteratorHelper20(this.postActions), _step9;
2876228762
try {
2876328763
for (_iterator9.s(); !(_step9 = _iterator9.n()).done; ) {
28764-
var _action = _step9.value;
28765-
_action();
28764+
var _action2 = _step9.value;
28765+
_action2();
2876628766
}
2876728767
} catch (err) {
2876828768
_iterator9.e(err);
@@ -30703,7 +30703,7 @@ function checkGithubVersion() {
3070330703
var releaseSHA = (_gitBranches$find = gitBranches.find(function(branchInfo) {
3070430704
return branchInfo.name === "release";
3070530705
})) === null || _gitBranches$find === void 0 || (_gitBranches$find = _gitBranches$find.commit) === null || _gitBranches$find === void 0 ? void 0 : _gitBranches$find.sha;
30706-
(0, import_kolmafia81.print)("Local Version: ".concat(localSHA, " (built from ").concat("main", "@").concat("e45cf39fd3bb20639bb630eec3bb0db59378ee5c", ")"));
30706+
(0, import_kolmafia81.print)("Local Version: ".concat(localSHA, " (built from ").concat("main", "@").concat("1359e614c80d46351c52bd2489cedcb81d117dd9", ")"));
3070730707
if (releaseSHA === localSHA) {
3070830708
(0, import_kolmafia81.print)("Garbo is up to date!", HIGHLIGHT);
3070930709
} else if (releaseSHA === void 0) {
@@ -37508,7 +37508,7 @@ function banishBunny() {
3750837508
do {
3750937509
var _banish$prepare;
3751037510
(_banish$prepare = banish.prepare) === null || _banish$prepare === void 0 || _banish$prepare.call(banish);
37511-
garboAdventure($location(_templateObject6910 || (_templateObject6910 = _taggedTemplateLiteral91(["The Dire Warren"]))), Macro2.if_($monster(_templateObject708 || (_templateObject708 = _taggedTemplateLiteral91(["fluffy bunny"]))), banish.macro()).embezzler());
37511+
garboAdventure($location(_templateObject6910 || (_templateObject6910 = _taggedTemplateLiteral91(["The Dire Warren"]))), Macro2.if_($monster(_templateObject708 || (_templateObject708 = _taggedTemplateLiteral91(["fluffy bunny"]))), banish.macro()).embezzler("fluffy bunny banish"));
3751237512
} while ("fluffy bunny" !== get("lastEncounter") && !get("banishedMonsters").includes("fluffy bunny"));
3751337513
}
3751437514
function getBanishedPhyla() {
@@ -39048,9 +39048,10 @@ var wandererFailsafeMacro = function() {
3904839048
var _macro = /* @__PURE__ */ new WeakMap();
3904939049
var _location = /* @__PURE__ */ new WeakMap();
3905039050
var _useAuto = /* @__PURE__ */ new WeakMap();
39051+
var _action = /* @__PURE__ */ new WeakMap();
3905139052
var EmbezzlerFightRunOptions = /* @__PURE__ */ function() {
3905239053
function EmbezzlerFightRunOptions2(configOptions) {
39053-
var _ref = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, macro = _ref.macro, location = _ref.location, useAuto = _ref.useAuto;
39054+
var _ref = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, macro = _ref.macro, location = _ref.location, useAuto = _ref.useAuto, action = _ref.action;
3905439055
_classCallCheck26(this, EmbezzlerFightRunOptions2);
3905539056
_defineProperty35(this, "configOptions", void 0);
3905639057
_classPrivateFieldInitSpec2(this, _macro, {
@@ -39065,7 +39066,12 @@ var EmbezzlerFightRunOptions = /* @__PURE__ */ function() {
3906539066
writable: true,
3906639067
value: void 0
3906739068
});
39069+
_classPrivateFieldInitSpec2(this, _action, {
39070+
writable: true,
39071+
value: void 0
39072+
});
3906839073
this.configOptions = configOptions;
39074+
_classPrivateFieldSet2(this, _action, action);
3906939075
_classPrivateFieldSet2(this, _macro, macro);
3907039076
_classPrivateFieldSet2(this, _location, location);
3907139077
_classPrivateFieldSet2(this, _useAuto, useAuto);
@@ -39090,7 +39096,7 @@ var EmbezzlerFightRunOptions = /* @__PURE__ */ function() {
3909039096
key: "macro",
3909139097
get: function get4() {
3909239098
var _classPrivateFieldGet22;
39093-
var baseMacro = (_classPrivateFieldGet22 = _classPrivateFieldGet2(this, _macro)) !== null && _classPrivateFieldGet22 !== void 0 ? _classPrivateFieldGet22 : Macro2.embezzler();
39099+
var baseMacro = (_classPrivateFieldGet22 = _classPrivateFieldGet2(this, _macro)) !== null && _classPrivateFieldGet22 !== void 0 ? _classPrivateFieldGet22 : Macro2.embezzler(this.action);
3909439100
return this.configOptions.draggable === "wanderer" ? wandererFailsafeMacro().step(baseMacro) : baseMacro;
3909539101
}
3909639102
}, {
@@ -39099,6 +39105,12 @@ var EmbezzlerFightRunOptions = /* @__PURE__ */ function() {
3909939105
var _classPrivateFieldGet3;
3910039106
return (_classPrivateFieldGet3 = _classPrivateFieldGet2(this, _useAuto)) !== null && _classPrivateFieldGet3 !== void 0 ? _classPrivateFieldGet3 : true;
3910139107
}
39108+
}, {
39109+
key: "action",
39110+
get: function get4() {
39111+
var _classPrivateFieldGet4;
39112+
return (_classPrivateFieldGet4 = _classPrivateFieldGet2(this, _action)) !== null && _classPrivateFieldGet4 !== void 0 ? _classPrivateFieldGet4 : "???";
39113+
}
3910239114
}]);
3910339115
return EmbezzlerFightRunOptions2;
3910439116
}();
@@ -40070,9 +40082,9 @@ var Macro2 = /* @__PURE__ */ function(_StrictMacro) {
4007040082
}
4007140083
}, {
4007240084
key: "embezzler",
40073-
value: function embezzler() {
40085+
value: function embezzler(action) {
4007440086
var doneHabitat = !have($skill(_templateObject1783 || (_templateObject1783 = _taggedTemplateLiteral103(["Just the Facts"])))) || get("_monsterHabitatsRecalled") === 3 && get("_monsterHabitatsFightsLeft") <= 1;
40075-
return this.if_(globalOptions.target, Macro3.if_($location(_templateObject1793 || (_templateObject1793 = _taggedTemplateLiteral103(["The Briny Deeps"]))), Macro3.tryCopier($item(_templateObject1803 || (_templateObject1803 = _taggedTemplateLiteral103(["pulled green taffy"]))))).externalIf((0, import_kolmafia114.myFamiliar)() === $familiar(_templateObject18111 || (_templateObject18111 = _taggedTemplateLiteral103(["Reanimated Reanimator"]))), Macro3.trySkill($skill(_templateObject18210 || (_templateObject18210 = _taggedTemplateLiteral103(["Wink at"]))))).externalIf((0, import_kolmafia114.myFamiliar)() === $familiar(_templateObject1836 || (_templateObject1836 = _taggedTemplateLiteral103(["Obtuse Angel"]))), Macro3.trySkill($skill(_templateObject1843 || (_templateObject1843 = _taggedTemplateLiteral103(["Fire a badly romantic arrow"]))))).externalIf(doneHabitat && get("beGregariousCharges") > 0 && (get("beGregariousMonster") !== globalOptions.target || have($item(_templateObject1853 || (_templateObject1853 = _taggedTemplateLiteral103(["miniature crystal ball"])))) ? get("beGregariousFightsLeft") === 0 : get("beGregariousFightsLeft") <= 1), Macro3.trySkill($skill(_templateObject1863 || (_templateObject1863 = _taggedTemplateLiteral103(["Be Gregarious"]))))).externalIf(have($skill(_templateObject1873 || (_templateObject1873 = _taggedTemplateLiteral103(["Just the Facts"])))) && get("_monsterHabitatsRecalled") < 3 && (get("_monsterHabitatsMonster") !== globalOptions.target || have($item(_templateObject1883 || (_templateObject1883 = _taggedTemplateLiteral103(["miniature crystal ball"])))) ? get("_monsterHabitatsFightsLeft") === 0 : get("_monsterHabitatsFightsLeft") <= 1), Macro3.trySkill($skill(_templateObject1893 || (_templateObject1893 = _taggedTemplateLiteral103(["Recall Facts: Monster Habitats"]))))).externalIf(have($skill(_templateObject1903 || (_templateObject1903 = _taggedTemplateLiteral103(["Recall Facts: %phylum Circadian Rhythms"])))) && !get("_circadianRhythmsRecalled"), Macro3.trySkill($skill(_templateObject19111 || (_templateObject19111 = _taggedTemplateLiteral103(["Recall Facts: %phylum Circadian Rhythms"]))))).externalIf(SourceTerminal_exports.getDigitizeMonster() !== globalOptions.target || shouldRedigitize(), Macro3.tryCopier($skill(_templateObject19210 || (_templateObject19210 = _taggedTemplateLiteral103(["Digitize"]))))).tryCopier($item(_templateObject1935 || (_templateObject1935 = _taggedTemplateLiteral103(["Spooky Putty sheet"])))).tryCopier($item(_templateObject1943 || (_templateObject1943 = _taggedTemplateLiteral103(["Rain-Doh black box"])))).tryCopier($item(_templateObject1953 || (_templateObject1953 = _taggedTemplateLiteral103(["4-d camera"])))).tryCopier($item(_templateObject1963 || (_templateObject1963 = _taggedTemplateLiteral103(["unfinished ice sculpture"])))).externalIf(get("_enamorangs") === 0, Macro3.tryCopier($item(_templateObject1973 || (_templateObject1973 = _taggedTemplateLiteral103(["LOV Enamorang"]))))).meatKill()).abortWithMsg("Expected ".concat(globalOptions.target, " but encountered something else."));
40087+
return this.if_(globalOptions.target, Macro3.if_($location(_templateObject1793 || (_templateObject1793 = _taggedTemplateLiteral103(["The Briny Deeps"]))), Macro3.tryCopier($item(_templateObject1803 || (_templateObject1803 = _taggedTemplateLiteral103(["pulled green taffy"]))))).externalIf((0, import_kolmafia114.myFamiliar)() === $familiar(_templateObject18111 || (_templateObject18111 = _taggedTemplateLiteral103(["Reanimated Reanimator"]))), Macro3.trySkill($skill(_templateObject18210 || (_templateObject18210 = _taggedTemplateLiteral103(["Wink at"]))))).externalIf((0, import_kolmafia114.myFamiliar)() === $familiar(_templateObject1836 || (_templateObject1836 = _taggedTemplateLiteral103(["Obtuse Angel"]))), Macro3.trySkill($skill(_templateObject1843 || (_templateObject1843 = _taggedTemplateLiteral103(["Fire a badly romantic arrow"]))))).externalIf(doneHabitat && get("beGregariousCharges") > 0 && (get("beGregariousMonster") !== globalOptions.target || have($item(_templateObject1853 || (_templateObject1853 = _taggedTemplateLiteral103(["miniature crystal ball"])))) ? get("beGregariousFightsLeft") === 0 : get("beGregariousFightsLeft") <= 1), Macro3.trySkill($skill(_templateObject1863 || (_templateObject1863 = _taggedTemplateLiteral103(["Be Gregarious"]))))).externalIf(have($skill(_templateObject1873 || (_templateObject1873 = _taggedTemplateLiteral103(["Just the Facts"])))) && get("_monsterHabitatsRecalled") < 3 && (get("_monsterHabitatsMonster") !== globalOptions.target || have($item(_templateObject1883 || (_templateObject1883 = _taggedTemplateLiteral103(["miniature crystal ball"])))) ? get("_monsterHabitatsFightsLeft") === 0 : get("_monsterHabitatsFightsLeft") <= 1), Macro3.trySkill($skill(_templateObject1893 || (_templateObject1893 = _taggedTemplateLiteral103(["Recall Facts: Monster Habitats"]))))).externalIf(have($skill(_templateObject1903 || (_templateObject1903 = _taggedTemplateLiteral103(["Recall Facts: %phylum Circadian Rhythms"])))) && !get("_circadianRhythmsRecalled"), Macro3.trySkill($skill(_templateObject19111 || (_templateObject19111 = _taggedTemplateLiteral103(["Recall Facts: %phylum Circadian Rhythms"]))))).externalIf(SourceTerminal_exports.getDigitizeMonster() !== globalOptions.target || shouldRedigitize(), Macro3.tryCopier($skill(_templateObject19210 || (_templateObject19210 = _taggedTemplateLiteral103(["Digitize"]))))).tryCopier($item(_templateObject1935 || (_templateObject1935 = _taggedTemplateLiteral103(["Spooky Putty sheet"])))).tryCopier($item(_templateObject1943 || (_templateObject1943 = _taggedTemplateLiteral103(["Rain-Doh black box"])))).tryCopier($item(_templateObject1953 || (_templateObject1953 = _taggedTemplateLiteral103(["4-d camera"])))).tryCopier($item(_templateObject1963 || (_templateObject1963 = _taggedTemplateLiteral103(["unfinished ice sculpture"])))).externalIf(get("_enamorangs") === 0, Macro3.tryCopier($item(_templateObject1973 || (_templateObject1973 = _taggedTemplateLiteral103(["LOV Enamorang"]))))).meatKill()).abortWithMsg("Macro for ".concat(action, " expected ").concat(globalOptions.target, " but encountered something else."));
4007640088
}
4007740089
}], [{
4007840090
key: "abortWithMsg",
@@ -40136,8 +40148,8 @@ var Macro2 = /* @__PURE__ */ function(_StrictMacro) {
4013640148
}
4013740149
}, {
4013840150
key: "embezzler",
40139-
value: function embezzler() {
40140-
return new Macro3().embezzler();
40151+
value: function embezzler(action) {
40152+
return new Macro3().embezzler(action);
4014140153
}
4014240154
}]);
4014340155
return Macro3;
@@ -43040,7 +43052,7 @@ function startWandererCounter() {
4304043052
(_run$constraints$prep3 = (_run$constraints3 = run.constraints).preparation) === null || _run$constraints$prep3 === void 0 || _run$constraints$prep3.call(_run$constraints3);
4304143053
freeFightOutfit(toSpec(run)).dress();
4304243054
}
43043-
garboAdventure($location(_templateObject4322 || (_templateObject4322 = _taggedTemplateLiteral109(["The Haunted Kitchen"]))), Macro2.if_(globalOptions.target, Macro2.embezzler()).step(run.macro));
43055+
garboAdventure($location(_templateObject4322 || (_templateObject4322 = _taggedTemplateLiteral109(["The Haunted Kitchen"]))), Macro2.if_(globalOptions.target, Macro2.embezzler("wanderer")).step(run.macro));
4304443056
} while (get("lastCopyableMonster") === $monster(_templateObject4222 || (_templateObject4222 = _taggedTemplateLiteral109(["Government agent"]))) || lastAdventureWasWeird({
4304543057
extraEncounters: ["Lights Out in the Kitchen"]
4304643058
}));
@@ -43129,7 +43141,8 @@ function dailyFights() {
4312943141
var startLectures = get("_pocketProfessorLectures");
4313043142
runEmbezzlerFight(fightSource, {
4313143143
macro: macro(),
43132-
useAuto: false
43144+
useAuto: false,
43145+
action: "Pocket Professor"
4313343146
});
4313443147
eventLog.initialCopyTargetsFought += 1 + get("_pocketProfessorLectures") - startLectures;
4313543148
eventLog.copyTargetSources.push(fightSource.name);
@@ -43177,7 +43190,9 @@ function dailyFights() {
4317743190
}
4317843191
(0, import_kolmafia120.setLocation)(location);
4317943192
embezzlerOutfit(_objectSpread22(_objectSpread22({}, nextFight.spec), famSpec), location).dress();
43180-
runEmbezzlerFight(nextFight);
43193+
runEmbezzlerFight(nextFight, {
43194+
action: nextFight.name
43195+
});
4318143196
postCombatActions();
4318243197
(0, import_kolmafia120.print)("Finished ".concat(nextFight.name));
4318343198
if ((0, import_kolmafia120.totalTurnsPlayed)() - startTurns === 1 && get("lastCopyableMonster") === globalOptions.target && (nextFight.wrongEncounterName || get("lastEncounter") === globalOptions.target.name)) {
@@ -45253,7 +45268,7 @@ var BarfTurnTasks = [
4525345268
spendsTurn: true,
4525445269
outfit: embezzlerOutfit,
4525545270
combat: new GarboStrategy(function() {
45256-
return Macro2.embezzler();
45271+
return Macro2.embezzler("envyfish egg");
4525745272
})
4525845273
},
4525945274
wanderTask("yellow ray", {}, {

0 commit comments

Comments
 (0)