diff --git a/src/js/game/building_codes.js b/src/js/game/building_codes.js index 05c27f57..65eff317 100644 --- a/src/js/game/building_codes.js +++ b/src/js/game/building_codes.js @@ -19,7 +19,7 @@ import { Vector } from "../core/vector"; /** * Stores a lookup table for all building variants (for better performance) - * @type {Object} + * @type {Object} */ export const gBuildingVariants = { // Set later @@ -27,7 +27,7 @@ export const gBuildingVariants = { /** * Registers a new variant - * @param {number} id + * @param {number | string} id * @param {typeof MetaBuilding} meta * @param {string} variant * @param {number} rotationVariant @@ -50,7 +50,7 @@ export function registerBuildingVariant( /** * - * @param {number} code + * @param {number | string} code * @returns {BuildingVariantIdentifier} */ export function getBuildingDataFromCode(code) { @@ -72,7 +72,7 @@ export function getCodeFromBuildingData(metaBuilding, variant, rotationVariant) data.variant === variant && data.rotationVariant === rotationVariant ) { - return +key; + return key; } } assertAlways( diff --git a/src/js/game/component_registry.js b/src/js/game/component_registry.js index b03c164f..ea1e4b95 100644 --- a/src/js/game/component_registry.js +++ b/src/js/game/component_registry.js @@ -44,7 +44,7 @@ export function initComponentRegistry() { assert( // @ts-ignore - require.context("./components", false, /.*\.js/i).keys().length === + require.context("./components", false, /.*\.js/i).keys().length >= gComponentRegistry.getNumEntries(), "Not all components are registered" ); diff --git a/src/js/game/components/static_map_entity.js b/src/js/game/components/static_map_entity.js index 3d138e42..1ef9506e 100644 --- a/src/js/game/components/static_map_entity.js +++ b/src/js/game/components/static_map_entity.js @@ -79,7 +79,7 @@ export class StaticMapEntityComponent extends Component { * @param {Vector=} param0.tileSize Size of the entity in tiles * @param {number=} param0.rotation Rotation in degrees. Must be multiple of 90 * @param {number=} param0.originalRotation Original Rotation in degrees. Must be multiple of 90 - * @param {number=} param0.code Building code + * @param {(number | string)=} param0.code Building code */ constructor({ origin = new Vector(), diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index d58aa697..2075b566 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -238,8 +238,8 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const items = processorComp.inputSlots; processorComp.inputSlots = []; - /** @type {Object.} */ - const itemsBySlot = {}; + /** @type {Array<{ item: BaseItem, sourceSlot: number }>} */ + const itemsBySlot = []; for (let i = 0; i < items.length; ++i) { itemsBySlot[items[i].sourceSlot] = items[i]; } diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index bea209a8..abde69c4 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -75,7 +75,7 @@ export class MainMenuState extends GameState { @@ -119,7 +119,7 @@ export class MainMenuState extends GameState {
${T.mainMenu.madeBy.replace( "", - 'Tobias Springer' + 'Tobias Springer & modded by Exund' )}