Skip to content
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

Don't use Northern Explosion for Cold monsters instead of just snowmen #2137

Merged
merged 3 commits into from
Sep 28, 2024
Merged

Don't use Northern Explosion for Cold monsters instead of just snowmen #2137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22038cf
update libram & kolmafia
Rinn Sep 28, 2024
8c3afa2
bump since version
Rinn Sep 28, 2024
f176d45
Don't use Northern Explosion for Cold monsters
Rinn Sep 28, 2024
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
Binary file removed .yarn/cache/kolmafia-npm-5.28021.0-adb0809c75-8c24fc05ea.zip
View file
Open in desktop
Binary file not shown.
Binary file added .yarn/cache/kolmafia-npm-5.28064.0-9d57c95fce-619b5b862c.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...ibram-npm-0.9.9-41a6d77ace-eb8b20bb6f.zip → ...bram-npm-0.9.10-9e89503100-26e7513a92.zip
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions packages/garbo-lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
]
},
"peerDependencies": {
"kolmafia": "^5.27668.0",
"libram": "^0.8.17"
"kolmafia": "^5.28064.0",
"libram": "^0.9.10"
},
"devDependencies": {
"eslint": "^9.9.0",
"eslint-config-garbo": "^0.0.1",
"kolmafia": "^5.28021.0",
"libram": "^0.9.9",
"kolmafia": "^5.28064.0",
"libram": "^0.9.10",
"lint-staged": "^15.2.9",
"madge": "^8.0.0",
"prettier": "^3.3.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/garbo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"dependencies": {
"garbo-lib": "*",
"grimoire-kolmafia": "^0.3.26",
"kolmafia": "^5.28021.0",
"libram": "^0.9.9"
"kolmafia": "^5.28064.0",
"libram": "^0.9.10"
},
"devDependencies": {
"@babel/cli": "^7.24.8",
Expand Down
5 changes: 3 additions & 2 deletions packages/garbo/src/combat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import {
import {
$class,
$effect,
$element,
$familiar,
$item,
$items,
Expand Down Expand Up @@ -612,7 +613,7 @@ export class Macro extends StrictMacro {
itemType(equippedItem($slot`weapon`)) === "knife"),

Macro.ifNot(
$monster`X-32-F Combat Training Snowman`,
$element`Cold`,
Macro.trySkillRepeat($skill`Northern Explosion`),
).trySkillRepeat(
$skill`Lunging Thrust-Smack`,
Expand All @@ -630,7 +631,7 @@ export class Macro extends StrictMacro {
$skill`Saucestorm`,
)
.ifNot(
$monster`X-32-F Combat Training Snowman`,
$element`Cold`,
Macro.trySkillRepeat($skill`Northern Explosion`),
)
.trySkillRepeat($skill`Lunging Thrust-Smack`),
Expand Down
2 changes: 1 addition & 1 deletion packages/garbo/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function defaultTarget() {
}

export function main(argString = ""): void {
sinceKolmafiaRevision(28054); // Mimic egg tracking
sinceKolmafiaRevision(28063); // Update for new BALLS predicates
checkGithubVersion();

// Hit up main.php to get out of easily escapable choices
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4334,15 +4334,15 @@ __metadata:
dependencies:
eslint: ^9.9.0
eslint-config-garbo: ^0.0.1
kolmafia: ^5.28021.0
libram: ^0.9.9
kolmafia: ^5.28064.0
libram: ^0.9.10
lint-staged: ^15.2.9
madge: ^8.0.0
prettier: ^3.3.3
typescript: ^5.5.4
peerDependencies:
kolmafia: ^5.27668.0
libram: ^0.8.17
kolmafia: ^5.28064.0
libram: ^0.9.10
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -4389,8 +4389,8 @@ __metadata:
eslint-config-garbo: ^0.0.1
garbo-lib: "*"
grimoire-kolmafia: ^0.3.26
kolmafia: ^5.28021.0
libram: ^0.9.9
kolmafia: ^5.28064.0
libram: ^0.9.10
lint-staged: ^15.2.9
madge: ^8.0.0
prettier: ^3.3.3
Expand Down Expand Up @@ -5037,10 +5037,10 @@ __metadata:
languageName: node
linkType: hard

"kolmafia@npm:^5.28021.0":
version: 5.28021.0
resolution: "kolmafia@npm:5.28021.0"
checksum: 8c24fc05ea935f7000450337b80be73aecc8787106333506afc97e6575ea2142bfd0e428997ecd43c7441ae8df6cba0fc43e3640b4f735aa9e3d81d1bcdf11a6
"kolmafia@npm:^5.28064.0":
version: 5.28064.0
resolution: "kolmafia@npm:5.28064.0"
checksum: 619b5b862c93307b7238ecff6352a3391d67972ef138ebe343faa7419d63a2d649cdf931bbab92a320bbf4f6aa647ef38a0f8a2b1201f647907d2eef63cec098
languageName: node
linkType: hard

Expand All @@ -5054,14 +5054,14 @@ __metadata:
languageName: node
linkType: hard

"libram@npm:^0.9.9":
version: 0.9.9
resolution: "libram@npm:0.9.9"
"libram@npm:^0.9.10":
version: 0.9.10
resolution: "libram@npm:0.9.10"
dependencies:
html-entities: ^2.5.2
peerDependencies:
kolmafia: ^5.27668.0
checksum: eb8b20bb6f45095e3c5d06c5a5c37bcac7d8270ded791380a57d8e584598fc2eff6c8fabfd15753a3665761deacf875833e80ff7a631a7367c8f78a58fe8521c
checksum: 26e7513a92c89a0d85b59cbe32def8ec690e84c5d93e66af8db253208028cb93a5285803f1ac93dcf876b57f35be185513095683400407c63ac8e9da730351ca
languageName: node
linkType: hard

Expand Down
Loading