-
Notifications
You must be signed in to change notification settings - Fork 280
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
perf: make more items stackable (#3489)
* fix: allow using charges when sewing * feat: item to stackable converter script * perf: make stuff stackable rag was also made GENERIC because TOOL worked poorly * fix: account for count by charges item * refactor: use `std::clamp` * fix: remove fuel randomness for charge based items this makes fire source calculation flaky.
- Loading branch information
Showing
11 changed files
with
150 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| import { z } from "https://deno.land/x/catjazz@v0.0.2/mod.ts" | ||
| import { Command } from "https://deno.land/x/catjazz@v0.0.2/deps/cliffy.ts" | ||
| import { cliOptions } from "https://deno.land/x/catjazz@v0.0.2/utils/cli.ts" | ||
| import { timeit } from "https://deno.land/x/catjazz@v0.0.2/utils/timeit.ts" | ||
| import { | ||
| applyRecursively, | ||
| schemaTransformer, | ||
| } from "https://deno.land/x/catjazz@v0.0.2/utils/transform.ts" | ||
| import { | ||
| type CataEntry, | ||
| Entry, | ||
| parseCataJson, | ||
| readRecursively, | ||
| } from "https://deno.land/x/catjazz@v0.0.2/utils/parse.ts" | ||
| import { fmtJsonRecursively } from "https://deno.land/x/catjazz@v0.0.2/utils/json_fmt.ts" | ||
| import { match, P } from "https://deno.land/x/catjazz@v0.0.2/deps/ts_pattern.ts" | ||
| import { id } from "https://deno.land/x/catjazz@v0.0.2/utils/id.ts" | ||
|
|
||
| // FIXME: include in library | ||
| const unpack = (xs: string[] | Entry[]) => | ||
| match(xs) | ||
| .with(P.array(P.string), id) | ||
| .otherwise((xs) => xs.map(({ path }) => path)) | ||
|
|
||
| const main = new Command() | ||
| // TODO: allow multiple paths | ||
| .option(...cliOptions.path) | ||
| .option(...cliOptions.format) | ||
| .option(...cliOptions.quiet) | ||
| .arguments("<...ids>") | ||
| .description("Converts given id to stackable.") | ||
| .action(async ({ path, quiet = false, format }, ...ids) => { | ||
| const timeIt = timeit(quiet) | ||
|
|
||
| const schema = z.object({ | ||
| // @ts-expect-error: zod hates string literal mapping | ||
| id: z.union(ids.map((id) => z.literal(id))) as z.ZodString, | ||
| type: z.string().transform((x) => x === "TOOL" ? "GENERIC" : x), | ||
| }) | ||
| .passthrough() | ||
| .transform(({ id, ...rest }) => { | ||
| console.log(id) | ||
| return { id, ...rest, stackable: true } | ||
| }) | ||
|
|
||
| const transformer = schemaTransformer(schema) | ||
| const ignore = (entries: CataEntry[]) => | ||
| entries.find(({ type }) => ["mapgen", "palette", "mod_tileset"].includes(type)) | ||
|
|
||
| // FIXME: include in library | ||
| const mapgenIgnoringTransformer = (text: string) => { | ||
| const entries = parseCataJson(text) | ||
| return ignore(entries) ? text : JSON.stringify(transformer(entries), null, 2) | ||
| } | ||
|
|
||
| const recursiveTransformer = applyRecursively(mapgenIgnoringTransformer) | ||
|
|
||
| const entries = await timeIt({ name: "reading JSON", val: readRecursively(path) }) | ||
|
|
||
| await timeIt({ name: "Transforming", val: recursiveTransformer(entries) }) | ||
|
|
||
| if (!format) return | ||
| await timeIt({ | ||
| name: "formatting", | ||
| val: fmtJsonRecursively({ formatterPath: format, quiet: true })(unpack(entries)), | ||
| }) | ||
| }) | ||
|
|
||
| if (import.meta.main) { | ||
| await main.parse(Deno.args) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters