diff --git a/src/js/changelog.js b/src/js/changelog.js index d13c471f..face08db 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -1,5 +1,5 @@ /** - * @type {Array<{version: string, date: string, entries: Array}>} changelog + * @type {Array<{version: string, date: string, skin?: string, entries: Array}>} changelog */ export const CHANGELOG = [ { diff --git a/src/js/game/root.js b/src/js/game/root.js index d6f5ec0a..8a274680 100644 --- a/src/js/game/root.js +++ b/src/js/game/root.js @@ -181,7 +181,7 @@ export class GameRoot { freeEntityAreaBeforeBuild: /** @type {TypedSignal<[Entity]>} */ (new Signal()), // Called with an achievement key and necessary args to validate it can be unlocked. - achievementCheck: /** @type {TypedSignal<[string, *]>} */ (new Signal()), + achievementCheck: /** @type {TypedSignal<(string|any)[]>} */ (new Signal()), bulkAchievementCheck: /** @type {TypedSignal<(string|any)[]>} */ (new Signal()), }; diff --git a/src/js/platform/achievement_provider.js b/src/js/platform/achievement_provider.js index 5d7f94bc..01efa815 100644 --- a/src/js/platform/achievement_provider.js +++ b/src/js/platform/achievement_provider.js @@ -3,12 +3,13 @@ import { Application } from "../application"; import { Entity } from "../game/entity"; import { GameRoot } from "../game/root"; import { ShapeDefinition } from "../game/shape_definition"; -import { THEMES } from "../game/theme"; +import { VANILLA_THEMES } from "../game/theme"; /* typehints:end */ import { enumAnalyticsDataSource } from "../game/production_analytics"; import { ShapeItem } from "../game/items/shape_item"; import { globalConfig } from "../core/config"; +import { codes } from "../savegame/schemas/ML01"; export const ACHIEVEMENTS = { belt500Tiles: "belt500Tiles", @@ -58,7 +59,7 @@ export const ACHIEVEMENTS = { upgradesTier8: "upgradesTier8", }; -/** @type {keyof typeof THEMES} */ +/** @type {keyof typeof VANILLA_THEMES} */ const DARK_MODE = "dark"; const HOUR_1 = 3600; // Seconds @@ -68,8 +69,8 @@ const ITEM_SHAPE = ShapeItem.getId(); const MINUTE_30 = 1800; // Seconds const MINUTE_60 = MINUTE_30 * 2; const MINUTE_120 = MINUTE_30 * 4; -const ROTATER_CCW_CODE = 12; -const ROTATER_180_CODE = 13; +const ROTATER_CCW_CODE = codes[12]; +const ROTATER_180_CODE = codes[13]; const SHAPE_BP = "CbCbCbRb:CwCwCwCw"; const SHAPE_LOGO = "RuCw--Cw:----Ru--"; const SHAPE_MS_LOGO = "RgRyRbRr";