Skip to content

Commit

Permalink
Basic ELP support (#1966)
Browse files Browse the repository at this point in the history
* Update eslint-related packages

* Use ELP when possible on embezzlers
  • Loading branch information
gausie authored Jul 10, 2024
1 parent a47bb79 commit e13e14e
Show file tree
Hide file tree
Showing 56 changed files with 190 additions and 337 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"copyfiles": "^2.4.1",
"eslint": "^8.50.0",
"eslint": "^8.57.0",
"husky": "^8.0.3",
"prettier": "^3.0.3",
"typescript": "^5.4.5"
Expand Down
10 changes: 5 additions & 5 deletions packages/eslint-config-garbo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
"typescript": ">=4.2.0"
},
"dependencies": {
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-libram": "latest"
"@typescript-eslint/eslint-plugin": "^7.16.0",
"@typescript-eslint/parser": "^7.16.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-libram": "^0.4.9"
},
"devDependencies": {
"eslint": "^8.50.0",
"eslint": "^8.57.0",
"lint-staged": "^14.0.1",
"madge": "^6.1.0",
"prettier": "^3.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/garbo-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"libram": "^0.8.17"
},
"devDependencies": {
"eslint": "^8.50.0",
"eslint": "^8.57.0",
"eslint-config-garbo": "^0.0.1",
"kolmafia": "^5.27920.0",
"libram": "latest",
Expand Down
10 changes: 5 additions & 5 deletions packages/garbo-relay/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
"devDependencies": {
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@typescript-eslint/eslint-plugin": "^7.16.0",
"@typescript-eslint/parser": "^7.16.0",
"@vitejs/plugin-react": "^4.0.3",
"eslint": "^8.45.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.8",
"lint-staged": "^14.0.1",
"prettier": "^3.0.3",
"rimraf": "^5.0.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/garbo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"copyfiles": "^2.4.1",
"esbuild": "^0.19.3",
"esbuild-plugin-babel": "^0.2.3",
"eslint": "^8.50.0",
"eslint": "^8.57.0",
"eslint-config-garbo": "^0.0.1",
"lint-staged": "^14.0.1",
"madge": "^6.1.0",
Expand Down
1 change: 1 addition & 0 deletions packages/garbo/src/combat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,7 @@ export class Macro extends StrictMacro {
get("_enamorangs") === 0,
Macro.tryCopier($item`LOV Enamorang`),
)
.tryHaveSkill($skill`Blow the Purple Candle!`)
.meatKill(),
).abortWithMsg(
`Macro for ${action} expected ${globalOptions.target} but encountered something else.`,
Expand Down
15 changes: 14 additions & 1 deletion packages/garbo/src/outfit/embezzler.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
import { Outfit, OutfitSpec } from "grimoire-kolmafia";
import { toJson } from "kolmafia";
import { $familiar, $item, $items, $location, $monster, Guzzlr } from "libram";
import {
$effect,
$familiar,
$item,
$items,
$location,
$monster,
Guzzlr,
have,
} from "libram";
import { freeFightFamiliar, meatFamiliar } from "../familiar";
import { chooseBjorn } from "./bjorn";
import { bonusGear } from "./dropsgear";
Expand Down Expand Up @@ -106,5 +115,9 @@ export function embezzlerOutfit(
edpiece: "fish",
});

if (!have($effect`Everything Looks Purple`)) {
outfit.equip($item`Roman Candelabra`);
}

return outfit;
}
Loading

0 comments on commit e13e14e

Please sign in to comment.