diff --git a/CREDITS.md b/CREDITS.md index 6d884c8fd60..bca89c816ca 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -40,6 +40,7 @@ ## Backgrounds - Squip (Paid Commissions) - Contributions by Someonealive-QN +- Contributions by redactedinlight ## UI - GAMEFREAK diff --git a/lefthook.yml b/lefthook.yml index 28178432c31..40875073fdd 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -15,4 +15,6 @@ post-merge: post-checkout: commands: update-submodules: - run: git submodule update --init --recursive \ No newline at end of file + # cf https://git-scm.com/docs/githooks#_post_checkout: + # The 3rd argument is 1 for branch checkouts and 0 for file checkouts. + run: if test {3} -eq "1"; then git submodule update --init --recursive; fi \ No newline at end of file diff --git a/public/images/arenas/plains_b_1.png b/public/images/arenas/plains_b_1.png new file mode 100644 index 00000000000..7312a61af32 Binary files /dev/null and b/public/images/arenas/plains_b_1.png differ diff --git a/public/images/arenas/plains_b_2.png b/public/images/arenas/plains_b_2.png new file mode 100644 index 00000000000..e270986dd21 Binary files /dev/null and b/public/images/arenas/plains_b_2.png differ diff --git a/public/images/arenas/plains_b_3.png b/public/images/arenas/plains_b_3.png new file mode 100644 index 00000000000..b149daccd72 Binary files /dev/null and b/public/images/arenas/plains_b_3.png differ diff --git a/public/images/arenas/plains_bg.png b/public/images/arenas/plains_bg.png index 7815fd8843f..092f7e9cdbc 100644 Binary files a/public/images/arenas/plains_bg.png and b/public/images/arenas/plains_bg.png differ diff --git a/public/images/statuses.png b/public/images/statuses.png index d372b989be9..f678b9cb700 100644 Binary files a/public/images/statuses.png and b/public/images/statuses.png differ diff --git a/public/images/statuses_ca.png b/public/images/statuses_ca.png index fe05e243f7a..d6fb8fd0415 100644 Binary files a/public/images/statuses_ca.png and b/public/images/statuses_ca.png differ diff --git a/public/images/statuses_da.png b/public/images/statuses_da.png index 02780bddd98..274e960a565 100644 Binary files a/public/images/statuses_da.png and b/public/images/statuses_da.png differ diff --git a/public/images/statuses_de.png b/public/images/statuses_de.png index ab85384d591..140ba6326ca 100644 Binary files a/public/images/statuses_de.png and b/public/images/statuses_de.png differ diff --git a/public/images/statuses_es-ES.png b/public/images/statuses_es-ES.png index dc845d6fb1f..fbe87996506 100644 Binary files a/public/images/statuses_es-ES.png and b/public/images/statuses_es-ES.png differ diff --git a/public/images/statuses_es-MX.png b/public/images/statuses_es-MX.png index dc845d6fb1f..fbe87996506 100644 Binary files a/public/images/statuses_es-MX.png and b/public/images/statuses_es-MX.png differ diff --git a/public/images/statuses_fr.png b/public/images/statuses_fr.png index 95989cd5d97..611e6226a17 100644 Binary files a/public/images/statuses_fr.png and b/public/images/statuses_fr.png differ diff --git a/public/images/statuses_it.png b/public/images/statuses_it.png index af3107018f8..4ca1e908d94 100644 Binary files a/public/images/statuses_it.png and b/public/images/statuses_it.png differ diff --git a/public/images/statuses_ja.png b/public/images/statuses_ja.png index 305fbe9168c..433c54f04bd 100644 Binary files a/public/images/statuses_ja.png and b/public/images/statuses_ja.png differ diff --git a/public/images/statuses_ko.png b/public/images/statuses_ko.png index d372b989be9..a600231df7b 100644 Binary files a/public/images/statuses_ko.png and b/public/images/statuses_ko.png differ diff --git a/public/images/statuses_pt-BR.png b/public/images/statuses_pt-BR.png index 3073540e8a2..0c5124f12d8 100644 Binary files a/public/images/statuses_pt-BR.png and b/public/images/statuses_pt-BR.png differ diff --git a/public/images/statuses_ro.png b/public/images/statuses_ro.png index 537b634c520..0eb8e1fc32c 100644 Binary files a/public/images/statuses_ro.png and b/public/images/statuses_ro.png differ diff --git a/public/images/statuses_ru.png b/public/images/statuses_ru.png index 1da8b66a4f8..c579e454c0f 100644 Binary files a/public/images/statuses_ru.png and b/public/images/statuses_ru.png differ diff --git a/public/images/statuses_tr.png b/public/images/statuses_tr.png index d372b989be9..f678b9cb700 100644 Binary files a/public/images/statuses_tr.png and b/public/images/statuses_tr.png differ diff --git a/public/images/statuses_zh-CN.png b/public/images/statuses_zh-CN.png index d372b989be9..f678b9cb700 100644 Binary files a/public/images/statuses_zh-CN.png and b/public/images/statuses_zh-CN.png differ diff --git a/public/images/statuses_zh-TW.png b/public/images/statuses_zh-TW.png index d372b989be9..f678b9cb700 100644 Binary files a/public/images/statuses_zh-TW.png and b/public/images/statuses_zh-TW.png differ diff --git a/public/images/types.png b/public/images/types.png index 8b644f1041c..26cb6111c8e 100644 Binary files a/public/images/types.png and b/public/images/types.png differ diff --git a/public/images/types_ca.png b/public/images/types_ca.png index a1c295d7b9b..363589b6421 100644 Binary files a/public/images/types_ca.png and b/public/images/types_ca.png differ diff --git a/public/images/types_da.png b/public/images/types_da.png index f2b7af8967a..c199e078376 100644 Binary files a/public/images/types_da.png and b/public/images/types_da.png differ diff --git a/public/images/types_de.png b/public/images/types_de.png index a033554029c..0e1d77e73b2 100755 Binary files a/public/images/types_de.png and b/public/images/types_de.png differ diff --git a/public/images/types_es-ES.png b/public/images/types_es-ES.png index 3596b7f6a0a..79797df11e0 100644 Binary files a/public/images/types_es-ES.png and b/public/images/types_es-ES.png differ diff --git a/public/images/types_es-MX.png b/public/images/types_es-MX.png index ad159a7c6bb..49c99bfaf35 100644 Binary files a/public/images/types_es-MX.png and b/public/images/types_es-MX.png differ diff --git a/public/images/types_fr.png b/public/images/types_fr.png index bf81bed1b22..4ee31a0fb36 100644 Binary files a/public/images/types_fr.png and b/public/images/types_fr.png differ diff --git a/public/images/types_it.png b/public/images/types_it.png index 3be03aeea68..61079be81c0 100644 Binary files a/public/images/types_it.png and b/public/images/types_it.png differ diff --git a/public/images/types_ja.png b/public/images/types_ja.png index a6f3b00607f..072e723f9a8 100644 Binary files a/public/images/types_ja.png and b/public/images/types_ja.png differ diff --git a/public/images/types_ko.png b/public/images/types_ko.png index 53342ddd3ec..d8f7b2a7761 100644 Binary files a/public/images/types_ko.png and b/public/images/types_ko.png differ diff --git a/public/images/types_pt-BR.png b/public/images/types_pt-BR.png index 71bb1471ff2..58b6b14bcf4 100644 Binary files a/public/images/types_pt-BR.png and b/public/images/types_pt-BR.png differ diff --git a/public/images/types_ro.png b/public/images/types_ro.png index 35b09a37035..4eaadd8877b 100644 Binary files a/public/images/types_ro.png and b/public/images/types_ro.png differ diff --git a/public/images/types_ru.png b/public/images/types_ru.png index 1e0615f721f..8ce9c06f905 100644 Binary files a/public/images/types_ru.png and b/public/images/types_ru.png differ diff --git a/public/images/types_tr.png b/public/images/types_tr.png index 93eae27caa0..828aeb0b741 100644 Binary files a/public/images/types_tr.png and b/public/images/types_tr.png differ diff --git a/public/images/types_zh-CN.png b/public/images/types_zh-CN.png index e1927ad9d3b..52403ed5892 100644 Binary files a/public/images/types_zh-CN.png and b/public/images/types_zh-CN.png differ diff --git a/public/images/types_zh-TW.png b/public/images/types_zh-TW.png index 8b644f1041c..9ebc29f0d4f 100644 Binary files a/public/images/types_zh-TW.png and b/public/images/types_zh-TW.png differ diff --git a/src/field/arena.ts b/src/field/arena.ts index 9f79e502c66..94b95c79261 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -935,6 +935,7 @@ export function getBiomeKey(biome: BiomeId): string { export function getBiomeHasProps(biomeType: BiomeId): boolean { switch (biomeType) { + case BiomeId.PLAINS: case BiomeId.METROPOLIS: case BiomeId.BEACH: case BiomeId.LAKE: diff --git a/src/main.ts b/src/main.ts index 6c0fcacd521..9063ac0ec5b 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,3 +1,6 @@ +import "#app/polyfills"; +// All polyfills MUST be loaded first for side effects + import { InvertPostFX } from "#app/pipelines/invert"; import { initI18n } from "#app/plugins/i18n"; import { version } from "#package.json"; diff --git a/src/polyfills.ts b/src/polyfills.ts new file mode 100644 index 00000000000..8666629fceb --- /dev/null +++ b/src/polyfills.ts @@ -0,0 +1,21 @@ +/* +Manual rolling of polyfills desired by the project. + +IMPORTANT: When adding / removing polyfills, ensure that typescript becomes +aware of their existence, either by creating `src/typings/polyfills.d.ts` +and defining them there, or or by adding the appropriate field polyfill to the +`lib` property in `tsconfig.json`. +*/ + +if (typeof Promise.withResolvers === "undefined") { + Promise.withResolvers = () => { + // Bangs are OK here; they are guaranteed to be defined when the promise is invoked. + let resolve!: (value: T | PromiseLike) => void; + let reject!: (reason?: unknown) => void; + const promise = new Promise((res, rej) => { + resolve = res; + reject = rej; + }); + return { promise, resolve, reject }; + }; +} diff --git a/tsconfig.json b/tsconfig.json index 39b99cf9ca9..b7ef84869e5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,6 +2,17 @@ "compilerOptions": { "target": "ES2020", "module": "ES2020", + // Modifying this option requires all values to be set manually because the defaults get overridden + // Values other than "ES2024.Promise" taken from https://github.com/microsoft/TypeScript/blob/main/src/lib/es2020.full.d.ts + "lib": [ + "ES2020", + "ES2024.Promise", + "DOM", + "DOM.AsyncIterable", + "DOM.Iterable", + "ScriptHost", + "WebWorker.ImportScripts" + ], "moduleResolution": "bundler", "resolveJsonModule": true, "esModuleInterop": true,