From abf2fd3d9424b8eef84fd3262a3f90159cf55ee7 Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 13 Jan 2022 21:20:42 +0100 Subject: [PATCH 001/129] initial modloader draft --- src/js/core/background_resources_loader.js | 2 + src/js/core/globals.js | 3 + src/js/core/loader.js | 4 ++ src/js/game/theme.js | 3 + src/js/main.js | 3 + src/js/mods/demo_mod.js | 31 +++++++++ src/js/mods/mod.js | 50 ++++++++++++++ src/js/mods/mod_interface.js | 77 ++++++++++++++++++++++ src/js/mods/modloader.js | 77 ++++++++++++++++++++++ 9 files changed, 250 insertions(+) create mode 100644 src/js/mods/demo_mod.js create mode 100644 src/js/mods/mod.js create mode 100644 src/js/mods/mod_interface.js create mode 100644 src/js/mods/modloader.js diff --git a/src/js/core/background_resources_loader.js b/src/js/core/background_resources_loader.js index 316619c4..e1a585b6 100644 --- a/src/js/core/background_resources_loader.js +++ b/src/js/core/background_resources_loader.js @@ -9,6 +9,7 @@ import { SOUNDS, MUSIC } from "../platform/sound"; import { AtlasDefinition, atlasFiles } from "./atlas_definitions"; import { initBuildingCodesAfterResourcesLoaded } from "../game/meta_building_registry"; import { cachebust } from "./cachebust"; +import { MODS } from "../mods/modloader"; const logger = createLogger("background_loader"); @@ -232,6 +233,7 @@ export class BackgroundResourcesLoader { this.numAssetsToLoadTotal = 0; this.numAssetsLoaded = 0; }) + .then(MODS.hook_injectSprites.bind(MODS)) ); } } diff --git a/src/js/core/globals.js b/src/js/core/globals.js index 15197880..fcb9a3e8 100644 --- a/src/js/core/globals.js +++ b/src/js/core/globals.js @@ -2,6 +2,8 @@ import { Application } from "../application"; /* typehints:end */ +import { MODS } from "../mods/modloader"; + /** * Used for the bug reporter, and the click detector which both have no handles to this. * It would be nicer to have no globals, but this is the only one. I promise! @@ -14,4 +16,5 @@ export let GLOBAL_APP = null; export function setGlobalApp(app) { assert(!GLOBAL_APP, "Create application twice!"); GLOBAL_APP = app; + MODS.linkApp(app); } diff --git a/src/js/core/loader.js b/src/js/core/loader.js index cadbc048..b955beda 100644 --- a/src/js/core/loader.js +++ b/src/js/core/loader.js @@ -181,6 +181,10 @@ class LoaderImpl { w: sourceSize.w, h: sourceSize.h, }); + if (sprite.linksByResolution[scale]) { + // Seems data is already present, might have been replaced by a mod + continue; + } sprite.linksByResolution[scale] = link; } } diff --git a/src/js/game/theme.js b/src/js/game/theme.js index 251f4433..4f68997e 100644 --- a/src/js/game/theme.js +++ b/src/js/game/theme.js @@ -1,3 +1,5 @@ +import { MODS } from "../mods/modloader"; + export const THEMES = { dark: require("./themes/dark.json"), light: require("./themes/light.json"), @@ -7,4 +9,5 @@ export let THEME = THEMES.light; export function applyGameTheme(id) { THEME = THEMES[id]; + MODS.callHook("preprocessTheme", { id, theme: THEME }); } diff --git a/src/js/main.js b/src/js/main.js index 94f3d37a..3046820c 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -11,6 +11,7 @@ import { initItemRegistry } from "./game/item_registry"; import { initMetaBuildingRegistry } from "./game/meta_building_registry"; import { initGameModeRegistry } from "./game/game_mode_registry"; import { initGameSpeedRegistry } from "./game/game_speed_registry"; +import { MODS } from "./mods/modloader"; const logger = createLogger("main"); @@ -19,6 +20,8 @@ if (window.coreThreadLoadedCb) { window.coreThreadLoadedCb(); } +MODS.hook_init(); + // Logrocket // if (!G_IS_DEV && !G_IS_STANDALONE) { // const monthlyUsers = 300; // thousand diff --git a/src/js/mods/demo_mod.js b/src/js/mods/demo_mod.js new file mode 100644 index 00000000..c5003da0 --- /dev/null +++ b/src/js/mods/demo_mod.js @@ -0,0 +1,31 @@ +import { Mod } from "./mod"; + +export class DemoMod extends Mod { + constructor() { + super({ + authorContact: "tobias@tobspr.io", + authorName: "tobspr", + name: "Demo Mod", + version: "1", + id: "demo-mod", + }); + } + + hook_init() { + this.interface.registerCss(` + * { + color: red !important; + } + `); + + this.interface.registerSprite( + "sprites/colors/red.png", + "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAB2AAAAdgB+lymcgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAATkSURBVHic7ZpfiFRVHMc/v5m99+6qWYhCYKFGVJpPFYgK4UNQb1GwODO5M2OLUmASItGD6OJDYX8IIqPMdWdmdWZkE6GnnozqJWkxENMyg/75tP31z+7MnZ3760GrZf7fmXuvaPfzMvA7v3PO9/e7555z5pwLISEhISEhISH/U6SXyjo4aFaM+atUndUISwEUSmjkW5XouYH86I9eiJxJDC8Tra4EHhBxrGtW+UWQr43K1bMyMWF323ZXCSglko8JJFF5EljYwvUMytFqVcfmTeQuuuljejC5NBqVzQgx4MEWrpdAjjtIbqAwdsJNH+AyAXYi9TDKGwobXPYzI8J7hil7JZP5s5WjptN3VGzdrcpzwICbTgQ9gbLTLOa+6rxOh9iJ1FZV3gEMN6Jqevspok7SKIx/2qi4Ek+udZDDwD1d9wGziO6y8rl9nUlqg4LY8dQosLkHUXOpCmwxC9mxuUY7ln5WRQ8AUS86UWXUKma3CGgrv0i7hirx1Ot4FzxAVGG0lEhu+8dQiqdfUNGDeBQ8gAjDdiL1Wlu/VoXleHITyLhXompwVHkKQITjdPAwukOHrELucLPSpgnQeHxxGfOcwGJ/hAFw5frvAr86UJiysFdJofBro/KmWS+rudfn4OFa4L4FDyCwpCLmSIvyenRw6+12X/kiMN8vYQFzxZy17pKJA3/VFjQcAWWjNMStEzzAgnK0vKlRQcMEiMoT/uoJHhEeb2SvS4Beey3W+q4oeNbryEhdvHWGUiy9DFgUiKRgWVQ6//Pdtca6BESVJcHoCZ4os3WrWl0CnGj1Vnz6ADg47RNANdJy73xzI9VaS/2kEOW3YMQET6Qa/b3OVmsw+qPnAScQRcHiGH32hVpjXQLk0KHLwDeBSAqWs3LkyKVaY+ONEPKx/3oCRmgYU+M/Q1ot+CrmBiCO5hvZGybALI5PIpzyV1KAKF82OydsfgihvOKboKARaRpL0wSY9684fouMgknz/uUfNStseSRmx4YeUYmcxLfjKt9xJCLrzSOZL5o5tAzMLI5PqvK+97qCQZR3WwUPHTxZq192AKc9UxUcZ43q9EvtnNomQDKZEugQMOOJrCAQpnGcjTIx0VZzR++2VcidBoa4ObbICjJsHR0/04lzx5ObVcgeQ9nTva6AEN1l5TPFjt3dtm/H028qusNtvSAQYb+Zz25r7/kfrpc3o5DZqegHbuv5j2SN+1Zsd1vLdQIE1JqdeR4Ya+scHGPm7NVhGRlxPUd1/YWIgtiJ9B5Ub+i8IMLbRj77Yrtb4Kb1exVQiqW2i/AWwe8WFXjZKmTb3gC3oucEANiJVFKVg/Ty8YQ7KqIybBYzPd9ce5IAgMozqfWOw4fAnV612QiFKRXdOJDPfeJFe54lAK5/2NQXOQa6xst2/0U45dD3tFdfn4HH7+28idxF02IDvqwQesj8Y+E6L4MHj0fAXK7PC/vp/f7/sgg7zXz2gBe6avEtAQAzsfTyiGie7i9bJ1Uk0Z/PfOelrrn4unQNFDM/mLPTG1DZB9TdyrSgCrxq3mat8zN48HkEzMWODa1RiYwBK9u4fh9R2WwUM58HoSuwzYtZHD9pWvIQIrsVpmrLFaYQ2W1asjqo4CHAETAXHRwcKBv9j+JE7gUg4lywKqXPOjnACAkJCQkJCQkJ8Yi/AfA6e2lfA0oPAAAAAElFTkSuQmCC" + ); + } + + hook_preprocessTheme({ id, theme }) { + theme.map.background = "#eee"; + theme.items.outline = "#000"; + } +} diff --git a/src/js/mods/mod.js b/src/js/mods/mod.js new file mode 100644 index 00000000..7a0b3a7f --- /dev/null +++ b/src/js/mods/mod.js @@ -0,0 +1,50 @@ +/* typehints:start */ +import { ModInterface } from "./mod_interface"; +/* typehints:end */ + +export class Mod { + /** + * + * @param {object} metadata + * @param {string} metadata.name + * @param {string} metadata.version + * @param {string} metadata.authorName + * @param {string} metadata.authorContact + * @param {string} metadata.id + */ + constructor(metadata) { + this.metadata = metadata; + + /** + * @type {ModInterface} + */ + this.interface = undefined; + } + + hook_init() {} + + executeGuarded(taskName, task) { + try { + return task(); + } catch (ex) { + console.error(ex); + alert( + "Mod " + + this.metadata.name + + " (version " + + this.metadata.version + + ")" + + " failed to execute '" + + taskName + + "':\n\n" + + ex + + "\n\nPlease forward this to the mod author:\n\n" + + this.metadata.authorName + + " (" + + this.metadata.authorContact + + ")" + ); + throw ex; + } + } +} diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js new file mode 100644 index 00000000..47bff484 --- /dev/null +++ b/src/js/mods/mod_interface.js @@ -0,0 +1,77 @@ +/* typehints:start */ +import { Application } from "../application"; +import { ModLoader } from "./modloader"; +/* typehints:end */ + +import { createLogger } from "../core/logging"; +import { AtlasSprite, SpriteAtlasLink } from "../core/sprites"; +import { Mod } from "./mod"; + +const LOG = createLogger("mod-interface"); + +export class ModInterface { + /** + * + * @param {ModLoader} modLoader + * @param {Mod} mod + */ + constructor(modLoader, mod) { + /** + * @param {Application} app + */ + this.app = undefined; + + this.modLoader = modLoader; + this.mod = mod; + } + + registerCss(cssString) { + const element = document.createElement("style"); + element.textContent = cssString; + element.setAttribute("data-mod-id", this.mod.metadata.id); + element.setAttribute("data-mod-name", this.mod.metadata.name); + document.head.appendChild(element); + } + + registerSprite(spriteId, base64string) { + assert(base64string.startsWith("data:image")); + const img = new Image(); + img.src = base64string; + + const sprite = new AtlasSprite(spriteId); + + const link = new SpriteAtlasLink({ + w: img.width, + h: img.height, + atlas: img, + packOffsetX: 0, + packOffsetY: 0, + packedW: img.width, + packedH: img.height, + packedX: 0, + packedY: 0, + }); + + sprite.linksByResolution["0.25"] = link; + sprite.linksByResolution["0.5"] = link; + sprite.linksByResolution["0.75"] = link; + + // @ts-ignore + sprite.modSource = this.mod; + + const oldSprite = this.modLoader.lazySprites.get(spriteId); + if (oldSprite) { + LOG.error( + "Sprite '" + + spriteId + + "' is provided twice, once by mod '" + + // @ts-ignore + oldSprite.modSource.metadata.name + + "' and once by mod '" + + this.mod.metadata.name + + "'. This could cause artifacts." + ); + } + this.modLoader.lazySprites.set(spriteId, sprite); + } +} diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js new file mode 100644 index 00000000..2b6cbbaf --- /dev/null +++ b/src/js/mods/modloader.js @@ -0,0 +1,77 @@ +import { Loader } from "../core/loader"; +import { createLogger } from "../core/logging"; +import { AtlasSprite } from "../core/sprites"; +import { DemoMod } from "./demo_mod"; +import { Mod } from "./mod"; +import { ModInterface } from "./mod_interface"; + +const LOG = createLogger("mods"); + +export class ModLoader { + constructor() { + LOG.log("modloader created"); + + /** @type {Mod[]} */ + this.mods = []; + + /** @type {Map} */ + this.lazySprites = new Map(); + + this.initialized = false; + } + + linkApp(app) { + this.app = app; + this.mods.forEach(mod => (mod.interface.app = app)); + } + + hook_init() { + LOG.log("hook:init"); + this.initialized = true; + this.mods.forEach(mod => { + LOG.log("Loading mod", mod.metadata.name); + mod.interface = new ModInterface(this, mod); + mod.executeGuarded("hook_init", mod.hook_init.bind(mod)); + }); + } + + hook_injectSprites() { + LOG.log("hook:injectSprites"); + this.lazySprites.forEach((sprite, key) => { + Loader.sprites.set(key, sprite); + console.log("override", key); + }); + } + + callHook(id, structuredArgs) { + LOG.log("hook:" + id); + this.mods.forEach(mod => { + const handler = mod["hook_" + id]; + if (handler) { + mod.executeGuarded("hook:" + id, handler.bind(mod, structuredArgs)); + } + }); + } + + registerSprite() {} + + registerGameState() {} + + registerBuilding() {} + + /** + * + * @param {Mod} mod + */ + registerMod(mod) { + LOG.log("Registering mod", mod.metadata.name); + if (this.initialized) { + throw new Error("Mods are already initialized, can not add mod afterwards."); + } + this.mods.push(mod); + } +} + +export const MODS = new ModLoader(); + +MODS.registerMod(new DemoMod()); From 3e5716504ad86229add6bcba11ec137344a9bf6e Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 13 Jan 2022 21:45:09 +0100 Subject: [PATCH 002/129] modloader features --- src/js/game/map_chunk.js | 5 +++++ src/js/game/modes/regular.js | 3 +++ src/js/game/shape_definition.js | 34 ++++++++++++++-------------- src/js/mods/demo_mod.js | 36 +++++++++++++++++++++++++++--- src/js/mods/mod_interface.js | 39 +++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 19 deletions(-) diff --git a/src/js/game/map_chunk.js b/src/js/game/map_chunk.js index 54af1125..0c5390e4 100644 --- a/src/js/game/map_chunk.js +++ b/src/js/game/map_chunk.js @@ -10,6 +10,7 @@ import { COLOR_ITEM_SINGLETONS } from "./items/color_item"; import { GameRoot } from "./root"; import { enumSubShape } from "./shape_definition"; import { Rectangle } from "../core/rectangle"; +import { MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS } from "../mods/mod_interface"; const logger = createLogger("map_chunk"); @@ -192,6 +193,10 @@ export class MapChunk { [enumSubShape.windmill]: Math.round(6 + clamp(distanceToOriginInChunks / 2, 0, 20)), }; + for (const key in MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS) { + weights[key] = MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS[key](distanceToOriginInChunks); + } + if (distanceToOriginInChunks < 7) { // Initial chunks can not spawn the good stuff weights[enumSubShape.star] = 0; diff --git a/src/js/game/modes/regular.js b/src/js/game/modes/regular.js index 429c1515..c8d6c9e5 100644 --- a/src/js/game/modes/regular.js +++ b/src/js/game/modes/regular.js @@ -38,6 +38,7 @@ import { HUDSandboxController } from "../hud/parts/sandbox_controller"; import { queryParamOptions } from "../../core/query_parameters"; import { MetaBlockBuilding } from "../buildings/block"; import { MetaItemProducerBuilding } from "../buildings/item_producer"; +import { MODS } from "../../mods/modloader"; /** @typedef {{ * shape: string, @@ -521,6 +522,8 @@ export function generateLevelDefinitions(limitedVersion = false) { }); } + MODS.callHook("modifyLevelDefinitions", levelDefinitions); + return levelDefinitions; } diff --git a/src/js/game/shape_definition.js b/src/js/game/shape_definition.js index b09d73c5..acc0bd1c 100644 --- a/src/js/game/shape_definition.js +++ b/src/js/game/shape_definition.js @@ -3,6 +3,7 @@ import { globalConfig } from "../core/config"; import { smoothenDpi } from "../core/dpi_manager"; import { DrawParameters } from "../core/draw_parameters"; import { Vector } from "../core/vector"; +import { MODS_ADDITIONAL_SUB_SHAPE_DRAWERS } from "../mods/mod_interface"; import { BasicSerializableObject, types } from "../savegame/serialization"; import { enumColors, enumColorsToHexCode, enumColorToShortcode, enumShortcodeToColor } from "./colors"; import { THEME } from "./theme"; @@ -366,18 +367,11 @@ export class ShapeDefinition extends BasicSerializableObject { context.strokeStyle = THEME.items.outline; context.lineWidth = THEME.items.outlineWidth; - const insetPadding = 0.0; - switch (subShape) { case enumSubShape.rect: { context.beginPath(); const dims = quadrantSize * layerScale; - context.rect( - insetPadding + -quadrantHalfSize, - -insetPadding + quadrantHalfSize - dims, - dims, - dims - ); + context.rect(-quadrantHalfSize, quadrantHalfSize - dims, dims, dims); break; } @@ -385,8 +379,8 @@ export class ShapeDefinition extends BasicSerializableObject { context.beginPath(); const dims = quadrantSize * layerScale; - let originX = insetPadding - quadrantHalfSize; - let originY = -insetPadding + quadrantHalfSize - dims; + let originX = -quadrantHalfSize; + let originY = quadrantHalfSize - dims; const moveInwards = dims * 0.4; context.moveTo(originX, originY + moveInwards); @@ -401,8 +395,8 @@ export class ShapeDefinition extends BasicSerializableObject { context.beginPath(); const dims = quadrantSize * layerScale; - let originX = insetPadding - quadrantHalfSize; - let originY = -insetPadding + quadrantHalfSize - dims; + let originX = -quadrantHalfSize; + let originY = quadrantHalfSize - dims; const moveInwards = dims * 0.4; context.moveTo(originX, originY + moveInwards); context.lineTo(originX + dims, originY); @@ -414,10 +408,10 @@ export class ShapeDefinition extends BasicSerializableObject { case enumSubShape.circle: { context.beginPath(); - context.moveTo(insetPadding + -quadrantHalfSize, -insetPadding + quadrantHalfSize); + context.moveTo(-quadrantHalfSize, quadrantHalfSize); context.arc( - insetPadding + -quadrantHalfSize, - -insetPadding + quadrantHalfSize, + -quadrantHalfSize, + quadrantHalfSize, quadrantSize * layerScale, -Math.PI * 0.5, 0 @@ -427,7 +421,15 @@ export class ShapeDefinition extends BasicSerializableObject { } default: { - assertAlways(false, "Unkown sub shape: " + subShape); + if (MODS_ADDITIONAL_SUB_SHAPE_DRAWERS[subShape]) { + MODS_ADDITIONAL_SUB_SHAPE_DRAWERS[subShape]({ + context, + layerScale, + quadrantSize, + }); + } else { + throw new Error("Unkown sub shape: " + subShape); + } } } diff --git a/src/js/mods/demo_mod.js b/src/js/mods/demo_mod.js index c5003da0..7dca4bad 100644 --- a/src/js/mods/demo_mod.js +++ b/src/js/mods/demo_mod.js @@ -12,20 +12,50 @@ export class DemoMod extends Mod { } hook_init() { + // Add some custom css this.interface.registerCss(` - * { - color: red !important; - } + * { + color: red !important; + } `); + // Replace a builtin sprite this.interface.registerSprite( "sprites/colors/red.png", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAB2AAAAdgB+lymcgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAATkSURBVHic7ZpfiFRVHMc/v5m99+6qWYhCYKFGVJpPFYgK4UNQb1GwODO5M2OLUmASItGD6OJDYX8IIqPMdWdmdWZkE6GnnozqJWkxENMyg/75tP31z+7MnZ3760GrZf7fmXuvaPfzMvA7v3PO9/e7555z5pwLISEhISEhISH/U6SXyjo4aFaM+atUndUISwEUSmjkW5XouYH86I9eiJxJDC8Tra4EHhBxrGtW+UWQr43K1bMyMWF323ZXCSglko8JJFF5EljYwvUMytFqVcfmTeQuuuljejC5NBqVzQgx4MEWrpdAjjtIbqAwdsJNH+AyAXYi9TDKGwobXPYzI8J7hil7JZP5s5WjptN3VGzdrcpzwICbTgQ9gbLTLOa+6rxOh9iJ1FZV3gEMN6Jqevspok7SKIx/2qi4Ek+udZDDwD1d9wGziO6y8rl9nUlqg4LY8dQosLkHUXOpCmwxC9mxuUY7ln5WRQ8AUS86UWXUKma3CGgrv0i7hirx1Ot4FzxAVGG0lEhu+8dQiqdfUNGDeBQ8gAjDdiL1Wlu/VoXleHITyLhXompwVHkKQITjdPAwukOHrELucLPSpgnQeHxxGfOcwGJ/hAFw5frvAr86UJiysFdJofBro/KmWS+rudfn4OFa4L4FDyCwpCLmSIvyenRw6+12X/kiMN8vYQFzxZy17pKJA3/VFjQcAWWjNMStEzzAgnK0vKlRQcMEiMoT/uoJHhEeb2SvS4Beey3W+q4oeNbryEhdvHWGUiy9DFgUiKRgWVQ6//Pdtca6BESVJcHoCZ4os3WrWl0CnGj1Vnz6ADg47RNANdJy73xzI9VaS/2kEOW3YMQET6Qa/b3OVmsw+qPnAScQRcHiGH32hVpjXQLk0KHLwDeBSAqWs3LkyKVaY+ONEPKx/3oCRmgYU+M/Q1ot+CrmBiCO5hvZGybALI5PIpzyV1KAKF82OydsfgihvOKboKARaRpL0wSY9684fouMgknz/uUfNStseSRmx4YeUYmcxLfjKt9xJCLrzSOZL5o5tAzMLI5PqvK+97qCQZR3WwUPHTxZq192AKc9UxUcZ43q9EvtnNomQDKZEugQMOOJrCAQpnGcjTIx0VZzR++2VcidBoa4ObbICjJsHR0/04lzx5ObVcgeQ9nTva6AEN1l5TPFjt3dtm/H028qusNtvSAQYb+Zz25r7/kfrpc3o5DZqegHbuv5j2SN+1Zsd1vLdQIE1JqdeR4Ya+scHGPm7NVhGRlxPUd1/YWIgtiJ9B5Ub+i8IMLbRj77Yrtb4Kb1exVQiqW2i/AWwe8WFXjZKmTb3gC3oucEANiJVFKVg/Ty8YQ7KqIybBYzPd9ce5IAgMozqfWOw4fAnV612QiFKRXdOJDPfeJFe54lAK5/2NQXOQa6xst2/0U45dD3tFdfn4HH7+28idxF02IDvqwQesj8Y+E6L4MHj0fAXK7PC/vp/f7/sgg7zXz2gBe6avEtAQAzsfTyiGie7i9bJ1Uk0Z/PfOelrrn4unQNFDM/mLPTG1DZB9TdyrSgCrxq3mat8zN48HkEzMWODa1RiYwBK9u4fh9R2WwUM58HoSuwzYtZHD9pWvIQIrsVpmrLFaYQ2W1asjqo4CHAETAXHRwcKBv9j+JE7gUg4lywKqXPOjnACAkJCQkJCQkJ8Yi/AfA6e2lfA0oPAAAAAElFTkSuQmCC" ); + + // Add a new type of sub shape ("Line", short code "L") + this.interface.registerSubShapeType({ + id: "line", + shortCode: "L", + weightComputation: distanceToOriginInChunks => + Math.round(20 + Math.max(Math.min(distanceToOriginInChunks, 30), 0)), + + shapeDrawer: ({ context, quadrantSize, layerScale }) => { + const quadrantHalfSize = quadrantSize / 2; + context.beginPath(); + context.moveTo(-quadrantHalfSize, quadrantHalfSize); + context.arc( + -quadrantHalfSize, + quadrantHalfSize, + quadrantSize * layerScale, + -Math.PI * 0.25, + 0 + ); + context.closePath(); + }, + }); } hook_preprocessTheme({ id, theme }) { + // Modify the theme colors theme.map.background = "#eee"; theme.items.outline = "#000"; } + + hook_modifyLevelDefinitions(definitions) { + // Modify the goal of the first level + definitions[0].shape = "LuCuLuCu"; + } } diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 47bff484..16de4d67 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -6,9 +6,28 @@ import { ModLoader } from "./modloader"; import { createLogger } from "../core/logging"; import { AtlasSprite, SpriteAtlasLink } from "../core/sprites"; import { Mod } from "./mod"; +import { enumShortcodeToSubShape, enumSubShape, enumSubShapeToShortcode } from "../game/shape_definition"; const LOG = createLogger("mod-interface"); +/** + * @type {Object number>} + */ +export const MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS = {}; + +/** + * @typedef {{ + * context: CanvasRenderingContext2D, + * quadrantSize: number, + * layerScale: number, + * }} SubShapeDrawOptions + */ + +/** + * @type {Object void>} + */ +export const MODS_ADDITIONAL_SUB_SHAPE_DRAWERS = {}; + export class ModInterface { /** * @@ -74,4 +93,24 @@ export class ModInterface { } this.modLoader.lazySprites.set(spriteId, sprite); } + + /** + * + * @param {object} param0 + * @param {string} param0.id + * @param {string} param0.shortCode + * @param {(distanceToOriginInChunks: number) => number} param0.weightComputation + * @param {(options: SubShapeDrawOptions) => void} param0.shapeDrawer + */ + registerSubShapeType({ id, shortCode, weightComputation, shapeDrawer }) { + if (shortCode.length !== 1) { + throw new Error("Bad short code: " + shortCode); + } + enumSubShape[id] = id; + enumSubShapeToShortcode[id] = shortCode; + enumShortcodeToSubShape[shortCode] = id; + + MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS[id] = weightComputation; + MODS_ADDITIONAL_SUB_SHAPE_DRAWERS[id] = shapeDrawer; + } } From 6bac7cec57f38ab97a2ace548ad9132b0d6f3bca Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 13 Jan 2022 22:14:49 +0100 Subject: [PATCH 003/129] Refactor mods to use signals --- src/js/core/background_resources_loader.js | 2 +- src/js/game/modes/regular.js | 4 +- src/js/game/theme.js | 2 +- src/js/main.js | 5 +- src/js/mods/demo_mod.js | 47 ++++++++-------- src/js/mods/mod.js | 39 +++----------- src/js/mods/mod_interface.js | 34 +++++------- src/js/mods/modloader.js | 63 +++++++++------------- 8 files changed, 74 insertions(+), 122 deletions(-) diff --git a/src/js/core/background_resources_loader.js b/src/js/core/background_resources_loader.js index e1a585b6..927071a9 100644 --- a/src/js/core/background_resources_loader.js +++ b/src/js/core/background_resources_loader.js @@ -233,7 +233,7 @@ export class BackgroundResourcesLoader { this.numAssetsToLoadTotal = 0; this.numAssetsLoaded = 0; }) - .then(MODS.hook_injectSprites.bind(MODS)) + .then(MODS.modInterface.injectSprites.bind(MODS)) ); } } diff --git a/src/js/game/modes/regular.js b/src/js/game/modes/regular.js index c8d6c9e5..0aad3669 100644 --- a/src/js/game/modes/regular.js +++ b/src/js/game/modes/regular.js @@ -512,6 +512,8 @@ export function generateLevelDefinitions(limitedVersion = false) { ]), ]; + MODS.signals.modifyLevelDefinitions.dispatch(levelDefinitions); + if (G_IS_DEV) { levelDefinitions.forEach(({ shape }) => { try { @@ -522,8 +524,6 @@ export function generateLevelDefinitions(limitedVersion = false) { }); } - MODS.callHook("modifyLevelDefinitions", levelDefinitions); - return levelDefinitions; } diff --git a/src/js/game/theme.js b/src/js/game/theme.js index 4f68997e..023710dd 100644 --- a/src/js/game/theme.js +++ b/src/js/game/theme.js @@ -9,5 +9,5 @@ export let THEME = THEMES.light; export function applyGameTheme(id) { THEME = THEMES[id]; - MODS.callHook("preprocessTheme", { id, theme: THEME }); + MODS.signals.preprocessTheme.dispatch({ id, theme: THEME }); } diff --git a/src/js/main.js b/src/js/main.js index 3046820c..71ec59a9 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -2,6 +2,8 @@ import "./core/polyfills"; import "./core/assert"; import "./core/error_handler"; +import "./mods/modloader"; + import { createLogger, logSection } from "./core/logging"; import { Application } from "./application"; import { IS_DEBUG } from "./core/config"; @@ -11,7 +13,6 @@ import { initItemRegistry } from "./game/item_registry"; import { initMetaBuildingRegistry } from "./game/meta_building_registry"; import { initGameModeRegistry } from "./game/game_mode_registry"; import { initGameSpeedRegistry } from "./game/game_speed_registry"; -import { MODS } from "./mods/modloader"; const logger = createLogger("main"); @@ -20,8 +21,6 @@ if (window.coreThreadLoadedCb) { window.coreThreadLoadedCb(); } -MODS.hook_init(); - // Logrocket // if (!G_IS_DEV && !G_IS_STANDALONE) { // const monthlyUsers = 300; // thousand diff --git a/src/js/mods/demo_mod.js b/src/js/mods/demo_mod.js index 7dca4bad..f3bcbaf8 100644 --- a/src/js/mods/demo_mod.js +++ b/src/js/mods/demo_mod.js @@ -1,32 +1,35 @@ import { Mod } from "./mod"; export class DemoMod extends Mod { - constructor() { - super({ - authorContact: "tobias@tobspr.io", - authorName: "tobspr", - name: "Demo Mod", - version: "1", - id: "demo-mod", - }); + constructor(modLoader) { + super( + { + authorContact: "tobias@tobspr.io", + authorName: "tobspr", + name: "Demo Mod", + version: "1", + id: "demo-mod", + }, + modLoader + ); } - hook_init() { + init() { // Add some custom css - this.interface.registerCss(` - * { - color: red !important; - } + this.modLoader.modInterface.registerCss(` + * { + color: red !important; + } `); // Replace a builtin sprite - this.interface.registerSprite( + this.modLoader.modInterface.registerSprite( "sprites/colors/red.png", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAB2AAAAdgB+lymcgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAATkSURBVHic7ZpfiFRVHMc/v5m99+6qWYhCYKFGVJpPFYgK4UNQb1GwODO5M2OLUmASItGD6OJDYX8IIqPMdWdmdWZkE6GnnozqJWkxENMyg/75tP31z+7MnZ3760GrZf7fmXuvaPfzMvA7v3PO9/e7555z5pwLISEhISEhISH/U6SXyjo4aFaM+atUndUISwEUSmjkW5XouYH86I9eiJxJDC8Tra4EHhBxrGtW+UWQr43K1bMyMWF323ZXCSglko8JJFF5EljYwvUMytFqVcfmTeQuuuljejC5NBqVzQgx4MEWrpdAjjtIbqAwdsJNH+AyAXYi9TDKGwobXPYzI8J7hil7JZP5s5WjptN3VGzdrcpzwICbTgQ9gbLTLOa+6rxOh9iJ1FZV3gEMN6Jqevspok7SKIx/2qi4Ek+udZDDwD1d9wGziO6y8rl9nUlqg4LY8dQosLkHUXOpCmwxC9mxuUY7ln5WRQ8AUS86UWXUKma3CGgrv0i7hirx1Ot4FzxAVGG0lEhu+8dQiqdfUNGDeBQ8gAjDdiL1Wlu/VoXleHITyLhXompwVHkKQITjdPAwukOHrELucLPSpgnQeHxxGfOcwGJ/hAFw5frvAr86UJiysFdJofBro/KmWS+rudfn4OFa4L4FDyCwpCLmSIvyenRw6+12X/kiMN8vYQFzxZy17pKJA3/VFjQcAWWjNMStEzzAgnK0vKlRQcMEiMoT/uoJHhEeb2SvS4Beey3W+q4oeNbryEhdvHWGUiy9DFgUiKRgWVQ6//Pdtca6BESVJcHoCZ4os3WrWl0CnGj1Vnz6ADg47RNANdJy73xzI9VaS/2kEOW3YMQET6Qa/b3OVmsw+qPnAScQRcHiGH32hVpjXQLk0KHLwDeBSAqWs3LkyKVaY+ONEPKx/3oCRmgYU+M/Q1ot+CrmBiCO5hvZGybALI5PIpzyV1KAKF82OydsfgihvOKboKARaRpL0wSY9684fouMgknz/uUfNStseSRmx4YeUYmcxLfjKt9xJCLrzSOZL5o5tAzMLI5PqvK+97qCQZR3WwUPHTxZq192AKc9UxUcZ43q9EvtnNomQDKZEugQMOOJrCAQpnGcjTIx0VZzR++2VcidBoa4ObbICjJsHR0/04lzx5ObVcgeQ9nTva6AEN1l5TPFjt3dtm/H028qusNtvSAQYb+Zz25r7/kfrpc3o5DZqegHbuv5j2SN+1Zsd1vLdQIE1JqdeR4Ya+scHGPm7NVhGRlxPUd1/YWIgtiJ9B5Ub+i8IMLbRj77Yrtb4Kb1exVQiqW2i/AWwe8WFXjZKmTb3gC3oucEANiJVFKVg/Ty8YQ7KqIybBYzPd9ce5IAgMozqfWOw4fAnV612QiFKRXdOJDPfeJFe54lAK5/2NQXOQa6xst2/0U45dD3tFdfn4HH7+28idxF02IDvqwQesj8Y+E6L4MHj0fAXK7PC/vp/f7/sgg7zXz2gBe6avEtAQAzsfTyiGie7i9bJ1Uk0Z/PfOelrrn4unQNFDM/mLPTG1DZB9TdyrSgCrxq3mat8zN48HkEzMWODa1RiYwBK9u4fh9R2WwUM58HoSuwzYtZHD9pWvIQIrsVpmrLFaYQ2W1asjqo4CHAETAXHRwcKBv9j+JE7gUg4lywKqXPOjnACAkJCQkJCQkJ8Yi/AfA6e2lfA0oPAAAAAElFTkSuQmCC" ); // Add a new type of sub shape ("Line", short code "L") - this.interface.registerSubShapeType({ + this.modLoader.modInterface.registerSubShapeType({ id: "line", shortCode: "L", weightComputation: distanceToOriginInChunks => @@ -46,16 +49,16 @@ export class DemoMod extends Mod { context.closePath(); }, }); - } - hook_preprocessTheme({ id, theme }) { // Modify the theme colors - theme.map.background = "#eee"; - theme.items.outline = "#000"; - } + this.modLoader.signals.preprocessTheme.add(({ theme }) => { + theme.map.background = "#eee"; + theme.items.outline = "#000"; + }); - hook_modifyLevelDefinitions(definitions) { // Modify the goal of the first level - definitions[0].shape = "LuCuLuCu"; + this.modLoader.signals.modifyLevelDefinitions.add(definitions => { + definitions[0].shape = "LuCuLuCu"; + }); } } diff --git a/src/js/mods/mod.js b/src/js/mods/mod.js index 7a0b3a7f..65cdd53a 100644 --- a/src/js/mods/mod.js +++ b/src/js/mods/mod.js @@ -1,5 +1,5 @@ /* typehints:start */ -import { ModInterface } from "./mod_interface"; +import { ModLoader } from "./modloader"; /* typehints:end */ export class Mod { @@ -11,40 +11,13 @@ export class Mod { * @param {string} metadata.authorName * @param {string} metadata.authorContact * @param {string} metadata.id + * + * @param {ModLoader} modLoader */ - constructor(metadata) { + constructor(metadata, modLoader) { this.metadata = metadata; - - /** - * @type {ModInterface} - */ - this.interface = undefined; + this.modLoader = modLoader; } - hook_init() {} - - executeGuarded(taskName, task) { - try { - return task(); - } catch (ex) { - console.error(ex); - alert( - "Mod " + - this.metadata.name + - " (version " + - this.metadata.version + - ")" + - " failed to execute '" + - taskName + - "':\n\n" + - ex + - "\n\nPlease forward this to the mod author:\n\n" + - this.metadata.authorName + - " (" + - this.metadata.authorContact + - ")" - ); - throw ex; - } - } + init() {} } diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 16de4d67..9ce15d01 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -7,6 +7,7 @@ import { createLogger } from "../core/logging"; import { AtlasSprite, SpriteAtlasLink } from "../core/sprites"; import { Mod } from "./mod"; import { enumShortcodeToSubShape, enumSubShape, enumSubShapeToShortcode } from "../game/shape_definition"; +import { Loader } from "../core/loader"; const LOG = createLogger("mod-interface"); @@ -32,23 +33,22 @@ export class ModInterface { /** * * @param {ModLoader} modLoader - * @param {Mod} mod */ - constructor(modLoader, mod) { + constructor(modLoader) { /** * @param {Application} app */ this.app = undefined; this.modLoader = modLoader; - this.mod = mod; + + /** @type {Map} */ + this.lazySprites = new Map(); } registerCss(cssString) { const element = document.createElement("style"); element.textContent = cssString; - element.setAttribute("data-mod-id", this.mod.metadata.id); - element.setAttribute("data-mod-name", this.mod.metadata.name); document.head.appendChild(element); } @@ -75,23 +75,15 @@ export class ModInterface { sprite.linksByResolution["0.5"] = link; sprite.linksByResolution["0.75"] = link; - // @ts-ignore - sprite.modSource = this.mod; + this.lazySprites.set(spriteId, sprite); + } - const oldSprite = this.modLoader.lazySprites.get(spriteId); - if (oldSprite) { - LOG.error( - "Sprite '" + - spriteId + - "' is provided twice, once by mod '" + - // @ts-ignore - oldSprite.modSource.metadata.name + - "' and once by mod '" + - this.mod.metadata.name + - "'. This could cause artifacts." - ); - } - this.modLoader.lazySprites.set(spriteId, sprite); + injectSprites() { + LOG.log("inject sprites"); + this.lazySprites.forEach((sprite, key) => { + Loader.sprites.set(key, sprite); + console.log("override", key); + }); } /** diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 2b6cbbaf..1a903ae2 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -1,6 +1,5 @@ -import { Loader } from "../core/loader"; import { createLogger } from "../core/logging"; -import { AtlasSprite } from "../core/sprites"; +import { Signal } from "../core/signal"; import { DemoMod } from "./demo_mod"; import { Mod } from "./mod"; import { ModInterface } from "./mod_interface"; @@ -14,64 +13,50 @@ export class ModLoader { /** @type {Mod[]} */ this.mods = []; - /** @type {Map} */ - this.lazySprites = new Map(); + this.modInterface = new ModInterface(this); + + /** @type {(new (ModLoader) => Mod)[]} */ + this.modLoadQueue = []; this.initialized = false; + + this.signals = { + postInit: new Signal(), + injectSprites: new Signal(), + preprocessTheme: /** @type {TypedSignal<[Object]>} */ (new Signal()), + modifyLevelDefinitions: /** @type {TypedSignal<[Array[Object]]>} */ (new Signal()), + }; + + this.registerMod(DemoMod); + this.initMods(); } linkApp(app) { this.app = app; - this.mods.forEach(mod => (mod.interface.app = app)); } - hook_init() { + initMods() { LOG.log("hook:init"); this.initialized = true; - this.mods.forEach(mod => { - LOG.log("Loading mod", mod.metadata.name); - mod.interface = new ModInterface(this, mod); - mod.executeGuarded("hook_init", mod.hook_init.bind(mod)); + this.modLoadQueue.forEach(modClass => { + const mod = new modClass(this); + mod.init(); + this.mods.push(mod); }); + this.modLoadQueue = []; + this.signals.postInit.dispatch(); } - hook_injectSprites() { - LOG.log("hook:injectSprites"); - this.lazySprites.forEach((sprite, key) => { - Loader.sprites.set(key, sprite); - console.log("override", key); - }); - } - - callHook(id, structuredArgs) { - LOG.log("hook:" + id); - this.mods.forEach(mod => { - const handler = mod["hook_" + id]; - if (handler) { - mod.executeGuarded("hook:" + id, handler.bind(mod, structuredArgs)); - } - }); - } - - registerSprite() {} - - registerGameState() {} - - registerBuilding() {} - /** * - * @param {Mod} mod + * @param {new (ModLoader) => Mod} mod */ registerMod(mod) { - LOG.log("Registering mod", mod.metadata.name); if (this.initialized) { throw new Error("Mods are already initialized, can not add mod afterwards."); } - this.mods.push(mod); + this.modLoadQueue.push(mod); } } export const MODS = new ModLoader(); - -MODS.registerMod(new DemoMod()); From ebb2f3a1c6c6542fdb70137ff36c11fad4d1a776 Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 13 Jan 2022 22:30:52 +0100 Subject: [PATCH 004/129] Add support for modifying and registering new transltions --- src/js/core/background_resources_loader.js | 2 +- src/js/core/globals.js | 2 +- src/js/mods/demo_mod.js | 11 ++++++++++ src/js/mods/mod_interface.js | 19 ++++++++++++----- src/js/translations.js | 24 ++++++++++++---------- 5 files changed, 40 insertions(+), 18 deletions(-) diff --git a/src/js/core/background_resources_loader.js b/src/js/core/background_resources_loader.js index 927071a9..10f8d6f0 100644 --- a/src/js/core/background_resources_loader.js +++ b/src/js/core/background_resources_loader.js @@ -233,7 +233,7 @@ export class BackgroundResourcesLoader { this.numAssetsToLoadTotal = 0; this.numAssetsLoaded = 0; }) - .then(MODS.modInterface.injectSprites.bind(MODS)) + .then(MODS.modInterface.injectSprites.bind(MODS.modInterface)) ); } } diff --git a/src/js/core/globals.js b/src/js/core/globals.js index fcb9a3e8..4e72dddf 100644 --- a/src/js/core/globals.js +++ b/src/js/core/globals.js @@ -16,5 +16,5 @@ export let GLOBAL_APP = null; export function setGlobalApp(app) { assert(!GLOBAL_APP, "Create application twice!"); GLOBAL_APP = app; - MODS.linkApp(app); + MODS.app = app; } diff --git a/src/js/mods/demo_mod.js b/src/js/mods/demo_mod.js index f3bcbaf8..5df293ce 100644 --- a/src/js/mods/demo_mod.js +++ b/src/js/mods/demo_mod.js @@ -60,5 +60,16 @@ export class DemoMod extends Mod { this.modLoader.signals.modifyLevelDefinitions.add(definitions => { definitions[0].shape = "LuCuLuCu"; }); + + this.modLoader.modInterface.registerTranslations("en", { + ingame: { + interactiveTutorial: { + title: "Hello", + hints: { + "1_1_extractor": "World!", + }, + }, + }, + }); } } diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 9ce15d01..6cfc86be 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -8,6 +8,8 @@ import { AtlasSprite, SpriteAtlasLink } from "../core/sprites"; import { Mod } from "./mod"; import { enumShortcodeToSubShape, enumSubShape, enumSubShapeToShortcode } from "../game/shape_definition"; import { Loader } from "../core/loader"; +import { LANGUAGES } from "../languages"; +import { matchDataRecursive, T } from "../translations"; const LOG = createLogger("mod-interface"); @@ -35,11 +37,6 @@ export class ModInterface { * @param {ModLoader} modLoader */ constructor(modLoader) { - /** - * @param {Application} app - */ - this.app = undefined; - this.modLoader = modLoader; /** @type {Map} */ @@ -105,4 +102,16 @@ export class ModInterface { MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS[id] = weightComputation; MODS_ADDITIONAL_SUB_SHAPE_DRAWERS[id] = shapeDrawer; } + + registerTranslations(language, translations) { + const data = LANGUAGES[language]; + if (!data) { + throw new Error("Unknown language: " + language); + } + + matchDataRecursive(data.data, translations, true); + if (language === "en") { + matchDataRecursive(T, translations, true); + } + } } diff --git a/src/js/translations.js b/src/js/translations.js index 6ad926bc..9d976a41 100644 --- a/src/js/translations.js +++ b/src/js/translations.js @@ -24,15 +24,6 @@ if (G_IS_DEV && globalConfig.debug.testTranslations) { mapTranslations(T); } -export function applyLanguage(languageCode) { - logger.log("Applying language:", languageCode); - const data = LANGUAGES[languageCode]; - if (!data) { - logger.error("Language not found:", languageCode); - return false; - } -} - // Language key is something like de-DE or en or en-US function mapLanguageCodeToId(languageKey) { const key = languageKey.toLowerCase(); @@ -97,17 +88,20 @@ export function autoDetectLanguageId() { return "en"; } -function matchDataRecursive(dest, src) { +export function matchDataRecursive(dest, src, addNewKeys = false) { if (typeof dest !== "object" || typeof src !== "object") { return; } + if (dest === null || src === null) { + return; + } for (const key in dest) { if (src[key]) { // console.log("copy", key); const data = dest[key]; if (typeof data === "object") { - matchDataRecursive(dest[key], src[key]); + matchDataRecursive(dest[key], src[key], addNewKeys); } else if (typeof data === "string" || typeof data === "number") { // console.log("match string", key); dest[key] = src[key]; @@ -116,6 +110,14 @@ function matchDataRecursive(dest, src) { } } } + + if (addNewKeys) { + for (const key in src) { + if (!dest[key]) { + dest[key] = JSON.parse(JSON.stringify(src[key])); + } + } + } } export function updateApplicationLanguage(id) { From 7e2501ea6ef74c66340d9a96c69c981ce631d9c1 Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 13 Jan 2022 23:16:24 +0100 Subject: [PATCH 005/129] Minor adjustments --- src/js/mods/demo_mod.js | 2 +- src/js/mods/mod_interface.js | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/js/mods/demo_mod.js b/src/js/mods/demo_mod.js index 5df293ce..be3a7c1b 100644 --- a/src/js/mods/demo_mod.js +++ b/src/js/mods/demo_mod.js @@ -35,7 +35,7 @@ export class DemoMod extends Mod { weightComputation: distanceToOriginInChunks => Math.round(20 + Math.max(Math.min(distanceToOriginInChunks, 30), 0)), - shapeDrawer: ({ context, quadrantSize, layerScale }) => { + draw: ({ context, quadrantSize, layerScale }) => { const quadrantHalfSize = quadrantSize / 2; context.beginPath(); context.moveTo(-quadrantHalfSize, quadrantHalfSize); diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 6cfc86be..eaf1d314 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -5,7 +5,6 @@ import { ModLoader } from "./modloader"; import { createLogger } from "../core/logging"; import { AtlasSprite, SpriteAtlasLink } from "../core/sprites"; -import { Mod } from "./mod"; import { enumShortcodeToSubShape, enumSubShape, enumSubShapeToShortcode } from "../game/shape_definition"; import { Loader } from "../core/loader"; import { LANGUAGES } from "../languages"; @@ -89,9 +88,9 @@ export class ModInterface { * @param {string} param0.id * @param {string} param0.shortCode * @param {(distanceToOriginInChunks: number) => number} param0.weightComputation - * @param {(options: SubShapeDrawOptions) => void} param0.shapeDrawer + * @param {(options: SubShapeDrawOptions) => void} param0.draw */ - registerSubShapeType({ id, shortCode, weightComputation, shapeDrawer }) { + registerSubShapeType({ id, shortCode, weightComputation, draw }) { if (shortCode.length !== 1) { throw new Error("Bad short code: " + shortCode); } @@ -100,7 +99,7 @@ export class ModInterface { enumShortcodeToSubShape[shortCode] = id; MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS[id] = weightComputation; - MODS_ADDITIONAL_SUB_SHAPE_DRAWERS[id] = shapeDrawer; + MODS_ADDITIONAL_SUB_SHAPE_DRAWERS[id] = draw; } registerTranslations(language, translations) { From 8777e4c6eab77e363218a9ebc57fcbb5ccc3a339 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 06:14:37 +0100 Subject: [PATCH 006/129] Support for string building ids for mods --- src/js/game/building_codes.js | 27 ++++++++---- src/js/game/components/static_map_entity.js | 4 +- src/js/savegame/serialization.js | 2 + src/js/savegame/serialization_data_types.js | 47 +++++++++++++++++++++ 4 files changed, 70 insertions(+), 10 deletions(-) diff --git a/src/js/game/building_codes.js b/src/js/game/building_codes.js index 78240c31..5e2b717b 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,13 +27,13 @@ export const gBuildingVariants = { /** * Mapping from 'metaBuildingId/variant/rotationVariant' to building code - * @type {Map} + * @type {Map} */ const variantsCache = new Map(); /** * Registers a new variant - * @param {number} code + * @param {number|string} code * @param {typeof MetaBuilding} meta * @param {string} variant * @param {number} rotationVariant @@ -54,9 +54,20 @@ export function registerBuildingVariant( }; } +/** + * Hashes the combination of buildng, variant and rotation variant + * @param {string} buildingId + * @param {string} variant + * @param {number} rotationVariant + * @returns + */ +function generateBuildingHash(buildingId, variant, rotationVariant) { + return buildingId + "/" + variant + "/" + rotationVariant; +} + /** * - * @param {number} code + * @param {string|number} code * @returns {BuildingVariantIdentifier} */ export function getBuildingDataFromCode(code) { @@ -70,8 +81,8 @@ export function getBuildingDataFromCode(code) { export function buildBuildingCodeCache() { for (const code in gBuildingVariants) { const data = gBuildingVariants[code]; - const hash = data.metaInstance.getId() + "/" + data.variant + "/" + data.rotationVariant; - variantsCache.set(hash, +code); + const hash = generateBuildingHash(data.metaInstance.getId(), data.variant, data.rotationVariant); + variantsCache.set(hash, isNaN(+code) ? code : +code); } } @@ -80,10 +91,10 @@ export function buildBuildingCodeCache() { * @param {MetaBuilding} metaBuilding * @param {string} variant * @param {number} rotationVariant - * @returns {number} + * @returns {number|string} */ export function getCodeFromBuildingData(metaBuilding, variant, rotationVariant) { - const hash = metaBuilding.getId() + "/" + variant + "/" + rotationVariant; + const hash = generateBuildingHash(metaBuilding.getId(), variant, rotationVariant); const result = variantsCache.get(hash); if (G_IS_DEV) { if (!result) { diff --git a/src/js/game/components/static_map_entity.js b/src/js/game/components/static_map_entity.js index c76a298e..a3d6a8ca 100644 --- a/src/js/game/components/static_map_entity.js +++ b/src/js/game/components/static_map_entity.js @@ -19,7 +19,7 @@ export class StaticMapEntityComponent extends Component { originalRotation: types.float, // See building_codes.js - code: types.uint, + code: types.uintOrString, }; } @@ -99,7 +99,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/savegame/serialization.js b/src/js/savegame/serialization.js index 78642ceb..9a0ce3a5 100644 --- a/src/js/savegame/serialization.js +++ b/src/js/savegame/serialization.js @@ -22,6 +22,7 @@ import { TypeString, TypeStructuredObject, TypeVector, + TypePositiveIntegerOrString, } from "./serialization_data_types"; const logger = createLogger("serialization"); @@ -38,6 +39,7 @@ export const types = { vector: new TypeVector(), tileVector: new TypeVector(), bool: new TypeBoolean(), + uintOrString: new TypePositiveIntegerOrString(), /** * @param {BaseDataType} wrapped diff --git a/src/js/savegame/serialization_data_types.js b/src/js/savegame/serialization_data_types.js index 9d3b689f..df352e78 100644 --- a/src/js/savegame/serialization_data_types.js +++ b/src/js/savegame/serialization_data_types.js @@ -213,6 +213,53 @@ export class TypePositiveInteger extends BaseDataType { } } +export class TypePositiveIntegerOrString extends BaseDataType { + serialize(value) { + if (Number.isInteger(value)) { + assert(value >= 0, "type integer got negative value: " + value); + } else if (typeof value === "string") { + // all good + } else { + assertAlways(false, "Type integer|string got non integer or string for serialize: " + value); + } + return value; + } + + /** + * @see BaseDataType.deserialize + * @param {any} value + * @param {GameRoot} root + * @param {object} targetObject + * @param {string|number} targetKey + * @returns {string|void} String error code or null on success + */ + deserialize(value, targetObject, targetKey, root) { + targetObject[targetKey] = value; + } + + getAsJsonSchemaUncached() { + return { + oneOf: [{ type: "integer", minimum: 0 }, { type: "string" }], + }; + } + + verifySerializedValue(value) { + if (Number.isInteger(value)) { + if (value < 0) { + return "Negative value for positive integer"; + } + } else if (typeof value === "string") { + // all good + } else { + return "Not a valid number or string: " + value; + } + } + + getCacheKey() { + return "uint_str"; + } +} + export class TypeBoolean extends BaseDataType { serialize(value) { assert(value === true || value === false, "Type bool got non bool for serialize: " + value); From 01b9bf561c5f782b411e60193e1ca071f1cb3b7c Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 07:05:46 +0100 Subject: [PATCH 007/129] Initial support for adding new buildings --- src/js/game/hud/hud.js | 3 + src/js/game/hud/parts/base_toolbar.js | 9 ++- src/js/game/hud/parts/building_placer.js | 15 +++-- src/js/game/meta_building_registry.js | 11 ++-- src/js/mods/demo_mod.js | 65 ++++++++++++++++++-- src/js/mods/mod_interface.js | 78 +++++++++++++++++++++++- src/js/mods/modloader.js | 4 ++ 7 files changed, 165 insertions(+), 20 deletions(-) diff --git a/src/js/game/hud/hud.js b/src/js/game/hud/hud.js index 3d22787c..cffc290d 100644 --- a/src/js/game/hud/hud.js +++ b/src/js/game/hud/hud.js @@ -1,6 +1,7 @@ import { globalConfig } from "../../core/config"; import { DrawParameters } from "../../core/draw_parameters"; import { Signal } from "../../core/signal"; +import { MODS } from "../../mods/modloader"; import { KEYMAPPINGS } from "../key_action_mapper"; import { MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; @@ -91,6 +92,7 @@ export class GameHUD { const frag = document.createDocumentFragment(); for (const key in this.parts) { + MODS.signals.hudElementInitialized.dispatch(this.parts[key]); this.parts[key].createElements(frag); } @@ -98,6 +100,7 @@ export class GameHUD { for (const key in this.parts) { this.parts[key].initialize(); + MODS.signals.hudElementFinalized.dispatch(this.parts[key]); } this.root.keyMapper.getBinding(KEYMAPPINGS.ingame.toggleHud).add(this.toggleUi, this); diff --git a/src/js/game/hud/parts/base_toolbar.js b/src/js/game/hud/parts/base_toolbar.js index 15faad66..bee88574 100644 --- a/src/js/game/hud/parts/base_toolbar.js +++ b/src/js/game/hud/parts/base_toolbar.js @@ -1,4 +1,5 @@ import { gMetaBuildingRegistry } from "../../../core/global_registries"; +import { globalWarn } from "../../../core/logging"; import { STOP_PROPAGATION } from "../../../core/signal"; import { makeDiv, safeModulo } from "../../../core/utils"; import { MetaBlockBuilding } from "../../buildings/block"; @@ -101,7 +102,12 @@ export class HUDBaseToolbar extends BaseHUDPart { rawBinding = KEYMAPPINGS.buildings[metaBuilding.getId()]; } - const binding = actionMapper.getBinding(rawBinding); + if (rawBinding) { + const binding = actionMapper.getBinding(rawBinding); + binding.add(() => this.selectBuildingForPlacement(metaBuilding)); + } else { + globalWarn("Building has no keybinding:", metaBuilding.getId()); + } const itemContainer = makeDiv( this.primaryBuildings.includes(allBuildings[i]) ? rowPrimary : rowSecondary, @@ -110,7 +116,6 @@ export class HUDBaseToolbar extends BaseHUDPart { ); itemContainer.setAttribute("data-icon", "building_icons/" + metaBuilding.getId() + ".png"); itemContainer.setAttribute("data-id", metaBuilding.getId()); - binding.add(() => this.selectBuildingForPlacement(metaBuilding)); const icon = makeDiv(itemContainer, null, ["icon"]); diff --git a/src/js/game/hud/parts/building_placer.js b/src/js/game/hud/parts/building_placer.js index 33e6ebc2..ee7bc804 100644 --- a/src/js/game/hud/parts/building_placer.js +++ b/src/js/game/hud/parts/building_placer.js @@ -126,12 +126,15 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { rawBinding = KEYMAPPINGS.buildings[metaBuilding.getId()]; } - const binding = this.root.keyMapper.getBinding(rawBinding); - - this.buildingInfoElements.hotkey.innerHTML = T.ingame.buildingPlacement.hotkeyLabel.replace( - "", - "" + binding.getKeyCodeString() + "" - ); + if (rawBinding) { + const binding = this.root.keyMapper.getBinding(rawBinding); + this.buildingInfoElements.hotkey.innerHTML = T.ingame.buildingPlacement.hotkeyLabel.replace( + "", + "" + binding.getKeyCodeString() + "" + ); + } else { + this.buildingInfoElements.hotkey.innerHTML = ""; + } this.buildingInfoElements.tutorialImage.setAttribute( "data-icon", diff --git a/src/js/game/meta_building_registry.js b/src/js/game/meta_building_registry.js index 0c93153d..193d60e5 100644 --- a/src/js/game/meta_building_registry.js +++ b/src/js/game/meta_building_registry.js @@ -205,18 +205,15 @@ export function initMetaBuildingRegistry() { const id = metaBuilding.getId(); if (!["hub"].includes(id)) { if (!KEYMAPPINGS.buildings[id]) { - assertAlways( - false, + console.error( "Building " + id + " has no keybinding assigned! Add it to key_action_mapper.js" ); } if (!T.buildings[id]) { - assertAlways(false, "Translation for building " + id + " missing!"); - } - - if (!T.buildings[id].default) { - assertAlways(false, "Translation for building " + id + " missing (default variant)!"); + console.error("Translation for building " + id + " missing!"); + } else if (!T.buildings[id].default) { + console.error("Translation for building " + id + " missing (default variant)!"); } } }); diff --git a/src/js/mods/demo_mod.js b/src/js/mods/demo_mod.js index be3a7c1b..42f48fa3 100644 --- a/src/js/mods/demo_mod.js +++ b/src/js/mods/demo_mod.js @@ -1,4 +1,25 @@ +/* typehints:start */ +import { Entity } from "../game/entity"; +/* typehints:end */ + import { Mod } from "./mod"; +import { MetaBuilding } from "../game/meta_building"; + +export class MetaDemoModBuilding extends MetaBuilding { + constructor() { + super("demoModBuilding"); + } + + getSilhouetteColor() { + return "red"; + } + + /** + * Creates the entity at the given location + * @param {Entity} entity + */ + setupEntityComponents(entity) {} +} export class DemoMod extends Mod { constructor(modLoader) { @@ -23,10 +44,7 @@ export class DemoMod extends Mod { `); // Replace a builtin sprite - this.modLoader.modInterface.registerSprite( - "sprites/colors/red.png", - "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAB2AAAAdgB+lymcgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAATkSURBVHic7ZpfiFRVHMc/v5m99+6qWYhCYKFGVJpPFYgK4UNQb1GwODO5M2OLUmASItGD6OJDYX8IIqPMdWdmdWZkE6GnnozqJWkxENMyg/75tP31z+7MnZ3760GrZf7fmXuvaPfzMvA7v3PO9/e7555z5pwLISEhISEhISH/U6SXyjo4aFaM+atUndUISwEUSmjkW5XouYH86I9eiJxJDC8Tra4EHhBxrGtW+UWQr43K1bMyMWF323ZXCSglko8JJFF5EljYwvUMytFqVcfmTeQuuuljejC5NBqVzQgx4MEWrpdAjjtIbqAwdsJNH+AyAXYi9TDKGwobXPYzI8J7hil7JZP5s5WjptN3VGzdrcpzwICbTgQ9gbLTLOa+6rxOh9iJ1FZV3gEMN6Jqevspok7SKIx/2qi4Ek+udZDDwD1d9wGziO6y8rl9nUlqg4LY8dQosLkHUXOpCmwxC9mxuUY7ln5WRQ8AUS86UWXUKma3CGgrv0i7hirx1Ot4FzxAVGG0lEhu+8dQiqdfUNGDeBQ8gAjDdiL1Wlu/VoXleHITyLhXompwVHkKQITjdPAwukOHrELucLPSpgnQeHxxGfOcwGJ/hAFw5frvAr86UJiysFdJofBro/KmWS+rudfn4OFa4L4FDyCwpCLmSIvyenRw6+12X/kiMN8vYQFzxZy17pKJA3/VFjQcAWWjNMStEzzAgnK0vKlRQcMEiMoT/uoJHhEeb2SvS4Beey3W+q4oeNbryEhdvHWGUiy9DFgUiKRgWVQ6//Pdtca6BESVJcHoCZ4os3WrWl0CnGj1Vnz6ADg47RNANdJy73xzI9VaS/2kEOW3YMQET6Qa/b3OVmsw+qPnAScQRcHiGH32hVpjXQLk0KHLwDeBSAqWs3LkyKVaY+ONEPKx/3oCRmgYU+M/Q1ot+CrmBiCO5hvZGybALI5PIpzyV1KAKF82OydsfgihvOKboKARaRpL0wSY9684fouMgknz/uUfNStseSRmx4YeUYmcxLfjKt9xJCLrzSOZL5o5tAzMLI5PqvK+97qCQZR3WwUPHTxZq192AKc9UxUcZ43q9EvtnNomQDKZEugQMOOJrCAQpnGcjTIx0VZzR++2VcidBoa4ObbICjJsHR0/04lzx5ObVcgeQ9nTva6AEN1l5TPFjt3dtm/H028qusNtvSAQYb+Zz25r7/kfrpc3o5DZqegHbuv5j2SN+1Zsd1vLdQIE1JqdeR4Ya+scHGPm7NVhGRlxPUd1/YWIgtiJ9B5Ub+i8IMLbRj77Yrtb4Kb1exVQiqW2i/AWwe8WFXjZKmTb3gC3oucEANiJVFKVg/Ty8YQ7KqIybBYzPd9ce5IAgMozqfWOw4fAnV612QiFKRXdOJDPfeJFe54lAK5/2NQXOQa6xst2/0U45dD3tFdfn4HH7+28idxF02IDvqwQesj8Y+E6L4MHj0fAXK7PC/vp/f7/sgg7zXz2gBe6avEtAQAzsfTyiGie7i9bJ1Uk0Z/PfOelrrn4unQNFDM/mLPTG1DZB9TdyrSgCrxq3mat8zN48HkEzMWODa1RiYwBK9u4fh9R2WwUM58HoSuwzYtZHD9pWvIQIrsVpmrLFaYQ2W1asjqo4CHAETAXHRwcKBv9j+JE7gUg4lywKqXPOjnACAkJCQkJCQkJ8Yi/AfA6e2lfA0oPAAAAAElFTkSuQmCC" - ); + this.modLoader.modInterface.registerSprite("sprites/colors/red.png", RESOURCES["red.png"]); // Add a new type of sub shape ("Line", short code "L") this.modLoader.modInterface.registerSubShapeType({ @@ -71,5 +89,44 @@ export class DemoMod extends Mod { }, }, }); + + // Register the new building + this.modLoader.modInterface.registerNewBuilding({ + metaClass: MetaDemoModBuilding, + buildingIconBase64: RESOURCES["demoBuilding.png"], + + variantsAndRotations: [ + { + description: "A test building", + name: "A test name", + + regularImageBase64: RESOURCES["demoBuilding.png"], + blueprintImageBase64: RESOURCES["demoBuildingBlueprint.png"], + tutorialImageBase64: RESOURCES["demoBuildingBlueprint.png"], + }, + ], + }); + + // Add it to the regular toolbar + this.modLoader.signals.hudElementInitialized.add(element => { + if (element.constructor.name === "HUDBuildingsToolbar") { + // @ts-ignore + element.primaryBuildings.push(MetaDemoModBuilding); + } + }); } } + +//////////////////////////////////////////////////////////////////////// +// @notice: Later this part will be autogenerated + +const RESOURCES = { + "red.png": + "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAB2AAAAdgB+lymcgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAATkSURBVHic7ZpfiFRVHMc/v5m99+6qWYhCYKFGVJpPFYgK4UNQb1GwODO5M2OLUmASItGD6OJDYX8IIqPMdWdmdWZkE6GnnozqJWkxENMyg/75tP31z+7MnZ3760GrZf7fmXuvaPfzMvA7v3PO9/e7555z5pwLISEhISEhISH/U6SXyjo4aFaM+atUndUISwEUSmjkW5XouYH86I9eiJxJDC8Tra4EHhBxrGtW+UWQr43K1bMyMWF323ZXCSglko8JJFF5EljYwvUMytFqVcfmTeQuuuljejC5NBqVzQgx4MEWrpdAjjtIbqAwdsJNH+AyAXYi9TDKGwobXPYzI8J7hil7JZP5s5WjptN3VGzdrcpzwICbTgQ9gbLTLOa+6rxOh9iJ1FZV3gEMN6Jqevspok7SKIx/2qi4Ek+udZDDwD1d9wGziO6y8rl9nUlqg4LY8dQosLkHUXOpCmwxC9mxuUY7ln5WRQ8AUS86UWXUKma3CGgrv0i7hirx1Ot4FzxAVGG0lEhu+8dQiqdfUNGDeBQ8gAjDdiL1Wlu/VoXleHITyLhXompwVHkKQITjdPAwukOHrELucLPSpgnQeHxxGfOcwGJ/hAFw5frvAr86UJiysFdJofBro/KmWS+rudfn4OFa4L4FDyCwpCLmSIvyenRw6+12X/kiMN8vYQFzxZy17pKJA3/VFjQcAWWjNMStEzzAgnK0vKlRQcMEiMoT/uoJHhEeb2SvS4Beey3W+q4oeNbryEhdvHWGUiy9DFgUiKRgWVQ6//Pdtca6BESVJcHoCZ4os3WrWl0CnGj1Vnz6ADg47RNANdJy73xzI9VaS/2kEOW3YMQET6Qa/b3OVmsw+qPnAScQRcHiGH32hVpjXQLk0KHLwDeBSAqWs3LkyKVaY+ONEPKx/3oCRmgYU+M/Q1ot+CrmBiCO5hvZGybALI5PIpzyV1KAKF82OydsfgihvOKboKARaRpL0wSY9684fouMgknz/uUfNStseSRmx4YeUYmcxLfjKt9xJCLrzSOZL5o5tAzMLI5PqvK+97qCQZR3WwUPHTxZq192AKc9UxUcZ43q9EvtnNomQDKZEugQMOOJrCAQpnGcjTIx0VZzR++2VcidBoa4ObbICjJsHR0/04lzx5ObVcgeQ9nTva6AEN1l5TPFjt3dtm/H028qusNtvSAQYb+Zz25r7/kfrpc3o5DZqegHbuv5j2SN+1Zsd1vLdQIE1JqdeR4Ya+scHGPm7NVhGRlxPUd1/YWIgtiJ9B5Ub+i8IMLbRj77Yrtb4Kb1exVQiqW2i/AWwe8WFXjZKmTb3gC3oucEANiJVFKVg/Ty8YQ7KqIybBYzPd9ce5IAgMozqfWOw4fAnV612QiFKRXdOJDPfeJFe54lAK5/2NQXOQa6xst2/0U45dD3tFdfn4HH7+28idxF02IDvqwQesj8Y+E6L4MHj0fAXK7PC/vp/f7/sgg7zXz2gBe6avEtAQAzsfTyiGie7i9bJ1Uk0Z/PfOelrrn4unQNFDM/mLPTG1DZB9TdyrSgCrxq3mat8zN48HkEzMWODa1RiYwBK9u4fh9R2WwUM58HoSuwzYtZHD9pWvIQIrsVpmrLFaYQ2W1asjqo4CHAETAXHRwcKBv9j+JE7gUg4lywKqXPOjnACAkJCQkJCQkJ8Yi/AfA6e2lfA0oPAAAAAElFTkSuQmCC", + + "demoBuilding.png": + "data:image/png;base64,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", + + "demoBuildingBlueprint.png": + "data:image/png;base64,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", +}; diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index eaf1d314..fae5f2ba 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -1,14 +1,17 @@ /* typehints:start */ -import { Application } from "../application"; import { ModLoader } from "./modloader"; +import { MetaBuilding } from "../game/meta_building"; /* typehints:end */ +import { defaultBuildingVariant } from "../game/meta_building"; import { createLogger } from "../core/logging"; import { AtlasSprite, SpriteAtlasLink } from "../core/sprites"; import { enumShortcodeToSubShape, enumSubShape, enumSubShapeToShortcode } from "../game/shape_definition"; import { Loader } from "../core/loader"; import { LANGUAGES } from "../languages"; import { matchDataRecursive, T } from "../translations"; +import { registerBuildingVariant } from "../game/building_codes"; +import { gMetaBuildingRegistry } from "../core/global_registries"; const LOG = createLogger("mod-interface"); @@ -113,4 +116,77 @@ export class ModInterface { matchDataRecursive(T, translations, true); } } + + /** + * + * @param {object} param0 + * @param {typeof MetaBuilding} param0.metaClass + * @param {string=} param0.buildingIconBase64 + * @param {({ + * variant?: string; + * rotationVariant?: number; + * name: string; + * description: string; + * blueprintImageBase64?: string; + * regularImageBase64?: string; + * tutorialImageBase64?: string; + * }[])} param0.variantsAndRotations + */ + registerNewBuilding({ metaClass, variantsAndRotations, buildingIconBase64 }) { + const id = new /** @type {new () => MetaBuilding} */ (metaClass)().getId(); + if (gMetaBuildingRegistry.hasId(id)) { + throw new Error("Tried to register building twice: " + id); + } + gMetaBuildingRegistry.register(metaClass); + + T.buildings[id] = {}; + variantsAndRotations.forEach(payload => { + const actualVariant = payload.variant || defaultBuildingVariant; + registerBuildingVariant(id, metaClass, actualVariant, payload.rotationVariant || 0); + T.buildings[id][actualVariant] = { + name: payload.name, + description: payload.description, + }; + + const buildingIdentifier = + id + (actualVariant === defaultBuildingVariant ? "" : "-" + actualVariant); + if (payload.regularImageBase64) { + this.registerSprite( + "sprites/buildings/" + buildingIdentifier + ".png", + payload.regularImageBase64 + ); + } + if (payload.blueprintImageBase64) { + this.registerSprite( + "sprites/blueprints/" + buildingIdentifier + ".png", + payload.blueprintImageBase64 + ); + } + if (payload.tutorialImageBase64) { + this.setBuildingTutorialImage(id, actualVariant, payload.tutorialImageBase64); + } + }); + + if (buildingIconBase64) { + this.setBuildingToolbarIcon(id, buildingIconBase64); + } + } + + setBuildingToolbarIcon(buildingId, iconBase64) { + this.registerCss(` + [data-icon="building_icons/${buildingId}.png"] .icon { + background-image: url('${iconBase64}') !important; + } + `); + } + + setBuildingTutorialImage(buildingId, variant, imageBase64) { + const buildingIdentifier = buildingId + (variant === defaultBuildingVariant ? "" : "-" + variant); + + this.registerCss(` + [data-icon="building_tutorials/${buildingIdentifier}.png"] { + background-image: url('${imageBase64}') !important; + } + `); + } } diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 1a903ae2..75115dd7 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -3,6 +3,7 @@ import { Signal } from "../core/signal"; import { DemoMod } from "./demo_mod"; import { Mod } from "./mod"; import { ModInterface } from "./mod_interface"; +import { BaseHUDPart } from "../game/hud/base_hud_part"; const LOG = createLogger("mods"); @@ -25,6 +26,9 @@ export class ModLoader { injectSprites: new Signal(), preprocessTheme: /** @type {TypedSignal<[Object]>} */ (new Signal()), modifyLevelDefinitions: /** @type {TypedSignal<[Array[Object]]>} */ (new Signal()), + + hudElementInitialized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), + hudElementFinalized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), }; this.registerMod(DemoMod); From 16ecbf9c6d45a0b1d7466f4ac8d67e805bbcc449 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 07:18:25 +0100 Subject: [PATCH 008/129] Refactor how mods are loaded to resolve circular dependencies and prepare for future mod loading --- src/js/game/hud/hud.js | 6 +- src/js/game/map_chunk.js | 6 +- src/js/game/modes/regular.js | 4 +- src/js/game/shape_definition.js | 14 ++- src/js/game/theme.js | 4 +- src/js/mods/demo_mod.js | 193 ++++++++++++++++---------------- src/js/mods/mod.js | 5 + src/js/mods/mod_interface.js | 28 ++--- src/js/mods/mod_signals.js | 16 +++ src/js/mods/modloader.js | 22 ++-- 10 files changed, 159 insertions(+), 139 deletions(-) create mode 100644 src/js/mods/mod_signals.js diff --git a/src/js/game/hud/hud.js b/src/js/game/hud/hud.js index cffc290d..9fe1ba2f 100644 --- a/src/js/game/hud/hud.js +++ b/src/js/game/hud/hud.js @@ -1,7 +1,7 @@ import { globalConfig } from "../../core/config"; import { DrawParameters } from "../../core/draw_parameters"; import { Signal } from "../../core/signal"; -import { MODS } from "../../mods/modloader"; +import { MOD_SIGNALS } from "../../mods/mod_signals"; import { KEYMAPPINGS } from "../key_action_mapper"; import { MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; @@ -92,7 +92,7 @@ export class GameHUD { const frag = document.createDocumentFragment(); for (const key in this.parts) { - MODS.signals.hudElementInitialized.dispatch(this.parts[key]); + MOD_SIGNALS.hudElementInitialized.dispatch(this.parts[key]); this.parts[key].createElements(frag); } @@ -100,7 +100,7 @@ export class GameHUD { for (const key in this.parts) { this.parts[key].initialize(); - MODS.signals.hudElementFinalized.dispatch(this.parts[key]); + MOD_SIGNALS.hudElementFinalized.dispatch(this.parts[key]); } this.root.keyMapper.getBinding(KEYMAPPINGS.ingame.toggleHud).add(this.toggleUi, this); diff --git a/src/js/game/map_chunk.js b/src/js/game/map_chunk.js index 0c5390e4..ca2db36f 100644 --- a/src/js/game/map_chunk.js +++ b/src/js/game/map_chunk.js @@ -10,10 +10,14 @@ import { COLOR_ITEM_SINGLETONS } from "./items/color_item"; import { GameRoot } from "./root"; import { enumSubShape } from "./shape_definition"; import { Rectangle } from "../core/rectangle"; -import { MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS } from "../mods/mod_interface"; const logger = createLogger("map_chunk"); +/** + * @type {Object number>} + */ +export const MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS = {}; + export class MapChunk { /** * diff --git a/src/js/game/modes/regular.js b/src/js/game/modes/regular.js index 0aad3669..699874b5 100644 --- a/src/js/game/modes/regular.js +++ b/src/js/game/modes/regular.js @@ -38,7 +38,7 @@ import { HUDSandboxController } from "../hud/parts/sandbox_controller"; import { queryParamOptions } from "../../core/query_parameters"; import { MetaBlockBuilding } from "../buildings/block"; import { MetaItemProducerBuilding } from "../buildings/item_producer"; -import { MODS } from "../../mods/modloader"; +import { MOD_SIGNALS } from "../../mods/mod_signals"; /** @typedef {{ * shape: string, @@ -512,7 +512,7 @@ export function generateLevelDefinitions(limitedVersion = false) { ]), ]; - MODS.signals.modifyLevelDefinitions.dispatch(levelDefinitions); + MOD_SIGNALS.modifyLevelDefinitions.dispatch(levelDefinitions); if (G_IS_DEV) { levelDefinitions.forEach(({ shape }) => { diff --git a/src/js/game/shape_definition.js b/src/js/game/shape_definition.js index acc0bd1c..9cf2d094 100644 --- a/src/js/game/shape_definition.js +++ b/src/js/game/shape_definition.js @@ -3,11 +3,23 @@ import { globalConfig } from "../core/config"; import { smoothenDpi } from "../core/dpi_manager"; import { DrawParameters } from "../core/draw_parameters"; import { Vector } from "../core/vector"; -import { MODS_ADDITIONAL_SUB_SHAPE_DRAWERS } from "../mods/mod_interface"; import { BasicSerializableObject, types } from "../savegame/serialization"; import { enumColors, enumColorsToHexCode, enumColorToShortcode, enumShortcodeToColor } from "./colors"; import { THEME } from "./theme"; +/** + * @typedef {{ + * context: CanvasRenderingContext2D, + * quadrantSize: number, + * layerScale: number, + * }} SubShapeDrawOptions + */ + +/** + * @type {Object void>} + */ +export const MODS_ADDITIONAL_SUB_SHAPE_DRAWERS = {}; + /** * @typedef {{ * subShape: enumSubShape, diff --git a/src/js/game/theme.js b/src/js/game/theme.js index 023710dd..5e371740 100644 --- a/src/js/game/theme.js +++ b/src/js/game/theme.js @@ -1,4 +1,4 @@ -import { MODS } from "../mods/modloader"; +import { MOD_SIGNALS } from "../mods/mod_signals"; export const THEMES = { dark: require("./themes/dark.json"), @@ -9,5 +9,5 @@ export let THEME = THEMES.light; export function applyGameTheme(id) { THEME = THEMES[id]; - MODS.signals.preprocessTheme.dispatch({ id, theme: THEME }); + MOD_SIGNALS.preprocessTheme.dispatch({ id, theme: THEME }); } diff --git a/src/js/mods/demo_mod.js b/src/js/mods/demo_mod.js index 42f48fa3..944cae38 100644 --- a/src/js/mods/demo_mod.js +++ b/src/js/mods/demo_mod.js @@ -2,119 +2,118 @@ import { Entity } from "../game/entity"; /* typehints:end */ -import { Mod } from "./mod"; -import { MetaBuilding } from "../game/meta_building"; +export default function ({ Mod, MetaBuilding }) { + class MetaDemoModBuilding extends MetaBuilding { + constructor() { + super("demoModBuilding"); + } -export class MetaDemoModBuilding extends MetaBuilding { - constructor() { - super("demoModBuilding"); + getSilhouetteColor() { + return "red"; + } + + /** + * Creates the entity at the given location + * @param {Entity} entity + */ + setupEntityComponents(entity) {} } - getSilhouetteColor() { - return "red"; - } + return class ModImpl extends Mod { + constructor(modLoader) { + super( + { + authorContact: "tobias@tobspr.io", + authorName: "tobspr", + name: "Demo Mod", + version: "1", + id: "demo-mod", + }, + modLoader + ); + } - /** - * Creates the entity at the given location - * @param {Entity} entity - */ - setupEntityComponents(entity) {} -} + init() { + // Add some custom css + this.modInterface.registerCss(` + * { + color: red !important; + } + `); -export class DemoMod extends Mod { - constructor(modLoader) { - super( - { - authorContact: "tobias@tobspr.io", - authorName: "tobspr", - name: "Demo Mod", - version: "1", - id: "demo-mod", - }, - modLoader - ); - } + // Replace a builtin sprite + this.modInterface.registerSprite("sprites/colors/red.png", RESOURCES["red.png"]); - init() { - // Add some custom css - this.modLoader.modInterface.registerCss(` - * { - color: red !important; - } - `); + // Add a new type of sub shape ("Line", short code "L") + this.modInterface.registerSubShapeType({ + id: "line", + shortCode: "L", + weightComputation: distanceToOriginInChunks => + Math.round(20 + Math.max(Math.min(distanceToOriginInChunks, 30), 0)), - // Replace a builtin sprite - this.modLoader.modInterface.registerSprite("sprites/colors/red.png", RESOURCES["red.png"]); + draw: ({ context, quadrantSize, layerScale }) => { + const quadrantHalfSize = quadrantSize / 2; + context.beginPath(); + context.moveTo(-quadrantHalfSize, quadrantHalfSize); + context.arc( + -quadrantHalfSize, + quadrantHalfSize, + quadrantSize * layerScale, + -Math.PI * 0.25, + 0 + ); + context.closePath(); + }, + }); - // Add a new type of sub shape ("Line", short code "L") - this.modLoader.modInterface.registerSubShapeType({ - id: "line", - shortCode: "L", - weightComputation: distanceToOriginInChunks => - Math.round(20 + Math.max(Math.min(distanceToOriginInChunks, 30), 0)), + // Modify the theme colors + this.signals.preprocessTheme.add(({ theme }) => { + theme.map.background = "#eee"; + theme.items.outline = "#000"; + }); - draw: ({ context, quadrantSize, layerScale }) => { - const quadrantHalfSize = quadrantSize / 2; - context.beginPath(); - context.moveTo(-quadrantHalfSize, quadrantHalfSize); - context.arc( - -quadrantHalfSize, - quadrantHalfSize, - quadrantSize * layerScale, - -Math.PI * 0.25, - 0 - ); - context.closePath(); - }, - }); + // Modify the goal of the first level + this.signals.modifyLevelDefinitions.add(definitions => { + definitions[0].shape = "LuCuLuCu"; + }); - // Modify the theme colors - this.modLoader.signals.preprocessTheme.add(({ theme }) => { - theme.map.background = "#eee"; - theme.items.outline = "#000"; - }); - - // Modify the goal of the first level - this.modLoader.signals.modifyLevelDefinitions.add(definitions => { - definitions[0].shape = "LuCuLuCu"; - }); - - this.modLoader.modInterface.registerTranslations("en", { - ingame: { - interactiveTutorial: { - title: "Hello", - hints: { - "1_1_extractor": "World!", + this.modInterface.registerTranslations("en", { + ingame: { + interactiveTutorial: { + title: "Hello", + hints: { + "1_1_extractor": "World!", + }, }, }, - }, - }); + }); - // Register the new building - this.modLoader.modInterface.registerNewBuilding({ - metaClass: MetaDemoModBuilding, - buildingIconBase64: RESOURCES["demoBuilding.png"], + // Register the new building + this.modInterface.registerNewBuilding({ + metaClass: MetaDemoModBuilding, + buildingIconBase64: RESOURCES["demoBuilding.png"], - variantsAndRotations: [ - { - description: "A test building", - name: "A test name", + variantsAndRotations: [ + { + description: "A test building", + name: "A test name", - regularImageBase64: RESOURCES["demoBuilding.png"], - blueprintImageBase64: RESOURCES["demoBuildingBlueprint.png"], - tutorialImageBase64: RESOURCES["demoBuildingBlueprint.png"], - }, - ], - }); + regularImageBase64: RESOURCES["demoBuilding.png"], + blueprintImageBase64: RESOURCES["demoBuildingBlueprint.png"], + tutorialImageBase64: RESOURCES["demoBuildingBlueprint.png"], + }, + ], + }); - // Add it to the regular toolbar - this.modLoader.signals.hudElementInitialized.add(element => { - if (element.constructor.name === "HUDBuildingsToolbar") { - // @ts-ignore - element.primaryBuildings.push(MetaDemoModBuilding); - } - }); - } + // Add it to the regular toolbar + this.signals.hudElementInitialized.add(element => { + if (element.constructor.name === "HUDBuildingsToolbar") { + // @ts-ignore + element.primaryBuildings.push(MetaDemoModBuilding); + } + }); + } + }; } //////////////////////////////////////////////////////////////////////// diff --git a/src/js/mods/mod.js b/src/js/mods/mod.js index 65cdd53a..12992999 100644 --- a/src/js/mods/mod.js +++ b/src/js/mods/mod.js @@ -2,6 +2,8 @@ import { ModLoader } from "./modloader"; /* typehints:end */ +import { MOD_SIGNALS } from "./mod_signals"; + export class Mod { /** * @@ -17,6 +19,9 @@ export class Mod { constructor(metadata, modLoader) { this.metadata = metadata; this.modLoader = modLoader; + + this.signals = MOD_SIGNALS; + this.modInterface = modLoader.modInterface; } init() {} diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index fae5f2ba..5d395819 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -6,33 +6,21 @@ import { MetaBuilding } from "../game/meta_building"; import { defaultBuildingVariant } from "../game/meta_building"; import { createLogger } from "../core/logging"; import { AtlasSprite, SpriteAtlasLink } from "../core/sprites"; -import { enumShortcodeToSubShape, enumSubShape, enumSubShapeToShortcode } from "../game/shape_definition"; +import { + enumShortcodeToSubShape, + enumSubShape, + enumSubShapeToShortcode, + MODS_ADDITIONAL_SUB_SHAPE_DRAWERS, +} from "../game/shape_definition"; import { Loader } from "../core/loader"; import { LANGUAGES } from "../languages"; import { matchDataRecursive, T } from "../translations"; import { registerBuildingVariant } from "../game/building_codes"; import { gMetaBuildingRegistry } from "../core/global_registries"; +import { MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS } from "../game/map_chunk"; const LOG = createLogger("mod-interface"); -/** - * @type {Object number>} - */ -export const MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS = {}; - -/** - * @typedef {{ - * context: CanvasRenderingContext2D, - * quadrantSize: number, - * layerScale: number, - * }} SubShapeDrawOptions - */ - -/** - * @type {Object void>} - */ -export const MODS_ADDITIONAL_SUB_SHAPE_DRAWERS = {}; - export class ModInterface { /** * @@ -91,7 +79,7 @@ export class ModInterface { * @param {string} param0.id * @param {string} param0.shortCode * @param {(distanceToOriginInChunks: number) => number} param0.weightComputation - * @param {(options: SubShapeDrawOptions) => void} param0.draw + * @param {(options: import("../game/shape_definition").SubShapeDrawOptions) => void} param0.draw */ registerSubShapeType({ id, shortCode, weightComputation, draw }) { if (shortCode.length !== 1) { diff --git a/src/js/mods/mod_signals.js b/src/js/mods/mod_signals.js new file mode 100644 index 00000000..a2bc0380 --- /dev/null +++ b/src/js/mods/mod_signals.js @@ -0,0 +1,16 @@ +import { Signal } from "../core/signal"; +/* typehints:start */ +import { BaseHUDPart } from "../game/hud/base_hud_part"; +/* typehints:end */ + +// Single file to avoid circular deps + +export const MOD_SIGNALS = { + postInit: new Signal(), + injectSprites: new Signal(), + preprocessTheme: /** @type {TypedSignal<[Object]>} */ (new Signal()), + modifyLevelDefinitions: /** @type {TypedSignal<[Array[Object]]>} */ (new Signal()), + + hudElementInitialized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), + hudElementFinalized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), +}; diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 75115dd7..49e30662 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -1,9 +1,8 @@ import { createLogger } from "../core/logging"; -import { Signal } from "../core/signal"; -import { DemoMod } from "./demo_mod"; import { Mod } from "./mod"; import { ModInterface } from "./mod_interface"; -import { BaseHUDPart } from "../game/hud/base_hud_part"; +import { MetaBuilding } from "../game/meta_building"; +import { MOD_SIGNALS } from "./mod_signals"; const LOG = createLogger("mods"); @@ -21,17 +20,14 @@ export class ModLoader { this.initialized = false; - this.signals = { - postInit: new Signal(), - injectSprites: new Signal(), - preprocessTheme: /** @type {TypedSignal<[Object]>} */ (new Signal()), - modifyLevelDefinitions: /** @type {TypedSignal<[Array[Object]]>} */ (new Signal()), + this.signals = MOD_SIGNALS; - hudElementInitialized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), - hudElementFinalized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), - }; - - this.registerMod(DemoMod); + this.registerMod( + /** @type {any} */ (require("./demo_mod").default({ + Mod, + MetaBuilding, + })) + ); this.initMods(); } From bc5eff84f6f4266f9032898dee897699e81fd6be Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 07:37:26 +0100 Subject: [PATCH 009/129] Lazy Load mods to make sure all dependencies are loaded --- src/js/application.js | 6 ++++++ src/js/game/modes/regular.js | 30 ++++++++++++++++++------------ src/js/mods/demo_mod.js | 5 +++-- src/js/mods/mod.js | 5 ++++- src/js/mods/mod_interface.js | 6 +++++- src/js/mods/mod_signals.js | 3 +++ src/js/mods/modloader.js | 17 +++++++---------- 7 files changed, 46 insertions(+), 26 deletions(-) diff --git a/src/js/application.js b/src/js/application.js index c49b7027..66e9eb8c 100644 --- a/src/js/application.js +++ b/src/js/application.js @@ -35,6 +35,8 @@ import { PuzzleMenuState } from "./states/puzzle_menu"; import { ClientAPI } from "./platform/api"; import { LoginState } from "./states/login"; import { WegameSplashState } from "./states/wegame_splash"; +import { MODS } from "./mods/modloader"; +import { MOD_SIGNALS } from "./mods/mod_signals"; /** * @typedef {import("./platform/achievement_provider").AchievementProviderInterface} AchievementProviderInterface @@ -128,6 +130,8 @@ export class Application { // Store the mouse position, or null if not available /** @type {Vector|null} */ this.mousePosition = null; + + MODS.initMods(); } /** @@ -148,6 +152,8 @@ export class Application { this.analytics = new GoogleAnalyticsImpl(this); this.gameAnalytics = new ShapezGameAnalytics(this); this.achievementProvider = new NoAchievementProvider(this); + + MOD_SIGNALS.platformInstancesInitialized.dispatch(); } /** diff --git a/src/js/game/modes/regular.js b/src/js/game/modes/regular.js index 699874b5..b52cbc89 100644 --- a/src/js/game/modes/regular.js +++ b/src/js/game/modes/regular.js @@ -69,10 +69,16 @@ const tierGrowth = 2.5; const chinaShapes = G_WEGAME_VERSION || G_CHINA_VERSION; +const upgradesCache = {}; + /** * Generates all upgrades * @returns {Object} */ function generateUpgrades(limitedVersion = false) { + if (upgradesCache[limitedVersion]) { + return upgradesCache[limitedVersion]; + } + const fixedImprovements = [0.5, 0.5, 1, 1, 2, 1, 1]; const numEndgameUpgrades = limitedVersion ? 0 : 1000 - fixedImprovements.length - 1; @@ -265,6 +271,8 @@ function generateUpgrades(limitedVersion = false) { } } + MOD_SIGNALS.modifyUpgrades.dispatch(upgrades); + // VALIDATE if (G_IS_DEV) { for (const upgradeId in upgrades) { @@ -280,14 +288,20 @@ function generateUpgrades(limitedVersion = false) { } } + upgradesCache[limitedVersion] = upgrades; return upgrades; } +const levelDefinitionsCache = {}; + /** * Generates the level definitions * @param {boolean} limitedVersion */ export function generateLevelDefinitions(limitedVersion = false) { + if (levelDefinitionsCache[limitedVersion]) { + return levelDefinitionsCache[limitedVersion]; + } const levelDefinitions = [ // 1 // Circle @@ -524,15 +538,11 @@ export function generateLevelDefinitions(limitedVersion = false) { }); } + levelDefinitionsCache[limitedVersion] = levelDefinitions; + return levelDefinitions; } -const fullVersionUpgrades = generateUpgrades(false); -const demoVersionUpgrades = generateUpgrades(true); - -const fullVersionLevels = generateLevelDefinitions(false); -const demoVersionLevels = generateLevelDefinitions(true); - export class RegularGameMode extends GameMode { static getId() { return enumGameModeIds.regular; @@ -603,9 +613,7 @@ export class RegularGameMode extends GameMode { * @returns {Object} */ getUpgrades() { - return this.root.app.restrictionMgr.getHasExtendedUpgrades() - ? fullVersionUpgrades - : demoVersionUpgrades; + return generateUpgrades(!this.root.app.restrictionMgr.getHasExtendedUpgrades()); } /** @@ -613,9 +621,7 @@ export class RegularGameMode extends GameMode { * @returns {Array} */ getLevelDefinitions() { - return this.root.app.restrictionMgr.getHasExtendedLevelsAndFreeplay() - ? fullVersionLevels - : demoVersionLevels; + return generateLevelDefinitions(!this.root.app.restrictionMgr.getHasExtendedLevelsAndFreeplay()); } /** diff --git a/src/js/mods/demo_mod.js b/src/js/mods/demo_mod.js index 944cae38..e11c3667 100644 --- a/src/js/mods/demo_mod.js +++ b/src/js/mods/demo_mod.js @@ -20,8 +20,9 @@ export default function ({ Mod, MetaBuilding }) { } return class ModImpl extends Mod { - constructor(modLoader) { + constructor(app, modLoader) { super( + app, { authorContact: "tobias@tobspr.io", authorName: "tobspr", @@ -37,7 +38,7 @@ export default function ({ Mod, MetaBuilding }) { // Add some custom css this.modInterface.registerCss(` * { - color: red !important; + font-family: "Comic Sans", "Comic Sans MS", Tahoma !important; } `); diff --git a/src/js/mods/mod.js b/src/js/mods/mod.js index 12992999..b9018b68 100644 --- a/src/js/mods/mod.js +++ b/src/js/mods/mod.js @@ -1,4 +1,5 @@ /* typehints:start */ +import { Application } from "../application"; import { ModLoader } from "./modloader"; /* typehints:end */ @@ -7,6 +8,7 @@ import { MOD_SIGNALS } from "./mod_signals"; export class Mod { /** * + * @param {Application} app * @param {object} metadata * @param {string} metadata.name * @param {string} metadata.version @@ -16,7 +18,8 @@ export class Mod { * * @param {ModLoader} modLoader */ - constructor(metadata, modLoader) { + constructor(app, metadata, modLoader) { + this.app = app; this.metadata = metadata; this.modLoader = modLoader; diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 5d395819..64c4971e 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -15,7 +15,7 @@ import { import { Loader } from "../core/loader"; import { LANGUAGES } from "../languages"; import { matchDataRecursive, T } from "../translations"; -import { registerBuildingVariant } from "../game/building_codes"; +import { gBuildingVariants, registerBuildingVariant } from "../game/building_codes"; import { gMetaBuildingRegistry } from "../core/global_registries"; import { MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS } from "../game/map_chunk"; @@ -126,11 +126,15 @@ export class ModInterface { throw new Error("Tried to register building twice: " + id); } gMetaBuildingRegistry.register(metaClass); + const metaInstance = gMetaBuildingRegistry.findByClass(metaClass); T.buildings[id] = {}; variantsAndRotations.forEach(payload => { const actualVariant = payload.variant || defaultBuildingVariant; registerBuildingVariant(id, metaClass, actualVariant, payload.rotationVariant || 0); + + gBuildingVariants[id].metaInstance = metaInstance; + T.buildings[id][actualVariant] = { name: payload.name, description: payload.description, diff --git a/src/js/mods/mod_signals.js b/src/js/mods/mod_signals.js index a2bc0380..23670d8b 100644 --- a/src/js/mods/mod_signals.js +++ b/src/js/mods/mod_signals.js @@ -7,9 +7,12 @@ import { BaseHUDPart } from "../game/hud/base_hud_part"; export const MOD_SIGNALS = { postInit: new Signal(), + platformInstancesInitialized: new Signal(), + injectSprites: new Signal(), preprocessTheme: /** @type {TypedSignal<[Object]>} */ (new Signal()), modifyLevelDefinitions: /** @type {TypedSignal<[Array[Object]]>} */ (new Signal()), + modifyUpgrades: /** @type {TypedSignal<[Object]>} */ (new Signal()), hudElementInitialized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), hudElementFinalized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 49e30662..8edc2d3d 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -15,20 +15,14 @@ export class ModLoader { this.modInterface = new ModInterface(this); - /** @type {(new (ModLoader) => Mod)[]} */ + /** @type {((Object) => (new (Application, ModLoader) => Mod))[]} */ this.modLoadQueue = []; this.initialized = false; this.signals = MOD_SIGNALS; - this.registerMod( - /** @type {any} */ (require("./demo_mod").default({ - Mod, - MetaBuilding, - })) - ); - this.initMods(); + this.registerMod(/** @type {any} */ (require("./demo_mod").default)); } linkApp(app) { @@ -39,7 +33,10 @@ export class ModLoader { LOG.log("hook:init"); this.initialized = true; this.modLoadQueue.forEach(modClass => { - const mod = new modClass(this); + const mod = new (modClass({ + Mod, + MetaBuilding, + }))(this.app, this); mod.init(); this.mods.push(mod); }); @@ -49,7 +46,7 @@ export class ModLoader { /** * - * @param {new (ModLoader) => Mod} mod + * @param {(Object) => (new (Application, ModLoader) => Mod)} mod */ registerMod(mod) { if (this.initialized) { From a6b024be256c4e6dede72010089e2115ac0c8e8b Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 07:51:48 +0100 Subject: [PATCH 010/129] Expose all exported members automatically to mods --- src/js/mods/demo_mod.js | 6 +++--- src/js/mods/modloader.js | 33 +++++++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/js/mods/demo_mod.js b/src/js/mods/demo_mod.js index e11c3667..43ceffd4 100644 --- a/src/js/mods/demo_mod.js +++ b/src/js/mods/demo_mod.js @@ -2,8 +2,8 @@ import { Entity } from "../game/entity"; /* typehints:end */ -export default function ({ Mod, MetaBuilding }) { - class MetaDemoModBuilding extends MetaBuilding { +export default function (shapez) { + class MetaDemoModBuilding extends shapez.MetaBuilding { constructor() { super("demoModBuilding"); } @@ -19,7 +19,7 @@ export default function ({ Mod, MetaBuilding }) { setupEntityComponents(entity) {} } - return class ModImpl extends Mod { + return class ModImpl extends shapez.Mod { constructor(app, modLoader) { super( app, diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 8edc2d3d..5732b083 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -31,12 +31,37 @@ export class ModLoader { initMods() { LOG.log("hook:init"); + + let exports = {}; + + if (G_IS_DEV || G_IS_STANDALONE) { + const modules = require.context("../", true, /\.js$/); + + Array.from(modules.keys()).forEach(key => { + // @ts-ignore + const module = modules(key); + for (const member in module) { + if (member === "default") { + continue; + } + if (exports[member]) { + continue; + } + Object.defineProperty(exports, member, { + get() { + return module[member]; + }, + set(v) { + module[member] = v; + }, + }); + } + }); + } + this.initialized = true; this.modLoadQueue.forEach(modClass => { - const mod = new (modClass({ - Mod, - MetaBuilding, - }))(this.app, this); + const mod = new (modClass(exports))(this.app, this); mod.init(); this.mods.push(mod); }); From 258dbbd98f84bea5ca4815ab80d861f82cd54415 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 07:53:32 +0100 Subject: [PATCH 011/129] Fix duplicate exports --- src/js/game/buildings/logic_gate.js | 2 +- src/js/game/buildings/virtual_processor.js | 2 +- src/js/game/map_chunk_aggregate.js | 3 +-- src/js/mods/modloader.js | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/js/game/buildings/logic_gate.js b/src/js/game/buildings/logic_gate.js index b61d4373..a0e63c06 100644 --- a/src/js/game/buildings/logic_gate.js +++ b/src/js/game/buildings/logic_gate.js @@ -15,7 +15,7 @@ export const enumLogicGateVariants = { }; /** @enum {string} */ -export const enumVariantToGate = { +const enumVariantToGate = { [defaultBuildingVariant]: enumLogicGateType.and, [enumLogicGateVariants.not]: enumLogicGateType.not, [enumLogicGateVariants.xor]: enumLogicGateType.xor, diff --git a/src/js/game/buildings/virtual_processor.js b/src/js/game/buildings/virtual_processor.js index b4f91762..ab32a0d3 100644 --- a/src/js/game/buildings/virtual_processor.js +++ b/src/js/game/buildings/virtual_processor.js @@ -19,7 +19,7 @@ export const enumVirtualProcessorVariants = { }; /** @enum {string} */ -export const enumVariantToGate = { +const enumVariantToGate = { [defaultBuildingVariant]: enumLogicGateType.cutter, [enumVirtualProcessorVariants.rotater]: enumLogicGateType.rotater, [enumVirtualProcessorVariants.unstacker]: enumLogicGateType.unstacker, diff --git a/src/js/game/map_chunk_aggregate.js b/src/js/game/map_chunk_aggregate.js index de15362d..f47ed676 100644 --- a/src/js/game/map_chunk_aggregate.js +++ b/src/js/game/map_chunk_aggregate.js @@ -2,10 +2,9 @@ import { globalConfig } from "../core/config"; import { DrawParameters } from "../core/draw_parameters"; import { drawSpriteClipped } from "../core/draw_utils"; import { safeModulo } from "../core/utils"; +import { CHUNK_OVERLAY_RES } from "./map_chunk_view"; import { GameRoot } from "./root"; -export const CHUNK_OVERLAY_RES = 3; - export class MapChunkAggregate { /** * diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 5732b083..beb9e5e1 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -1,7 +1,6 @@ import { createLogger } from "../core/logging"; import { Mod } from "./mod"; import { ModInterface } from "./mod_interface"; -import { MetaBuilding } from "../game/meta_building"; import { MOD_SIGNALS } from "./mod_signals"; const LOG = createLogger("mods"); @@ -45,7 +44,7 @@ export class ModLoader { continue; } if (exports[member]) { - continue; + throw new Error("Duplicate export of " + member); } Object.defineProperty(exports, member, { get() { From 575abd255d39fc78ddcff1e37d53d9a0e48c12b5 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 08:55:18 +0100 Subject: [PATCH 012/129] Allow loading mods from standalone --- electron/.gitignore | 1 + electron/index.js | 27 ++++++++++ electron/mods/README.txt | 6 +++ src/css/states/main_menu.scss | 69 ++++++++++++++++++++++++- src/js/application.js | 7 +-- src/js/core/config.local.template.js | 3 ++ src/js/mods/{demo_mod.js => dev_mod.js} | 18 ++----- src/js/mods/modloader.js | 41 ++++++++++----- src/js/states/main_menu.js | 61 ++++++++++++++++++++-- translations/base-en.yaml | 10 ++++ 10 files changed, 209 insertions(+), 34 deletions(-) create mode 100644 electron/.gitignore create mode 100644 electron/mods/README.txt rename src/js/mods/{demo_mod.js => dev_mod.js} (98%) diff --git a/electron/.gitignore b/electron/.gitignore new file mode 100644 index 00000000..0cdb30f4 --- /dev/null +++ b/electron/.gitignore @@ -0,0 +1 @@ +mods/*.js \ No newline at end of file diff --git a/electron/index.js b/electron/index.js index e7994050..e6f9ce1e 100644 --- a/electron/index.js +++ b/electron/index.js @@ -9,6 +9,7 @@ const asyncLock = require("async-lock"); const isDev = process.argv.indexOf("--dev") >= 0; const isLocal = process.argv.indexOf("--local") >= 0; +const safeMode = process.argv.indexOf("--safe-mode") >= 0; const roamingFolder = process.env.APPDATA || @@ -16,6 +17,7 @@ const roamingFolder = ? process.env.HOME + "/Library/Preferences" : process.env.HOME + "/.local/share"); let storePath = path.join(roamingFolder, "shapez.io", "saves"); +let modsPath = path.join(app.getAppPath(), "mods"); if (!fs.existsSync(storePath)) { // No try-catch by design @@ -79,6 +81,8 @@ function createWindow() { if (isDev) { menu = new Menu(); + win.toggleDevTools(); + const mainItem = new MenuItem({ label: "Toggle Dev Tools", click: () => win.toggleDevTools(), @@ -279,5 +283,28 @@ ipcMain.on("fs-job", async (event, arg) => { event.reply("fs-response", { id: arg.id, result }); }); +ipcMain.on("open-mods-folder", async () => { + shell.openPath(modsPath); +}); + +ipcMain.handle("get-mods", async (event, arg) => { + if (safeMode) { + console.warn("Not loading mods due to safe mode"); + return []; + } + if (!fs.existsSync(modsPath)) { + console.warn("Mods folder not found:", modsPath); + return []; + } + try { + console.log("Loading mods from", modsPath); + let entries = fs.readdirSync(modsPath); + entries = entries.filter(entry => entry.endsWith(".js")); + return entries.map(filename => fs.readFileSync(path.join(modsPath, filename), { encoding: "utf8" })); + } catch (ex) { + throw new Error(ex); + } +}); + steam.init(isDev); steam.listen(); diff --git a/electron/mods/README.txt b/electron/mods/README.txt new file mode 100644 index 00000000..666cc18f --- /dev/null +++ b/electron/mods/README.txt @@ -0,0 +1,6 @@ +Here you can place mods. Every mod should be a single file ending with ".js". + +--- WARNING --- +Mods can potentially access to your filesystem. +Please only install mods from trusted sources and developers. +--- WARNING --- diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss index 15cdbe1c..2c70f5d8 100644 --- a/src/css/states/main_menu.scss +++ b/src/css/states/main_menu.scss @@ -185,7 +185,7 @@ .updateLabel { position: absolute; transform: translateX(50%) rotate(-5deg); - color: #ff590b; + color: #300bff; @include Heading; font-weight: bold; @include S(right, 40px); @@ -290,6 +290,73 @@ } } + .modsList { + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + background: #fff; + grid-row: 1 / 2; + grid-column: 2 / 3; + position: relative; + text-align: left; + align-items: flex-start; + @include S(padding, 15px); + @include S(padding-bottom, 10px); + @include S(border-radius, $globalBorderRadius); + + h3 { + @include S(margin-bottom, 10px); + @include Heading; + } + + .dlcHint { + @include SuperSmallText; + @include S(margin-top, 10px); + + display: grid; + grid-template-columns: 1fr auto; + grid-gap: 20px; + align-items: center; + } + + .mod { + background: #eee; + width: 100%; + @include S(border-radius, $globalBorderRadius); + @include S(padding, 5px); + box-sizing: border-box; + @include S(margin-bottom, 5px); + display: grid; + grid-template-columns: 1fr auto auto; + @include S(grid-gap, 5px); + + .author, + .version { + @include SuperSmallText; + } + .name { + overflow: hidden; + } + } + + .modsList { + box-sizing: border-box; + @include S(height, 100px); + @include S(padding, 5px); + border: D(1px) solid #eee; + overflow-y: scroll; + width: 100%; + display: flex; + flex-direction: column; + pointer-events: all; + + :last-child { + margin-bottom: auto; + } + } + } + .mainContainer { display: flex; align-items: center; diff --git a/src/js/application.js b/src/js/application.js index 66e9eb8c..67e9c353 100644 --- a/src/js/application.js +++ b/src/js/application.js @@ -130,8 +130,6 @@ export class Application { // Store the mouse position, or null if not available /** @type {Vector|null} */ this.mousePosition = null; - - MODS.initMods(); } /** @@ -331,8 +329,11 @@ export class Application { /** * Boots the application */ - boot() { + async boot() { console.log("Booting ..."); + + await MODS.initMods(); + this.registerStates(); this.registerEventListeners(); diff --git a/src/js/core/config.local.template.js b/src/js/core/config.local.template.js index 41677997..ed230ae4 100644 --- a/src/js/core/config.local.template.js +++ b/src/js/core/config.local.template.js @@ -116,5 +116,8 @@ export default { // Disables slow asserts, useful for debugging performance // disableSlowAsserts: true, // ----------------------------------------------------------------------------------- + // Loads the dev_mod.js for developing new mods + // loadDevMod: true, + // ----------------------------------------------------------------------------------- /* dev:end */ }; diff --git a/src/js/mods/demo_mod.js b/src/js/mods/dev_mod.js similarity index 98% rename from src/js/mods/demo_mod.js rename to src/js/mods/dev_mod.js index 43ceffd4..aa74f59a 100644 --- a/src/js/mods/demo_mod.js +++ b/src/js/mods/dev_mod.js @@ -1,7 +1,3 @@ -/* typehints:start */ -import { Entity } from "../game/entity"; -/* typehints:end */ - export default function (shapez) { class MetaDemoModBuilding extends shapez.MetaBuilding { constructor() { @@ -12,10 +8,6 @@ export default function (shapez) { return "red"; } - /** - * Creates the entity at the given location - * @param {Entity} entity - */ setupEntityComponents(entity) {} } @@ -36,11 +28,11 @@ export default function (shapez) { init() { // Add some custom css - this.modInterface.registerCss(` - * { - font-family: "Comic Sans", "Comic Sans MS", Tahoma !important; - } - `); + // this.modInterface.registerCss(` + // button { + // font-family: "Comic Sans", "Comic Sans MS", Tahoma !important; + // } + // `); // Replace a builtin sprite this.modInterface.registerSprite("sprites/colors/red.png", RESOURCES["red.png"]); diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index beb9e5e1..5c308d8a 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -1,4 +1,6 @@ +import { globalConfig } from "../core/config"; import { createLogger } from "../core/logging"; +import { getIPCRenderer } from "../core/utils"; import { Mod } from "./mod"; import { ModInterface } from "./mod_interface"; import { MOD_SIGNALS } from "./mod_signals"; @@ -20,17 +22,39 @@ export class ModLoader { this.initialized = false; this.signals = MOD_SIGNALS; - - this.registerMod(/** @type {any} */ (require("./demo_mod").default)); } linkApp(app) { this.app = app; } - initMods() { + anyModsActive() { + return this.mods.length > 0; + } + + async initMods() { LOG.log("hook:init"); + if (G_IS_STANDALONE) { + try { + const mods = await getIPCRenderer().invoke("get-mods"); + + mods.forEach(modCode => { + const registerMod = mod => { + this.modLoadQueue.push(mod); + }; + // ugh + eval(modCode); + }); + } catch (ex) { + alert("Failed to load mods: " + ex); + } + } else if (G_IS_DEV) { + if (globalConfig.debug.loadDevMod) { + this.modLoadQueue.push(/** @type {any} */ (require("./dev_mod").default)); + } + } + let exports = {}; if (G_IS_DEV || G_IS_STANDALONE) { @@ -67,17 +91,6 @@ export class ModLoader { this.modLoadQueue = []; this.signals.postInit.dispatch(); } - - /** - * - * @param {(Object) => (new (Application, ModLoader) => Mod)} mod - */ - registerMod(mod) { - if (this.initialized) { - throw new Error("Mods are already initialized, can not add mod afterwards."); - } - this.modLoadQueue.push(mod); - } } export const MODS = new ModLoader(); diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index 60495a9c..a6bb940a 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -8,6 +8,7 @@ import { ReadWriteProxy } from "../core/read_write_proxy"; import { formatSecondsToTimeAgo, generateFileDownload, + getIPCRenderer, isSupportedBrowser, makeButton, makeButtonElement, @@ -17,6 +18,7 @@ import { waitNextFrame, } from "../core/utils"; import { HUDModalDialogs } from "../game/hud/parts/modal_dialogs"; +import { MODS } from "../mods/modloader"; import { PlatformWrapperImplBrowser } from "../platform/browser/wrapper"; import { PlatformWrapperImplElectron } from "../platform/electron/wrapper"; import { getApplicationSettingById } from "../profile/application_settings"; @@ -41,6 +43,7 @@ export class MainMenuState extends GameState { const showBrowserWarning = !G_IS_STANDALONE && !isSupportedBrowser(); const showPuzzleDLC = !G_WEGAME_VERSION && (G_IS_STANDALONE || G_IS_DEV); const showWegameFooter = G_WEGAME_VERSION; + const hasMods = MODS.anyModsActive(); let showExternalLinks = true; @@ -94,7 +97,7 @@ export class MainMenuState extends GameState {
@@ -112,7 +115,7 @@ export class MainMenuState extends GameState {
${ - showPuzzleDLC && ownsPuzzleDLC + showPuzzleDLC && ownsPuzzleDLC && !hasMods ? `
@@ -147,6 +150,49 @@ export class MainMenuState extends GameState {
` : "" } + ${ + hasMods + ? ` + +
+

${T.mainMenu.mods.title} + +

+ +
+ ${MODS.mods + .map(mod => { + return ` +
+ ${mod.metadata.name} + ${T.mainMenu.mods.version.replace( + "", + mod.metadata.version + )} + ${T.mainMenu.mods.author.replace( + "", + mod.metadata.authorName + )} +
+ `; + }) + .join("")} +
+ +
+ ${T.mainMenu.modsWarningPuzzleDLC} + + +
+ + +
+ ` + : "" + } + ${ @@ -335,6 +381,7 @@ export class MainMenuState extends GameState { ".puzzleDlcPlayButton": this.onPuzzleModeButtonClicked, ".puzzleDlcGetButton": this.onPuzzleWishlistButtonClicked, ".wegameDisclaimer > .rating": this.onWegameRatingClicked, + ".modsOpenFolder": this.openModsFolder, }; for (const key in clickHandling) { @@ -716,6 +763,14 @@ export class MainMenuState extends GameState { }); } + openModsFolder() { + if (!G_IS_STANDALONE) { + this.dialogs.showWarning(T.global.error, T.mainMenu.mods.folderOnlyStandalone); + return; + } + getIPCRenderer().send("open-mods-folder"); + } + onLeave() { this.dialogs.cleanup(); } diff --git a/translations/base-en.yaml b/translations/base-en.yaml index 3f3b1412..a7a27bfe 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -126,6 +126,16 @@ mainMenu: puzzleDlcWishlist: Wishlist now! puzzleDlcViewNow: View Dlc + modsWarningPuzzleDLC: >- + Playing the Puzzle DLC is not possible with mods. Please disable all mods to play the DLC. + + mods: + title: Active Mods + author: by + version: v + openFolder: Open Folder + folderOnlyStandalone: Opening the mod folder is only possible when running the standalone. + puzzleMenu: play: Play edit: Edit From ed837703487484fca1b887f8c7e904c5ace9aa96 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 09:05:03 +0100 Subject: [PATCH 013/129] update changelog --- src/js/changelog.js | 7 +++++++ version | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/js/changelog.js b/src/js/changelog.js index ec9a317c..a68c8ce4 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -1,4 +1,11 @@ export const CHANGELOG = [ + { + version: "1.5.0", + date: "unreleased", + entries: [ + "This version adds an official modloader! You can now load mods by placing it in the mods/ folder of the game.", + ], + }, { version: "1.4.4", date: "29.08.2021", diff --git a/version b/version index e1df5de7..3e1ad720 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.4.4 \ No newline at end of file +1.5.0 \ No newline at end of file From e0e5fb8d2a7670fc7ff848787924f28bb3d36ad8 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 09:55:03 +0100 Subject: [PATCH 014/129] Fix mods folder incorrect path --- electron/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron/index.js b/electron/index.js index e6f9ce1e..b3f75e72 100644 --- a/electron/index.js +++ b/electron/index.js @@ -17,7 +17,7 @@ const roamingFolder = ? process.env.HOME + "/Library/Preferences" : process.env.HOME + "/.local/share"); let storePath = path.join(roamingFolder, "shapez.io", "saves"); -let modsPath = path.join(app.getAppPath(), "mods"); +let modsPath = path.join(path.dirname(app.getPath("exe")), "mods"); if (!fs.existsSync(storePath)) { // No try-catch by design From 0e86cd3535f6c3612de3f758d9ddaf62f4c1be4a Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 10:14:51 +0100 Subject: [PATCH 015/129] Fix modloading in standalone --- src/js/mods/modloader.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 5c308d8a..3db01878 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -40,11 +40,12 @@ export class ModLoader { const mods = await getIPCRenderer().invoke("get-mods"); mods.forEach(modCode => { - const registerMod = mod => { + window.registerMod = mod => { this.modLoadQueue.push(mod); }; // ugh eval(modCode); + delete window.registerMod; }); } catch (ex) { alert("Failed to load mods: " + ex); From 38b4e93180cbed10c77520fdb425d9b8cf5f9ad4 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 10:39:26 +0100 Subject: [PATCH 016/129] Fix sprites not getting replaced, update demo mod --- src/js/mods/dev_mod.js | 39 +++++++++++++++++++++++++++++------- src/js/mods/mod_interface.js | 1 + 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/js/mods/dev_mod.js b/src/js/mods/dev_mod.js index aa74f59a..dbe4aa0f 100644 --- a/src/js/mods/dev_mod.js +++ b/src/js/mods/dev_mod.js @@ -27,15 +27,23 @@ export default function (shapez) { } init() { + // Increase belt speed + shapez.globalConfig.beltSpeedItemsPerSecond = 25; + // Add some custom css - // this.modInterface.registerCss(` - // button { - // font-family: "Comic Sans", "Comic Sans MS", Tahoma !important; - // } - // `); + this.modInterface.registerCss(` + * { + font-family: "Comic Sans", "Comic Sans MS", Tahoma !important; + } + `); // Replace a builtin sprite - this.modInterface.registerSprite("sprites/colors/red.png", RESOURCES["red.png"]); + ["red", "green", "blue", "yellow", "purple", "cyan", "white"].forEach(color => { + this.modInterface.registerSprite( + "sprites/colors/" + color + ".png", + RESOURCES[color + ".png"] + ); + }); // Add a new type of sub shape ("Line", short code "L") this.modInterface.registerSubShapeType({ @@ -114,8 +122,25 @@ export default function (shapez) { const RESOURCES = { "red.png": - "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAB2AAAAdgB+lymcgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAATkSURBVHic7ZpfiFRVHMc/v5m99+6qWYhCYKFGVJpPFYgK4UNQb1GwODO5M2OLUmASItGD6OJDYX8IIqPMdWdmdWZkE6GnnozqJWkxENMyg/75tP31z+7MnZ3760GrZf7fmXuvaPfzMvA7v3PO9/e7555z5pwLISEhISEhISH/U6SXyjo4aFaM+atUndUISwEUSmjkW5XouYH86I9eiJxJDC8Tra4EHhBxrGtW+UWQr43K1bMyMWF323ZXCSglko8JJFF5EljYwvUMytFqVcfmTeQuuuljejC5NBqVzQgx4MEWrpdAjjtIbqAwdsJNH+AyAXYi9TDKGwobXPYzI8J7hil7JZP5s5WjptN3VGzdrcpzwICbTgQ9gbLTLOa+6rxOh9iJ1FZV3gEMN6Jqevspok7SKIx/2qi4Ek+udZDDwD1d9wGziO6y8rl9nUlqg4LY8dQosLkHUXOpCmwxC9mxuUY7ln5WRQ8AUS86UWXUKma3CGgrv0i7hirx1Ot4FzxAVGG0lEhu+8dQiqdfUNGDeBQ8gAjDdiL1Wlu/VoXleHITyLhXompwVHkKQITjdPAwukOHrELucLPSpgnQeHxxGfOcwGJ/hAFw5frvAr86UJiysFdJofBro/KmWS+rudfn4OFa4L4FDyCwpCLmSIvyenRw6+12X/kiMN8vYQFzxZy17pKJA3/VFjQcAWWjNMStEzzAgnK0vKlRQcMEiMoT/uoJHhEeb2SvS4Beey3W+q4oeNbryEhdvHWGUiy9DFgUiKRgWVQ6//Pdtca6BESVJcHoCZ4os3WrWl0CnGj1Vnz6ADg47RNANdJy73xzI9VaS/2kEOW3YMQET6Qa/b3OVmsw+qPnAScQRcHiGH32hVpjXQLk0KHLwDeBSAqWs3LkyKVaY+ONEPKx/3oCRmgYU+M/Q1ot+CrmBiCO5hvZGybALI5PIpzyV1KAKF82OydsfgihvOKboKARaRpL0wSY9684fouMgknz/uUfNStseSRmx4YeUYmcxLfjKt9xJCLrzSOZL5o5tAzMLI5PqvK+97qCQZR3WwUPHTxZq192AKc9UxUcZ43q9EvtnNomQDKZEugQMOOJrCAQpnGcjTIx0VZzR++2VcidBoa4ObbICjJsHR0/04lzx5ObVcgeQ9nTva6AEN1l5TPFjt3dtm/H028qusNtvSAQYb+Zz25r7/kfrpc3o5DZqegHbuv5j2SN+1Zsd1vLdQIE1JqdeR4Ya+scHGPm7NVhGRlxPUd1/YWIgtiJ9B5Ub+i8IMLbRj77Yrtb4Kb1exVQiqW2i/AWwe8WFXjZKmTb3gC3oucEANiJVFKVg/Ty8YQ7KqIybBYzPd9ce5IAgMozqfWOw4fAnV612QiFKRXdOJDPfeJFe54lAK5/2NQXOQa6xst2/0U45dD3tFdfn4HH7+28idxF02IDvqwQesj8Y+E6L4MHj0fAXK7PC/vp/f7/sgg7zXz2gBe6avEtAQAzsfTyiGie7i9bJ1Uk0Z/PfOelrrn4unQNFDM/mLPTG1DZB9TdyrSgCrxq3mat8zN48HkEzMWODa1RiYwBK9u4fh9R2WwUM58HoSuwzYtZHD9pWvIQIrsVpmrLFaYQ2W1asjqo4CHAETAXHRwcKBv9j+JE7gUg4lywKqXPOjnACAkJCQkJCQkJ8Yi/AfA6e2lfA0oPAAAAAElFTkSuQmCC", + "data:image/png;base64,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", + "green.png": + "data:image/png;base64,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", + + "purple.png": + "data:image/png;base64,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", + + "blue.png": + "data:image/png;base64,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", + + "yellow.png": + "data:image/png;base64,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", + + "cyan.png": + "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAOxAAADsQH1g+1JAAAE8mlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNy4xLWMwMDAgNzkuZGFiYWNiYiwgMjAyMS8wNC8xNC0wMDozOTo0NCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIzLjAgKE1hY2ludG9zaCkiIHhtcDpDcmVhdGVEYXRlPSIyMDIyLTAxLTE0VDEwOjMwOjMyKzAxOjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyMi0wMS0xNFQxMDozMDo1MCswMTowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyMi0wMS0xNFQxMDozMDo1MCswMTowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ZTFiZTU2MjEtMTU1ZC00YmFmLWFiNzgtYjM2Y2QzMmIzNTNkIiB4bXBNTTpEb2N1bWVudElE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", + + "white.png": + "data:image/png;base64,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", "demoBuilding.png": "data:image/png;base64,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", diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 64c4971e..b0a8fe0c 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -63,6 +63,7 @@ export class ModInterface { sprite.linksByResolution["0.75"] = link; this.lazySprites.set(spriteId, sprite); + Loader.sprites.set(spriteId, sprite); } injectSprites() { From f3b8d329fcc90cf9131824c02f3629d378f3f2b5 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 10:56:33 +0100 Subject: [PATCH 017/129] Load dev mod via raw loader --- gulp/package.json | 1 + gulp/yarn.lock | 46 ++++++++++++++++++++++++++++++++++++++++ src/js/mods/dev_mod.js | 7 ++---- src/js/mods/modloader.js | 14 ++++++------ 4 files changed, 57 insertions(+), 11 deletions(-) diff --git a/gulp/package.json b/gulp/package.json index 2a17b4fd..adc4389f 100644 --- a/gulp/package.json +++ b/gulp/package.json @@ -46,6 +46,7 @@ "postcss": ">=5.0.0", "promise-polyfill": "^8.1.0", "query-string": "^6.8.1", + "raw-loader": "^4.0.2", "rusha": "^0.8.13", "serialize-error": "^3.0.0", "stream-browserify": "^3.0.0", diff --git a/gulp/yarn.lock b/gulp/yarn.lock index f4f3ba7f..93ef55b1 100644 --- a/gulp/yarn.lock +++ b/gulp/yarn.lock @@ -989,6 +989,11 @@ "@types/minimatch" "*" "@types/node" "*" +"@types/json-schema@^7.0.8": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== + "@types/minimatch@*": version "3.0.3" resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz" @@ -1237,6 +1242,11 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz" integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== +ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + ajv@^4.7.0: version "4.11.8" resolved "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz" @@ -1255,6 +1265,16 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5, ajv@^6.9.1: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.12.5: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz" @@ -7407,6 +7427,15 @@ loader-utils@^1.0.0, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4 emojis-list "^3.0.0" json5 "^1.0.1" +loader-utils@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" + integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + localtunnel@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.0.tgz" @@ -10227,6 +10256,14 @@ raw-body@^2.3.2: iconv-lite "0.4.24" unpipe "1.0.0" +raw-loader@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6" + integrity sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA== + dependencies: + loader-utils "^2.0.0" + schema-utils "^3.0.0" + rcedit@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/rcedit/-/rcedit-2.0.0.tgz" @@ -10869,6 +10906,15 @@ schema-utils@^2.6.5: ajv "^6.12.0" ajv-keywords "^3.4.1" +schema-utils@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + seek-bzip@^1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz" diff --git a/src/js/mods/dev_mod.js b/src/js/mods/dev_mod.js index dbe4aa0f..b636dace 100644 --- a/src/js/mods/dev_mod.js +++ b/src/js/mods/dev_mod.js @@ -1,4 +1,4 @@ -export default function (shapez) { +registerMod(shapez => { class MetaDemoModBuilding extends shapez.MetaBuilding { constructor() { super("demoModBuilding"); @@ -27,9 +27,6 @@ export default function (shapez) { } init() { - // Increase belt speed - shapez.globalConfig.beltSpeedItemsPerSecond = 25; - // Add some custom css this.modInterface.registerCss(` * { @@ -115,7 +112,7 @@ export default function (shapez) { }); } }; -} +}); //////////////////////////////////////////////////////////////////////// // @notice: Later this part will be autogenerated diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 3db01878..45c70caa 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -35,9 +35,15 @@ export class ModLoader { async initMods() { LOG.log("hook:init"); - if (G_IS_STANDALONE) { + if (G_IS_STANDALONE || G_IS_DEV) { try { - const mods = await getIPCRenderer().invoke("get-mods"); + let mods = []; + if (G_IS_STANDALONE) { + mods = await getIPCRenderer().invoke("get-mods"); + } else if (G_IS_DEV && globalConfig.debug.loadDevMod) { + // @ts-expect-error + mods = [require("!!raw-loader!./dev_mod")]; + } mods.forEach(modCode => { window.registerMod = mod => { @@ -50,10 +56,6 @@ export class ModLoader { } catch (ex) { alert("Failed to load mods: " + ex); } - } else if (G_IS_DEV) { - if (globalConfig.debug.loadDevMod) { - this.modLoadQueue.push(/** @type {any} */ (require("./dev_mod").default)); - } } let exports = {}; From 6fa2515d858b3797fa021c72a55f2dded9492e00 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 11:08:16 +0100 Subject: [PATCH 018/129] Improve mod developing so mods are directly ready to be deployed, load mods from local file server --- gulp/gulpfile.js | 2 +- gulp/webpack.config.js | 1 + gulp/webpack.production.config.js | 1 + src/js/mods/{dev_mod.js => demo_mod.nobuild/index.js} | 0 src/js/mods/mod_interface.js | 11 ++++++++++- src/js/mods/modloader.js | 8 ++++++-- 6 files changed, 19 insertions(+), 4 deletions(-) rename src/js/mods/{dev_mod.js => demo_mod.nobuild/index.js} (100%) diff --git a/gulp/gulpfile.js b/gulp/gulpfile.js index 0f4f4185..87901377 100644 --- a/gulp/gulpfile.js +++ b/gulp/gulpfile.js @@ -146,7 +146,7 @@ gulp.task("main.webserver", () => { */ function serve({ version = "web" }) { browserSync.init({ - server: buildFolder, + server: [buildFolder, path.join(baseDir, "src", "js")], port: 3005, ghostMode: { clicks: false, diff --git a/gulp/webpack.config.js b/gulp/webpack.config.js index 14987cfa..7db0bf0b 100644 --- a/gulp/webpack.config.js +++ b/gulp/webpack.config.js @@ -71,6 +71,7 @@ module.exports = ({ watch = false, standalone = false, chineseVersion = false, w type: "javascript/auto", }, { test: /\.(png|jpe?g|svg)$/, loader: "ignore-loader" }, + { test: /\.nobuild/, loader: "ignore-loader" }, { test: /\.md$/, use: [ diff --git a/gulp/webpack.production.config.js b/gulp/webpack.production.config.js index fd7551e0..72bae9f4 100644 --- a/gulp/webpack.production.config.js +++ b/gulp/webpack.production.config.js @@ -177,6 +177,7 @@ module.exports = ({ type: "javascript/auto", }, { test: /\.(png|jpe?g|svg)$/, loader: "ignore-loader" }, + { test: /\.nobuild/, loader: "ignore-loader" }, { test: /\.js$/, enforce: "pre", diff --git a/src/js/mods/dev_mod.js b/src/js/mods/demo_mod.nobuild/index.js similarity index 100% rename from src/js/mods/dev_mod.js rename to src/js/mods/demo_mod.nobuild/index.js diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index b0a8fe0c..89330d3d 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -1,5 +1,6 @@ /* typehints:start */ import { ModLoader } from "./modloader"; +import { Component } from "../game/component"; import { MetaBuilding } from "../game/meta_building"; /* typehints:end */ @@ -16,7 +17,7 @@ import { Loader } from "../core/loader"; import { LANGUAGES } from "../languages"; import { matchDataRecursive, T } from "../translations"; import { gBuildingVariants, registerBuildingVariant } from "../game/building_codes"; -import { gMetaBuildingRegistry } from "../core/global_registries"; +import { gComponentRegistry, gMetaBuildingRegistry } from "../core/global_registries"; import { MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS } from "../game/map_chunk"; const LOG = createLogger("mod-interface"); @@ -106,6 +107,14 @@ export class ModInterface { } } + /** + * + * @param {typeof Component} component + */ + registerComponent(component) { + gComponentRegistry.register(component); + } + /** * * @param {object} param0 diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 45c70caa..b9a7d4d2 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -41,8 +41,12 @@ export class ModLoader { if (G_IS_STANDALONE) { mods = await getIPCRenderer().invoke("get-mods"); } else if (G_IS_DEV && globalConfig.debug.loadDevMod) { - // @ts-expect-error - mods = [require("!!raw-loader!./dev_mod")]; + const mod = await ( + await fetch("http://localhost:3005/mods/demo_mod.nobuild/index.js", { + method: "GET", + }) + ).text(); + mods.push(mod); } mods.forEach(modCode => { From 4176621b057dbd65d56c074544a556f7ab633157 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 12:34:02 +0100 Subject: [PATCH 019/129] Proper mods ui --- res/ui/icons/mods.png | Bin 0 -> 4450 bytes res/ui/icons/mods_white.png | Bin 0 -> 4455 bytes src/css/main.scss | 1 + src/css/states/main_menu.scss | 57 ++++++++--- src/css/states/mods.scss | 131 +++++++++++++++++++++++++ src/css/states/settings.scss | 48 +++++++-- src/css/variables.scss | 1 + src/js/application.js | 2 + src/js/mods/demo_mod.nobuild/index.js | 15 +-- src/js/mods/mod.js | 5 +- src/js/states/main_menu.js | 50 ++++------ src/js/states/mods.js | 135 ++++++++++++++++++++++++++ src/js/states/settings.js | 23 +++++ translations/base-en.yaml | 26 +++-- 14 files changed, 431 insertions(+), 63 deletions(-) create mode 100644 res/ui/icons/mods.png create mode 100644 res/ui/icons/mods_white.png create mode 100644 src/css/states/mods.scss create mode 100644 src/js/states/mods.js diff --git a/res/ui/icons/mods.png b/res/ui/icons/mods.png new file mode 100644 index 0000000000000000000000000000000000000000..1b3cb477aff032e4770ee2c8010e2d919c9fc5c7 GIT binary patch literal 4450 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 literal 0 HcmV?d00001 diff --git a/res/ui/icons/mods_white.png b/res/ui/icons/mods_white.png new file mode 100644 index 0000000000000000000000000000000000000000..1cb34f27dc90aaec243ce98e1b387f56cd7a2c46 GIT binary patch literal 4455 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 .headerBar { + display: grid; + grid-template-columns: 1fr auto; + align-items: center; + + > h1 { + justify-self: start; + } + + .openModsFolder { + background-color: $modsColor; + } + } + + .noModSupport { + display: flex; + align-items: center; + justify-content: center; + height: 100%; + flex-direction: column; + + .steamLink { + @include S(height, 50px); + @include S(width, 220px); + background: #171a23 center center / contain no-repeat; + overflow: hidden; + display: block; + text-indent: -999em; + cursor: pointer; + @include S(margin-top, 30px); + pointer-events: all; + transition: all 0.12s ease-in; + transition-property: opacity, transform; + + @include S(border-radius, $globalBorderRadius); + + &:hover { + opacity: 0.9; + } + } + } + + .modsStats { + @include PlainText; + color: $accentColorDark; + + &.noMods { + @include S(width, 400px); + align-self: center; + justify-self: center; + text-align: center; + display: flex; + flex-direction: column; + align-items: center; + @include Text; + @include S(margin-top, 100px); + color: lighten($accentColorDark, 15); + + &::before { + @include S(margin-bottom, 15px); + content: ""; + @include S(width, 50px); + @include S(height, 50px); + background-position: center center; + background-size: contain; + opacity: 0.2; + } + &::before { + /* @load-async */ + background-image: uiResource("res/ui/icons/mods.png") !important; + } + } + } + + .modsList { + @include S(margin-top, 10px); + overflow-y: scroll; + pointer-events: all; + @include S(padding-right, 5px); + flex-grow: 1; + + .mod { + @include S(border-radius, $globalBorderRadius); + background: $accentColorBright; + @include S(margin-bottom, 4px); + @include S(padding, 7px); + @include S(grid-gap, 5px); + display: grid; + grid-template-columns: 1fr D(100px) D(100px) D(100px); + + .checkbox { + align-self: center; + justify-self: center; + } + + .mainInfo { + display: flex; + flex-direction: column; + + .description { + @include SuperSmallText; + @include S(margin-top, 5px); + color: $accentColorDark; + } + .website { + text-transform: uppercase; + align-self: start; + @include SuperSmallText; + @include S(margin-top, 5px); + } + } + + .version, + .author { + display: flex; + flex-direction: column; + strong { + text-transform: uppercase; + color: $accentColorDark; + @include SuperSmallText; + } + } + } + } +} diff --git a/src/css/states/settings.scss b/src/css/states/settings.scss index 5b36c677..75ef6b85 100644 --- a/src/css/states/settings.scss +++ b/src/css/states/settings.scss @@ -15,20 +15,21 @@ } .sidebar { - display: grid; + display: flex; @include S(min-width, 210px); @include S(max-width, 320px); - @include S(grid-gap, 3px); - grid-template-rows: auto auto auto auto auto 1fr; + flex-direction: column; @include StyleBelowWidth($layoutBreak) { - grid-template-rows: 1fr 1fr; - grid-template-columns: auto auto; + display: grid; + grid-template-columns: 1fr 1fr 1fr; + @include S(grid-gap, 5px); max-width: unset !important; } button { text-align: left; + @include S(margin-bottom, 3px); &::after { content: unset; } @@ -37,15 +38,26 @@ @include StyleBelowWidth($layoutBreak) { text-align: center; + height: D(30px) !important; + padding: D(5px) !important; } } .other { - @include S(margin-top, 10px); align-self: end; + margin-top: auto; @include StyleBelowWidth($layoutBreak) { margin-top: 0; + display: grid; + grid-template-columns: 1fr 1fr; + @include S(grid-gap, 5px); + max-width: unset !important; + grid-column: 1 / 3; + + button { + margin: 0 !important; + } } } @@ -69,6 +81,30 @@ } } + button.manageMods { + background-color: lighten($modsColor, 38); + color: $modsColor; + display: flex; + @include S(padding-right, 5px); + .newBadge { + color: #fff; + @include S(border-radius, $globalBorderRadius); + background: $modsColor; + margin-left: auto; + @include S(padding, 0, 3px, 0, 3px); + + @include InlineAnimation(1.3s ease-in-out infinite) { + 50% { + transform: rotate(0deg) scale(1.1); + } + } + } + + &.active { + background-color: $colorGreenBright; + } + } + button.privacy { @include S(margin-top, 4px); } diff --git a/src/css/variables.scss b/src/css/variables.scss index c7b7c17c..fe1fa864 100644 --- a/src/css/variables.scss +++ b/src/css/variables.scss @@ -38,6 +38,7 @@ $colorRedBright: #ef5072; $colorOrangeBright: #ef9d50; $themeColor: #393747; $ingameHudBg: rgba(#333438, 0.9); +$modsColor: rgb(214, 60, 228); $text3dColor: #f4ffff; diff --git a/src/js/application.js b/src/js/application.js index 67e9c353..44207e4d 100644 --- a/src/js/application.js +++ b/src/js/application.js @@ -37,6 +37,7 @@ import { LoginState } from "./states/login"; import { WegameSplashState } from "./states/wegame_splash"; import { MODS } from "./mods/modloader"; import { MOD_SIGNALS } from "./mods/mod_signals"; +import { ModsState } from "./states/mods"; /** * @typedef {import("./platform/achievement_provider").AchievementProviderInterface} AchievementProviderInterface @@ -171,6 +172,7 @@ export class Application { ChangelogState, PuzzleMenuState, LoginState, + ModsState, ]; for (let i = 0; i < states.length; ++i) { diff --git a/src/js/mods/demo_mod.nobuild/index.js b/src/js/mods/demo_mod.nobuild/index.js index b636dace..2188defc 100644 --- a/src/js/mods/demo_mod.nobuild/index.js +++ b/src/js/mods/demo_mod.nobuild/index.js @@ -16,11 +16,12 @@ registerMod(shapez => { super( app, { - authorContact: "tobias@tobspr.io", - authorName: "tobspr", + website: "https://tobspr.io", + author: "tobspr", name: "Demo Mod", version: "1", id: "demo-mod", + description: "A simple mod to demonstrate the capatibilities of the mod loader.", }, modLoader ); @@ -28,11 +29,11 @@ registerMod(shapez => { init() { // Add some custom css - this.modInterface.registerCss(` - * { - font-family: "Comic Sans", "Comic Sans MS", Tahoma !important; - } - `); + // this.modInterface.registerCss(` + // * { + // font-family: "Comic Sans", "Comic Sans MS", Tahoma !important; + // } + // `); // Replace a builtin sprite ["red", "green", "blue", "yellow", "purple", "cyan", "white"].forEach(color => { diff --git a/src/js/mods/mod.js b/src/js/mods/mod.js index b9018b68..4e14bfe2 100644 --- a/src/js/mods/mod.js +++ b/src/js/mods/mod.js @@ -12,8 +12,9 @@ export class Mod { * @param {object} metadata * @param {string} metadata.name * @param {string} metadata.version - * @param {string} metadata.authorName - * @param {string} metadata.authorContact + * @param {string} metadata.author + * @param {string} metadata.website + * @param {string} metadata.description * @param {string} metadata.id * * @param {ModLoader} modLoader diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index a6bb940a..91142c3b 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -155,36 +155,22 @@ export class MainMenuState extends GameState { ? `
-

${T.mainMenu.mods.title} - -

- +
+

${T.mods.title}

+ +
${MODS.mods .map(mod => { return ` -
- ${mod.metadata.name} - ${T.mainMenu.mods.version.replace( - "", - mod.metadata.version - )} - ${T.mainMenu.mods.author.replace( - "", - mod.metadata.authorName - )} -
+
${mod.metadata.name} @ v${mod.metadata.version}
`; }) .join("")}
- ${T.mainMenu.modsWarningPuzzleDLC} - - + ${T.mainMenu.mods.warningPuzzleDLC}
@@ -381,7 +367,7 @@ export class MainMenuState extends GameState { ".puzzleDlcPlayButton": this.onPuzzleModeButtonClicked, ".puzzleDlcGetButton": this.onPuzzleWishlistButtonClicked, ".wegameDisclaimer > .rating": this.onWegameRatingClicked, - ".modsOpenFolder": this.openModsFolder, + ".editMods": this.onModsClicked, }; for (const key in clickHandling) { @@ -430,6 +416,14 @@ export class MainMenuState extends GameState { this.trackClicks(playBtn, this.onPlayButtonClicked); buttonContainer.appendChild(importButtonElement); } + + // Mods + const modsBtn = makeButton( + this.htmlElement.querySelector(".mainContainer .outer"), + ["modsButton", "styledButton"], + " " + ); + this.trackClicks(modsBtn, this.onModsClicked); } onPuzzleModeButtonClicked(force = false) { @@ -742,6 +736,12 @@ export class MainMenuState extends GameState { ); } + onModsClicked() { + this.moveToState("ModsState", { + backToStateId: "MainMenuState", + }); + } + onContinueButtonClicked() { let latestLastUpdate = 0; let latestInternalId; @@ -763,14 +763,6 @@ export class MainMenuState extends GameState { }); } - openModsFolder() { - if (!G_IS_STANDALONE) { - this.dialogs.showWarning(T.global.error, T.mainMenu.mods.folderOnlyStandalone); - return; - } - getIPCRenderer().send("open-mods-folder"); - } - onLeave() { this.dialogs.cleanup(); } diff --git a/src/js/states/mods.js b/src/js/states/mods.js new file mode 100644 index 00000000..d746434d --- /dev/null +++ b/src/js/states/mods.js @@ -0,0 +1,135 @@ +import { THIRDPARTY_URLS } from "../core/config"; +import { TextualGameState } from "../core/textual_game_state"; +import { getIPCRenderer } from "../core/utils"; +import { MODS } from "../mods/modloader"; +import { T } from "../translations"; + +export class ModsState extends TextualGameState { + constructor() { + super("ModsState"); + } + + getStateHeaderTitle() { + return T.mods.title; + } + + internalGetFullHtml() { + let headerHtml = ` +
+

${this.getStateHeaderTitle()}

+ +
+ ${ + G_IS_STANDALONE || G_IS_DEV + ? `` + : "" + } +
+ +
`; + + return ` + ${headerHtml} +
+ ${this.getInnerHTML()} +
+ `; + } + + getMainContentHTML() { + if (!G_IS_STANDALONE && !G_IS_DEV) { + return ` +
+ +

${T.mods.noModSupport}

+ + Get the shapez.io standalone! + + +
+ `; + } + + if (MODS.mods.length === 0) { + return ` + +
+ + ${T.mods.modsInfo} +
+ + `; + } + + let modsHtml = ``; + + MODS.mods.forEach(mod => { + modsHtml += ` +
+
+ ${mod.metadata.name} + ${mod.metadata.description} + Website +
+ ${T.mods.version}${mod.metadata.version} + ${T.mods.author}${mod.metadata.author} +
+ +
+ +
+ `; + }); + return ` + +
+ ${T.mods.modsInfo} +
+ +
+ ${modsHtml} +
+ `; + } + + onEnter() { + const steamLink = this.htmlElement.querySelector(".steamLink"); + if (steamLink) { + this.trackClicks(steamLink, this.onSteamLinkClicked); + } + const openModsFolder = this.htmlElement.querySelector(".openModsFolder"); + if (openModsFolder) { + this.trackClicks(openModsFolder, this.openModsFolder); + } + + const checkboxes = this.htmlElement.querySelectorAll(".checkbox"); + Array.from(checkboxes).forEach(checkbox => { + this.trackClicks(checkbox, this.showModTogglingComingSoon); + }); + } + + showModTogglingComingSoon() { + this.dialogs.showWarning(T.mods.togglingComingSoon.title, T.mods.togglingComingSoon.description); + } + + openModsFolder() { + if (!G_IS_STANDALONE) { + this.dialogs.showWarning(T.global.error, T.mods.folderOnlyStandalone); + return; + } + getIPCRenderer().send("open-mods-folder"); + } + + onSteamLinkClicked() { + this.app.analytics.trackUiClick("mods_steam_link"); + this.app.platformWrapper.openExternalLink( + THIRDPARTY_URLS.stanaloneCampaignLink + "/shapez_modsettings" + ); + + return false; + } + + getDefaultPreviousState() { + return "SettingsState"; + } +} diff --git a/src/js/states/settings.js b/src/js/states/settings.js index 352e0153..b28a4136 100644 --- a/src/js/states/settings.js +++ b/src/js/states/settings.js @@ -19,6 +19,8 @@ export class SettingsState extends TextualGameState {
${this.getCategoryButtonsHtml()} + + ${ this.app.platformWrapper.getSupportsKeyboard() ? ` @@ -28,6 +30,18 @@ export class SettingsState extends TextualGameState { : "" } + ${ + G_WEGAME_VERSION + ? "" + : ` + + +` + } + +
${ @@ -131,6 +145,11 @@ export class SettingsState extends TextualGameState { this.htmlElement.querySelector(".category").classList.add("active"); this.htmlElement.querySelector(".categoryButton").classList.add("active"); + + const modsButton = this.htmlElement.querySelector(".manageMods"); + if (modsButton) { + this.trackClicks(modsButton, this.onModsClicked, { preventDefault: false }); + } } setActiveCategory(category) { @@ -196,4 +215,8 @@ export class SettingsState extends TextualGameState { onKeybindingsClicked() { this.moveToStateAddGoBack("KeybindingsState"); } + + onModsClicked() { + this.moveToStateAddGoBack("ModsState"); + } } diff --git a/translations/base-en.yaml b/translations/base-en.yaml index a7a27bfe..14dd610e 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -126,15 +126,10 @@ mainMenu: puzzleDlcWishlist: Wishlist now! puzzleDlcViewNow: View Dlc - modsWarningPuzzleDLC: >- - Playing the Puzzle DLC is not possible with mods. Please disable all mods to play the DLC. - mods: title: Active Mods - author: by - version: v - openFolder: Open Folder - folderOnlyStandalone: Opening the mod folder is only possible when running the standalone. + warningPuzzleDLC: >- + Playing the Puzzle DLC is not possible with mods. Please disable all mods to play the DLC. puzzleMenu: play: Play @@ -1096,6 +1091,22 @@ storyRewards: desc: >- You have reached the end of the demo version! +mods: + title: Mods + + author: Author + version: Version + openFolder: Open Mods Folder + folderOnlyStandalone: Opening the mod folder is only possible when running the standalone. + + modsInfo: >- + To install and manage mods, copy them to the mods folder within the game directory. You can also use the 'Open Mods Folder' button on the top right. + noModSupport: You need the standalone version on Steam to install mods. + + togglingComingSoon: + title: Coming Soon + description: Enabling or disabling mods is currently only possible by copying the mod file from or to the mods/ folder. However, being able to toggle them here is planned for a future update! + settings: title: Settings categories: @@ -1111,6 +1122,7 @@ settings: buildDate: Built tickrateHz: Hz rangeSliderPercentage: % + newBadge: New! labels: uiScale: From ebda1c5024747ba8cc7c132746a68425a92bf1ae Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 13:09:05 +0100 Subject: [PATCH 020/129] Allow mods to register game systems and draw stuff --- src/js/game/game_system_manager.js | 22 +++++++ src/js/game/map_chunk_view.js | 33 ++++++++++- src/js/mods/demo_mod.nobuild/index.js | 82 ++++++++++++++++++++++++++- src/js/mods/mod_interface.js | 37 ++++++++++++ 4 files changed, 172 insertions(+), 2 deletions(-) diff --git a/src/js/game/game_system_manager.js b/src/js/game/game_system_manager.js index 08609f89..05085b70 100644 --- a/src/js/game/game_system_manager.js +++ b/src/js/game/game_system_manager.js @@ -1,4 +1,5 @@ /* typehints:start */ +import { GameSystem } from "./game_system"; import { GameRoot } from "./root"; /* typehints:end */ @@ -30,6 +31,11 @@ import { ZoneSystem } from "./systems/zone"; const logger = createLogger("game_system_manager"); +/** + * @type {Object GameSystem}>>} + */ +export const MODS_ADDITIONAL_SYSTEMS = {}; + export class GameSystemManager { /** * @@ -123,7 +129,15 @@ export class GameSystemManager { * Initializes all systems */ internalInitSystems() { + const addBefore = id => { + const systems = MODS_ADDITIONAL_SYSTEMS[id]; + if (systems) { + systems.forEach(({ id, systemClass }) => add(id, systemClass)); + } + }; + const add = (id, systemClass) => { + addBefore(id); this.systems[id] = new systemClass(this.root); this.systemUpdateOrder.push(id); }; @@ -187,6 +201,14 @@ export class GameSystemManager { add("zone", ZoneSystem); } + addBefore("end"); + + for (const key in MODS_ADDITIONAL_SYSTEMS) { + if (!this.systems[key]) { + logger.error("Mod system not attached due to invalid 'before': ", key); + } + } + logger.log("📦 There are", this.systemUpdateOrder.length, "game systems"); } diff --git a/src/js/game/map_chunk_view.js b/src/js/game/map_chunk_view.js index 947b7a9f..86c14fb8 100644 --- a/src/js/game/map_chunk_view.js +++ b/src/js/game/map_chunk_view.js @@ -5,10 +5,20 @@ import { Entity } from "./entity"; import { MapChunk } from "./map_chunk"; import { GameRoot } from "./root"; import { THEME } from "./theme"; -import { drawSpriteClipped } from "../core/draw_utils"; export const CHUNK_OVERLAY_RES = 3; +export const MOD_CHUNK_DRAW_HOOKS = { + backgroundLayerBefore: [], + backgroundLayerAfter: [], + + foregroundDynamicBefore: [], + foregroundDynamicAfter: [], + + staticBefore: [], + staticAfter: [], +}; + export class MapChunkView extends MapChunk { /** * @@ -42,6 +52,11 @@ export class MapChunkView extends MapChunk { */ drawBackgroundLayer(parameters) { const systems = this.root.systemMgr.systems; + + MOD_CHUNK_DRAW_HOOKS.backgroundLayerBefore.forEach(systemId => + systems[systemId].drawChunk(parameters, this) + ); + if (systems.zone) { systems.zone.drawChunk(parameters, this); } @@ -52,6 +67,10 @@ export class MapChunkView extends MapChunk { systems.beltUnderlays.drawChunk(parameters, this); systems.belt.drawChunk(parameters, this); + + MOD_CHUNK_DRAW_HOOKS.backgroundLayerAfter.forEach(systemId => + systems[systemId].drawChunk(parameters, this) + ); } /** @@ -61,9 +80,17 @@ export class MapChunkView extends MapChunk { drawForegroundDynamicLayer(parameters) { const systems = this.root.systemMgr.systems; + MOD_CHUNK_DRAW_HOOKS.foregroundDynamicBefore.forEach(systemId => + systems[systemId].drawChunk(parameters, this) + ); + systems.itemEjector.drawChunk(parameters, this); systems.itemAcceptor.drawChunk(parameters, this); systems.miner.drawChunk(parameters, this); + + MOD_CHUNK_DRAW_HOOKS.foregroundDynamicAfter.forEach(systemId => + systems[systemId].drawChunk(parameters, this) + ); } /** @@ -73,6 +100,8 @@ export class MapChunkView extends MapChunk { drawForegroundStaticLayer(parameters) { const systems = this.root.systemMgr.systems; + MOD_CHUNK_DRAW_HOOKS.staticBefore.forEach(systemId => systems[systemId].drawChunk(parameters, this)); + systems.staticMapEntities.drawChunk(parameters, this); systems.lever.drawChunk(parameters, this); systems.display.drawChunk(parameters, this); @@ -80,6 +109,8 @@ export class MapChunkView extends MapChunk { systems.constantProducer.drawChunk(parameters, this); systems.goalAcceptor.drawChunk(parameters, this); systems.itemProcessorOverlays.drawChunk(parameters, this); + + MOD_CHUNK_DRAW_HOOKS.staticAfter.forEach(systemId => systems[systemId].drawChunk(parameters, this)); } /** diff --git a/src/js/mods/demo_mod.nobuild/index.js b/src/js/mods/demo_mod.nobuild/index.js index 2188defc..99ea39b7 100644 --- a/src/js/mods/demo_mod.nobuild/index.js +++ b/src/js/mods/demo_mod.nobuild/index.js @@ -1,4 +1,22 @@ registerMod(shapez => { + class DemoModComponent extends shapez.Component { + static getId() { + return "DemoMod"; + } + + static getSchema() { + return { + magicNumber: shapez.types.uint, + }; + } + + constructor(magicNumber) { + super(); + + this.magicNumber = magicNumber; + } + } + class MetaDemoModBuilding extends shapez.MetaBuilding { constructor() { super("demoModBuilding"); @@ -8,7 +26,58 @@ registerMod(shapez => { return "red"; } - setupEntityComponents(entity) {} + setupEntityComponents(entity) { + entity.addComponent(new DemoModComponent(Math.floor(Math.random() * 100.0))); + } + } + + class DemoModSystem extends shapez.GameSystemWithFilter { + constructor(root) { + super(root, [DemoModComponent]); + } + + update() { + // nothing to do here + } + + drawChunk(parameters, chunk) { + const contents = chunk.containedEntitiesByLayer.regular; + for (let i = 0; i < contents.length; ++i) { + const entity = contents[i]; + const demoComp = entity.components.DemoMod; + if (!demoComp) { + continue; + } + + const staticComp = entity.components.StaticMapEntity; + + const context = parameters.context; + const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace(); + + // Culling for better performance + if (parameters.visibleRect.containsCircle(center.x, center.y, 40)) { + // Circle + context.fillStyle = "#53cf47"; + context.strokeStyle = "#000"; + context.lineWidth = 2; + + const timeFactor = 5.23 * this.root.time.now(); + context.beginCircle( + center.x + Math.cos(timeFactor) * 10, + center.y + Math.sin(timeFactor) * 10, + 7 + ); + context.fill(); + context.stroke(); + + // Text + context.fillStyle = "#fff"; + context.textAlign = "center"; + context.font = "12px GameFont"; + context.fillText(demoComp.magicNumber, center.x, center.y + 4); + } + } + } } return class ModImpl extends shapez.Mod { @@ -87,6 +156,17 @@ registerMod(shapez => { }, }); + // Register a new component + this.modInterface.registerComponent(DemoModComponent); + + // Register a new game system which can update and draw stuff + this.modInterface.registerGameSystem({ + id: "demo_mod", + systemClass: DemoModSystem, + before: "belt", + drawHooks: ["staticAfter"], + }); + // Register the new building this.modInterface.registerNewBuilding({ metaClass: MetaDemoModBuilding, diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 89330d3d..40f1cb13 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -1,5 +1,6 @@ /* typehints:start */ import { ModLoader } from "./modloader"; +import { GameSystem } from "../game/game_system"; import { Component } from "../game/component"; import { MetaBuilding } from "../game/meta_building"; /* typehints:end */ @@ -19,6 +20,8 @@ import { matchDataRecursive, T } from "../translations"; import { gBuildingVariants, registerBuildingVariant } from "../game/building_codes"; import { gComponentRegistry, gMetaBuildingRegistry } from "../core/global_registries"; import { MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS } from "../game/map_chunk"; +import { MODS_ADDITIONAL_SYSTEMS } from "../game/game_system_manager"; +import { MOD_CHUNK_DRAW_HOOKS } from "../game/map_chunk_view"; const LOG = createLogger("mod-interface"); @@ -115,6 +118,40 @@ export class ModInterface { gComponentRegistry.register(component); } + /** + * + * @param {Object} param0 + * @param {string} param0.id + * @param {new (any) => GameSystem} param0.systemClass + * @param {string=} param0.before + * @param {string[]=} param0.drawHooks + */ + registerGameSystem({ id, systemClass, before, drawHooks }) { + const key = before || "key"; + const payload = { id, systemClass }; + + if (MODS_ADDITIONAL_SYSTEMS[key]) { + MODS_ADDITIONAL_SYSTEMS[key].push(payload); + } else { + MODS_ADDITIONAL_SYSTEMS[key] = [payload]; + } + if (drawHooks) { + drawHooks.forEach(hookId => this.registerGameSystemDrawHook(hookId, id)); + } + } + + /** + * + * @param {string} hookId + * @param {string} systemId + */ + registerGameSystemDrawHook(hookId, systemId) { + if (!MOD_CHUNK_DRAW_HOOKS[hookId]) { + throw new Error("bad game system draw hook: " + hookId); + } + MOD_CHUNK_DRAW_HOOKS[hookId].push(systemId); + } + /** * * @param {object} param0 From 497990905a27184aa2f3bf5de9f832f37928af86 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 16:24:15 +0100 Subject: [PATCH 021/129] Change mods path --- electron/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/electron/index.js b/electron/index.js index b3f75e72..c2d894f2 100644 --- a/electron/index.js +++ b/electron/index.js @@ -17,13 +17,17 @@ const roamingFolder = ? process.env.HOME + "/Library/Preferences" : process.env.HOME + "/.local/share"); let storePath = path.join(roamingFolder, "shapez.io", "saves"); -let modsPath = path.join(path.dirname(app.getPath("exe")), "mods"); +let modsPath = path.join(roamingFolder, "shapez.io", "mods"); if (!fs.existsSync(storePath)) { // No try-catch by design fs.mkdirSync(storePath, { recursive: true }); } +if (!fs.existsSync(modsPath)) { + fs.mkdirSync(modsPath, { recursive: true }); +} + /** @type {BrowserWindow} */ let win = null; let menu = null; From de8afcedc938c24e7400b56c4440a750032e6b65 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 16:38:25 +0100 Subject: [PATCH 022/129] Fix sprites not loading --- src/js/core/background_resources_loader.js | 1 - src/js/core/loader.js | 8 +++--- src/js/core/sprites.js | 2 ++ src/js/mods/mod_interface.js | 31 ++++++++++++---------- src/js/mods/mod_signals.js | 1 - 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/js/core/background_resources_loader.js b/src/js/core/background_resources_loader.js index 10f8d6f0..79c43e20 100644 --- a/src/js/core/background_resources_loader.js +++ b/src/js/core/background_resources_loader.js @@ -233,7 +233,6 @@ export class BackgroundResourcesLoader { this.numAssetsToLoadTotal = 0; this.numAssetsLoaded = 0; }) - .then(MODS.modInterface.injectSprites.bind(MODS.modInterface)) ); } } diff --git a/src/js/core/loader.js b/src/js/core/loader.js index b955beda..14866ad6 100644 --- a/src/js/core/loader.js +++ b/src/js/core/loader.js @@ -169,6 +169,9 @@ class LoaderImpl { sprite = new AtlasSprite(spriteName); this.sprites.set(spriteName, sprite); } + if (sprite.frozen) { + continue; + } const link = new SpriteAtlasLink({ packedX: frame.x, @@ -181,10 +184,7 @@ class LoaderImpl { w: sourceSize.w, h: sourceSize.h, }); - if (sprite.linksByResolution[scale]) { - // Seems data is already present, might have been replaced by a mod - continue; - } + sprite.linksByResolution[scale] = link; } } diff --git a/src/js/core/sprites.js b/src/js/core/sprites.js index 1019d8f7..51032e4e 100644 --- a/src/js/core/sprites.js +++ b/src/js/core/sprites.js @@ -71,6 +71,8 @@ export class AtlasSprite extends BaseSprite { /** @type {Object.} */ this.linksByResolution = {}; this.spriteName = spriteName; + + this.frozen = false; } getRawTexture() { diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 40f1cb13..ae091e31 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -46,18 +46,30 @@ export class ModInterface { registerSprite(spriteId, base64string) { assert(base64string.startsWith("data:image")); const img = new Image(); - img.src = base64string; const sprite = new AtlasSprite(spriteId); + sprite.frozen = true; + + img.addEventListener("load", () => { + for (const resolution in sprite.linksByResolution) { + const link = sprite.linksByResolution[resolution]; + link.w = img.width; + link.h = img.height; + link.packedW = img.width; + link.packedH = img.height; + } + }); + + img.src = base64string; const link = new SpriteAtlasLink({ - w: img.width, - h: img.height, + w: 1, + h: 1, atlas: img, packOffsetX: 0, packOffsetY: 0, - packedW: img.width, - packedH: img.height, + packedW: 1, + packedH: 1, packedX: 0, packedY: 0, }); @@ -66,18 +78,9 @@ export class ModInterface { sprite.linksByResolution["0.5"] = link; sprite.linksByResolution["0.75"] = link; - this.lazySprites.set(spriteId, sprite); Loader.sprites.set(spriteId, sprite); } - injectSprites() { - LOG.log("inject sprites"); - this.lazySprites.forEach((sprite, key) => { - Loader.sprites.set(key, sprite); - console.log("override", key); - }); - } - /** * * @param {object} param0 diff --git a/src/js/mods/mod_signals.js b/src/js/mods/mod_signals.js index 23670d8b..7701e10f 100644 --- a/src/js/mods/mod_signals.js +++ b/src/js/mods/mod_signals.js @@ -9,7 +9,6 @@ export const MOD_SIGNALS = { postInit: new Signal(), platformInstancesInitialized: new Signal(), - injectSprites: new Signal(), preprocessTheme: /** @type {TypedSignal<[Object]>} */ (new Signal()), modifyLevelDefinitions: /** @type {TypedSignal<[Array[Object]]>} */ (new Signal()), modifyUpgrades: /** @type {TypedSignal<[Object]>} */ (new Signal()), From 81da328f5abc707ce0ea36100632fc08a9f82eba Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 16:53:20 +0100 Subject: [PATCH 023/129] Minor adjustments, closes #1333 --- electron/index.js | 45 +++++++++++++++++------------- src/css/states/main_menu.scss | 3 +- src/js/core/utils.js | 2 +- src/js/states/main_menu.js | 52 ++++++++++++++++------------------- 4 files changed, 53 insertions(+), 49 deletions(-) diff --git a/electron/index.js b/electron/index.js index c2d894f2..411faf27 100644 --- a/electron/index.js +++ b/electron/index.js @@ -7,15 +7,17 @@ const fs = require("fs"); const steam = require("./steam"); const asyncLock = require("async-lock"); -const isDev = process.argv.indexOf("--dev") >= 0; -const isLocal = process.argv.indexOf("--local") >= 0; -const safeMode = process.argv.indexOf("--safe-mode") >= 0; +const isDev = app.commandLine.hasSwitch("dev"); +const isLocal = app.commandLine.hasSwitch("local"); +const safeMode = app.commandLine.hasSwitch("safe-mode"); +const externalMod = app.commandLine.getSwitchValue("load-mod"); const roamingFolder = process.env.APPDATA || (process.platform == "darwin" ? process.env.HOME + "/Library/Preferences" : process.env.HOME + "/.local/share"); + let storePath = path.join(roamingFolder, "shapez.io", "saves"); let modsPath = path.join(roamingFolder, "shapez.io", "mods"); @@ -122,7 +124,7 @@ function createWindow() { if (!app.requestSingleInstanceLock()) { app.exit(0); } else { - app.on("second-instance", (event, commandLine, workingDirectory) => { + app.on("second-instance", () => { // Someone tried to run a second instance, we should focus if (win) { if (win.isMinimized()) { @@ -144,7 +146,7 @@ ipcMain.on("set-fullscreen", (event, flag) => { win.setFullScreen(flag); }); -ipcMain.on("exit-app", (event, flag) => { +ipcMain.on("exit-app", () => { win.close(); app.quit(); }); @@ -175,14 +177,14 @@ async function writeFileSafe(filename, contents) { if (!fs.existsSync(filename)) { // this one is easy console.log(prefix, "Writing file instantly because it does not exist:", niceFileName(filename)); - await fs.promises.writeFile(filename, contents, { encoding: "utf8" }); + await fs.promises.writeFile(filename, contents, "utf8"); return; } // first, write a temporary file (.tmp-XXX) const tempName = filename + ".tmp-" + transactionId; console.log(prefix, "Writing temporary file", niceFileName(tempName)); - await fs.promises.writeFile(tempName, contents, { encoding: "utf8" }); + await fs.promises.writeFile(tempName, contents, "utf8"); // now, rename the original file to (.backup-XXX) const oldTemporaryName = filename + ".backup-" + transactionId; @@ -237,7 +239,7 @@ async function performFsJob(job) { } try { - const data = await fs.promises.readFile(fname, { encoding: "utf8" }); + const data = await fs.promises.readFile(fname, "utf8"); return { success: true, data, @@ -278,7 +280,7 @@ async function performFsJob(job) { } default: - throw new Error("Unkown fs job: " + job.type); + throw new Error("Unknown fs job: " + job.type); } } @@ -291,20 +293,25 @@ ipcMain.on("open-mods-folder", async () => { shell.openPath(modsPath); }); -ipcMain.handle("get-mods", async (event, arg) => { +ipcMain.handle("get-mods", async () => { if (safeMode) { - console.warn("Not loading mods due to safe mode"); - return []; - } - if (!fs.existsSync(modsPath)) { - console.warn("Mods folder not found:", modsPath); - return []; + console.log("Safe Mode enabled for mods, skipping mod search"); } + try { console.log("Loading mods from", modsPath); - let entries = fs.readdirSync(modsPath); - entries = entries.filter(entry => entry.endsWith(".js")); - return entries.map(filename => fs.readFileSync(path.join(modsPath, filename), { encoding: "utf8" })); + let modFiles = safeMode + ? [] + : fs + .readdirSync(modsPath) + .filter(filename => filename.endsWith(".js")) + .map(filename => path.join(modsPath, filename)); + if (externalMod) { + console.log("Adding external mod source:", externalMod); + modFiles.push(externalMod); + } + + return modFiles.map(filename => fs.readFileSync(filename, "utf8")); } catch (ex) { throw new Error(ex); } diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss index f6e0c776..c221c18e 100644 --- a/src/css/states/main_menu.scss +++ b/src/css/states/main_menu.scss @@ -304,6 +304,7 @@ position: relative; text-align: left; align-items: flex-start; + @include S(width, 250px); @include S(padding, 15px); @include S(padding-bottom, 10px); @include S(border-radius, $globalBorderRadius); @@ -337,7 +338,7 @@ .dlcHint { @include SuperSmallText; @include S(margin-top, 10px); - @include S(width, 300px); + width: 100%; display: grid; grid-template-columns: 1fr auto; diff --git a/src/js/core/utils.js b/src/js/core/utils.js index 1d1b0b02..2c2c0ed8 100644 --- a/src/js/core/utils.js +++ b/src/js/core/utils.js @@ -395,7 +395,7 @@ export function clamp(v, minimum = 0, maximum = 1) { * @param {Array=} classes * @param {string=} innerHTML */ -function makeDivElement(id = null, classes = [], innerHTML = "") { +export function makeDivElement(id = null, classes = [], innerHTML = "") { const div = document.createElement("div"); if (id) { div.id = id; diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index 91142c3b..cbebd629 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -8,11 +8,10 @@ import { ReadWriteProxy } from "../core/read_write_proxy"; import { formatSecondsToTimeAgo, generateFileDownload, - getIPCRenderer, isSupportedBrowser, makeButton, - makeButtonElement, makeDiv, + makeDivElement, removeAllChildren, startFileChoose, waitNextFrame, @@ -386,44 +385,41 @@ export class MainMenuState extends GameState { const buttonContainer = this.htmlElement.querySelector(".mainContainer .buttons"); removeAllChildren(buttonContainer); + const outerDiv = makeDivElement(null, ["outer"], null); + // Import button - const importButtonElement = makeButtonElement( - ["importButton", "styledButton"], - T.mainMenu.importSavegame + this.trackClicks( + makeButton(outerDiv, ["importButton", "styledButton"], T.mainMenu.importSavegame), + this.requestImportSavegame ); - this.trackClicks(importButtonElement, this.requestImportSavegame); if (this.savedGames.length > 0) { // Continue game - const continueButton = makeButton( - buttonContainer, - ["continueButton", "styledButton"], - T.mainMenu.continue + this.trackClicks( + makeButton(buttonContainer, ["continueButton", "styledButton"], T.mainMenu.continue), + this.onContinueButtonClicked ); - this.trackClicks(continueButton, this.onContinueButtonClicked); - const outerDiv = makeDiv(buttonContainer, null, ["outer"], null); - outerDiv.appendChild(importButtonElement); - const newGameButton = makeButton( - this.htmlElement.querySelector(".mainContainer .outer"), - ["newGameButton", "styledButton"], - T.mainMenu.newGame + // New game + this.trackClicks( + makeButton(outerDiv, ["newGameButton", "styledButton"], T.mainMenu.newGame), + this.onPlayButtonClicked + ); + + // Mods + this.trackClicks( + makeButton(outerDiv, ["modsButton", "styledButton"], " "), + this.onModsClicked ); - this.trackClicks(newGameButton, this.onPlayButtonClicked); } else { // New game - const playBtn = makeButton(buttonContainer, ["playButton", "styledButton"], T.mainMenu.play); - this.trackClicks(playBtn, this.onPlayButtonClicked); - buttonContainer.appendChild(importButtonElement); + this.trackClicks( + makeButton(buttonContainer, ["playButton", "styledButton"], T.mainMenu.play), + this.onPlayButtonClicked + ); } - // Mods - const modsBtn = makeButton( - this.htmlElement.querySelector(".mainContainer .outer"), - ["modsButton", "styledButton"], - " " - ); - this.trackClicks(modsBtn, this.onModsClicked); + buttonContainer.appendChild(outerDiv); } onPuzzleModeButtonClicked(force = false) { From 99e49d5abbce55d2a98e2a2a0b6caea726c756bb Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 17:03:03 +0100 Subject: [PATCH 024/129] Add support for loading atlases via mods --- src/js/mods/demo_mod.nobuild/index.js | 9 +++++++ src/js/mods/mod_interface.js | 35 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/src/js/mods/demo_mod.nobuild/index.js b/src/js/mods/demo_mod.nobuild/index.js index 99ea39b7..083d9ca6 100644 --- a/src/js/mods/demo_mod.nobuild/index.js +++ b/src/js/mods/demo_mod.nobuild/index.js @@ -112,6 +112,9 @@ registerMod(shapez => { ); }); + // Add an atlas + this.modInterface.registerAtlas(RESOURCES["demoAtlas.png"], RESOURCES["demoAtlas.json"]); + // Add a new type of sub shape ("Line", short code "L") this.modInterface.registerSubShapeType({ id: "line", @@ -224,4 +227,10 @@ const RESOURCES = { "demoBuildingBlueprint.png": "data:image/png;base64,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", + + "demoAtlas.png": + "data:image/png;base64,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", + + "demoAtlas.json": + '{"frames":{"enum_selector.png":{"frame":{"x":1,"y":1,"w":38,"h":23},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":5,"y":12,"w":38,"h":23},"sourceSize":{"w":48,"h":48}},"enum_selector_white.png":{"frame":{"x":387,"y":101,"w":38,"h":23},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":5,"y":12,"w":38,"h":23},"sourceSize":{"w":48,"h":48}},"icon.png":{"frame":{"x":387,"y":126,"w":284,"h":284},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":0,"y":0,"w":284,"h":284},"sourceSize":{"w":284,"h":284}},"sprites/blueprints/miner-chainable.png":{"frame":{"x":673,"y":267,"w":137,"h":143},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":4,"y":0,"w":137,"h":143},"sourceSize":{"w":144,"h":144}},"sprites/buildings/miner-chainable.png":{"frame":{"x":812,"y":268,"w":136,"h":142},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":5,"y":0,"w":136,"h":142},"sourceSize":{"w":144,"h":144}},"test.png":{"frame":{"x":1,"y":26,"w":384,"h":384},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":0,"y":0,"w":384,"h":384},"sourceSize":{"w":384,"h":384}}},"meta":{"image":"atlas0_hq.png","format":"RGBA8888","size":{"w":1024,"h":512},"scale":"0.75"}}', }; diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index ae091e31..3ab05af3 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -81,6 +81,41 @@ export class ModInterface { Loader.sprites.set(spriteId, sprite); } + /** + * + * @param {string} imageBase64 + * @param {string} jsonTextData + */ + registerAtlas(imageBase64, jsonTextData) { + const atlasData = JSON.parse(jsonTextData); + const img = new Image(); + img.src = imageBase64; + + const sourceData = atlasData.frames; + for (const spriteName in sourceData) { + const { frame, sourceSize, spriteSourceSize } = sourceData[spriteName]; + + const sprite = new AtlasSprite(spriteName); + Loader.sprites.set(spriteName, sprite); + sprite.frozen = true; + + const link = new SpriteAtlasLink({ + packedX: frame.x, + packedY: frame.y, + packedW: frame.w, + packedH: frame.h, + packOffsetX: spriteSourceSize.x, + packOffsetY: spriteSourceSize.y, + atlas: img, + w: sourceSize.w, + h: sourceSize.h, + }); + sprite.linksByResolution["0.25"] = link; + sprite.linksByResolution["0.5"] = link; + sprite.linksByResolution["0.75"] = link; + } + } + /** * * @param {object} param0 From 27e4dc9ba50e2146d3c77c96281bbd4c6674ed81 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 17:23:41 +0100 Subject: [PATCH 025/129] Add support for loading mods from external sources in DEV --- src/js/core/config.local.template.js | 4 ++-- src/js/mods/modloader.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/core/config.local.template.js b/src/js/core/config.local.template.js index ed230ae4..a1e7b98f 100644 --- a/src/js/core/config.local.template.js +++ b/src/js/core/config.local.template.js @@ -116,8 +116,8 @@ export default { // Disables slow asserts, useful for debugging performance // disableSlowAsserts: true, // ----------------------------------------------------------------------------------- - // Loads the dev_mod.js for developing new mods - // loadDevMod: true, + // Allows to load a mod from an external source for developing it + // externalModUrl: "http://localhost:3005/mods/demo_mod.nobuild/index.js", // ----------------------------------------------------------------------------------- /* dev:end */ }; diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index b9a7d4d2..c8e57f0b 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -40,9 +40,9 @@ export class ModLoader { let mods = []; if (G_IS_STANDALONE) { mods = await getIPCRenderer().invoke("get-mods"); - } else if (G_IS_DEV && globalConfig.debug.loadDevMod) { + } else if (G_IS_DEV && globalConfig.debug.externalModUrl) { const mod = await ( - await fetch("http://localhost:3005/mods/demo_mod.nobuild/index.js", { + await fetch(globalConfig.debug.externalModUrl, { method: "GET", }) ).text(); From df9ebd170f47897e9fdb6d469ccc4586bb4bb1f8 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 17:39:29 +0100 Subject: [PATCH 026/129] Add confirmation when loading mods --- electron/index.js | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/electron/index.js b/electron/index.js index 411faf27..81b0e360 100644 --- a/electron/index.js +++ b/electron/index.js @@ -1,6 +1,6 @@ /* eslint-disable quotes,no-undef */ -const { app, BrowserWindow, Menu, MenuItem, ipcMain, shell } = require("electron"); +const { app, BrowserWindow, Menu, MenuItem, ipcMain, shell, dialog } = require("electron"); const path = require("path"); const url = require("url"); const fs = require("fs"); @@ -306,11 +306,44 @@ ipcMain.handle("get-mods", async () => { .readdirSync(modsPath) .filter(filename => filename.endsWith(".js")) .map(filename => path.join(modsPath, filename)); + if (externalMod) { console.log("Adding external mod source:", externalMod); modFiles.push(externalMod); } + if (modFiles.length > 0 && !isDev) { + let confirmed = false; + while (!confirmed) { + const response = await dialog.showMessageBox(win, { + message: + "You have installed one or more mods for shapez.io. Please confirm that you are aware of the risks and install mods only from trusted sources.", + buttons: ["Exit Game", "Continue"], + type: "warning", + defaultId: 0, + + checkboxLabel: + "I understand that mods have access to my file system and can be potentially harmful", + checkboxChecked: false, + cancelId: 0, + }); + if (response.response === 1) { + if (response.checkboxChecked) { + break; + } else { + await dialog.showMessageBox(win, { + message: + "Please confirm that you have understood the risks by checking the checkbox in the next dialog.", + }); + } + } + if (response.response === 0) { + process.exit(0); + return; + } + } + } + return modFiles.map(filename => fs.readFileSync(filename, "utf8")); } catch (ex) { throw new Error(ex); From 3cfd4aaebdd7261dd31ac5ecda88ca18965bb033 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 17:46:28 +0100 Subject: [PATCH 027/129] Fix circular dependency --- src/js/application.js | 1 + src/js/core/globals.js | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/js/application.js b/src/js/application.js index 44207e4d..9827d674 100644 --- a/src/js/application.js +++ b/src/js/application.js @@ -69,6 +69,7 @@ export class Application { assert(!GLOBAL_APP, "Tried to construct application twice"); logger.log("Creating application, platform =", getPlatformName()); setGlobalApp(this); + MODS.app = this; this.unloaded = false; diff --git a/src/js/core/globals.js b/src/js/core/globals.js index 4e72dddf..15197880 100644 --- a/src/js/core/globals.js +++ b/src/js/core/globals.js @@ -2,8 +2,6 @@ import { Application } from "../application"; /* typehints:end */ -import { MODS } from "../mods/modloader"; - /** * Used for the bug reporter, and the click detector which both have no handles to this. * It would be nicer to have no globals, but this is the only one. I promise! @@ -16,5 +14,4 @@ export let GLOBAL_APP = null; export function setGlobalApp(app) { assert(!GLOBAL_APP, "Create application twice!"); GLOBAL_APP = app; - MODS.app = app; } From 8a60acc6e39233d0d1efdcaa004845ccd3adba98 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 19:01:38 +0100 Subject: [PATCH 028/129] Minor Keybindings refactor, add support for keybindings to mods, add support for dialogs to mods --- src/css/states/mods.scss | 7 +- src/css/states/settings.scss | 4 - src/js/core/input_distributor.js | 1 + src/js/core/modal_dialog_elements.js | 3 +- src/js/game/key_action_mapper.js | 259 ++++++++++++++++---------- src/js/mods/demo_mod.nobuild/index.js | 14 ++ src/js/mods/mod.js | 4 + src/js/mods/mod_interface.js | 68 ++++++- src/js/mods/mod_signals.js | 6 +- src/js/mods/modloader.js | 9 + src/js/states/ingame.js | 7 + src/js/states/keybindings.js | 20 +- translations/base-en.yaml | 1 + 13 files changed, 286 insertions(+), 117 deletions(-) diff --git a/src/css/states/mods.scss b/src/css/states/mods.scss index b0d0cb9b..54d8422b 100644 --- a/src/css/states/mods.scss +++ b/src/css/states/mods.scss @@ -89,10 +89,10 @@ @include S(border-radius, $globalBorderRadius); background: $accentColorBright; @include S(margin-bottom, 4px); - @include S(padding, 7px); - @include S(grid-gap, 5px); + @include S(padding, 7px, 10px); + @include S(grid-gap, 15px); display: grid; - grid-template-columns: 1fr D(100px) D(100px) D(100px); + grid-template-columns: 1fr D(100px) D(80px) D(50px); .checkbox { align-self: center; @@ -120,6 +120,7 @@ .author { display: flex; flex-direction: column; + align-self: center; strong { text-transform: uppercase; color: $accentColorDark; diff --git a/src/css/states/settings.scss b/src/css/states/settings.scss index 75ef6b85..15187cda 100644 --- a/src/css/states/settings.scss +++ b/src/css/states/settings.scss @@ -105,10 +105,6 @@ } } - button.privacy { - @include S(margin-top, 4px); - } - .versionbar { @include S(margin-top, 10px); diff --git a/src/js/core/input_distributor.js b/src/js/core/input_distributor.js index 03ad8e0c..debdba6c 100644 --- a/src/js/core/input_distributor.js +++ b/src/js/core/input_distributor.js @@ -211,6 +211,7 @@ export class InputDistributor { keyCode: keyCode, shift: event.shiftKey, alt: event.altKey, + ctrl: event.ctrlKey, initial: isInitial, event, }) === STOP_PROPAGATION diff --git a/src/js/core/modal_dialog_elements.js b/src/js/core/modal_dialog_elements.js index ee552aa9..5af7d9d1 100644 --- a/src/js/core/modal_dialog_elements.js +++ b/src/js/core/modal_dialog_elements.js @@ -90,8 +90,9 @@ export class Dialog { * @param {number} param0.keyCode * @param {boolean} param0.shift * @param {boolean} param0.alt + * @param {boolean} param0.ctrl */ - handleKeydown({ keyCode, shift, alt }) { + handleKeydown({ keyCode, shift, alt, ctrl }) { if (keyCode === kbEnter && this.enterHandler) { this.internalButtonHandler(this.enterHandler); return STOP_PROPAGATION; diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js index 090b8b83..3378368a 100644 --- a/src/js/game/key_action_mapper.js +++ b/src/js/game/key_action_mapper.js @@ -7,118 +7,152 @@ import { Application } from "../application"; import { Signal, STOP_PROPAGATION } from "../core/signal"; import { IS_MOBILE } from "../core/config"; import { T } from "../translations"; -function key(str) { + +export function keyToKeyCode(str) { return str.toUpperCase().charCodeAt(0); } -const KEYCODE_UP_ARROW = 38; -const KEYCODE_DOWN_ARROW = 40; -const KEYCODE_LEFT_ARROW = 37; -const KEYCODE_RIGHT_ARROW = 39; +export const KEYCODES = { + Tab: 9, + Enter: 13, + + Shift: 16, + Ctrl: 17, + Alt: 18, + + Escape: 27, + + Space: 32, + + ArrowLeft: 37, + ArrowUp: 38, + ArrowRight: 39, + ArrowDown: 40, + + Delete: 46, + + F1: 112, + F2: 113, + F3: 114, + F4: 115, + F5: 116, + F6: 117, + F7: 118, + F8: 119, + F9: 120, + F10: 121, + F11: 122, + F12: 123, + + Plus: 187, + Minus: 189, +}; export const KEYMAPPINGS = { + // Make sure mods come first so they can override everything + mods: {}, + general: { - confirm: { keyCode: 13 }, // enter - back: { keyCode: 27, builtin: true }, // escape + confirm: { keyCode: KEYCODES.Enter }, + back: { keyCode: KEYCODES.Escape, builtin: true }, }, ingame: { - menuOpenShop: { keyCode: key("F") }, - menuOpenStats: { keyCode: key("G") }, - menuClose: { keyCode: key("Q") }, + menuOpenShop: { keyCode: keyToKeyCode("F") }, + menuOpenStats: { keyCode: keyToKeyCode("G") }, + menuClose: { keyCode: keyToKeyCode("Q") }, - toggleHud: { keyCode: 113 }, // F2 - exportScreenshot: { keyCode: 114 }, // F3PS - toggleFPSInfo: { keyCode: 115 }, // F4 + toggleHud: { keyCode: KEYCODES.F2 }, + exportScreenshot: { keyCode: KEYCODES.F3 }, + toggleFPSInfo: { keyCode: KEYCODES.F4 }, - switchLayers: { keyCode: key("E") }, + switchLayers: { keyCode: keyToKeyCode("E") }, - showShapeTooltip: { keyCode: 18 }, // ALT + showShapeTooltip: { keyCode: KEYCODES.Alt }, }, navigation: { - mapMoveUp: { keyCode: key("W") }, - mapMoveRight: { keyCode: key("D") }, - mapMoveDown: { keyCode: key("S") }, - mapMoveLeft: { keyCode: key("A") }, - mapMoveFaster: { keyCode: 16 }, //shift + mapMoveUp: { keyCode: keyToKeyCode("W") }, + mapMoveRight: { keyCode: keyToKeyCode("D") }, + mapMoveDown: { keyCode: keyToKeyCode("S") }, + mapMoveLeft: { keyCode: keyToKeyCode("A") }, + mapMoveFaster: { keyCode: KEYCODES.Shift }, - centerMap: { keyCode: 32 }, // SPACE - mapZoomIn: { keyCode: 187, repeated: true }, // "+" - mapZoomOut: { keyCode: 189, repeated: true }, // "-" - - createMarker: { keyCode: key("M") }, + centerMap: { keyCode: KEYCODES.Space }, + mapZoomIn: { keyCode: KEYCODES.Plus, repeated: true }, + mapZoomOut: { keyCode: KEYCODES.Minus, repeated: true }, + createMarker: { keyCode: keyToKeyCode("M") }, }, buildings: { // Puzzle buildings - constant_producer: { keyCode: key("H") }, - goal_acceptor: { keyCode: key("N") }, - block: { keyCode: key("4") }, + constant_producer: { keyCode: keyToKeyCode("H") }, + goal_acceptor: { keyCode: keyToKeyCode("N") }, + block: { keyCode: keyToKeyCode("4") }, // Primary Toolbar - belt: { keyCode: key("1") }, - balancer: { keyCode: key("2") }, - underground_belt: { keyCode: key("3") }, - miner: { keyCode: key("4") }, - cutter: { keyCode: key("5") }, - rotater: { keyCode: key("6") }, - stacker: { keyCode: key("7") }, - mixer: { keyCode: key("8") }, - painter: { keyCode: key("9") }, - trash: { keyCode: key("0") }, + belt: { keyCode: keyToKeyCode("1") }, + balancer: { keyCode: keyToKeyCode("2") }, + underground_belt: { keyCode: keyToKeyCode("3") }, + miner: { keyCode: keyToKeyCode("4") }, + cutter: { keyCode: keyToKeyCode("5") }, + rotater: { keyCode: keyToKeyCode("6") }, + stacker: { keyCode: keyToKeyCode("7") }, + mixer: { keyCode: keyToKeyCode("8") }, + painter: { keyCode: keyToKeyCode("9") }, + trash: { keyCode: keyToKeyCode("0") }, // Sandbox - item_producer: { keyCode: key("L") }, + item_producer: { keyCode: keyToKeyCode("L") }, // Secondary toolbar - storage: { keyCode: key("Y") }, - reader: { keyCode: key("U") }, - lever: { keyCode: key("I") }, - filter: { keyCode: key("O") }, - display: { keyCode: key("P") }, + storage: { keyCode: keyToKeyCode("Y") }, + reader: { keyCode: keyToKeyCode("U") }, + lever: { keyCode: keyToKeyCode("I") }, + filter: { keyCode: keyToKeyCode("O") }, + display: { keyCode: keyToKeyCode("P") }, // Wires toolbar - wire: { keyCode: key("1") }, - wire_tunnel: { keyCode: key("2") }, - constant_signal: { keyCode: key("3") }, - logic_gate: { keyCode: key("4") }, - virtual_processor: { keyCode: key("5") }, - analyzer: { keyCode: key("6") }, - comparator: { keyCode: key("7") }, - transistor: { keyCode: key("8") }, + wire: { keyCode: keyToKeyCode("1") }, + wire_tunnel: { keyCode: keyToKeyCode("2") }, + constant_signal: { keyCode: keyToKeyCode("3") }, + logic_gate: { keyCode: keyToKeyCode("4") }, + virtual_processor: { keyCode: keyToKeyCode("5") }, + analyzer: { keyCode: keyToKeyCode("6") }, + comparator: { keyCode: keyToKeyCode("7") }, + transistor: { keyCode: keyToKeyCode("8") }, }, placement: { - pipette: { keyCode: key("Q") }, - rotateWhilePlacing: { keyCode: key("R") }, - rotateInverseModifier: { keyCode: 16 }, // SHIFT - rotateToUp: { keyCode: KEYCODE_UP_ARROW }, - rotateToDown: { keyCode: KEYCODE_DOWN_ARROW }, - rotateToRight: { keyCode: KEYCODE_RIGHT_ARROW }, - rotateToLeft: { keyCode: KEYCODE_LEFT_ARROW }, - cycleBuildingVariants: { keyCode: key("T") }, - cycleBuildings: { keyCode: 9 }, // TAB - switchDirectionLockSide: { keyCode: key("R") }, + pipette: { keyCode: keyToKeyCode("Q") }, + rotateWhilePlacing: { keyCode: keyToKeyCode("R") }, + rotateInverseModifier: { keyCode: KEYCODES.Shift }, + rotateToUp: { keyCode: KEYCODES.ArrowUp }, + rotateToDown: { keyCode: KEYCODES.ArrowDown }, + rotateToRight: { keyCode: KEYCODES.ArrowRight }, + rotateToLeft: { keyCode: KEYCODES.ArrowLeft }, + cycleBuildingVariants: { keyCode: keyToKeyCode("T") }, + cycleBuildings: { keyCode: KEYCODES.Tab }, + switchDirectionLockSide: { keyCode: keyToKeyCode("R") }, - copyWireValue: { keyCode: key("Z") }, + copyWireValue: { keyCode: keyToKeyCode("Z") }, }, massSelect: { - massSelectStart: { keyCode: 17 }, // CTRL - massSelectSelectMultiple: { keyCode: 16 }, // SHIFT - massSelectCopy: { keyCode: key("C") }, - massSelectCut: { keyCode: key("X") }, - massSelectClear: { keyCode: key("B") }, - confirmMassDelete: { keyCode: 46 }, // DEL - pasteLastBlueprint: { keyCode: key("V") }, + massSelectStart: { keyCode: KEYCODES.Ctrl }, + massSelectSelectMultiple: { keyCode: KEYCODES.Shift }, + massSelectCopy: { keyCode: keyToKeyCode("C") }, + massSelectCut: { keyCode: keyToKeyCode("X") }, + massSelectClear: { keyCode: keyToKeyCode("B") }, + confirmMassDelete: { keyCode: KEYCODES.Delete }, + pasteLastBlueprint: { keyCode: keyToKeyCode("V") }, }, placementModifiers: { - lockBeltDirection: { keyCode: 16 }, // SHIFT - placementDisableAutoOrientation: { keyCode: 17 }, // CTRL - placeMultiple: { keyCode: 16 }, // SHIFT - placeInverse: { keyCode: 18 }, // ALT + lockBeltDirection: { keyCode: KEYCODES.Shift }, + placementDisableAutoOrientation: { keyCode: KEYCODES.Ctrl }, + placeMultiple: { keyCode: KEYCODES.Shift }, + placeInverse: { keyCode: KEYCODES.Alt }, }, }; @@ -153,23 +187,23 @@ export function getStringForKeyCode(code) { return "MB5"; case 8: return "⌫"; - case 9: + case KEYCODES.Tab: return T.global.keys.tab; - case 13: + case KEYCODES.Enter: return "⏎"; - case 16: + case KEYCODES.Shift: return "⇪"; - case 17: + case KEYCODES.Ctrl: return T.global.keys.control; - case 18: + case KEYCODES.Alt: return T.global.keys.alt; case 19: return "PAUSE"; case 20: return "CAPS"; - case 27: + case KEYCODES.Escape: return T.global.keys.escape; - case 32: + case KEYCODES.Space: return T.global.keys.space; case 33: return "PGUP"; @@ -179,13 +213,13 @@ export function getStringForKeyCode(code) { return "END"; case 36: return "HOME"; - case KEYCODE_LEFT_ARROW: + case KEYCODES.ArrowLeft: return "⬅"; - case KEYCODE_UP_ARROW: + case KEYCODES.ArrowUp: return "⬆"; - case KEYCODE_RIGHT_ARROW: + case KEYCODES.ArrowRight: return "➡"; - case KEYCODE_DOWN_ARROW: + case KEYCODES.ArrowDown: return "⬇"; case 44: return "PRNT"; @@ -225,29 +259,29 @@ export function getStringForKeyCode(code) { return "."; case 111: return "/"; - case 112: + case KEYCODES.F1: return "F1"; - case 113: + case KEYCODES.F2: return "F2"; - case 114: + case KEYCODES.F3: return "F3"; - case 115: + case KEYCODES.F4: return "F4"; - case 116: + case KEYCODES.F5: return "F5"; - case 117: + case KEYCODES.F6: return "F6"; - case 118: + case KEYCODES.F7: return "F7"; - case 119: + case KEYCODES.F8: return "F8"; - case 120: + case KEYCODES.F9: return "F9"; - case 121: + case KEYCODES.F10: return "F10"; - case 122: + case KEYCODES.F11: return "F11"; - case 123: + case KEYCODES.F12: return "F12"; case 144: @@ -296,8 +330,9 @@ export class Keybinding { * @param {number} param0.keyCode * @param {boolean=} param0.builtin * @param {boolean=} param0.repeated + * @param {{ shift?: boolean; alt?: boolean; ctrl?: boolean; }=} param0.modifiers */ - constructor(keyMapper, app, { keyCode, builtin = false, repeated = false }) { + constructor(keyMapper, app, { keyCode, builtin = false, repeated = false, modifiers = {} }) { assert(keyCode && Number.isInteger(keyCode), "Invalid key code: " + keyCode); this.keyMapper = keyMapper; this.app = app; @@ -305,6 +340,8 @@ export class Keybinding { this.builtin = builtin; this.repeated = repeated; + this.modifiers = modifiers; + this.signal = new Signal(); this.toggled = new Signal(); } @@ -395,7 +432,6 @@ export class KeyActionMapper { if (overrides[key]) { payload.keyCode = overrides[key]; } - this.keybindings[key] = new Keybinding(this, this.root.app, payload); if (G_IS_DEV) { @@ -459,9 +495,10 @@ export class KeyActionMapper { * @param {number} param0.keyCode * @param {boolean} param0.shift * @param {boolean} param0.alt + * @param {boolean} param0.ctrl * @param {boolean=} param0.initial */ - handleKeydown({ keyCode, shift, alt, initial }) { + handleKeydown({ keyCode, shift, alt, ctrl, initial }) { let stop = false; // Find mapping @@ -469,6 +506,18 @@ export class KeyActionMapper { /** @type {Keybinding} */ const binding = this.keybindings[key]; if (binding.keyCode === keyCode && (initial || binding.repeated)) { + if (binding.modifiers.shift && !shift) { + continue; + } + + if (binding.modifiers.ctrl && !ctrl) { + continue; + } + + if (binding.modifiers.alt && !alt) { + continue; + } + /** @type {Signal} */ const signal = this.keybindings[key].signal; if (signal.dispatch() === STOP_PROPAGATION) { @@ -505,4 +554,14 @@ export class KeyActionMapper { assert(this.keybindings[id], "Keybinding " + id + " not known!"); return this.keybindings[id]; } + + /** + * Returns a given keybinding + * @param {string} id + * @returns {Keybinding} + */ + getBindingById(id) { + assert(this.keybindings[id], "Keybinding " + id + " not known!"); + return this.keybindings[id]; + } } diff --git a/src/js/mods/demo_mod.nobuild/index.js b/src/js/mods/demo_mod.nobuild/index.js index 083d9ca6..35cd8532 100644 --- a/src/js/mods/demo_mod.nobuild/index.js +++ b/src/js/mods/demo_mod.nobuild/index.js @@ -194,6 +194,20 @@ registerMod(shapez => { element.primaryBuildings.push(MetaDemoModBuilding); } }); + + // Register keybinding + this.modInterface.registerIngameKeybinding({ + id: "demo_mod_binding", + keyCode: shapez.keyToKeyCode("F"), + translation: "mymod: Do something (always with SHIFT)", + modifiers: { + shift: true, + }, + handler: root => { + this.dialogs.showInfo("Mod Message", "It worked!"); + return shapez.STOP_PROPAGATION; + }, + }); } }; }); diff --git a/src/js/mods/mod.js b/src/js/mods/mod.js index 4e14bfe2..0bfe3693 100644 --- a/src/js/mods/mod.js +++ b/src/js/mods/mod.js @@ -29,4 +29,8 @@ export class Mod { } init() {} + + get dialogs() { + return this.modInterface.dialogs; + } } diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 3ab05af3..f5af7ef5 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -6,7 +6,6 @@ import { MetaBuilding } from "../game/meta_building"; /* typehints:end */ import { defaultBuildingVariant } from "../game/meta_building"; -import { createLogger } from "../core/logging"; import { AtlasSprite, SpriteAtlasLink } from "../core/sprites"; import { enumShortcodeToSubShape, @@ -22,8 +21,8 @@ import { gComponentRegistry, gMetaBuildingRegistry } from "../core/global_regist import { MODS_ADDITIONAL_SHAPE_MAP_WEIGHTS } from "../game/map_chunk"; import { MODS_ADDITIONAL_SYSTEMS } from "../game/game_system_manager"; import { MOD_CHUNK_DRAW_HOOKS } from "../game/map_chunk_view"; - -const LOG = createLogger("mod-interface"); +import { KEYMAPPINGS } from "../game/key_action_mapper"; +import { HUDModalDialogs } from "../game/hud/parts/modal_dialogs"; export class ModInterface { /** @@ -32,9 +31,6 @@ export class ModInterface { */ constructor(modLoader) { this.modLoader = modLoader; - - /** @type {Map} */ - this.lazySprites = new Map(); } registerCss(cssString) { @@ -249,6 +245,66 @@ export class ModInterface { } } + /** + * + * @param {Object} param0 + * @param {string} param0.id + * @param {number} param0.keyCode + * @param {string} param0.translation + * @param {boolean=} param0.repeated + * @param {((GameRoot) => void)=} param0.handler + * @param {{shift?: boolean; alt?: boolean; ctrl?: boolean}=} param0.modifiers + * @param {boolean=} param0.builtin + */ + registerIngameKeybinding({ + id, + keyCode, + translation, + modifiers = {}, + repeated = false, + builtin = false, + handler = null, + }) { + if (!KEYMAPPINGS.mods) { + KEYMAPPINGS.mods = {}; + } + const binding = (KEYMAPPINGS.mods[id] = { + keyCode, + id, + repeated, + modifiers, + builtin, + }); + this.registerTranslations("en", { + keybindings: { + mappings: { + [id]: translation, + }, + }, + }); + + if (handler) { + this.modLoader.signals.gameStarted.add(root => { + root.keyMapper.getBindingById(id).addToTop(handler.bind(null, root)); + }); + } + + return binding; + } + + /** + * @returns {HUDModalDialogs} + */ + get dialogs() { + const state = this.modLoader.app.stateMgr.currentState; + // @ts-ignore + if (state.dialogs) { + // @ts-ignore + return state.dialogs; + } + throw new Error("Tried to access dialogs but current state doesn't support it"); + } + setBuildingToolbarIcon(buildingId, iconBase64) { this.registerCss(` [data-icon="building_icons/${buildingId}.png"] .icon { diff --git a/src/js/mods/mod_signals.js b/src/js/mods/mod_signals.js index 7701e10f..9b893e66 100644 --- a/src/js/mods/mod_signals.js +++ b/src/js/mods/mod_signals.js @@ -1,8 +1,10 @@ -import { Signal } from "../core/signal"; /* typehints:start */ import { BaseHUDPart } from "../game/hud/base_hud_part"; +import { GameRoot } from "../game/root"; /* typehints:end */ +import { Signal } from "../core/signal"; + // Single file to avoid circular deps export const MOD_SIGNALS = { @@ -15,4 +17,6 @@ export const MOD_SIGNALS = { hudElementInitialized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), hudElementFinalized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), + + gameStarted: /** @type {TypedSignal<[GameRoot]>} */ (new Signal()), }; diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index c8e57f0b..f9926eff 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -1,3 +1,7 @@ +/* typehints:start */ +import { Application } from "../application"; +/* typehints:end */ + import { globalConfig } from "../core/config"; import { createLogger } from "../core/logging"; import { getIPCRenderer } from "../core/utils"; @@ -11,6 +15,11 @@ export class ModLoader { constructor() { LOG.log("modloader created"); + /** + * @type {Application} + */ + this.app = undefined; + /** @type {Mod[]} */ this.mods = []; diff --git a/src/js/states/ingame.js b/src/js/states/ingame.js index 0dd6c72a..1d16c4f4 100644 --- a/src/js/states/ingame.js +++ b/src/js/states/ingame.js @@ -9,6 +9,7 @@ import { Savegame } from "../savegame/savegame"; import { GameCore } from "../game/core"; import { MUSIC } from "../platform/sound"; import { enumGameModeIds } from "../game/game_mode"; +import { MOD_SIGNALS } from "../mods/mod_signals"; const logger = createLogger("state/ingame"); @@ -82,6 +83,10 @@ export class InGameState extends GameState { this.currentSavePromise = null; } + get dialogs() { + return this.core.root.hud.parts.dialogs; + } + /** * Switches the game into another sub-state * @param {string} stage @@ -318,6 +323,8 @@ export class InGameState extends GameState { // Initial resize, might have changed during loading (this is possible) this.core.resize(this.app.screenWidth, this.app.screenHeight); + + MOD_SIGNALS.gameStarted.dispatch(this.core.root); } } diff --git a/src/js/states/keybindings.js b/src/js/states/keybindings.js index a01629f1..e6721bf8 100644 --- a/src/js/states/keybindings.js +++ b/src/js/states/keybindings.js @@ -19,7 +19,7 @@ export class KeybindingsState extends TextualGameState {
${T.keybindings.hint} - +
@@ -34,6 +34,10 @@ export class KeybindingsState extends TextualGameState { this.trackClicks(this.htmlElement.querySelector(".resetBindings"), this.resetBindings); for (const category in KEYMAPPINGS) { + if (Object.keys(KEYMAPPINGS[category]).length === 0) { + continue; + } + const categoryDiv = document.createElement("div"); categoryDiv.classList.add("category"); keybindingsElem.appendChild(categoryDiv); @@ -138,7 +142,19 @@ export class KeybindingsState extends TextualGameState { } const mappingDiv = container.querySelector(".mapping"); - mappingDiv.innerHTML = getStringForKeyCode(keyCode); + let modifiers = ""; + + if (mapped.modifiers && mapped.modifiers.shift) { + modifiers += "⇪ "; + } + if (mapped.modifiers && mapped.modifiers.alt) { + modifiers += T.global.keys.alt + " "; + } + if (mapped.modifiers && mapped.modifiers.ctrl) { + modifiers += T.global.keys.control + " "; + } + + mappingDiv.innerHTML = modifiers + getStringForKeyCode(keyCode); mappingDiv.classList.toggle("changed", !!overrides[keybindingId]); const resetBtn = container.querySelector("button.resetKeybinding"); diff --git a/translations/base-en.yaml b/translations/base-en.yaml index 14dd610e..2f76c00f 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -1328,6 +1328,7 @@ keybindings: massSelect: Mass Select buildings: Building Shortcuts placementModifiers: Placement Modifiers + mods: Provided by Mods mappings: confirm: Confirm From a7b957642f1b8dcf13c15137c0e62239404c9e72 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 19:07:37 +0100 Subject: [PATCH 029/129] Add some mod signals --- src/js/core/state_manager.js | 3 +++ src/js/game/core.js | 2 ++ src/js/mods/demo_mod.nobuild/index.js | 22 ++++++++++++++++++++++ src/js/mods/mod_signals.js | 7 +++++++ src/js/states/ingame.js | 1 + 5 files changed, 35 insertions(+) diff --git a/src/js/core/state_manager.js b/src/js/core/state_manager.js index 2e55f5d4..e8a8ba94 100644 --- a/src/js/core/state_manager.js +++ b/src/js/core/state_manager.js @@ -6,6 +6,7 @@ import { GameState } from "./game_state"; import { createLogger } from "./logging"; import { APPLICATION_ERROR_OCCURED } from "./error_handler"; import { waitNextFrame, removeAllChildren } from "./utils"; +import { MOD_SIGNALS } from "../mods/mod_signals"; const logger = createLogger("state_manager"); @@ -109,6 +110,8 @@ export class StateManager { key ); + MOD_SIGNALS.stateEntered.dispatch(this.currentState); + waitNextFrame().then(() => { document.body.classList.add("arrived"); }); diff --git a/src/js/game/core.js b/src/js/game/core.js index a0ee3713..aa411c3d 100644 --- a/src/js/game/core.js +++ b/src/js/game/core.js @@ -38,6 +38,7 @@ import { ShapeDefinitionManager } from "./shape_definition_manager"; import { AchievementProxy } from "./achievement_proxy"; import { SoundProxy } from "./sound_proxy"; import { GameTime } from "./time/game_time"; +import { MOD_SIGNALS } from "../mods/mod_signals"; const logger = createLogger("ingame/core"); @@ -161,6 +162,7 @@ export class GameCore { } logger.log("root initialized"); + MOD_SIGNALS.gameInitialized.dispatch(root); } /** diff --git a/src/js/mods/demo_mod.nobuild/index.js b/src/js/mods/demo_mod.nobuild/index.js index 35cd8532..1ff42074 100644 --- a/src/js/mods/demo_mod.nobuild/index.js +++ b/src/js/mods/demo_mod.nobuild/index.js @@ -208,6 +208,28 @@ registerMod(shapez => { return shapez.STOP_PROPAGATION; }, }); + + // Add fancy sign to main menu + this.signals.stateEntered.add(state => { + if (state.key === "MainMenuState") { + const element = document.createElement("div"); + element.innerText = "Hello World from mod!"; + element.id = "demo_mod_hello_world_element"; + document.body.appendChild(element); + } + }); + + this.modInterface.registerCss(` + #demo_mod_hello_world_element { + position: fixed; + top: 10px; + left: 10px; + color: red; + z-index: 999; + font-size: 50px; + } + + `); } }; }); diff --git a/src/js/mods/mod_signals.js b/src/js/mods/mod_signals.js index 9b893e66..16e08f8a 100644 --- a/src/js/mods/mod_signals.js +++ b/src/js/mods/mod_signals.js @@ -1,6 +1,8 @@ /* typehints:start */ import { BaseHUDPart } from "../game/hud/base_hud_part"; import { GameRoot } from "../game/root"; +import { GameState } from "../core/game_state"; +import { InGameState } from "../states/ingame"; /* typehints:end */ import { Signal } from "../core/signal"; @@ -18,5 +20,10 @@ export const MOD_SIGNALS = { hudElementInitialized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), hudElementFinalized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), + gameInitialized: /** @type {TypedSignal<[GameRoot]>} */ (new Signal()), + gameLoadingStageEntered: /** @type {TypedSignal<[InGameState, string]>} */ (new Signal()), + gameStarted: /** @type {TypedSignal<[GameRoot]>} */ (new Signal()), + + stateEntered: /** @type {TypedSignal<[GameState]>} */ (new Signal()), }; diff --git a/src/js/states/ingame.js b/src/js/states/ingame.js index 1d16c4f4..3c2bf84d 100644 --- a/src/js/states/ingame.js +++ b/src/js/states/ingame.js @@ -96,6 +96,7 @@ export class InGameState extends GameState { if (stage !== this.stage) { this.stage = stage; logger.log(this.stage); + MOD_SIGNALS.gameLoadingStageEntered.dispatch(this, stage); return true; } else { // log(this, "Re entering", stage); From 2d3219373f08fdd6d7e59e4988267946ef26e52c Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 19:08:45 +0100 Subject: [PATCH 030/129] refactor game loading states --- src/js/states/ingame.js | 60 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/js/states/ingame.js b/src/js/states/ingame.js index 3c2bf84d..108028a4 100644 --- a/src/js/states/ingame.js +++ b/src/js/states/ingame.js @@ -14,20 +14,20 @@ import { MOD_SIGNALS } from "../mods/mod_signals"; const logger = createLogger("state/ingame"); // Different sub-states -const stages = { - s3_createCore: "🌈 3: Create core", - s4_A_initEmptyGame: "🌈 4/A: Init empty game", - s4_B_resumeGame: "🌈 4/B: Resume game", +export const GAME_LOADING_STATES = { + s3_createCore: "s3_createCore", + s4_A_initEmptyGame: "s4_A_initEmptyGame", + s4_B_resumeGame: "s4_B_resumeGame", - s5_firstUpdate: "🌈 5: First game update", - s6_postLoadHook: "🌈 6: Post load hook", - s7_warmup: "🌈 7: Warmup", + s5_firstUpdate: "s5_firstUpdate", + s6_postLoadHook: "s6_postLoadHook", + s7_warmup: "s7_warmup", - s10_gameRunning: "🌈 10: Game finally running", + s10_gameRunning: "s10_gameRunning", - leaving: "🌈 Saving, then leaving the game", - destroyed: "🌈 DESTROYED: Core is empty and waits for state leave", - initFailed: "🌈 ERROR: Initialization failed!", + leaving: "leaving", + destroyed: "destroyed", + initFailed: "initFailed", }; export const gameCreationAction = { @@ -152,7 +152,7 @@ export class InGameState extends GameState { onResized(w, h) { super.onResized(w, h); - if (this.stage === stages.s10_gameRunning) { + if (this.stage === GAME_LOADING_STATES.s10_gameRunning) { this.core.resize(w, h); } } @@ -196,7 +196,7 @@ export class InGameState extends GameState { * @param {any=} payload */ saveThenGoToState(stateId, payload) { - if (this.stage === stages.leaving || this.stage === stages.destroyed) { + if (this.stage === GAME_LOADING_STATES.leaving || this.stage === GAME_LOADING_STATES.destroyed) { logger.warn( "Tried to leave game twice or during destroy:", this.stage, @@ -223,7 +223,7 @@ export class InGameState extends GameState { * @param {string} err */ onInitializationFailure(err) { - if (this.switchStage(stages.initFailed)) { + if (this.switchStage(GAME_LOADING_STATES.initFailed)) { logger.error("Init failure:", err); this.stageDestroyed(); this.moveToState("MainMenuState", { loadError: err }); @@ -236,7 +236,7 @@ export class InGameState extends GameState { * Creates the game core instance, and thus the root */ stage3CreateCore() { - if (this.switchStage(stages.s3_createCore)) { + if (this.switchStage(GAME_LOADING_STATES.s3_createCore)) { logger.log("Creating new game core"); this.core = new GameCore(this.app); @@ -255,7 +255,7 @@ export class InGameState extends GameState { * Initializes a new empty game */ stage4aInitEmptyGame() { - if (this.switchStage(stages.s4_A_initEmptyGame)) { + if (this.switchStage(GAME_LOADING_STATES.s4_A_initEmptyGame)) { this.core.initNewGame(); this.stage5FirstUpdate(); } @@ -265,7 +265,7 @@ export class InGameState extends GameState { * Resumes an existing game */ stage4bResumeGame() { - if (this.switchStage(stages.s4_B_resumeGame)) { + if (this.switchStage(GAME_LOADING_STATES.s4_B_resumeGame)) { if (!this.core.initExistingGame()) { this.onInitializationFailure("Savegame is corrupt and can not be restored."); return; @@ -279,7 +279,7 @@ export class InGameState extends GameState { * Performs the first game update on the game which initializes most caches */ stage5FirstUpdate() { - if (this.switchStage(stages.s5_firstUpdate)) { + if (this.switchStage(GAME_LOADING_STATES.s5_firstUpdate)) { this.core.root.logicInitialized = true; this.core.updateLogic(); this.stage6PostLoadHook(); @@ -291,7 +291,7 @@ export class InGameState extends GameState { * can operate and start to work now. */ stage6PostLoadHook() { - if (this.switchStage(stages.s6_postLoadHook)) { + if (this.switchStage(GAME_LOADING_STATES.s6_postLoadHook)) { logger.log("Post load hook"); this.core.postLoadHook(); this.stage7Warmup(); @@ -304,7 +304,7 @@ export class InGameState extends GameState { * are in the VRAM and we have a smooth experience once we start. */ stage7Warmup() { - if (this.switchStage(stages.s7_warmup)) { + if (this.switchStage(GAME_LOADING_STATES.s7_warmup)) { if (this.creationPayload.fastEnter) { this.warmupTimeSeconds = globalConfig.warmupTimeSecondsFast; } else { @@ -317,7 +317,7 @@ export class InGameState extends GameState { * The final stage where this game is running and updating regulary. */ stage10GameRunning() { - if (this.switchStage(stages.s10_gameRunning)) { + if (this.switchStage(GAME_LOADING_STATES.s10_gameRunning)) { this.core.root.signals.readyToRender.dispatch(); logSection("GAME STARTED", "#26a69a"); @@ -333,7 +333,7 @@ export class InGameState extends GameState { * This stage destroys the whole game, used to cleanup */ stageDestroyed() { - if (this.switchStage(stages.destroyed)) { + if (this.switchStage(GAME_LOADING_STATES.destroyed)) { // Cleanup all api calls this.cancelAllAsyncOperations(); @@ -354,7 +354,7 @@ export class InGameState extends GameState { * When leaving the game */ stageLeavingGame() { - if (this.switchStage(stages.leaving)) { + if (this.switchStage(GAME_LOADING_STATES.leaving)) { // ... } } @@ -365,7 +365,7 @@ export class InGameState extends GameState { * Filters the input (keybindings) */ filterInput() { - return this.stage === stages.s10_gameRunning; + return this.stage === GAME_LOADING_STATES.s10_gameRunning; } /** @@ -403,7 +403,7 @@ export class InGameState extends GameState { return; } - if (this.stage === stages.s7_warmup) { + if (this.stage === GAME_LOADING_STATES.s7_warmup) { this.core.draw(); this.warmupTimeSeconds -= dt / 1000.0; if (this.warmupTimeSeconds < 0) { @@ -412,12 +412,12 @@ export class InGameState extends GameState { } } - if (this.stage === stages.s10_gameRunning) { + if (this.stage === GAME_LOADING_STATES.s10_gameRunning) { this.core.tick(dt); } // If the stage is still active (This might not be the case if tick() moved us to game over) - if (this.stage === stages.s10_gameRunning) { + if (this.stage === GAME_LOADING_STATES.s10_gameRunning) { // Only draw if page visible if (this.app.pageVisible) { this.core.draw(); @@ -450,9 +450,9 @@ export class InGameState extends GameState { } if ( - this.stage !== stages.s10_gameRunning && - this.stage !== stages.s7_warmup && - this.stage !== stages.leaving + this.stage !== GAME_LOADING_STATES.s10_gameRunning && + this.stage !== GAME_LOADING_STATES.s7_warmup && + this.stage !== GAME_LOADING_STATES.leaving ) { logger.warn("Skipping save because game is not ready"); return Promise.resolve(); From e12ed11c3e51fe5794dbd92fbac4131768cea14a Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 19:12:50 +0100 Subject: [PATCH 031/129] Make shapez exports global --- src/js/globals.d.ts | 4 ++ src/js/mods/demo_mod.nobuild/index.js | 2 +- src/js/mods/modloader.js | 61 +++++++++++++++------------ 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/src/js/globals.d.ts b/src/js/globals.d.ts index bf870fab..f6983645 100644 --- a/src/js/globals.d.ts +++ b/src/js/globals.d.ts @@ -22,6 +22,8 @@ declare const G_IS_RELEASE: boolean; declare const G_CHINA_VERSION: boolean; declare const G_WEGAME_VERSION: boolean; +declare const shapez: any; + // Polyfills declare interface String { replaceAll(search: string, replacement: string): string; @@ -95,6 +97,8 @@ declare interface Window { registerMod: any; anyModLoaded: any; + shapez: any; + webkitRequestAnimationFrame(); assert(condition: boolean, failureMessage: string); diff --git a/src/js/mods/demo_mod.nobuild/index.js b/src/js/mods/demo_mod.nobuild/index.js index 1ff42074..c8f166ba 100644 --- a/src/js/mods/demo_mod.nobuild/index.js +++ b/src/js/mods/demo_mod.nobuild/index.js @@ -1,4 +1,4 @@ -registerMod(shapez => { +registerMod(() => { class DemoModComponent extends shapez.Component { static getId() { return "DemoMod"; diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index f9926eff..7cbcc0fd 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -41,9 +41,41 @@ export class ModLoader { return this.mods.length > 0; } + exposeExports() { + if (G_IS_DEV || G_IS_STANDALONE) { + let exports = {}; + const modules = require.context("../", true, /\.js$/); + + Array.from(modules.keys()).forEach(key => { + // @ts-ignore + const module = modules(key); + for (const member in module) { + if (member === "default") { + continue; + } + if (exports[member]) { + throw new Error("Duplicate export of " + member); + } + Object.defineProperty(exports, member, { + get() { + return module[member]; + }, + set(v) { + module[member] = v; + }, + }); + } + }); + + window.shapez = exports; + } + } + async initMods() { LOG.log("hook:init"); + this.exposeExports(); + if (G_IS_STANDALONE || G_IS_DEV) { try { let mods = []; @@ -71,36 +103,9 @@ export class ModLoader { } } - let exports = {}; - - if (G_IS_DEV || G_IS_STANDALONE) { - const modules = require.context("../", true, /\.js$/); - - Array.from(modules.keys()).forEach(key => { - // @ts-ignore - const module = modules(key); - for (const member in module) { - if (member === "default") { - continue; - } - if (exports[member]) { - throw new Error("Duplicate export of " + member); - } - Object.defineProperty(exports, member, { - get() { - return module[member]; - }, - set(v) { - module[member] = v; - }, - }); - } - }); - } - this.initialized = true; this.modLoadQueue.forEach(modClass => { - const mod = new (modClass(exports))(this.app, this); + const mod = new (modClass())(this.app, this); mod.init(); this.mods.push(mod); }); From a0071681e72f10fca4bb584e098db8c821c4e071 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 15 Jan 2022 10:49:58 +0100 Subject: [PATCH 032/129] Start to make mods safer --- electron/index.js | 5 ++++- electron/preload.js | 3 +++ package.json | 3 ++- src/js/core/modal_dialog_forms.js | 13 +++++------- src/js/core/utils.js | 15 ------------- src/js/game/modes/regular.js | 2 +- src/js/globals.d.ts | 2 ++ src/js/mods/modloader.js | 21 ++++++++++--------- src/js/platform/api.js | 5 +---- .../electron/steam_achievement_provider.js | 7 ++----- src/js/platform/electron/storage.js | 9 ++++---- src/js/platform/electron/wrapper.js | 9 +++----- src/js/states/main_menu.js | 9 +++----- src/js/states/mods.js | 3 +-- 14 files changed, 42 insertions(+), 64 deletions(-) create mode 100644 electron/preload.js diff --git a/electron/index.js b/electron/index.js index 81b0e360..c7b07c55 100644 --- a/electron/index.js +++ b/electron/index.js @@ -54,8 +54,11 @@ function createWindow() { // fullscreen: true, autoHideMenuBar: true, webPreferences: { - nodeIntegration: true, + nodeIntegration: false, webSecurity: false, + // sandbox: true, + contextIsolation: true, + preload: path.join(__dirname, "preload.js"), }, allowRunningInsecureContent: false, }); diff --git a/electron/preload.js b/electron/preload.js new file mode 100644 index 00000000..5729634a --- /dev/null +++ b/electron/preload.js @@ -0,0 +1,3 @@ +const { contextBridge, ipcRenderer } = require("electron"); + +contextBridge.exposeInMainWorld("ipcRenderer", ipcRenderer); diff --git a/package.json b/package.json index f3ab2f80..f1f3cfdf 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,8 @@ "publishStandalone": "yarn publishOnItch && yarn publishOnSteam", "publishWeb": "cd gulp && yarn main.deploy.prod", "publish": "yarn publishStandalone && yarn publishWeb", - "syncTranslations": "node sync-translations.js" + "syncTranslations": "node sync-translations.js", + "buildTypes": "tsc src/js/application.js --declaration --allowJs --emitDeclarationOnly --skipLibCheck --out types.js" }, "dependencies": { "@babel/core": "^7.5.4", diff --git a/src/js/core/modal_dialog_forms.js b/src/js/core/modal_dialog_forms.js index ccf9bfb2..a4e617f8 100644 --- a/src/js/core/modal_dialog_forms.js +++ b/src/js/core/modal_dialog_forms.js @@ -1,7 +1,6 @@ import { BaseItem } from "../game/base_item"; import { ClickDetector } from "./click_detector"; import { Signal } from "./signal"; -import { getIPCRenderer } from "./utils"; /* * *************************************************** @@ -113,13 +112,11 @@ export class FormElementInput extends FormElement { if (G_WEGAME_VERSION) { const value = String(this.element.value); - getIPCRenderer() - .invoke("profanity-check", value) - .then(newValue => { - if (value !== newValue && this.element) { - this.element.value = newValue; - } - }); + ipcRenderer.invoke("profanity-check", value).then(newValue => { + if (value !== newValue && this.element) { + this.element.value = newValue; + } + }); } } diff --git a/src/js/core/utils.js b/src/js/core/utils.js index 2c2c0ed8..35e70310 100644 --- a/src/js/core/utils.js +++ b/src/js/core/utils.js @@ -42,21 +42,6 @@ export function getPlatformName() { return "unknown"; } -/** - * Returns the IPC renderer, or null if not within the standalone - * @returns {object|null} - */ -let ipcRenderer = null; -export function getIPCRenderer() { - if (!G_IS_STANDALONE) { - return null; - } - if (!ipcRenderer) { - ipcRenderer = eval("require")("electron").ipcRenderer; - } - return ipcRenderer; -} - /** * Makes a new 2D array with undefined contents * @param {number} w diff --git a/src/js/game/modes/regular.js b/src/js/game/modes/regular.js index b52cbc89..cd14833e 100644 --- a/src/js/game/modes/regular.js +++ b/src/js/game/modes/regular.js @@ -602,7 +602,7 @@ export class RegularGameMode extends GameMode { /** @type {(typeof MetaBuilding)[]} */ this.hiddenBuildings = [MetaConstantProducerBuilding, MetaGoalAcceptorBuilding, MetaBlockBuilding]; - // @ts-expect-error + // @ts-ignore if (!(G_IS_DEV || window.sandboxMode || queryParamOptions.sandboxMode)) { this.hiddenBuildings.push(MetaItemProducerBuilding); } diff --git a/src/js/globals.d.ts b/src/js/globals.d.ts index f6983645..0b9421e1 100644 --- a/src/js/globals.d.ts +++ b/src/js/globals.d.ts @@ -24,6 +24,8 @@ declare const G_WEGAME_VERSION: boolean; declare const shapez: any; +declare const ipcRenderer: any; + // Polyfills declare interface String { replaceAll(search: string, replacement: string): string; diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 7cbcc0fd..f5145207 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -1,10 +1,8 @@ /* typehints:start */ import { Application } from "../application"; /* typehints:end */ - import { globalConfig } from "../core/config"; import { createLogger } from "../core/logging"; -import { getIPCRenderer } from "../core/utils"; import { Mod } from "./mod"; import { ModInterface } from "./mod_interface"; import { MOD_SIGNALS } from "./mod_signals"; @@ -76,12 +74,17 @@ export class ModLoader { this.exposeExports(); + window.registerMod = mod => { + this.modLoadQueue.push(mod); + }; + if (G_IS_STANDALONE || G_IS_DEV) { try { let mods = []; if (G_IS_STANDALONE) { - mods = await getIPCRenderer().invoke("get-mods"); - } else if (G_IS_DEV && globalConfig.debug.externalModUrl) { + mods = await ipcRenderer.invoke("get-mods"); + } + if (G_IS_DEV && globalConfig.debug.externalModUrl) { const mod = await ( await fetch(globalConfig.debug.externalModUrl, { method: "GET", @@ -91,12 +94,8 @@ export class ModLoader { } mods.forEach(modCode => { - window.registerMod = mod => { - this.modLoadQueue.push(mod); - }; - // ugh - eval(modCode); - delete window.registerMod; + const func = new Function(modCode); + func(); }); } catch (ex) { alert("Failed to load mods: " + ex); @@ -111,6 +110,8 @@ export class ModLoader { }); this.modLoadQueue = []; this.signals.postInit.dispatch(); + + delete window.registerMod; } } diff --git a/src/js/platform/api.js b/src/js/platform/api.js index d518c98a..4e7a82f9 100644 --- a/src/js/platform/api.js +++ b/src/js/platform/api.js @@ -3,7 +3,6 @@ import { Application } from "../application"; /* typehints:end */ import { createLogger } from "../core/logging"; import { compressX64 } from "../core/lzstring"; -import { getIPCRenderer } from "../core/utils"; import { T } from "../translations"; const logger = createLogger("puzzle-api"); @@ -113,9 +112,7 @@ export class ClientAPI { return Promise.resolve({ token }); } - const renderer = getIPCRenderer(); - - return renderer.invoke("steam:get-ticket").then( + return ipcRenderer.invoke("steam:get-ticket").then( ticket => { logger.log("Got auth ticket:", ticket); return this._request("/v1/public/login", { diff --git a/src/js/platform/electron/steam_achievement_provider.js b/src/js/platform/electron/steam_achievement_provider.js index c0ef552c..638cdbc5 100644 --- a/src/js/platform/electron/steam_achievement_provider.js +++ b/src/js/platform/electron/steam_achievement_provider.js @@ -4,7 +4,6 @@ import { GameRoot } from "../../game/root"; /* typehints:end */ import { createLogger } from "../../core/logging"; -import { getIPCRenderer } from "../../core/utils"; import { ACHIEVEMENTS, AchievementCollection, AchievementProviderInterface } from "../achievement_provider"; const logger = createLogger("achievements/steam"); @@ -109,9 +108,7 @@ export class SteamAchievementProvider extends AchievementProviderInterface { return Promise.resolve(); } - this.ipc = getIPCRenderer(); - - return this.ipc.invoke("steam:is-initialized").then(initialized => { + return ipcRenderer.invoke("steam:is-initialized").then(initialized => { this.initialized = initialized; if (!this.initialized) { @@ -136,7 +133,7 @@ export class SteamAchievementProvider extends AchievementProviderInterface { if (!this.initialized) { promise = Promise.resolve(); } else { - promise = this.ipc.invoke("steam:activate-achievement", ACHIEVEMENT_IDS[key]); + promise = ipcRenderer.invoke("steam:activate-achievement", ACHIEVEMENT_IDS[key]); } return promise diff --git a/src/js/platform/electron/storage.js b/src/js/platform/electron/storage.js index 41ed1746..24aff500 100644 --- a/src/js/platform/electron/storage.js +++ b/src/js/platform/electron/storage.js @@ -1,5 +1,4 @@ import { StorageInterface } from "../storage"; -import { getIPCRenderer } from "../../core/utils"; import { createLogger } from "../../core/logging"; const logger = createLogger("electron-storage"); @@ -12,7 +11,7 @@ export class StorageImplElectron extends StorageInterface { this.jobs = {}; this.jobId = 0; - getIPCRenderer().on("fs-response", (event, arg) => { + ipcRenderer.on("fs-response", (event, arg) => { const id = arg.id; if (!this.jobs[id]) { logger.warn("Got unhandled FS response, job not known:", id); @@ -37,7 +36,7 @@ export class StorageImplElectron extends StorageInterface { const jobId = ++this.jobId; this.jobs[jobId] = { resolve, reject }; - getIPCRenderer().send("fs-job", { + ipcRenderer.send("fs-job", { type: "write", filename, contents, @@ -52,7 +51,7 @@ export class StorageImplElectron extends StorageInterface { const jobId = ++this.jobId; this.jobs[jobId] = { resolve, reject }; - getIPCRenderer().send("fs-job", { + ipcRenderer.send("fs-job", { type: "read", filename, id: jobId, @@ -65,7 +64,7 @@ export class StorageImplElectron extends StorageInterface { // ipcMain const jobId = ++this.jobId; this.jobs[jobId] = { resolve, reject }; - getIPCRenderer().send("fs-job", { + ipcRenderer.send("fs-job", { type: "delete", filename, id: jobId, diff --git a/src/js/platform/electron/wrapper.js b/src/js/platform/electron/wrapper.js index c1764f68..65451395 100644 --- a/src/js/platform/electron/wrapper.js +++ b/src/js/platform/electron/wrapper.js @@ -1,6 +1,5 @@ import { NoAchievementProvider } from "../browser/no_achievement_provider"; import { PlatformWrapperImplBrowser } from "../browser/wrapper"; -import { getIPCRenderer } from "../../core/utils"; import { createLogger } from "../../core/logging"; import { StorageImplElectron } from "./storage"; import { SteamAchievementProvider } from "./steam_achievement_provider"; @@ -71,15 +70,13 @@ export class PlatformWrapperImplElectron extends PlatformWrapperImplBrowser { } initializeDlcStatus() { - const renderer = getIPCRenderer(); - if (G_WEGAME_VERSION) { return Promise.resolve(); } logger.log("Checking DLC ownership ..."); // @todo: Don't hardcode the app id - return renderer.invoke("steam:check-app-ownership", 1625400).then( + return ipcRenderer.invoke("steam:check-app-ownership", 1625400).then( res => { logger.log("Got DLC ownership:", res); this.dlcs.puzzle = Boolean(res); @@ -106,7 +103,7 @@ export class PlatformWrapperImplElectron extends PlatformWrapperImplBrowser { } setFullscreen(flag) { - getIPCRenderer().send("set-fullscreen", flag); + ipcRenderer.send("set-fullscreen", flag); } getSupportsAppExit() { @@ -115,6 +112,6 @@ export class PlatformWrapperImplElectron extends PlatformWrapperImplBrowser { exitApp() { logger.log(this, "Sending app exit signal"); - getIPCRenderer().send("exit-app"); + ipcRenderer.send("exit-app"); } } diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index cbebd629..04cf8bca 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -405,12 +405,6 @@ export class MainMenuState extends GameState { makeButton(outerDiv, ["newGameButton", "styledButton"], T.mainMenu.newGame), this.onPlayButtonClicked ); - - // Mods - this.trackClicks( - makeButton(outerDiv, ["modsButton", "styledButton"], " "), - this.onModsClicked - ); } else { // New game this.trackClicks( @@ -419,6 +413,9 @@ export class MainMenuState extends GameState { ); } + // Mods + this.trackClicks(makeButton(outerDiv, ["modsButton", "styledButton"], " "), this.onModsClicked); + buttonContainer.appendChild(outerDiv); } diff --git a/src/js/states/mods.js b/src/js/states/mods.js index d746434d..a99d2e95 100644 --- a/src/js/states/mods.js +++ b/src/js/states/mods.js @@ -1,6 +1,5 @@ import { THIRDPARTY_URLS } from "../core/config"; import { TextualGameState } from "../core/textual_game_state"; -import { getIPCRenderer } from "../core/utils"; import { MODS } from "../mods/modloader"; import { T } from "../translations"; @@ -117,7 +116,7 @@ export class ModsState extends TextualGameState { this.dialogs.showWarning(T.global.error, T.mods.folderOnlyStandalone); return; } - getIPCRenderer().send("open-mods-folder"); + ipcRenderer.send("open-mods-folder"); } onSteamLinkClicked() { From f12f81a1252921dabea9a417d6172eaabaebb39d Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 15 Jan 2022 11:23:14 +0100 Subject: [PATCH 033/129] Refactor file system electron event handling --- electron/index.js | 63 +++++---------------- electron/preload.js | 6 +- electron_wegame/index.js | 86 +++++++++-------------------- src/js/platform/electron/storage.js | 67 ++++++---------------- src/js/states/mods.js | 2 +- 5 files changed, 61 insertions(+), 163 deletions(-) diff --git a/electron/index.js b/electron/index.js index c7b07c55..8ff7faa2 100644 --- a/electron/index.js +++ b/electron/index.js @@ -55,8 +55,8 @@ function createWindow() { autoHideMenuBar: true, webPreferences: { nodeIntegration: false, - webSecurity: false, - // sandbox: true, + webSecurity: true, + sandbox: true, contextIsolation: true, preload: path.join(__dirname, "preload.js"), }, @@ -229,70 +229,33 @@ async function writeFileSafe(filename, contents) { }); } -async function performFsJob(job) { - const fname = path.join(storePath, job.filename); - +ipcMain.handle("fs-job", async (event, job) => { + const filenameSafe = job.filename.replace(/[^a-z\.\-_0-9]/i, ""); + const fname = path.join(storePath, filenameSafe); switch (job.type) { case "read": { if (!fs.existsSync(fname)) { - return { - // Special FILE_NOT_FOUND error code - error: "file_not_found", - }; - } - - try { - const data = await fs.promises.readFile(fname, "utf8"); - return { - success: true, - data, - }; - } catch (ex) { - return { - error: ex, - }; + // Special FILE_NOT_FOUND error code + return { error: "file_not_found" }; } + return await fs.promises.readFile(fname, "utf8"); } case "write": { - try { - await writeFileSafe(fname, job.contents); - return { - success: true, - data: job.contents, - }; - } catch (ex) { - return { - error: ex, - }; - } + await writeFileSafe(fname, job.contents); + return job.contents; } case "delete": { - try { - await fs.promises.unlink(fname); - } catch (ex) { - return { - error: ex, - }; - } - - return { - success: true, - data: null, - }; + await fs.promises.unlink(fname); + return; } default: throw new Error("Unknown fs job: " + job.type); } -} - -ipcMain.on("fs-job", async (event, arg) => { - const result = await performFsJob(arg); - event.reply("fs-response", { id: arg.id, result }); }); -ipcMain.on("open-mods-folder", async () => { +ipcMain.handle("open-mods-folder", async () => { shell.openPath(modsPath); }); diff --git a/electron/preload.js b/electron/preload.js index 5729634a..c6336230 100644 --- a/electron/preload.js +++ b/electron/preload.js @@ -1,3 +1,7 @@ const { contextBridge, ipcRenderer } = require("electron"); -contextBridge.exposeInMainWorld("ipcRenderer", ipcRenderer); +contextBridge.exposeInMainWorld("ipcRenderer", { + invoke: ipcRenderer.invoke.bind(ipcRenderer), + on: ipcRenderer.on.bind(ipcRenderer), + send: ipcRenderer.send.bind(ipcRenderer), +}); diff --git a/electron_wegame/index.js b/electron_wegame/index.js index 23c277c4..2c183f15 100644 --- a/electron_wegame/index.js +++ b/electron_wegame/index.js @@ -49,9 +49,12 @@ function createWindow() { // fullscreen: true, autoHideMenuBar: true, webPreferences: { - nodeIntegration: true, - webSecurity: false, - contextIsolation: false, + nodeIntegration: false, + webSecurity: true, + sandbox: true, + + contextIsolation: true, + preload: path.join(__dirname, "preload.js"), }, allowRunningInsecureContent: false, }); @@ -165,20 +168,20 @@ async function writeFileSafe(filename, contents) { console.warn(prefix, "Concurrent write process on", filename); } - await fileLock.acquire(filename, async () => { + fileLock.acquire(filename, async () => { console.log(prefix, "Starting write on", niceFileName(filename), "in transaction", transactionId); if (!fs.existsSync(filename)) { // this one is easy console.log(prefix, "Writing file instantly because it does not exist:", niceFileName(filename)); - fs.writeFileSync(filename, contents, { encoding: "utf8" }); + await fs.promises.writeFile(filename, contents, "utf8"); return; } // first, write a temporary file (.tmp-XXX) const tempName = filename + ".tmp-" + transactionId; console.log(prefix, "Writing temporary file", niceFileName(tempName)); - fs.writeFileSync(tempName, contents, { encoding: "utf8" }); + await fs.promises.writeFile(tempName, contents, "utf8"); // now, rename the original file to (.backup-XXX) const oldTemporaryName = filename + ".backup-" + transactionId; @@ -189,7 +192,7 @@ async function writeFileSafe(filename, contents) { "to", niceFileName(oldTemporaryName) ); - fs.renameSync(filename, oldTemporaryName); + await fs.promises.rename(filename, oldTemporaryName); // now, rename the temporary file (.tmp-XXX) to the target console.log( @@ -199,7 +202,7 @@ async function writeFileSafe(filename, contents) { "to the original", niceFileName(filename) ); - fs.renameSync(tempName, filename); + await fs.promises.rename(tempName, filename); // we are done now, try to create a backup, but don't fail if the backup fails try { @@ -208,82 +211,43 @@ async function writeFileSafe(filename, contents) { if (fs.existsSync(backupFileName)) { console.log(prefix, "Deleting old backup file", niceFileName(backupFileName)); // delete the old backup - fs.unlinkSync(backupFileName); + await fs.promises.unlink(backupFileName); } // rename the old file to the new backup file console.log(prefix, "Moving", niceFileName(oldTemporaryName), "to the backup file location"); - fs.renameSync(oldTemporaryName, backupFileName); + await fs.promises.rename(oldTemporaryName, backupFileName); } catch (ex) { console.error(prefix, "Failed to switch backup files:", ex); } }); } -async function performFsJob(job) { - const fname = path.join(storePath, job.filename); - +ipcMain.handle("fs-job", async (event, job) => { + const filenameSafe = job.filename.replace(/[^a-z\.\-_0-9]/i, ""); + const fname = path.join(storePath, filenameSafe); switch (job.type) { case "read": { if (!fs.existsSync(fname)) { - return { - // Special FILE_NOT_FOUND error code - error: "file_not_found", - }; - } - - try { - const data = fs.readFileSync(fname, { encoding: "utf8" }); - return { - success: true, - data, - }; - } catch (ex) { - console.error(ex); - return { - error: ex, - }; + // Special FILE_NOT_FOUND error code + return { error: "file_not_found" }; } + return await fs.promises.readFile(fname, "utf8"); } case "write": { - try { - writeFileSafe(fname, job.contents); - return { - success: true, - data: job.contents, - }; - } catch (ex) { - console.error(ex); - return { - error: ex, - }; - } + await writeFileSafe(fname, job.contents); + return job.contents; } case "delete": { - try { - fs.unlinkSync(fname); - } catch (ex) { - console.error(ex); - return { - error: ex, - }; - } - - return { - success: true, - data: null, - }; + await fs.promises.unlink(fname); + return; } default: - throw new Error("Unkown fs job: " + job.type); + throw new Error("Unknown fs job: " + job.type); } -} - -ipcMain.on("fs-job", async (event, arg) => { - const result = await performFsJob(arg); - event.sender.send("fs-response", { id: arg.id, result }); }); + wegame.init(isDev); wegame.listen(); diff --git a/src/js/platform/electron/storage.js b/src/js/platform/electron/storage.js index 24aff500..65f0e507 100644 --- a/src/js/platform/electron/storage.js +++ b/src/js/platform/electron/storage.js @@ -1,29 +1,8 @@ -import { StorageInterface } from "../storage"; -import { createLogger } from "../../core/logging"; - -const logger = createLogger("electron-storage"); +import { FILE_NOT_FOUND, StorageInterface } from "../storage"; export class StorageImplElectron extends StorageInterface { constructor(app) { super(app); - - /** @type {Object.} */ - this.jobs = {}; - this.jobId = 0; - - ipcRenderer.on("fs-response", (event, arg) => { - const id = arg.id; - if (!this.jobs[id]) { - logger.warn("Got unhandled FS response, job not known:", id); - return; - } - const { resolve, reject } = this.jobs[id]; - if (arg.result.success) { - resolve(arg.result.data); - } else { - reject(arg.result.error); - } - }); } initialize() { @@ -31,44 +10,32 @@ export class StorageImplElectron extends StorageInterface { } writeFileAsync(filename, contents) { - return new Promise((resolve, reject) => { - // ipcMain - const jobId = ++this.jobId; - this.jobs[jobId] = { resolve, reject }; - - ipcRenderer.send("fs-job", { - type: "write", - filename, - contents, - id: jobId, - }); + return ipcRenderer.invoke("fs-job", { + type: "write", + filename, + contents, }); } readFileAsync(filename) { - return new Promise((resolve, reject) => { - // ipcMain - const jobId = ++this.jobId; - this.jobs[jobId] = { resolve, reject }; - - ipcRenderer.send("fs-job", { + return ipcRenderer + .invoke("fs-job", { type: "read", filename, - id: jobId, + }) + .then(res => { + if (res && res.error === FILE_NOT_FOUND) { + throw FILE_NOT_FOUND; + } + + return res; }); - }); } deleteFileAsync(filename) { - return new Promise((resolve, reject) => { - // ipcMain - const jobId = ++this.jobId; - this.jobs[jobId] = { resolve, reject }; - ipcRenderer.send("fs-job", { - type: "delete", - filename, - id: jobId, - }); + return ipcRenderer.invoke("fs-job", { + type: "delete", + filename, }); } } diff --git a/src/js/states/mods.js b/src/js/states/mods.js index a99d2e95..c3cbce52 100644 --- a/src/js/states/mods.js +++ b/src/js/states/mods.js @@ -116,7 +116,7 @@ export class ModsState extends TextualGameState { this.dialogs.showWarning(T.global.error, T.mods.folderOnlyStandalone); return; } - ipcRenderer.send("open-mods-folder"); + ipcRenderer.invoke("open-mods-folder"); } onSteamLinkClicked() { From 05056545f27754901e88d9b87539e5256331d372 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 15 Jan 2022 11:45:57 +0100 Subject: [PATCH 034/129] Properly isolate electron renderer process --- electron/index.js | 74 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 5 deletions(-) diff --git a/electron/index.js b/electron/index.js index 8ff7faa2..1b8b4b5e 100644 --- a/electron/index.js +++ b/electron/index.js @@ -1,6 +1,6 @@ /* eslint-disable quotes,no-undef */ -const { app, BrowserWindow, Menu, MenuItem, ipcMain, shell, dialog } = require("electron"); +const { app, BrowserWindow, Menu, MenuItem, ipcMain, shell, dialog, session } = require("electron"); const path = require("path"); const url = require("url"); const fs = require("fs"); @@ -55,10 +55,16 @@ function createWindow() { autoHideMenuBar: true, webPreferences: { nodeIntegration: false, + nodeIntegrationInWorker: false, + nodeIntegrationInSubFrames: false, + contextIsolation: true, + enableRemoteModule: false, + disableBlinkFeatures: "Auxclick", + webSecurity: true, sandbox: true, - contextIsolation: true, preload: path.join(__dirname, "preload.js"), + experimentalFeatures: false, }, allowRunningInsecureContent: false, }); @@ -77,9 +83,67 @@ function createWindow() { win.webContents.session.clearCache(); win.webContents.session.clearStorageData(); + ////// SECURITY + + // Disable permission requests + win.webContents.session.setPermissionRequestHandler((webContents, permission, callback) => { + callback(false); + }); + session.fromPartition("default").setPermissionRequestHandler((webContents, permission, callback) => { + callback(false); + }); + + app.on("web-contents-created", (event, contents) => { + // Disable vewbiew + contents.on("will-attach-webview", (event, webPreferences, params) => { + event.preventDefault(); + }); + // Disable navigation + contents.on("will-navigate", (event, navigationUrl) => { + event.preventDefault(); + }); + }); + + win.webContents.on("will-redirect", (contentsEvent, navigationUrl) => { + // Log and prevent the app from redirecting to a new page + console.error( + `The application tried to redirect to the following address: '${navigationUrl}'. This attempt was blocked.` + ); + contentsEvent.preventDefault(); + }); + + // Filter loading any module via remote; + // you shouldn't be using remote at all, though + // https://electronjs.org/docs/tutorial/security#16-filter-the-remote-module + app.on("remote-require", (event, webContents, moduleName) => { + event.preventDefault(); + }); + + // built-ins are modules such as "app" + app.on("remote-get-builtin", (event, webContents, moduleName) => { + event.preventDefault(); + }); + + app.on("remote-get-global", (event, webContents, globalName) => { + event.preventDefault(); + }); + + app.on("remote-get-current-window", (event, webContents) => { + event.preventDefault(); + }); + + app.on("remote-get-current-web-contents", (event, webContents) => { + event.preventDefault(); + }); + + //// END SECURITY + win.webContents.on("new-window", (event, pth) => { event.preventDefault(); - shell.openExternal(pth); + + if (pth.startsWith("https://")) { + shell.openExternal(pth); + } }); win.on("closed", () => { @@ -90,11 +154,11 @@ function createWindow() { if (isDev) { menu = new Menu(); - win.toggleDevTools(); + win.webContents.toggleDevTools(); const mainItem = new MenuItem({ label: "Toggle Dev Tools", - click: () => win.toggleDevTools(), + click: () => win.webContents.toggleDevTools(), accelerator: "F12", }); menu.append(mainItem); From eba9163a332cb88502c2400b1d875067c198c84e Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 15 Jan 2022 12:02:24 +0100 Subject: [PATCH 035/129] Update to latest electron --- electron/package.json | 9 ++++---- electron/steam.js | 1 - electron/yarn.lock | 48 +++++++++++++++++++------------------------ 3 files changed, 25 insertions(+), 33 deletions(-) diff --git a/electron/package.json b/electron/package.json index d21aff71..f866811e 100644 --- a/electron/package.json +++ b/electron/package.json @@ -9,13 +9,12 @@ "startDevGpu": "electron --enable-gpu-rasterization --enable-accelerated-2d-canvas --num-raster-threads=8 --enable-zero-copy . --dev --local", "start": "electron --disable-direct-composition --in-process-gpu ." }, - "devDependencies": { - "electron": "10.4.3" - }, + "devDependencies": {}, "optionalDependencies": { - "shapez.io-private-artifacts": "github:tobspr/shapez.io-private-artifacts#abi-v82" + "shapez.io-private-artifacts": "github:tobspr/shapez.io-private-artifacts#abi-v99" }, "dependencies": { - "async-lock": "^1.2.8" + "async-lock": "^1.2.8", + "electron": "16.0.7" } } diff --git a/electron/steam.js b/electron/steam.js index 464b7924..7faceb04 100644 --- a/electron/steam.js +++ b/electron/steam.js @@ -13,7 +13,6 @@ try { // greenworks is not installed console.warn("Failed to load steam api:", err); } - function init(isDev) { if (!greenworks) { return; diff --git a/electron/yarn.lock b/electron/yarn.lock index db2b6278..39142b68 100644 --- a/electron/yarn.lock +++ b/electron/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@electron/get@^1.0.1": - version "1.12.4" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" - integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg== +"@electron/get@^1.13.0": + version "1.13.1" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368" + integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA== dependencies: debug "^4.1.1" env-paths "^2.2.0" @@ -15,7 +15,7 @@ semver "^6.2.0" sumchecker "^3.0.1" optionalDependencies: - global-agent "^2.0.2" + global-agent "^3.0.0" global-tunnel-ng "^2.7.1" "@sindresorhus/is@^0.14.0": @@ -30,10 +30,10 @@ dependencies: defer-to-connect "^1.0.1" -"@types/node@^12.0.12": - version "12.20.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.5.tgz#4ca82a766f05c359fd6c77505007e5a272f4bb9b" - integrity sha512-5Oy7tYZnu3a4pnJ//d4yVvOImExl4Vtwf0D40iKUlU+XlUsyV9iyFWyCFlwy489b72FMAik/EFwRkNLjjOdSPg== +"@types/node@^14.6.2": + version "14.18.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.5.tgz#0dd636fe7b2c6055cbed0d4ca3b7fb540f130a96" + integrity sha512-LMy+vDDcQR48EZdEx5wRX1q/sEl6NdGuHXPnfeL8ixkwCOSZ2qnIyIZmcCbdX0MeRqHhAcHmX+haCbrS8Run+A== async-lock@^1.2.8: version "1.2.8" @@ -93,11 +93,6 @@ config-chain@^1.1.11: ini "^1.3.4" proto-list "~1.2.1" -core-js@^3.6.5: - version "3.9.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz#cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae" - integrity sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg== - core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -146,13 +141,13 @@ duplexer3@^0.1.4: resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= -electron@10.4.3: - version "10.4.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-10.4.3.tgz#8d1c0f5e562d1b78dcec8074c0d59e58137fd508" - integrity sha512-qL8XZBII9KQHr1+YmVMj1AqyTR2I8/lxozvKEWoKKSkF8Hl6GzzxrLXRfISP7aDAvsJEyyhc6b2/42ME8hG5JA== +electron@16.0.7: + version "16.0.7" + resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.7.tgz#87eaccd05ab61563d3c17dfbad2949bba7ead162" + integrity sha512-/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w== dependencies: - "@electron/get" "^1.0.1" - "@types/node" "^12.0.12" + "@electron/get" "^1.13.0" + "@types/node" "^14.6.2" extract-zip "^1.0.3" encodeurl@^1.0.2: @@ -222,13 +217,12 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" -global-agent@^2.0.2: - version "2.1.12" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195" - integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg== +global-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" + integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== dependencies: boolean "^3.0.1" - core-js "^3.6.5" es6-error "^4.1.1" matcher "^3.0.0" roarr "^2.15.3" @@ -503,9 +497,9 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" -"shapez.io-private-artifacts@github:tobspr/shapez.io-private-artifacts#abi-v82": +"shapez.io-private-artifacts@github:tobspr/shapez.io-private-artifacts#abi-v99": version "0.1.0" - resolved "git+ssh://git@github.com/tobspr/shapez.io-private-artifacts.git#8aa3bfd3b569eb5695fc8a585a3f2ee3ed2db290" + resolved "git+ssh://git@github.com/tobspr/shapez.io-private-artifacts.git#b638501e81bba324923fc1b9d9aadc925da9b2c6" sprintf-js@^1.1.2: version "1.1.2" From 53c3cbfe268e0dcab10b343e1b0bac46e676f097 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 15 Jan 2022 12:30:57 +0100 Subject: [PATCH 036/129] Show errors when loading mods --- src/js/mods/modloader.js | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index f5145207..d7e10391 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -94,19 +94,29 @@ export class ModLoader { } mods.forEach(modCode => { - const func = new Function(modCode); - func(); + try { + const func = new Function(modCode); + const response = func(); + } catch (ex) { + console.error(ex); + alert("Failed to parse mod (launch with --dev for more info): " + ex); + } }); } catch (ex) { - alert("Failed to load mods: " + ex); + alert("Failed to load mods (launch with --dev for more info): " + ex); } } this.initialized = true; this.modLoadQueue.forEach(modClass => { - const mod = new (modClass())(this.app, this); - mod.init(); - this.mods.push(mod); + try { + const mod = new (modClass())(this.app, this); + mod.init(); + this.mods.push(mod); + } catch (ex) { + console.error(ex); + alert("Failed to initialize mods (launch with --dev for more info): " + ex); + } }); this.modLoadQueue = []; this.signals.postInit.dispatch(); From 4e33eb5a7c5d83b26078c14c0c5a389cba5277bf Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 15 Jan 2022 12:37:22 +0100 Subject: [PATCH 037/129] Update confirm dialgo --- electron/index.js | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/electron/index.js b/electron/index.js index 1b8b4b5e..3c567893 100644 --- a/electron/index.js +++ b/electron/index.js @@ -351,21 +351,10 @@ ipcMain.handle("get-mods", async () => { buttons: ["Exit Game", "Continue"], type: "warning", defaultId: 0, - - checkboxLabel: - "I understand that mods have access to my file system and can be potentially harmful", - checkboxChecked: false, cancelId: 0, }); if (response.response === 1) { - if (response.checkboxChecked) { - break; - } else { - await dialog.showMessageBox(win, { - message: - "Please confirm that you have understood the risks by checking the checkbox in the next dialog.", - }); - } + break; } if (response.response === 0) { process.exit(0); From b39f48ebfba5fa7eab0f0275e0208d2a56782097 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 15 Jan 2022 13:35:19 +0100 Subject: [PATCH 038/129] Minor restructure, start to add mod examples --- gulp/gulpfile.js | 2 +- gulp/standalone.js | 2 +- gulp/webpack.production.config.js | 2 +- .../index.js => mod_examples/combined.js | 18 ++++-- mod_examples/custom_css.js | 47 +++++++++++++++ mod_examples/replace_builtin_sprites.js | 57 +++++++++++++++++++ package.json | 2 +- src/css/states/main_menu.scss | 2 +- src/html/index.html | 4 +- src/js/core/config.local.template.js | 2 +- src/js/game/hud/parts/modal_dialogs.js | 2 +- src/js/main.js | 2 +- src/js/mods/modloader.js | 1 - src/js/states/main_menu.js | 4 +- 14 files changed, 128 insertions(+), 19 deletions(-) rename src/js/mods/demo_mod.nobuild/index.js => mod_examples/combined.js (99%) create mode 100644 mod_examples/custom_css.js create mode 100644 mod_examples/replace_builtin_sprites.js diff --git a/gulp/gulpfile.js b/gulp/gulpfile.js index 87901377..32a751fd 100644 --- a/gulp/gulpfile.js +++ b/gulp/gulpfile.js @@ -146,7 +146,7 @@ gulp.task("main.webserver", () => { */ function serve({ version = "web" }) { browserSync.init({ - server: [buildFolder, path.join(baseDir, "src", "js")], + server: [buildFolder, path.join(baseDir, "mod_examples")], port: 3005, ghostMode: { clicks: false, diff --git a/gulp/standalone.js b/gulp/standalone.js index 81b41929..75f0b7a8 100644 --- a/gulp/standalone.js +++ b/gulp/standalone.js @@ -143,7 +143,7 @@ function gulptasksStandalone($, gulp) { packager({ dir: tempDestBuildDir, - appCopyright: "Tobias Springer", + appCopyright: "tobspr Games", appVersion: getVersion(), buildVersion: "1.0.0", arch, diff --git a/gulp/webpack.production.config.js b/gulp/webpack.production.config.js index 72bae9f4..fdd477b9 100644 --- a/gulp/webpack.production.config.js +++ b/gulp/webpack.production.config.js @@ -145,7 +145,7 @@ module.exports = ({ braces: false, ecma: es6 ? 6 : 5, preamble: - "/* shapez.io Codebase - Copyright 2020 Tobias Springer - " + + "/* shapez.io Codebase - Copyright 2022 tobspr Games - " + getVersion() + " @ " + getRevision() + diff --git a/src/js/mods/demo_mod.nobuild/index.js b/mod_examples/combined.js similarity index 99% rename from src/js/mods/demo_mod.nobuild/index.js rename to mod_examples/combined.js index c8f166ba..54bf474a 100644 --- a/src/js/mods/demo_mod.nobuild/index.js +++ b/mod_examples/combined.js @@ -213,20 +213,26 @@ registerMod(() => { this.signals.stateEntered.add(state => { if (state.key === "MainMenuState") { const element = document.createElement("div"); - element.innerText = "Hello World from mod!"; element.id = "demo_mod_hello_world_element"; document.body.appendChild(element); + + const button = document.createElement("button"); + button.classList.add("styledButton"); + button.innerText = "Hello!"; + button.addEventListener("click", () => { + this.dialogs.showInfo("Mod Message", "Button clicked!"); + }); + element.appendChild(button); } }); this.modInterface.registerCss(` #demo_mod_hello_world_element { - position: fixed; - top: 10px; - left: 10px; + position: absolute; + top: calc(10px * var(--ui-scale)); + left: calc(10px * var(--ui-scale)); color: red; - z-index: 999; - font-size: 50px; + z-index: 0; } `); diff --git a/mod_examples/custom_css.js b/mod_examples/custom_css.js new file mode 100644 index 00000000..c8feb0ab --- /dev/null +++ b/mod_examples/custom_css.js @@ -0,0 +1,47 @@ +/** + * This example shows how to replace builtin sprites, in this case + * the color sprites + */ +registerMod(() => { + return class ModImpl extends shapez.Mod { + constructor(app, modLoader) { + super( + app, + { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Add custom CSS", + version: "1", + id: "custom-css", + description: "Shows how to add custom css", + }, + modLoader + ); + } + + init() { + this.modInterface.registerCss(` + * { + font-family: "Comic Sans", "Comic Sans MS", "ComicSans", Tahoma !important; + } + + #state_MainMenuState { + background: #9dc499 url('${RESOURCES["cat.png"]}') top left repeat !important; + } + + #state_MainMenuState .fullscreenBackgroundVideo { + display: none !important; + } + + #state_MainMenuState .mainContainer, #state_MainMenuState .modsOverview { + border: 5px solid #000 !important; + } + `); + } + }; +}); + +const RESOURCES = { + "cat.png": + "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAGxAAABsQFhmCgOAAAE8mlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNy4xLWMwMDAgNzkuZGFiYWNiYiwgMjAyMS8wNC8xNC0wMDozOTo0NCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIzLjAgKE1hY2ludG9zaCkiIHhtcDpDcmVhdGVEYXRlPSIyMDIyLTAxLTE1VDEzOjI3OjU1KzAxOjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyMi0wMS0xNVQxMzozMDowMyswMTowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyMi0wMS0xNVQxMzozMDowMyswMTowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTI2OGI2OWUtYTQ2Ni00YmNkLWJjNGYtM2VlNmUwOGI2NzA2IiB4bXBNTTpEb2N1bWVudElE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", +}; diff --git a/mod_examples/replace_builtin_sprites.js b/mod_examples/replace_builtin_sprites.js new file mode 100644 index 00000000..a6c5d53d --- /dev/null +++ b/mod_examples/replace_builtin_sprites.js @@ -0,0 +1,57 @@ +/** + * This example shows how to replace builtin sprites, in this case + * the color sprites + */ +registerMod(() => { + return class ModImpl extends shapez.Mod { + constructor(app, modLoader) { + super( + app, + { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Replace builtin sprites", + version: "1", + id: "replace-builtin-sprites", + description: "Shows how to replace builtin sprites", + }, + modLoader + ); + } + + init() { + // Replace a builtin sprite + ["red", "green", "blue", "yellow", "purple", "cyan", "white"].forEach(color => { + this.modInterface.registerSprite( + "sprites/colors/" + color + ".png", + RESOURCES[color + ".png"] + ); + }); + } + }; +}); + +//////////////////////////////////////////////////////////////////////// + +const RESOURCES = { + "red.png": + "data:image/png;base64,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", + + "green.png": + "data:image/png;base64,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", + + "purple.png": + "data:image/png;base64,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", + + "blue.png": + "data:image/png;base64,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", + + "yellow.png": + "data:image/png;base64,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", + + "cyan.png": + "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAOxAAADsQH1g+1JAAAE8mlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNy4xLWMwMDAgNzkuZGFiYWNiYiwgMjAyMS8wNC8xNC0wMDozOTo0NCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIzLjAgKE1hY2ludG9zaCkiIHhtcDpDcmVhdGVEYXRlPSIyMDIyLTAxLTE0VDEwOjMwOjMyKzAxOjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyMi0wMS0xNFQxMDozMDo1MCswMTowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyMi0wMS0xNFQxMDozMDo1MCswMTowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ZTFiZTU2MjEtMTU1ZC00YmFmLWFiNzgtYjM2Y2QzMmIzNTNkIiB4bXBNTTpEb2N1bWVudElE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", + + "white.png": + "data:image/png;base64,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", +}; diff --git a/package.json b/package.json index f1f3cfdf..4ee134b7 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "main": "index.js", "repository": "https://github.com/tobspr/shapez.io", - "author": "Tobias Springer ", + "author": "tobspr Games ", "license": "MIT", "private": true, "scripts": { diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss index c221c18e..2458350e 100644 --- a/src/css/states/main_menu.scss +++ b/src/css/states/main_menu.scss @@ -293,7 +293,7 @@ } } - .modsList { + .modsOverview { display: flex; align-items: center; justify-content: center; diff --git a/src/html/index.html b/src/html/index.html index b1d89377..6ffa1876 100644 --- a/src/html/index.html +++ b/src/html/index.html @@ -15,8 +15,8 @@ - - + + 0) { diff --git a/src/js/main.js b/src/js/main.js index 71ec59a9..3ae76844 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -53,7 +53,7 @@ if (window.coreThreadLoadedCb) { // } console.log( - `%cshapez.io ️%c\n© 2020 Tobias Springer IT Solutions\nCommit %c${G_BUILD_COMMIT_HASH}%c on %c${new Date( + `%cshapez.io ️%c\n© 2022 tobspr Games\nCommit %c${G_BUILD_COMMIT_HASH}%c on %c${new Date( G_BUILD_TIME ).toLocaleString()}\n`, "font-size: 35px; font-family: Arial;font-weight: bold; padding: 10px 0;", diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index f5145207..0aae0721 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -43,7 +43,6 @@ export class ModLoader { if (G_IS_DEV || G_IS_STANDALONE) { let exports = {}; const modules = require.context("../", true, /\.js$/); - Array.from(modules.keys()).forEach(key => { // @ts-ignore const module = modules(key); diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index 04cf8bca..153bc4e5 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -153,7 +153,7 @@ export class MainMenuState extends GameState { hasMods ? ` -
+

${T.mods.title}

@@ -226,7 +226,7 @@ export class MainMenuState extends GameState {
${T.mainMenu.madeBy.replace( "", - 'Tobias Springer' + 'tobspr Games' )}
From 2a83853b1cc41ec87d8e51ae70d0dc38d43a1b17 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 15 Jan 2022 13:59:38 +0100 Subject: [PATCH 039/129] Allow adding custom themesw --- mod_examples/custom_css.js | 3 +- mod_examples/custom_theme.js | 101 ++++++++ mod_examples/modify_theme.js | 30 +++ src/js/application.js | 69 +++--- src/js/game/theme.js | 3 - src/js/game/themes/dark.json | 1 - src/js/game/themes/light.json | 1 - src/js/mods/mod_interface.js | 22 ++ src/js/mods/mod_signals.js | 5 +- src/js/mods/modloader.js | 3 +- src/js/profile/application_settings.js | 327 +++++++++++++------------ src/js/states/main_menu.js | 3 +- src/js/states/settings.js | 8 +- 13 files changed, 367 insertions(+), 209 deletions(-) create mode 100644 mod_examples/custom_theme.js create mode 100644 mod_examples/modify_theme.js diff --git a/mod_examples/custom_css.js b/mod_examples/custom_css.js index c8feb0ab..248e0983 100644 --- a/mod_examples/custom_css.js +++ b/mod_examples/custom_css.js @@ -1,6 +1,5 @@ /** - * This example shows how to replace builtin sprites, in this case - * the color sprites + * This example shows how to add custom css */ registerMod(() => { return class ModImpl extends shapez.Mod { diff --git a/mod_examples/custom_theme.js b/mod_examples/custom_theme.js new file mode 100644 index 00000000..b53016aa --- /dev/null +++ b/mod_examples/custom_theme.js @@ -0,0 +1,101 @@ +/** + * This example shows how to add a new theme to the game + */ +registerMod(() => { + return class ModImpl extends shapez.Mod { + constructor(app, modLoader) { + super( + app, + { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Custom Game Theme", + version: "1", + id: "custom-theme", + description: "Shows how to add a custom game theme", + }, + modLoader + ); + } + + init() { + console.log("CUSTOM GAME THEME NOW"); + this.modInterface.registerGameTheme({ + id: "my-theme", + name: "My fancy theme", + theme: RESOURCES["my-theme.json"], + }); + } + }; +}); + +const RESOURCES = { + "my-theme.json": { + map: { + background: "#abc", + grid: "#ccc", + gridLineWidth: 1, + + selectionOverlay: "rgba(74, 163, 223, 0.7)", + selectionOutline: "rgba(74, 163, 223, 0.5)", + selectionBackground: "rgba(74, 163, 223, 0.2)", + + chunkBorders: "rgba(0, 30, 50, 0.03)", + + directionLock: { + regular: { + color: "rgb(74, 237, 134)", + background: "rgba(74, 237, 134, 0.2)", + }, + wires: { + color: "rgb(74, 237, 134)", + background: "rgba(74, 237, 134, 0.2)", + }, + }, + + colorBlindPickerTile: "rgba(50, 50, 50, 0.4)", + + resources: { + shape: "#eaebec", + red: "#ffbfc1", + green: "#cbffc4", + blue: "#bfdaff", + }, + + chunkOverview: { + empty: "#a6afbb", + filled: "#c5ccd6", + beltColor: "#777", + }, + + wires: { + overlayColor: "rgba(97, 161, 152, 0.75)", + previewColor: "rgb(97, 161, 152, 0.4)", + highlightColor: "rgba(72, 137, 255, 1)", + }, + + connectedMiners: { + overlay: "rgba(40, 50, 60, 0.5)", + textColor: "#fff", + textColorCapped: "#ef5072", + background: "rgba(40, 50, 60, 0.8)", + }, + + zone: { + borderSolid: "rgba(23, 192, 255, 1)", + outerColor: "rgba(240, 240, 255, 0.5)", + }, + }, + + items: { + outline: "#55575a", + outlineWidth: 0.75, + circleBackground: "rgba(40, 50, 65, 0.1)", + }, + + shapeTooltip: { + background: "#dee1ea", + outline: "#54565e", + }, + }, +}; diff --git a/mod_examples/modify_theme.js b/mod_examples/modify_theme.js new file mode 100644 index 00000000..6f7f53ff --- /dev/null +++ b/mod_examples/modify_theme.js @@ -0,0 +1,30 @@ +/** + * This example shows how to modify the builtin themes. If you want to create your own theme, + * be sure to check out the "custom_theme" example + */ +registerMod(() => { + return class ModImpl extends shapez.Mod { + constructor(app, modLoader) { + super( + app, + { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Modify Builtin Themes", + version: "1", + id: "modify-theme", + description: "Shows how to modify builtin themes", + }, + modLoader + ); + } + + init() { + shapez.THEMES.light.map.background = "#eee"; + shapez.THEMES.light.items.outline = "#000"; + + shapez.THEMES.dark.map.background = "#245"; + shapez.THEMES.dark.items.outline = "#fff"; + } + }; +}); diff --git a/src/js/application.js b/src/js/application.js index 9827d674..cbf6528b 100644 --- a/src/js/application.js +++ b/src/js/application.js @@ -65,12 +65,20 @@ if (typeof document.hidden !== "undefined") { } export class Application { - constructor() { + /** + * Boots the application + */ + async boot() { + console.log("Booting ..."); + assert(!GLOBAL_APP, "Tried to construct application twice"); logger.log("Creating application, platform =", getPlatformName()); setGlobalApp(this); MODS.app = this; + // MODS + await MODS.initMods(); + this.unloaded = false; // Global stuff @@ -132,6 +140,31 @@ export class Application { // Store the mouse position, or null if not available /** @type {Vector|null} */ this.mousePosition = null; + + this.registerStates(); + this.registerEventListeners(); + + Loader.linkAppAfterBoot(this); + + if (G_WEGAME_VERSION) { + this.stateMgr.moveToState("WegameSplashState"); + } + + // Check for mobile + else if (IS_MOBILE) { + this.stateMgr.moveToState("MobileWarningState"); + } else { + this.stateMgr.moveToState("PreloadState"); + } + + // Starting rendering + this.ticker.frameEmitted.add(this.onFrameEmitted, this); + this.ticker.bgFrameEmitted.add(this.onBackgroundFrame, this); + this.ticker.start(); + + window.focus(); + + MOD_SIGNALS.appBooted.dispatch(); } /** @@ -152,8 +185,6 @@ export class Application { this.analytics = new GoogleAnalyticsImpl(this); this.gameAnalytics = new ShapezGameAnalytics(this); this.achievementProvider = new NoAchievementProvider(this); - - MOD_SIGNALS.platformInstancesInitialized.dispatch(); } /** @@ -329,38 +360,6 @@ export class Application { } } - /** - * Boots the application - */ - async boot() { - console.log("Booting ..."); - - await MODS.initMods(); - - this.registerStates(); - this.registerEventListeners(); - - Loader.linkAppAfterBoot(this); - - if (G_WEGAME_VERSION) { - this.stateMgr.moveToState("WegameSplashState"); - } - - // Check for mobile - else if (IS_MOBILE) { - this.stateMgr.moveToState("MobileWarningState"); - } else { - this.stateMgr.moveToState("PreloadState"); - } - - // Starting rendering - this.ticker.frameEmitted.add(this.onFrameEmitted, this); - this.ticker.bgFrameEmitted.add(this.onBackgroundFrame, this); - this.ticker.start(); - - window.focus(); - } - /** * Deinitializes the application */ diff --git a/src/js/game/theme.js b/src/js/game/theme.js index 5e371740..251f4433 100644 --- a/src/js/game/theme.js +++ b/src/js/game/theme.js @@ -1,5 +1,3 @@ -import { MOD_SIGNALS } from "../mods/mod_signals"; - export const THEMES = { dark: require("./themes/dark.json"), light: require("./themes/light.json"), @@ -9,5 +7,4 @@ export let THEME = THEMES.light; export function applyGameTheme(id) { THEME = THEMES[id]; - MOD_SIGNALS.preprocessTheme.dispatch({ id, theme: THEME }); } diff --git a/src/js/game/themes/dark.json b/src/js/game/themes/dark.json index fec42e28..25571700 100644 --- a/src/js/game/themes/dark.json +++ b/src/js/game/themes/dark.json @@ -1,5 +1,4 @@ { - "uiStyle": "dark", "map": { "background": "#3e3f47", "grid": "rgba(255, 255, 255, 0.02)", diff --git a/src/js/game/themes/light.json b/src/js/game/themes/light.json index d44a15ab..3bea6a80 100644 --- a/src/js/game/themes/light.json +++ b/src/js/game/themes/light.json @@ -1,5 +1,4 @@ { - "uiStyle": "light", "map": { "background": "#fff", "grid": "#fafafa", diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index f5af7ef5..0e967990 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -23,6 +23,7 @@ import { MODS_ADDITIONAL_SYSTEMS } from "../game/game_system_manager"; import { MOD_CHUNK_DRAW_HOOKS } from "../game/map_chunk_view"; import { KEYMAPPINGS } from "../game/key_action_mapper"; import { HUDModalDialogs } from "../game/hud/parts/modal_dialogs"; +import { THEMES } from "../game/theme"; export class ModInterface { /** @@ -322,4 +323,25 @@ export class ModInterface { } `); } + + /** + * @param {Object} param0 + * @param {string} param0.id + * @param {string} param0.name + * @param {Object} param0.theme + */ + registerGameTheme({ id, name, theme }) { + THEMES[id] = theme; + this.registerTranslations("en", { + settings: { + labels: { + theme: { + themes: { + [id]: name, + }, + }, + }, + }, + }); + } } diff --git a/src/js/mods/mod_signals.js b/src/js/mods/mod_signals.js index 16e08f8a..220cb424 100644 --- a/src/js/mods/mod_signals.js +++ b/src/js/mods/mod_signals.js @@ -10,10 +10,9 @@ import { Signal } from "../core/signal"; // Single file to avoid circular deps export const MOD_SIGNALS = { - postInit: new Signal(), - platformInstancesInitialized: new Signal(), + // Called when the application has booted and instances like the app settings etc are available + appBooted: new Signal(), - preprocessTheme: /** @type {TypedSignal<[Object]>} */ (new Signal()), modifyLevelDefinitions: /** @type {TypedSignal<[Array[Object]]>} */ (new Signal()), modifyUpgrades: /** @type {TypedSignal<[Object]>} */ (new Signal()), diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 525baaa5..715a0e33 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -95,7 +95,7 @@ export class ModLoader { mods.forEach(modCode => { try { const func = new Function(modCode); - const response = func(); + func(); } catch (ex) { console.error(ex); alert("Failed to parse mod (launch with --dev for more info): " + ex); @@ -118,7 +118,6 @@ export class ModLoader { } }); this.modLoadQueue = []; - this.signals.postInit.dispatch(); delete window.registerMod; } diff --git a/src/js/profile/application_settings.js b/src/js/profile/application_settings.js index 22074eae..03f4fdcf 100644 --- a/src/js/profile/application_settings.js +++ b/src/js/profile/application_settings.js @@ -122,7 +122,7 @@ export const autosaveIntervals = [ }, ]; -const refreshRateOptions = ["30", "60", "120", "180", "240"]; +export const refreshRateOptions = ["30", "60", "120", "180", "240"]; if (G_IS_DEV) { refreshRateOptions.unshift("10"); @@ -133,163 +133,161 @@ if (G_IS_DEV) { refreshRateOptions.push("10000"); } -/** @type {Array} */ -export const allApplicationSettings = [ - new EnumSetting("language", { - options: Object.keys(LANGUAGES), - valueGetter: key => key, - textGetter: key => LANGUAGES[key].name, - category: enumCategories.general, - restartRequired: true, - changeCb: (app, id) => null, - magicValue: "auto-detect", - }), +/** @returns {Array} */ +function initializeSettings() { + return [ + new EnumSetting("language", { + options: Object.keys(LANGUAGES), + valueGetter: key => key, + textGetter: key => LANGUAGES[key].name, + category: enumCategories.general, + restartRequired: true, + changeCb: (app, id) => null, + magicValue: "auto-detect", + }), - new EnumSetting("uiScale", { - options: uiScales.sort((a, b) => a.size - b.size), - valueGetter: scale => scale.id, - textGetter: scale => T.settings.labels.uiScale.scales[scale.id], - category: enumCategories.userInterface, - restartRequired: false, - changeCb: + new EnumSetting("uiScale", { + options: uiScales.sort((a, b) => a.size - b.size), + valueGetter: scale => scale.id, + textGetter: scale => T.settings.labels.uiScale.scales[scale.id], + category: enumCategories.userInterface, + restartRequired: false, + changeCb: + /** + * @param {Application} app + */ + (app, id) => app.updateAfterUiScaleChanged(), + }), + + new RangeSetting( + "soundVolume", + enumCategories.general, /** * @param {Application} app */ - (app, id) => app.updateAfterUiScaleChanged(), - }), - - new RangeSetting( - "soundVolume", - enumCategories.general, - /** - * @param {Application} app - */ - (app, value) => app.sound.setSoundVolume(value) - ), - new RangeSetting( - "musicVolume", - enumCategories.general, - /** - * @param {Application} app - */ - (app, value) => app.sound.setMusicVolume(value) - ), - - new BoolSetting( - "fullscreen", - enumCategories.general, - /** - * @param {Application} app - */ - (app, value) => { - if (app.platformWrapper.getSupportsFullscreen()) { - app.platformWrapper.setFullscreen(value); - } - }, - /** - * @param {Application} app - */ app => app.restrictionMgr.getHasExtendedSettings() - ), - - new BoolSetting( - "enableColorBlindHelper", - enumCategories.general, - /** - * @param {Application} app - */ - (app, value) => null - ), - - new BoolSetting("offerHints", enumCategories.userInterface, (app, value) => {}), - - new EnumSetting("theme", { - options: Object.keys(THEMES), - valueGetter: theme => theme, - textGetter: theme => T.settings.labels.theme.themes[theme], - category: enumCategories.userInterface, - restartRequired: false, - changeCb: + (app, value) => app.sound.setSoundVolume(value) + ), + new RangeSetting( + "musicVolume", + enumCategories.general, /** * @param {Application} app */ - (app, id) => { - applyGameTheme(id); - document.documentElement.setAttribute("data-theme", id); + (app, value) => app.sound.setMusicVolume(value) + ), + + new BoolSetting( + "fullscreen", + enumCategories.general, + /** + * @param {Application} app + */ + (app, value) => { + if (app.platformWrapper.getSupportsFullscreen()) { + app.platformWrapper.setFullscreen(value); + } }, - enabledCb: /** - * @param {Application} app - */ app => app.restrictionMgr.getHasExtendedSettings(), - }), + /** + * @param {Application} app + */ app => app.restrictionMgr.getHasExtendedSettings() + ), - new EnumSetting("autosaveInterval", { - options: autosaveIntervals, - valueGetter: interval => interval.id, - textGetter: interval => T.settings.labels.autosaveInterval.intervals[interval.id], - category: enumCategories.advanced, - restartRequired: false, - changeCb: + new BoolSetting( + "enableColorBlindHelper", + enumCategories.general, /** * @param {Application} app */ - (app, id) => null, - }), + (app, value) => null + ), - new EnumSetting("scrollWheelSensitivity", { - options: scrollWheelSensitivities.sort((a, b) => a.scale - b.scale), - valueGetter: scale => scale.id, - textGetter: scale => T.settings.labels.scrollWheelSensitivity.sensitivity[scale.id], - category: enumCategories.advanced, - restartRequired: false, - changeCb: - /** + new BoolSetting("offerHints", enumCategories.userInterface, (app, value) => {}), + + new EnumSetting("theme", { + options: Object.keys(THEMES), + valueGetter: theme => theme, + textGetter: theme => T.settings.labels.theme.themes[theme], + category: enumCategories.userInterface, + restartRequired: false, + changeCb: + /** + * @param {Application} app + */ + (app, id) => { + applyGameTheme(id); + document.documentElement.setAttribute("data-theme", id); + }, + enabledCb: /** * @param {Application} app - */ - (app, id) => app.updateAfterUiScaleChanged(), - }), + */ app => app.restrictionMgr.getHasExtendedSettings(), + }), - new EnumSetting("movementSpeed", { - options: movementSpeeds.sort((a, b) => a.multiplier - b.multiplier), - valueGetter: multiplier => multiplier.id, - textGetter: multiplier => T.settings.labels.movementSpeed.speeds[multiplier.id], - category: enumCategories.advanced, - restartRequired: false, - changeCb: (app, id) => {}, - }), + new EnumSetting("autosaveInterval", { + options: autosaveIntervals, + valueGetter: interval => interval.id, + textGetter: interval => T.settings.labels.autosaveInterval.intervals[interval.id], + category: enumCategories.advanced, + restartRequired: false, + changeCb: + /** + * @param {Application} app + */ + (app, id) => null, + }), - new BoolSetting("enableMousePan", enumCategories.advanced, (app, value) => {}), - new BoolSetting("shapeTooltipAlwaysOn", enumCategories.advanced, (app, value) => {}), - new BoolSetting("alwaysMultiplace", enumCategories.advanced, (app, value) => {}), - new BoolSetting("zoomToCursor", enumCategories.advanced, (app, value) => {}), - new BoolSetting("clearCursorOnDeleteWhilePlacing", enumCategories.advanced, (app, value) => {}), - new BoolSetting("enableTunnelSmartplace", enumCategories.advanced, (app, value) => {}), - new BoolSetting("vignette", enumCategories.userInterface, (app, value) => {}), - new BoolSetting("compactBuildingInfo", enumCategories.userInterface, (app, value) => {}), - new BoolSetting("disableCutDeleteWarnings", enumCategories.advanced, (app, value) => {}), - new BoolSetting("rotationByBuilding", enumCategories.advanced, (app, value) => {}), - new BoolSetting("displayChunkBorders", enumCategories.advanced, (app, value) => {}), - new BoolSetting("pickMinerOnPatch", enumCategories.advanced, (app, value) => {}), - new RangeSetting("mapResourcesScale", enumCategories.advanced, () => null), + new EnumSetting("scrollWheelSensitivity", { + options: scrollWheelSensitivities.sort((a, b) => a.scale - b.scale), + valueGetter: scale => scale.id, + textGetter: scale => T.settings.labels.scrollWheelSensitivity.sensitivity[scale.id], + category: enumCategories.advanced, + restartRequired: false, + changeCb: + /** + * @param {Application} app + */ + (app, id) => app.updateAfterUiScaleChanged(), + }), - new EnumSetting("refreshRate", { - options: refreshRateOptions, - valueGetter: rate => rate, - textGetter: rate => T.settings.tickrateHz.replace("", rate), - category: enumCategories.performance, - restartRequired: false, - changeCb: (app, id) => {}, - enabledCb: /** - * @param {Application} app - */ app => app.restrictionMgr.getHasExtendedSettings(), - }), + new EnumSetting("movementSpeed", { + options: movementSpeeds.sort((a, b) => a.multiplier - b.multiplier), + valueGetter: multiplier => multiplier.id, + textGetter: multiplier => T.settings.labels.movementSpeed.speeds[multiplier.id], + category: enumCategories.advanced, + restartRequired: false, + changeCb: (app, id) => {}, + }), - new BoolSetting("lowQualityMapResources", enumCategories.performance, (app, value) => {}), - new BoolSetting("disableTileGrid", enumCategories.performance, (app, value) => {}), - new BoolSetting("lowQualityTextures", enumCategories.performance, (app, value) => {}), - new BoolSetting("simplifiedBelts", enumCategories.performance, (app, value) => {}), -]; + new BoolSetting("enableMousePan", enumCategories.advanced, (app, value) => {}), + new BoolSetting("shapeTooltipAlwaysOn", enumCategories.advanced, (app, value) => {}), + new BoolSetting("alwaysMultiplace", enumCategories.advanced, (app, value) => {}), + new BoolSetting("zoomToCursor", enumCategories.advanced, (app, value) => {}), + new BoolSetting("clearCursorOnDeleteWhilePlacing", enumCategories.advanced, (app, value) => {}), + new BoolSetting("enableTunnelSmartplace", enumCategories.advanced, (app, value) => {}), + new BoolSetting("vignette", enumCategories.userInterface, (app, value) => {}), + new BoolSetting("compactBuildingInfo", enumCategories.userInterface, (app, value) => {}), + new BoolSetting("disableCutDeleteWarnings", enumCategories.advanced, (app, value) => {}), + new BoolSetting("rotationByBuilding", enumCategories.advanced, (app, value) => {}), + new BoolSetting("displayChunkBorders", enumCategories.advanced, (app, value) => {}), + new BoolSetting("pickMinerOnPatch", enumCategories.advanced, (app, value) => {}), + new RangeSetting("mapResourcesScale", enumCategories.advanced, () => null), -export function getApplicationSettingById(id) { - return allApplicationSettings.find(setting => setting.id === id); + new EnumSetting("refreshRate", { + options: refreshRateOptions, + valueGetter: rate => rate, + textGetter: rate => T.settings.tickrateHz.replace("", rate), + category: enumCategories.performance, + restartRequired: false, + changeCb: (app, id) => {}, + enabledCb: /** + * @param {Application} app + */ app => app.restrictionMgr.getHasExtendedSettings(), + }), + + new BoolSetting("lowQualityMapResources", enumCategories.performance, (app, value) => {}), + new BoolSetting("disableTileGrid", enumCategories.performance, (app, value) => {}), + new BoolSetting("lowQualityTextures", enumCategories.performance, (app, value) => {}), + new BoolSetting("simplifiedBelts", enumCategories.performance, (app, value) => {}), + ]; } class SettingsStorage { @@ -339,6 +337,8 @@ class SettingsStorage { export class ApplicationSettings extends ReadWriteProxy { constructor(app) { super(app, "app_settings.bin"); + + this.settingHandles = initializeSettings(); } initialize() { @@ -347,8 +347,8 @@ export class ApplicationSettings extends ReadWriteProxy { .then(() => { // Apply default setting callbacks const settings = this.getAllSettings(); - for (let i = 0; i < allApplicationSettings.length; ++i) { - const handle = allApplicationSettings[i]; + for (let i = 0; i < this.settingHandles.length; ++i) { + const handle = this.settingHandles[i]; handle.apply(this.app, settings[handle.id]); } }) @@ -360,6 +360,10 @@ export class ApplicationSettings extends ReadWriteProxy { return this.writeAsync(); } + getSettingHandleById(id) { + return this.settingHandles.find(setting => setting.id === id); + } + // Getters /** @@ -457,20 +461,18 @@ export class ApplicationSettings extends ReadWriteProxy { * @param {string|boolean|number} value */ updateSetting(key, value) { - for (let i = 0; i < allApplicationSettings.length; ++i) { - const setting = allApplicationSettings[i]; - if (setting.id === key) { - if (!setting.validate(value)) { - assertAlways(false, "Bad setting value: " + key); - } - this.getAllSettings()[key] = value; - if (setting.changeCb) { - setting.changeCb(this.app, value); - } - return this.writeAsync(); - } + const setting = this.getSettingHandleById(key); + if (!setting) { + assertAlways(false, "Unknown setting: " + key); } - assertAlways(false, "Unknown setting: " + key); + if (!setting.validate(value)) { + assertAlways(false, "Bad setting value: " + key); + } + this.getAllSettings()[key] = value; + if (setting.changeCb) { + setting.changeCb(this.app, value); + } + return this.writeAsync(); } /** @@ -510,8 +512,15 @@ export class ApplicationSettings extends ReadWriteProxy { } const settings = data.settings; - for (let i = 0; i < allApplicationSettings.length; ++i) { - const setting = allApplicationSettings[i]; + + // MODS + if (!THEMES[settings.theme]) { + console.warn("Resetting theme because its no longer available: " + settings.theme); + settings.theme = "light"; + } + + for (let i = 0; i < this.settingHandles.length; ++i) { + const setting = this.settingHandles[i]; const storedValue = settings[setting.id]; if (!setting.validate(storedValue)) { return ExplainedResult.bad( @@ -690,6 +699,12 @@ export class ApplicationSettings extends ReadWriteProxy { data.version = 31; } + // MODS + if (!THEMES[data.settings.theme]) { + console.warn("Resetting theme because its no longer available: " + data.settings.theme); + data.settings.theme = "light"; + } + return ExplainedResult.good(); } } diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index 153bc4e5..b23a15f3 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -20,7 +20,6 @@ import { HUDModalDialogs } from "../game/hud/parts/modal_dialogs"; import { MODS } from "../mods/modloader"; import { PlatformWrapperImplBrowser } from "../platform/browser/wrapper"; import { PlatformWrapperImplElectron } from "../platform/electron/wrapper"; -import { getApplicationSettingById } from "../profile/application_settings"; import { T } from "../translations"; const trim = require("trim"); @@ -468,7 +467,7 @@ export class MainMenuState extends GameState { onLanguageChooseClicked() { this.app.analytics.trackUiClick("choose_language"); - const setting = /** @type {EnumSetting} */ (getApplicationSettingById("language")); + const setting = /** @type {EnumSetting} */ (this.app.settings.getSettingHandleById("language")); const { optionSelected } = this.dialogs.showOptionChooser(T.settings.labels.language.title, { active: this.app.settings.getLanguage(), diff --git a/src/js/states/settings.js b/src/js/states/settings.js index b28a4136..ad52f3df 100644 --- a/src/js/states/settings.js +++ b/src/js/states/settings.js @@ -1,7 +1,7 @@ import { THIRDPARTY_URLS } from "../core/config"; import { TextualGameState } from "../core/textual_game_state"; import { formatSecondsToTimeAgo } from "../core/utils"; -import { allApplicationSettings, enumCategories } from "../profile/application_settings"; +import { enumCategories } from "../profile/application_settings"; import { T } from "../translations"; export class SettingsState extends TextualGameState { @@ -88,8 +88,8 @@ export class SettingsState extends TextualGameState { categoriesHTML[catName] = `
`; }); - for (let i = 0; i < allApplicationSettings.length; ++i) { - const setting = allApplicationSettings[i]; + for (let i = 0; i < this.app.settings.settingHandles.length; ++i) { + const setting = this.app.settings.settingHandles[i]; if ((G_CHINA_VERSION || G_WEGAME_VERSION) && setting.id === "language") { continue; @@ -171,7 +171,7 @@ export class SettingsState extends TextualGameState { } initSettings() { - allApplicationSettings.forEach(setting => { + this.app.settings.settingHandles.forEach(setting => { if ((G_CHINA_VERSION || G_WEGAME_VERSION) && setting.id === "language") { return; } From 22b619e8ab293d098a717a1c317c2f2eb6d9b04a Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 15 Jan 2022 14:57:11 +0100 Subject: [PATCH 040/129] Add more examples and allow defining custom item processor operations --- mod_examples/add_building_basic.js | 76 ++++++++++++++ mod_examples/add_building_flipper.js | 138 ++++++++++++++++++++++++++ mod_examples/base.js | 25 +++++ src/js/game/hub_goals.js | 5 + src/js/game/shape_definition.js | 23 +++-- src/js/game/systems/item_processor.js | 8 +- src/js/globals.d.ts | 2 + 7 files changed, 267 insertions(+), 10 deletions(-) create mode 100644 mod_examples/add_building_basic.js create mode 100644 mod_examples/add_building_flipper.js create mode 100644 mod_examples/base.js diff --git a/mod_examples/add_building_basic.js b/mod_examples/add_building_basic.js new file mode 100644 index 00000000..c06b5dd4 --- /dev/null +++ b/mod_examples/add_building_basic.js @@ -0,0 +1,76 @@ +/** + * This shows how to add a new (currently useless) building. + * If you are interested in adding more logic to the game, you should also check out + * the advanced example + */ +registerMod(() => { + class MetaDemoModBuilding extends shapez.MetaBuilding { + constructor() { + super("demoModBuilding"); + } + + getSilhouetteColor() { + return "red"; + } + + setupEntityComponents(entity) { + // Here you can add components, for example an ItemProcessorComponent. + // To get an idea what you can do with the builtin components, have a look + // at the builtin buildings in + } + } + + return class ModImpl extends shapez.Mod { + constructor(app, modLoader) { + super( + app, + { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Add new basic building", + version: "1", + id: "add-building-basic", + description: "Shows how to add a new basic building", + }, + modLoader + ); + } + + init() { + // Register the new building + this.modInterface.registerNewBuilding({ + metaClass: MetaDemoModBuilding, + buildingIconBase64: RESOURCES["demoBuilding.png"], + + variantsAndRotations: [ + { + name: "A test name", + description: "A test building", + variant: shapez.defaultBuildingVariant, + + regularImageBase64: RESOURCES["demoBuilding.png"], + blueprintImageBase64: RESOURCES["demoBuildingBlueprint.png"], + tutorialImageBase64: RESOURCES["demoBuildingBlueprint.png"], + }, + ], + }); + + // Add it to the regular toolbar + this.signals.hudElementInitialized.add(element => { + if (element.constructor.name === "HUDBuildingsToolbar") { + element.primaryBuildings.push(MetaDemoModBuilding); + } + }); + } + }; +}); + +//////////////////////////////////////////////////////////////////////// + +const RESOURCES = { + "demoBuilding.png": + "data:image/png;base64,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", + + "demoBuildingBlueprint.png": + "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOxAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAACAASURBVHic7d13gFxlvcbx5z0zW5NND4RAOgEBaYIFQQVEeoeNBb0qKqiIFMVCc1AR8V5BQVRQREFaIh3BClwURCkiXDokAUJI22Sz2c22mfO7f4QkW2Z3Z7ac95yZ7+cP2J3Tnt3MznnmPWfOkQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8Mn5DgCgMDtdsWJ0ZVV2YtYqJgUWTnJmE82CieZsopMmmdxE52yimZyZquRUK0mysE5yaZOc5MZJkkKrlNMokyRTi5zr2DCvNZqTOblOmZolKVS4XrJ2mUzONTjTqlBqkHMNkhqUCxuc08qgQqtSTUHDU2dNafHx+wFQHAoAEAN7XLl6bJjunGmhzZQFMwNplslmmTRD0iSTJjqp2jYuYJuXtTzrs24PWu/5rJ9le83Tey7Ls3CXb9sk1yDTylD2mpwtCkItkrPFCsJFuWzt4pe/PLEpz6YBRIgCAETkndesmGJZ21nObW+yWWZupqSZJpvp5Cbk30F338smpABsesDyTH3rq9UyLZa0yJwWW2iLU9LznWH66UWnb7k8TywAw4wCAAyzPa60isCt3s5StoezcMfQaSeZ9pC01cZ5LM+et8wKQH8/wxpJz5rpcZmeMenZtmo9sfTkqevzxAUwSBQAYAje9Zumicq17yXZrqZgVzPbWdJcmVIb5si3+6QA9FyggJ8ha9LLTnoqNHvKOT3ZkbV/LDlz2uo8iwIoAAUAKMLeV6+c2hnY3i4M9gmd7S3T7pKCjdN779woAD2nDvZnyL9+WyjpISn4eyrnHnr5jCnPyrl8qwPQAwUA6MO+GUu3zly1q8z2cRbsHco+IGkLST12bptRALo/MPIFoNdjK0Knfznp8SDU38NxHX9f/OlZbXlWD5Q9CgCwkZl7929WvcPJHWyhO8gUvstJVZsmd5uXAhDLAtB7/W2S/mVyf1Rg97566tQnGSEANqAAoKzt9cu1E5TKflCmA8zZYZK2ljbufPrY+b71DQWgj+W6PBCDAtDjcVvppAdC6e4wtLs5hwDljAKA8pKx4N0zV+2eMneAOR0g0wdMqug5GwWg7wybJiWzAHR9KGfSkzL3FwXu7tfWbPWwMi7Ms0qgJFEAUPJ2mm+VY1pXHRiYqw+lQyRNLmznQwHIl2HTpOQXgJ4/xwpJ9zppwei1a//8TGanjjyrB0oGBQAlqX6+pd5sW7NXGIb1kj4qabJU7M6HApAvw6ZJpVcAuj7eaNJdgbkFk0e9+YfHT96zM8+mgESjAKB0ZCzYZ/aa90pWb6E+bLIte85CAei5/n5ylHcB6GqNme4O5RZsRRlACaEAINkyFuwzY9X7lXLzzNxx6vYxvT52XN2+oAD0mYMC0GtbJi2XdEsQhDe/3jjt75wzgCSjACCR9r565VSXTn1CspMlzcr/gk0B6DoHBaD3g8UWgB5zvCGn3+ZyqZ+9+dWpr+aJAsQaBQDJkbFgn1kN+wfOnRSajpGU3jiJAtDf+ikAm78d1gKw8atQsvtkwVVTRi+7nUMESAoKAGJv3982bJM1d4Iz+6Kk6VLvHSgFoL/1UwA2fzsiBaDrw2+adG0uCK9afsaMhXniAbFBAUAs7TTfKie1rT5Ksv8K5Q6RNt5cZwMKQB/L5V0/BWDztyNeADb+L5TZfc4F1zlnC5acOa01T1TAKwoAYmXfG5om5XK5LzgLT5G0pVTIzoEC0P/6KQCbv42sAHThljsX/kSVwc/e+NI2DXkiA15QABAL+1zfODtludPM3Gcl1XZ99acA9Ld+CkDebH3m81EANj3WLqf5Lkx9b+lXpz6fZxYgUhQAeLXf9Y17hBaeJtPHJKU2v3hTAPItTQHoa/151hW/ArDxi9BJ98jCHy89a8Zf8swKRIICgMhlMhbcP3vNYXL6hqT3dp1GAej+DQVg8xwlVAC6fvG4Obts2brpNyjjsnkWA0YMBQCR2Wv+6zWVHaM/K9npzjS7/xdJCkC+pSkAfa0/z7qSUQA2fvuKnC6tXpe7enFmVluexYFhRwHAiNvjSqsYM3rNp810vt663e7AL94UgHxLUwD6Wn+edSWrAGy0xGT/U9McXkkRwEijAGDE7HGlVYypbfyoZOeb05xuEykAfS/b5RsKwOY5yqQAbHjM6TWZXbi8efqvODSAkUIBwLDLZCx4cO7q42S60OTmSoW8oG56+K0vKAD5lqYA9LX+POtKcgHY+B+nxZJdtHz69Ks1z+XyzAoMGgUAw8fM7X/D2uNN+rYsfFu3Sb3mpQD0uWyXbygAm+coywKw2XNm9v0VM6dfTxHAcKEAYFh88IY1R5vp25J23vDi1c/O860HKAB9LNvlGwrA5jnKvABsfPwpF+i85V+ZfmeexYCiUAAwJAfctGoHywWXmtxBGx+jAHT/ggLQfSoFoL9EheUy6QEXBKev+Mo2/8mzOFAQCgAG5YO/aZqodO58SadYz+v0SxQACgAFYMBcgy8Abwkld706Os9acc7s5XlWA/SLAoCi7HGlVYwb3fhFSRdIGiv1fp2iAHT/ggLQfSoFoL9Eg8lljTJ9f2xNx49e/vLc9jyrA/KiAKBgB1zfeIA5+7GkHft78aYAdP+CAtB9KgWgv0SDybXp0ZcknbPyazMW5Fkl0AsFAAPa77qm7VOp8BLJDi3kxZsC0P0LCkD3qRSA/hINJlevZH9NhcEZy78x7ek8qwY2oQCgT/vOXzE6la34rpNOkZSWCnvxpgB0/4IC0H0qBaC/RIPJlW8N6jSzy1NB9fnLz5rSkm8GIPAdAPH0wRsaDk5nK/7PSafprZ0/gMSokHNn5qz96S2+/9pBA8+OcsQIALo57PrG8e1B+H1n7qRC310xAtDf+hkB6DmVEYD+Eg0mV94RgJ6bWVCZqvji0q9OXZV3ZpQlRgCwyYduaqzvCPSCkzvJdxYAw6q+I9f5wqQfvMrfNjZhBAD60I0rp5qruMKZjt7wiBX17ooRgP7WzwhAz6mMAPSXaDC5ChoB2PSlk7s3m8p+ofGrs1/NuyDKBiMA5czMHXhT40nOKp7fvPMHUMpMdkgql3p24sWvfl3zLTXwEihVjACUqUNuapyTM10naS8pz7sbRgB6TWEEoMc8jAD0njcBIwA9PJwN9Ym135yxMO9KUNIYAShDH7qpsT4nPaa3dv4AytZ7U4GenMC5AWWJEYAycsD81WPTobsilDuh/3dvjAAwAtB3hk2TGAHoPW/yRgC6/s39LluZOrnpzGmr864QJYcRgDJx0M1r9ktZ8H8md4LvLABi6fh0Z/jkuB8s+oDvIIgGIwAlbt/7LV29rPFcc+5cvXXXvoHfvTECwAhA3xk2TWIEoPe8yR4B2PyQ2eWr29efpcxOHXlXjpJAAShhB89v2t7C8HpJe3R9nAKggV8UKQAUgH63VdIFYKPHgjB3wqqz57yYdwNIPA4BlKhDbm78nMLwCfXY+QNAIUzaMxeknphw0eITfWfByGAEoMTse41VV9es/Ymkz0iFv7tgBCDf+hkByJdh0yRGAHrPW0IjAD1+rutq2is/vzQzdX3ejSGRGAEoIQfe2DCturbpQbkNO38AGBZOn2it7vj72O8snuU7CoYPBaBEHHbzmv1SQfoxSe/0nQVASdrdpfXo2IsWHug7CIYHBSDpzNwhNzd+PVTwZ0lb+I4DoKRNdAruGXfRoowyxv4j4TgHIMGOvGNlXWdb1TWSHbfxsU1HFQc6Fsk5AAWsn3MA8mXYNIlzAHrPW6rnAOSdxe5Su/6rMTOrMW8AxB4NLqEOnt+0fWdb5SNdd/4AEB13hKrcP8df+NrbfSfB4FAAEuiwBWuOTZk9JmlH31kAlLXtLAgfHve9RdxNNIEoAAlz6Py1p5kFC0wa7TsLAEiqM+duHXfRoozvICgO5wAkRP18S7W4ph/LdIqkAY5/cg4A5wD0XopzAHo/yDkAQzkHIM+8Tr9Y27boi8rsl80/J+KEEYAEOPDaZaNa1HT7pp0/AMSR6XNjK2fePSHz0hjfUTAwCkDMHXRLy1YV1TX/K+lw31kAYEBOB+Uq03+bcPFL2/iOgv5RAGLssJvWvT2dyz4irucPIFl2yeXSj4y7cNFuvoOgbxSAmDrs5sYDFIR/lzTddxYAKJZJW4dOD465cPEhvrMgPwpADB02v+kzcu5eSWN9ZwGAIaiTszvqLlz0Kd9B0BsFIGYOn7/2S3L2C0lp31kAYBhUOKdf1X1v8Zm+g6A7CkCMHLag6etyulx8PBNAaXFO9sO6Cxd933cQbEYBiIkjFqz9tpP44wBQspzT1+u+t+hi3zmwAe80fTNzh9/SfKnMTnvrgUFcZKXnfFwIiAsB9V6KCwH1fpALAQ3zhYA2h+oj1YbHnennTZ0zT1HGhX3MhghQADyqn2+pVrfuKkknbn6UAqAey1MA+ls/BSBvtj7zUQD6ni+6ArDh/3Z9c8ern+Kqgf5wCMCTk660ija37kZ12/kDQHlw5k4YUzHzel35WIXvLOWKAuDBIfdY1Zvj182XVO87CwD4YtK8ulUTbtMlr9f4zlKOKAAR2/caq063NN8lJ26fCQByh41en71dmUXVvpOUGwpAhE660irq6tbNl7MP+c4CALHhdODoCt2uy16q8h2lnFAAIlI/31JLJzVdK+kI31kAIIYOGr0ufYMy93MRtIhQAKJg5tpS637uzH3EdxQAiLFj69Izf6mMsW+KAL/kkWbmjrq16SfO9FnfUQAg7szpk6MrFl3mO0c5oACMsKNuXXeRmfui7xwAkBzulFEXLrrEd4pSRwEYQUcuWJsx09d95wCA5LEzai9ceI7vFKWMAjBCjvzd2tPk3Ld85wCApHLSd0dduPAs3zlKFQVgBBx1S9NnJXep7xwAkHimi0dduOhTvmOUIgrAMDvylnX7SbpC3GcBAIaDk9lVoy5cyPVThhkFYBgd8bt1OznZrZIqfWcBgBJSIdPvRl24cBffQUoJBWCYHHtLy1aB0z2SxvnOAgAlaIzM7qnJvLSN7yClggIwDOrnrxidU/h7SdN9ZwGA0uW2dungDv33slG+k5QCCsAQ1c+3VGdQ81tJu/vOAgClz72jtn39zZpvKd9Jko4CMESdqeYfyeko3zkAoIwcVvvSwit8h0g6CsAQHHVr81clfcl3DgAoO+ZOrvnOotN8x0gyCsAgHXPrumOd2cW+cwBAuXLOLqn97iJGYAeJAjAIR97RtL1J14jfHwD4FEj228rvvbqj7yBJxA6sSEfesbIuyLnbZBrjOwsAQKNTudyt47//yljfQZKGAlAMM5fOVl8jaQffUQAAm2zf1uF+IzOuwFoECkARjrmt+WxzOs53DgBAD05H1Vy4mBsHFYECUKDjbmk+QNIFvnMAAPpgdtGoCxYd5DtGUlAACnDsLa0zQmc3SuLCEwAQX0EY2A3V31k8y3eQJKAADOBT11i1uewtkib5zgIAGNAEp/AWXfJ6je8gcZf2HSDu1o5tuULSHr5zDFbKSe+cWqGdJ6c0oTpQOpCskAX7mKmgZfPM2Wu5wldUzKzdFhrUct222c8ahvz7GWDZYf395JnDit5Mkdvse6bBbdOG9Bwa/HY3Lzyk5fNuf4A19v3PNowZuk/sDE3LmnP6x+tt+vPCVmXDIW7Qn91rWjqvbJX+y3eQOOOMyX4cc2vT5yR3Vc/HbdN/ejzW5Ssb6I+3zxdgG2D9mx/I98dsXSZuNyGls95Tq23qGOgBUJyXGjp18t2r9OSyjk2P5Xtdk/LU/X4Kk/X6oq/Xsvwvknnn7SuXuU+3nT/r131EKXsUgD7U37F221wu+LdJo3tOS0IBmDs+pf/ef5SqUvwTAxic9Z2mw29YtqkEJK4ASC2Wsne0nz3nxT7ilDXeGuZx0pVWkculrleenX8SpJx01rtr2fkDGJLaCqerjpikdHL3FKNcTjfoyscqfAeJo+T+s46ghskt35HsXb5zDNY7t6rQtDH80wIYum0nVGj/WYk+n26P6uUTzvcdIo7YS/Rw/O1N7zNnX/WdYyjePplPKwIYPu+dVu07wtA4O7v6Oy/t6ztG3FAAujj6tjXjQnO/VcI/7z+umn9WAMNni1GJfkmUpEAKrht70avjfQeJE/YUXQQu/TNJ033nGCqO/AMYTkFpvKhs09aZ7fWprnJGAXjL8bc3f1qmj/jOAQAYGU46vvrbCz/uO0dcUAAkHXdL22wz/ch3DgDAyDLZz6oyL2/rO0cclH0ByGQssKDzt5LG+M4CABhxo+XcNcpY2e//yv4X8PSuLac6ub185wAARMRpn6pg4ed9x/CtrO8FUH9X6/QwG3536FfYTrY7XuzQ0yuzXR4Z8Er4/V7FK9+VDAdYRbfHDp5dqb22Lvy6Hfe+0q6Hl3QWtIVCr0JWyHXYC/v95LmGvfq+clnv1fRxT4WBLiM/hOvI99xG/p+g9wr7vjJlH1MHuhLcEJ5DfU7M9/scxO9q/1nVqt+xdoC5NvvrwjbNf7Yl78r7/70NwPr+9+nv9/CeaVX63DvqCt1Kqbqo5rsv39V67rav+w7iS1kXgDCb+4kSerW/4fTC6qwefL3rDrTvS3kWsgPd8KLax46r+ybyrn+nSamiCsDLa3K6/9WO7g/28cJY8GVI8+wZel7KubDfT+EFIP+logcuAAOvP0+h6/NS1IUVgOIvV53nqyJ/huIuh91XvkEWgB7b2mp0IKnwArBwTVZ3vdiaN2CfP0PBuQovABu/rEyXxmn9QzQmDN3PJR3mO4gvZXsI4Ljbmj8u6QjfOQAA3hxaecHLH/YdwpeyLADH3No0UdIPfecAAPjlnPtJXeaFSb5z+FCWBSAVBD+WtIXvHAAA7ya1p9I/8B3Ch7IrAPV3NB8s6QTfOQAA8eBMn666YOGHfOeIWlkVgCPuslqTXeE7BwAgXszZVfrvZaN854hSWRWAymzL92Rutu8cAIDYmVnZ2pzxHSJKZVMA6m9ft6NzOsV3DgBAXLnTK7/90k6+U0SlbAqA5C5RmV/3AADQr7RZcKnvEFEpiwJw/J0tR5l0kO8cKEwuLG7+bG5kcgB96SzyOdoZlvfVRpPESR+quuDlQ3zniELJF4D6+VZpoZXlRzySasX64l5di50fGKql64prnW8UOT/8MrlLdOVjhV+ONKFKvgCoquU0J23nOwYK9+ib2YKvhd6eM/17Wb77AAAj5x9L2tWWLexZGpr0wOK2EU6EYfa2qmXjv+g7xEgr6QJwzK3rtpDpHN85UJzXm3L6y6KOgWeUdPOzbWrpZHgV0VrXHuqXTzQXNO+tz63X4sbswDMiVkz6lkr8CoElXQAqAl0oaazvHCjepf9s0Yur+3/RfOSNTl3zn9aIEgHd/fAfTQO+s39qeYfOuW9NRIkwzMZXKH2B7xAjqWQLQP1tzbuZ3Kd958DgtHSaTv3jOi14rk3tOes17ZdPtuob961TlsP/8CQbmj59xyr9z8NNWtfe/YnYljVd9fg6HXvzSjV3MEKVWE4nV2YW7uI7xkgp3Y/FBfqRTCnfMTB4bVnTTx5br1882aodJ6U1tsqpoTXUcw1ZdTCiihjIhtKP/tmknz62TrtNqdQWtYHWtIV6fGmHWgs8RwCxlrLALpX0Qd9BRkJJFoB5d7UcbTn7gO8cGB5tWdMTnOiHGOvImf71Rrs2nr3Krr+EmPZPZV45PJeZc7fvKMOt5A4BZDIWWGgZ3zkAAKUhcPqeMlZy+8uS+4Ge2715nqRdfecAAJSMnSvdwmN8hxhuJVUA6udbypw733cOAEBpMdkFpTYKUFo/TGXLCTLt4DsHAKDk7FTpFn7Yd4jhVDIFYMO7fy76AwAYGRtGAe4vmZPnS6YAuKr1J4pL/gIARs7cCjftBN8hhktJFID6+VYp6Zu+cwAASl5GmWcqfYcYDiVRAFzl+s9JmuU7BwCg5M2scFWf9B1iOCS+AHzqfquW0zd85wAAlAnTubrspSrfMYYq8QWgdV3r5yRt4zsHAKA8mDS9YnWQ+HvNJLoA1M+3lJmd5jsHAKC8mOzMpF8XINHhXXXrcZLm+M4BACg7c1PulaN8hxiKZBcAszN8ZwAAlCdn+orvDEOR2ALwkdtb3yfpPb5zAADK1t7pb7+0l+8Qg5XYAmAuTHTzAgCUgDA403eEwUpkAfjYXW1zJR3hOwcAoNzZMVWZl7f1nWIwElkAwjB3phKaHQBQUlJZKZGfRkvcTrT+D2snmNMnfOcAAECSnHSiMi9M8p2jWIkrAK4zfaqkUb5zAADwltpAqc/7DlGsRBWA+vlW6Uxf8J0D0QqctO34lPbcqkKzxqUUON+JgO4CJ71tUoXeN71KO06uUIrnaNlx0ilJu0lQou5r7Kpbj5a0pe8ciEZFIH10pxodv0O1xlZtfkVd3Rrq+mfa9Lvn2hSax4AoeyknnfiOOn1hz9GaXJva9Pjq1lC/eKJZP310nbI8ScvFlJSrPiIn3eI7SKESNQLgnH3OdwZEoyrl9D8H1Okzu9V02/lL0oSaQKfuWasL9x3NOy14kw6kq46YqPPfP7bbzl/a8Bz9+t5jdONxk1SV5klaNixZ+6jEFID6O1tnybS/7xyIxqnvrNVuW1b0O88+0yr1yV1qIkoEdHf6e8bowDn9P//eO61KmQ+MjSgRYuBDyiya6TtEoRJTAFIKP6sE5cXgTRkd6LBtC7vT5kd3qlZtBe+wEK26qkAn7VFX0Lwn7DJaW9elBp4RpSBIK3ei7xCFSsQOdd/7LS3pU75zIBrvnlpR8Il+1Wmn3bdM1KksKAF7bVOlmgKH9lNO2n9W9QgnQlyYdKLmWyIaXyIKwFbN6w+XNNV3DkRjyqjinpZbjkrE3xpKyFaji3vOTRtLSS0jW6eeXXiI7xCFSEQBCE2JOrECQ5Mu8lmZZv+PiFUW+Zyr5LOrZcY+6ztBIWJfAE64Z/02TjrIdw4AAAp0mDLPx37UOvYFIJezz0jiPR4AICnSgVKf8pxhQLEuAJmMBTIl5oxKAAAkycl9RhmL9T421uGe3b35A5Km+84BAECRZksL3+s7RH9iXQACBfN8ZwAAYDACWaz3YbEtAPXzLSWnY33nAABgUEz1qo/vNQFiWwDSVS37S9rCdw4AAAZpSnqnl9/nO0RfYlsAQudiPXQCAMBAQim2+7JYFoCTHrMKJx3jOwcAAEPjjlfm/lheCjKWBWDt0vUHSJroOwcAAENimpzW9H19x8gnlgXABfEdMgEAoBhhTD8NELsCUD/fKp3pSN85AAAYJscr80yl7xA9xa4ApGvWHyRpgu8cAAAMC9P4tKr29x2jp9gVAEnH+w4AAMBwCs3qfWfoKVYFILPhuskH+84BAMDwcodKFqv7QseqALy4R+ue4uI/AIDSM0Xnvbyb7xBdxaoAhLJDfGcAAGAkBCnFah8XqwIghv8BACXKycVqHxebAlD/h7UTnPRO3zkAABgJZtpLmUXjfOfYKDYFIN1RcZCk2N41CQCAIUqnlD3Ad4iNYlMA5CxWQyMAAAw3i9Gh7ngUADMn6SDfMQAAGFnx+ThgLArAx36//h2StvSdAwCAEWW2lTKLdvYdQ4pJAQgtiNVHIwAAGDFhLhb7vFgUACc70HcGAACi4IJ4HPL2XgAOuceqxMf/AADl4z1xuDug9wIwobN1T0nVvnMAABAJU42U9n5ZYO8FQIH29h0BAIBIhYH3fZ/3AhCKAgAAKC8uBm9+/RYAM+ekvbxmAAAgevv4DuC1AHz8zvbtJE32mQEAgMiZttS5L83xGcFrAbCUeR8CAQDAi7Tzug/0WwAUvtfn9hFPrdni5m/psJEJAvShucjn3LqOcISSIMkCC8u3AMj8th/E06trcyM6PzBUL63uLGr+FxuKmx/lwVyZjgD8161NEyVt72v7iK9H3ujUugLfYS1pyunZVUUOGQBD9MSbHVrcWNjzrrEt1P2L20Y4ERJqR2WemeBr494KQC6d2ktSLO6IhHhp6TRd9e/1A84XmvSjR9cr5AgAIhaa9K0HGgt67l34t7VFHzJAmTA5qfo9vjbvrQBYEOzua9uIvztfbNfVT7aqr5fNzlC6+B8t+ucbDK3Cj/sWtelrf16jzlz+Z6lJuvihJt3wdEu0wZAsudDbFQHTvjYss1jcDhHxde3Trfrn0k7N27Fau22Z1tiqQA2toR5d2qkbn2nT600c+4dfNz/TokeXtuvkPer0/hnV2nLUhufoP5a066rHm/XU8g7fERFzQWA7+zpF1F8BkHbxuG0kxAsNWX37b829HjdGVBETr6zJ6mt/WbPhG+v2P2BAZs7bvtDLIYD6+VYjaVsf2wYAIEa2U2aRlxvieSkAqVHrd5KU8rFtAABiJK1cdgcfG/ZTACxg+B8AAEmS83JOnJcCEIoTAAEAkKQgCMunADjjBEAAACTJQj8nAvq6DsDbPW0XAIB4cX7eFEdeAD7+h5at5LRF1NsFACCmpijzcuT7xcgLgHWmOP4PAEBXYfQnAkZeAEIXcgMgAAC6CbeLeouRFwDnNDPqbQIAEGvOzYx6k9GfBGgUAAAAurOZUW/RRwGYFfk2AQCIM7PI943RFwAOAQAA0IMr7QJQ/+fVYyWNj3KbAAAkwCR97fm6KDcYaQGo6Khk+B8AgHxq0zOi3FykBSAI3cwotwcAQGKE0Z4HEGkBCIPoj3EAAJAMbmaUW4u0ALiQEwABAMjLRftRwGg/BcAnAAAAyC/ijwJG/THA6RFvDwCAhHCRngSYjnJjEncBRHECJ71raoV2n1Khukqnte2mx97s1GNLO2W+wwGSnKT3z6jWPtOrNK460Nq2UA8vadcDi9qU40mK4kyOcmORFgAnTeTvAYXadnxK571vtGaOTXV7/GM7VeuFhqwyf2vRkqacp3SANGtcWlccniHuIgAAIABJREFUNlE7b1HR7fHP71mnFxo6dco9q/Xcyk5P6ZBAk6LcWGSHAE68w+pMqopqe0i22eNSuuygMb12/httPzGtnx5cpymjor+YJSBJ24xJ69YPb9Fr57/R9hMrdNuHJ2v7ifmnA3nUKLO0NqqNRfbqub6ybWJU20KyOUnf3HuURlW4fucbXx3ozPeMiiYU0MP3DxinSbX9v4TWVQa6/NAJCvp/KgObda6PbF8ZWQGoCMNIhzaQXDtvkdZ2Ewo7OrXX1hWaWscoAKI1c1xaH5hRXdC8O02u0J5TGfxEgQKLbF8Z2StnzowRABRkly2KOzXl7ZOjPpcV5W7PqZVFzf/OIudHGUtFt6+M7q2TpRgBQEHGVhU3Xjq2ihEARKvY59xAhwqATXJB6Y0AKGAEACPDcXwVESv2mL4TT1IUyJXgCIDjEAAAAAMpwREAOQ4BAADQrxIcAZATIwAAAPTHuRIsAKEbE9m2AABIItP4qDYVWQEwGR+EBQCgP6aaqDYV3UmAjssAAwDQL1eCBUBOXAkDAID+ld69AGQUAAAABlCCBYA7AQIAMJDSOwTgJO6JCQBA/wq7y9QwiPBTAIwAAAAwgFRUG4pyBIACAABA/0qvAJgcJwECANC/0isAklEAAADoXzqqDUX5KQAKAAAA/SvFEQAAABAXURaAjgi3BQBAEuWi2lCEBcBRAAAA6F82qg1FeClga49sWwAAJFMJjgA4DgEAADCA0isATmIEAACA/pVeATAZIwAAAPSvLaoNcRIgAADx0RrVhjgHAACA+Fgf1YaiOwfAOAcAAIABlF4BCI0RAAAA+mUleAjAyTECAABAv6z0RgCcs7VRbQsAgERybk1Um4ruY4Cmhqi2BQBAIjkX2b4ywkMAtiqqbQEAkEihlV4BsAhbDQAACRXZm+UIrwNAAcDIMPOdAOUmLPI5Z+JJigKV4iEAhY5DACjI2vbiXizXtIUjlATIb3Vrcc+5Vet5jqJQ0e0rIzwEkGMEAAV5akXht8O2IucHhsOjS9uLek//zzf4FDQKFES3r4zwEEDACAAK8vSKrF5oKGyn/uBrHVrRwrsrRGtJU05/eqWw67U8uaxDjy/lOmgoVAmOAHS2VDMCgIKYpIseblFLZ//vsVauD/Wjf0V2zQygm3Pua9Sy5v7v3LquI9SZf1zDGQAo3Nro9pWRFYAF81yzIrzNIZJtUWNOp/6xSYsa87/APrUiqy/c28SxVXizvDmnY25eoUf7eHf//KpOHX3TSr3Q0BlxMiTYel06LbJLAaej2tBbGiRtHfE2kVCvrMnpxLvX6p1TK7T7lhWqq3Ja3RrqsTc79e9lHPeHf0uaNpSA92xTpfdPr9Lk2pQa20M9/Hq7/ndxm3K89UdxIj1UHnUBWCkKAIoQmvTIG5165A3eRSG+HlnSrkeWtGvjWD/7fQxSpAUgupMAN3gt4u0BAJAQ9mqUW4u0AJjToii3BwBAYjgX6T4y0gLgTIuj3B4AAIlhbnGUm4u4ANjiKLcHAEBiBGHpjgBIxiEAAADyChZHurUoN2apURQAAADyal8c5dYiLQDXH+qaJK2JcpsAACTASmV2ao5yg1F/DFASnwQAAKCHyPeNPgrAYg/bBAAgvlz0+8bIC4AxAgAAQHdWBiMAXAsAAIAePHxMPvoRgCB4IeptAgAQay76fWPkBSDrOp+MepsAAMRap/1f1JuMvAAsOLRupUwrot4uAAAxtVQXzV0Z9UZ9fApAcvaUl+0CABA3Ji/7RE8FwFEAAACQ5Jx72sd2/RQA+flhAQCIm1BWPgUgCENGAAAAkCTzs0/0UgAaUrXPSMr62DYAADGSVWPwvI8NeykA9x7q2p3sJR/bBgAgRp7X5XPbfWw47WOjkiTnnpZpB2/bRyLsMCmt+h2qtduWaY2rDrSmLdTjb3bqxmfa9MqanO94gHacXKHP71GnfaZXaUJNSqtbc3r49Xb94olmPbmsw3c8xJxzeso8bdtbATBzT0s2z9f2EX+f3KVGn961Rq7LY5NqAh00u0oHzKrS5Y+u1y3Pt3nLB3xqt9HK7DtOqS5P0i1GpXT022p11Ntq9YOHmnTZP5v8BUTshaG8nRTv6VMAUujCf/vaNuLvqO2qdGKPnX9XKSed9q5avX96ZaS5gI0O2bZG396v+86/Kyfp63uP0Qk7j4o0FxLGuf/42rS3AhCo82FJoa/tI75GVTidtHvtgPM5SafuWdvnCzAwUtKB9K19x/VZULs6+31jNbqSJynyCtVR8YivjXsrADccPm6Nk3FjIPTynq0rCn7BnDI60E6T/Z3KgvK059QqbV2XKmjecdWB9p9VM8KJkEhOz+j7M9b42ry3AiBJpuAhn9tHPM0cW9gL60YzipwfGKptJxRXOrebSElFb86c132g1wIgEwUAvVQX+VpZU8HwKqJVky7uOTe6wu9LLeIpdFbGBcD5bT8AAHiTzZVvAbjhiOqXnLTMZwYAADxYpu++bZHPAN7HpUzydgYkAAA+OKe/+c7gvQBwHgAAoNyEod/j/1IMCoA5CgAAoMwEKe/7Pu8FINta87ikVt85AACIhFOLlq7xdgXAjbwXgAXzXIdMj/rOAQBAJEz/1FV7dvqO4b0ASJIL3B99ZwAAIApm9gffGaSYFICchbH4ZQAAMOIsFYt9XiwKwM2H1/5b0pu+cwAAMMKW6Duz/893CCkmBUDOmaQ/+Y4BAMAI+4PkzHcIKS4FQJJzLhZDIgAAjBQXk+P/UowKgNTxR0k53ykAABgh2VxQ8VffITaKTQG44fBxayT9y3cOAABGgpN7WJlZjb5zbBSbAiBJzule3xkAABgJFrN9XKwKQC5UbI6NAAAwnELlYrWPi1UB2OGJ2sclrfCdAwCAYbZMmbneL//bVawKQCbjQileQyQAAAyZc7+Py8f/NopVAZAkc1rgOwMAAMMpUDjfd4aeYlcAxkyp/ZOk1b5zAAAwTFZlteQ+3yF6il0BuGpP1ynpdt85AAAYFk63KLNf1neMnmJXACQplN3sOwMAAMMhCBXLfVosC8Dy0aPuE58GAAAkndPy7HNzHvQdI59YFoAH9nNZcRgAAJB47nda4GJ5mftYFgBJcgpjOWQCAEChwpyL7b4stgVg+ydGPyCnN33nAABgUJzeVGrWQ75j9CW2BSCTcaGZbvOdAwCAQZqvDRe4i6XYFgBJMgtiO3QCAEB/wly8P9EW6wKw47+r/y5pse8cAAAU6RV9Z9tHfIfoT6wLQCbjQpl+5TsHAADFMLlfxu3a/z3FugBIUi5wv5IUy49QAACQRzZU57W+Qwwk9gVgwRG1b4g7BAIAkuNuZd621HeIgcS+AEiSTL/wHQHRyRZ5zmxnLtajbChB7UWOSXaEPEfLi0vEPisRBWDZmNp7JL3hOweisayluAawrDm2n7JBiXqjqbj7ury2Nnb3gcHIWZLbcfYffYcoRCIKwAP7uayTfu07B6Lxz6WdKvQNU0un6d/LeXFFtP6xpF3NHYU9SbOhdP+ithFOhLhwsqs1L56X/u0pEQVAkrIKrpbEW70ysKw51N0vtRc073VPt6oty/AqorW+03TFo00FzXv90816Y10i9gcYujCbTl3jO0ShElMAFhxZs8ikv/rOgWj85LH1+veyzn7n+cuiDt34DO+s4MdPH12nO15Y3+88D73Wrgv+d21EiRADf9K5s1/1HaJQiSkAkuQsGSdWYOjac6az/rpOv3yyVY1t3d/hL28J9cNHWvTtvzUXfKgAGG6hSafes1pn39eopT3e4Te0hvr+39fqY7euUjsjVGUkWfuotO8AxQjba+4Iqtcvl7Sl7ywYeZ3hhiH+3/5fq2aOTWlcdaBVraFeX5tjx49YMEnX/qdZ1/2nWdtOSGuLUSk1rA/1YkOn+HBK2Xkzt9Wau3yHKEaiRgAWzHMdznSF7xyIVmjSwsacnljWqdfW5sTrKuLGJL20OquHXmvX86vY+Zcjk/1EJ+/Z/3HLmElUAZCkXFX2CkktvnMAAPCW9WFl9krfIYqVuAKw4OCxqyX9xncOAADe8kudvUOD7xDFSlwBkKRUkPqhuD8AAMC/XCpll/kOMRiJLAA3HF69UNIdvnMAAMqbk25pP2/uK75zDEYiC4AkOXM/9J0BAFDu7FLfCQYrsQXgpqNrH3amf/jOAQAoV+7BzszcR3ynGKzEFgBJCgNGAQAAfpjCRO+DEl0Adnyi5jZJL/vOAQAoOy/mtO3dvkMMRaILQCbjQpl+5DsHAKC8OOmHyrhE36Au0QVAkmrH1l4taYnvHACA8uCk1zonWOKvR5P4AvDr/VybSd/znQMAUCacfVtfnlvYPctjLPEFQJLGL6v9paRFvnMAAEreK51T1l7rO8RwKIkCcNXJrtOcLvSdAwBQ6uyCpN30py8lUQAkSW21v5b0gu8YAICS9WKnLbnRd4jhUjIFYME8l5P0Xd85AAClyUnnK7Nf1neO4VIyBUCSrH3UjXJ6zncOAEDJeabD5izwHWI4lVQB2DAKYBnfOQAApcVJ5yX9c/89lVQBkKT5R4xeIOlJ3zkAACXjiY7z59zuO8RwK7kCIOdMct/yHQMAUBpC03kb9i2lpfQKgKQFR426U6Y/+86B4VGTdtpzqwrtN6NSu26ZVkXKdyKgu8qU07u3rtLh29Von+lVqq1wviNh+Pw1l5lzj+8QIyHtO8BICVN2RhC6J1XCP2Opq047fW73Gh05t0qVqc0vqC2dppueadN1T7cqV3KdHEmSDqQvvWuMTtpjtOoqN7+fas+arn2qRT94aK3Wd/IkTbCsczrDd4iRUpIjAJJ0y5F1z5jsl75zYHBGVThdflCdjn9bdbed/8Zpn9mtRhfvX6d0yT6DEXfpwOmaoybpK3uN6bbzl6SqtNPn3jFat8yb3GsaksT9rOP8OU/7TjFSSvqZ6TrCcySt9p0DxTvz3aO03YT+B2/evXWFTty1JqJEQHdffe8Y7Tuzut95dtmyUhd+cFxEiTDM1nRWtF/gO8RIKukCsGDe2NWOiwMlzrQxKX1wVmVB887bsVqjON6KiNVVBfrM7qMLmvfYHWo1cxxHIpPGOXe+zt6hwXeOkVTSBUCSxi0f9RNxieBEeedWaRW6S69KOe0+pWJE8wA97bVNlarThT1LnaT9BhgpQNzYc+1brr7Sd4qRVvIF4KqTXadz7iu+c6BwW9QW97Qsdn5gqKbWFfdRlGLnh19OqTNK5YY//SmLV84FR436vaQ/+M6BwqSKfFameW1FxCqKfI5WBBymSpC72r8164++Q0ShLAqAJKVCO1NSyTc6AMCgdTjTV32HiErZFICbj617zkyX+84BAIgp06XtmTkv+o4RlbIpAJLUkR51nsm94jsHACB2Xuqoqyzpj/31VFYF4K4j3PogCE+SxKW5AAAbWeD0RZ05rdV3kCiVVQGQpAVH1t0n6TrfOQAAcWFXt5035y++U0St7AqAJOXC8ExJK3znAAB4t6y9ouJrvkP4UJYF4LZjxzRYCd/gAQBQGHPuVH1zxhrfOXwoywIgSbcePfoGZ3an7xwAAG9+33He7N/5DuFLWV+g2lWkT7Vsbj9Jdb6z+LT9hLQ6cl0fsS7/7YPl/XLz9wWcZplvFtOGewEUY9vxKe03I9+9A3pvwfJMyhs1z4N5f86+dNlQ3p+zwNNQey6dL3/e5QrI3/c2u3+R/yfovcK+/j37nDrAv0Ehv6N+t1nAP2xfz9WBNr3D5MLuVbHR7PFpHbFdTd6V9/97G4D1/e/T3+/hHVsVl79ENQVh+HnfIXwq+8tTHXvbulOd3GVSjz8k6/a/bvK9aPR8oRvwBbjP9dsA69/8QF/Zznp3jfafwfXxAQyP+c+06PN3r+qzlPWqVX28PnWbd6AC2MeLZDFlsddbme65vtB+/pyf9xGzLJTtIYCNdvnP6Cvk3EO+cwAAImJ6sD2cfZXvGL6VfQHIZFwYBMEnJDX5zgIAGHFrnQWfVMaFvoP4VvYFQJIWHFmzSKYv+84BABhZJn2xLTNrse8ccUABeMstx47+jUk3+s4BABgxv+04f84NvkPEBQWgC1P2i5K96jvHUHGdYwDDKSyNF5XXqyrSjPR2QQHo4vZjxjcGTp+QlBtw5hhrbCv7Q1sAhtGKlkS/JEpSKAs+sbZML/jTFwpAD787eszfJPcD3zmG4umVif9jBRAjD73e5jvCUH2n7fxZ/+s7RNxQAPJYPW7U+TL3T985BuvRNzv1WhOjAACG7sWGTt2/KNE3yXu0bYs1F/oOEUcUgDwe2M9lwyB7gqR1vrMMRmjS/zyyXm3Z0jhwB8CP9Z2mk+5apWxy3080m3SCTt6z03eQOKIA9OH2Y8a94mSn+84xWC+tyelr97UwEgBgUJ5f1alDr1+mp5Z3+I4yeE5fbD9vzku+Y8RV2V8KeCDH3LruF5I+2/WxuF8KuOvEwEl7bJXWLpPTmlgTKB0U+CmBwi7/XvAK8uUf3JoKX2go4x8D3g1hyL+fAZYd1t9P30/GweaN5jnUfamhPIcGv93NCw91PK2fO1MUusAIZOg+sTM0vbkup4deb9NfF7Yq1/N1KEGXAjZnP287d84X+ogBlfnNgArRVj36S9Vt63aV3Dt9ZxmMnEn/WprVv5ZmNz02cMHo+w+4kD/eDesfuAD0v/6elarHfAUVpH5ecgd68cnzS+q5gy7s91P4zYDyF8Q+MhSUv/schRXQ3tvo8/dYVEnN81WRP0Pxz6F8j+f5fRayo+21rT6en0X8XvurmcXlyr+rLXxHu/GLAf5mk+WfbWPCxI7gRoVDAAO491DXHgbp4ySt9J0FADCgFcrljteX57b7DhJ3FIAC3HF07euSPqKEXx8AAEpc1uQ+3JqZu8R3kCSgABTotmPr7pPsXN85AAB9cPb1tvNmPeA7RlJQAIpw2zF1F0ta4DsHAKAHs9taz5l9qe8YSUIBKIZzls62nijpWd9RAACbvNAahp+Scwk/dzFaFIAiLZi3RXOYsmPl1OQ7CwCUO5PW5RQco8xcXpOLRAEYhDuPGvOCQvukJK6yAwD+5Jx0Qsd5M5/zHSSJKACDdPvxY2535s7ynQMAypXJnbn+3Nl3+c6RVBSAIbjt+NGXSLrcdw4AKDfOuUtbz511me8cSUYBGKLdnh59uqTbfecAgDJyd8vcmYzADhEFYIgyGRdW5EZ/TEru7YMBIDGce3x9Ve1HNM9xYbYhogAMgwXzXGtK7hjJXvWdBQBK2GInO0xnTWnxHaQUUACGya3HjXpTOXeopEbfWQCgBDUptCNbzpm93HeQUkEBGEZ3zKt71oXuGEkJvoE2AMROp5wd23L+nKd9ByklFIBhdnt93QNOOlmJv5smAMSCSfpMyzlz/uo7SKmhAIyA248b82tzdprvHACQeE5ntZw7+zrfMUoRBWCE3HXc2Mtl7nzfOQAguezslnNm/9B3ilJFARhBd9bXfUemi3znAICkcdKFLefM4fVzBFEARtid9WPOlokGCwCFcu4nzefMPtd3jFJHAYjAncfXnSXpF75zAEDcOdNvmjtmcA5VBCgAUXDOqsK6L0juRt9RACC+7JZ12838jDKOO61GgAIQkQXzXG6rhtGflMSdqwCgtzubJ63+KJf4jQ4FIEJXnew6162rmye5P/nOAgCxYfpTc112nk7es9N3lHJCAYjYA592bdXh6COcdJvvLADgnbm7m7M6Sl+e2+47SrmhAHiwYJ7rqLK6eidd6zsLAPjinG5eN3nVscrMavOdpRxRADxZMM/lqqzuRHO62ncWAIie+21Tx+KPM+zvj/MdoOyZuSN+13yJyU5/64ENNxHocSeBXjcWsPw3G7AeE/ucp9/12wDr775Az/k2rL/XGnvN1P/6rfdjXecr6PfTe8lC8m9efz8/Q8G/n3wpeufPt/58SxeXv/sc+dffT44+MmyaVNRzNM9XRf4MxT+H8j2e5/c50L9F3m318fws4veaP9FgcuW/7UjBv+dNXwzwN9t7lj7m7fv1Y+O8zuynTZ2zTuVsf7/SvgOUPefsLumMwxesXSu5b/mOAwAjynRx0zmzv+E7BjgEEBt314/NmMQfBYDS5ZRZd84sXudiggIQI7+vH3Oxk06RxLAYgFJiks5o+uasC3wHwWYUgJi5q37sT83cZyRxYgyAUtAh2Sebzp71I99B0B0FIIbumTfm16HsYEmNvrMAwBCsCcwd3HT27Ot8B0FvFICYunfeuPuCINhH0mLfWQBgEBaFKbd34zkz7/cdBPlRAGLsruPrnjGl9pL0mO8sAFCEf+XM9mr++sznfAdB3ygAMXfPvNHLOtta95V0h+8sADAgp9tHdVTt13LO7OW+o6B/FIAE+NN/TWkZpTHHyeky31kAoC9OdtnatpnHLc1MXe87CwbGlQAT5tD5a0+T9EOZUlwJcKD1cyXArnNwJcDeD3IlwGG7EmDOnDuj6RszLs8/B+KIEYCEuWfe2B/LueMkrfOdBQAkNQXOHcPOP3koAAl0T/2YO2RuT8n+z3cWAOXLSS8E5vZa840Zd/nOguJRABLqno+MebHVdezlnFvgOwuAcuTukMu9e/XZM571nQSDwzkASWfmDl3Q9GUz/bekCs4B6Lp+zgHoOgfnAPR+kHMABnUOQM7kzln7jek/kHN9nBWAJGAEIOmcs3vmjf2xU3CAJD52A2AkrTK5g9d+c8bF7PyTjwJQIu75cN2DSmf3lPSI7ywASo+THlcu3HPtN2f8xXcWDA8KQAm597iJS1zdmH0l43oBAIaPs6tWt7W8t/Hc2a/6joLhwzkAJergG9d8Ss5dbtLontM4B0ADHxflHADOAeh3W2VzDsA6c+6Uxq/P4GY+JYgRgBL1h4+O/7XMdnayh3xnAZA8JvevnKXewc6/dFEAStgfPjp+cduW4/Z1ZhdIyvnOAyARcs7ZxY3jV+7T9M1pL/sOg5HDIYAycchNa98Tyn4raQ6HADTwsCiHADgE0O+2SvQQgOlVSwWfWPO16X/Lu1KUFEYAysS9Hxn7SJDNvUMyhvMA9Oa0ICe3Ozv/8sEIQBn60E2N9c50paTxGx9jBCDf+hkByJdh0yRGAHrPm8QRAFOTc/pSA8f6yw4jAGXozx8Zt0Ap7eHk/u47CwB/THowTOd2YedfnhgBKGdm7sCb135Opv82aUyXCYwAMALACEC/20r4CICpyQKdv3r99MuVcWHeFaDkUQCgg65r2SpMd/5E0rEbHqEAUAD6zrBpEgWg97wJKAAm/V7p9BdWf2Xr1/MuiLJBAcAmB96w+ghzwc8k25oC0HsKBaDHPBSA3vPGuwAsN6evNXxtxrV5F0DZ4RwAbPKnj024q7PN3m6yq5T/dQlA8pik69pzqZ3Y+aMrRgCQ14HXr3l/6PQLSdt1fZwRgK7rz7Ncni8YAeg+lRGA/hINJle/IwALzenkhrO4gQ96YwQAef3phPEP1tS17i6z/5HU6TsPgMI5qcNJ369OB29n54++MAKAAX3wpqbtnOW+K1M9IwBd159nuTxfMALQfSojAP0lGkyuXsn+kg51+rJvzHgmz6qBTSgAKNgB1zceEDq71ElvpwBQACgAeeb1WwBeMGdfWXXWzN/nWSXQC4cAULC/nDDuL+FW43Z35k6WtMp3HgCSpDUyfWPl+uZd2PmjGIwAYFAOmr92QrYz/JakL5qU7jqNEYDuXzAC0H0qIwD9JSoqV1bmfhVk0+cuO3urlXlWA/SLAoAhOfCGVW/LWvoSyQ7Z+BgFoPsXFIDuUykA/SUqNJe7z6V0+vIzpz2dZ3GgIBQADIsP/nb14XLuOybtRgHo/gUFoPtUCkB/iQbM9YSZO2/l16bdk2cxoCgUAAwfM7f/jWsOl7kLzGz3bpN6zUsB6HPZLt9QADbPUdYFwOkZF9oFy86a/js5l28RoGicBIjh45zd97EJd73/pXF7OmfzJL3gOxKQbO55M/vk8unTdl32tRkL2PljODECgBGTyVjw4NzVx8l0YSg3t9tERgD6XrbLN4wAbJ6jzEYAFkt20fLm6b9SxmXzzAIMGQUAI26PK61iTG3jR0Nn33LSbEkUAAoABSBfIqfXzOySusqOn7/85bnteVYDDBsKACJzyD1W1bp6zaclO1Pm5lIA+li2yzcUgM1zlHYBsBecdMmE5uZfP5PZqSPP4sCwowAgcpmMBffPXnOYAvdlmR3QdRoFoPs3FIDNc5RoAXjcnF22bNr06zXP5fIsBowYCgC8et91je8IXHi6TB+VlKYAdP+GArB5jhIqAKGT7pHLXbT0KzMfzjMrEAkKAGLh/dc2znJB7nQz9xlJoygA+ZemAPS1/jzril8BaJHT9a4zuGTp17fmEzLwjgKAWPngb5omdqayn1doX5I0RaIA9L9+CkDebH3m81IAlpm5y1OB/XzJmdNW54kMeEEBQCzVz7fUytaG/ULnTjLpWEmprtMpAH0sl3f9FIDN30ZWAEKZ3edccNWU0ctuf/zkPTvzRAW8ogAg9vb6zaqtU0HwcWf2eUkzJQoABaDn+vOsy08BWGrSdbkwd+Xys2YuyhMPiA0KAJIjY8E+sxr2D5w7KTQdLali4yQKQH/rpwBs/nZECkBOsvtlwVVvrNv6Ni7cg6SgACCR9r1mxZRskP6kFH5OcnMoAP2tnwKw+dthLQCvy+mGMEj9dOlpU1/LEwWINQoAki1jwT6z17zXTPMkO17SVpIoABSAkSkATktl7neh0/ylp099mGvzI8koACgdb5UByeot1DyTTek5CwWg5/r7yUEB2KjBTPeEcguWNk29lyF+lAoKAErTW2UgDMN6SR+WtKVEAei9/n5ylHcBWGPS3YG5BZNHvfkHzuJHKaIAoOTtcaVVVFau/qALrN5Mh0qaQgHoZ9kBMmyaVHoF4E0zu0eBLXi9cdpfeaePUkcBQNnZ+9cNO5nZ4eZ0gEzvN6lMn4/dAAACqUlEQVSy5zwUgL4zbJqU/AKQM+lJmd2tIHXXa1/e6gmO6aOcUABQ1na5dtmo2lxqf2fB4ebsEEnTJApAfxk2TUpmAVjhpP8NpbsD67xz8RmzGvOsAigLFACgi3ddvXzXIEgdbKaDJHu3pNqN0ygAPeZJRgFYL+kROf3RWfiHRadPeyrPIkBZogAAfdg3Y+mWmau3D8Jwb5n2Maf3S5ohiQKQZ+GYFIBlofSYc/p7YO6hwLU8+vKX57bnWT1Q9igAQBH2vnrl1M7A9nZhsE/obG+ZdpcUbJxOAej+wMgXAFso6SEp+Hsq5x56+Ywpz3IcHygMBQAYgn1+2ji+raZjL5cLdpVs19BpZydtJ1N6wxwUgJ5TB/kzZE16QU5PK3RPucA9mcu2/YNj+MDgUQCAYbbHlVYRuNXbhUFuR2e2kwVuD5l2lDR74zwUAPX3M6yR9KyZHpfpGZOe7cjlHl9y5rTWPHEBDBIFAIjI7r96c7JCt0tgbjtTMEuymdpwd8NZkiaVWQFYqVCLnWyRuWCxOS02cy+kKsOnXjx56qo8sQAMMwoAEAM7XbFidKoqnJlWapaZzTKzmYGCWaZwuklbSJooqSYhBWC9pAaZVpjcazItNuUWWaDFFUFqURAGi585ZYvmPJsGECEKAJAQe1y5tLa9wiamsxUTFdrkMLCJzoJJJptoziY6cxNlmiintEnjJFXINFqyGslVd3kPXiNTtdRtp90mudbNj1mbTK0mNUvWKadGZ8pK1hDKNcipwZlWKXQNCtyqwDpXtck1jEu7hsdPnro+wl8LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEun/Af3OJlev0ZvTAAAAAElFTkSuQmCC", +}; diff --git a/mod_examples/add_building_flipper.js b/mod_examples/add_building_flipper.js new file mode 100644 index 00000000..b78283d6 --- /dev/null +++ b/mod_examples/add_building_flipper.js @@ -0,0 +1,138 @@ +/** + * This shows how to add a new extended building (A building which flips shapes). + * Be sure to check out the "add_building_basic" example first + */ +registerMod(() => { + // Declare a new type of item processor + shapez.enumItemProcessorTypes.flipper = "flipper"; + + // For now, flipper always has the same speed + shapez.MOD_ITEM_PROCESSOR_SPEEDS.flipper = () => 10; + + // Declare a handler for the processor so we define the "flip" operation + shapez.MOD_ITEM_PROCESSOR_HANDLERS.flipper = function (payload) { + const shapeDefinition = payload.items.get(0).definition; + + // Flip bottom with top on a new, cloned item (NEVER modify the incoming item!) + const newLayers = shapeDefinition.getClonedLayers(); + newLayers.forEach(layer => { + const tr = layer[shapez.TOP_RIGHT]; + const br = layer[shapez.BOTTOM_RIGHT]; + const bl = layer[shapez.BOTTOM_LEFT]; + const tl = layer[shapez.TOP_LEFT]; + + layer[shapez.BOTTOM_LEFT] = tl; + layer[shapez.BOTTOM_RIGHT] = tr; + + layer[shapez.TOP_LEFT] = bl; + layer[shapez.TOP_RIGHT] = br; + }); + + const newDefinition = new shapez.ShapeDefinition({ layers: newLayers }); + payload.outItems.push({ + item: this.root.shapeDefinitionMgr.getShapeItemFromDefinition(newDefinition), + }); + }; + + // Create the building + class MetaModFlipperBuilding extends shapez.MetaBuilding { + constructor() { + super("modFlipperBuilding"); + } + + getSilhouetteColor() { + return "red"; + } + + getAdditionalStatistics(root) { + const speed = root.hubGoals.getProcessorBaseSpeed(shapez.enumItemProcessorTypes.flipper); + return [[shapez.T.ingame.buildingPlacement.infoTexts.speed, shapez.formatItemsPerSecond(speed)]]; + } + + getIsUnlocked(root) { + return true; + } + + setupEntityComponents(entity) { + // Accept shapes from the bottom + entity.addComponent( + new shapez.ItemAcceptorComponent({ + slots: [ + { + pos: new shapez.Vector(0, 0), + directions: [shapez.enumDirection.bottom], + filter: "shape", + }, + ], + }) + ); + + // Process those shapes with tye processor type "flipper" (which we added above) + entity.addComponent( + new shapez.ItemProcessorComponent({ + inputsPerCharge: 1, + processorType: shapez.enumItemProcessorTypes.flipper, + }) + ); + + // Eject the result to the top + entity.addComponent( + new shapez.ItemEjectorComponent({ + slots: [{ pos: new shapez.Vector(0, 0), direction: shapez.enumDirection.top }], + }) + ); + } + } + + return class ModImpl extends shapez.Mod { + constructor(app, modLoader) { + super( + app, + { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Add a flipper building", + version: "1", + id: "add-building-extended", + description: + "Shows how to add a new building with logic, in this case it flips/mirrors shapez from top to down", + }, + modLoader + ); + } + + init() { + // Register the new building + this.modInterface.registerNewBuilding({ + metaClass: MetaModFlipperBuilding, + buildingIconBase64: RESOURCES["flipper.png"], + + variantsAndRotations: [ + { + name: "Flipper", + description: "Flipps/Mirrors shapez from top to bottom", + variant: shapez.defaultBuildingVariant, + + regularImageBase64: RESOURCES["flipper.png"], + blueprintImageBase64: RESOURCES["flipper.png"], + tutorialImageBase64: RESOURCES["flipper.png"], + }, + ], + }); + + // Add it to the regular toolbar + this.signals.hudElementInitialized.add(element => { + if (element.constructor.name === "HUDBuildingsToolbar") { + element.primaryBuildings.push(MetaModFlipperBuilding); + } + }); + } + }; +}); + +//////////////////////////////////////////////////////////////////////// + +const RESOURCES = { + "flipper.png": + "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDcuMS1jMDAwIDc5LmRhYmFjYmIsIDIwMjEvMDQvMTQtMDA6Mzk6NDQgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCAyMy4wIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkZDMkFGQkY5NkUyQTExRUM5QUY0OTQyNUQyODU2NURGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkZDMkFGQkZBNkUyQTExRUM5QUY0OTQyNUQyODU2NURGIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkMyQUZCRjc2RTJBMTFFQzlBRjQ5NDI1RDI4NTY1REYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RkMyQUZCRjg2RTJBMTFFQzlBRjQ5NDI1RDI4NTY1REYiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz43izVKAAATMklEQVR42uzd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", +}; diff --git a/mod_examples/base.js b/mod_examples/base.js new file mode 100644 index 00000000..c60f4b87 --- /dev/null +++ b/mod_examples/base.js @@ -0,0 +1,25 @@ +/** + * This is the minimal structure of a mod + */ +registerMod(() => { + return class ModImpl extends shapez.Mod { + constructor(app, modLoader) { + super( + app, + { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Base", + version: "1", + id: "base", + description: "The most basic mod", + }, + modLoader + ); + } + + init() { + // Start the modding here + } + }; +}); diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index 8351775e..854ef2ae 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -9,6 +9,8 @@ import { GameRoot } from "./root"; import { enumSubShape, ShapeDefinition } from "./shape_definition"; import { enumHubGoalRewards } from "./tutorial_goals"; +export const MOD_ITEM_PROCESSOR_SPEEDS = {}; + export class HubGoals extends BasicSerializableObject { static getId() { return "HubGoals"; @@ -556,6 +558,9 @@ export class HubGoals extends BasicSerializableObject { ); } default: + if (MOD_ITEM_PROCESSOR_SPEEDS[processorType]) { + return MOD_ITEM_PROCESSOR_SPEEDS[processorType](this.root); + } assertAlways(false, "invalid processor type: " + processorType); } diff --git a/src/js/game/shape_definition.js b/src/js/game/shape_definition.js index 9cf2d094..453c26f1 100644 --- a/src/js/game/shape_definition.js +++ b/src/js/game/shape_definition.js @@ -27,6 +27,11 @@ export const MODS_ADDITIONAL_SUB_SHAPE_DRAWERS = {}; * }} ShapeLayerItem */ +export const TOP_RIGHT = 0; +export const BOTTOM_RIGHT = 1; +export const BOTTOM_LEFT = 2; +export const TOP_LEFT = 3; + /** * Order is Q1 (tr), Q2(br), Q3(bl), Q4(tl) * @typedef {[ShapeLayerItem?, ShapeLayerItem?, ShapeLayerItem?, ShapeLayerItem?]} ShapeLayer @@ -64,7 +69,7 @@ for (const key in enumSubShapeToShortcode) { /** * Converts the given parameters to a valid shape definition * @param {*} layers - * @returns {Array} + * @returns {Array} */ export function createSimpleShape(layers) { layers.forEach(layer => { @@ -242,7 +247,7 @@ export class ShapeDefinition extends BasicSerializableObject { * Internal method to clone the shape definition * @returns {Array} */ - internalCloneLayers() { + getClonedLayers() { return JSON.parse(JSON.stringify(this.layers)); } @@ -460,7 +465,7 @@ export class ShapeDefinition extends BasicSerializableObject { * @returns {ShapeDefinition} */ cloneFilteredByQuadrants(includeQuadrants) { - const newLayers = this.internalCloneLayers(); + const newLayers = this.getClonedLayers(); for (let layerIndex = 0; layerIndex < newLayers.length; ++layerIndex) { const quadrants = newLayers[layerIndex]; let anyContents = false; @@ -486,7 +491,7 @@ export class ShapeDefinition extends BasicSerializableObject { * @returns {ShapeDefinition} */ cloneRotateCW() { - const newLayers = this.internalCloneLayers(); + const newLayers = this.getClonedLayers(); for (let layerIndex = 0; layerIndex < newLayers.length; ++layerIndex) { const quadrants = newLayers[layerIndex]; quadrants.unshift(quadrants[3]); @@ -500,7 +505,7 @@ export class ShapeDefinition extends BasicSerializableObject { * @returns {ShapeDefinition} */ cloneRotateCCW() { - const newLayers = this.internalCloneLayers(); + const newLayers = this.getClonedLayers(); for (let layerIndex = 0; layerIndex < newLayers.length; ++layerIndex) { const quadrants = newLayers[layerIndex]; quadrants.push(quadrants[0]); @@ -514,7 +519,7 @@ export class ShapeDefinition extends BasicSerializableObject { * @returns {ShapeDefinition} */ cloneRotate180() { - const newLayers = this.internalCloneLayers(); + const newLayers = this.getClonedLayers(); for (let layerIndex = 0; layerIndex < newLayers.length; ++layerIndex) { const quadrants = newLayers[layerIndex]; quadrants.push(quadrants.shift(), quadrants.shift()); @@ -572,7 +577,7 @@ export class ShapeDefinition extends BasicSerializableObject { // Can't merge at a layer lower than 0 const layerToMergeAt = Math.max(1 - smallestGapBetweenShapes, 0); - const mergedLayers = this.internalCloneLayers(); + const mergedLayers = this.getClonedLayers(); for (let layer = mergedLayers.length; layer < layerToMergeAt + topShapeLayers.length; ++layer) { mergedLayers.push([null, null, null, null]); } @@ -598,7 +603,7 @@ export class ShapeDefinition extends BasicSerializableObject { * @param {enumColors} color */ cloneAndPaintWith(color) { - const newLayers = this.internalCloneLayers(); + const newLayers = this.getClonedLayers(); for (let layerIndex = 0; layerIndex < newLayers.length; ++layerIndex) { const quadrants = newLayers[layerIndex]; @@ -617,7 +622,7 @@ export class ShapeDefinition extends BasicSerializableObject { * @param {[enumColors, enumColors, enumColors, enumColors]} colors */ cloneAndPaintWith4Colors(colors) { - const newLayers = this.internalCloneLayers(); + const newLayers = this.getClonedLayers(); for (let layerIndex = 0; layerIndex < newLayers.length; ++layerIndex) { const quadrants = newLayers[layerIndex]; diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 525c242c..36c837fb 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -8,7 +8,7 @@ import { } from "../components/item_processor"; import { Entity } from "../entity"; import { GameSystemWithFilter } from "../game_system_with_filter"; -import { BOOL_TRUE_SINGLETON, isTruthyItem } from "../items/boolean_item"; +import { isTruthyItem } from "../items/boolean_item"; import { ColorItem, COLOR_ITEM_SINGLETONS } from "../items/color_item"; import { ShapeItem } from "../items/shape_item"; @@ -38,6 +38,11 @@ const MAX_QUEUED_CHARGES = 2; * }} ProcessorImplementationPayload */ +/** + * @type {Object void>} + */ +export const MOD_ITEM_PROCESSOR_HANDLERS = {}; + export class ItemProcessorSystem extends GameSystemWithFilter { constructor(root) { super(root, [ItemProcessorComponent]); @@ -61,6 +66,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { [enumItemProcessorTypes.hub]: this.process_HUB, [enumItemProcessorTypes.reader]: this.process_READER, [enumItemProcessorTypes.goal]: this.process_GOAL, + ...MOD_ITEM_PROCESSOR_HANDLERS, }; // Bind all handlers diff --git a/src/js/globals.d.ts b/src/js/globals.d.ts index 0b9421e1..042b549d 100644 --- a/src/js/globals.d.ts +++ b/src/js/globals.d.ts @@ -26,6 +26,8 @@ declare const shapez: any; declare const ipcRenderer: any; +declare const registerMod: any; + // Polyfills declare interface String { replaceAll(search: string, replacement: string): string; From e4b8071c2f1fc929f6bc46edab8362d823d1d61a Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 10:39:54 +0100 Subject: [PATCH 041/129] Add interface to register new buildings --- mod_examples/add_building_basic.js | 8 ++++---- mod_examples/add_building_flipper.js | 8 ++++---- mod_examples/combined.js | 9 ++++----- mod_examples/custom_theme.js | 1 - src/js/mods/mod_interface.js | 17 +++++++++++++++++ 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/mod_examples/add_building_basic.js b/mod_examples/add_building_basic.js index c06b5dd4..532455a1 100644 --- a/mod_examples/add_building_basic.js +++ b/mod_examples/add_building_basic.js @@ -56,10 +56,10 @@ registerMod(() => { }); // Add it to the regular toolbar - this.signals.hudElementInitialized.add(element => { - if (element.constructor.name === "HUDBuildingsToolbar") { - element.primaryBuildings.push(MetaDemoModBuilding); - } + this.modInterface.addNewBuildingToToolbar({ + toolbar: "regular", + location: "primary", + metaClass: MetaDemoModBuilding, }); } }; diff --git a/mod_examples/add_building_flipper.js b/mod_examples/add_building_flipper.js index b78283d6..1174823b 100644 --- a/mod_examples/add_building_flipper.js +++ b/mod_examples/add_building_flipper.js @@ -121,10 +121,10 @@ registerMod(() => { }); // Add it to the regular toolbar - this.signals.hudElementInitialized.add(element => { - if (element.constructor.name === "HUDBuildingsToolbar") { - element.primaryBuildings.push(MetaModFlipperBuilding); - } + this.modInterface.addNewBuildingToToolbar({ + toolbar: "regular", + location: "primary", + metaClass: MetaModFlipperBuilding, }); } }; diff --git a/mod_examples/combined.js b/mod_examples/combined.js index 54bf474a..c7d6c6b6 100644 --- a/mod_examples/combined.js +++ b/mod_examples/combined.js @@ -188,11 +188,10 @@ registerMod(() => { }); // Add it to the regular toolbar - this.signals.hudElementInitialized.add(element => { - if (element.constructor.name === "HUDBuildingsToolbar") { - // @ts-ignore - element.primaryBuildings.push(MetaDemoModBuilding); - } + this.modInterface.addNewBuildingToToolbar({ + toolbar: "regular", + location: "primary", + metaClass: MetaDemoModBuilding, }); // Register keybinding diff --git a/mod_examples/custom_theme.js b/mod_examples/custom_theme.js index b53016aa..328630a5 100644 --- a/mod_examples/custom_theme.js +++ b/mod_examples/custom_theme.js @@ -19,7 +19,6 @@ registerMod(() => { } init() { - console.log("CUSTOM GAME THEME NOW"); this.modInterface.registerGameTheme({ id: "my-theme", name: "My fancy theme", diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 0e967990..eb27df21 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -344,4 +344,21 @@ export class ModInterface { }, }); } + + /** + * @param {object} param0 + * @param {"regular"|"wires"} param0.toolbar + * @param {"primary"|"secondary"} param0.location + * @param {typeof MetaBuilding} param0.metaClass + */ + addNewBuildingToToolbar({ toolbar, location, metaClass }) { + const hudElementName = toolbar === "wires" ? "HUDWiresToolbar" : "HUDBuildingsToolbar"; + const property = location === "secondary" ? "secondaryBuildings" : "primaryBuildings"; + + this.modLoader.signals.hudElementInitialized.add(element => { + if (element.constructor.name === hudElementName) { + element[property].push(metaClass); + } + }); + } } From 592b30414787891a5d432092235e0deec9acc998 Mon Sep 17 00:00:00 2001 From: "Thomas (DJ1TJOO)" <44841260+DJ1TJOO@users.noreply.github.com> Date: Sun, 16 Jan 2022 10:41:09 +0100 Subject: [PATCH 042/129] Fixed typescript type errors (#1335) --- src/js/game/map_chunk.js | 2 +- src/js/savegame/serialization.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/game/map_chunk.js b/src/js/game/map_chunk.js index ca2db36f..2f92ee08 100644 --- a/src/js/game/map_chunk.js +++ b/src/js/game/map_chunk.js @@ -433,7 +433,7 @@ export class MapChunk { * Sets the chunks contents * @param {number} tileX * @param {number} tileY - * @param {Entity=} contents + * @param {Entity} contents * @param {Layer} layer */ setLayerContentFromWorldCords(tileX, tileY, contents, layer) { diff --git a/src/js/savegame/serialization.js b/src/js/savegame/serialization.js index 9a0ce3a5..770f166f 100644 --- a/src/js/savegame/serialization.js +++ b/src/js/savegame/serialization.js @@ -138,7 +138,7 @@ export const types = { /** * A full schema declaration - * @typedef {Object.} Schema + * @typedef {Object. | object} Schema */ const globalSchemaCache = {}; From 2c8f11ff7f31c03f152161beb565a5767027701b Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 11:19:22 +0100 Subject: [PATCH 043/129] Refactor building registry, make it easier for mods to add new buildings --- mod_examples/add_building_basic.js | 28 +-- mod_examples/add_building_flipper.js | 28 +-- src/js/game/building_codes.js | 3 + src/js/game/buildings/analyzer.js | 11 +- src/js/game/buildings/balancer.js | 25 +++ src/js/game/buildings/belt.js | 22 +- src/js/game/buildings/block.js | 11 +- src/js/game/buildings/comparator.js | 11 +- src/js/game/buildings/constant_producer.js | 11 +- src/js/game/buildings/constant_signal.js | 11 +- src/js/game/buildings/cutter.js | 13 ++ src/js/game/buildings/display.js | 11 +- src/js/game/buildings/filter.js | 11 +- src/js/game/buildings/goal_acceptor.js | 11 +- src/js/game/buildings/hub.js | 11 +- src/js/game/buildings/item_producer.js | 11 +- src/js/game/buildings/lever.js | 11 +- src/js/game/buildings/logic_gate.js | 21 ++ src/js/game/buildings/miner.js | 13 ++ src/js/game/buildings/mixer.js | 11 +- src/js/game/buildings/painter.js | 21 ++ src/js/game/buildings/reader.js | 11 +- src/js/game/buildings/rotater.js | 17 ++ src/js/game/buildings/stacker.js | 11 +- src/js/game/buildings/storage.js | 11 +- src/js/game/buildings/transistor.js | 13 ++ src/js/game/buildings/trash.js | 11 +- src/js/game/buildings/underground_belt.js | 25 +++ src/js/game/buildings/virtual_processor.js | 25 +++ src/js/game/buildings/wire.js | 45 ++++ src/js/game/buildings/wire_tunnel.js | 11 +- src/js/game/meta_building.js | 10 + src/js/game/meta_building_registry.js | 227 ++++++--------------- src/js/mods/mod_interface.js | 42 ++-- src/js/mods/mod_meta_building.js | 18 ++ 35 files changed, 545 insertions(+), 238 deletions(-) create mode 100644 src/js/mods/mod_meta_building.js diff --git a/mod_examples/add_building_basic.js b/mod_examples/add_building_basic.js index 532455a1..b7c1a6bb 100644 --- a/mod_examples/add_building_basic.js +++ b/mod_examples/add_building_basic.js @@ -4,11 +4,25 @@ * the advanced example */ registerMod(() => { - class MetaDemoModBuilding extends shapez.MetaBuilding { + class MetaDemoModBuilding extends shapez.ModMetaBuilding { constructor() { super("demoModBuilding"); } + static getAllVariantCombinations() { + return [ + { + variant: shapez.defaultBuildingVariant, + name: "A test name", + description: "A test building", + + regularImageBase64: RESOURCES["demoBuilding.png"], + blueprintImageBase64: RESOURCES["demoBuildingBlueprint.png"], + tutorialImageBase64: RESOURCES["demoBuildingBlueprint.png"], + }, + ]; + } + getSilhouetteColor() { return "red"; } @@ -41,18 +55,6 @@ registerMod(() => { this.modInterface.registerNewBuilding({ metaClass: MetaDemoModBuilding, buildingIconBase64: RESOURCES["demoBuilding.png"], - - variantsAndRotations: [ - { - name: "A test name", - description: "A test building", - variant: shapez.defaultBuildingVariant, - - regularImageBase64: RESOURCES["demoBuilding.png"], - blueprintImageBase64: RESOURCES["demoBuildingBlueprint.png"], - tutorialImageBase64: RESOURCES["demoBuildingBlueprint.png"], - }, - ], }); // Add it to the regular toolbar diff --git a/mod_examples/add_building_flipper.js b/mod_examples/add_building_flipper.js index 1174823b..f216f31b 100644 --- a/mod_examples/add_building_flipper.js +++ b/mod_examples/add_building_flipper.js @@ -35,11 +35,25 @@ registerMod(() => { }; // Create the building - class MetaModFlipperBuilding extends shapez.MetaBuilding { + class MetaModFlipperBuilding extends shapez.ModMetaBuilding { constructor() { super("modFlipperBuilding"); } + static getAllVariantCombinations() { + return [ + { + name: "Flipper", + description: "Flipps/Mirrors shapez from top to bottom", + variant: shapez.defaultBuildingVariant, + + regularImageBase64: RESOURCES["flipper.png"], + blueprintImageBase64: RESOURCES["flipper.png"], + tutorialImageBase64: RESOURCES["flipper.png"], + }, + ]; + } + getSilhouetteColor() { return "red"; } @@ -106,18 +120,6 @@ registerMod(() => { this.modInterface.registerNewBuilding({ metaClass: MetaModFlipperBuilding, buildingIconBase64: RESOURCES["flipper.png"], - - variantsAndRotations: [ - { - name: "Flipper", - description: "Flipps/Mirrors shapez from top to bottom", - variant: shapez.defaultBuildingVariant, - - regularImageBase64: RESOURCES["flipper.png"], - blueprintImageBase64: RESOURCES["flipper.png"], - tutorialImageBase64: RESOURCES["flipper.png"], - }, - ], }); // Add it to the regular toolbar diff --git a/src/js/game/building_codes.js b/src/js/game/building_codes.js index 5e2b717b..1d178daf 100644 --- a/src/js/game/building_codes.js +++ b/src/js/game/building_codes.js @@ -4,6 +4,8 @@ import { AtlasSprite } from "../core/sprites"; import { Vector } from "../core/vector"; /* typehints:end */ +import { gMetaBuildingRegistry } from "../core/global_registries"; + /** * @typedef {{ * metaClass: typeof MetaBuilding, @@ -47,6 +49,7 @@ export function registerBuildingVariant( assert(!gBuildingVariants[code], "Duplicate id: " + code); gBuildingVariants[code] = { metaClass: meta, + metaInstance: gMetaBuildingRegistry.findByClass(meta), variant, rotationVariant, // @ts-ignore diff --git a/src/js/game/buildings/analyzer.js b/src/js/game/buildings/analyzer.js index 8335f730..13597d7b 100644 --- a/src/js/game/buildings/analyzer.js +++ b/src/js/game/buildings/analyzer.js @@ -3,7 +3,7 @@ import { enumDirection, Vector } from "../../core/vector"; import { enumLogicGateType, LogicGateComponent } from "../components/logic_gate"; import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; import { enumHubGoalRewards } from "../tutorial_goals"; @@ -14,6 +14,15 @@ export class MetaAnalyzerBuilding extends MetaBuilding { super("analyzer"); } + static getAllVariantCombinations() { + return [ + { + internalId: 43, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { return "#3a52bc"; } diff --git a/src/js/game/buildings/balancer.js b/src/js/game/buildings/balancer.js index 38a568e1..0948338c 100644 --- a/src/js/game/buildings/balancer.js +++ b/src/js/game/buildings/balancer.js @@ -31,6 +31,31 @@ export class MetaBalancerBuilding extends MetaBuilding { super("balancer"); } + static getAllVariantCombinations() { + return [ + { + internalId: 4, + variant: defaultBuildingVariant, + }, + { + internalId: 5, + variant: enumBalancerVariants.merger, + }, + { + internalId: 6, + variant: enumBalancerVariants.mergerInverse, + }, + { + internalId: 47, + variant: enumBalancerVariants.splitter, + }, + { + internalId: 48, + variant: enumBalancerVariants.splitterInverse, + }, + ]; + } + getDimensions(variant) { switch (variant) { case defaultBuildingVariant: diff --git a/src/js/game/buildings/belt.js b/src/js/game/buildings/belt.js index f4e31ba9..11a53cdf 100644 --- a/src/js/game/buildings/belt.js +++ b/src/js/game/buildings/belt.js @@ -5,7 +5,7 @@ import { SOUNDS } from "../../platform/sound"; import { T } from "../../translations"; import { BeltComponent } from "../components/belt"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; import { THEME } from "../theme"; @@ -22,6 +22,26 @@ export class MetaBeltBuilding extends MetaBuilding { super("belt"); } + static getAllVariantCombinations() { + return [ + { + internalId: 1, + variant: defaultBuildingVariant, + rotationVariant: 0, + }, + { + internalId: 2, + variant: defaultBuildingVariant, + rotationVariant: 1, + }, + { + internalId: 3, + variant: defaultBuildingVariant, + rotationVariant: 2, + }, + ]; + } + getSilhouetteColor() { return THEME.map.chunkOverview.beltColor; } diff --git a/src/js/game/buildings/block.js b/src/js/game/buildings/block.js index d6499648..024c6322 100644 --- a/src/js/game/buildings/block.js +++ b/src/js/game/buildings/block.js @@ -2,13 +2,22 @@ import { Entity } from "../entity"; /* typehints:end */ -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; export class MetaBlockBuilding extends MetaBuilding { constructor() { super("block"); } + static getAllVariantCombinations() { + return [ + { + internalId: 64, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { return "#333"; } diff --git a/src/js/game/buildings/comparator.js b/src/js/game/buildings/comparator.js index 6738d514..1f45dbbb 100644 --- a/src/js/game/buildings/comparator.js +++ b/src/js/game/buildings/comparator.js @@ -2,7 +2,7 @@ import { enumDirection, Vector } from "../../core/vector"; import { enumLogicGateType, LogicGateComponent } from "../components/logic_gate"; import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; import { enumHubGoalRewards } from "../tutorial_goals"; @@ -11,6 +11,15 @@ export class MetaComparatorBuilding extends MetaBuilding { super("comparator"); } + static getAllVariantCombinations() { + return [ + { + internalId: 46, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { return "#823cab"; } diff --git a/src/js/game/buildings/constant_producer.js b/src/js/game/buildings/constant_producer.js index c1c502d0..5c19a6ed 100644 --- a/src/js/game/buildings/constant_producer.js +++ b/src/js/game/buildings/constant_producer.js @@ -6,13 +6,22 @@ import { enumDirection, Vector } from "../../core/vector"; import { ConstantSignalComponent } from "../components/constant_signal"; import { ItemEjectorComponent } from "../components/item_ejector"; import { ItemProducerComponent } from "../components/item_producer"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; export class MetaConstantProducerBuilding extends MetaBuilding { constructor() { super("constant_producer"); } + static getAllVariantCombinations() { + return [ + { + internalId: 62, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { return "#bfd630"; } diff --git a/src/js/game/buildings/constant_signal.js b/src/js/game/buildings/constant_signal.js index 983594cb..2bb72def 100644 --- a/src/js/game/buildings/constant_signal.js +++ b/src/js/game/buildings/constant_signal.js @@ -1,7 +1,7 @@ import { enumDirection, Vector } from "../../core/vector"; import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; import { ConstantSignalComponent } from "../components/constant_signal"; import { generateMatrixRotations } from "../../core/utils"; @@ -14,6 +14,15 @@ export class MetaConstantSignalBuilding extends MetaBuilding { super("constant_signal"); } + static getAllVariantCombinations() { + return [ + { + internalId: 31, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { return "#2b84fd"; } diff --git a/src/js/game/buildings/cutter.js b/src/js/game/buildings/cutter.js index 37264c9d..4950f786 100644 --- a/src/js/game/buildings/cutter.js +++ b/src/js/game/buildings/cutter.js @@ -17,6 +17,19 @@ export class MetaCutterBuilding extends MetaBuilding { super("cutter"); } + static getAllVariantCombinations() { + return [ + { + internalId: 9, + variant: defaultBuildingVariant, + }, + { + internalId: 10, + variant: enumCutterVariants.quad, + }, + ]; + } + getSilhouetteColor() { return "#7dcda2"; } diff --git a/src/js/game/buildings/display.js b/src/js/game/buildings/display.js index 422bea81..7c1277c2 100644 --- a/src/js/game/buildings/display.js +++ b/src/js/game/buildings/display.js @@ -1,7 +1,7 @@ import { enumDirection, Vector } from "../../core/vector"; import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; import { DisplayComponent } from "../components/display"; import { enumHubGoalRewards } from "../tutorial_goals"; @@ -11,6 +11,15 @@ export class MetaDisplayBuilding extends MetaBuilding { super("display"); } + static getAllVariantCombinations() { + return [ + { + internalId: 40, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { return "#aaaaaa"; } diff --git a/src/js/game/buildings/filter.js b/src/js/game/buildings/filter.js index 08296853..bf4c5f19 100644 --- a/src/js/game/buildings/filter.js +++ b/src/js/game/buildings/filter.js @@ -6,7 +6,7 @@ import { ItemAcceptorComponent } from "../components/item_acceptor"; import { ItemEjectorComponent } from "../components/item_ejector"; import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; import { enumHubGoalRewards } from "../tutorial_goals"; @@ -15,6 +15,15 @@ export class MetaFilterBuilding extends MetaBuilding { super("filter"); } + static getAllVariantCombinations() { + return [ + { + internalId: 37, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { return "#c45c2e"; } diff --git a/src/js/game/buildings/goal_acceptor.js b/src/js/game/buildings/goal_acceptor.js index dde720e3..cb51a6d2 100644 --- a/src/js/game/buildings/goal_acceptor.js +++ b/src/js/game/buildings/goal_acceptor.js @@ -6,13 +6,22 @@ import { enumDirection, Vector } from "../../core/vector"; import { GoalAcceptorComponent } from "../components/goal_acceptor"; import { ItemAcceptorComponent } from "../components/item_acceptor"; import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; export class MetaGoalAcceptorBuilding extends MetaBuilding { constructor() { super("goal_acceptor"); } + static getAllVariantCombinations() { + return [ + { + internalId: 63, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { return "#ce418a"; } diff --git a/src/js/game/buildings/hub.js b/src/js/game/buildings/hub.js index b9929b31..3a543cf0 100644 --- a/src/js/game/buildings/hub.js +++ b/src/js/game/buildings/hub.js @@ -3,7 +3,7 @@ import { HubComponent } from "../components/hub"; import { ItemAcceptorComponent } from "../components/item_acceptor"; import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { WiredPinsComponent, enumPinSlotType } from "../components/wired_pins"; export class MetaHubBuilding extends MetaBuilding { @@ -11,6 +11,15 @@ export class MetaHubBuilding extends MetaBuilding { super("hub"); } + static getAllVariantCombinations() { + return [ + { + internalId: 26, + variant: defaultBuildingVariant, + }, + ]; + } + getDimensions() { return new Vector(4, 4); } diff --git a/src/js/game/buildings/item_producer.js b/src/js/game/buildings/item_producer.js index 1140c8f1..a367beae 100644 --- a/src/js/game/buildings/item_producer.js +++ b/src/js/game/buildings/item_producer.js @@ -3,13 +3,22 @@ import { ItemEjectorComponent } from "../components/item_ejector"; import { ItemProducerComponent } from "../components/item_producer"; import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; export class MetaItemProducerBuilding extends MetaBuilding { constructor() { super("item_producer"); } + static getAllVariantCombinations() { + return [ + { + internalId: 61, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { return "#b37dcd"; } diff --git a/src/js/game/buildings/lever.js b/src/js/game/buildings/lever.js index 7ddaf65f..970a4bc6 100644 --- a/src/js/game/buildings/lever.js +++ b/src/js/game/buildings/lever.js @@ -1,7 +1,7 @@ import { enumDirection, Vector } from "../../core/vector"; import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; import { LeverComponent } from "../components/lever"; import { enumHubGoalRewards } from "../tutorial_goals"; @@ -11,6 +11,15 @@ export class MetaLeverBuilding extends MetaBuilding { super("lever"); } + static getAllVariantCombinations() { + return [ + { + internalId: 33, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { // @todo: Render differently based on if its activated or not return "#1a678b"; diff --git a/src/js/game/buildings/logic_gate.js b/src/js/game/buildings/logic_gate.js index a0e63c06..bd5e1940 100644 --- a/src/js/game/buildings/logic_gate.js +++ b/src/js/game/buildings/logic_gate.js @@ -41,6 +41,27 @@ export class MetaLogicGateBuilding extends MetaBuilding { super("logic_gate"); } + static getAllVariantCombinations() { + return [ + { + internalId: 32, + variant: defaultBuildingVariant, + }, + { + internalId: 34, + variant: enumLogicGateVariants.not, + }, + { + internalId: 35, + variant: enumLogicGateVariants.xor, + }, + { + internalId: 36, + variant: enumLogicGateVariants.or, + }, + ]; + } + getSilhouetteColor(variant) { return colors[variant]; } diff --git a/src/js/game/buildings/miner.js b/src/js/game/buildings/miner.js index 473aa262..b086a562 100644 --- a/src/js/game/buildings/miner.js +++ b/src/js/game/buildings/miner.js @@ -21,6 +21,19 @@ export class MetaMinerBuilding extends MetaBuilding { super("miner"); } + static getAllVariantCombinations() { + return [ + { + internalId: 7, + variant: defaultBuildingVariant, + }, + { + internalId: 8, + variant: enumMinerVariants.chainable, + }, + ]; + } + getSilhouetteColor() { return "#b37dcd"; } diff --git a/src/js/game/buildings/mixer.js b/src/js/game/buildings/mixer.js index e572bbba..db8d867a 100644 --- a/src/js/game/buildings/mixer.js +++ b/src/js/game/buildings/mixer.js @@ -5,7 +5,7 @@ import { ItemAcceptorComponent } from "../components/item_acceptor"; import { ItemEjectorComponent } from "../components/item_ejector"; import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; import { enumHubGoalRewards } from "../tutorial_goals"; @@ -14,6 +14,15 @@ export class MetaMixerBuilding extends MetaBuilding { super("mixer"); } + static getAllVariantCombinations() { + return [ + { + internalId: 15, + variant: defaultBuildingVariant, + }, + ]; + } + getDimensions() { return new Vector(2, 1); } diff --git a/src/js/game/buildings/painter.js b/src/js/game/buildings/painter.js index e7a0b72d..79ae86ac 100644 --- a/src/js/game/buildings/painter.js +++ b/src/js/game/buildings/painter.js @@ -22,6 +22,27 @@ export class MetaPainterBuilding extends MetaBuilding { super("painter"); } + static getAllVariantCombinations() { + return [ + { + internalId: 16, + variant: defaultBuildingVariant, + }, + { + internalId: 17, + variant: enumPainterVariants.mirrored, + }, + { + internalId: 18, + variant: enumPainterVariants.double, + }, + { + internalId: 19, + variant: enumPainterVariants.quad, + }, + ]; + } + getDimensions(variant) { switch (variant) { case defaultBuildingVariant: diff --git a/src/js/game/buildings/reader.js b/src/js/game/buildings/reader.js index 006d6582..951c7e8a 100644 --- a/src/js/game/buildings/reader.js +++ b/src/js/game/buildings/reader.js @@ -4,7 +4,7 @@ import { ItemEjectorComponent } from "../components/item_ejector"; import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor"; import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; import { BeltUnderlaysComponent } from "../components/belt_underlays"; import { BeltReaderComponent } from "../components/belt_reader"; @@ -18,6 +18,15 @@ export class MetaReaderBuilding extends MetaBuilding { super("reader"); } + static getAllVariantCombinations() { + return [ + { + internalId: 49, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { return "#25fff2"; } diff --git a/src/js/game/buildings/rotater.js b/src/js/game/buildings/rotater.js index f24fee14..428ab08a 100644 --- a/src/js/game/buildings/rotater.js +++ b/src/js/game/buildings/rotater.js @@ -23,6 +23,23 @@ export class MetaRotaterBuilding extends MetaBuilding { super("rotater"); } + static getAllVariantCombinations() { + return [ + { + internalId: 11, + variant: defaultBuildingVariant, + }, + { + internalId: 12, + variant: enumRotaterVariants.ccw, + }, + { + internalId: 13, + variant: enumRotaterVariants.rotate180, + }, + ]; + } + getSilhouetteColor() { return "#7dc6cd"; } diff --git a/src/js/game/buildings/stacker.js b/src/js/game/buildings/stacker.js index 6b70365d..ad1a7bc7 100644 --- a/src/js/game/buildings/stacker.js +++ b/src/js/game/buildings/stacker.js @@ -5,7 +5,7 @@ import { ItemAcceptorComponent } from "../components/item_acceptor"; import { ItemEjectorComponent } from "../components/item_ejector"; import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; import { enumHubGoalRewards } from "../tutorial_goals"; @@ -14,6 +14,15 @@ export class MetaStackerBuilding extends MetaBuilding { super("stacker"); } + static getAllVariantCombinations() { + return [ + { + internalId: 14, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { return "#9fcd7d"; } diff --git a/src/js/game/buildings/storage.js b/src/js/game/buildings/storage.js index 5574e137..b63adc01 100644 --- a/src/js/game/buildings/storage.js +++ b/src/js/game/buildings/storage.js @@ -6,7 +6,7 @@ import { ItemEjectorComponent } from "../components/item_ejector"; import { StorageComponent } from "../components/storage"; import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; import { enumHubGoalRewards } from "../tutorial_goals"; @@ -17,6 +17,15 @@ export class MetaStorageBuilding extends MetaBuilding { super("storage"); } + static getAllVariantCombinations() { + return [ + { + internalId: 21, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { return "#bbdf6d"; } diff --git a/src/js/game/buildings/transistor.js b/src/js/game/buildings/transistor.js index ebcfeac3..1505903a 100644 --- a/src/js/game/buildings/transistor.js +++ b/src/js/game/buildings/transistor.js @@ -22,6 +22,19 @@ export class MetaTransistorBuilding extends MetaBuilding { super("transistor"); } + static getAllVariantCombinations() { + return [ + { + internalId: 38, + variant: defaultBuildingVariant, + }, + { + internalId: 60, + variant: enumTransistorVariants.mirrored, + }, + ]; + } + getSilhouetteColor() { return "#bc3a61"; } diff --git a/src/js/game/buildings/trash.js b/src/js/game/buildings/trash.js index 0ad5bfd7..3085bc55 100644 --- a/src/js/game/buildings/trash.js +++ b/src/js/game/buildings/trash.js @@ -4,7 +4,7 @@ import { ACHIEVEMENTS } from "../../platform/achievement_provider"; import { ItemAcceptorComponent } from "../components/item_acceptor"; import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; import { enumHubGoalRewards } from "../tutorial_goals"; @@ -15,6 +15,15 @@ export class MetaTrashBuilding extends MetaBuilding { super("trash"); } + static getAllVariantCombinations() { + return [ + { + internalId: 20, + variant: defaultBuildingVariant, + }, + ]; + } + getIsRotateable() { return false; } diff --git a/src/js/game/buildings/underground_belt.js b/src/js/game/buildings/underground_belt.js index 12e887c9..0f02863f 100644 --- a/src/js/game/buildings/underground_belt.js +++ b/src/js/game/buildings/underground_belt.js @@ -40,6 +40,31 @@ export class MetaUndergroundBeltBuilding extends MetaBuilding { super("underground_belt"); } + static getAllVariantCombinations() { + return [ + { + internalId: 22, + variant: defaultBuildingVariant, + rotationVariant: 0, + }, + { + internalId: 23, + variant: defaultBuildingVariant, + rotationVariant: 1, + }, + { + internalId: 24, + variant: enumUndergroundBeltVariants.tier2, + rotationVariant: 0, + }, + { + internalId: 25, + variant: enumUndergroundBeltVariants.tier2, + rotationVariant: 1, + }, + ]; + } + getSilhouetteColor(variant, rotationVariant) { return colorsByRotationVariant[rotationVariant]; } diff --git a/src/js/game/buildings/virtual_processor.js b/src/js/game/buildings/virtual_processor.js index ab32a0d3..b42ceb5d 100644 --- a/src/js/game/buildings/virtual_processor.js +++ b/src/js/game/buildings/virtual_processor.js @@ -40,6 +40,31 @@ export class MetaVirtualProcessorBuilding extends MetaBuilding { super("virtual_processor"); } + static getAllVariantCombinations() { + return [ + { + internalId: 42, + variant: defaultBuildingVariant, + }, + { + internalId: 44, + variant: enumVirtualProcessorVariants.rotater, + }, + { + internalId: 45, + variant: enumVirtualProcessorVariants.unstacker, + }, + { + internalId: 50, + variant: enumVirtualProcessorVariants.stacker, + }, + { + internalId: 51, + variant: enumVirtualProcessorVariants.painter, + }, + ]; + } + getSilhouetteColor(variant) { return colors[variant]; } diff --git a/src/js/game/buildings/wire.js b/src/js/game/buildings/wire.js index 61b75073..c69dbfa1 100644 --- a/src/js/game/buildings/wire.js +++ b/src/js/game/buildings/wire.js @@ -37,6 +37,51 @@ export class MetaWireBuilding extends MetaBuilding { super("wire"); } + static getAllVariantCombinations() { + return [ + { + internalId: 27, + variant: defaultBuildingVariant, + rotationVariant: 0, + }, + { + internalId: 28, + variant: defaultBuildingVariant, + rotationVariant: 1, + }, + { + internalId: 29, + variant: defaultBuildingVariant, + rotationVariant: 2, + }, + { + internalId: 30, + variant: defaultBuildingVariant, + rotationVariant: 3, + }, + { + internalId: 52, + variant: enumWireVariant.second, + rotationVariant: 0, + }, + { + internalId: 53, + variant: enumWireVariant.second, + rotationVariant: 1, + }, + { + internalId: 54, + variant: enumWireVariant.second, + rotationVariant: 2, + }, + { + internalId: 55, + variant: enumWireVariant.second, + rotationVariant: 3, + }, + ]; + } + getHasDirectionLockAvailable() { return true; } diff --git a/src/js/game/buildings/wire_tunnel.js b/src/js/game/buildings/wire_tunnel.js index 2626dd12..80faa9df 100644 --- a/src/js/game/buildings/wire_tunnel.js +++ b/src/js/game/buildings/wire_tunnel.js @@ -2,7 +2,7 @@ import { generateMatrixRotations } from "../../core/utils"; import { Vector } from "../../core/vector"; import { WireTunnelComponent } from "../components/wire_tunnel"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; import { enumHubGoalRewards } from "../tutorial_goals"; @@ -13,6 +13,15 @@ export class MetaWireTunnelBuilding extends MetaBuilding { super("wire_tunnel"); } + static getAllVariantCombinations() { + return [ + { + internalId: 39, + variant: defaultBuildingVariant, + }, + ]; + } + getSilhouetteColor() { return "#777a86"; } diff --git a/src/js/game/meta_building.js b/src/js/game/meta_building.js index 7bfbce25..0e92d3d9 100644 --- a/src/js/game/meta_building.js +++ b/src/js/game/meta_building.js @@ -18,6 +18,16 @@ export class MetaBuilding { this.id = id; } + /** + * Should return all possible variants of this building, no matter + * if they are already available or will be unlocked later on + * + * @returns {Array<{ variant: string, rotationVariant?: number, internalId?: number|string }>} + */ + static getAllVariantCombinations() { + throw new Error("implement getAllVariantCombinations"); + } + /** * Returns the id of this building */ diff --git a/src/js/game/meta_building_registry.js b/src/js/game/meta_building_registry.js index 193d60e5..55bc46d4 100644 --- a/src/js/game/meta_building_registry.js +++ b/src/js/game/meta_building_registry.js @@ -2,202 +2,89 @@ import { gMetaBuildingRegistry } from "../core/global_registries"; import { createLogger } from "../core/logging"; import { T } from "../translations"; import { MetaAnalyzerBuilding } from "./buildings/analyzer"; -import { enumBalancerVariants, MetaBalancerBuilding } from "./buildings/balancer"; +import { MetaBalancerBuilding } from "./buildings/balancer"; import { MetaBeltBuilding } from "./buildings/belt"; import { MetaBlockBuilding } from "./buildings/block"; import { MetaComparatorBuilding } from "./buildings/comparator"; import { MetaConstantProducerBuilding } from "./buildings/constant_producer"; import { MetaConstantSignalBuilding } from "./buildings/constant_signal"; -import { enumCutterVariants, MetaCutterBuilding } from "./buildings/cutter"; +import { MetaCutterBuilding } from "./buildings/cutter"; import { MetaDisplayBuilding } from "./buildings/display"; import { MetaFilterBuilding } from "./buildings/filter"; import { MetaGoalAcceptorBuilding } from "./buildings/goal_acceptor"; import { MetaHubBuilding } from "./buildings/hub"; import { MetaItemProducerBuilding } from "./buildings/item_producer"; import { MetaLeverBuilding } from "./buildings/lever"; -import { enumLogicGateVariants, MetaLogicGateBuilding } from "./buildings/logic_gate"; -import { enumMinerVariants, MetaMinerBuilding } from "./buildings/miner"; +import { MetaLogicGateBuilding } from "./buildings/logic_gate"; +import { MetaMinerBuilding } from "./buildings/miner"; import { MetaMixerBuilding } from "./buildings/mixer"; -import { enumPainterVariants, MetaPainterBuilding } from "./buildings/painter"; +import { MetaPainterBuilding } from "./buildings/painter"; import { MetaReaderBuilding } from "./buildings/reader"; -import { enumRotaterVariants, MetaRotaterBuilding } from "./buildings/rotater"; +import { MetaRotaterBuilding } from "./buildings/rotater"; import { MetaStackerBuilding } from "./buildings/stacker"; import { MetaStorageBuilding } from "./buildings/storage"; -import { enumTransistorVariants, MetaTransistorBuilding } from "./buildings/transistor"; +import { MetaTransistorBuilding } from "./buildings/transistor"; import { MetaTrashBuilding } from "./buildings/trash"; -import { enumUndergroundBeltVariants, MetaUndergroundBeltBuilding } from "./buildings/underground_belt"; -import { enumVirtualProcessorVariants, MetaVirtualProcessorBuilding } from "./buildings/virtual_processor"; +import { MetaUndergroundBeltBuilding } from "./buildings/underground_belt"; +import { MetaVirtualProcessorBuilding } from "./buildings/virtual_processor"; import { MetaWireBuilding } from "./buildings/wire"; import { MetaWireTunnelBuilding } from "./buildings/wire_tunnel"; import { buildBuildingCodeCache, gBuildingVariants, registerBuildingVariant } from "./building_codes"; -import { enumWireVariant } from "./components/wire"; import { KEYMAPPINGS } from "./key_action_mapper"; -import { defaultBuildingVariant } from "./meta_building"; +import { defaultBuildingVariant, MetaBuilding } from "./meta_building"; const logger = createLogger("building_registry"); -export function initMetaBuildingRegistry() { - gMetaBuildingRegistry.register(MetaBalancerBuilding); - gMetaBuildingRegistry.register(MetaMinerBuilding); - gMetaBuildingRegistry.register(MetaCutterBuilding); - gMetaBuildingRegistry.register(MetaRotaterBuilding); - gMetaBuildingRegistry.register(MetaStackerBuilding); - gMetaBuildingRegistry.register(MetaMixerBuilding); - gMetaBuildingRegistry.register(MetaPainterBuilding); - gMetaBuildingRegistry.register(MetaTrashBuilding); - gMetaBuildingRegistry.register(MetaStorageBuilding); - gMetaBuildingRegistry.register(MetaBeltBuilding); - gMetaBuildingRegistry.register(MetaUndergroundBeltBuilding); - gMetaBuildingRegistry.register(MetaGoalAcceptorBuilding); - gMetaBuildingRegistry.register(MetaHubBuilding); - gMetaBuildingRegistry.register(MetaWireBuilding); - gMetaBuildingRegistry.register(MetaConstantSignalBuilding); - gMetaBuildingRegistry.register(MetaLogicGateBuilding); - gMetaBuildingRegistry.register(MetaLeverBuilding); - gMetaBuildingRegistry.register(MetaFilterBuilding); - gMetaBuildingRegistry.register(MetaWireTunnelBuilding); - gMetaBuildingRegistry.register(MetaDisplayBuilding); - gMetaBuildingRegistry.register(MetaVirtualProcessorBuilding); - gMetaBuildingRegistry.register(MetaReaderBuilding); - gMetaBuildingRegistry.register(MetaTransistorBuilding); - gMetaBuildingRegistry.register(MetaAnalyzerBuilding); - gMetaBuildingRegistry.register(MetaComparatorBuilding); - gMetaBuildingRegistry.register(MetaItemProducerBuilding); - gMetaBuildingRegistry.register(MetaConstantProducerBuilding); - gMetaBuildingRegistry.register(MetaBlockBuilding); - - // Belt - registerBuildingVariant(1, MetaBeltBuilding, defaultBuildingVariant, 0); - registerBuildingVariant(2, MetaBeltBuilding, defaultBuildingVariant, 1); - registerBuildingVariant(3, MetaBeltBuilding, defaultBuildingVariant, 2); - - // Balancer - registerBuildingVariant(4, MetaBalancerBuilding); - registerBuildingVariant(5, MetaBalancerBuilding, enumBalancerVariants.merger); - registerBuildingVariant(6, MetaBalancerBuilding, enumBalancerVariants.mergerInverse); - registerBuildingVariant(47, MetaBalancerBuilding, enumBalancerVariants.splitter); - registerBuildingVariant(48, MetaBalancerBuilding, enumBalancerVariants.splitterInverse); - - // Miner - registerBuildingVariant(7, MetaMinerBuilding); - registerBuildingVariant(8, MetaMinerBuilding, enumMinerVariants.chainable); - - // Cutter - registerBuildingVariant(9, MetaCutterBuilding); - registerBuildingVariant(10, MetaCutterBuilding, enumCutterVariants.quad); - - // Rotater - registerBuildingVariant(11, MetaRotaterBuilding); - registerBuildingVariant(12, MetaRotaterBuilding, enumRotaterVariants.ccw); - registerBuildingVariant(13, MetaRotaterBuilding, enumRotaterVariants.rotate180); - - // Stacker - registerBuildingVariant(14, MetaStackerBuilding); - - // Mixer - registerBuildingVariant(15, MetaMixerBuilding); - - // Painter - registerBuildingVariant(16, MetaPainterBuilding); - registerBuildingVariant(17, MetaPainterBuilding, enumPainterVariants.mirrored); - registerBuildingVariant(18, MetaPainterBuilding, enumPainterVariants.double); - registerBuildingVariant(19, MetaPainterBuilding, enumPainterVariants.quad); - - // Trash - registerBuildingVariant(20, MetaTrashBuilding); - - // Storage - registerBuildingVariant(21, MetaStorageBuilding); - - // Underground belt - registerBuildingVariant(22, MetaUndergroundBeltBuilding, defaultBuildingVariant, 0); - registerBuildingVariant(23, MetaUndergroundBeltBuilding, defaultBuildingVariant, 1); - registerBuildingVariant(24, MetaUndergroundBeltBuilding, enumUndergroundBeltVariants.tier2, 0); - registerBuildingVariant(25, MetaUndergroundBeltBuilding, enumUndergroundBeltVariants.tier2, 1); - - // Hub - registerBuildingVariant(26, MetaHubBuilding); - - // Wire - registerBuildingVariant(27, MetaWireBuilding, defaultBuildingVariant, 0); - registerBuildingVariant(28, MetaWireBuilding, defaultBuildingVariant, 1); - registerBuildingVariant(29, MetaWireBuilding, defaultBuildingVariant, 2); - registerBuildingVariant(30, MetaWireBuilding, defaultBuildingVariant, 3); - - registerBuildingVariant(52, MetaWireBuilding, enumWireVariant.second, 0); - registerBuildingVariant(53, MetaWireBuilding, enumWireVariant.second, 1); - registerBuildingVariant(54, MetaWireBuilding, enumWireVariant.second, 2); - registerBuildingVariant(55, MetaWireBuilding, enumWireVariant.second, 3); - - // Constant signal - registerBuildingVariant(31, MetaConstantSignalBuilding); - - // Logic gate - registerBuildingVariant(32, MetaLogicGateBuilding); - registerBuildingVariant(34, MetaLogicGateBuilding, enumLogicGateVariants.not); - registerBuildingVariant(35, MetaLogicGateBuilding, enumLogicGateVariants.xor); - registerBuildingVariant(36, MetaLogicGateBuilding, enumLogicGateVariants.or); - - // Transistor - registerBuildingVariant(38, MetaTransistorBuilding, defaultBuildingVariant); - registerBuildingVariant(60, MetaTransistorBuilding, enumTransistorVariants.mirrored); - - // Lever - registerBuildingVariant(33, MetaLeverBuilding); - - // Filter - registerBuildingVariant(37, MetaFilterBuilding); - - // Wire tunnel - registerBuildingVariant(39, MetaWireTunnelBuilding); - - // Display - registerBuildingVariant(40, MetaDisplayBuilding); - - // Virtual Processor - registerBuildingVariant(42, MetaVirtualProcessorBuilding); - registerBuildingVariant(44, MetaVirtualProcessorBuilding, enumVirtualProcessorVariants.rotater); - registerBuildingVariant(45, MetaVirtualProcessorBuilding, enumVirtualProcessorVariants.unstacker); - registerBuildingVariant(50, MetaVirtualProcessorBuilding, enumVirtualProcessorVariants.stacker); - registerBuildingVariant(51, MetaVirtualProcessorBuilding, enumVirtualProcessorVariants.painter); - - // Analyzer - registerBuildingVariant(46, MetaComparatorBuilding); - registerBuildingVariant(43, MetaAnalyzerBuilding); - - // Reader - registerBuildingVariant(49, MetaReaderBuilding); - - // Item producer - registerBuildingVariant(61, MetaItemProducerBuilding); - - // Constant producer - registerBuildingVariant(62, MetaConstantProducerBuilding); - - // Goal acceptor - registerBuildingVariant(63, MetaGoalAcceptorBuilding); - - // Block - registerBuildingVariant(64, MetaBlockBuilding); - - // Propagate instances - for (const key in gBuildingVariants) { - gBuildingVariants[key].metaInstance = gMetaBuildingRegistry.findByClass( - gBuildingVariants[key].metaClass +/** + * + * @param {typeof MetaBuilding} metaBuilding + */ +export function registerBuildingVariants(metaBuilding) { + gMetaBuildingRegistry.register(metaBuilding); + const combinations = metaBuilding.getAllVariantCombinations(); + combinations.forEach(combination => { + registerBuildingVariant( + combination.internalId, + metaBuilding, + combination.variant || defaultBuildingVariant, + combination.rotationVariant || 0 ); - } + }); +} - for (const key in gBuildingVariants) { - const variant = gBuildingVariants[key]; - assert(variant.metaClass, "Variant has no meta: " + key); +export function initMetaBuildingRegistry() { + const buildings = [ + MetaBalancerBuilding, + MetaMinerBuilding, + MetaCutterBuilding, + MetaRotaterBuilding, + MetaStackerBuilding, + MetaMixerBuilding, + MetaPainterBuilding, + MetaTrashBuilding, + MetaStorageBuilding, + MetaBeltBuilding, + MetaUndergroundBeltBuilding, + MetaGoalAcceptorBuilding, + MetaHubBuilding, + MetaWireBuilding, + MetaConstantSignalBuilding, + MetaLogicGateBuilding, + MetaLeverBuilding, + MetaFilterBuilding, + MetaWireTunnelBuilding, + MetaDisplayBuilding, + MetaVirtualProcessorBuilding, + MetaReaderBuilding, + MetaTransistorBuilding, + MetaAnalyzerBuilding, + MetaComparatorBuilding, + MetaItemProducerBuilding, + MetaConstantProducerBuilding, + MetaBlockBuilding, + ]; - if (typeof variant.rotationVariant === "undefined") { - variant.rotationVariant = 0; - } - if (typeof variant.variant === "undefined") { - variant.variant = defaultBuildingVariant; - } - } + buildings.forEach(registerBuildingVariants); // Check for valid keycodes if (G_IS_DEV) { diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index eb27df21..f7db8b95 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -24,6 +24,7 @@ import { MOD_CHUNK_DRAW_HOOKS } from "../game/map_chunk_view"; import { KEYMAPPINGS } from "../game/key_action_mapper"; import { HUDModalDialogs } from "../game/hud/parts/modal_dialogs"; import { THEMES } from "../game/theme"; +import { ModMetaBuilding } from "./mod_meta_building"; export class ModInterface { /** @@ -190,54 +191,47 @@ export class ModInterface { /** * * @param {object} param0 - * @param {typeof MetaBuilding} param0.metaClass + * @param {typeof ModMetaBuilding} param0.metaClass * @param {string=} param0.buildingIconBase64 - * @param {({ - * variant?: string; - * rotationVariant?: number; - * name: string; - * description: string; - * blueprintImageBase64?: string; - * regularImageBase64?: string; - * tutorialImageBase64?: string; - * }[])} param0.variantsAndRotations */ - registerNewBuilding({ metaClass, variantsAndRotations, buildingIconBase64 }) { - const id = new /** @type {new () => MetaBuilding} */ (metaClass)().getId(); + registerNewBuilding({ metaClass, buildingIconBase64 }) { + const id = new /** @type {new (...args) => ModMetaBuilding} */ (metaClass)().getId(); if (gMetaBuildingRegistry.hasId(id)) { throw new Error("Tried to register building twice: " + id); } gMetaBuildingRegistry.register(metaClass); const metaInstance = gMetaBuildingRegistry.findByClass(metaClass); - T.buildings[id] = {}; - variantsAndRotations.forEach(payload => { - const actualVariant = payload.variant || defaultBuildingVariant; - registerBuildingVariant(id, metaClass, actualVariant, payload.rotationVariant || 0); + + metaClass.getAllVariantCombinations().forEach(combination => { + const actualVariant = combination.variant || defaultBuildingVariant; + registerBuildingVariant(id, metaClass, actualVariant, combination.rotationVariant || 0); gBuildingVariants[id].metaInstance = metaInstance; T.buildings[id][actualVariant] = { - name: payload.name, - description: payload.description, + name: combination.name || "Name", + description: combination.description || "Description", }; const buildingIdentifier = id + (actualVariant === defaultBuildingVariant ? "" : "-" + actualVariant); - if (payload.regularImageBase64) { + + if (combination.regularImageBase64) { this.registerSprite( "sprites/buildings/" + buildingIdentifier + ".png", - payload.regularImageBase64 + combination.regularImageBase64 ); } - if (payload.blueprintImageBase64) { + + if (combination.blueprintImageBase64) { this.registerSprite( "sprites/blueprints/" + buildingIdentifier + ".png", - payload.blueprintImageBase64 + combination.blueprintImageBase64 ); } - if (payload.tutorialImageBase64) { - this.setBuildingTutorialImage(id, actualVariant, payload.tutorialImageBase64); + if (combination.tutorialImageBase64) { + this.setBuildingTutorialImage(id, actualVariant, combination.tutorialImageBase64); } }); diff --git a/src/js/mods/mod_meta_building.js b/src/js/mods/mod_meta_building.js new file mode 100644 index 00000000..0d8f215a --- /dev/null +++ b/src/js/mods/mod_meta_building.js @@ -0,0 +1,18 @@ +import { MetaBuilding } from "../game/meta_building"; + +export class ModMetaBuilding extends MetaBuilding { + /** + * @returns {({ + * variant: string; + * rotationVariant?: number; + * name: string; + * description: string; + * blueprintImageBase64?: string; + * regularImageBase64?: string; + * tutorialImageBase64?: string; + * }[])} + */ + static getAllVariantCombinations() { + throw new Error("Implement getAllVariantCombinations"); + } +} From 93f269d62d8c335ec68250663f2164a5b13282cc Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 11:40:01 +0100 Subject: [PATCH 044/129] Allow overriding existing methods --- mod_examples/modify_existing_building.js | 36 ++++++++++++++++++ src/js/game/component_registry.js | 47 +++++++++++++----------- src/js/main.js | 31 ---------------- src/js/mods/mod_interface.js | 7 ++++ 4 files changed, 68 insertions(+), 53 deletions(-) create mode 100644 mod_examples/modify_existing_building.js diff --git a/mod_examples/modify_existing_building.js b/mod_examples/modify_existing_building.js new file mode 100644 index 00000000..cf8452ae --- /dev/null +++ b/mod_examples/modify_existing_building.js @@ -0,0 +1,36 @@ +/** + * This shows how to modify an existing building + */ +registerMod(() => { + return class ModImpl extends shapez.Mod { + constructor(app, modLoader) { + super( + app, + { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Modify existing building", + version: "1", + id: "modify-existing-building", + description: "Shows how to modify an existing building", + }, + modLoader + ); + } + + init() { + // Make Rotator always unlocked + this.modInterface.replaceMethod(shapez.MetaRotaterBuilding, "getIsUnlocked", function () { + return true; + }); + + // Add some custom stats to the info panel when selecting the building + this.modInterface.replaceMethod(shapez.MetaRotaterBuilding, "getAdditionalStatistics", function ( + root, + variant + ) { + return [["Awesomeness", 5]]; + }); + } + }; +}); diff --git a/src/js/game/component_registry.js b/src/js/game/component_registry.js index 9c9247e6..1add879e 100644 --- a/src/js/game/component_registry.js +++ b/src/js/game/component_registry.js @@ -22,31 +22,34 @@ import { ItemProducerComponent } from "./components/item_producer"; import { GoalAcceptorComponent } from "./components/goal_acceptor"; export function initComponentRegistry() { - gComponentRegistry.register(StaticMapEntityComponent); - gComponentRegistry.register(BeltComponent); - gComponentRegistry.register(ItemEjectorComponent); - gComponentRegistry.register(ItemAcceptorComponent); - gComponentRegistry.register(MinerComponent); - gComponentRegistry.register(ItemProcessorComponent); - gComponentRegistry.register(UndergroundBeltComponent); - gComponentRegistry.register(HubComponent); - gComponentRegistry.register(StorageComponent); - gComponentRegistry.register(WiredPinsComponent); - gComponentRegistry.register(BeltUnderlaysComponent); - gComponentRegistry.register(WireComponent); - gComponentRegistry.register(ConstantSignalComponent); - gComponentRegistry.register(LogicGateComponent); - gComponentRegistry.register(LeverComponent); - gComponentRegistry.register(WireTunnelComponent); - gComponentRegistry.register(DisplayComponent); - gComponentRegistry.register(BeltReaderComponent); - gComponentRegistry.register(FilterComponent); - gComponentRegistry.register(ItemProducerComponent); - gComponentRegistry.register(GoalAcceptorComponent); + const components = [ + StaticMapEntityComponent, + BeltComponent, + ItemEjectorComponent, + ItemAcceptorComponent, + MinerComponent, + ItemProcessorComponent, + UndergroundBeltComponent, + HubComponent, + StorageComponent, + WiredPinsComponent, + BeltUnderlaysComponent, + WireComponent, + ConstantSignalComponent, + LogicGateComponent, + LeverComponent, + WireTunnelComponent, + DisplayComponent, + BeltReaderComponent, + FilterComponent, + ItemProducerComponent, + GoalAcceptorComponent, + ]; + components.forEach(component => gComponentRegistry.register(component)); // IMPORTANT ^^^^^ UPDATE ENTITY COMPONENT STORAGE AFTERWARDS - // Sanity check - If this is thrown, you (=me, lol) forgot to add a new component here + // Sanity check - If this is thrown, you forgot to add a new component here assert( // @ts-ignore diff --git a/src/js/main.js b/src/js/main.js index 3ae76844..0f80f527 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -21,37 +21,6 @@ if (window.coreThreadLoadedCb) { window.coreThreadLoadedCb(); } -// Logrocket -// if (!G_IS_DEV && !G_IS_STANDALONE) { -// const monthlyUsers = 300; // thousand -// const logrocketLimit = 10; // thousand -// const percentageOfUsers = logrocketLimit / monthlyUsers; - -// if (Math.random() <= percentageOfUsers) { -// logger.log("Analyzing this session with logrocket"); -// const logrocket = require("logrocket"); -// logrocket.init("p1x9zh/shapezio"); - -// try { -// logrocket.getSessionURL(function (sessionURL) { -// logger.log("Connected lockrocket to GA"); -// // @ts-ignore -// try { -// window.ga("send", { -// hitType: "event", -// eventCategory: "LogRocket", -// eventAction: sessionURL, -// }); -// } catch (ex) { -// logger.warn("Logrocket connection to analytics failed:", ex); -// } -// }); -// } catch (ex) { -// logger.warn("Logrocket connection to analytics failed:", ex); -// } -// } -// } - console.log( `%cshapez.io ️%c\n© 2022 tobspr Games\nCommit %c${G_BUILD_COMMIT_HASH}%c on %c${new Date( G_BUILD_TIME diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index f7db8b95..895d64c7 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -355,4 +355,11 @@ export class ModInterface { } }); } + + /** + * Patches a method on a given object + */ + replaceMethod(classHandle, methodName, override) { + classHandle.prototype[methodName] = override; + } } From 43348a893194b836e51fbd1a6a23edf9c5fccbde Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 16:13:57 +0100 Subject: [PATCH 045/129] Add more examples and more features --- mod_examples/buildings_have_cost.js | 102 ++++++++++++++++++ ...{HUDPuzzleNextPuzzle.js => next_puzzle.js} | 0 src/js/game/modes/puzzle_play.js | 2 +- src/js/mods/mod_interface.js | 26 ++++- src/js/mods/modloader.js | 21 ++-- 5 files changed, 143 insertions(+), 8 deletions(-) create mode 100644 mod_examples/buildings_have_cost.js rename src/js/game/hud/parts/{HUDPuzzleNextPuzzle.js => next_puzzle.js} (100%) diff --git a/mod_examples/buildings_have_cost.js b/mod_examples/buildings_have_cost.js new file mode 100644 index 00000000..41b7ad86 --- /dev/null +++ b/mod_examples/buildings_have_cost.js @@ -0,0 +1,102 @@ +/** + * This shows how to patch existing methods by making belts have a cost + */ +registerMod(() => { + return class ModImpl extends shapez.Mod { + constructor(app, modLoader) { + super( + app, + { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Patch Methods", + version: "1", + id: "patch-methods", + description: + "Shows how to patch existing methods to change the game by making the belts cost shapes", + }, + modLoader + ); + } + + init() { + // Define our currency + const CURRENCY = "CyCyCyCy:--------:CuCuCuCu"; + + // Make sure the currency is always pinned + this.modInterface.runAfterMethod(shapez.HUDPinnedShapes, "rerenderFull", function () { + this.internalPinShape({ + key: CURRENCY, + canUnpin: false, + className: "currency", + }); + }); + + // Style it + this.modInterface.registerCss(` + #ingame_HUD_PinnedShapes .shape.currency::after { + content: " "; + position: absolute; + display: inline-block; + width: $scaled(8px); + height: $scaled(8px); + top: $scaled(4px); + left: $scaled(-7px); + background: url('${RESOURCES["currency.png"]}') center center / contain no-repeat; + } + + .currencyIcon { + display: inline-block; + vertical-align: middle; + background: url('${RESOURCES["currency.png"]}') center center / contain no-repeat; + } + + .currencyIcon.small { + width: $scaled(11px); + height: $scaled(11px); + } + `); + + // Make the player start with some currency + this.modInterface.runAfterMethod(shapez.GameCore, "initNewGame", function () { + console.log("Giving player start currency"); + this.root.hubGoals.storedShapes[CURRENCY] = 100; + }); + + // Make belts have a cost + this.modInterface.replaceMethod(shapez.MetaBeltBuilding, "getAdditionalStatistics", function ( + $original, + [root, variant] + ) { + const oldStats = $original(root, variant); + oldStats.push(["Cost", "1 x "]); + return oldStats; + }); + + // Only allow placing an entity when there is enough currency + this.modInterface.replaceMethod(shapez.GameLogic, "checkCanPlaceEntity", function ( + $original, + [entity, offset] + ) { + const storedCurrency = this.root.hubGoals.storedShapes[CURRENCY] || 0; + return storedCurrency > 0 && $original(entity, offset); + }); + + // Take shapes when placing a building + this.modInterface.replaceMethod(shapez.GameLogic, "tryPlaceBuilding", function ($original, args) { + const result = $original(...args); + if (result && result.components.Belt) { + console.log("BELT PLACED"); + + this.root.hubGoals.storedShapes[CURRENCY]--; + } + return result; + }); + } + }; +}); + +const RESOURCES = { + "currency.png": + "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAACXBIWXMAAAIAAAACAAF+ftPjAAAFwWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNy4xLWMwMDAgNzkuZGFiYWNiYiwgMjAyMS8wNC8xNC0wMDozOTo0NCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIzLjAgKE1hY2ludG9zaCkiIHhtcDpDcmVhdGVEYXRlPSIyMDIyLTAxLTE2VDE2OjAzOjE1KzAxOjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyMi0wMS0xNlQxNjowNDowMyswMTowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyMi0wMS0xNlQxNjowNDowMyswMTowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6M2IxMTM4ZjEtNzdmMi00MzcyLTg4ZDktZTgzN2I4NzlkNGUwIiB4bXBNTTpEb2N1bWVudElE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", +}; diff --git a/src/js/game/hud/parts/HUDPuzzleNextPuzzle.js b/src/js/game/hud/parts/next_puzzle.js similarity index 100% rename from src/js/game/hud/parts/HUDPuzzleNextPuzzle.js rename to src/js/game/hud/parts/next_puzzle.js diff --git a/src/js/game/modes/puzzle_play.js b/src/js/game/modes/puzzle_play.js index fc9a8f11..19957eee 100644 --- a/src/js/game/modes/puzzle_play.js +++ b/src/js/game/modes/puzzle_play.js @@ -30,7 +30,7 @@ import { HUDPuzzlePlaySettings } from "../hud/parts/puzzle_play_settings"; import { MetaBlockBuilding } from "../buildings/block"; import { MetaBuilding } from "../meta_building"; import { gMetaBuildingRegistry } from "../../core/global_registries"; -import { HUDPuzzleNextPuzzle } from "../hud/parts/HUDPuzzleNextPuzzle"; +import { HUDPuzzleNextPuzzle } from "../hud/parts/next_puzzle"; const logger = createLogger("puzzle-play"); const copy = require("clipboard-copy"); diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 895d64c7..784e3d9d 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -36,6 +36,10 @@ export class ModInterface { } registerCss(cssString) { + // Preprocess css + cssString = cssString.replace(/\$scaled\(([^\)]*)\)/gim, (substr, expression) => { + return "calc((" + expression + ") * var(--ui-scale))"; + }); const element = document.createElement("style"); element.textContent = cssString; document.head.appendChild(element); @@ -360,6 +364,26 @@ export class ModInterface { * Patches a method on a given object */ replaceMethod(classHandle, methodName, override) { - classHandle.prototype[methodName] = override; + const oldMethod = classHandle.prototype[methodName]; + classHandle.prototype[methodName] = function () { + return override.call(this, oldMethod.bind(this), arguments); + }; + } + + runBeforeMethod(classHandle, methodName, executeBefore) { + const oldHandle = classHandle.prototype[methodName]; + classHandle.prototype[methodName] = function () { + executeBefore.apply(this, arguments); + return oldHandle.apply(this, arguments); + }; + } + + runAfterMethod(classHandle, methodName, executeAfter) { + const oldHandle = classHandle.prototype[methodName]; + classHandle.prototype[methodName] = function () { + const returnValue = oldHandle.apply(this, arguments); + executeAfter.apply(this, arguments); + return returnValue; + }; } } diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 715a0e33..301b5ec7 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -84,12 +84,21 @@ export class ModLoader { mods = await ipcRenderer.invoke("get-mods"); } if (G_IS_DEV && globalConfig.debug.externalModUrl) { - const mod = await ( - await fetch(globalConfig.debug.externalModUrl, { - method: "GET", - }) - ).text(); - mods.push(mod); + const response = await fetch(globalConfig.debug.externalModUrl, { + method: "GET", + }); + if (response.status !== 200) { + throw new Error( + "Failed to load " + + globalConfig.debug.externalModUrl + + ": " + + response.status + + " " + + response.statusText + ); + } + + mods.push(await response.text()); } mods.forEach(modCode => { From 41a8d4334c624d87f8f9695f76ee50f7540d1981 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 16:45:05 +0100 Subject: [PATCH 046/129] More mod examples --- mod_examples/buildings_have_cost.js | 3 -- mod_examples/custom_css.js | 5 +- mod_examples/custom_sub_shapes.js | 53 +++++++++++++++++++++ mod_examples/translations.js | 71 +++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+), 4 deletions(-) create mode 100644 mod_examples/custom_sub_shapes.js create mode 100644 mod_examples/translations.js diff --git a/mod_examples/buildings_have_cost.js b/mod_examples/buildings_have_cost.js index 41b7ad86..7fda49c6 100644 --- a/mod_examples/buildings_have_cost.js +++ b/mod_examples/buildings_have_cost.js @@ -59,7 +59,6 @@ registerMod(() => { // Make the player start with some currency this.modInterface.runAfterMethod(shapez.GameCore, "initNewGame", function () { - console.log("Giving player start currency"); this.root.hubGoals.storedShapes[CURRENCY] = 100; }); @@ -86,8 +85,6 @@ registerMod(() => { this.modInterface.replaceMethod(shapez.GameLogic, "tryPlaceBuilding", function ($original, args) { const result = $original(...args); if (result && result.components.Belt) { - console.log("BELT PLACED"); - this.root.hubGoals.storedShapes[CURRENCY]--; } return result; diff --git a/mod_examples/custom_css.js b/mod_examples/custom_css.js index 248e0983..a5dfcc08 100644 --- a/mod_examples/custom_css.js +++ b/mod_examples/custom_css.js @@ -19,6 +19,9 @@ registerMod(() => { } init() { + // Notice that, since the UI is scaled dynamically, every pixel value + // should be wrapped in '$scaled()' (see below) + this.modInterface.registerCss(` * { font-family: "Comic Sans", "Comic Sans MS", "ComicSans", Tahoma !important; @@ -33,7 +36,7 @@ registerMod(() => { } #state_MainMenuState .mainContainer, #state_MainMenuState .modsOverview { - border: 5px solid #000 !important; + border: $scaled(5px) solid #000 !important; } `); } diff --git a/mod_examples/custom_sub_shapes.js b/mod_examples/custom_sub_shapes.js new file mode 100644 index 00000000..0ed47aec --- /dev/null +++ b/mod_examples/custom_sub_shapes.js @@ -0,0 +1,53 @@ +/** + * This shows how to add custom sub shapes + */ +registerMod(() => { + return class ModImpl extends shapez.Mod { + constructor(app, modLoader) { + super( + app, + { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Custom Sub Shapes", + version: "1", + id: "custom-sub-shapes", + description: "Shows how to add custom sub shapes", + }, + modLoader + ); + } + + init() { + // Add a new type of sub shape ("Line", short code "L") + this.modInterface.registerSubShapeType({ + id: "line", + shortCode: "L", + + // Make it spawn on the map + weightComputation: distanceToOriginInChunks => + Math.round(20 + Math.max(Math.min(distanceToOriginInChunks, 30), 0)), + + // This defines how to draw it + draw: ({ context, quadrantSize, layerScale }) => { + const quadrantHalfSize = quadrantSize / 2; + context.beginPath(); + context.moveTo(-quadrantHalfSize, quadrantHalfSize); + context.arc( + -quadrantHalfSize, + quadrantHalfSize, + quadrantSize * layerScale, + -Math.PI * 0.25, + 0 + ); + context.closePath(); + }, + }); + + // Modify the goal of the first level to add our goal + this.signals.modifyLevelDefinitions.add(definitions => { + definitions[0].shape = "LuLuLuLu"; + }); + } + }; +}); diff --git a/mod_examples/translations.js b/mod_examples/translations.js new file mode 100644 index 00000000..7763ee16 --- /dev/null +++ b/mod_examples/translations.js @@ -0,0 +1,71 @@ +/** + * Shows to add new translations + */ +registerMod(() => { + return class ModImpl extends shapez.Mod { + constructor(app, modLoader) { + super( + app, + { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Translations", + version: "1", + id: "translations", + description: "Shows how to add and modify translations", + }, + modLoader + ); + } + + init() { + // Replace an existing translation in the english language + this.modInterface.registerTranslations("en", { + ingame: { + interactiveTutorial: { + title: "Hello", + hints: { + "1_1_extractor": "World!", + }, + }, + }, + }); + + // Replace an existing translation in german + this.modInterface.registerTranslations("de", { + ingame: { + interactiveTutorial: { + title: "Hallo", + hints: { + "1_1_extractor": "Welt!", + }, + }, + }, + }); + + // Add an entirely new translation which is localized in german and english + this.modInterface.registerTranslations("en", { + mods: { + mymod: { + test: "Test Translation", + }, + }, + }); + this.modInterface.registerTranslations("de", { + mods: { + mymod: { + test: "Test Übersetzung", + }, + }, + }); + + // Show a dialog in the main menu + this.signals.stateEntered.add(state => { + if (state instanceof shapez.MainMenuState) { + // Will show differently based on the selected language + this.dialogs.showInfo("My translation", shapez.T.mods.mymod.test); + } + }); + } + }; +}); From 44c4807d7496b4d99ae1fdcc3a6604465b6a4478 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 17:05:13 +0100 Subject: [PATCH 047/129] Make mod loading simpler --- mod_examples/add_building_basic.js | 107 +++---- mod_examples/add_building_flipper.js | 226 +++++++------- mod_examples/base.js | 35 +-- mod_examples/buildings_have_cost.js | 114 ++++--- mod_examples/combined.js | 375 ++++++++++------------- mod_examples/custom_css.js | 38 +-- mod_examples/custom_sub_shapes.js | 85 +++-- mod_examples/custom_theme.js | 42 +-- mod_examples/modify_existing_building.js | 55 ++-- mod_examples/modify_theme.js | 40 +-- mod_examples/replace_builtin_sprites.js | 44 +-- mod_examples/translations.js | 109 +++---- src/js/globals.d.ts | 4 +- src/js/mods/mod.js | 18 +- src/js/mods/modloader.js | 27 +- 15 files changed, 599 insertions(+), 720 deletions(-) diff --git a/mod_examples/add_building_basic.js b/mod_examples/add_building_basic.js index b7c1a6bb..5147613c 100644 --- a/mod_examples/add_building_basic.js +++ b/mod_examples/add_building_basic.js @@ -3,69 +3,62 @@ * If you are interested in adding more logic to the game, you should also check out * the advanced example */ -registerMod(() => { - class MetaDemoModBuilding extends shapez.ModMetaBuilding { - constructor() { - super("demoModBuilding"); - } - static getAllVariantCombinations() { - return [ - { - variant: shapez.defaultBuildingVariant, - name: "A test name", - description: "A test building", +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Add new basic building", + version: "1", + id: "add-building-basic", + description: "Shows how to add a new basic building", +}; - regularImageBase64: RESOURCES["demoBuilding.png"], - blueprintImageBase64: RESOURCES["demoBuildingBlueprint.png"], - tutorialImageBase64: RESOURCES["demoBuildingBlueprint.png"], - }, - ]; - } - - getSilhouetteColor() { - return "red"; - } - - setupEntityComponents(entity) { - // Here you can add components, for example an ItemProcessorComponent. - // To get an idea what you can do with the builtin components, have a look - // at the builtin buildings in - } +class MetaDemoModBuilding extends shapez.ModMetaBuilding { + constructor() { + super("demoModBuilding"); } - return class ModImpl extends shapez.Mod { - constructor(app, modLoader) { - super( - app, - { - website: "https://tobspr.io", - author: "tobspr", - name: "Mod Example: Add new basic building", - version: "1", - id: "add-building-basic", - description: "Shows how to add a new basic building", - }, - modLoader - ); - } + static getAllVariantCombinations() { + return [ + { + variant: shapez.defaultBuildingVariant, + name: "A test name", + description: "A test building", - init() { - // Register the new building - this.modInterface.registerNewBuilding({ - metaClass: MetaDemoModBuilding, - buildingIconBase64: RESOURCES["demoBuilding.png"], - }); + regularImageBase64: RESOURCES["demoBuilding.png"], + blueprintImageBase64: RESOURCES["demoBuildingBlueprint.png"], + tutorialImageBase64: RESOURCES["demoBuildingBlueprint.png"], + }, + ]; + } - // Add it to the regular toolbar - this.modInterface.addNewBuildingToToolbar({ - toolbar: "regular", - location: "primary", - metaClass: MetaDemoModBuilding, - }); - } - }; -}); + getSilhouetteColor() { + return "red"; + } + + setupEntityComponents(entity) { + // Here you can add components, for example an ItemProcessorComponent. + // To get an idea what you can do with the builtin components, have a look + // at the builtin buildings in + } +} + +class Mod extends shapez.Mod { + init() { + // Register the new building + this.modInterface.registerNewBuilding({ + metaClass: MetaDemoModBuilding, + buildingIconBase64: RESOURCES["demoBuilding.png"], + }); + + // Add it to the regular toolbar + this.modInterface.addNewBuildingToToolbar({ + toolbar: "regular", + location: "primary", + metaClass: MetaDemoModBuilding, + }); + } +} //////////////////////////////////////////////////////////////////////// diff --git a/mod_examples/add_building_flipper.js b/mod_examples/add_building_flipper.js index f216f31b..88093392 100644 --- a/mod_examples/add_building_flipper.js +++ b/mod_examples/add_building_flipper.js @@ -2,135 +2,127 @@ * This shows how to add a new extended building (A building which flips shapes). * Be sure to check out the "add_building_basic" example first */ -registerMod(() => { - // Declare a new type of item processor - shapez.enumItemProcessorTypes.flipper = "flipper"; +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Add a flipper building", + version: "1", + id: "add-building-extended", + description: + "Shows how to add a new building with logic, in this case it flips/mirrors shapez from top to down", +}; - // For now, flipper always has the same speed - shapez.MOD_ITEM_PROCESSOR_SPEEDS.flipper = () => 10; +// Declare a new type of item processor +shapez.enumItemProcessorTypes.flipper = "flipper"; - // Declare a handler for the processor so we define the "flip" operation - shapez.MOD_ITEM_PROCESSOR_HANDLERS.flipper = function (payload) { - const shapeDefinition = payload.items.get(0).definition; +// For now, flipper always has the same speed +shapez.MOD_ITEM_PROCESSOR_SPEEDS.flipper = () => 10; - // Flip bottom with top on a new, cloned item (NEVER modify the incoming item!) - const newLayers = shapeDefinition.getClonedLayers(); - newLayers.forEach(layer => { - const tr = layer[shapez.TOP_RIGHT]; - const br = layer[shapez.BOTTOM_RIGHT]; - const bl = layer[shapez.BOTTOM_LEFT]; - const tl = layer[shapez.TOP_LEFT]; +// Declare a handler for the processor so we define the "flip" operation +shapez.MOD_ITEM_PROCESSOR_HANDLERS.flipper = function (payload) { + const shapeDefinition = payload.items.get(0).definition; - layer[shapez.BOTTOM_LEFT] = tl; - layer[shapez.BOTTOM_RIGHT] = tr; + // Flip bottom with top on a new, cloned item (NEVER modify the incoming item!) + const newLayers = shapeDefinition.getClonedLayers(); + newLayers.forEach(layer => { + const tr = layer[shapez.TOP_RIGHT]; + const br = layer[shapez.BOTTOM_RIGHT]; + const bl = layer[shapez.BOTTOM_LEFT]; + const tl = layer[shapez.TOP_LEFT]; - layer[shapez.TOP_LEFT] = bl; - layer[shapez.TOP_RIGHT] = br; - }); + layer[shapez.BOTTOM_LEFT] = tl; + layer[shapez.BOTTOM_RIGHT] = tr; - const newDefinition = new shapez.ShapeDefinition({ layers: newLayers }); - payload.outItems.push({ - item: this.root.shapeDefinitionMgr.getShapeItemFromDefinition(newDefinition), - }); - }; + layer[shapez.TOP_LEFT] = bl; + layer[shapez.TOP_RIGHT] = br; + }); - // Create the building - class MetaModFlipperBuilding extends shapez.ModMetaBuilding { - constructor() { - super("modFlipperBuilding"); - } + const newDefinition = new shapez.ShapeDefinition({ layers: newLayers }); + payload.outItems.push({ + item: this.root.shapeDefinitionMgr.getShapeItemFromDefinition(newDefinition), + }); +}; - static getAllVariantCombinations() { - return [ - { - name: "Flipper", - description: "Flipps/Mirrors shapez from top to bottom", - variant: shapez.defaultBuildingVariant, - - regularImageBase64: RESOURCES["flipper.png"], - blueprintImageBase64: RESOURCES["flipper.png"], - tutorialImageBase64: RESOURCES["flipper.png"], - }, - ]; - } - - getSilhouetteColor() { - return "red"; - } - - getAdditionalStatistics(root) { - const speed = root.hubGoals.getProcessorBaseSpeed(shapez.enumItemProcessorTypes.flipper); - return [[shapez.T.ingame.buildingPlacement.infoTexts.speed, shapez.formatItemsPerSecond(speed)]]; - } - - getIsUnlocked(root) { - return true; - } - - setupEntityComponents(entity) { - // Accept shapes from the bottom - entity.addComponent( - new shapez.ItemAcceptorComponent({ - slots: [ - { - pos: new shapez.Vector(0, 0), - directions: [shapez.enumDirection.bottom], - filter: "shape", - }, - ], - }) - ); - - // Process those shapes with tye processor type "flipper" (which we added above) - entity.addComponent( - new shapez.ItemProcessorComponent({ - inputsPerCharge: 1, - processorType: shapez.enumItemProcessorTypes.flipper, - }) - ); - - // Eject the result to the top - entity.addComponent( - new shapez.ItemEjectorComponent({ - slots: [{ pos: new shapez.Vector(0, 0), direction: shapez.enumDirection.top }], - }) - ); - } +// Create the building +class MetaModFlipperBuilding extends shapez.ModMetaBuilding { + constructor() { + super("modFlipperBuilding"); } - return class ModImpl extends shapez.Mod { - constructor(app, modLoader) { - super( - app, - { - website: "https://tobspr.io", - author: "tobspr", - name: "Mod Example: Add a flipper building", - version: "1", - id: "add-building-extended", - description: - "Shows how to add a new building with logic, in this case it flips/mirrors shapez from top to down", - }, - modLoader - ); - } + static getAllVariantCombinations() { + return [ + { + name: "Flipper", + description: "Flipps/Mirrors shapez from top to bottom", + variant: shapez.defaultBuildingVariant, - init() { - // Register the new building - this.modInterface.registerNewBuilding({ - metaClass: MetaModFlipperBuilding, - buildingIconBase64: RESOURCES["flipper.png"], - }); + regularImageBase64: RESOURCES["flipper.png"], + blueprintImageBase64: RESOURCES["flipper.png"], + tutorialImageBase64: RESOURCES["flipper.png"], + }, + ]; + } - // Add it to the regular toolbar - this.modInterface.addNewBuildingToToolbar({ - toolbar: "regular", - location: "primary", - metaClass: MetaModFlipperBuilding, - }); - } - }; -}); + getSilhouetteColor() { + return "red"; + } + + getAdditionalStatistics(root) { + const speed = root.hubGoals.getProcessorBaseSpeed(shapez.enumItemProcessorTypes.flipper); + return [[shapez.T.ingame.buildingPlacement.infoTexts.speed, shapez.formatItemsPerSecond(speed)]]; + } + + getIsUnlocked(root) { + return true; + } + + setupEntityComponents(entity) { + // Accept shapes from the bottom + entity.addComponent( + new shapez.ItemAcceptorComponent({ + slots: [ + { + pos: new shapez.Vector(0, 0), + directions: [shapez.enumDirection.bottom], + filter: "shape", + }, + ], + }) + ); + + // Process those shapes with tye processor type "flipper" (which we added above) + entity.addComponent( + new shapez.ItemProcessorComponent({ + inputsPerCharge: 1, + processorType: shapez.enumItemProcessorTypes.flipper, + }) + ); + + // Eject the result to the top + entity.addComponent( + new shapez.ItemEjectorComponent({ + slots: [{ pos: new shapez.Vector(0, 0), direction: shapez.enumDirection.top }], + }) + ); + } +} + +class Mod extends shapez.Mod { + init() { + // Register the new building + this.modInterface.registerNewBuilding({ + metaClass: MetaModFlipperBuilding, + buildingIconBase64: RESOURCES["flipper.png"], + }); + + // Add it to the regular toolbar + this.modInterface.addNewBuildingToToolbar({ + toolbar: "regular", + location: "primary", + metaClass: MetaModFlipperBuilding, + }); + } +} //////////////////////////////////////////////////////////////////////// diff --git a/mod_examples/base.js b/mod_examples/base.js index c60f4b87..94776d5e 100644 --- a/mod_examples/base.js +++ b/mod_examples/base.js @@ -1,25 +1,18 @@ /** * This is the minimal structure of a mod */ -registerMod(() => { - return class ModImpl extends shapez.Mod { - constructor(app, modLoader) { - super( - app, - { - website: "https://tobspr.io", - author: "tobspr", - name: "Mod Example: Base", - version: "1", - id: "base", - description: "The most basic mod", - }, - modLoader - ); - } - init() { - // Start the modding here - } - }; -}); +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Base", + version: "1", + id: "base", + description: "The most basic mod", +}; + +class Mod extends shapez.Mod { + init() { + // Start the modding here + } +} diff --git a/mod_examples/buildings_have_cost.js b/mod_examples/buildings_have_cost.js index 7fda49c6..96f47865 100644 --- a/mod_examples/buildings_have_cost.js +++ b/mod_examples/buildings_have_cost.js @@ -1,39 +1,32 @@ /** * This shows how to patch existing methods by making belts have a cost */ -registerMod(() => { - return class ModImpl extends shapez.Mod { - constructor(app, modLoader) { - super( - app, - { - website: "https://tobspr.io", - author: "tobspr", - name: "Mod Example: Patch Methods", - version: "1", - id: "patch-methods", - description: - "Shows how to patch existing methods to change the game by making the belts cost shapes", - }, - modLoader - ); - } - init() { - // Define our currency - const CURRENCY = "CyCyCyCy:--------:CuCuCuCu"; +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Patch Methods", + version: "1", + id: "patch-methods", + description: "Shows how to patch existing methods to change the game by making the belts cost shapes", +}; - // Make sure the currency is always pinned - this.modInterface.runAfterMethod(shapez.HUDPinnedShapes, "rerenderFull", function () { - this.internalPinShape({ - key: CURRENCY, - canUnpin: false, - className: "currency", - }); +class Mod extends shapez.Mod { + init() { + // Define our currency + const CURRENCY = "CyCyCyCy:--------:CuCuCuCu"; + + // Make sure the currency is always pinned + this.modInterface.runAfterMethod(shapez.HUDPinnedShapes, "rerenderFull", function () { + this.internalPinShape({ + key: CURRENCY, + canUnpin: false, + className: "currency", }); + }); - // Style it - this.modInterface.registerCss(` + // Style it + this.modInterface.registerCss(` #ingame_HUD_PinnedShapes .shape.currency::after { content: " "; position: absolute; @@ -57,41 +50,40 @@ registerMod(() => { } `); - // Make the player start with some currency - this.modInterface.runAfterMethod(shapez.GameCore, "initNewGame", function () { - this.root.hubGoals.storedShapes[CURRENCY] = 100; - }); + // Make the player start with some currency + this.modInterface.runAfterMethod(shapez.GameCore, "initNewGame", function () { + this.root.hubGoals.storedShapes[CURRENCY] = 100; + }); - // Make belts have a cost - this.modInterface.replaceMethod(shapez.MetaBeltBuilding, "getAdditionalStatistics", function ( - $original, - [root, variant] - ) { - const oldStats = $original(root, variant); - oldStats.push(["Cost", "1 x "]); - return oldStats; - }); + // Make belts have a cost + this.modInterface.replaceMethod(shapez.MetaBeltBuilding, "getAdditionalStatistics", function ( + $original, + [root, variant] + ) { + const oldStats = $original(root, variant); + oldStats.push(["Cost", "1 x "]); + return oldStats; + }); - // Only allow placing an entity when there is enough currency - this.modInterface.replaceMethod(shapez.GameLogic, "checkCanPlaceEntity", function ( - $original, - [entity, offset] - ) { - const storedCurrency = this.root.hubGoals.storedShapes[CURRENCY] || 0; - return storedCurrency > 0 && $original(entity, offset); - }); + // Only allow placing an entity when there is enough currency + this.modInterface.replaceMethod(shapez.GameLogic, "checkCanPlaceEntity", function ( + $original, + [entity, offset] + ) { + const storedCurrency = this.root.hubGoals.storedShapes[CURRENCY] || 0; + return storedCurrency > 0 && $original(entity, offset); + }); - // Take shapes when placing a building - this.modInterface.replaceMethod(shapez.GameLogic, "tryPlaceBuilding", function ($original, args) { - const result = $original(...args); - if (result && result.components.Belt) { - this.root.hubGoals.storedShapes[CURRENCY]--; - } - return result; - }); - } - }; -}); + // Take shapes when placing a building + this.modInterface.replaceMethod(shapez.GameLogic, "tryPlaceBuilding", function ($original, args) { + const result = $original(...args); + if (result && result.components.Belt) { + this.root.hubGoals.storedShapes[CURRENCY]--; + } + return result; + }); + } +} const RESOURCES = { "currency.png": diff --git a/mod_examples/combined.js b/mod_examples/combined.js index c7d6c6b6..b74d13a1 100644 --- a/mod_examples/combined.js +++ b/mod_examples/combined.js @@ -1,231 +1,189 @@ -registerMod(() => { - class DemoModComponent extends shapez.Component { - static getId() { - return "DemoMod"; - } - - static getSchema() { - return { - magicNumber: shapez.types.uint, - }; - } - - constructor(magicNumber) { - super(); - - this.magicNumber = magicNumber; - } +class DemoModComponent extends shapez.Component { + static getId() { + return "DemoMod"; } - class MetaDemoModBuilding extends shapez.MetaBuilding { - constructor() { - super("demoModBuilding"); - } - - getSilhouetteColor() { - return "red"; - } - - setupEntityComponents(entity) { - entity.addComponent(new DemoModComponent(Math.floor(Math.random() * 100.0))); - } + static getSchema() { + return { + magicNumber: shapez.types.uint, + }; } - class DemoModSystem extends shapez.GameSystemWithFilter { - constructor(root) { - super(root, [DemoModComponent]); - } + constructor(magicNumber) { + super(); - update() { - // nothing to do here - } + this.magicNumber = magicNumber; + } +} - drawChunk(parameters, chunk) { - const contents = chunk.containedEntitiesByLayer.regular; - for (let i = 0; i < contents.length; ++i) { - const entity = contents[i]; - const demoComp = entity.components.DemoMod; - if (!demoComp) { - continue; - } +class MetaDemoModBuilding extends shapez.MetaBuilding { + constructor() { + super("demoModBuilding"); + } - const staticComp = entity.components.StaticMapEntity; + getSilhouetteColor() { + return "red"; + } - const context = parameters.context; - const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace(); + setupEntityComponents(entity) { + entity.addComponent(new DemoModComponent(Math.floor(Math.random() * 100.0))); + } +} - // Culling for better performance - if (parameters.visibleRect.containsCircle(center.x, center.y, 40)) { - // Circle - context.fillStyle = "#53cf47"; - context.strokeStyle = "#000"; - context.lineWidth = 2; +class DemoModSystem extends shapez.GameSystemWithFilter { + constructor(root) { + super(root, [DemoModComponent]); + } - const timeFactor = 5.23 * this.root.time.now(); - context.beginCircle( - center.x + Math.cos(timeFactor) * 10, - center.y + Math.sin(timeFactor) * 10, - 7 - ); - context.fill(); - context.stroke(); + update() { + // nothing to do here + } - // Text - context.fillStyle = "#fff"; - context.textAlign = "center"; - context.font = "12px GameFont"; - context.fillText(demoComp.magicNumber, center.x, center.y + 4); - } + drawChunk(parameters, chunk) { + const contents = chunk.containedEntitiesByLayer.regular; + for (let i = 0; i < contents.length; ++i) { + const entity = contents[i]; + const demoComp = entity.components.DemoMod; + if (!demoComp) { + continue; + } + + const staticComp = entity.components.StaticMapEntity; + + const context = parameters.context; + const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace(); + + // Culling for better performance + if (parameters.visibleRect.containsCircle(center.x, center.y, 40)) { + // Circle + context.fillStyle = "#53cf47"; + context.strokeStyle = "#000"; + context.lineWidth = 2; + + const timeFactor = 5.23 * this.root.time.now(); + context.beginCircle( + center.x + Math.cos(timeFactor) * 10, + center.y + Math.sin(timeFactor) * 10, + 7 + ); + context.fill(); + context.stroke(); + + // Text + context.fillStyle = "#fff"; + context.textAlign = "center"; + context.font = "12px GameFont"; + context.fillText(demoComp.magicNumber, center.x, center.y + 4); } } } +} - return class ModImpl extends shapez.Mod { - constructor(app, modLoader) { - super( - app, +class Mod extends shapez.Mod { + constructor(app, modLoader) { + super( + app, + { + website: "https://tobspr.io", + author: "tobspr", + name: "Demo Mod", + version: "1", + id: "demo-mod", + description: "A simple mod to demonstrate the capatibilities of the mod loader.", + }, + modLoader + ); + } + + init() { + // Add some custom css + // this.modInterface.registerCss(` + // * { + // font-family: "Comic Sans", "Comic Sans MS", Tahoma !important; + // } + // `); + + // Add an atlas + this.modInterface.registerAtlas(RESOURCES["demoAtlas.png"], RESOURCES["demoAtlas.json"]); + + this.modInterface.registerTranslations("en", { + ingame: { + interactiveTutorial: { + title: "Hello", + hints: { + "1_1_extractor": "World!", + }, + }, + }, + }); + + // Register a new component + this.modInterface.registerComponent(DemoModComponent); + + // Register a new game system which can update and draw stuff + this.modInterface.registerGameSystem({ + id: "demo_mod", + systemClass: DemoModSystem, + before: "belt", + drawHooks: ["staticAfter"], + }); + + // Register the new building + this.modInterface.registerNewBuilding({ + metaClass: MetaDemoModBuilding, + buildingIconBase64: RESOURCES["demoBuilding.png"], + + variantsAndRotations: [ { - website: "https://tobspr.io", - author: "tobspr", - name: "Demo Mod", - version: "1", - id: "demo-mod", - description: "A simple mod to demonstrate the capatibilities of the mod loader.", + description: "A test building", + name: "A test name", + + regularImageBase64: RESOURCES["demoBuilding.png"], + blueprintImageBase64: RESOURCES["demoBuildingBlueprint.png"], + tutorialImageBase64: RESOURCES["demoBuildingBlueprint.png"], }, - modLoader - ); - } + ], + }); - init() { - // Add some custom css - // this.modInterface.registerCss(` - // * { - // font-family: "Comic Sans", "Comic Sans MS", Tahoma !important; - // } - // `); + // Add it to the regular toolbar + this.modInterface.addNewBuildingToToolbar({ + toolbar: "regular", + location: "primary", + metaClass: MetaDemoModBuilding, + }); - // Replace a builtin sprite - ["red", "green", "blue", "yellow", "purple", "cyan", "white"].forEach(color => { - this.modInterface.registerSprite( - "sprites/colors/" + color + ".png", - RESOURCES[color + ".png"] - ); - }); + // Register keybinding + this.modInterface.registerIngameKeybinding({ + id: "demo_mod_binding", + keyCode: shapez.keyToKeyCode("F"), + translation: "mymod: Do something (always with SHIFT)", + modifiers: { + shift: true, + }, + handler: root => { + this.dialogs.showInfo("Mod Message", "It worked!"); + return shapez.STOP_PROPAGATION; + }, + }); - // Add an atlas - this.modInterface.registerAtlas(RESOURCES["demoAtlas.png"], RESOURCES["demoAtlas.json"]); + // Add fancy sign to main menu + this.signals.stateEntered.add(state => { + if (state.key === "MainMenuState") { + const element = document.createElement("div"); + element.id = "demo_mod_hello_world_element"; + document.body.appendChild(element); - // Add a new type of sub shape ("Line", short code "L") - this.modInterface.registerSubShapeType({ - id: "line", - shortCode: "L", - weightComputation: distanceToOriginInChunks => - Math.round(20 + Math.max(Math.min(distanceToOriginInChunks, 30), 0)), + const button = document.createElement("button"); + button.classList.add("styledButton"); + button.innerText = "Hello!"; + button.addEventListener("click", () => { + this.dialogs.showInfo("Mod Message", "Button clicked!"); + }); + element.appendChild(button); + } + }); - draw: ({ context, quadrantSize, layerScale }) => { - const quadrantHalfSize = quadrantSize / 2; - context.beginPath(); - context.moveTo(-quadrantHalfSize, quadrantHalfSize); - context.arc( - -quadrantHalfSize, - quadrantHalfSize, - quadrantSize * layerScale, - -Math.PI * 0.25, - 0 - ); - context.closePath(); - }, - }); - - // Modify the theme colors - this.signals.preprocessTheme.add(({ theme }) => { - theme.map.background = "#eee"; - theme.items.outline = "#000"; - }); - - // Modify the goal of the first level - this.signals.modifyLevelDefinitions.add(definitions => { - definitions[0].shape = "LuCuLuCu"; - }); - - this.modInterface.registerTranslations("en", { - ingame: { - interactiveTutorial: { - title: "Hello", - hints: { - "1_1_extractor": "World!", - }, - }, - }, - }); - - // Register a new component - this.modInterface.registerComponent(DemoModComponent); - - // Register a new game system which can update and draw stuff - this.modInterface.registerGameSystem({ - id: "demo_mod", - systemClass: DemoModSystem, - before: "belt", - drawHooks: ["staticAfter"], - }); - - // Register the new building - this.modInterface.registerNewBuilding({ - metaClass: MetaDemoModBuilding, - buildingIconBase64: RESOURCES["demoBuilding.png"], - - variantsAndRotations: [ - { - description: "A test building", - name: "A test name", - - regularImageBase64: RESOURCES["demoBuilding.png"], - blueprintImageBase64: RESOURCES["demoBuildingBlueprint.png"], - tutorialImageBase64: RESOURCES["demoBuildingBlueprint.png"], - }, - ], - }); - - // Add it to the regular toolbar - this.modInterface.addNewBuildingToToolbar({ - toolbar: "regular", - location: "primary", - metaClass: MetaDemoModBuilding, - }); - - // Register keybinding - this.modInterface.registerIngameKeybinding({ - id: "demo_mod_binding", - keyCode: shapez.keyToKeyCode("F"), - translation: "mymod: Do something (always with SHIFT)", - modifiers: { - shift: true, - }, - handler: root => { - this.dialogs.showInfo("Mod Message", "It worked!"); - return shapez.STOP_PROPAGATION; - }, - }); - - // Add fancy sign to main menu - this.signals.stateEntered.add(state => { - if (state.key === "MainMenuState") { - const element = document.createElement("div"); - element.id = "demo_mod_hello_world_element"; - document.body.appendChild(element); - - const button = document.createElement("button"); - button.classList.add("styledButton"); - button.innerText = "Hello!"; - button.addEventListener("click", () => { - this.dialogs.showInfo("Mod Message", "Button clicked!"); - }); - element.appendChild(button); - } - }); - - this.modInterface.registerCss(` + this.modInterface.registerCss(` #demo_mod_hello_world_element { position: absolute; top: calc(10px * var(--ui-scale)); @@ -235,9 +193,8 @@ registerMod(() => { } `); - } - }; -}); + } +} //////////////////////////////////////////////////////////////////////// // @notice: Later this part will be autogenerated diff --git a/mod_examples/custom_css.js b/mod_examples/custom_css.js index a5dfcc08..5aa1219b 100644 --- a/mod_examples/custom_css.js +++ b/mod_examples/custom_css.js @@ -1,28 +1,21 @@ /** * This example shows how to add custom css */ -registerMod(() => { - return class ModImpl extends shapez.Mod { - constructor(app, modLoader) { - super( - app, - { - website: "https://tobspr.io", - author: "tobspr", - name: "Mod Example: Add custom CSS", - version: "1", - id: "custom-css", - description: "Shows how to add custom css", - }, - modLoader - ); - } +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Add custom CSS", + version: "1", + id: "custom-css", + description: "Shows how to add custom css", +}; - init() { - // Notice that, since the UI is scaled dynamically, every pixel value - // should be wrapped in '$scaled()' (see below) +class Mod extends shapez.Mod { + init() { + // Notice that, since the UI is scaled dynamically, every pixel value + // should be wrapped in '$scaled()' (see below) - this.modInterface.registerCss(` + this.modInterface.registerCss(` * { font-family: "Comic Sans", "Comic Sans MS", "ComicSans", Tahoma !important; } @@ -39,9 +32,8 @@ registerMod(() => { border: $scaled(5px) solid #000 !important; } `); - } - }; -}); + } +} const RESOURCES = { "cat.png": diff --git a/mod_examples/custom_sub_shapes.js b/mod_examples/custom_sub_shapes.js index 0ed47aec..e56a528e 100644 --- a/mod_examples/custom_sub_shapes.js +++ b/mod_examples/custom_sub_shapes.js @@ -1,53 +1,46 @@ /** * This shows how to add custom sub shapes */ -registerMod(() => { - return class ModImpl extends shapez.Mod { - constructor(app, modLoader) { - super( - app, - { - website: "https://tobspr.io", - author: "tobspr", - name: "Mod Example: Custom Sub Shapes", - version: "1", - id: "custom-sub-shapes", - description: "Shows how to add custom sub shapes", - }, - modLoader - ); - } - init() { - // Add a new type of sub shape ("Line", short code "L") - this.modInterface.registerSubShapeType({ - id: "line", - shortCode: "L", +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Custom Sub Shapes", + version: "1", + id: "custom-sub-shapes", + description: "Shows how to add custom sub shapes", +}; - // Make it spawn on the map - weightComputation: distanceToOriginInChunks => - Math.round(20 + Math.max(Math.min(distanceToOriginInChunks, 30), 0)), +class Mod extends shapez.Mod { + init() { + // Add a new type of sub shape ("Line", short code "L") + this.modInterface.registerSubShapeType({ + id: "line", + shortCode: "L", - // This defines how to draw it - draw: ({ context, quadrantSize, layerScale }) => { - const quadrantHalfSize = quadrantSize / 2; - context.beginPath(); - context.moveTo(-quadrantHalfSize, quadrantHalfSize); - context.arc( - -quadrantHalfSize, - quadrantHalfSize, - quadrantSize * layerScale, - -Math.PI * 0.25, - 0 - ); - context.closePath(); - }, - }); + // Make it spawn on the map + weightComputation: distanceToOriginInChunks => + Math.round(20 + Math.max(Math.min(distanceToOriginInChunks, 30), 0)), - // Modify the goal of the first level to add our goal - this.signals.modifyLevelDefinitions.add(definitions => { - definitions[0].shape = "LuLuLuLu"; - }); - } - }; -}); + // This defines how to draw it + draw: ({ context, quadrantSize, layerScale }) => { + const quadrantHalfSize = quadrantSize / 2; + context.beginPath(); + context.moveTo(-quadrantHalfSize, quadrantHalfSize); + context.arc( + -quadrantHalfSize, + quadrantHalfSize, + quadrantSize * layerScale, + -Math.PI * 0.25, + 0 + ); + context.closePath(); + }, + }); + + // Modify the goal of the first level to add our goal + this.signals.modifyLevelDefinitions.add(definitions => { + definitions[0].shape = "LuLuLuLu"; + }); + } +} diff --git a/mod_examples/custom_theme.js b/mod_examples/custom_theme.js index 328630a5..46557721 100644 --- a/mod_examples/custom_theme.js +++ b/mod_examples/custom_theme.js @@ -1,32 +1,24 @@ /** * This example shows how to add a new theme to the game */ -registerMod(() => { - return class ModImpl extends shapez.Mod { - constructor(app, modLoader) { - super( - app, - { - website: "https://tobspr.io", - author: "tobspr", - name: "Mod Example: Custom Game Theme", - version: "1", - id: "custom-theme", - description: "Shows how to add a custom game theme", - }, - modLoader - ); - } +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Custom Game Theme", + version: "1", + id: "custom-theme", + description: "Shows how to add a custom game theme", +}; - init() { - this.modInterface.registerGameTheme({ - id: "my-theme", - name: "My fancy theme", - theme: RESOURCES["my-theme.json"], - }); - } - }; -}); +class Mod extends shapez.Mod { + init() { + this.modInterface.registerGameTheme({ + id: "my-theme", + name: "My fancy theme", + theme: RESOURCES["my-theme.json"], + }); + } +} const RESOURCES = { "my-theme.json": { diff --git a/mod_examples/modify_existing_building.js b/mod_examples/modify_existing_building.js index cf8452ae..97ce461a 100644 --- a/mod_examples/modify_existing_building.js +++ b/mod_examples/modify_existing_building.js @@ -1,36 +1,29 @@ /** * This shows how to modify an existing building */ -registerMod(() => { - return class ModImpl extends shapez.Mod { - constructor(app, modLoader) { - super( - app, - { - website: "https://tobspr.io", - author: "tobspr", - name: "Mod Example: Modify existing building", - version: "1", - id: "modify-existing-building", - description: "Shows how to modify an existing building", - }, - modLoader - ); - } - init() { - // Make Rotator always unlocked - this.modInterface.replaceMethod(shapez.MetaRotaterBuilding, "getIsUnlocked", function () { - return true; - }); +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Modify existing building", + version: "1", + id: "modify-existing-building", + description: "Shows how to modify an existing building", +}; - // Add some custom stats to the info panel when selecting the building - this.modInterface.replaceMethod(shapez.MetaRotaterBuilding, "getAdditionalStatistics", function ( - root, - variant - ) { - return [["Awesomeness", 5]]; - }); - } - }; -}); +class Mod extends shapez.Mod { + init() { + // Make Rotator always unlocked + this.modInterface.replaceMethod(shapez.MetaRotaterBuilding, "getIsUnlocked", function () { + return true; + }); + + // Add some custom stats to the info panel when selecting the building + this.modInterface.replaceMethod(shapez.MetaRotaterBuilding, "getAdditionalStatistics", function ( + root, + variant + ) { + return [["Awesomeness", 5]]; + }); + } +} diff --git a/mod_examples/modify_theme.js b/mod_examples/modify_theme.js index 6f7f53ff..8a931fd7 100644 --- a/mod_examples/modify_theme.js +++ b/mod_examples/modify_theme.js @@ -2,29 +2,21 @@ * This example shows how to modify the builtin themes. If you want to create your own theme, * be sure to check out the "custom_theme" example */ -registerMod(() => { - return class ModImpl extends shapez.Mod { - constructor(app, modLoader) { - super( - app, - { - website: "https://tobspr.io", - author: "tobspr", - name: "Mod Example: Modify Builtin Themes", - version: "1", - id: "modify-theme", - description: "Shows how to modify builtin themes", - }, - modLoader - ); - } +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Modify Builtin Themes", + version: "1", + id: "modify-theme", + description: "Shows how to modify builtin themes", +}; - init() { - shapez.THEMES.light.map.background = "#eee"; - shapez.THEMES.light.items.outline = "#000"; +class Mod extends shapez.Mod { + init() { + shapez.THEMES.light.map.background = "#eee"; + shapez.THEMES.light.items.outline = "#000"; - shapez.THEMES.dark.map.background = "#245"; - shapez.THEMES.dark.items.outline = "#fff"; - } - }; -}); + shapez.THEMES.dark.map.background = "#245"; + shapez.THEMES.dark.items.outline = "#fff"; + } +} diff --git a/mod_examples/replace_builtin_sprites.js b/mod_examples/replace_builtin_sprites.js index a6c5d53d..bed831de 100644 --- a/mod_examples/replace_builtin_sprites.js +++ b/mod_examples/replace_builtin_sprites.js @@ -2,34 +2,24 @@ * This example shows how to replace builtin sprites, in this case * the color sprites */ -registerMod(() => { - return class ModImpl extends shapez.Mod { - constructor(app, modLoader) { - super( - app, - { - website: "https://tobspr.io", - author: "tobspr", - name: "Mod Example: Replace builtin sprites", - version: "1", - id: "replace-builtin-sprites", - description: "Shows how to replace builtin sprites", - }, - modLoader - ); - } - init() { - // Replace a builtin sprite - ["red", "green", "blue", "yellow", "purple", "cyan", "white"].forEach(color => { - this.modInterface.registerSprite( - "sprites/colors/" + color + ".png", - RESOURCES[color + ".png"] - ); - }); - } - }; -}); +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Replace builtin sprites", + version: "1", + id: "replace-builtin-sprites", + description: "Shows how to replace builtin sprites", +}; + +class Mod extends shapez.Mod { + init() { + // Replace a builtin sprite + ["red", "green", "blue", "yellow", "purple", "cyan", "white"].forEach(color => { + this.modInterface.registerSprite("sprites/colors/" + color + ".png", RESOURCES[color + ".png"]); + }); + } +} //////////////////////////////////////////////////////////////////////// diff --git a/mod_examples/translations.js b/mod_examples/translations.js index 7763ee16..b2471ba3 100644 --- a/mod_examples/translations.js +++ b/mod_examples/translations.js @@ -1,71 +1,64 @@ /** * Shows to add new translations */ -registerMod(() => { - return class ModImpl extends shapez.Mod { - constructor(app, modLoader) { - super( - app, - { - website: "https://tobspr.io", - author: "tobspr", - name: "Mod Example: Translations", - version: "1", - id: "translations", - description: "Shows how to add and modify translations", - }, - modLoader - ); - } - init() { - // Replace an existing translation in the english language - this.modInterface.registerTranslations("en", { - ingame: { - interactiveTutorial: { - title: "Hello", - hints: { - "1_1_extractor": "World!", - }, +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Translations", + version: "1", + id: "translations", + description: "Shows how to add and modify translations", +}; + +class Mod extends shapez.Mod { + init() { + // Replace an existing translation in the english language + this.modInterface.registerTranslations("en", { + ingame: { + interactiveTutorial: { + title: "Hello", + hints: { + "1_1_extractor": "World!", }, }, - }); + }, + }); - // Replace an existing translation in german - this.modInterface.registerTranslations("de", { - ingame: { - interactiveTutorial: { - title: "Hallo", - hints: { - "1_1_extractor": "Welt!", - }, + // Replace an existing translation in german + this.modInterface.registerTranslations("de", { + ingame: { + interactiveTutorial: { + title: "Hallo", + hints: { + "1_1_extractor": "Welt!", }, }, - }); + }, + }); - // Add an entirely new translation which is localized in german and english - this.modInterface.registerTranslations("en", { - mods: { - mymod: { - test: "Test Translation", - }, + // Add an entirely new translation which is localized in german and english + this.modInterface.registerTranslations("en", { + mods: { + mymod: { + test: "Test Translation", }, - }); - this.modInterface.registerTranslations("de", { - mods: { - mymod: { - test: "Test Übersetzung", - }, + }, + }); + this.modInterface.registerTranslations("de", { + mods: { + mymod: { + test: "Test Übersetzung", }, - }); + }, + }); - // Show a dialog in the main menu - this.signals.stateEntered.add(state => { - if (state instanceof shapez.MainMenuState) { - // Will show differently based on the selected language - this.dialogs.showInfo("My translation", shapez.T.mods.mymod.test); - } - }); - } - }; -}); + // Show a dialog in the main menu + this.signals.stateEntered.add(state => { + if (state instanceof shapez.MainMenuState) { + // Will show differently based on the selected language + this.dialogs.showInfo("My translation", shapez.T.mods.mymod.test); + } + }); + } +} diff --git a/src/js/globals.d.ts b/src/js/globals.d.ts index 042b549d..f18d1d61 100644 --- a/src/js/globals.d.ts +++ b/src/js/globals.d.ts @@ -26,8 +26,6 @@ declare const shapez: any; declare const ipcRenderer: any; -declare const registerMod: any; - // Polyfills declare interface String { replaceAll(search: string, replacement: string): string; @@ -98,7 +96,7 @@ declare interface Window { cpmstarAPI: any; // Mods - registerMod: any; + $shapez_registerMod: any; anyModLoaded: any; shapez: any; diff --git a/src/js/mods/mod.js b/src/js/mods/mod.js index 0bfe3693..b130370d 100644 --- a/src/js/mods/mod.js +++ b/src/js/mods/mod.js @@ -7,28 +7,22 @@ import { MOD_SIGNALS } from "./mod_signals"; export class Mod { /** - * * @param {Application} app - * @param {object} metadata - * @param {string} metadata.name - * @param {string} metadata.version - * @param {string} metadata.author - * @param {string} metadata.website - * @param {string} metadata.description - * @param {string} metadata.id - * * @param {ModLoader} modLoader + * @param {import("./modloader").ModMetadata} meta */ - constructor(app, metadata, modLoader) { + constructor(app, modLoader, meta) { this.app = app; - this.metadata = metadata; this.modLoader = modLoader; + this.metadata = meta; this.signals = MOD_SIGNALS; this.modInterface = modLoader.modInterface; } - init() {} + init() { + // to be overridden + } get dialogs() { return this.modInterface.dialogs; diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 301b5ec7..9f45e401 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -9,6 +9,17 @@ import { MOD_SIGNALS } from "./mod_signals"; const LOG = createLogger("mods"); +/** + * @typedef {{ + * name: string; + * version: string; + * author: string; + * website: string; + * description: string; + * id: string; + * }} ModMetadata + */ + export class ModLoader { constructor() { LOG.log("modloader created"); @@ -23,7 +34,7 @@ export class ModLoader { this.modInterface = new ModInterface(this); - /** @type {((Object) => (new (Application, ModLoader) => Mod))[]} */ + /** @type {({ meta: ModMetadata, modClass: typeof Mod})[]} */ this.modLoadQueue = []; this.initialized = false; @@ -73,8 +84,11 @@ export class ModLoader { this.exposeExports(); - window.registerMod = mod => { - this.modLoadQueue.push(mod); + window.$shapez_registerMod = (modClass, meta) => { + this.modLoadQueue.push({ + modClass, + meta, + }); }; if (G_IS_STANDALONE || G_IS_DEV) { @@ -103,6 +117,7 @@ export class ModLoader { mods.forEach(modCode => { try { + modCode += "\n;window.$shapez_registerMod(Mod, METADATA);"; const func = new Function(modCode); func(); } catch (ex) { @@ -116,9 +131,9 @@ export class ModLoader { } this.initialized = true; - this.modLoadQueue.forEach(modClass => { + this.modLoadQueue.forEach(({ modClass, meta }) => { try { - const mod = new (modClass())(this.app, this); + const mod = new modClass(this.app, this, meta); mod.init(); this.mods.push(mod); } catch (ex) { @@ -128,7 +143,7 @@ export class ModLoader { }); this.modLoadQueue = []; - delete window.registerMod; + delete window.$shapez_registerMod; } } From 88f98072749b6cf1e578f1f0de96082ed6553d56 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 17:17:02 +0100 Subject: [PATCH 048/129] Add example how to add custom drawings --- mod_examples/custom_drawing.js | 62 ++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 mod_examples/custom_drawing.js diff --git a/mod_examples/custom_drawing.js b/mod_examples/custom_drawing.js new file mode 100644 index 00000000..23099d6f --- /dev/null +++ b/mod_examples/custom_drawing.js @@ -0,0 +1,62 @@ +/** + * Shows how to draw overlays by visualizing which item processors are working + */ + +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: custom drawing", + version: "1", + id: "base", + description: "Displays an indicator on every item processing building when its working", +}; + +class ItemProcessorStatusGameSystem extends shapez.GameSystem { + drawChunk(parameters, chunk) { + const contents = chunk.containedEntitiesByLayer.regular; + for (let i = 0; i < contents.length; ++i) { + const entity = contents[i]; + const processorComp = entity.components.ItemProcessor; + if (!processorComp) { + continue; + } + + const staticComp = entity.components.StaticMapEntity; + + const context = parameters.context; + const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace(); + + // Culling for better performance + if (parameters.visibleRect.containsCircle(center.x, center.y, 40)) { + // Circle + context.fillStyle = processorComp.ongoingCharges.length === 0 ? "#aaa" : "#53cf47"; + context.strokeStyle = "#000"; + context.lineWidth = 1; + + const timeFactor = 15.23 * this.root.time.now(); + context.beginCircle(center.x + 5, center.y + 5, 4); + context.fill(); + context.stroke(); + } + } + } +} + +class Mod extends shapez.Mod { + init() { + // Register our game system + this.modInterface.registerGameSystem({ + id: "item_processor_status", + systemClass: ItemProcessorStatusGameSystem, + + // Specify at which point the update method will be called, + // in this case directly before the belt system. You can use + // before: "end" to make it the last system + before: "belt", + + // Specify where our drawChunk method should be called, check out + // map_chunk_view + drawHooks: ["staticAfter"], + }); + } +} From 8ad1c1bf9d35fb05fbf0bc652680815137caa828 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 17:18:24 +0100 Subject: [PATCH 049/129] Remove unused code --- mod_examples/custom_drawing.js | 1 - 1 file changed, 1 deletion(-) diff --git a/mod_examples/custom_drawing.js b/mod_examples/custom_drawing.js index 23099d6f..23158911 100644 --- a/mod_examples/custom_drawing.js +++ b/mod_examples/custom_drawing.js @@ -33,7 +33,6 @@ class ItemProcessorStatusGameSystem extends shapez.GameSystem { context.strokeStyle = "#000"; context.lineWidth = 1; - const timeFactor = 15.23 * this.root.time.now(); context.beginCircle(center.x + 5, center.y + 5, 4); context.fill(); context.stroke(); From 97174635000772960cc9848fda5f950ff326890d Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 17:35:21 +0100 Subject: [PATCH 050/129] Minor modloader adjustments --- src/js/mods/modloader.js | 41 +++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 9f45e401..1ef26f7a 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -84,13 +84,6 @@ export class ModLoader { this.exposeExports(); - window.$shapez_registerMod = (modClass, meta) => { - this.modLoadQueue.push({ - modClass, - meta, - }); - }; - if (G_IS_STANDALONE || G_IS_DEV) { try { let mods = []; @@ -115,18 +108,42 @@ export class ModLoader { mods.push(await response.text()); } + window.$shapez_registerMod = (modClass, meta) => { + if (this.modLoadQueue.some(entry => entry.meta.id === meta.id)) { + console.warn( + "Not registering mod", + meta, + "since a mod with the same id is already loaded" + ); + return; + } + this.modLoadQueue.push({ + modClass, + meta, + }); + }; + mods.forEach(modCode => { + modCode += ` + if (typeof Mod !== 'undefined') { + if (typeof METADATA !== 'object') { + throw new Error("No METADATA variable found"); + } + window.$shapez_registerMod(Mod, METADATA); + } + `; try { - modCode += "\n;window.$shapez_registerMod(Mod, METADATA);"; const func = new Function(modCode); func(); } catch (ex) { console.error(ex); - alert("Failed to parse mod (launch with --dev for more info): " + ex); + alert("Failed to parse mod (launch with --dev for more info): \n\n" + ex); } }); + + delete window.$shapez_registerMod; } catch (ex) { - alert("Failed to load mods (launch with --dev for more info): " + ex); + alert("Failed to load mods (launch with --dev for more info): \n\n" + ex); } } @@ -138,12 +155,10 @@ export class ModLoader { this.mods.push(mod); } catch (ex) { console.error(ex); - alert("Failed to initialize mods (launch with --dev for more info): " + ex); + alert("Failed to initialize mods (launch with --dev for more info): \n\n" + ex); } }); this.modLoadQueue = []; - - delete window.$shapez_registerMod; } } From c553ee16328e3f5d28be6ecbe8173b99a89ec982 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 18:02:40 +0100 Subject: [PATCH 051/129] Support for rotation variants in mods (was broken previously) --- src/js/mods/mod_interface.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 784e3d9d..e1043cb1 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -208,19 +208,21 @@ export class ModInterface { T.buildings[id] = {}; metaClass.getAllVariantCombinations().forEach(combination => { - const actualVariant = combination.variant || defaultBuildingVariant; - registerBuildingVariant(id, metaClass, actualVariant, combination.rotationVariant || 0); + const variant = combination.variant || defaultBuildingVariant; + const rotationVariant = combination.rotationVariant || 0; + + const buildingIdentifier = id + (variant === defaultBuildingVariant ? "" : "-" + variant); + + const uniqueTypeId = buildingIdentifier + (rotationVariant === 0 ? "" : "-" + rotationVariant); + registerBuildingVariant(uniqueTypeId, metaClass, variant, rotationVariant); gBuildingVariants[id].metaInstance = metaInstance; - T.buildings[id][actualVariant] = { + T.buildings[id][variant] = { name: combination.name || "Name", description: combination.description || "Description", }; - const buildingIdentifier = - id + (actualVariant === defaultBuildingVariant ? "" : "-" + actualVariant); - if (combination.regularImageBase64) { this.registerSprite( "sprites/buildings/" + buildingIdentifier + ".png", @@ -235,7 +237,7 @@ export class ModInterface { ); } if (combination.tutorialImageBase64) { - this.setBuildingTutorialImage(id, actualVariant, combination.tutorialImageBase64); + this.setBuildingTutorialImage(id, variant, combination.tutorialImageBase64); } }); From 7e0689694cbad21c0f888ae65b055643e58a3515 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 18:19:46 +0100 Subject: [PATCH 052/129] Allow mods to replace builtin sub shapes --- src/js/game/shape_definition.js | 120 +++++++++++++++++--------------- 1 file changed, 62 insertions(+), 58 deletions(-) diff --git a/src/js/game/shape_definition.js b/src/js/game/shape_definition.js index 453c26f1..12d9c741 100644 --- a/src/js/game/shape_definition.js +++ b/src/js/game/shape_definition.js @@ -384,75 +384,79 @@ export class ShapeDefinition extends BasicSerializableObject { context.strokeStyle = THEME.items.outline; context.lineWidth = THEME.items.outlineWidth; - switch (subShape) { - case enumSubShape.rect: { - context.beginPath(); - const dims = quadrantSize * layerScale; - context.rect(-quadrantHalfSize, quadrantHalfSize - dims, dims, dims); + if (MODS_ADDITIONAL_SUB_SHAPE_DRAWERS[subShape]) { + MODS_ADDITIONAL_SUB_SHAPE_DRAWERS[subShape]({ + context, + layerScale, + quadrantSize, + }); + } else { + switch (subShape) { + case enumSubShape.rect: { + context.beginPath(); + const dims = quadrantSize * layerScale; + context.rect(-quadrantHalfSize, quadrantHalfSize - dims, dims, dims); + context.fill(); + context.stroke(); + break; + } + case enumSubShape.star: { + context.beginPath(); + const dims = quadrantSize * layerScale; - break; - } - case enumSubShape.star: { - context.beginPath(); - const dims = quadrantSize * layerScale; + let originX = -quadrantHalfSize; + let originY = quadrantHalfSize - dims; - let originX = -quadrantHalfSize; - let originY = quadrantHalfSize - dims; + const moveInwards = dims * 0.4; + context.moveTo(originX, originY + moveInwards); + context.lineTo(originX + dims, originY); + context.lineTo(originX + dims - moveInwards, originY + dims); + context.lineTo(originX, originY + dims); + context.closePath(); + context.fill(); + context.stroke(); + break; + } - const moveInwards = dims * 0.4; - context.moveTo(originX, originY + moveInwards); - context.lineTo(originX + dims, originY); - context.lineTo(originX + dims - moveInwards, originY + dims); - context.lineTo(originX, originY + dims); - context.closePath(); - break; - } + case enumSubShape.windmill: { + context.beginPath(); + const dims = quadrantSize * layerScale; - case enumSubShape.windmill: { - context.beginPath(); - const dims = quadrantSize * layerScale; + let originX = -quadrantHalfSize; + let originY = quadrantHalfSize - dims; + const moveInwards = dims * 0.4; + context.moveTo(originX, originY + moveInwards); + context.lineTo(originX + dims, originY); + context.lineTo(originX + dims, originY + dims); + context.lineTo(originX, originY + dims); + context.closePath(); + context.fill(); + context.stroke(); + break; + } - let originX = -quadrantHalfSize; - let originY = quadrantHalfSize - dims; - const moveInwards = dims * 0.4; - context.moveTo(originX, originY + moveInwards); - context.lineTo(originX + dims, originY); - context.lineTo(originX + dims, originY + dims); - context.lineTo(originX, originY + dims); - context.closePath(); - break; - } + case enumSubShape.circle: { + context.beginPath(); + context.moveTo(-quadrantHalfSize, quadrantHalfSize); + context.arc( + -quadrantHalfSize, + quadrantHalfSize, + quadrantSize * layerScale, + -Math.PI * 0.5, + 0 + ); + context.closePath(); + context.fill(); + context.stroke(); + break; + } - case enumSubShape.circle: { - context.beginPath(); - context.moveTo(-quadrantHalfSize, quadrantHalfSize); - context.arc( - -quadrantHalfSize, - quadrantHalfSize, - quadrantSize * layerScale, - -Math.PI * 0.5, - 0 - ); - context.closePath(); - break; - } - - default: { - if (MODS_ADDITIONAL_SUB_SHAPE_DRAWERS[subShape]) { - MODS_ADDITIONAL_SUB_SHAPE_DRAWERS[subShape]({ - context, - layerScale, - quadrantSize, - }); - } else { + default: { throw new Error("Unkown sub shape: " + subShape); } } } - context.fill(); - context.stroke(); - context.rotate(-rotation); context.translate(-centerQuadrantX, -centerQuadrantY); } From e942ba486e3c633fb3b7c9b1fa8a93f895d04883 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 20:30:51 +0100 Subject: [PATCH 053/129] Add helper methods to extend classes --- mod_examples/class_extensions.js | 32 ++++++++++++++++++++++++++++++++ src/js/mods/mod_interface.js | 15 +++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 mod_examples/class_extensions.js diff --git a/mod_examples/class_extensions.js b/mod_examples/class_extensions.js new file mode 100644 index 00000000..55431c32 --- /dev/null +++ b/mod_examples/class_extensions.js @@ -0,0 +1,32 @@ +/** + * Shows how to extend builtin classes + */ + +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Class Extensions", + version: "1", + id: "class-extensions", + description: "Shows how to extend builtin classes", +}; + +class Mod extends shapez.Mod { + init() { + this.modInterface.extendClass(shapez.MetaBeltBuilding, { + // this replaces a regular method + getShowWiresLayerPreview() { + return true; + }, + + // Instead of super, use this.$super() + getIsReplaceable() { + return this.$super.getIsReplaceable.call(this); + }, + + getIsRemoveable() { + return false; + }, + }); + } +} diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index e1043cb1..c83f8b11 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -388,4 +388,19 @@ export class ModInterface { return returnValue; }; } + + extendClass(classHandle, extensionClass) { + const extendPrototype = function (base, extension) { + const properties = Array.from(Object.getOwnPropertyNames(extension)); + base.$super = base.$super || {}; + properties.forEach(propertyName => { + if (["constructor", "name", "length", "prototype"].includes(propertyName)) { + return; + } + base.$super[propertyName] = base.$super[propertyName] || base[propertyName]; + base[propertyName] = extension[propertyName]; + }); + }; + extendPrototype(classHandle.prototype, extensionClass); + } } From d6c31a03a919eae4ff019921704bc74c86b70ba7 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 20:36:39 +0100 Subject: [PATCH 054/129] Fix menu bar on mac os --- electron/index.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/electron/index.js b/electron/index.js index 3c567893..3961be89 100644 --- a/electron/index.js +++ b/electron/index.js @@ -52,7 +52,7 @@ function createWindow() { transparent: false, icon: path.join(__dirname, "favicon" + faviconExtension), // fullscreen: true, - autoHideMenuBar: true, + autoHideMenuBar: !isDev, webPreferences: { nodeIntegration: false, nodeIntegrationInWorker: false, @@ -164,7 +164,7 @@ function createWindow() { menu.append(mainItem); const reloadItem = new MenuItem({ - label: "Restart", + label: "Reload", click: () => win.reload(), accelerator: "F5", }); @@ -177,7 +177,15 @@ function createWindow() { }); menu.append(fullscreenItem); - Menu.setApplicationMenu(menu); + const mainMenu = new Menu(); + mainMenu.append( + new MenuItem({ + label: "shapez.io", + submenu: menu, + }) + ); + + Menu.setApplicationMenu(mainMenu); } else { Menu.setApplicationMenu(null); } From 459cc76d960e58912d4cd17e3ac555ee4c1874df Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 16 Jan 2022 20:40:42 +0100 Subject: [PATCH 055/129] Remember window state --- electron/index.js | 16 +++++++++++++--- electron/package.json | 3 ++- electron/yarn.lock | 10 +++++++++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/electron/index.js b/electron/index.js index 3961be89..5f63789b 100644 --- a/electron/index.js +++ b/electron/index.js @@ -6,6 +6,7 @@ const url = require("url"); const fs = require("fs"); const steam = require("./steam"); const asyncLock = require("async-lock"); +const windowStateKeeper = require("electron-window-state"); const isDev = app.commandLine.hasSwitch("dev"); const isLocal = app.commandLine.hasSwitch("local"); @@ -40,12 +41,19 @@ function createWindow() { faviconExtension = ".ico"; } + const mainWindowState = windowStateKeeper({ + defaultWidth: 1000, + defaultHeight: 800, + }); + win = new BrowserWindow({ - width: 1280, - height: 800, + x: mainWindowState.x, + y: mainWindowState.y, + width: mainWindowState.width, + height: mainWindowState.height, show: false, backgroundColor: "#222428", - useContentSize: true, + useContentSize: false, minWidth: 800, minHeight: 600, title: "shapez.io Standalone", @@ -69,6 +77,8 @@ function createWindow() { allowRunningInsecureContent: false, }); + mainWindowState.manage(win); + if (isLocal) { win.loadURL("http://localhost:3005"); } else { diff --git a/electron/package.json b/electron/package.json index f866811e..a0b97f6f 100644 --- a/electron/package.json +++ b/electron/package.json @@ -15,6 +15,7 @@ }, "dependencies": { "async-lock": "^1.2.8", - "electron": "16.0.7" + "electron": "16.0.7", + "electron-window-state": "^5.0.3" } } diff --git a/electron/yarn.lock b/electron/yarn.lock index 39142b68..22eb0a46 100644 --- a/electron/yarn.lock +++ b/electron/yarn.lock @@ -141,6 +141,14 @@ duplexer3@^0.1.4: resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= +electron-window-state@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-5.0.3.tgz#4f36d09e3f953d87aff103bf010f460056050aa8" + integrity sha512-1mNTwCfkolXl3kMf50yW3vE2lZj0y92P/HYWFBrb+v2S/pCka5mdwN3cagKm458A7NjndSwijynXgcLWRodsVg== + dependencies: + jsonfile "^4.0.0" + mkdirp "^0.5.1" + electron@16.0.7: version "16.0.7" resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.7.tgz#87eaccd05ab61563d3c17dfbad2949bba7ead162" @@ -351,7 +359,7 @@ minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp@^0.5.4: +mkdirp@^0.5.1, mkdirp@^0.5.4: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== From 8943dc045cb16a6cfa54637759a87c9ab23f543e Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 17 Jan 2022 09:34:34 +0100 Subject: [PATCH 056/129] Add support for paste signals --- electron/index.js | 4 +++ mod_examples/combined.js | 49 +++++++++++++------------------- mod_examples/pasting.js | 25 ++++++++++++++++ src/js/core/input_distributor.js | 9 ++++++ src/js/core/input_receiver.js | 3 ++ 5 files changed, 60 insertions(+), 30 deletions(-) create mode 100644 mod_examples/pasting.js diff --git a/electron/index.js b/electron/index.js index 5f63789b..bc7cf393 100644 --- a/electron/index.js +++ b/electron/index.js @@ -8,6 +8,10 @@ const steam = require("./steam"); const asyncLock = require("async-lock"); const windowStateKeeper = require("electron-window-state"); +// Disable hardware key handling, i.e. being able to pause/resume the game music +// with hardware keys +app.commandLine.appendSwitch("disable-features", "HardwareMediaKeyHandling"); + const isDev = app.commandLine.hasSwitch("dev"); const isLocal = app.commandLine.hasSwitch("local"); const safeMode = app.commandLine.hasSwitch("safe-mode"); diff --git a/mod_examples/combined.js b/mod_examples/combined.js index b74d13a1..57d2f218 100644 --- a/mod_examples/combined.js +++ b/mod_examples/combined.js @@ -106,17 +106,6 @@ class Mod extends shapez.Mod { // Add an atlas this.modInterface.registerAtlas(RESOURCES["demoAtlas.png"], RESOURCES["demoAtlas.json"]); - this.modInterface.registerTranslations("en", { - ingame: { - interactiveTutorial: { - title: "Hello", - hints: { - "1_1_extractor": "World!", - }, - }, - }, - }); - // Register a new component this.modInterface.registerComponent(DemoModComponent); @@ -128,29 +117,29 @@ class Mod extends shapez.Mod { drawHooks: ["staticAfter"], }); - // Register the new building - this.modInterface.registerNewBuilding({ - metaClass: MetaDemoModBuilding, - buildingIconBase64: RESOURCES["demoBuilding.png"], + // // Register the new building + // this.modInterface.registerNewBuilding({ + // metaClass: MetaDemoModBuilding, + // buildingIconBase64: RESOURCES["demoBuilding.png"], - variantsAndRotations: [ - { - description: "A test building", - name: "A test name", + // variantsAndRotations: [ + // { + // description: "A test building", + // name: "A test name", - regularImageBase64: RESOURCES["demoBuilding.png"], - blueprintImageBase64: RESOURCES["demoBuildingBlueprint.png"], - tutorialImageBase64: RESOURCES["demoBuildingBlueprint.png"], - }, - ], - }); + // regularImageBase64: RESOURCES["demoBuilding.png"], + // blueprintImageBase64: RESOURCES["demoBuildingBlueprint.png"], + // tutorialImageBase64: RESOURCES["demoBuildingBlueprint.png"], + // }, + // ], + // }); // Add it to the regular toolbar - this.modInterface.addNewBuildingToToolbar({ - toolbar: "regular", - location: "primary", - metaClass: MetaDemoModBuilding, - }); + // this.modInterface.addNewBuildingToToolbar({ + // toolbar: "regular", + // location: "primary", + // metaClass: MetaDemoModBuilding, + // }); // Register keybinding this.modInterface.registerIngameKeybinding({ diff --git a/mod_examples/pasting.js b/mod_examples/pasting.js new file mode 100644 index 00000000..5da71fb7 --- /dev/null +++ b/mod_examples/pasting.js @@ -0,0 +1,25 @@ +/** + * This is the minimal structure of a mod + */ + +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Pasting", + version: "1", + id: "pasting", + description: "Shows how to properly receive paste events ingame", +}; + +class Mod extends shapez.Mod { + init() { + this.signals.gameInitialized.add(root => { + root.gameState.inputReciever.paste.add(event => { + event.preventDefault(); + + const data = event.clipboardData.getData("text"); + this.dialogs.showInfo("Pasted", "You pasted: '" + data + "'"); + }); + }); + } +} diff --git a/src/js/core/input_distributor.js b/src/js/core/input_distributor.js index debdba6c..be5440a9 100644 --- a/src/js/core/input_distributor.js +++ b/src/js/core/input_distributor.js @@ -149,6 +149,8 @@ export class InputDistributor { window.addEventListener("mouseup", this.handleKeyMouseUp.bind(this)); window.addEventListener("blur", this.handleBlur.bind(this)); + + document.addEventListener("paste", this.handlePaste.bind(this)); } forwardToReceiver(eventId, payload = null) { @@ -186,6 +188,13 @@ export class InputDistributor { this.keysDown.clear(); } + /** + * + */ + handlePaste(ev) { + this.forwardToReceiver("paste", ev); + } + /** * @param {KeyboardEvent | MouseEvent} event */ diff --git a/src/js/core/input_receiver.js b/src/js/core/input_receiver.js index ae54f24d..164ab84b 100644 --- a/src/js/core/input_receiver.js +++ b/src/js/core/input_receiver.js @@ -12,12 +12,15 @@ export class InputReceiver { // Dispatched on destroy this.destroyed = new Signal(); + + this.paste = new Signal(); } cleanup() { this.backButton.removeAll(); this.keydown.removeAll(); this.keyup.removeAll(); + this.paste.removeAll(); this.destroyed.dispatch(); } From fd0ae12a84039709f53774928e5d0f3067eb12a5 Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 17 Jan 2022 10:11:38 +0100 Subject: [PATCH 057/129] Add example how to add custom components and systems --- mod_examples/add_building_basic.js | 6 - mod_examples/add_building_flipper.js | 4 - mod_examples/base.js | 4 - mod_examples/buildings_have_cost.js | 4 - mod_examples/class_extensions.js | 4 - mod_examples/custom_css.js | 3 - mod_examples/custom_drawing.js | 4 - mod_examples/custom_sub_shapes.js | 4 - mod_examples/custom_theme.js | 3 - mod_examples/modify_existing_building.js | 4 - mod_examples/modify_theme.js | 4 - mod_examples/pasting.js | 4 - mod_examples/replace_builtin_sprites.js | 5 - mod_examples/translations.js | 4 - mod_examples/usage_statistics.js | 146 +++++++++++++++++++++++ 15 files changed, 146 insertions(+), 57 deletions(-) create mode 100644 mod_examples/usage_statistics.js diff --git a/mod_examples/add_building_basic.js b/mod_examples/add_building_basic.js index 5147613c..8b497374 100644 --- a/mod_examples/add_building_basic.js +++ b/mod_examples/add_building_basic.js @@ -1,9 +1,3 @@ -/** - * This shows how to add a new (currently useless) building. - * If you are interested in adding more logic to the game, you should also check out - * the advanced example - */ - const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/add_building_flipper.js b/mod_examples/add_building_flipper.js index 88093392..fdfcb0e2 100644 --- a/mod_examples/add_building_flipper.js +++ b/mod_examples/add_building_flipper.js @@ -1,7 +1,3 @@ -/** - * This shows how to add a new extended building (A building which flips shapes). - * Be sure to check out the "add_building_basic" example first - */ const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/base.js b/mod_examples/base.js index 94776d5e..71be904f 100644 --- a/mod_examples/base.js +++ b/mod_examples/base.js @@ -1,7 +1,3 @@ -/** - * This is the minimal structure of a mod - */ - const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/buildings_have_cost.js b/mod_examples/buildings_have_cost.js index 96f47865..92e0535e 100644 --- a/mod_examples/buildings_have_cost.js +++ b/mod_examples/buildings_have_cost.js @@ -1,7 +1,3 @@ -/** - * This shows how to patch existing methods by making belts have a cost - */ - const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/class_extensions.js b/mod_examples/class_extensions.js index 55431c32..04fa5193 100644 --- a/mod_examples/class_extensions.js +++ b/mod_examples/class_extensions.js @@ -1,7 +1,3 @@ -/** - * Shows how to extend builtin classes - */ - const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/custom_css.js b/mod_examples/custom_css.js index 5aa1219b..59a28afe 100644 --- a/mod_examples/custom_css.js +++ b/mod_examples/custom_css.js @@ -1,6 +1,3 @@ -/** - * This example shows how to add custom css - */ const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/custom_drawing.js b/mod_examples/custom_drawing.js index 23158911..60574c5f 100644 --- a/mod_examples/custom_drawing.js +++ b/mod_examples/custom_drawing.js @@ -1,7 +1,3 @@ -/** - * Shows how to draw overlays by visualizing which item processors are working - */ - const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/custom_sub_shapes.js b/mod_examples/custom_sub_shapes.js index e56a528e..47e051c1 100644 --- a/mod_examples/custom_sub_shapes.js +++ b/mod_examples/custom_sub_shapes.js @@ -1,7 +1,3 @@ -/** - * This shows how to add custom sub shapes - */ - const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/custom_theme.js b/mod_examples/custom_theme.js index 46557721..d781dd8d 100644 --- a/mod_examples/custom_theme.js +++ b/mod_examples/custom_theme.js @@ -1,6 +1,3 @@ -/** - * This example shows how to add a new theme to the game - */ const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/modify_existing_building.js b/mod_examples/modify_existing_building.js index 97ce461a..be7d122c 100644 --- a/mod_examples/modify_existing_building.js +++ b/mod_examples/modify_existing_building.js @@ -1,7 +1,3 @@ -/** - * This shows how to modify an existing building - */ - const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/modify_theme.js b/mod_examples/modify_theme.js index 8a931fd7..ca012c7f 100644 --- a/mod_examples/modify_theme.js +++ b/mod_examples/modify_theme.js @@ -1,7 +1,3 @@ -/** - * This example shows how to modify the builtin themes. If you want to create your own theme, - * be sure to check out the "custom_theme" example - */ const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/pasting.js b/mod_examples/pasting.js index 5da71fb7..ebdda2bb 100644 --- a/mod_examples/pasting.js +++ b/mod_examples/pasting.js @@ -1,7 +1,3 @@ -/** - * This is the minimal structure of a mod - */ - const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/replace_builtin_sprites.js b/mod_examples/replace_builtin_sprites.js index bed831de..009aa65a 100644 --- a/mod_examples/replace_builtin_sprites.js +++ b/mod_examples/replace_builtin_sprites.js @@ -1,8 +1,3 @@ -/** - * This example shows how to replace builtin sprites, in this case - * the color sprites - */ - const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/translations.js b/mod_examples/translations.js index b2471ba3..b0b718f2 100644 --- a/mod_examples/translations.js +++ b/mod_examples/translations.js @@ -1,7 +1,3 @@ -/** - * Shows to add new translations - */ - const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/usage_statistics.js b/mod_examples/usage_statistics.js new file mode 100644 index 00000000..a00ee2c3 --- /dev/null +++ b/mod_examples/usage_statistics.js @@ -0,0 +1,146 @@ +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Usage Statistics", + version: "1", + id: "usage-statistics", + description: + "Shows how to add a new component to the game, how to save additional data and how to add custom logic and drawings", +}; + +/** + * Quick info on how this mod works: + * + * It tracks how many ticks a building was idle within X seconds to compute + * the usage percentage. + * + * Every tick the logic checks if the building is idle, if so, it increases aggregatedIdleTime. + * Once X seconds are over, the aggregatedIdleTime is copied to computedUsage which + * is displayed on screen via the UsageStatisticsSystem + */ + +const MEASURE_INTERVAL_SECONDS = 5; + +class UsageStatisticsComponent extends shapez.Component { + static getId() { + return "UsageStatistics"; + } + + static getSchema() { + // Here you define which properties should be saved to the savegame + // and get automatically restored + return { + lastTimestamp: shapez.types.float, + computedUsage: shapez.types.float, + aggregatedIdleTime: shapez.types.float, + }; + } + + constructor() { + super(); + this.lastTimestamp = 0; + this.computedUsage = 0; + this.aggregatedIdleTime = 0; + } +} + +class UsageStatisticsSystem extends shapez.GameSystemWithFilter { + constructor(root) { + // By specifying the list of components, `this.allEntities` will only + // contain entities which have *all* of the specified components + super(root, [UsageStatisticsComponent, shapez.ItemProcessorComponent]); + } + + update() { + const now = this.root.time.now(); + for (let i = 0; i < this.allEntities.length; ++i) { + const entity = this.allEntities[i]; + + const processorComp = entity.components.ItemProcessor; + const usageComp = entity.components.UsageStatistics; + + if (now - usageComp.lastTimestamp > MEASURE_INTERVAL_SECONDS) { + usageComp.computedUsage = shapez.clamp( + 1 - usageComp.aggregatedIdleTime / MEASURE_INTERVAL_SECONDS + ); + usageComp.aggregatedIdleTime = 0; + usageComp.lastTimestamp = now; + } + + if (processorComp.ongoingCharges.length === 0) { + usageComp.aggregatedIdleTime += this.root.dynamicTickrate.deltaSeconds; + } + } + } + + drawChunk(parameters, chunk) { + const contents = chunk.containedEntitiesByLayer.regular; + for (let i = 0; i < contents.length; ++i) { + const entity = contents[i]; + const usageComp = entity.components.UsageStatistics; + if (!usageComp) { + continue; + } + + const staticComp = entity.components.StaticMapEntity; + const context = parameters.context; + const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace(); + + // Culling for better performance + if (parameters.visibleRect.containsCircle(center.x, center.y, 40)) { + // Background badge + context.fillStyle = "rgba(250, 250, 250, 0.8)"; + context.beginRoundedRect(center.x - 10, center.y + 3, 20, 8, 2); + + context.fill(); + + // Text + const usage = usageComp.computedUsage * 100.0; + if (usage > 99.99) { + context.fillStyle = "green"; + } else if (usage > 70) { + context.fillStyle = "orange"; + } else { + context.fillStyle = "red"; + } + + context.textAlign = "center"; + context.font = "7px GameFont"; + context.fillText(Math.round(usage) + "%", center.x, center.y + 10); + } + } + } +} + +class Mod extends shapez.Mod { + init() { + // Register the component + this.modInterface.registerComponent(UsageStatisticsComponent); + + // Add our new component to all item processor buildings so we can see how many items it processed. + // You can also inspect the entity with F8 after enabling `enableEntityInspector` to see + // the new component + const buildings = [ + shapez.MetaBalancerBuilding, + shapez.MetaCutterBuilding, + shapez.MetaRotaterBuilding, + shapez.MetaStackerBuilding, + shapez.MetaMixerBuilding, + shapez.MetaPainterBuilding, + ]; + + buildings.forEach(metaClass => { + this.modInterface.runAfterMethod(metaClass, "setupEntityComponents", function (entity) { + entity.addComponent(new UsageStatisticsComponent()); + }); + }); + + // Register our game system so we can update and draw stuff + this.modInterface.registerGameSystem({ + id: "demo_mod", + systemClass: UsageStatisticsSystem, + before: "belt", + drawHooks: ["staticAfter"], + }); + } +} From 54a69c97253eacf9f1074c74fc370bc1b212a28d Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 17 Jan 2022 12:15:57 +0100 Subject: [PATCH 058/129] Support for mod settings --- electron/index.js | 2 +- mod_examples/add_building_basic.js | 1 + mod_examples/add_building_flipper.js | 1 + mod_examples/base.js | 1 + mod_examples/buildings_have_cost.js | 1 + mod_examples/class_extensions.js | 1 + mod_examples/custom_css.js | 1 + mod_examples/custom_drawing.js | 1 + mod_examples/custom_sub_shapes.js | 1 + mod_examples/custom_theme.js | 1 + mod_examples/mod_settings.js | 31 +++++ mod_examples/modify_existing_building.js | 1 + mod_examples/modify_theme.js | 1 + mod_examples/pasting.js | 1 + mod_examples/replace_builtin_sprites.js | 1 + mod_examples/translations.js | 1 + mod_examples/usage_statistics.js | 1 + src/js/application.js | 7 +- src/js/mods/mod.js | 14 ++- src/js/mods/modloader.js | 139 ++++++++++++++--------- 20 files changed, 148 insertions(+), 60 deletions(-) create mode 100644 mod_examples/mod_settings.js diff --git a/electron/index.js b/electron/index.js index bc7cf393..18943589 100644 --- a/electron/index.js +++ b/electron/index.js @@ -316,7 +316,7 @@ async function writeFileSafe(filename, contents) { } ipcMain.handle("fs-job", async (event, job) => { - const filenameSafe = job.filename.replace(/[^a-z\.\-_0-9]/i, ""); + const filenameSafe = job.filename.replace(/[^a-z\.\-_0-9]/i, "_"); const fname = path.join(storePath, filenameSafe); switch (job.type) { case "read": { diff --git a/mod_examples/add_building_basic.js b/mod_examples/add_building_basic.js index 8b497374..97e0a358 100644 --- a/mod_examples/add_building_basic.js +++ b/mod_examples/add_building_basic.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/add_building_flipper.js b/mod_examples/add_building_flipper.js index fdfcb0e2..b3b746f3 100644 --- a/mod_examples/add_building_flipper.js +++ b/mod_examples/add_building_flipper.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/base.js b/mod_examples/base.js index 71be904f..6dc8df8f 100644 --- a/mod_examples/base.js +++ b/mod_examples/base.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/buildings_have_cost.js b/mod_examples/buildings_have_cost.js index 92e0535e..b97197f9 100644 --- a/mod_examples/buildings_have_cost.js +++ b/mod_examples/buildings_have_cost.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/class_extensions.js b/mod_examples/class_extensions.js index 04fa5193..167ca53a 100644 --- a/mod_examples/class_extensions.js +++ b/mod_examples/class_extensions.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/custom_css.js b/mod_examples/custom_css.js index 59a28afe..74d19057 100644 --- a/mod_examples/custom_css.js +++ b/mod_examples/custom_css.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/custom_drawing.js b/mod_examples/custom_drawing.js index 60574c5f..6ba49454 100644 --- a/mod_examples/custom_drawing.js +++ b/mod_examples/custom_drawing.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/custom_sub_shapes.js b/mod_examples/custom_sub_shapes.js index 47e051c1..d44b84d9 100644 --- a/mod_examples/custom_sub_shapes.js +++ b/mod_examples/custom_sub_shapes.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/custom_theme.js b/mod_examples/custom_theme.js index d781dd8d..fd2e063a 100644 --- a/mod_examples/custom_theme.js +++ b/mod_examples/custom_theme.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/mod_settings.js b/mod_examples/mod_settings.js new file mode 100644 index 00000000..4e35f5df --- /dev/null +++ b/mod_examples/mod_settings.js @@ -0,0 +1,31 @@ +// @ts-nocheck +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Mod Settings", + version: "1", + id: "base", + description: "Shows how to add settings to your mod", + + settings: { + timesLaunched: 0, + }, +}; + +class Mod extends shapez.Mod { + init() { + // Increment the setting every time we launch the mod + this.settings.timesLaunched++; + this.saveSettings(); + + // Show a dialog in the main menu wit the settings + this.signals.stateEntered.add(state => { + if (state instanceof shapez.MainMenuState) { + this.dialogs.showInfo( + "Welcome back", + "You have launched this mod " + this.settings.timesLaunched + " times" + ); + } + }); + } +} diff --git a/mod_examples/modify_existing_building.js b/mod_examples/modify_existing_building.js index be7d122c..1264b2c3 100644 --- a/mod_examples/modify_existing_building.js +++ b/mod_examples/modify_existing_building.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/modify_theme.js b/mod_examples/modify_theme.js index ca012c7f..dfdfb6e9 100644 --- a/mod_examples/modify_theme.js +++ b/mod_examples/modify_theme.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/pasting.js b/mod_examples/pasting.js index ebdda2bb..edd4952c 100644 --- a/mod_examples/pasting.js +++ b/mod_examples/pasting.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/replace_builtin_sprites.js b/mod_examples/replace_builtin_sprites.js index 009aa65a..9865121e 100644 --- a/mod_examples/replace_builtin_sprites.js +++ b/mod_examples/replace_builtin_sprites.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/translations.js b/mod_examples/translations.js index b0b718f2..8a3e07da 100644 --- a/mod_examples/translations.js +++ b/mod_examples/translations.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/mod_examples/usage_statistics.js b/mod_examples/usage_statistics.js index a00ee2c3..36bb81f5 100644 --- a/mod_examples/usage_statistics.js +++ b/mod_examples/usage_statistics.js @@ -1,3 +1,4 @@ +// @ts-nocheck const METADATA = { website: "https://tobspr.io", author: "tobspr", diff --git a/src/js/application.js b/src/js/application.js index cbf6528b..4f3a4c5f 100644 --- a/src/js/application.js +++ b/src/js/application.js @@ -77,7 +77,12 @@ export class Application { MODS.app = this; // MODS - await MODS.initMods(); + + try { + await MODS.initMods(); + } catch (ex) { + alert("Failed to load mods (launch with --dev for more info): \n\n" + ex); + } this.unloaded = false; diff --git a/src/js/mods/mod.js b/src/js/mods/mod.js index b130370d..cea152d8 100644 --- a/src/js/mods/mod.js +++ b/src/js/mods/mod.js @@ -7,17 +7,23 @@ import { MOD_SIGNALS } from "./mod_signals"; export class Mod { /** - * @param {Application} app - * @param {ModLoader} modLoader - * @param {import("./modloader").ModMetadata} meta + * @param {object} param0 + * @param {Application} param0.app + * @param {ModLoader} param0.modLoader + * @param {import("./modloader").ModMetadata} param0.meta + * @param {Object} param0.settings + * @param {() => Promise} param0.saveSettings */ - constructor(app, modLoader, meta) { + constructor({ app, modLoader, meta, settings, saveSettings }) { this.app = app; this.modLoader = modLoader; this.metadata = meta; this.signals = MOD_SIGNALS; this.modInterface = modLoader.modInterface; + + this.settings = settings; + this.saveSettings = saveSettings; } init() { diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 1ef26f7a..668411f3 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -3,6 +3,9 @@ import { Application } from "../application"; /* typehints:end */ import { globalConfig } from "../core/config"; import { createLogger } from "../core/logging"; +import { StorageImplBrowserIndexedDB } from "../platform/browser/storage_indexed_db"; +import { StorageImplElectron } from "../platform/electron/storage"; +import { FILE_NOT_FOUND } from "../platform/storage"; import { Mod } from "./mod"; import { ModInterface } from "./mod_interface"; import { MOD_SIGNALS } from "./mod_signals"; @@ -17,6 +20,7 @@ const LOG = createLogger("mods"); * website: string; * description: string; * id: string; + * settings: [] * }} ModMetadata */ @@ -80,51 +84,55 @@ export class ModLoader { } async initMods() { - LOG.log("hook:init"); + if (!G_IS_STANDALONE && !G_IS_DEV) { + this.initialized = true; + return; + } + // Create a storage for reading mod settings + const storage = G_IS_STANDALONE + ? new StorageImplElectron(this.app) + : new StorageImplBrowserIndexedDB(this.app); + await storage.initialize(); + + LOG.log("hook:init", this.app, this.app.storage); this.exposeExports(); - if (G_IS_STANDALONE || G_IS_DEV) { - try { - let mods = []; - if (G_IS_STANDALONE) { - mods = await ipcRenderer.invoke("get-mods"); - } - if (G_IS_DEV && globalConfig.debug.externalModUrl) { - const response = await fetch(globalConfig.debug.externalModUrl, { - method: "GET", - }); - if (response.status !== 200) { - throw new Error( - "Failed to load " + - globalConfig.debug.externalModUrl + - ": " + - response.status + - " " + - response.statusText - ); - } + let mods = []; + if (G_IS_STANDALONE) { + mods = await ipcRenderer.invoke("get-mods"); + } + if (G_IS_DEV && globalConfig.debug.externalModUrl) { + const response = await fetch(globalConfig.debug.externalModUrl, { + method: "GET", + }); + if (response.status !== 200) { + throw new Error( + "Failed to load " + + globalConfig.debug.externalModUrl + + ": " + + response.status + + " " + + response.statusText + ); + } - mods.push(await response.text()); - } + mods.push(await response.text()); + } - window.$shapez_registerMod = (modClass, meta) => { - if (this.modLoadQueue.some(entry => entry.meta.id === meta.id)) { - console.warn( - "Not registering mod", - meta, - "since a mod with the same id is already loaded" - ); - return; - } - this.modLoadQueue.push({ - modClass, - meta, - }); - }; + window.$shapez_registerMod = (modClass, meta) => { + if (this.modLoadQueue.some(entry => entry.meta.id === meta.id)) { + console.warn("Not registering mod", meta, "since a mod with the same id is already loaded"); + return; + } + this.modLoadQueue.push({ + modClass, + meta, + }); + }; - mods.forEach(modCode => { - modCode += ` + mods.forEach(modCode => { + modCode += ` if (typeof Mod !== 'undefined') { if (typeof METADATA !== 'object') { throw new Error("No METADATA variable found"); @@ -132,32 +140,55 @@ export class ModLoader { window.$shapez_registerMod(Mod, METADATA); } `; - try { - const func = new Function(modCode); - func(); - } catch (ex) { - console.error(ex); - alert("Failed to parse mod (launch with --dev for more info): \n\n" + ex); - } - }); - - delete window.$shapez_registerMod; + try { + const func = new Function(modCode); + func(); } catch (ex) { - alert("Failed to load mods (launch with --dev for more info): \n\n" + ex); + console.error(ex); + alert("Failed to parse mod (launch with --dev for more info): \n\n" + ex); } - } + }); + + delete window.$shapez_registerMod; this.initialized = true; - this.modLoadQueue.forEach(({ modClass, meta }) => { + + for (let i = 0; i < this.modLoadQueue.length; i++) { + const { modClass, meta } = this.modLoadQueue[i]; + const modDataFile = "modsettings_" + meta.id + "__" + meta.version + ".json"; + + let settings = meta.settings; + + if (meta.settings) { + try { + const storedSettings = await storage.readFileAsync(modDataFile); + settings = JSON.parse(storedSettings); + } catch (ex) { + if (ex === FILE_NOT_FOUND) { + // Write default data + await storage.writeFileAsync(modDataFile, JSON.stringify(meta.settings)); + } else { + alert("Failed to load settings for " + meta.id + ", will use defaults:\n\n" + ex); + } + } + } + try { - const mod = new modClass(this.app, this, meta); + const mod = new modClass({ + app: this.app, + modLoader: this, + meta, + settings, + saveSettings: () => storage.writeFileAsync(modDataFile, JSON.stringify(mod.settings)), + }); mod.init(); this.mods.push(mod); } catch (ex) { console.error(ex); alert("Failed to initialize mods (launch with --dev for more info): \n\n" + ex); } - }); + } + this.modLoadQueue = []; } } From 1b931808ebfd59c79c282e83f40263f0885ba3ad Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 17 Jan 2022 12:37:04 +0100 Subject: [PATCH 059/129] Add example for adding a new item type --- mod_examples/mod_settings.js | 4 +- mod_examples/new_item_type.js | 146 ++++++++++++++++++++++++++++++++++ src/js/game/base_item.js | 3 - src/js/game/map_chunk.js | 11 +++ 4 files changed, 159 insertions(+), 5 deletions(-) create mode 100644 mod_examples/new_item_type.js diff --git a/mod_examples/mod_settings.js b/mod_examples/mod_settings.js index 4e35f5df..bbcfe3fd 100644 --- a/mod_examples/mod_settings.js +++ b/mod_examples/mod_settings.js @@ -4,7 +4,7 @@ const METADATA = { author: "tobspr", name: "Mod Example: Mod Settings", version: "1", - id: "base", + id: "mod-settings", description: "Shows how to add settings to your mod", settings: { @@ -18,7 +18,7 @@ class Mod extends shapez.Mod { this.settings.timesLaunched++; this.saveSettings(); - // Show a dialog in the main menu wit the settings + // Show a dialog in the main menu with the settings this.signals.stateEntered.add(state => { if (state instanceof shapez.MainMenuState) { this.dialogs.showInfo( diff --git a/mod_examples/new_item_type.js b/mod_examples/new_item_type.js new file mode 100644 index 00000000..ee06538d --- /dev/null +++ b/mod_examples/new_item_type.js @@ -0,0 +1,146 @@ +// @ts-nocheck +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: New Item Type (Fluids)", + version: "1", + id: "new-item-type", + description: "Shows how to add a new item type (fluid)", +}; + +// Define which fluid types there are +const enumFluidType = { + water: "water", + oil: "oil", +}; + +// Define which color they should have on the map +const fluidColors = { + [enumFluidType.water]: "#477be7", + [enumFluidType.oil]: "#bc483a", +}; + +// The fluid item class (also see ColorItem and ShapeItem) +class FluidItem extends shapez.BaseItem { + static getId() { + return "fluid"; + } + + static getSchema() { + return shapez.types.enum(enumFluidType); + } + + serialize() { + return this.fluidType; + } + + deserialize(data) { + this.fluidType = data; + } + + getItemType() { + return "fluid"; + } + + /** + * @returns {string} + */ + getAsCopyableKey() { + return this.fluidType; + } + + /** + * @param {BaseItem} other + */ + equalsImpl(other) { + return this.fluidType === /** @type {FluidItem} */ (other).fluidType; + } + + /** + * @param {enumFluidType} fluidType + */ + constructor(fluidType) { + super(); + this.fluidType = fluidType; + } + + getBackgroundColorAsResource() { + return fluidColors[this.fluidType]; + } + + /** + * Draws the item to a canvas + * @param {CanvasRenderingContext2D} context + * @param {number} size + */ + drawFullSizeOnCanvas(context, size) { + if (!this.cachedSprite) { + this.cachedSprite = shapez.Loader.getSprite("sprites/fluids/" + this.fluidType + ".png"); + } + this.cachedSprite.drawCentered(context, size / 2, size / 2, size); + } + + /** + * @param {number} x + * @param {number} y + * @param {number} diameter + * @param {DrawParameters} parameters + */ + drawItemCenteredClipped(x, y, parameters, diameter = globalConfig.defaultItemDiameter) { + const realDiameter = diameter * 0.6; + if (!this.cachedSprite) { + this.cachedSprite = shapez.Loader.getSprite("sprites/fluids/" + this.fluidType + ".png"); + } + this.cachedSprite.drawCachedCentered(parameters, x, y, realDiameter); + } +} + +/** + * Singleton instances. + * + * NOTICE: The game tries to instantiate as few instances as possible. + * Which means that if you have two types of fluids in this case, there should + * ONLY be 2 instances of FluidItem at *any* time. + * + * This works by having a map from fluid type to the FluidItem singleton. + * Additionally, all items are and should be immutable. + * @type {Object} + */ +const FLUID_ITEM_SINGLETONS = {}; + +for (const fluidType in enumFluidType) { + FLUID_ITEM_SINGLETONS[fluidType] = new FluidItem(fluidType); +} + +class Mod extends shapez.Mod { + init() { + // Register the sprites + this.modInterface.registerSprite("sprites/fluids/oil.png", RESOURCES["oil.png"]); + this.modInterface.registerSprite("sprites/fluids/water.png", RESOURCES["water.png"]); + + // Make the item spawn on the map + this.modInterface.runAfterMethod(shapez.MapChunk, "generatePatches", function ({ + rng, + chunkCenter, + distanceToOriginInChunks, + }) { + // Generate a simple patch + // ALWAYS use rng and NEVER use Math.random() otherwise the map will look different + // every time you resume the game + if (rng.next() > 0.8) { + const fluidType = rng.choice(Array.from(Object.keys(enumFluidType))); + this.internalGeneratePatch(rng, 4, FLUID_ITEM_SINGLETONS[fluidType]); + } + }); + } +} + +/////////////////////////////////////// + +const RESOURCES = { + "oil.png": + "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAOxAAADsQH1g+1JAAAE8mlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNy4xLWMwMDAgNzkuZGFiYWNiYiwgMjAyMS8wNC8xNC0wMDozOTo0NCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIzLjAgKE1hY2ludG9zaCkiIHhtcDpDcmVhdGVEYXRlPSIyMDIyLTAxLTE3VDEyOjIyOjUxKzAxOjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyMi0wMS0xN1QxMjoyMzozMCswMTowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyMi0wMS0xN1QxMjoyMzozMCswMTowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Y2EzMGQxMDEtZWU5Yy00Mzc2LTgyOGEtZDM5ZmFkN2ViZTYyIiB4bXBNTTpEb2N1bWVudElE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", + + "water.png": + "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAATEAAAExAE8zNSDAAAE8mlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNy4xLWMwMDAgNzkuZGFiYWNiYiwgMjAyMS8wNC8xNC0wMDozOTo0NCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIzLjAgKE1hY2ludG9zaCkiIHhtcDpDcmVhdGVEYXRlPSIyMDIyLTAxLTE3VDEyOjI0OjA3KzAxOjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyMi0wMS0xN1QxMjoyNTowNiswMTowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyMi0wMS0xN1QxMjoyNTowNiswMTowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NmU3YjM1ZDctOTAyNi00ZjNlLTkxNGItZTc0NjJhMzM3MGE4IiB4bXBNTTpEb2N1bWVudElE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", +}; diff --git a/src/js/game/base_item.js b/src/js/game/base_item.js index d74ff834..ae569ddf 100644 --- a/src/js/game/base_item.js +++ b/src/js/game/base_item.js @@ -2,9 +2,6 @@ import { globalConfig } from "../core/config"; import { DrawParameters } from "../core/draw_parameters"; import { BasicSerializableObject } from "../savegame/serialization"; -/** @type {ItemType[]} **/ -export const itemTypes = ["shape", "color", "boolean"]; - /** * Class for items on belts etc. Not an entity for performance reasons */ diff --git a/src/js/game/map_chunk.js b/src/js/game/map_chunk.js index 2f92ee08..b966a322 100644 --- a/src/js/game/map_chunk.js +++ b/src/js/game/map_chunk.js @@ -283,6 +283,17 @@ export class MapChunk { const chunkCenter = new Vector(this.x, this.y).addScalar(0.5); const distanceToOriginInChunks = Math.round(chunkCenter.length()); + this.generatePatches({ rng, chunkCenter, distanceToOriginInChunks }); + } + + /** + * + * @param {object} param0 + * @param {RandomNumberGenerator} param0.rng + * @param {Vector} param0.chunkCenter + * @param {number} param0.distanceToOriginInChunks + */ + generatePatches({ rng, chunkCenter, distanceToOriginInChunks }) { // Determine how likely it is that there is a color patch const colorPatchChance = 0.9 - clamp(distanceToOriginInChunks / 25, 0, 1) * 0.5; From 0dac3366709e5c53d9780988cfa7fe999ffb11a7 Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 17 Jan 2022 19:11:04 +0100 Subject: [PATCH 060/129] Update class extensions --- mod_examples/class_extensions.js | 32 +++++++++++++++++--------------- src/js/mods/mod_interface.js | 32 +++++++++++++++++++------------- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/mod_examples/class_extensions.js b/mod_examples/class_extensions.js index 167ca53a..c5b5b95e 100644 --- a/mod_examples/class_extensions.js +++ b/mod_examples/class_extensions.js @@ -8,22 +8,24 @@ const METADATA = { description: "Shows how to extend builtin classes", }; +const BeltExtension = ({ $super, $old }) => ({ + getShowWiresLayerPreview() { + // Access the old method + return !$old.getShowWiresLayerPreview(); + }, + + getIsReplaceable() { + // Instead of super, use $super + return $super.getIsReplaceable.call(this); + }, + + getIsRemoveable() { + return false; + }, +}); + class Mod extends shapez.Mod { init() { - this.modInterface.extendClass(shapez.MetaBeltBuilding, { - // this replaces a regular method - getShowWiresLayerPreview() { - return true; - }, - - // Instead of super, use this.$super() - getIsReplaceable() { - return this.$super.getIsReplaceable.call(this); - }, - - getIsRemoveable() { - return false; - }, - }); + this.modInterface.extendClass(shapez.MetaBeltBuilding, BeltExtension); } } diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index c83f8b11..ab6b4077 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -389,18 +389,24 @@ export class ModInterface { }; } - extendClass(classHandle, extensionClass) { - const extendPrototype = function (base, extension) { - const properties = Array.from(Object.getOwnPropertyNames(extension)); - base.$super = base.$super || {}; - properties.forEach(propertyName => { - if (["constructor", "name", "length", "prototype"].includes(propertyName)) { - return; - } - base.$super[propertyName] = base.$super[propertyName] || base[propertyName]; - base[propertyName] = extension[propertyName]; - }); - }; - extendPrototype(classHandle.prototype, extensionClass); + /** + * + * @param {typeof Object} classHandle + * @param {({ $super, $old }) => any} extender + */ + extendClass(classHandle, extender) { + const prototype = classHandle.prototype; + + const $super = Object.getPrototypeOf(prototype); + const $old = {}; + const extensionMethods = extender({ $super, $old }); + const properties = Array.from(Object.getOwnPropertyNames(extensionMethods)); + properties.forEach(propertyName => { + if (["constructor", "prototype"].includes(propertyName)) { + return; + } + $old[propertyName] = prototype[propertyName]; + prototype[propertyName] = extensionMethods[propertyName]; + }); } } From ce0c2c4977db3a564406e27073096a5390a08b52 Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 17 Jan 2022 19:18:03 +0100 Subject: [PATCH 061/129] Minor adjustments --- src/js/mods/mod_interface.js | 15 ++++++++++++--- src/js/mods/modloader.js | 6 ++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index ab6b4077..3f61fce1 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -391,11 +391,11 @@ export class ModInterface { /** * - * @param {typeof Object} classHandle + * @param {Object} obj * @param {({ $super, $old }) => any} extender */ - extendClass(classHandle, extender) { - const prototype = classHandle.prototype; + extendObject(obj, extender) { + const prototype = obj.prototype; const $super = Object.getPrototypeOf(prototype); const $old = {}; @@ -409,4 +409,13 @@ export class ModInterface { prototype[propertyName] = extensionMethods[propertyName]; }); } + + /** + * + * @param {typeof Object} classHandle + * @param {({ $super, $old }) => any} extender + */ + extendClass(classHandle, extender) { + this.extendObject(classHandle.prototype, extender); + } } diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 668411f3..fa90b8a6 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -121,6 +121,9 @@ export class ModLoader { } window.$shapez_registerMod = (modClass, meta) => { + if (this.initialized) { + throw new Error("Can't register mod after modloader is initialized"); + } if (this.modLoadQueue.some(entry => entry.meta.id === meta.id)) { console.warn("Not registering mod", meta, "since a mod with the same id is already loaded"); return; @@ -151,8 +154,6 @@ export class ModLoader { delete window.$shapez_registerMod; - this.initialized = true; - for (let i = 0; i < this.modLoadQueue.length; i++) { const { modClass, meta } = this.modLoadQueue[i]; const modDataFile = "modsettings_" + meta.id + "__" + meta.version + ".json"; @@ -190,6 +191,7 @@ export class ModLoader { } this.modLoadQueue = []; + this.initialized = true; } } From 2ac34665b3b19ad5a74178ea739bb427abf1ecc9 Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 17 Jan 2022 22:09:05 +0100 Subject: [PATCH 062/129] Fix typo --- src/js/mods/mod_interface.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 3f61fce1..904362e7 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -391,12 +391,10 @@ export class ModInterface { /** * - * @param {Object} obj + * @param {Object} prototype * @param {({ $super, $old }) => any} extender */ - extendObject(obj, extender) { - const prototype = obj.prototype; - + extendObject(prototype, extender) { const $super = Object.getPrototypeOf(prototype); const $old = {}; const extensionMethods = extender({ $super, $old }); From 27db6fe693fc764412a45c025a8d7dccafaa6d7a Mon Sep 17 00:00:00 2001 From: tobspr Date: Tue, 18 Jan 2022 10:13:25 +0100 Subject: [PATCH 063/129] Add notification blocks mod example --- mod_examples/notification_blocks.js | 312 ++++++++++++++++++ res/ui/icons/notification_error.png | Bin 0 -> 5509 bytes res/ui/icons/notification_info.png | Bin 0 -> 1899 bytes res/ui/icons/notification_warning.png | Bin 0 -> 4168 bytes src/css/resources.scss | 3 +- src/js/game/hud/hud.js | 2 + src/js/game/hud/parts/constant_signal_edit.js | 181 +++++++++- src/js/game/hud/parts/notifications.js | 9 +- src/js/game/systems/constant_signal.js | 188 +---------- src/js/mods/mod_interface.js | 12 + src/js/mods/mod_signals.js | 2 + 11 files changed, 522 insertions(+), 187 deletions(-) create mode 100644 mod_examples/notification_blocks.js create mode 100644 res/ui/icons/notification_error.png create mode 100644 res/ui/icons/notification_info.png create mode 100644 res/ui/icons/notification_warning.png diff --git a/mod_examples/notification_blocks.js b/mod_examples/notification_blocks.js new file mode 100644 index 00000000..a8116849 --- /dev/null +++ b/mod_examples/notification_blocks.js @@ -0,0 +1,312 @@ +// @ts-nocheck +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Notification Blocks", + version: "1", + id: "notification-blocks", + description: + "Adds a new building to the wires layer, 'Notification Blocks' which show a custom notification when they get a truthy signal.", +}; + +//////////////////////////////////////////////////////////////////////// +// This is the component storing which text the block should show as +// a notification. +class NotificationBlockComponent extends shapez.Component { + static getId() { + return "NotificationBlock"; + } + + static getSchema() { + // Here you define which properties should be saved to the savegame + // and get automatically restored + return { + notificationText: shapez.types.string, + lastStoredInput: shapez.types.bool, + }; + } + + constructor() { + super(); + this.notificationText = "Test"; + this.lastStoredInput = false; + } +} + +//////////////////////////////////////////////////////////////////////// +// The game system to trigger notifications when the signal changes +class NotificationBlocksSystem extends shapez.GameSystemWithFilter { + constructor(root) { + // By specifying the list of components, `this.allEntities` will only + // contain entities which have *all* of the specified components + super(root, [NotificationBlockComponent]); + + // Ask for a notification text once an entity is placed + this.root.signals.entityManuallyPlaced.add(entity => { + const editorHud = this.root.hud.parts.notificationBlockEdit; + if (editorHud) { + editorHud.editNotificationText(entity, { deleteOnCancel: true }); + } + }); + } + + update() { + if (!this.root.gameInitialized) { + // Do not start updating before the wires network was + // computed to avoid dispatching all notifications + return; + } + + // Go over all notification blocks and check if the signal changed + for (let i = 0; i < this.allEntities.length; ++i) { + const entity = this.allEntities[i]; + + // Compute if the bottom pin currently has a truthy input + const pinsComp = entity.components.WiredPins; + const network = pinsComp.slots[0].linkedNetwork; + + let currentInput = false; + + if (network && network.hasValue()) { + const value = network.currentValue; + if (value && shapez.isTruthyItem(value)) { + currentInput = true; + } + } + + // If the value changed, show the notification if its truthy + const notificationComp = entity.components.NotificationBlock; + if (currentInput !== notificationComp.lastStoredInput) { + notificationComp.lastStoredInput = currentInput; + if (currentInput) { + this.root.hud.signals.notification.dispatch( + notificationComp.notificationText, + shapez.enumNotificationType.info + ); + } + } + } + } +} + +//////////////////////////////////////////////////////////////////////// +// The actual notification block building +class MetaNotificationBlockBuilding extends shapez.ModMetaBuilding { + constructor() { + super("notification_block"); + } + + static getAllVariantCombinations() { + return [ + { + variant: shapez.defaultBuildingVariant, + name: "Notification Block", + description: "Shows a predefined notification on screen when receiving a truthy signal", + + regularImageBase64: RESOURCES["notification_block.png"], + blueprintImageBase64: RESOURCES["notification_block.png"], + tutorialImageBase64: RESOURCES["notification_block.png"], + }, + ]; + } + + getSilhouetteColor() { + return "#daff89"; + } + + getIsUnlocked(root) { + return root.hubGoals.isRewardUnlocked(shapez.enumHubGoalRewards.reward_wires_painter_and_levers); + } + + getLayer() { + return "wires"; + } + + getDimensions() { + return new shapez.Vector(1, 1); + } + + getRenderPins() { + // Do not show pin overlays since it would hide our building icon + return false; + } + + setupEntityComponents(entity) { + // Accept logical input from the bottom + entity.addComponent( + new shapez.WiredPinsComponent({ + slots: [ + { + pos: new shapez.Vector(0, 0), + direction: shapez.enumDirection.bottom, + type: shapez.enumPinSlotType.logicalAcceptor, + }, + ], + }) + ); + + // Add your notification component to identify the building as a notification block + entity.addComponent(new NotificationBlockComponent()); + } +} + +//////////////////////////////////////////////////////////////////////// +// HUD Component to be able to edit notification blocks by clicking them +class HUDNotificationBlockEdit extends shapez.BaseHUDPart { + initialize() { + this.root.camera.downPreHandler.add(this.downPreHandler, this); + } + + /** + * @param {Vector} pos + * @param {enumMouseButton} button + */ + downPreHandler(pos, button) { + if (this.root.currentLayer !== "wires") { + return; + } + + const tile = this.root.camera.screenToWorld(pos).toTileSpace(); + const contents = this.root.map.getLayerContentXY(tile.x, tile.y, "wires"); + if (contents) { + const notificationComp = contents.components.NotificationBlock; + if (notificationComp) { + if (button === shapez.enumMouseButton.left) { + this.editNotificationText(contents, { + deleteOnCancel: false, + }); + return shapez.STOP_PROPAGATION; + } + } + } + } + + /** + * Asks the player to enter a notification text + * @param {Entity} entity + * @param {object} param0 + * @param {boolean=} param0.deleteOnCancel + */ + editNotificationText(entity, { deleteOnCancel = true }) { + const notificationComp = entity.components.NotificationBlock; + if (!notificationComp) { + return; + } + + // save the uid because it could get stale + const uid = entity.uid; + + // create an input field to query the text + const textInput = new shapez.FormElementInput({ + id: "notificationText", + placeholder: "", + defaultValue: notificationComp.notificationText, + validator: val => val.length > 0, + }); + + // create the dialog & show it + const dialog = new shapez.DialogWithForm({ + app: this.root.app, + title: shapez.T.mods.notificationBlocks.dialogTitle, + desc: shapez.T.mods.notificationBlocks.enterNotificationText, + formElements: [textInput], + buttons: ["cancel:bad:escape", "ok:good:enter"], + closeButton: false, + }); + this.root.hud.parts.dialogs.internalShowDialog(dialog); + + // When confirmed, set the text + dialog.buttonSignals.ok.add(() => { + if (!this.root || !this.root.entityMgr) { + // Game got stopped + return; + } + + const entityRef = this.root.entityMgr.findByUid(uid, false); + if (!entityRef) { + // outdated + return; + } + + const notificationComp = entityRef.components.NotificationBlock; + if (!notificationComp) { + // no longer interesting + return; + } + + // set the text + notificationComp.notificationText = textInput.getValue(); + }); + + // When cancelled, destroy the entity again + if (deleteOnCancel) { + dialog.buttonSignals.cancel.add(() => { + if (!this.root || !this.root.entityMgr) { + // Game got stopped + return; + } + + const entityRef = this.root.entityMgr.findByUid(uid, false); + if (!entityRef) { + // outdated + return; + } + + const notificationComp = entityRef.components.NotificationBlock; + if (!notificationComp) { + // no longer interesting + return; + } + + this.root.logic.tryDeleteBuilding(entityRef); + }); + } + } +} + +//////////////////////////////////////////////////////////////////////// +// The actual mod logic +class Mod extends shapez.Mod { + init() { + // Register the component + this.modInterface.registerComponent(NotificationBlockComponent); + + // Register the new building + this.modInterface.registerNewBuilding({ + metaClass: MetaNotificationBlockBuilding, + buildingIconBase64: RESOURCES["notification_block.png"], + }); + + // Add it to the regular toolbar + this.modInterface.addNewBuildingToToolbar({ + toolbar: "wires", + location: "secondary", + metaClass: MetaNotificationBlockBuilding, + }); + + // Register our game system so we can dispatch the notifications + this.modInterface.registerGameSystem({ + id: "notificationBlocks", + systemClass: NotificationBlocksSystem, + before: "constantSignal", + }); + + // Register our hud element to be able to edit the notification texts + this.modInterface.registerHudElement("notificationBlockEdit", HUDNotificationBlockEdit); + + // This mod also supports translations + this.modInterface.registerTranslations("en", { + mods: { + notificationBlocks: { + enterNotificationText: + "Enter the notification text to show once the signal switches from 0 to 1:", + }, + }, + }); + } +} + +const RESOURCES = { + "notification_block.png": + "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMAAAADACAYAAABS3GwHAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA4VpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDcuMS1jMDAwIDc5LmRhYmFjYmIsIDIwMjEvMDQvMTQtMDA6Mzk6NDQgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6NGQwZTY5MmYtOTRlNy00MDQyLWFjY2ItNmU3OGEzMGU1N2ZjIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjAyQTMyQTVGNzA1RTExRUNBQ0EzQTZCNEYxQjM5MkFBIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjAyQTMyQTVFNzA1RTExRUNBQ0EzQTZCNEYxQjM5MkFBIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjY3NDVhMzZlLTkyMWUtNDViYS04NDFjLWVjOWZjZTc0Y2MyNSIgc3RSZWY6ZG9jdW1lbnRJRD0iYWRvYmU6ZG9jaWQ6cGhvdG9zaG9wOjk3MDYxZWYyLTY2ZGMtZjI0Zi1iZTMy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", +}; diff --git a/res/ui/icons/notification_error.png b/res/ui/icons/notification_error.png new file mode 100644 index 0000000000000000000000000000000000000000..cd9099910fa9e5f9882d15bdcefc095b18d11704 GIT binary patch literal 5509 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 UsxqbV`^TuR)@{vl^@m~q1HkPG`Tzg` literal 0 HcmV?d00001 diff --git a/res/ui/icons/notification_info.png b/res/ui/icons/notification_info.png new file mode 100644 index 0000000000000000000000000000000000000000..04afd526036b87a90b99131a1b70c1d79fab3312 GIT binary patch literal 1899 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 this.parseSignalCode(entity, val), + }); + + const items = [...Object.values(COLOR_ITEM_SINGLETONS)]; + + if (entity.components.WiredPins) { + items.unshift(BOOL_FALSE_SINGLETON, BOOL_TRUE_SINGLETON); + items.push( + this.root.shapeDefinitionMgr.getShapeItemFromShortKey( + this.root.gameMode.getBlueprintShapeKey() + ) + ); + } else { + // producer which can produce virtually anything + const shapes = ["CuCuCuCu", "RuRuRuRu", "WuWuWuWu", "SuSuSuSu"]; + items.unshift( + ...shapes.reverse().map(key => this.root.shapeDefinitionMgr.getShapeItemFromShortKey(key)) + ); + } + + if (this.root.gameMode.hasHub()) { + items.push( + this.root.shapeDefinitionMgr.getShapeItemFromDefinition( + this.root.hubGoals.currentGoal.definition + ) + ); + } + + if (this.root.hud.parts.pinnedShapes) { + items.push( + ...this.root.hud.parts.pinnedShapes.pinnedShapes.map(key => + this.root.shapeDefinitionMgr.getShapeItemFromShortKey(key) + ) + ); + } + + const itemInput = new FormElementItemChooser({ + id: "signalItem", + label: null, + items, + }); + + const dialog = new DialogWithForm({ + app: this.root.app, + title: T.dialogs.editConstantProducer.title, + desc: T.dialogs.editSignal.descItems, + formElements: [itemInput, signalValueInput], + buttons: ["cancel:bad:escape", "ok:good:enter"], + closeButton: false, + }); + this.root.hud.parts.dialogs.internalShowDialog(dialog); + + // When confirmed, set the signal + const closeHandler = () => { + if (!this.root || !this.root.entityMgr) { + // Game got stopped + return; + } + + const entityRef = this.root.entityMgr.findByUid(uid, false); + if (!entityRef) { + // outdated + return; + } + + const constantComp = entityRef.components.ConstantSignal; + if (!constantComp) { + // no longer interesting + return; + } + + if (itemInput.chosenItem) { + constantComp.signal = itemInput.chosenItem; + } else { + constantComp.signal = this.parseSignalCode(entity, signalValueInput.getValue()); + } + }; + + dialog.buttonSignals.ok.add(() => { + closeHandler(); + }); + dialog.valueChosen.add(() => { + dialog.closeRequested.dispatch(); + closeHandler(); + }); + + // When cancelled, destroy the entity again + if (deleteOnCancel) { + dialog.buttonSignals.cancel.add(() => { + if (!this.root || !this.root.entityMgr) { + // Game got stopped + return; + } + + const entityRef = this.root.entityMgr.findByUid(uid, false); + if (!entityRef) { + // outdated + return; + } + + const constantComp = entityRef.components.ConstantSignal; + if (!constantComp) { + // no longer interesting + return; + } + + this.root.logic.tryDeleteBuilding(entityRef); + }); + } + } + + /** + * Tries to parse a signal code + * @param {Entity} entity + * @param {string} code + * @returns {BaseItem} + */ + parseSignalCode(entity, code) { + if (!this.root || !this.root.shapeDefinitionMgr) { + // Stale reference + return null; + } + + code = trim(code); + const codeLower = code.toLowerCase(); + + if (enumColors[codeLower]) { + return COLOR_ITEM_SINGLETONS[codeLower]; + } + + if (entity.components.WiredPins) { + if (code === "1" || codeLower === "true") { + return BOOL_TRUE_SINGLETON; + } + + if (code === "0" || codeLower === "false") { + return BOOL_FALSE_SINGLETON; + } + } + + if (ShapeDefinition.isValidShortKey(code)) { + return this.root.shapeDefinitionMgr.getShapeItemFromShortKey(code); + } + + return null; + } } diff --git a/src/js/game/hud/parts/notifications.js b/src/js/game/hud/parts/notifications.js index bef8dd0f..abeab205 100644 --- a/src/js/game/hud/parts/notifications.js +++ b/src/js/game/hud/parts/notifications.js @@ -7,6 +7,9 @@ export const enumNotificationType = { saved: "saved", upgrade: "upgrade", success: "success", + info: "info", + warning: "warning", + error: "error", }; const notificationDuration = 3; @@ -17,14 +20,14 @@ export class HUDNotifications extends BaseHUDPart { } initialize() { - this.root.hud.signals.notification.add(this.onNotification, this); + this.root.hud.signals.notification.add(this.internalShowNotification, this); /** @type {Array<{ element: HTMLElement, expireAt: number}>} */ this.notificationElements = []; // Automatic notifications this.root.signals.gameSaved.add(() => - this.onNotification(T.ingame.notifications.gameSaved, enumNotificationType.saved) + this.internalShowNotification(T.ingame.notifications.gameSaved, enumNotificationType.saved) ); } @@ -32,7 +35,7 @@ export class HUDNotifications extends BaseHUDPart { * @param {string} message * @param {enumNotificationType} type */ - onNotification(message, type) { + internalShowNotification(message, type) { const element = makeDiv(this.element, null, ["notification", "type-" + type], message); element.setAttribute("data-icon", "icons/notification_" + type + ".png"); diff --git a/src/js/game/systems/constant_signal.js b/src/js/game/systems/constant_signal.js index 29079825..75a4dbdd 100644 --- a/src/js/game/systems/constant_signal.js +++ b/src/js/game/systems/constant_signal.js @@ -1,25 +1,16 @@ -import trim from "trim"; -import { THIRDPARTY_URLS } from "../../core/config"; -import { DialogWithForm } from "../../core/modal_dialog_elements"; -import { FormElementInput, FormElementItemChooser } from "../../core/modal_dialog_forms"; -import { fillInLinkIntoTranslation } from "../../core/utils"; -import { T } from "../../translations"; -import { BaseItem } from "../base_item"; -import { enumColors } from "../colors"; import { ConstantSignalComponent } from "../components/constant_signal"; -import { Entity } from "../entity"; import { GameSystemWithFilter } from "../game_system_with_filter"; -import { BOOL_FALSE_SINGLETON, BOOL_TRUE_SINGLETON } from "../items/boolean_item"; -import { COLOR_ITEM_SINGLETONS } from "../items/color_item"; -import { ShapeDefinition } from "../shape_definition"; export class ConstantSignalSystem extends GameSystemWithFilter { constructor(root) { super(root, [ConstantSignalComponent]); - this.root.signals.entityManuallyPlaced.add(entity => - this.editConstantSignal(entity, { deleteOnCancel: true }) - ); + this.root.signals.entityManuallyPlaced.add(entity => { + const editorHud = this.root.hud.parts.constantSignalEdit; + if (editorHud) { + editorHud.editConstantSignal(entity, { deleteOnCancel: true }); + } + }); } update() { @@ -34,171 +25,4 @@ export class ConstantSignalSystem extends GameSystemWithFilter { } } } - - /** - * Asks the entity to enter a valid signal code - * @param {Entity} entity - * @param {object} param0 - * @param {boolean=} param0.deleteOnCancel - */ - editConstantSignal(entity, { deleteOnCancel = true }) { - if (!entity.components.ConstantSignal) { - return; - } - - // Ok, query, but also save the uid because it could get stale - const uid = entity.uid; - - const signal = entity.components.ConstantSignal.signal; - const signalValueInput = new FormElementInput({ - id: "signalValue", - label: fillInLinkIntoTranslation(T.dialogs.editSignal.descShortKey, THIRDPARTY_URLS.shapeViewer), - placeholder: "", - defaultValue: signal ? signal.getAsCopyableKey() : "", - validator: val => this.parseSignalCode(entity, val), - }); - - const items = [...Object.values(COLOR_ITEM_SINGLETONS)]; - - if (entity.components.WiredPins) { - items.unshift(BOOL_FALSE_SINGLETON, BOOL_TRUE_SINGLETON); - items.push( - this.root.shapeDefinitionMgr.getShapeItemFromShortKey( - this.root.gameMode.getBlueprintShapeKey() - ) - ); - } else { - // producer which can produce virtually anything - const shapes = ["CuCuCuCu", "RuRuRuRu", "WuWuWuWu", "SuSuSuSu"]; - items.unshift( - ...shapes.reverse().map(key => this.root.shapeDefinitionMgr.getShapeItemFromShortKey(key)) - ); - } - - if (this.root.gameMode.hasHub()) { - items.push( - this.root.shapeDefinitionMgr.getShapeItemFromDefinition( - this.root.hubGoals.currentGoal.definition - ) - ); - } - - if (this.root.hud.parts.pinnedShapes) { - items.push( - ...this.root.hud.parts.pinnedShapes.pinnedShapes.map(key => - this.root.shapeDefinitionMgr.getShapeItemFromShortKey(key) - ) - ); - } - - const itemInput = new FormElementItemChooser({ - id: "signalItem", - label: null, - items, - }); - - const dialog = new DialogWithForm({ - app: this.root.app, - title: T.dialogs.editConstantProducer.title, - desc: T.dialogs.editSignal.descItems, - formElements: [itemInput, signalValueInput], - buttons: ["cancel:bad:escape", "ok:good:enter"], - closeButton: false, - }); - this.root.hud.parts.dialogs.internalShowDialog(dialog); - - // When confirmed, set the signal - const closeHandler = () => { - if (!this.root || !this.root.entityMgr) { - // Game got stopped - return; - } - - const entityRef = this.root.entityMgr.findByUid(uid, false); - if (!entityRef) { - // outdated - return; - } - - const constantComp = entityRef.components.ConstantSignal; - if (!constantComp) { - // no longer interesting - return; - } - - if (itemInput.chosenItem) { - constantComp.signal = itemInput.chosenItem; - } else { - constantComp.signal = this.parseSignalCode(entity, signalValueInput.getValue()); - } - }; - - dialog.buttonSignals.ok.add(() => { - closeHandler(); - }); - dialog.valueChosen.add(() => { - dialog.closeRequested.dispatch(); - closeHandler(); - }); - - // When cancelled, destroy the entity again - if (deleteOnCancel) { - dialog.buttonSignals.cancel.add(() => { - if (!this.root || !this.root.entityMgr) { - // Game got stopped - return; - } - - const entityRef = this.root.entityMgr.findByUid(uid, false); - if (!entityRef) { - // outdated - return; - } - - const constantComp = entityRef.components.ConstantSignal; - if (!constantComp) { - // no longer interesting - return; - } - - this.root.logic.tryDeleteBuilding(entityRef); - }); - } - } - - /** - * Tries to parse a signal code - * @param {Entity} entity - * @param {string} code - * @returns {BaseItem} - */ - parseSignalCode(entity, code) { - if (!this.root || !this.root.shapeDefinitionMgr) { - // Stale reference - return null; - } - - code = trim(code); - const codeLower = code.toLowerCase(); - - if (enumColors[codeLower]) { - return COLOR_ITEM_SINGLETONS[codeLower]; - } - - if (entity.components.WiredPins) { - if (code === "1" || codeLower === "true") { - return BOOL_TRUE_SINGLETON; - } - - if (code === "0" || codeLower === "false") { - return BOOL_FALSE_SINGLETON; - } - } - - if (ShapeDefinition.isValidShortKey(code)) { - return this.root.shapeDefinitionMgr.getShapeItemFromShortKey(code); - } - - return null; - } } diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 904362e7..acf47caf 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -25,6 +25,7 @@ import { KEYMAPPINGS } from "../game/key_action_mapper"; import { HUDModalDialogs } from "../game/hud/parts/modal_dialogs"; import { THEMES } from "../game/theme"; import { ModMetaBuilding } from "./mod_meta_building"; +import { BaseHUDPart } from "../game/hud/base_hud_part"; export class ModInterface { /** @@ -416,4 +417,15 @@ export class ModInterface { extendClass(classHandle, extender) { this.extendObject(classHandle.prototype, extender); } + + /** + * + * @param {string} id + * @param {new (...args) => BaseHUDPart} element + */ + registerHudElement(id, element) { + this.modLoader.signals.hudInitializer.add(root => { + root.hud.parts[id] = new element(root); + }); + } } diff --git a/src/js/mods/mod_signals.js b/src/js/mods/mod_signals.js index 220cb424..c311af29 100644 --- a/src/js/mods/mod_signals.js +++ b/src/js/mods/mod_signals.js @@ -19,6 +19,8 @@ export const MOD_SIGNALS = { hudElementInitialized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), hudElementFinalized: /** @type {TypedSignal<[BaseHUDPart]>} */ (new Signal()), + hudInitializer: /** @type {TypedSignal<[GameRoot]>} */ (new Signal()), + gameInitialized: /** @type {TypedSignal<[GameRoot]>} */ (new Signal()), gameLoadingStageEntered: /** @type {TypedSignal<[InGameState, string]>} */ (new Signal()), From 9311ffe4e3a8f5c6d2e9ffaa282623eef75f761c Mon Sep 17 00:00:00 2001 From: tobspr Date: Tue, 18 Jan 2022 11:03:10 +0100 Subject: [PATCH 064/129] Add small tutorial --- mod_examples/README.md | 48 +++++++ mod_examples/combined.js | 223 ------------------------------ mod_examples/custom_keybinding.js | 27 ++++ mod_examples/modify_ui.js | 41 ++++++ 4 files changed, 116 insertions(+), 223 deletions(-) create mode 100644 mod_examples/README.md delete mode 100644 mod_examples/combined.js create mode 100644 mod_examples/custom_keybinding.js create mode 100644 mod_examples/modify_ui.js diff --git a/mod_examples/README.md b/mod_examples/README.md new file mode 100644 index 00000000..cadc3b17 --- /dev/null +++ b/mod_examples/README.md @@ -0,0 +1,48 @@ +# shapez.io Modding + +## General Instructions + +Currently there are two options to develop mods for shapez.io: + +1. Writing single file mods, which doesn't require any additional tools and can be loaded directly in the game +2. Using the `create-shapezio-mod` package. This package is still in development but allows you to pack multiple files and images into a single mod file, so you don't have to base64 encode your images etc. + +Since the `create-shapezio-mod` package is still in development, the current recommended way is to write single file mods, which I'll explain now. + +## Setting up your development environment + +The simplest way of developing mods is by just creating a `mymod.js` file and putting it in the `mods/` folder of the standalone (You can find the `mods/` folder by clicking "Open Mods Folder" in the shapez.io Standalone). + +You can then add `--dev` to the launch options on Steam. This adds an application menu where you can click "Restart" to reload your mod, and will also show the developer console where you can see any potential errors. + +## Getting started + +To get into shapez.io modding, I highly recommend checking out all of the examples in this folder. Here's a list of examples and what features of the modloader they show: + +| Example | Description | Demonstrates | +| ---------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | +| [base.js](base.js) | The most basic mod | Base structure of a mod | +| [class_extensions.js](class_extensions.js) | Shows how to extend multiple methods of one class at once, useful for overriding a lot of methods | Overriding and extending builtin methods | +| [custom_css.js](custom_css.js) | Modifies the Main Menu State look | Modifying the UI styles with CSS | +| [replace_builtin_sprites.js](replace_builtin_sprites.js) | Replaces all color sprites with icons | Replacing builtin sprites | +| [translations.js](translations.js) | Shows how to replace and add new translations in multiple languages | Adding and replacing translations | +| [add_building_basic.js](add_building_basic.js) | Shows how to add a new building | Registering a new building | +| [add_building_flipper.js](add_building_flipper.js) | Adds a "flipper" building which mirrors shapes from top to bottom | Registering a new building, Adding a custom shape and item processing operation (flip) | +| [custom_drawing.js](custom_drawing.js) | Displays a a small indicator on every item processing building whether it is currently working | Adding a new GameSystem and drawing overlays | +| [custom_keybinding.js](custom_keybinding.js) | Adds a new customizable ingame keybinding (Shift+F) | Adding a new keybinding | +| [custom_sub_shapes.js](custom_sub_shapes.js) | Adds a new type of sub-shape (Line) | Adding a new sub shape and drawing it, making it spawn on the map, modifying the builtin levels | +| [modify_theme.js](modify_theme.js) | Modifies the default game themes | Modifying the builtin themes | +| [custom_theme.js](custom_theme.js) | Adds a new UI and map theme | Adding a new game theme | +| [mod_settings.js](mod_settings.js) | Shows a dialog counting how often the mod has been launched | Reading and storing mod settings | +| [modify_existing_building.js](modify_existing_building.js) | Makes the rotator building always unlocked and adds a new statistic to the building panel | Modifying a builtin building, replacing builtin methods | +| [modify_ui.js](modify_ui.js) | Shows how to add custom IU elements to builtin game states (the Main Menu in this case) | Extending builtin UI states, Adding CSS | +| [pasting.js](pasting.js) | Shows a dialog when pasting text in the game | Listening to paste events | + +### Advanced Examples + +| Example | Description | Demonstrates | +| ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| [notification_blocks.js](notification_blocks.js) | Adds a notification block building, which shows a user defined notification when receiving a truthy signal | Adding a new Component, Adding a new GameSystem, Working with wire networks, Adding a new building, Adding a new HUD part, Using Input Dialogs, Adding Translations | +| [usage_statistics.js](usage_statistics.js) | Displays a percentage on every building showing its utilization | Adding a new component, Adding a new GameSystem, Drawing within a GameSystem, Modifying builtin buildings, Adding custom game logic | +| [new_item_type.js](new_item_type.js) | Adds a new type of items to the map (fluids) | Adding a new item type, modifying map generation | +| [buildings_have_cost.js](buildings_have_cost.js) | Adds a new currency, and belts cost 1 of that currency | Extending and replacing builtin methods, Adding CSS and custom sprites | diff --git a/mod_examples/combined.js b/mod_examples/combined.js deleted file mode 100644 index 57d2f218..00000000 --- a/mod_examples/combined.js +++ /dev/null @@ -1,223 +0,0 @@ -class DemoModComponent extends shapez.Component { - static getId() { - return "DemoMod"; - } - - static getSchema() { - return { - magicNumber: shapez.types.uint, - }; - } - - constructor(magicNumber) { - super(); - - this.magicNumber = magicNumber; - } -} - -class MetaDemoModBuilding extends shapez.MetaBuilding { - constructor() { - super("demoModBuilding"); - } - - getSilhouetteColor() { - return "red"; - } - - setupEntityComponents(entity) { - entity.addComponent(new DemoModComponent(Math.floor(Math.random() * 100.0))); - } -} - -class DemoModSystem extends shapez.GameSystemWithFilter { - constructor(root) { - super(root, [DemoModComponent]); - } - - update() { - // nothing to do here - } - - drawChunk(parameters, chunk) { - const contents = chunk.containedEntitiesByLayer.regular; - for (let i = 0; i < contents.length; ++i) { - const entity = contents[i]; - const demoComp = entity.components.DemoMod; - if (!demoComp) { - continue; - } - - const staticComp = entity.components.StaticMapEntity; - - const context = parameters.context; - const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace(); - - // Culling for better performance - if (parameters.visibleRect.containsCircle(center.x, center.y, 40)) { - // Circle - context.fillStyle = "#53cf47"; - context.strokeStyle = "#000"; - context.lineWidth = 2; - - const timeFactor = 5.23 * this.root.time.now(); - context.beginCircle( - center.x + Math.cos(timeFactor) * 10, - center.y + Math.sin(timeFactor) * 10, - 7 - ); - context.fill(); - context.stroke(); - - // Text - context.fillStyle = "#fff"; - context.textAlign = "center"; - context.font = "12px GameFont"; - context.fillText(demoComp.magicNumber, center.x, center.y + 4); - } - } - } -} - -class Mod extends shapez.Mod { - constructor(app, modLoader) { - super( - app, - { - website: "https://tobspr.io", - author: "tobspr", - name: "Demo Mod", - version: "1", - id: "demo-mod", - description: "A simple mod to demonstrate the capatibilities of the mod loader.", - }, - modLoader - ); - } - - init() { - // Add some custom css - // this.modInterface.registerCss(` - // * { - // font-family: "Comic Sans", "Comic Sans MS", Tahoma !important; - // } - // `); - - // Add an atlas - this.modInterface.registerAtlas(RESOURCES["demoAtlas.png"], RESOURCES["demoAtlas.json"]); - - // Register a new component - this.modInterface.registerComponent(DemoModComponent); - - // Register a new game system which can update and draw stuff - this.modInterface.registerGameSystem({ - id: "demo_mod", - systemClass: DemoModSystem, - before: "belt", - drawHooks: ["staticAfter"], - }); - - // // Register the new building - // this.modInterface.registerNewBuilding({ - // metaClass: MetaDemoModBuilding, - // buildingIconBase64: RESOURCES["demoBuilding.png"], - - // variantsAndRotations: [ - // { - // description: "A test building", - // name: "A test name", - - // regularImageBase64: RESOURCES["demoBuilding.png"], - // blueprintImageBase64: RESOURCES["demoBuildingBlueprint.png"], - // tutorialImageBase64: RESOURCES["demoBuildingBlueprint.png"], - // }, - // ], - // }); - - // Add it to the regular toolbar - // this.modInterface.addNewBuildingToToolbar({ - // toolbar: "regular", - // location: "primary", - // metaClass: MetaDemoModBuilding, - // }); - - // Register keybinding - this.modInterface.registerIngameKeybinding({ - id: "demo_mod_binding", - keyCode: shapez.keyToKeyCode("F"), - translation: "mymod: Do something (always with SHIFT)", - modifiers: { - shift: true, - }, - handler: root => { - this.dialogs.showInfo("Mod Message", "It worked!"); - return shapez.STOP_PROPAGATION; - }, - }); - - // Add fancy sign to main menu - this.signals.stateEntered.add(state => { - if (state.key === "MainMenuState") { - const element = document.createElement("div"); - element.id = "demo_mod_hello_world_element"; - document.body.appendChild(element); - - const button = document.createElement("button"); - button.classList.add("styledButton"); - button.innerText = "Hello!"; - button.addEventListener("click", () => { - this.dialogs.showInfo("Mod Message", "Button clicked!"); - }); - element.appendChild(button); - } - }); - - this.modInterface.registerCss(` - #demo_mod_hello_world_element { - position: absolute; - top: calc(10px * var(--ui-scale)); - left: calc(10px * var(--ui-scale)); - color: red; - z-index: 0; - } - - `); - } -} - -//////////////////////////////////////////////////////////////////////// -// @notice: Later this part will be autogenerated - -const RESOURCES = { - "red.png": - "data:image/png;base64,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", - - "green.png": - "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAIwwAACMMBoDLh7AAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAABP2SURBVHic7Z15eFTV3cc/ZybJJJmQsEOQoqAVBaFVX7Uu5VXBpdW3uHZ56dviW1uL7VOXautSKy61Vay7Vn1tVV6tWkQUFI0RVFQsIPuO1hBMwhLJMskkmSQzv/5xb5K7zWSSzJKB+3me+yRz7nbO/f7uWX7n3HOUiOASP0opP3AhcC7wTaAeeEJEHk1rxHqJcg2ge5RSCk3smcClQIHlkDbgayKyNcVR6zNZ6Y5Af0cp9QPgTmBcjMOyAV9qYpRYXAOIglLqq8BjwLQ4Dl8EbExujJKDawAWlFI+4LfATcR+q3egCV8iIqWpiFsycA3AgFLqG8CzwJFRDgkA/wCeFpHlKYtYEnENQEcpNRVYCOQ77G4B/gTMEZGmlEYsybgGACilvg3MB3Iddi8ErhaRstTGKjUc9M1ApdQxwCrs4pcBvxSRxamPVeo4qHMAvcL3PHbx1wLniEh16mOVWjzpjkCauQuYbAn7J3DGwSA+HMRFgFJqNFCO+SXYD0wWkar0xCr19MscQCmVinhdhj39P02W+ClKU49JSw6glBoBnAAcAozS/xr/HwzUAVWWrVL/u1xE9vbh/gr4HDjMELxEROLx+kW75gjgFLrSMMqyDQRq6EpDpeX/VX1JU68RkZRswFjgWuADIAxIH7Yw8CHwa2BcL+IyzeGaP+jFdcbpafowQWn6QL/e2JTpkmTRJwO3Auv6+HC629bp95kUZ7xus5xfC+TGee6kFKdpcsYZAPA1oDTJDyja9lZ3Dw3N3Ws8Z0GcxvxWmtJUitbdnHCtEuoHUEoVo3WdzqSbCqZS4B/soXCEhwHDvRSO6Pjfg3+wh2BNhPo9EQJ7ItTvDhPYq/0NBaW7aJwDnKWUmgvcIiIVDsccavm9K0aaRgN3AD/qLk0APr+iqFhLT1Gxl8KRHopGdqWpYV+EwF5ta9inpStYE0FiJ2sasEYp9QzwOxHZ3V084iUhlUClVD5wvb75ox3n8cKhx+cw8RwfR0/zUTii5xXjYE2Ere+E2Lg4RNnKViQS8/Bm4AHgTyISMMR3J2Yj+I2IzLGkqRC4AbgayIt2A+WBsSfmMOnbWpr8g3uepsBeLU2bS0KUr24lEo55eBCYQ4L6JfpsAEqp6Wj95qOc9nuzYNzJOUw828dRU3v3gKLR+GWETW+F2PhGC1+sa4v1Fn2J5s9/Xo9zLVqtvIOZIvJsxw+l1Aw0wxnqdDGlYPTXspl8fi7HnOujYGji0hSsibBtSYjNb4f4/ONWwu1RD60CrhSR1/pyvz4ZgFLqRuAPgLLvg0nfzuWsX/sZOMrbhyjGR11VmI/nNvPP/2+K9QbdBfwO2ARMMITfICJ3683DO9HGAtjweOEb/5PPyT/KS1maSv8cZOPilmjGLcDNIvLH3t6jVwaglMoB/g+tXLRx6PHZnPvbAkZPzo7reu2tQmN1hIbqCIF9EYaO9TLiq72rnuzd0c7C2Q3sWtMW7ZB/AEOAqYawx4Fr0CqH33U6acxx2Xxn9gBGHJn67pOKDW28dXcj5aujpmkumhOrtafX7rEBKKWGAguA06z7Bo/xcvZ1BUw8O/pAmkgYdq1pY9vSEP/6uJX63RGa6+0F+Td+mMd5vxvQo7h1IAJrF7RQMqeRplrHSkI1MMzweyla3eUk64H5gzycc30Bx16Yi7Llc6ll89sh3r63kZpdjlnch8CFIvJlT67ZIwNQSk0AXkdz6pg49sJcpt8+AG+2/SmF22H7uyG2Lgmx471Wmupi19wAsnyKG5YPxefv/VNvro/w9p+DrJ7X3F0tOwyY8nSl4PhL8zj7137yivqPFzfcJrz2+wbWLmhx2l0GnC8iW+K9XtwGoJQ6EliBufKEUjDtmgKm/Mw+kEYENr3ZwjsPBKNZbVQGj/FydcmQhLx1m94M8fL19bEqVCa8WXDJnCKO+Vb/Hei77Mkm3rm/0cmw64CTRGRHPNeJywD0JtEK4ChjeHau4pI5hUw4y/6gyla0UjKnkcpNcT51HW8WHHZiDqfP8nPYCfHVIeJhx/utvPCretpDsdOb5VP84KEijvzPnITdO1lsKQ3x8vUB2lpsadqGZgQBh9NMdGsAes34NeC/jOEDhnv44V8GMmqiuVLUVBvhlRsb2P5eKOZ18woV48/0MfaEHApHeCgY5mHAMA/5gzxJK2vLVrby/Kz6qM4kn18x4y9FjD2x/4vfQdXmdp6bVUfDPluxugiYLt0IHI8B3A7cYgzzD/Hw83mDbE2hvZ+28/ysemornLN7/xAPx5zrY8I0H4edmIMn+S0pGxUb2ph7eR3NAXu6f/zXgRxxauaI30FdVZjHL60luN9mBHeIyO9jnRvTAJRSFwEvY2jne7Ng5tODbNnztndDvHxdwPHt8vkVp/0kn1MuyycnL81VabSm4jOX1dFoeWA3rRxGXmH649cbdq5q45nLaq31HAEuEZFXop0X1QD0Gv8KLN/BnX/LAE6aYfaMfvBUE6X3Ndrcst4s+I/v5XHGL/wJ9QAmgtZmYf5vA2wtDSECU6/yc/qsqF7sjGDF8828fkeDNbgRrT7g2DKIZQBLgDONYcddlMuFdxWajlv592YW3W67KQOGefjvR4vidgali6ZarTNm2OEHxvjYBTcFWPOKrYm4VESmOh3vaABKqWloXZCdHDIpm8ufH0hWTlcW+fnHrTx7eZ3N9XrIpGxmPFrEgOH9660/GGhvFZ6aUUflRpvX8CwReccaGE2hu4w/snIU33+w0CR+za4wL14dsIk/+bxcLn9uoCt+mnDSSucup+NtKimlLkYbr9fJSTPMnR8tDcJzP6+zuXCPnubjknsLyfJlZkXqQGHgKK+tngacoGtrwmQASikvWm9YJ74CxZQrzF6+0vsbqf7c/OqPHJ/FJfcUpt1f7qIx5Yp8fAU2Me7UNe7EmgP8GIu377Sf5JM/sOuw/eVhPnmp2XSSf4iHGX8pIiffVb+/kD/Qw2k/sbnnj0LTuBOrAdxo/FEwxMMpMy1v/32NtnL/e/cVpqR/3KVnnDIzn4IhtlLepHHnXv0jySOMO0+/0m9y3FRsaGNzidnFe9SZPsaelHnes4OBnDzF6VfafBtH6FoD5hxguvGoLJ/iuIvN30y+fW/Q9NvjhbOuzWznyYHOcRfnOlXKO7U2GsB3jEccfnI22bldJ9ZVhilbaR5w8vULchl+xIHhQDlQyc5VHH6yzRnXqbUHOodzm5p+488wd/FuXWLO+pUHzvyl+/ZnAlYt0ZqExdCVA5yPZWDn+NOtBmB++7/y9WyKit2KXyZg1RJN6/OhywBM5f+oCVmmMfvNAaH8E7MBOA0CcemfFI7wMGqCraieDuDRHQOmjoLxZ5rF3fF+yNb0mzDNNYBMwqopMFUp5fUAw7FMkTLO0qz7Yp25Y2Hk+CwGfcXN/jMJq6Zomg/3AMXWPUUjzc6Dxmqzz3/k0W7NP9OwaqpT7GgA1p68gGW8WaHb05dxROmdtRtAXqGyOQ6sAw4LhrnZf6aR5VNOw93sBjBguF3cxi/NBjBgmJsDZCIO2joZgFncUFBobzWPGioqdg0gE3EoBuwGYC3ffX7Focd3uRIHjvIyelL/Hufn4oxD3a04CzC1D7z2oURMv6OQZU8ECQWFKT/Np39OeObSHQ7a5mShTVHWSWCv/aOOYeO8XHx3oS3cJbNw0LbSg9UA9nT/5a5LZuKgbaUHME2iVO8awAGLg7YVthyguT7i9LWpS4bT1iJOE3HYcwDQZq1yObCIoqk9BwAI7OnZZA4u/Z8omlZ6RKQWMM0359YDDjwcNG0SkdqOFr2pGHCLgAMPB00roGtEUJlxz57tPZvWxaX/46BpGXQZwEfGPTtX9ni6OZd+joOmH0GXAbxv3NNQHWF/uVsRPFDYXx6modpWBLwPXQawAm1xxE7cXODAwUHLFjTNNQMQkVBHQAdlq6JOS+qSYThouULX3PRlkKkY2OkawAGDg5adWkc1gPrdYWq/cOsBmU7tF2Hqd9t0dDSAjwFTYeEWA5mPg4ataFoDBgMQkWa0NXQ7cSuCmY+Dhqt0rQH7BBGmYsDNATIfBw1NGsc0gLpKx/LDJUOo3x2mrjJ6+Q92A1gOmHyG25a6xUCm4qBdO5rGnZgMQEQa0VbP6GTDG44LE7hkAA7aLdU17sRpfO+Lxh9frG1zi4EMpH53mC/W2sr/F60BTgawAENzUAQ2Lo49979L/2Pj4pB1NZFWNG1N2AxAROqAEtPF3GIg43DQrETX1kS0TzxeMv6o2tLu9g5mEPvLw1RtsfX/v+R0bDQDWIi27Gonbi6QOTho1YymqQ1HAxCRBmCx6aJuPSBjcNBqsa6pjVhf+ZmyjH2ftbtDxTKAPdvb2fdZfNk/xDaA19GWG+nELQb6Pw4aNaJp6UhUA9A7DBaZLu4WA/0eB40WGTt/rHT3obfJcVBbEaZivdtB1F+pWN/mtGSfzfljpDsDKAHqjQGr/hHVmFzSjIM29Vh8OlZiGoA+bmyeMWzD66FoK3K7pJGm2ggbXrdl//M6xv5FI565Ph4x/mgPCatecnOB/saql5qd1kV+xOlYI90agIisx9KHvOLvzXGvxO2SfMLtmiYW3te1i0m8s/08aPzRsC/C5hK3Sdhf2FzS4rR49INOx1qJ1wAWAjuNAR/PdYuB/oKDFjuJ4vq1EpcBiEgYeNQYVrG+zW0S9gOi6PCorlm39GTCt6cA06JBbi6Qfhw0CKJpFRdxG4DelzzXGBal7HFJEVHqYnOd+v2j0dMpHx9CW5MeiFr7dEkRDq0xQdMobnpkACKyDcuq4lHany5JJoo/plTXKG56M+mrqXnRVBth/SK3SZhq1i9qcfLIxtX0M9IbA3gT+NQYsOzJJtcxlELC7dozt/ApmjY9oscGICK2cqZmV5hVL7p1gVSx6sVmanbZWnkP6dr0iN7O+/1XoMoY8N5jQUKNbl0g2YQahfceC1qDq9A06TG9MgB9gMFsY1iwJsIHT9myJZcE88FTTQRrbGX/7FiDPmLRl5n//wZsNwYsf6bJaTIilwTRUB1h+TO2l2w7mha9otcGoLsabzaGtbUISx+2ZU8uCWLpw0Gnibxvjtft60Sf1v4QkfnASmPYmvnNVP/LbRIkmup/tbNmvi2XX6lr0GsSsfjLDcYfkTCU3ufmAomm9L6gbfleLM++N/TZAETkXSzjzrYuCVG+2u0pTBTlq9vYusQ2sqtEf/Z9IlHLP92IoY8AoGROY5RDXXqKw7MUtGfeZxJiACKyFuu8Auva2FLqfkfQV7aUhmyLdwMv6s+8z6heOI+cL6TUOGAL0LlOeVGxl1++Nphc+5KlLnHQEhAemV5jnaAjBEwQkc8TcY+ErQCoR8jULKzfHea1WwOJusVBx2u3BpxmZ7k5UeJDAg1A535gmTFg05sh1i5wewt7ytoFLWx601aEvo/2jBNGwoqAzgsqNRbYABR0hOXkK37x6mAGj3FXHY+Hml1hHr2ghtYmkzYNwGQR2ZnIeyV8EVgRKQOuMYa1Ngnzrgs4tWNdLETCMO+6gFV8gKsSLT4kwQAAROQp4A1jWMWGNtdNHAdLHw5SscFW618oIk8n437JXAb6cmC/MWDZk0HKP3EdRNEo/6SNZU/aXpJq4KfJumfSDEBE9gCzTGERmHd9gJaAO27ASktAmHd9ALF3pv5MRPYl675JXQheROYBLxjD6neHWTjbcbqag5qFsxucmnzPisirybxvUg1A5xdYRg9tXNzCh39zB4908OHfmti42NZULgd+lex7J90A9JVJ/xdrX8E9jax8Ib3jCEONkvZhbCtfaKbkHpuvPwLMFJGke9ES7geIeiOlrgIeMIfBhX8s5NgLclMShw7qqsKU3hdkc4nmaJl4jo+zrvUzcFRq/RRrX21hwY0B65SuALNE5PFUxCFlBgCglLoTi7vY44WL7ylk8nnJN4JQUFj2RJDlz9o/ZsnyKU75cR5TrvDj8ye/72LDGy3M/42jb2S2iNyW9AjopNQAAJRST2Jp1igFU67wM/VXflQSCqVIGNa+0sw7DwZp/DL2mMWCoR6mXeXn2Ivy8CQhQ5AILHkoyLIngk5v/uMiMsvhtKSRDgPwoM07dJF135FTcrj03qKE9R5+WRZmzfxm1r7a0q3wVgqGejj2glyOuziPoWMTYwktAWHedfXsWOa4CMd84LsiDg3BJJJyAwBQSvmAZ4DvW/cNHuPlWzcWcNQZPtt58RAKCpvfCrH65WZ22efLt7JB/zs51kFjjs3m+EvymHiur9fFw7Z3Q7z5x0anDzpAG0sxs7sJnZJBWgyg8+ZK3QzcAdie6ujJ2Uy9ys8Rp+bEvEZrs7BrTRtlK1opW9lG1aa2eD5T+xS4la5BLN8HbgO+GuskbxaMOiabsSdmM/akHMYcl01OXmyD+OyjVpY86OjeBa1ldIuI/KHbGCeJtBoAgFLqAuA5wO+0f/AYL8VHZTFifBZDDvPSVCvUV4Wp2x2mtiLCnq1xCd5BBXA78LSImM5SSmUBlwG/B0bHczFvFow8OptBoz0MLPZSNMpL/iDF/rIwe7a3s3tbe6zFN4PAD5Pt6OkWEUn7hpYFf4b2RiR6i6CNUfgZ4IsjLj792GX6ucmI02doXbvpf/bpjoDhwWej9R1UJughrwN+A4zpQ5zG6NdYl6A4VeppzE738+7Y0l4EWFFK5QJXoo15H9aDU2uAj4APgTdEZHOC4zUROA84DTgVGNyD06uBPwGPiUi/Gh7V7wygA6VUPnAi8HXDdiTa/Le79a0SWA18AGyVFCVGKaWAo4FvAscDhwDF+laE9r3eOmC9/neliPTLzo9/Ayif0cMIPHkWAAAAAElFTkSuQmCC", - - "purple.png": - "data:image/png;base64,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", - - "blue.png": - "data:image/png;base64,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", - - "yellow.png": - "data:image/png;base64,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", - - "cyan.png": - "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAOxAAADsQH1g+1JAAAE8mlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNy4xLWMwMDAgNzkuZGFiYWNiYiwgMjAyMS8wNC8xNC0wMDozOTo0NCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIzLjAgKE1hY2ludG9zaCkiIHhtcDpDcmVhdGVEYXRlPSIyMDIyLTAxLTE0VDEwOjMwOjMyKzAxOjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyMi0wMS0xNFQxMDozMDo1MCswMTowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyMi0wMS0xNFQxMDozMDo1MCswMTowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ZTFiZTU2MjEtMTU1ZC00YmFmLWFiNzgtYjM2Y2QzMmIzNTNkIiB4bXBNTTpEb2N1bWVudElE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", - - "white.png": - "data:image/png;base64,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", - "demoBuilding.png": - "data:image/png;base64,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", - - "demoBuildingBlueprint.png": - "data:image/png;base64,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", - - "demoAtlas.png": - "data:image/png;base64,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", - - "demoAtlas.json": - '{"frames":{"enum_selector.png":{"frame":{"x":1,"y":1,"w":38,"h":23},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":5,"y":12,"w":38,"h":23},"sourceSize":{"w":48,"h":48}},"enum_selector_white.png":{"frame":{"x":387,"y":101,"w":38,"h":23},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":5,"y":12,"w":38,"h":23},"sourceSize":{"w":48,"h":48}},"icon.png":{"frame":{"x":387,"y":126,"w":284,"h":284},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":0,"y":0,"w":284,"h":284},"sourceSize":{"w":284,"h":284}},"sprites/blueprints/miner-chainable.png":{"frame":{"x":673,"y":267,"w":137,"h":143},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":4,"y":0,"w":137,"h":143},"sourceSize":{"w":144,"h":144}},"sprites/buildings/miner-chainable.png":{"frame":{"x":812,"y":268,"w":136,"h":142},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":5,"y":0,"w":136,"h":142},"sourceSize":{"w":144,"h":144}},"test.png":{"frame":{"x":1,"y":26,"w":384,"h":384},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":0,"y":0,"w":384,"h":384},"sourceSize":{"w":384,"h":384}}},"meta":{"image":"atlas0_hq.png","format":"RGBA8888","size":{"w":1024,"h":512},"scale":"0.75"}}', -}; diff --git a/mod_examples/custom_keybinding.js b/mod_examples/custom_keybinding.js new file mode 100644 index 00000000..650065f0 --- /dev/null +++ b/mod_examples/custom_keybinding.js @@ -0,0 +1,27 @@ +// @ts-nocheck +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Custom Keybindings", + version: "1", + id: "base", + description: "Shows how to add a new keybinding", +}; + +class Mod extends shapez.Mod { + init() { + // Register keybinding + this.modInterface.registerIngameKeybinding({ + id: "demo_mod_binding", + keyCode: shapez.keyToKeyCode("F"), + translation: "Do something (always with SHIFT)", + modifiers: { + shift: true, + }, + handler: root => { + this.dialogs.showInfo("Mod Message", "It worked!"); + return shapez.STOP_PROPAGATION; + }, + }); + } +} diff --git a/mod_examples/modify_ui.js b/mod_examples/modify_ui.js new file mode 100644 index 00000000..749e191e --- /dev/null +++ b/mod_examples/modify_ui.js @@ -0,0 +1,41 @@ +// @ts-nocheck +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Modify UI", + version: "1", + id: "modify-ui", + description: "Shows how to modify a builtin game state, in this case the main menu", +}; + +class Mod extends shapez.Mod { + init() { + // Add fancy sign to main menu + this.signals.stateEntered.add(state => { + if (state.key === "MainMenuState") { + const element = document.createElement("div"); + element.id = "demo_mod_hello_world_element"; + document.body.appendChild(element); + + const button = document.createElement("button"); + button.classList.add("styledButton"); + button.innerText = "Hello!"; + button.addEventListener("click", () => { + this.dialogs.showInfo("Mod Message", "Button clicked!"); + }); + element.appendChild(button); + } + }); + + this.modInterface.registerCss(` + #demo_mod_hello_world_element { + position: absolute; + top: calc(10px * var(--ui-scale)); + left: calc(10px * var(--ui-scale)); + color: red; + z-index: 0; + } + + `); + } +} From dc95ece45b203315397543248090e84bdd944d0c Mon Sep 17 00:00:00 2001 From: tobspr Date: Tue, 18 Jan 2022 17:51:56 +0100 Subject: [PATCH 065/129] Update readme --- mod_examples/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mod_examples/README.md b/mod_examples/README.md index cadc3b17..53a4309e 100644 --- a/mod_examples/README.md +++ b/mod_examples/README.md @@ -9,6 +9,10 @@ Currently there are two options to develop mods for shapez.io: Since the `create-shapezio-mod` package is still in development, the current recommended way is to write single file mods, which I'll explain now. +## Mod Developer Discord + +A great place to get help with mod development is the official [shapez.io modloader discord]https://discord.gg/xq5v8uyMue). + ## Setting up your development environment The simplest way of developing mods is by just creating a `mymod.js` file and putting it in the `mods/` folder of the standalone (You can find the `mods/` folder by clicking "Open Mods Folder" in the shapez.io Standalone). From f3a939b071ba5119bb02385e76242f71af246309 Mon Sep 17 00:00:00 2001 From: tobspr Date: Tue, 18 Jan 2022 18:23:23 +0100 Subject: [PATCH 066/129] Add better instructions --- mod_examples/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod_examples/README.md b/mod_examples/README.md index 53a4309e..1545a46b 100644 --- a/mod_examples/README.md +++ b/mod_examples/README.md @@ -15,7 +15,7 @@ A great place to get help with mod development is the official [shapez.io modloa ## Setting up your development environment -The simplest way of developing mods is by just creating a `mymod.js` file and putting it in the `mods/` folder of the standalone (You can find the `mods/` folder by clicking "Open Mods Folder" in the shapez.io Standalone). +The simplest way of developing mods is by just creating a `mymod.js` file and putting it in the `mods/` folder of the standalone (You can find the `mods/` folder by clicking "Open Mods Folder" in the shapez.io Standalone, be sure to select the 1.5.0-modloader branch on Steam). You can then add `--dev` to the launch options on Steam. This adds an application menu where you can click "Restart" to reload your mod, and will also show the developer console where you can see any potential errors. From e686ad2fe1ae1bbf22864dc68644650219c294d6 Mon Sep 17 00:00:00 2001 From: Bagel03 <70449196+Bagel03@users.noreply.github.com> Date: Tue, 18 Jan 2022 12:37:52 -0500 Subject: [PATCH 067/129] Update JSDoc for Replacing Methods (#1336) * upgraded types for overriding methods * updated comments Co-authored-by: Edward Badel --- src/js/mods/mod_interface.js | 61 +++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index acf47caf..6fb54be1 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -27,6 +27,27 @@ import { THEMES } from "../game/theme"; import { ModMetaBuilding } from "./mod_meta_building"; import { BaseHUDPart } from "../game/hud/base_hud_part"; +/** + * @typedef {{new(...args: any[]): any, prototype: any}} constructable + */ + +/** + * @template {(...args: any[]) => any} F + * @template P + * @typedef {(...args: [P, Parameters]) => ReturnType} beforePrams IMPORTANT: this puts the original parameters into an array + */ + +/** + * @template {(...args: any[]) => any} F + * @template P + * @typedef {(...args: [...Parameters, P]) => ReturnType} afterPrams + */ + +/** + * @template {(...args: any[]) => any} F + * @typedef {(...args: [...Parameters, ...any]) => ReturnType} extendsPrams + */ + export class ModInterface { /** * @@ -364,28 +385,58 @@ export class ModInterface { } /** - * Patches a method on a given object + * Patches a method on a given class + * @template {constructable} C the class + * @template {C["prototype"]} P the prototype of said class + * @template {keyof P} M the name of the method we are overriding + * @template {extendsPrams} O the method that will override the old one + * @param {C} classHandle + * @param {M} methodName + * @param {beforePrams} override */ replaceMethod(classHandle, methodName, override) { const oldMethod = classHandle.prototype[methodName]; classHandle.prototype[methodName] = function () { + //@ts-ignore This is true I just cant tell it that arguments will be Arguments return override.call(this, oldMethod.bind(this), arguments); }; } + /** + * Runs before a method on a given class + * @template {constructable} C the class + * @template {C["prototype"]} P the prototype of said class + * @template {keyof P} M the name of the method we are overriding + * @template {extendsPrams} O the method that will run before the old one + * @param {C} classHandle + * @param {M} methodName + * @param {O} executeBefore + */ runBeforeMethod(classHandle, methodName, executeBefore) { const oldHandle = classHandle.prototype[methodName]; classHandle.prototype[methodName] = function () { - executeBefore.apply(this, arguments); - return oldHandle.apply(this, arguments); + //@ts-ignore Same as above + executeBefore.apply(this, ...arguments); + return oldHandle.apply(this, ...arguments); }; } + /** + * Runs after a method on a given class + * @template {constructable} C the class + * @template {C["prototype"]} P the prototype of said class + * @template {keyof P} M the name of the method we are overriding + * @template {extendsPrams} O the method that will run before the old one + * @param {C} classHandle + * @param {M} methodName + * @param {O} executeAfter + */ runAfterMethod(classHandle, methodName, executeAfter) { const oldHandle = classHandle.prototype[methodName]; classHandle.prototype[methodName] = function () { - const returnValue = oldHandle.apply(this, arguments); - executeAfter.apply(this, arguments); + const returnValue = oldHandle.apply(this, ...arguments); + //@ts-ignore + executeAfter.apply(this, ...arguments); return returnValue; }; } From 4a1bfcda640aa0d6088690a1804c2134f1b1c1ab Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Tue, 18 Jan 2022 17:39:02 +0000 Subject: [PATCH 068/129] Item acceptor refactor part 1 --- src/js/game/belt_path.js | 33 +-- src/js/game/buildings/balancer.js | 11 +- src/js/game/buildings/cutter.js | 2 +- src/js/game/buildings/filter.js | 2 +- src/js/game/buildings/goal_acceptor.js | 2 +- src/js/game/buildings/hub.js | 51 +++-- src/js/game/buildings/mixer.js | 4 +- src/js/game/buildings/painter.js | 25 ++- src/js/game/buildings/reader.js | 2 +- src/js/game/buildings/rotater.js | 2 +- src/js/game/buildings/stacker.js | 4 +- src/js/game/buildings/storage.js | 7 +- src/js/game/buildings/trash.js | 13 +- src/js/game/buildings/underground_belt.js | 5 +- src/js/game/components/belt.js | 2 +- src/js/game/components/item_acceptor.js | 126 ++++++----- src/js/game/components/item_ejector.js | 20 +- src/js/game/components/item_processor.js | 55 ++--- src/js/game/hud/parts/building_placer.js | 97 ++++----- src/js/game/logic.js | 26 ++- src/js/game/systems/item_acceptor.js | 136 ++++++++---- src/js/game/systems/item_ejector.js | 252 +++++++++++----------- src/js/game/systems/item_processor.js | 100 +++++---- 23 files changed, 493 insertions(+), 484 deletions(-) diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js index 8ad4f7e3..81a60951 100644 --- a/src/js/game/belt_path.js +++ b/src/js/game/belt_path.js @@ -132,14 +132,14 @@ export class BeltPath extends BasicSerializableObject { tryAcceptItem(item) { if (this.spacingToFirstItem >= globalConfig.itemSpacingOnBelts) { // So, since we already need one tick to accept this item we will add this directly. - const beltProgressPerTick = + const progressGrowth = this.root.hubGoals.getBeltBaseSpeed() * this.root.dynamicTickrate.deltaSeconds * globalConfig.itemSpacingOnBelts; // First, compute how much progress we can make *at max* const maxProgress = Math.max(0, this.spacingToFirstItem - globalConfig.itemSpacingOnBelts); - const initialProgress = Math.min(maxProgress, beltProgressPerTick); + const initialProgress = Math.min(maxProgress, progressGrowth); this.items.unshift([this.spacingToFirstItem - initialProgress, item]); this.spacingToFirstItem = initialProgress; @@ -272,31 +272,10 @@ export class BeltPath extends BasicSerializableObject { } const matchingSlotIndex = matchingSlot.index; - const passOver = this.computePassOverFunctionWithoutBelts(targetEntity, matchingSlotIndex); - if (!passOver) { - return; - } - const matchingDirection = enumInvertedDirections[ejectingDirection]; - const filter = matchingSlot.slot.filter; - return function (item, remainingProgress = 0.0) { - // Check if the acceptor has a filter - if (filter && item._type !== filter) { - return false; - } - - // Try to pass over - if (passOver(item, matchingSlotIndex)) { - // Trigger animation on the acceptor comp - if (noSimplifiedBelts) { - targetAcceptorComp.onItemAccepted( - matchingSlotIndex, - matchingDirection, - item, - remainingProgress - ); - } + return function (item, startProgress = 0.0) { + if (targetAcceptorComp.tryAcceptItem(matchingSlotIndex, matchingDirection, item, startProgress)) { return true; } return false; @@ -313,7 +292,7 @@ export class BeltPath extends BasicSerializableObject { const systems = this.root.systemMgr.systems; const hubGoals = this.root.hubGoals; - // NOTICE: THIS IS COPIED FROM THE ITEM EJECTOR SYSTEM FOR PEROFMANCE REASONS + // NOTICE: THIS IS COPIED FROM THE ITEM EJECTOR SYSTEM FOR PERFORMANCE REASONS const itemProcessorComp = entity.components.ItemProcessor; if (itemProcessorComp) { @@ -323,7 +302,7 @@ export class BeltPath extends BasicSerializableObject { if (!systems.itemProcessor.checkRequirements(entity, item, matchingSlotIndex)) { return; } - return itemProcessorComp.tryTakeItem(item, matchingSlotIndex); + //return itemProcessorComp.tryTakeItem(item, matchingSlotIndex); }; } diff --git a/src/js/game/buildings/balancer.js b/src/js/game/buildings/balancer.js index 0948338c..ce685a9a 100644 --- a/src/js/game/buildings/balancer.js +++ b/src/js/game/buildings/balancer.js @@ -179,11 +179,11 @@ export class MetaBalancerBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, { pos: new Vector(1, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, ]); @@ -204,15 +204,14 @@ export class MetaBalancerBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, { pos: new Vector(0, 0), - directions: [ + direction: variant === enumBalancerVariants.mergerInverse ? enumDirection.left : enumDirection.right, - ], }, ]); @@ -231,7 +230,7 @@ export class MetaBalancerBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, ]); diff --git a/src/js/game/buildings/cutter.js b/src/js/game/buildings/cutter.js index 4950f786..21acdaa0 100644 --- a/src/js/game/buildings/cutter.js +++ b/src/js/game/buildings/cutter.js @@ -96,7 +96,7 @@ export class MetaCutterBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "shape", }, ], diff --git a/src/js/game/buildings/filter.js b/src/js/game/buildings/filter.js index bf4c5f19..f8c29b1f 100644 --- a/src/js/game/buildings/filter.js +++ b/src/js/game/buildings/filter.js @@ -78,7 +78,7 @@ export class MetaFilterBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, ], }) diff --git a/src/js/game/buildings/goal_acceptor.js b/src/js/game/buildings/goal_acceptor.js index cb51a6d2..463798ad 100644 --- a/src/js/game/buildings/goal_acceptor.js +++ b/src/js/game/buildings/goal_acceptor.js @@ -45,7 +45,7 @@ export class MetaGoalAcceptorBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "shape", }, ], diff --git a/src/js/game/buildings/hub.js b/src/js/game/buildings/hub.js index 3a543cf0..f8ba4b82 100644 --- a/src/js/game/buildings/hub.js +++ b/src/js/game/buildings/hub.js @@ -1,6 +1,6 @@ import { enumDirection, Vector } from "../../core/vector"; import { HubComponent } from "../components/hub"; -import { ItemAcceptorComponent } from "../components/item_acceptor"; +import { enumItemAcceptorTypes, ItemAcceptorComponent } from "../components/item_acceptor"; import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor"; import { Entity } from "../entity"; import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; @@ -75,75 +75,96 @@ export class MetaHubBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.top, enumDirection.left], + direction: enumDirection.top, + filter: "shape", + }, + { + pos: new Vector(0, 0), + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(1, 0), - directions: [enumDirection.top], + direction: enumDirection.top, filter: "shape", }, { pos: new Vector(2, 0), - directions: [enumDirection.top], + direction: enumDirection.top, filter: "shape", }, { pos: new Vector(3, 0), - directions: [enumDirection.top, enumDirection.right], + direction: enumDirection.top, + filter: "shape", + }, + { + pos: new Vector(3, 0), + direction: enumDirection.right, filter: "shape", }, { pos: new Vector(0, 3), - directions: [enumDirection.bottom, enumDirection.left], + direction: enumDirection.left, + filter: "shape", + }, + { + pos: new Vector(0, 3), + direction: enumDirection.bottom, filter: "shape", }, { pos: new Vector(1, 3), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "shape", }, { pos: new Vector(2, 3), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "shape", }, { pos: new Vector(3, 3), - directions: [enumDirection.bottom, enumDirection.right], + direction: enumDirection.bottom, + filter: "shape", + }, + { + pos: new Vector(3, 3), + direction: enumDirection.right, filter: "shape", }, { pos: new Vector(0, 1), - directions: [enumDirection.left], + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(0, 2), - directions: [enumDirection.left], + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(0, 3), - directions: [enumDirection.left], + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(3, 1), - directions: [enumDirection.right], + direction: enumDirection.right, filter: "shape", }, { pos: new Vector(3, 2), - directions: [enumDirection.right], + direction: enumDirection.right, filter: "shape", }, { pos: new Vector(3, 3), - directions: [enumDirection.right], + direction: enumDirection.right, filter: "shape", }, ], + type: enumItemAcceptorTypes.hub, }) ); } diff --git a/src/js/game/buildings/mixer.js b/src/js/game/buildings/mixer.js index db8d867a..de1665c4 100644 --- a/src/js/game/buildings/mixer.js +++ b/src/js/game/buildings/mixer.js @@ -73,12 +73,12 @@ export class MetaMixerBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "color", }, { pos: new Vector(1, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "color", }, ], diff --git a/src/js/game/buildings/painter.js b/src/js/game/buildings/painter.js index 79ae86ac..432973d0 100644 --- a/src/js/game/buildings/painter.js +++ b/src/js/game/buildings/painter.js @@ -128,12 +128,12 @@ export class MetaPainterBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.left], + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(1, 0), - directions: [enumDirection.top], + direction: enumDirection.top, filter: "color", }, ], @@ -160,14 +160,13 @@ export class MetaPainterBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.left], + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(1, 0), - directions: [ + direction: variant === defaultBuildingVariant ? enumDirection.top : enumDirection.bottom, - ], filter: "color", }, ]); @@ -193,17 +192,17 @@ export class MetaPainterBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.left], + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(0, 1), - directions: [enumDirection.left], + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(1, 0), - directions: [enumDirection.top], + direction: enumDirection.top, filter: "color", }, ]); @@ -251,27 +250,27 @@ export class MetaPainterBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.left], + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "color", }, { pos: new Vector(1, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "color", }, { pos: new Vector(2, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "color", }, { pos: new Vector(3, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "color", }, ]); diff --git a/src/js/game/buildings/reader.js b/src/js/game/buildings/reader.js index 951c7e8a..5c9307c3 100644 --- a/src/js/game/buildings/reader.js +++ b/src/js/game/buildings/reader.js @@ -84,7 +84,7 @@ export class MetaReaderBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, ], }) diff --git a/src/js/game/buildings/rotater.js b/src/js/game/buildings/rotater.js index 428ab08a..e1080767 100644 --- a/src/js/game/buildings/rotater.js +++ b/src/js/game/buildings/rotater.js @@ -128,7 +128,7 @@ export class MetaRotaterBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "shape", }, ], diff --git a/src/js/game/buildings/stacker.js b/src/js/game/buildings/stacker.js index ad1a7bc7..f36ef248 100644 --- a/src/js/game/buildings/stacker.js +++ b/src/js/game/buildings/stacker.js @@ -73,12 +73,12 @@ export class MetaStackerBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "shape", }, { pos: new Vector(1, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "shape", }, ], diff --git a/src/js/game/buildings/storage.js b/src/js/game/buildings/storage.js index b63adc01..69e03608 100644 --- a/src/js/game/buildings/storage.js +++ b/src/js/game/buildings/storage.js @@ -1,7 +1,7 @@ import { formatBigNumber } from "../../core/utils"; import { enumDirection, Vector } from "../../core/vector"; import { T } from "../../translations"; -import { ItemAcceptorComponent } from "../components/item_acceptor"; +import { enumItemAcceptorTypes, ItemAcceptorComponent } from "../components/item_acceptor"; import { ItemEjectorComponent } from "../components/item_ejector"; import { StorageComponent } from "../components/storage"; import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; @@ -74,13 +74,14 @@ export class MetaStorageBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 1), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, { pos: new Vector(1, 1), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, ], + type: enumItemAcceptorTypes.storage, }) ); diff --git a/src/js/game/buildings/trash.js b/src/js/game/buildings/trash.js index 3085bc55..1524c480 100644 --- a/src/js/game/buildings/trash.js +++ b/src/js/game/buildings/trash.js @@ -74,15 +74,10 @@ export class MetaTrashBuilding extends MetaBuilding { entity.addComponent( new ItemAcceptorComponent({ slots: [ - { - pos: new Vector(0, 0), - directions: [ - enumDirection.top, - enumDirection.right, - enumDirection.bottom, - enumDirection.left, - ], - }, + { pos: new Vector(0, 0), direction: enumDirection.top }, + { pos: new Vector(0, 0), direction: enumDirection.left }, + { pos: new Vector(0, 0), direction: enumDirection.right }, + { pos: new Vector(0, 0), direction: enumDirection.bottom }, ], }) ); diff --git a/src/js/game/buildings/underground_belt.js b/src/js/game/buildings/underground_belt.js index 0f02863f..182ee9a8 100644 --- a/src/js/game/buildings/underground_belt.js +++ b/src/js/game/buildings/underground_belt.js @@ -1,6 +1,6 @@ import { Loader } from "../../core/loader"; import { enumDirection, Vector, enumAngleToDirection, enumDirectionToVector } from "../../core/vector"; -import { ItemAcceptorComponent } from "../components/item_acceptor"; +import { enumItemAcceptorTypes, ItemAcceptorComponent } from "../components/item_acceptor"; import { ItemEjectorComponent } from "../components/item_ejector"; import { enumUndergroundBeltMode, UndergroundBeltComponent } from "../components/underground_belt"; import { Entity } from "../entity"; @@ -195,6 +195,7 @@ export class MetaUndergroundBeltBuilding extends MetaBuilding { entity.addComponent( new ItemAcceptorComponent({ slots: [], + type: enumItemAcceptorTypes.undergroundBelt, }) ); } @@ -277,7 +278,7 @@ export class MetaUndergroundBeltBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, ]); return; diff --git a/src/js/game/components/belt.js b/src/js/game/components/belt.js index 3144ad96..81d2c65c 100644 --- a/src/js/game/components/belt.js +++ b/src/js/game/components/belt.js @@ -8,7 +8,7 @@ export const curvedBeltLength = /* Math.PI / 4 */ 0.78; /** @type {import("./item_acceptor").ItemAcceptorSlot} */ export const FAKE_BELT_ACCEPTOR_SLOT = { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }; /** @type {Object} */ diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index 354f9024..5b2b7122 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -1,27 +1,52 @@ import { enumDirection, enumInvertedDirections, Vector } from "../../core/vector"; -import { types } from "../../savegame/serialization"; import { BaseItem } from "../base_item"; import { Component } from "../component"; - -/** @typedef {{ - * pos: Vector, - * directions: enumDirection[], - * filter?: ItemType - * }} ItemAcceptorSlot */ +import { Entity } from "../entity"; +import { GameRoot } from "../root"; /** + * @typedef {{ + * pos: Vector, + * direction: enumDirection, + * filter?: ItemType + * }} ItemAcceptorSlot + * * Contains information about a slot plus its location * @typedef {{ - * slot: ItemAcceptorSlot, - * index: number, - * acceptedDirection: enumDirection - * }} ItemAcceptorLocatedSlot */ - -/** @typedef {{ + * slot: ItemAcceptorSlot, + * index: number, + * acceptedDirection: enumDirection + * }} ItemAcceptorLocatedSlot + * + * @typedef {{ * pos: Vector, - * directions: enumDirection[], + * direction: enumDirection, * filter?: ItemType - * }} ItemAcceptorSlotConfig */ + * }} ItemAcceptorSlotConfig + * + * @typedef {Map} ItemAcceptorInput + * + * @typedef {{ + * root: GameRoot, + * entity: Entity, + * item: BaseItem, + * slotIndex: number, + * extraProgress: number + * }} InputCompletedArgs + */ + +/** @enum {string} */ +export const enumItemAcceptorTypes = { + itemProcessor: "itemProcessor", + hub: "hub", + storage: "storage", + trash: "trash", + undergroundBelt: "undergroundBelt", +}; export class ItemAcceptorComponent extends Component { static getId() { @@ -32,25 +57,15 @@ export class ItemAcceptorComponent extends Component { * * @param {object} param0 * @param {Array} param0.slots The slots from which we accept items + * @param {enumItemAcceptorTypes=} param0.type Function that gets called when the input of an item is completed */ - constructor({ slots = [] }) { + constructor({ slots = [], type = enumItemAcceptorTypes.itemProcessor }) { super(); + /** @type {ItemAcceptorInput} */ + this.currentInputs = new Map(); // @SENSETODO does this need to be saved? + this.type = type; this.setSlots(slots); - this.clear(); - } - - clear() { - /** - * Fixes belt animations - * @type {Array<{ - * item: BaseItem, - * slotIndex: number, - * animProgress: number, - * direction: enumDirection - * }>} - */ - this.itemConsumptionAnimations = []; } /** @@ -64,7 +79,7 @@ export class ItemAcceptorComponent extends Component { const slot = slots[i]; this.slots.push({ pos: slot.pos, - directions: slot.directions, + direction: slot.direction, // Which type of item to accept (shape | color | all) @see ItemType filter: slot.filter, @@ -73,31 +88,28 @@ export class ItemAcceptorComponent extends Component { } /** - * Returns if this acceptor can accept a new item at slot N - * - * NOTICE: The belt path ignores this for performance reasons and does his own check - * @param {number} slotIndex - * @param {BaseItem=} item - */ - canAcceptItem(slotIndex, item) { - const slot = this.slots[slotIndex]; - return !slot.filter || slot.filter === item.getItemType(); - } - - /** - * Called when an item has been accepted so that + * Called when trying to input a new item * @param {number} slotIndex * @param {enumDirection} direction * @param {BaseItem} item - * @param {number} remainingProgress World space remaining progress, can be set to set the start position of the item + * @param {number} startProgress World space remaining progress, can be set to set the start position of the item + * @returns {boolean} if the input was succesful */ - onItemAccepted(slotIndex, direction, item, remainingProgress = 0.0) { - this.itemConsumptionAnimations.push({ + tryAcceptItem(slotIndex, direction, item, startProgress = 0.0) { + const slot = this.slots[slotIndex]; + + //@SENSETODO see if this works for buildings like hub + + if (this.currentInputs.has(slotIndex) || (slot.filter && slot.filter != item.getItemType())) { + return false; + } + + this.currentInputs.set(slotIndex, { item, - slotIndex, direction, - animProgress: Math.min(1, remainingProgress * 2), + animProgress: Math.min(1, startProgress), }); + return true; } /** @@ -121,16 +133,12 @@ export class ItemAcceptorComponent extends Component { continue; } - // Check if the acceptor slot accepts items from our direction - for (let i = 0; i < slot.directions.length; ++i) { - // const localDirection = targetStaticComp.localDirectionToWorld(slot.directions[l]); - if (desiredDirection === slot.directions[i]) { - return { - slot, - index: slotIndex, - acceptedDirection: desiredDirection, - }; - } + if (desiredDirection === slot.direction) { + return { + slot, + index: slotIndex, + acceptedDirection: desiredDirection, + }; } } diff --git a/src/js/game/components/item_ejector.js b/src/js/game/components/item_ejector.js index bfc54cd8..b6d21e6a 100644 --- a/src/js/game/components/item_ejector.js +++ b/src/js/game/components/item_ejector.js @@ -70,7 +70,7 @@ export class ItemEjectorComponent extends Component { direction: slot.direction, item: null, lastItem: null, - progress: 0, + progress: 0, //@SENSETODO needs to be started off with extra time cachedDestSlot: null, cachedTargetEntity: null, }); @@ -127,28 +127,16 @@ export class ItemEjectorComponent extends Component { * Tries to eject a given item * @param {number} slotIndex * @param {BaseItem} item + * @param {number} startingProgress * @returns {boolean} */ - tryEject(slotIndex, item) { + tryEject(slotIndex, item, startingProgress = 0.0) { if (!this.canEjectOnSlot(slotIndex)) { return false; } this.slots[slotIndex].item = item; this.slots[slotIndex].lastItem = item; - this.slots[slotIndex].progress = 0; + this.slots[slotIndex].progress = startingProgress; return true; } - - /** - * Clears the given slot and returns the item it had - * @param {number} slotIndex - * @returns {BaseItem|null} - */ - takeSlotItem(slotIndex) { - const slot = this.slots[slotIndex]; - const item = slot.item; - slot.item = null; - slot.progress = 0.0; - return item; - } } diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index f7dddec1..749c1038 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -27,16 +27,23 @@ export const enumItemProcessorRequirements = { painterQuad: "painterQuad", }; -/** @typedef {{ +/** + * @typedef {{ * item: BaseItem, * requiredSlot?: number, * preferredSlot?: number - * }} EjectorItemToEject */ - -/** @typedef {{ + * }} EjectorItemToEject + * + * @typedef {{ * remainingTime: number, * items: Array, - * }} EjectorCharge */ + * }} EjectorCharge + * + * @typedef {{ + * item: BaseItem + * extraProgress: number + * }} ItemProcessorInput + */ export class ItemProcessorComponent extends Component { static getId() { @@ -75,9 +82,9 @@ export class ItemProcessorComponent extends Component { /** * Our current inputs - * @type {Map} + * @type {Map} */ - this.inputSlots = new Map(); + this.inputs = new Map(); this.clear(); } @@ -88,13 +95,7 @@ export class ItemProcessorComponent extends Component { // sure the outputs always match this.nextOutputSlot = 0; - this.inputSlots.clear(); - - /** - * Current input count - * @type {number} - */ - this.inputCount = 0; + this.inputs.clear(); /** * What we are currently processing, empty if we don't produce anything rn @@ -110,30 +111,4 @@ export class ItemProcessorComponent extends Component { */ this.bonusTime = 0; } - - /** - * Tries to take the item - * @param {BaseItem} item - * @param {number} sourceSlot - */ - tryTakeItem(item, sourceSlot) { - if ( - this.type === enumItemProcessorTypes.hub || - this.type === enumItemProcessorTypes.trash || - this.type === enumItemProcessorTypes.goal - ) { - // Hub has special logic .. not really nice but efficient. - this.inputSlots.set(this.inputCount, item); - this.inputCount++; - return true; - } - - // Check that we only take one item per slot - if (this.inputSlots.has(sourceSlot)) { - return false; - } - this.inputSlots.set(sourceSlot, item); - this.inputCount++; - return true; - } } diff --git a/src/js/game/hud/parts/building_placer.js b/src/js/game/hud/parts/building_placer.js index ee7bc804..a5609f1f 100644 --- a/src/js/game/hud/parts/building_placer.js +++ b/src/js/game/hud/parts/building_placer.js @@ -500,65 +500,58 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { const acceptorSlotWsTile = staticComp.localTileToWorld(slot.pos); const acceptorSlotWsPos = acceptorSlotWsTile.toWorldSpaceCenterOfTile(); - // Go over all slots - for ( - let acceptorDirectionIndex = 0; - acceptorDirectionIndex < slot.directions.length; - ++acceptorDirectionIndex - ) { - const direction = slot.directions[acceptorDirectionIndex]; - const worldDirection = staticComp.localDirectionToWorld(direction); + const direction = slot.direction; + const worldDirection = staticComp.localDirectionToWorld(direction); - // Figure out which tile ejects to this slot - const sourceTile = acceptorSlotWsTile.add(enumDirectionToVector[worldDirection]); + // Figure out which tile ejects to this slot + const sourceTile = acceptorSlotWsTile.add(enumDirectionToVector[worldDirection]); - let isBlocked = false; - let isConnected = false; + let isBlocked = false; + let isConnected = false; - // Find all entities which are on that tile - const sourceEntities = this.root.map.getLayersContentsMultipleXY(sourceTile.x, sourceTile.y); + // Find all entities which are on that tile + const sourceEntities = this.root.map.getLayersContentsMultipleXY(sourceTile.x, sourceTile.y); - // Check for every entity: - for (let i = 0; i < sourceEntities.length; ++i) { - const sourceEntity = sourceEntities[i]; - const sourceEjector = sourceEntity.components.ItemEjector; - const sourceBeltComp = sourceEntity.components.Belt; - const sourceStaticComp = sourceEntity.components.StaticMapEntity; - const ejectorAcceptLocalTile = sourceStaticComp.worldToLocalTile(acceptorSlotWsTile); + // Check for every entity: + for (let i = 0; i < sourceEntities.length; ++i) { + const sourceEntity = sourceEntities[i]; + const sourceEjector = sourceEntity.components.ItemEjector; + const sourceBeltComp = sourceEntity.components.Belt; + const sourceStaticComp = sourceEntity.components.StaticMapEntity; + const ejectorAcceptLocalTile = sourceStaticComp.worldToLocalTile(acceptorSlotWsTile); - // If this entity is on the same layer as the slot - if so, it can either be - // connected, or it can not be connected and thus block the input - if (sourceEjector && sourceEjector.anySlotEjectsToLocalTile(ejectorAcceptLocalTile)) { - // This one is connected, all good - isConnected = true; - } else if ( - sourceBeltComp && - sourceStaticComp.localDirectionToWorld(sourceBeltComp.direction) === - enumInvertedDirections[worldDirection] - ) { - // Belt connected - isConnected = true; - } else { - // This one is blocked - isBlocked = true; - } + // If this entity is on the same layer as the slot - if so, it can either be + // connected, or it can not be connected and thus block the input + if (sourceEjector && sourceEjector.anySlotEjectsToLocalTile(ejectorAcceptLocalTile)) { + // This one is connected, all good + isConnected = true; + } else if ( + sourceBeltComp && + sourceStaticComp.localDirectionToWorld(sourceBeltComp.direction) === + enumInvertedDirections[worldDirection] + ) { + // Belt connected + isConnected = true; + } else { + // This one is blocked + isBlocked = true; } - - const alpha = isConnected || isBlocked ? 1.0 : 0.3; - const sprite = isBlocked ? badArrowSprite : goodArrowSprite; - - parameters.context.globalAlpha = alpha; - drawRotatedSprite({ - parameters, - sprite, - x: acceptorSlotWsPos.x, - y: acceptorSlotWsPos.y, - angle: Math.radians(enumDirectionToAngle[enumInvertedDirections[worldDirection]]), - size: 13, - offsetY: offsetShift + 13, - }); - parameters.context.globalAlpha = 1; } + + const alpha = isConnected || isBlocked ? 1.0 : 0.3; + const sprite = isBlocked ? badArrowSprite : goodArrowSprite; + + parameters.context.globalAlpha = alpha; + drawRotatedSprite({ + parameters, + sprite, + x: acceptorSlotWsPos.x, + y: acceptorSlotWsPos.y, + angle: Math.radians(enumDirectionToAngle[enumInvertedDirections[worldDirection]]), + size: 13, + offsetY: offsetShift + 13, + }); + parameters.context.globalAlpha = 1; } // Go over all slots diff --git a/src/js/game/logic.js b/src/js/game/logic.js index 79104958..8d251859 100644 --- a/src/js/game/logic.js +++ b/src/js/game/logic.js @@ -431,22 +431,20 @@ export class GameLogic { } } - for (let acceptorSlot = 0; acceptorSlot < acceptorSlots.length; ++acceptorSlot) { - const slot = acceptorSlots[acceptorSlot]; + for (let i = 0; i < acceptorSlots.length; ++i) { + const slot = acceptorSlots[i]; const wsTile = staticComp.localTileToWorld(slot.pos); - for (let k = 0; k < slot.directions.length; ++k) { - const direction = slot.directions[k]; - const wsDirection = staticComp.localDirectionToWorld(direction); + const direction = slot.direction; + const wsDirection = staticComp.localDirectionToWorld(direction); - const sourceTile = wsTile.add(enumDirectionToVector[wsDirection]); - if (sourceTile.equals(tile)) { - acceptors.push({ - entity, - slot, - toTile: wsTile, - fromDirection: wsDirection, - }); - } + const sourceTile = wsTile.add(enumDirectionToVector[wsDirection]); + if (sourceTile.equals(tile)) { + acceptors.push({ + entity, + slot, + toTile: wsTile, + fromDirection: wsDirection, + }); } } } diff --git a/src/js/game/systems/item_acceptor.js b/src/js/game/systems/item_acceptor.js index 780b4abd..61bf780a 100644 --- a/src/js/game/systems/item_acceptor.js +++ b/src/js/game/systems/item_acceptor.js @@ -1,58 +1,67 @@ import { globalConfig } from "../../core/config"; import { DrawParameters } from "../../core/draw_parameters"; -import { fastArrayDelete } from "../../core/utils"; import { enumDirectionToVector } from "../../core/vector"; -import { ItemAcceptorComponent } from "../components/item_acceptor"; +import { + enumItemAcceptorTypes, + ItemAcceptorComponent, + InputCompletedArgs, +} from "../components/item_acceptor"; import { GameSystemWithFilter } from "../game_system_with_filter"; +import { ShapeItem } from "../items/shape_item"; import { MapChunkView } from "../map_chunk_view"; export class ItemAcceptorSystem extends GameSystemWithFilter { constructor(root) { super(root, [ItemAcceptorComponent]); - // Well ... it's better to be verbose I guess? - this.accumulatedTicksWhileInMapOverview = 0; + /** + * @type {Object} + */ + this.handlers = { + [enumItemAcceptorTypes.itemProcessor]: this.input_ITEMPROCESSOR, + [enumItemAcceptorTypes.hub]: this.input_HUB, + [enumItemAcceptorTypes.trash]: this.input_TRASH, + }; + + // Bind all handlers + for (const key in this.handlers) { + this.handlers[key] = this.handlers[key].bind(this); + } } update() { - if (this.root.app.settings.getAllSettings().simplifiedBelts) { - // Disabled in potato mode - return; - } - - // This system doesn't render anything while in map overview, - // so simply accumulate ticks - if (this.root.camera.getIsMapOverlayActive()) { - ++this.accumulatedTicksWhileInMapOverview; - return; - } - - // Compute how much ticks we missed - const numTicks = 1 + this.accumulatedTicksWhileInMapOverview; - const progress = - this.root.dynamicTickrate.deltaSeconds * + // * 2 because its only a half tile - (same code as ejector) + const progressGrowth = 2 * + this.root.dynamicTickrate.deltaSeconds * this.root.hubGoals.getBeltBaseSpeed() * - globalConfig.itemSpacingOnBelts * // * 2 because its only a half tile - numTicks; - - // Reset accumulated ticks - this.accumulatedTicksWhileInMapOverview = 0; + globalConfig.itemSpacingOnBelts; for (let i = 0; i < this.allEntities.length; ++i) { const entity = this.allEntities[i]; - const aceptorComp = entity.components.ItemAcceptor; - const animations = aceptorComp.itemConsumptionAnimations; + const acceptorComp = entity.components.ItemAcceptor; + const inputs = acceptorComp.currentInputs; - // Process item consumption animations to avoid items popping from the belts - for (let animIndex = 0; animIndex < animations.length; ++animIndex) { - const anim = animations[animIndex]; - anim.animProgress += progress; - if (anim.animProgress > 1) { - fastArrayDelete(animations, animIndex); - animIndex -= 1; - } - } + inputs.forEach((values, index) => { + if (values.animProgress >= 1) return; // items which are inputted already + + values.animProgress += progressGrowth; + + if (values.animProgress < 1) return; + + /** @type {function(InputCompletedArgs) : string} */ + const handler = this.handlers[acceptorComp.type]; + assert(handler, "No handler for acceptor type defined: " + acceptorComp.type); + + // Call implementation + handler({ + root: this.root, + entity, + item: values.item, + slotIndex: index, + extraProgress: values.animProgress - 1, + }); + }); } } @@ -75,17 +84,16 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { } const staticComp = entity.components.StaticMapEntity; - for (let animIndex = 0; animIndex < acceptorComp.itemConsumptionAnimations.length; ++animIndex) { - const { item, slotIndex, animProgress, direction } = acceptorComp.itemConsumptionAnimations[ - animIndex - ]; + acceptorComp.currentInputs.forEach((values, index) => { + const { item, animProgress, direction } = values; + if (animProgress >= 1) return; // items which are inputted already - const slotData = acceptorComp.slots[slotIndex]; + const slotData = acceptorComp.slots[index]; const realSlotPos = staticComp.localTileToWorld(slotData.pos); if (!chunk.tileSpaceRectangle.containsPoint(realSlotPos.x, realSlotPos.y)) { // Not within this chunk - continue; + return; } const fadeOutDirection = enumDirectionToVector[staticComp.localDirectionToWorld(direction)]; @@ -100,7 +108,49 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { parameters, globalConfig.defaultItemDiameter ); - } + }); } } + + /** + * @param {InputCompletedArgs} args + */ + input_ITEMPROCESSOR(args) { + const entity = args.entity; + + const itemProcessorComp = entity.components.ItemProcessor; + assert(itemProcessorComp, "No item processor to input item to"); + + itemProcessorComp.inputs.set(args.slotIndex, { + item: args.item, + extraProgress: args.extraProgress, + }); // in the future the item processor will not need a list of items + } + //@SENSETODO this isn't set up like it should be yet + + /** + * @param {InputCompletedArgs} args + */ + input_HUB(args) { + const item = /** @type {ShapeItem} */ (args.item); + assert(item instanceof ShapeItem, "Input for hub is not a shape"); + + this.root.hubGoals.handleDefinitionDelivered(item.definition); + + const acceptorComp = args.entity.components.ItemAcceptor; + acceptorComp.currentInputs.delete(args.slotIndex); + } + + /** + * @param {InputCompletedArgs} args + */ + input_TRASH(args) { + // just remove the item + const acceptorComp = args.entity.components.ItemAcceptor; + acceptorComp.currentInputs.delete(args.slotIndex); + } + + //storage + + //underground belt } diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index db37455a..8f08b6b0 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -139,169 +139,76 @@ export class ItemEjectorSystem extends GameSystemWithFilter { update() { this.staleAreaDetector.update(); - // Precompute effective belt speed - let progressGrowth = 2 * this.root.dynamicTickrate.deltaSeconds; - - if (G_IS_DEV && globalConfig.debug.instantBelts) { - progressGrowth = 1; - } + // * 2 because its only a half tile - (same code as acceptor) + const progressGrowth = + 2 * + this.root.dynamicTickrate.deltaSeconds * + this.root.hubGoals.getBeltBaseSpeed() * + globalConfig.itemSpacingOnBelts; // Go over all cache entries for (let i = 0; i < this.allEntities.length; ++i) { - const sourceEntity = this.allEntities[i]; - const sourceEjectorComp = sourceEntity.components.ItemEjector; + const entity = this.allEntities[i]; + const ejectorComp = entity.components.ItemEjector; + const slots = ejectorComp.slots; - const slots = sourceEjectorComp.slots; for (let j = 0; j < slots.length; ++j) { - const sourceSlot = slots[j]; - const item = sourceSlot.item; + const slot = slots[j]; + const item = slot.item; if (!item) { - // No item available to be ejected + // No output in progress continue; } // Advance items on the slot - sourceSlot.progress = Math.min( - 1, - sourceSlot.progress + - progressGrowth * - this.root.hubGoals.getBeltBaseSpeed() * - globalConfig.itemSpacingOnBelts - ); + // @SENSETODO do we really want to cap it at one, or should the excess get passed on? + slot.progress = Math.min(1, slot.progress + progressGrowth); if (G_IS_DEV && globalConfig.debug.disableEjectorProcessing) { - sourceSlot.progress = 1.0; + slot.progress = 1; } // Check if we are still in the process of ejecting, can't proceed then - if (sourceSlot.progress < 1.0) { + if (slot.progress < 1) { continue; } // Check if we are ejecting to a belt path - const destPath = sourceSlot.cachedBeltPath; + const destPath = slot.cachedBeltPath; if (destPath) { // Try passing the item over if (destPath.tryAcceptItem(item)) { - sourceSlot.item = null; + slot.item = null; } - // Always stop here, since there can *either* be a belt path *or* - // a slot + // Always stop here, since there can *either* be a belt path *or* an acceptor continue; } // Check if the target acceptor can actually accept this item - const destEntity = sourceSlot.cachedTargetEntity; - const destSlot = sourceSlot.cachedDestSlot; - if (destSlot) { + const destEntity = slot.cachedTargetEntity; + const destSlot = slot.cachedDestSlot; + if (destEntity && destSlot) { const targetAcceptorComp = destEntity.components.ItemAcceptor; - if (!targetAcceptorComp.canAcceptItem(destSlot.index, item)) { - continue; - } - - // Try to hand over the item - if (this.tryPassOverItem(item, destEntity, destSlot.index)) { + const extraProgress = slot.progress - 1; + if ( + targetAcceptorComp.tryAcceptItem( + destSlot.index, + destSlot.acceptedDirection, + item, + extraProgress + ) + ) { // Handover successful, clear slot - if (!this.root.app.settings.getAllSettings().simplifiedBelts) { - targetAcceptorComp.onItemAccepted( - destSlot.index, - destSlot.acceptedDirection, - item - ); - } - sourceSlot.item = null; - continue; + slot.item = null; } } + + //@SENSETODO deal with other buildings - acceptor code on them needs to be different! } } } - /** - * - * @param {BaseItem} item - * @param {Entity} receiver - * @param {number} slotIndex - */ - tryPassOverItem(item, receiver, slotIndex) { - // Try figuring out how what to do with the item - // @TODO: Kinda hacky. How to solve this properly? Don't want to go through inheritance hell. - - const beltComp = receiver.components.Belt; - if (beltComp) { - const path = beltComp.assignedPath; - assert(path, "belt has no path"); - if (path.tryAcceptItem(item)) { - return true; - } - // Belt can have nothing else - return false; - } - - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - // - // NOTICE ! THIS CODE IS DUPLICATED IN THE BELT PATH FOR PERFORMANCE REASONS - // - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - - const itemProcessorComp = receiver.components.ItemProcessor; - if (itemProcessorComp) { - // Check for potential filters - if (!this.root.systemMgr.systems.itemProcessor.checkRequirements(receiver, item, slotIndex)) { - return false; - } - - // Its an item processor .. - if (itemProcessorComp.tryTakeItem(item, slotIndex)) { - return true; - } - // Item processor can have nothing else - return false; - } - - const undergroundBeltComp = receiver.components.UndergroundBelt; - if (undergroundBeltComp) { - // Its an underground belt. yay. - if ( - undergroundBeltComp.tryAcceptExternalItem( - item, - this.root.hubGoals.getUndergroundBeltBaseSpeed() - ) - ) { - return true; - } - - // Underground belt can have nothing else - return false; - } - - const storageComp = receiver.components.Storage; - if (storageComp) { - // It's a storage - if (storageComp.canAcceptItem(item)) { - storageComp.takeItem(item); - return true; - } - - // Storage can't have anything else - return false; - } - - const filterComp = receiver.components.Filter; - if (filterComp) { - // It's a filter! Unfortunately the filter has to know a lot about it's - // surrounding state and components, so it can't be within the component itself. - if (this.root.systemMgr.systems.filter.tryAcceptItem(receiver, slotIndex, item)) { - return true; - } - } - - return false; - } - /** * @param {DrawParameters} parameters * @param {MapChunkView} chunk @@ -390,11 +297,6 @@ export class ItemEjectorSystem extends GameSystemWithFilter { progress = Math.min(maxProgress, progress); } - // Skip if the item would barely be visible - if (progress < 0.05) { - continue; - } - const realPosition = staticComp.localTileToWorld(slot.pos); if (!chunk.tileSpaceRectangle.containsPoint(realPosition.x, realPosition.y)) { // Not within this chunk @@ -419,4 +321,90 @@ export class ItemEjectorSystem extends GameSystemWithFilter { } } } + + /////////////////////////////////////////////////////// OBSOLETE + + /** + * + * @param {BaseItem} item + * @param {Entity} receiver + * @param {number} slotIndex + */ + tryPassOverItem(item, receiver, slotIndex) { + // Try figuring out how what to do with the item + // @TODO: Kinda hacky. How to solve this properly? Don't want to go through inheritance hell. + + const beltComp = receiver.components.Belt; + if (beltComp) { + const path = beltComp.assignedPath; + assert(path, "belt has no path"); + if (path.tryAcceptItem(item)) { + return true; + } + // Belt can have nothing else + return false; + } + + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + // + // NOTICE ! THIS CODE IS DUPLICATED IN THE BELT PATH FOR PERFORMANCE REASONS + // + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + + const itemProcessorComp = receiver.components.ItemProcessor; + if (itemProcessorComp) { + // Check for potential filters + if (!this.root.systemMgr.systems.itemProcessor.checkRequirements(receiver, item, slotIndex)) { + return false; + } + + // Its an item processor .. + //if (itemProcessorComp.tryTakeItem(item, slotIndex)) { + // return true; + //} + // Item processor can have nothing else + return false; + } + + const undergroundBeltComp = receiver.components.UndergroundBelt; + if (undergroundBeltComp) { + // Its an underground belt. yay. + if ( + undergroundBeltComp.tryAcceptExternalItem( + item, + this.root.hubGoals.getUndergroundBeltBaseSpeed() + ) + ) { + return true; + } + + // Underground belt can have nothing else + return false; + } + + const storageComp = receiver.components.Storage; + if (storageComp) { + // It's a storage + if (storageComp.canAcceptItem(item)) { + storageComp.takeItem(item); + return true; + } + + // Storage can't have anything else + return false; + } + + const filterComp = receiver.components.Filter; + if (filterComp) { + // It's a filter! Unfortunately the filter has to know a lot about it's + // surrounding state and components, so it can't be within the component itself. + if (this.root.systemMgr.systems.filter.tryAcceptItem(receiver, slotIndex, item)) { + return true; + } + } + + return false; + } } diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 36c837fb..bb5e9849 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -15,6 +15,7 @@ import { ShapeItem } from "../items/shape_item"; /** * We need to allow queuing charges, otherwise the throughput will stall */ +//@SENSETODO not sure if this is true anymore const MAX_QUEUED_CHARGES = 2; /** @@ -22,6 +23,7 @@ const MAX_QUEUED_CHARGES = 2; * * @typedef {{ * item: BaseItem, + * extraProgress?: number, * preferredSlot?: number, * requiredSlot?: number, * doNotTrack?: boolean @@ -32,8 +34,7 @@ const MAX_QUEUED_CHARGES = 2; * Type of a processor implementation * @typedef {{ * entity: Entity, - * items: Map, - * inputCount: number, + * inputs: Map, * outItems: Array * }} ProcessorImplementationPayload */ @@ -133,6 +134,8 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } } + //@SENSETODO add code in here that handles queued outputs -rearrange where this is too + // If the charge was entirely emptied to the outputs, start the next charge if (itemsToEject.length === 0) { processorComp.ongoingCharges.shift(); @@ -195,7 +198,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // DEFAULT // By default, we can start processing once all inputs are there case null: { - return processorComp.inputCount >= processorComp.inputsPerCharge; + return processorComp.inputs.size >= processorComp.inputsPerCharge; } // QUAD PAINTER @@ -204,7 +207,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const pinsComp = entity.components.WiredPins; // First slot is the shape, so if it's not there we can't do anything - const shapeItem = /** @type {ShapeItem} */ (processorComp.inputSlots.get(0)); + const shapeItem = /** @type {ShapeItem} */ (processorComp.inputs.get(0).item); if (!shapeItem) { return false; } @@ -233,7 +236,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // Check if all colors of the enabled slots are there for (let i = 0; i < slotStatus.length; ++i) { - if (slotStatus[i] && !processorComp.inputSlots.get(1 + i)) { + if (slotStatus[i] && !processorComp.inputs.get(1 + i)) { // A slot which is enabled wasn't enabled. Make sure if there is anything on the quadrant, // it is not possible to paint, but if there is nothing we can ignore it for (let j = 0; j < 4; ++j) { @@ -260,8 +263,8 @@ export class ItemProcessorSystem extends GameSystemWithFilter { startNewCharge(entity) { const processorComp = entity.components.ItemProcessor; - // First, take items - const items = processorComp.inputSlots; + // First, take inputs + const inputs = processorComp.inputs; /** @type {Array} */ const outItems = []; @@ -273,9 +276,8 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // Call implementation handler({ entity, - items, + inputs: inputs, outItems, - inputCount: processorComp.inputCount, }); // Track produced items @@ -298,8 +300,8 @@ export class ItemProcessorSystem extends GameSystemWithFilter { remainingTime: timeToProcess, }); - processorComp.inputSlots.clear(); - processorComp.inputCount = 0; + processorComp.inputs.clear(); //@SENSETODO temp, will completely replace processorcomp.inputs with acceptor inputs later + entity.components.ItemAcceptor.currentInputs.clear(); } /** @@ -314,12 +316,12 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const processorComp = payload.entity.components.ItemProcessor; for (let i = 0; i < 2; ++i) { - const item = payload.items.get(i); - if (!item) { + const input = payload.inputs.get(i); + if (!input || !input.item) { continue; } payload.outItems.push({ - item, + item: input.item, preferredSlot: processorComp.nextOutputSlot++ % availableSlots, doNotTrack: true, }); @@ -331,7 +333,8 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_CUTTER(payload) { - const inputItem = /** @type {ShapeItem} */ (payload.items.get(0)); + const input = payload.inputs.get(0); + const inputItem = /** @type {ShapeItem} */ (input.item); assert(inputItem instanceof ShapeItem, "Input for cut is not a shape"); const inputDefinition = inputItem.definition; @@ -357,7 +360,8 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_CUTTER_QUAD(payload) { - const inputItem = /** @type {ShapeItem} */ (payload.items.get(0)); + const input = payload.inputs.get(0); + const inputItem = /** @type {ShapeItem} */ (input.item); assert(inputItem instanceof ShapeItem, "Input for cut is not a shape"); const inputDefinition = inputItem.definition; @@ -383,7 +387,8 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_ROTATER(payload) { - const inputItem = /** @type {ShapeItem} */ (payload.items.get(0)); + const input = payload.inputs.get(0); + const inputItem = /** @type {ShapeItem} */ (input.item); assert(inputItem instanceof ShapeItem, "Input for rotation is not a shape"); const inputDefinition = inputItem.definition; @@ -397,7 +402,8 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_ROTATER_CCW(payload) { - const inputItem = /** @type {ShapeItem} */ (payload.items.get(0)); + const input = payload.inputs.get(0); + const inputItem = /** @type {ShapeItem} */ (input.item); assert(inputItem instanceof ShapeItem, "Input for rotation is not a shape"); const inputDefinition = inputItem.definition; @@ -411,7 +417,8 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_ROTATER_180(payload) { - const inputItem = /** @type {ShapeItem} */ (payload.items.get(0)); + const input = payload.inputs.get(0); + const inputItem = /** @type {ShapeItem} */ (input.item); assert(inputItem instanceof ShapeItem, "Input for rotation is not a shape"); const inputDefinition = inputItem.definition; @@ -425,8 +432,10 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_STACKER(payload) { - const lowerItem = /** @type {ShapeItem} */ (payload.items.get(0)); - const upperItem = /** @type {ShapeItem} */ (payload.items.get(1)); + const lowerInput = payload.inputs.get(0); + const upperInput = payload.inputs.get(0); + const lowerItem = /** @type {ShapeItem} */ (lowerInput.item); + const upperItem = /** @type {ShapeItem} */ (upperInput.item); assert(lowerItem instanceof ShapeItem, "Input for lower stack is not a shape"); assert(upperItem instanceof ShapeItem, "Input for upper stack is not a shape"); @@ -451,9 +460,11 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_MIXER(payload) { + const input1 = payload.inputs.get(0); + const input2 = payload.inputs.get(1); // Find both colors and combine them - const item1 = /** @type {ColorItem} */ (payload.items.get(0)); - const item2 = /** @type {ColorItem} */ (payload.items.get(1)); + const item1 = /** @type {ColorItem} */ (input1.item); + const item2 = /** @type {ColorItem} */ (input2.item); assert(item1 instanceof ColorItem, "Input for color mixer is not a color"); assert(item2 instanceof ColorItem, "Input for color mixer is not a color"); @@ -475,8 +486,10 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_PAINTER(payload) { - const shapeItem = /** @type {ShapeItem} */ (payload.items.get(0)); - const colorItem = /** @type {ColorItem} */ (payload.items.get(1)); + const input1 = payload.inputs.get(0); + const input2 = payload.inputs.get(1); + const shapeItem = /** @type {ShapeItem} */ (input1.item); + const colorItem = /** @type {ColorItem} */ (input2.item); const colorizedDefinition = this.root.shapeDefinitionMgr.shapeActionPaintWith( shapeItem.definition, @@ -492,9 +505,9 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_PAINTER_DOUBLE(payload) { - const shapeItem1 = /** @type {ShapeItem} */ (payload.items.get(0)); - const shapeItem2 = /** @type {ShapeItem} */ (payload.items.get(1)); - const colorItem = /** @type {ColorItem} */ (payload.items.get(2)); + const shapeItem1 = /** @type {ShapeItem} */ (payload.inputs.get(0).item); + const shapeItem2 = /** @type {ShapeItem} */ (payload.inputs.get(1).item); + const colorItem = /** @type {ColorItem} */ (payload.inputs.get(2).item); assert(shapeItem1 instanceof ShapeItem, "Input for painter is not a shape"); assert(shapeItem2 instanceof ShapeItem, "Input for painter is not a shape"); @@ -522,13 +535,14 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_PAINTER_QUAD(payload) { - const shapeItem = /** @type {ShapeItem} */ (payload.items.get(0)); + const input = payload.inputs.get(0); + const shapeItem = /** @type {ShapeItem} */ (input.item); assert(shapeItem instanceof ShapeItem, "Input for painter is not a shape"); /** @type {Array} */ const colors = [null, null, null, null]; for (let i = 0; i < 4; ++i) { - const colorItem = /** @type {ColorItem} */ (payload.items.get(i + 1)); + const colorItem = /** @type {ColorItem} */ (payload.inputs.get(i + 1).item); if (colorItem) { colors[i] = colorItem.color; } @@ -549,7 +563,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { */ process_READER(payload) { // Pass through the item - const item = payload.items.get(0); + const item = payload.inputs.get(0).item; payload.outItems.push({ item, doNotTrack: true, @@ -565,17 +579,17 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_HUB(payload) { - const hubComponent = payload.entity.components.Hub; - assert(hubComponent, "Hub item processor has no hub component"); - - // Hardcoded - for (let i = 0; i < payload.inputCount; ++i) { - const item = /** @type {ShapeItem} */ (payload.items.get(i)); - if (!item) { - continue; - } - this.root.hubGoals.handleDefinitionDelivered(item.definition); - } + //const input = payload.inputs.get(i); + //const hubComponent = payload.entity.components.Hub; + //assert(hubComponent, "Hub item processor has no hub component"); + //// Hardcoded + //for (let i = 0; i < payload.inputCount; ++i) { + // const item = /** @type {ShapeItem} */ (payload.inputs.get(i)); + // if (!item) { + // continue; + // } + // this.root.hubGoals.handleDefinitionDelivered(item.definition); + //} } /** @@ -583,7 +597,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { */ process_GOAL(payload) { const goalComp = payload.entity.components.GoalAcceptor; - const item = payload.items.get(0); + const item = payload.inputs.get(0).item; const now = this.root.time.now(); if (goalComp.item && !item.equals(goalComp.item)) { From 4a76135d575d250515781531077a7b9d00fcb3ec Mon Sep 17 00:00:00 2001 From: tobspr Date: Tue, 18 Jan 2022 20:38:20 +0100 Subject: [PATCH 069/129] Direction lock now indicates when there is a building inbetween --- mod_examples/buildings_have_cost.js | 4 +- mod_examples/custom_theme.js | 4 + src/js/game/blueprint.js | 6 +- src/js/game/hud/parts/building_placer.js | 138 ++++++++++++++++------- src/js/game/logic.js | 10 +- src/js/game/themes/dark.json | 4 + src/js/game/themes/light.json | 4 + 7 files changed, 119 insertions(+), 51 deletions(-) diff --git a/mod_examples/buildings_have_cost.js b/mod_examples/buildings_have_cost.js index b97197f9..79061d35 100644 --- a/mod_examples/buildings_have_cost.js +++ b/mod_examples/buildings_have_cost.js @@ -65,10 +65,10 @@ class Mod extends shapez.Mod { // Only allow placing an entity when there is enough currency this.modInterface.replaceMethod(shapez.GameLogic, "checkCanPlaceEntity", function ( $original, - [entity, offset] + [entity, options] ) { const storedCurrency = this.root.hubGoals.storedShapes[CURRENCY] || 0; - return storedCurrency > 0 && $original(entity, offset); + return storedCurrency > 0 && $original(entity, options); }); // Take shapes when placing a building diff --git a/mod_examples/custom_theme.js b/mod_examples/custom_theme.js index fd2e063a..a596799c 100644 --- a/mod_examples/custom_theme.js +++ b/mod_examples/custom_theme.js @@ -40,6 +40,10 @@ const RESOURCES = { color: "rgb(74, 237, 134)", background: "rgba(74, 237, 134, 0.2)", }, + error: { + color: "rgb(255, 137, 137)", + background: "rgba(255, 137, 137, 0.2)", + }, }, colorBlindPickerTile: "rgba(50, 50, 50, 0.4)", diff --git a/src/js/game/blueprint.js b/src/js/game/blueprint.js index 795b27c3..14848485 100644 --- a/src/js/game/blueprint.js +++ b/src/js/game/blueprint.js @@ -82,7 +82,7 @@ export class Blueprint { const rect = staticComp.getTileSpaceBounds(); rect.moveBy(tile.x, tile.y); - if (!parameters.root.logic.checkCanPlaceEntity(entity, tile)) { + if (!parameters.root.logic.checkCanPlaceEntity(entity, { offset: tile })) { parameters.context.globalAlpha = 0.3; } else { parameters.context.globalAlpha = 1; @@ -131,7 +131,7 @@ export class Blueprint { for (let i = 0; i < this.entities.length; ++i) { const entity = this.entities[i]; - if (root.logic.checkCanPlaceEntity(entity, tile)) { + if (root.logic.checkCanPlaceEntity(entity, { offset: tile })) { anyPlaceable = true; } } @@ -160,7 +160,7 @@ export class Blueprint { let count = 0; for (let i = 0; i < this.entities.length; ++i) { const entity = this.entities[i]; - if (!root.logic.checkCanPlaceEntity(entity, tile)) { + if (!root.logic.checkCanPlaceEntity(entity, { offset: tile })) { continue; } diff --git a/src/js/game/hud/parts/building_placer.js b/src/js/game/hud/parts/building_placer.js index ee7bc804..e4ecfe7e 100644 --- a/src/js/game/hud/parts/building_placer.js +++ b/src/js/game/hud/parts/building_placer.js @@ -61,7 +61,7 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { this.currentInterpolatedCornerTile = new Vector(); this.lockIndicatorSprites = {}; - layers.forEach(layer => { + [...layers, "error"].forEach(layer => { this.lockIndicatorSprites[layer] = this.makeLockIndicatorSprite(layer); }); @@ -76,7 +76,7 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { /** * Makes the lock indicator sprite for the given layer - * @param {Layer} layer + * @param {string} layer */ makeLockIndicatorSprite(layer) { const dims = 48; @@ -358,7 +358,7 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { rotationVariant ); - const canBuild = this.root.logic.checkCanPlaceEntity(this.fakeEntity); + const canBuild = this.root.logic.checkCanPlaceEntity(this.fakeEntity, {}); // Fade in / out parameters.context.lineWidth = 1; @@ -397,6 +397,42 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { } } + /** + * Checks if there are any entities in the way, returns true if there are + * @param {Vector} from + * @param {Vector} to + * @returns + */ + checkForObstales(from, to) { + assert(from.x === to.x || from.y === to.y, "Must be a straight line"); + + const prop = from.x === to.x ? "y" : "x"; + const current = from.copy(); + + const metaBuilding = this.currentMetaBuilding.get(); + this.fakeEntity.layer = metaBuilding.getLayer(); + const staticComp = this.fakeEntity.components.StaticMapEntity; + staticComp.origin = current; + staticComp.rotation = 0; + metaBuilding.updateVariants(this.fakeEntity, 0, this.currentVariant.get()); + staticComp.code = getCodeFromBuildingData( + this.currentMetaBuilding.get(), + this.currentVariant.get(), + 0 + ); + + const start = Math.min(from[prop], to[prop]); + const end = Math.max(from[prop], to[prop]); + + for (let i = start; i <= end; i++) { + current[prop] = i; + if (!this.root.logic.checkCanPlaceEntity(this.fakeEntity, { allowReplaceBuildings: false })) { + return true; + } + } + return false; + } + /** * @param {DrawParameters} parameters */ @@ -407,55 +443,73 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { return; } + const applyStyles = look => { + parameters.context.fillStyle = THEME.map.directionLock[look].color; + parameters.context.strokeStyle = THEME.map.directionLock[look].background; + parameters.context.lineWidth = 10; + }; + + if (!this.lastDragTile) { + // Not dragging yet + applyStyles(this.root.currentLayer); + const mouseWorld = this.root.camera.screenToWorld(mousePosition); + parameters.context.beginCircle(mouseWorld.x, mouseWorld.y, 4); + parameters.context.fill(); + return; + } + const mouseWorld = this.root.camera.screenToWorld(mousePosition); const mouseTile = mouseWorld.toTileSpace(); - parameters.context.fillStyle = THEME.map.directionLock[this.root.currentLayer].color; - parameters.context.strokeStyle = THEME.map.directionLock[this.root.currentLayer].background; - parameters.context.lineWidth = 10; + const startLine = this.lastDragTile.toWorldSpaceCenterOfTile(); + const endLine = mouseTile.toWorldSpaceCenterOfTile(); + const midLine = this.currentDirectionLockCorner.toWorldSpaceCenterOfTile(); + const anyObstacle = + this.checkForObstales(this.lastDragTile, this.currentDirectionLockCorner) || + this.checkForObstales(this.currentDirectionLockCorner, mouseTile); + + if (anyObstacle) { + applyStyles("error"); + } else { + applyStyles(this.root.currentLayer); + } parameters.context.beginCircle(mouseWorld.x, mouseWorld.y, 4); parameters.context.fill(); - if (this.lastDragTile) { - const startLine = this.lastDragTile.toWorldSpaceCenterOfTile(); - const endLine = mouseTile.toWorldSpaceCenterOfTile(); - const midLine = this.currentDirectionLockCorner.toWorldSpaceCenterOfTile(); + parameters.context.beginCircle(startLine.x, startLine.y, 8); + parameters.context.fill(); - parameters.context.beginCircle(startLine.x, startLine.y, 8); - parameters.context.fill(); + parameters.context.beginPath(); + parameters.context.moveTo(startLine.x, startLine.y); + parameters.context.lineTo(midLine.x, midLine.y); + parameters.context.lineTo(endLine.x, endLine.y); + parameters.context.stroke(); - parameters.context.beginPath(); - parameters.context.moveTo(startLine.x, startLine.y); - parameters.context.lineTo(midLine.x, midLine.y); - parameters.context.lineTo(endLine.x, endLine.y); - parameters.context.stroke(); + parameters.context.beginCircle(endLine.x, endLine.y, 5); + parameters.context.fill(); - parameters.context.beginCircle(endLine.x, endLine.y, 5); - parameters.context.fill(); + // Draw arrow + const arrowSprite = this.lockIndicatorSprites[anyObstacle ? "error" : this.root.currentLayer]; + const path = this.computeDirectionLockPath(); + for (let i = 0; i < path.length - 1; i += 1) { + const { rotation, tile } = path[i]; + const worldPos = tile.toWorldSpaceCenterOfTile(); + const angle = Math.radians(rotation); - // Draw arrow - const arrowSprite = this.lockIndicatorSprites[this.root.currentLayer]; - const path = this.computeDirectionLockPath(); - for (let i = 0; i < path.length - 1; i += 1) { - const { rotation, tile } = path[i]; - const worldPos = tile.toWorldSpaceCenterOfTile(); - const angle = Math.radians(rotation); - - parameters.context.translate(worldPos.x, worldPos.y); - parameters.context.rotate(angle); - parameters.context.drawImage( - arrowSprite, - -6, - -globalConfig.halfTileSize - - clamp((this.root.time.realtimeNow() * 1.5) % 1.0, 0, 1) * 1 * globalConfig.tileSize + - globalConfig.halfTileSize - - 6, - 12, - 12 - ); - parameters.context.rotate(-angle); - parameters.context.translate(-worldPos.x, -worldPos.y); - } + parameters.context.translate(worldPos.x, worldPos.y); + parameters.context.rotate(angle); + parameters.context.drawImage( + arrowSprite, + -6, + -globalConfig.halfTileSize - + clamp((this.root.time.realtimeNow() * 1.5) % 1.0, 0, 1) * 1 * globalConfig.tileSize + + globalConfig.halfTileSize - + 6, + 12, + 12 + ); + parameters.context.rotate(-angle); + parameters.context.translate(-worldPos.x, -worldPos.y); } } diff --git a/src/js/game/logic.js b/src/js/game/logic.js index 79104958..49bfb416 100644 --- a/src/js/game/logic.js +++ b/src/js/game/logic.js @@ -53,10 +53,12 @@ export class GameLogic { /** * Checks if the given entity can be placed * @param {Entity} entity - * @param {Vector=} offset Optional, move the entity by the given offset first + * @param {Object} param0 + * @param {boolean=} param0.allowReplaceBuildings + * @param {Vector=} param0.offset Optional, move the entity by the given offset first * @returns {boolean} true if the entity could be placed there */ - checkCanPlaceEntity(entity, offset = null) { + checkCanPlaceEntity(entity, { allowReplaceBuildings = false, offset = null }) { // Compute area of the building const rect = entity.components.StaticMapEntity.getTileSpaceBounds(); if (offset) { @@ -71,7 +73,7 @@ export class GameLogic { const otherEntity = this.root.map.getLayerContentXY(x, y, entity.layer); if (otherEntity) { const metaClass = otherEntity.components.StaticMapEntity.getMetaBuilding(); - if (!metaClass.getIsReplaceable()) { + if (!allowReplaceBuildings || !metaClass.getIsReplaceable()) { // This one is a direct blocker return false; } @@ -116,7 +118,7 @@ export class GameLogic { rotationVariant, variant, }); - if (this.checkCanPlaceEntity(entity)) { + if (this.checkCanPlaceEntity(entity, {})) { this.freeEntityAreaBeforeBuild(entity); this.root.map.placeStaticEntity(entity); this.root.entityMgr.registerEntity(entity); diff --git a/src/js/game/themes/dark.json b/src/js/game/themes/dark.json index 25571700..786cfda2 100644 --- a/src/js/game/themes/dark.json +++ b/src/js/game/themes/dark.json @@ -18,6 +18,10 @@ "wires": { "color": "rgb(74, 237, 134)", "background": "rgba(74, 237, 134, 0.2)" + }, + "error": { + "color": "rgb(255, 137, 137)", + "background": "rgba(255, 137, 137, 0.2)" } }, diff --git a/src/js/game/themes/light.json b/src/js/game/themes/light.json index 3bea6a80..1236d43d 100644 --- a/src/js/game/themes/light.json +++ b/src/js/game/themes/light.json @@ -18,6 +18,10 @@ "wires": { "color": "rgb(74, 237, 134)", "background": "rgba(74, 237, 134, 0.2)" + }, + "error": { + "color": "rgb(255, 137, 137)", + "background": "rgba(255, 137, 137, 0.2)" } }, From 4bfd423efb6fe46eb2016449b1624c824ba2d4c0 Mon Sep 17 00:00:00 2001 From: tobspr Date: Tue, 18 Jan 2022 20:49:11 +0100 Subject: [PATCH 070/129] Fix mod examples --- mod_examples/custom_sub_shapes.js | 2 ++ src/js/changelog.js | 1 + 2 files changed, 3 insertions(+) diff --git a/mod_examples/custom_sub_shapes.js b/mod_examples/custom_sub_shapes.js index d44b84d9..afb901c0 100644 --- a/mod_examples/custom_sub_shapes.js +++ b/mod_examples/custom_sub_shapes.js @@ -32,6 +32,8 @@ class Mod extends shapez.Mod { 0 ); context.closePath(); + context.fill(); + context.stroke(); }, }); diff --git a/src/js/changelog.js b/src/js/changelog.js index a68c8ce4..9165be18 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -4,6 +4,7 @@ export const CHANGELOG = [ date: "unreleased", entries: [ "This version adds an official modloader! You can now load mods by placing it in the mods/ folder of the game.", + "When holding shift while placing a belt, the indicator now becomes red when crossing buildings", ], }, { From 5c9cbcd8ad74fe9e2c9d48ae033bafdd184789ba Mon Sep 17 00:00:00 2001 From: tobspr Date: Tue, 18 Jan 2022 21:10:52 +0100 Subject: [PATCH 071/129] Fix linter error --- src/js/mods/mod_interface.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 6fb54be1..5e07c719 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -59,7 +59,7 @@ export class ModInterface { registerCss(cssString) { // Preprocess css - cssString = cssString.replace(/\$scaled\(([^\)]*)\)/gim, (substr, expression) => { + cssString = cssString.replace(/\$scaled\(([^)]*)\)/gim, (substr, expression) => { return "calc((" + expression + ") * var(--ui-scale))"; }); const element = document.createElement("style"); From e16f13034a05b312b5d8fa824cfe0766013bc7cc Mon Sep 17 00:00:00 2001 From: "Thomas (DJ1TJOO)" <44841260+DJ1TJOO@users.noreply.github.com> Date: Tue, 18 Jan 2022 21:11:21 +0100 Subject: [PATCH 072/129] Game state register (#1341) * Added a gamestate register helper Added a gamestate register helper * Update mod_interface.js --- src/js/mods/mod_interface.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 5e07c719..5df35563 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -367,6 +367,14 @@ export class ModInterface { }); } + /** + * Registers a new state class, should be a GameState derived class + * @param {typeof GameState} stateClass + */ + registerGameState(stateClass) { + this.modLoader.app.stateMgr.register(stateClass); + } + /** * @param {object} param0 * @param {"regular"|"wires"} param0.toolbar From 6bf07a43aa667ea9da517e0835379bfc0a12d453 Mon Sep 17 00:00:00 2001 From: tobspr Date: Tue, 18 Jan 2022 21:19:00 +0100 Subject: [PATCH 073/129] export build options --- src/js/core/globals.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/js/core/globals.js b/src/js/core/globals.js index 15197880..c47abfed 100644 --- a/src/js/core/globals.js +++ b/src/js/core/globals.js @@ -15,3 +15,20 @@ export function setGlobalApp(app) { assert(!GLOBAL_APP, "Create application twice!"); GLOBAL_APP = app; } + +export const BUILD_OPTIONS = { + HAVE_ASSERT: G_HAVE_ASSERT, + APP_ENVIRONMENT: G_APP_ENVIRONMENT, + TRACKING_ENDPOINT: G_TRACKING_ENDPOINT, + CHINA_VERSION: G_CHINA_VERSION, + WEGAME_VERSION: G_WEGAME_VERSION, + IS_DEV: G_IS_DEV, + IS_RELEASE: G_IS_RELEASE, + IS_MOBILE_APP: G_IS_MOBILE_APP, + IS_BROWSER: G_IS_BROWSER, + IS_STANDALONE: G_IS_STANDALONE, + BUILD_TIME: G_BUILD_TIME, + BUILD_COMMIT_HASH: G_BUILD_COMMIT_HASH, + BUILD_VERSION: G_BUILD_VERSION, + ALL_UI_IMAGES: G_ALL_UI_IMAGES, +}; From 4a14727fd3424509caba41b30ea8aceaa6be1e66 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Wed, 19 Jan 2022 00:16:59 +0000 Subject: [PATCH 074/129] Item acceptor refactor part two - completed functionality --- src/js/game/belt_path.js | 5 +- src/js/game/buildings/trash.js | 21 ----- src/js/game/components/item_acceptor.js | 17 ++-- src/js/game/components/item_ejector.js | 1 + src/js/game/components/item_processor.js | 4 +- src/js/game/game_system_manager.js | 6 +- src/js/game/systems/belt_underlays.js | 10 +-- src/js/game/systems/item_acceptor.js | 31 +++---- src/js/game/systems/item_ejector.js | 110 +++-------------------- src/js/game/systems/item_processor.js | 46 +++++----- 10 files changed, 74 insertions(+), 177 deletions(-) diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js index 81a60951..0126349d 100644 --- a/src/js/game/belt_path.js +++ b/src/js/game/belt_path.js @@ -128,8 +128,9 @@ export class BeltPath extends BasicSerializableObject { /** * Tries to accept the item * @param {BaseItem} item + * @param {number} startProgress */ - tryAcceptItem(item) { + tryAcceptItem(item, startProgress = 0) { if (this.spacingToFirstItem >= globalConfig.itemSpacingOnBelts) { // So, since we already need one tick to accept this item we will add this directly. const progressGrowth = @@ -139,7 +140,7 @@ export class BeltPath extends BasicSerializableObject { // First, compute how much progress we can make *at max* const maxProgress = Math.max(0, this.spacingToFirstItem - globalConfig.itemSpacingOnBelts); - const initialProgress = Math.min(maxProgress, progressGrowth); + const initialProgress = Math.min(maxProgress, startProgress); this.items.unshift([this.spacingToFirstItem - initialProgress, item]); this.spacingToFirstItem = initialProgress; diff --git a/src/js/game/buildings/trash.js b/src/js/game/buildings/trash.js index 1524c480..b461ef3a 100644 --- a/src/js/game/buildings/trash.js +++ b/src/js/game/buildings/trash.js @@ -47,25 +47,6 @@ export class MetaTrashBuilding extends MetaBuilding { return root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_cutter_and_trash); } - addAchievementReceiver(entity) { - if (!entity.root) { - return; - } - - const itemProcessor = entity.components.ItemProcessor; - const tryTakeItem = itemProcessor.tryTakeItem.bind(itemProcessor); - - itemProcessor.tryTakeItem = () => { - const taken = tryTakeItem(...arguments); - - if (taken) { - entity.root.signals.achievementCheck.dispatch(ACHIEVEMENTS.trash1000, 1); - } - - return taken; - }; - } - /** * Creates the entity at the given location * @param {Entity} entity @@ -88,7 +69,5 @@ export class MetaTrashBuilding extends MetaBuilding { processorType: enumItemProcessorTypes.trash, }) ); - - this.addAchievementReceiver(entity); } } diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index 5b2b7122..9d3f2894 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -28,7 +28,12 @@ import { GameRoot } from "../root"; * item: BaseItem, * animProgress: number, * direction: enumDirection - * }>} ItemAcceptorInput + * }>} ItemAcceptorInputs + * + * @typedef {Map} ItemAcceptorCompletedInputs * * @typedef {{ * root: GameRoot, @@ -62,8 +67,10 @@ export class ItemAcceptorComponent extends Component { constructor({ slots = [], type = enumItemAcceptorTypes.itemProcessor }) { super(); - /** @type {ItemAcceptorInput} */ - this.currentInputs = new Map(); // @SENSETODO does this need to be saved? + /** @type {ItemAcceptorInputs} */ + this.inputs = new Map(); + /** @type {ItemAcceptorCompletedInputs} */ + this.completedInputs = new Map(); // @SENSETODO does this need to be saved? this.type = type; this.setSlots(slots); } @@ -100,11 +107,11 @@ export class ItemAcceptorComponent extends Component { //@SENSETODO see if this works for buildings like hub - if (this.currentInputs.has(slotIndex) || (slot.filter && slot.filter != item.getItemType())) { + if (this.completedInputs.has(slotIndex) || (slot.filter && slot.filter != item.getItemType())) { return false; } - this.currentInputs.set(slotIndex, { + this.inputs.set(slotIndex, { item, direction, animProgress: Math.min(1, startProgress), diff --git a/src/js/game/components/item_ejector.js b/src/js/game/components/item_ejector.js index b6d21e6a..dbf88139 100644 --- a/src/js/game/components/item_ejector.js +++ b/src/js/game/components/item_ejector.js @@ -134,6 +134,7 @@ export class ItemEjectorComponent extends Component { if (!this.canEjectOnSlot(slotIndex)) { return false; } + if (startingProgress > 0) console.log("starting with progress: " + startingProgress); this.slots[slotIndex].item = item; this.slots[slotIndex].lastItem = item; this.slots[slotIndex].progress = startingProgress; diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index 749c1038..422450dd 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -30,6 +30,7 @@ export const enumItemProcessorRequirements = { /** * @typedef {{ * item: BaseItem, + * extraProgress?: number, * requiredSlot?: number, * preferredSlot?: number * }} EjectorItemToEject @@ -84,7 +85,6 @@ export class ItemProcessorComponent extends Component { * Our current inputs * @type {Map} */ - this.inputs = new Map(); this.clear(); } @@ -95,8 +95,6 @@ export class ItemProcessorComponent extends Component { // sure the outputs always match this.nextOutputSlot = 0; - this.inputs.clear(); - /** * What we are currently processing, empty if we don't produce anything rn * requiredSlot: Item *must* be ejected on this slot diff --git a/src/js/game/game_system_manager.js b/src/js/game/game_system_manager.js index 05085b70..4bf5f64d 100644 --- a/src/js/game/game_system_manager.js +++ b/src/js/game/game_system_manager.js @@ -145,7 +145,7 @@ export class GameSystemManager { // Order is important! // IMPORTANT: Item acceptor must be before the belt, because it may not tick after the belt - // has put in the item into the acceptor animation, otherwise its off + // has put in the item into the acceptor animqation, otherwise its off add("itemAcceptor", ItemAcceptorSystem); add("belt", BeltSystem); @@ -156,14 +156,14 @@ export class GameSystemManager { add("storage", StorageSystem); + add("itemEjector", ItemEjectorSystem); + add("itemProcessor", ItemProcessorSystem); add("filter", FilterSystem); add("itemProducer", ItemProducerSystem); - add("itemEjector", ItemEjectorSystem); - if (this.root.gameMode.hasResources()) { add("mapResources", MapResourcesSystem); } diff --git a/src/js/game/systems/belt_underlays.js b/src/js/game/systems/belt_underlays.js index c5c69d26..bc22e7d4 100644 --- a/src/js/game/systems/belt_underlays.js +++ b/src/js/game/systems/belt_underlays.js @@ -113,12 +113,10 @@ export class BeltUnderlaysSystem extends GameSystemWithFilter { continue; } - // Step 2: Check if any of the directions matches - for (let j = 0; j < slot.directions.length; ++j) { - const slotDirection = staticComp.localDirectionToWorld(slot.directions[j]); - if (slotDirection === fromDirection) { - return true; - } + // Step 2: Check if the direction matches + const slotDirection = staticComp.localDirectionToWorld(slot.direction); + if (slotDirection === fromDirection) { + return true; } } } diff --git a/src/js/game/systems/item_acceptor.js b/src/js/game/systems/item_acceptor.js index 61bf780a..a0ba70cf 100644 --- a/src/js/game/systems/item_acceptor.js +++ b/src/js/game/systems/item_acceptor.js @@ -1,6 +1,7 @@ import { globalConfig } from "../../core/config"; import { DrawParameters } from "../../core/draw_parameters"; import { enumDirectionToVector } from "../../core/vector"; +import { ACHIEVEMENTS } from "../../platform/achievement_provider"; import { enumItemAcceptorTypes, ItemAcceptorComponent, @@ -40,15 +41,19 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { for (let i = 0; i < this.allEntities.length; ++i) { const entity = this.allEntities[i]; const acceptorComp = entity.components.ItemAcceptor; - const inputs = acceptorComp.currentInputs; + const inputs = acceptorComp.inputs; inputs.forEach((values, index) => { - if (values.animProgress >= 1) return; // items which are inputted already - values.animProgress += progressGrowth; if (values.animProgress < 1) return; + inputs.delete(index); + acceptorComp.completedInputs.set(index, { + item: values.item, + extraProgress: values.animProgress - 1, + }); // will be handled on the SAME frame due to processor being afterwards + /** @type {function(InputCompletedArgs) : string} */ const handler = this.handlers[acceptorComp.type]; assert(handler, "No handler for acceptor type defined: " + acceptorComp.type); @@ -84,9 +89,8 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { } const staticComp = entity.components.StaticMapEntity; - acceptorComp.currentInputs.forEach((values, index) => { + acceptorComp.inputs.forEach((values, index) => { const { item, animProgress, direction } = values; - if (animProgress >= 1) return; // items which are inputted already const slotData = acceptorComp.slots[index]; const realSlotPos = staticComp.localTileToWorld(slotData.pos); @@ -115,17 +119,7 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { /** * @param {InputCompletedArgs} args */ - input_ITEMPROCESSOR(args) { - const entity = args.entity; - - const itemProcessorComp = entity.components.ItemProcessor; - assert(itemProcessorComp, "No item processor to input item to"); - - itemProcessorComp.inputs.set(args.slotIndex, { - item: args.item, - extraProgress: args.extraProgress, - }); // in the future the item processor will not need a list of items - } + input_ITEMPROCESSOR(args) {} //@SENSETODO this isn't set up like it should be yet /** @@ -138,7 +132,7 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { this.root.hubGoals.handleDefinitionDelivered(item.definition); const acceptorComp = args.entity.components.ItemAcceptor; - acceptorComp.currentInputs.delete(args.slotIndex); + acceptorComp.inputs.delete(args.slotIndex); } /** @@ -147,7 +141,8 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { input_TRASH(args) { // just remove the item const acceptorComp = args.entity.components.ItemAcceptor; - acceptorComp.currentInputs.delete(args.slotIndex); + acceptorComp.inputs.delete(args.slotIndex); + args.entity.root.signals.achievementCheck.dispatch(ACHIEVEMENTS.trash1000, 1); } //storage diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index 8f08b6b0..96c90951 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -160,24 +160,25 @@ export class ItemEjectorSystem extends GameSystemWithFilter { continue; } - // Advance items on the slot - // @SENSETODO do we really want to cap it at one, or should the excess get passed on? - slot.progress = Math.min(1, slot.progress + progressGrowth); + if (slot.progress < 1) { + // Advance items on the slot + slot.progress += progressGrowth; - if (G_IS_DEV && globalConfig.debug.disableEjectorProcessing) { - slot.progress = 1; + if (G_IS_DEV && globalConfig.debug.disableEjectorProcessing) { + slot.progress = 1; + } } // Check if we are still in the process of ejecting, can't proceed then - if (slot.progress < 1) { - continue; - } + if (slot.progress < 1) continue; + + const extraProgress = slot.progress - 1; // Check if we are ejecting to a belt path const destPath = slot.cachedBeltPath; if (destPath) { - // Try passing the item over - if (destPath.tryAcceptItem(item)) { + // Try passing the item over - extraProgress / 2 because the progress there is for double the distance + if (destPath.tryAcceptItem(item, extraProgress / 2)) { slot.item = null; } @@ -190,7 +191,6 @@ export class ItemEjectorSystem extends GameSystemWithFilter { const destSlot = slot.cachedDestSlot; if (destEntity && destSlot) { const targetAcceptorComp = destEntity.components.ItemAcceptor; - const extraProgress = slot.progress - 1; if ( targetAcceptorComp.tryAcceptItem( destSlot.index, @@ -245,7 +245,7 @@ export class ItemEjectorSystem extends GameSystemWithFilter { } // Limit the progress to the maximum available space on the next belt (also see #1000) - let progress = slot.progress; + let progress = Math.min(1, slot.progress); const nextBeltPath = slot.cachedBeltPath; if (nextBeltPath) { /* @@ -321,90 +321,4 @@ export class ItemEjectorSystem extends GameSystemWithFilter { } } } - - /////////////////////////////////////////////////////// OBSOLETE - - /** - * - * @param {BaseItem} item - * @param {Entity} receiver - * @param {number} slotIndex - */ - tryPassOverItem(item, receiver, slotIndex) { - // Try figuring out how what to do with the item - // @TODO: Kinda hacky. How to solve this properly? Don't want to go through inheritance hell. - - const beltComp = receiver.components.Belt; - if (beltComp) { - const path = beltComp.assignedPath; - assert(path, "belt has no path"); - if (path.tryAcceptItem(item)) { - return true; - } - // Belt can have nothing else - return false; - } - - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - // - // NOTICE ! THIS CODE IS DUPLICATED IN THE BELT PATH FOR PERFORMANCE REASONS - // - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - - const itemProcessorComp = receiver.components.ItemProcessor; - if (itemProcessorComp) { - // Check for potential filters - if (!this.root.systemMgr.systems.itemProcessor.checkRequirements(receiver, item, slotIndex)) { - return false; - } - - // Its an item processor .. - //if (itemProcessorComp.tryTakeItem(item, slotIndex)) { - // return true; - //} - // Item processor can have nothing else - return false; - } - - const undergroundBeltComp = receiver.components.UndergroundBelt; - if (undergroundBeltComp) { - // Its an underground belt. yay. - if ( - undergroundBeltComp.tryAcceptExternalItem( - item, - this.root.hubGoals.getUndergroundBeltBaseSpeed() - ) - ) { - return true; - } - - // Underground belt can have nothing else - return false; - } - - const storageComp = receiver.components.Storage; - if (storageComp) { - // It's a storage - if (storageComp.canAcceptItem(item)) { - storageComp.takeItem(item); - return true; - } - - // Storage can't have anything else - return false; - } - - const filterComp = receiver.components.Filter; - if (filterComp) { - // It's a filter! Unfortunately the filter has to know a lot about it's - // surrounding state and components, so it can't be within the component itself. - if (this.root.systemMgr.systems.filter.tryAcceptItem(receiver, slotIndex, item)) { - return true; - } - } - - return false; - } } diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index bb5e9849..2119a721 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -34,7 +34,7 @@ const MAX_QUEUED_CHARGES = 2; * Type of a processor implementation * @typedef {{ * entity: Entity, - * inputs: Map, + * inputs: import("../components/item_acceptor").ItemAcceptorCompletedInputs, * outItems: Array * }} ProcessorImplementationPayload */ @@ -83,8 +83,14 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const processorComp = entity.components.ItemProcessor; const ejectorComp = entity.components.ItemEjector; - const currentCharge = processorComp.ongoingCharges[0]; + // Check if we have an empty queue and can start a new charge - do this first so we don't waste a tick + if (processorComp.ongoingCharges.length < MAX_QUEUED_CHARGES) { + if (this.canProcess(entity)) { + this.startNewCharge(entity); + } + } + const currentCharge = processorComp.ongoingCharges[0]; if (currentCharge) { // Process next charge if (currentCharge.remainingTime > 0.0) { @@ -101,7 +107,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // Go over all items and try to eject them for (let j = 0; j < itemsToEject.length; ++j) { - const { item, requiredSlot, preferredSlot } = itemsToEject[j]; + const { item, requiredSlot, preferredSlot, extraProgress = 0 } = itemsToEject[j]; assert(ejectorComp, "To eject items, the building needs to have an ejector"); @@ -125,7 +131,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { if (slot !== null) { // Alright, we can actually eject - if (!ejectorComp.tryEject(slot, item)) { + if (!ejectorComp.tryEject(slot, item, extraProgress)) { assert(false, "Failed to eject"); } else { itemsToEject.splice(j, 1); @@ -142,13 +148,6 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } } } - - // Check if we have an empty queue and can start a new charge - if (processorComp.ongoingCharges.length < MAX_QUEUED_CHARGES) { - if (this.canProcess(entity)) { - this.startNewCharge(entity); - } - } } } @@ -192,13 +191,14 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {Entity} entity */ canProcess(entity) { + const acceptorComp = entity.components.ItemAcceptor; const processorComp = entity.components.ItemProcessor; switch (processorComp.processingRequirement) { // DEFAULT // By default, we can start processing once all inputs are there case null: { - return processorComp.inputs.size >= processorComp.inputsPerCharge; + return acceptorComp.completedInputs.size >= processorComp.inputsPerCharge; } // QUAD PAINTER @@ -207,7 +207,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const pinsComp = entity.components.WiredPins; // First slot is the shape, so if it's not there we can't do anything - const shapeItem = /** @type {ShapeItem} */ (processorComp.inputs.get(0).item); + const shapeItem = /** @type {ShapeItem} */ (acceptorComp.inputs.get(0).item); if (!shapeItem) { return false; } @@ -236,7 +236,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // Check if all colors of the enabled slots are there for (let i = 0; i < slotStatus.length; ++i) { - if (slotStatus[i] && !processorComp.inputs.get(1 + i)) { + if (slotStatus[i] && !acceptorComp.inputs.get(1 + i)) { // A slot which is enabled wasn't enabled. Make sure if there is anything on the quadrant, // it is not possible to paint, but if there is nothing we can ignore it for (let j = 0; j < 4; ++j) { @@ -261,12 +261,13 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {Entity} entity */ startNewCharge(entity) { + const acceptorComp = entity.components.ItemAcceptor; const processorComp = entity.components.ItemProcessor; - // First, take inputs - const inputs = processorComp.inputs; + // First, take inputs - but only ones that are completed + const inputs = acceptorComp.completedInputs; + console.log("processor added charge"); - /** @type {Array} */ const outItems = []; /** @type {function(ProcessorImplementationPayload) : void} */ @@ -276,7 +277,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // Call implementation handler({ entity, - inputs: inputs, + inputs, outItems, }); @@ -289,7 +290,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // Queue Charge const baseSpeed = this.root.hubGoals.getProcessorBaseSpeed(processorComp.type); - const originalTime = 1 / baseSpeed; + const originalTime = 0; const bonusTimeToApply = Math.min(originalTime, processorComp.bonusTime); const timeToProcess = originalTime - bonusTimeToApply; @@ -300,8 +301,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { remainingTime: timeToProcess, }); - processorComp.inputs.clear(); //@SENSETODO temp, will completely replace processorcomp.inputs with acceptor inputs later - entity.components.ItemAcceptor.currentInputs.clear(); + acceptorComp.completedInputs.clear(); } /** @@ -322,6 +322,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } payload.outItems.push({ item: input.item, + extraProgress: input.extraProgress, preferredSlot: processorComp.nextOutputSlot++ % availableSlots, doNotTrack: true, }); @@ -351,6 +352,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { payload.outItems.push({ item: this.root.shapeDefinitionMgr.getShapeItemFromDefinition(definition), + extraProgress: input.extraProgress, requiredSlot: i, }); } @@ -378,6 +380,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { payload.outItems.push({ item: this.root.shapeDefinitionMgr.getShapeItemFromDefinition(definition), + extraProgress: input.extraProgress, requiredSlot: i, }); } @@ -395,6 +398,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const rotatedDefinition = this.root.shapeDefinitionMgr.shapeActionRotateCW(inputDefinition); payload.outItems.push({ item: this.root.shapeDefinitionMgr.getShapeItemFromDefinition(rotatedDefinition), + extraProgress: input.extraProgress, }); } From 56a2aa5e0f9287eff9dd0c92727560d7dda8da6a Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Wed, 19 Jan 2022 16:35:46 +0000 Subject: [PATCH 075/129] processing refactor finished --- src/js/core/config.js | 19 +++---- src/js/game/belt_path.js | 64 --------------------- src/js/game/buildings/balancer.js | 3 +- src/js/game/buildings/cutter.js | 2 +- src/js/game/buildings/hub.js | 1 - src/js/game/buildings/mixer.js | 2 +- src/js/game/buildings/painter.js | 6 +- src/js/game/buildings/rotater.js | 6 +- src/js/game/buildings/stacker.js | 2 +- src/js/game/buildings/storage.js | 3 +- src/js/game/buildings/underground_belt.js | 4 +- src/js/game/components/item_acceptor.js | 6 +- src/js/game/components/item_ejector.js | 3 +- src/js/game/hub_goals.js | 69 +++++++++++++---------- src/js/game/systems/item_acceptor.js | 48 +++------------- src/js/game/systems/item_ejector.js | 34 ++++++----- src/js/game/systems/item_processor.js | 57 +++++++++++-------- src/js/game/systems/underground_belt.js | 1 + 18 files changed, 126 insertions(+), 204 deletions(-) diff --git a/src/js/core/config.js b/src/js/core/config.js index bc2e2460..abb25402 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -83,17 +83,14 @@ export const globalConfig = { puzzleMaxBoundsSize: 20, puzzleValidationDurationSeconds: 30, - buildingSpeeds: { - cutter: 1 / 4, - cutterQuad: 1 / 4, - rotater: 1 / 1, - rotaterCCW: 1 / 1, - rotater180: 1 / 1, - painter: 1 / 6, - painterDouble: 1 / 8, - painterQuad: 1 / 2, - mixer: 1 / 5, - stacker: 1 / 8, + buildingAmountsToBelt: { + cutter: 4, + cutterQuad: 4, + painter: 6, + painterDouble: 8, + painterQuad: 2, + mixer: 5, + stacker: 8, }, // Zooming diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js index 0126349d..e1326693 100644 --- a/src/js/game/belt_path.js +++ b/src/js/game/belt_path.js @@ -132,12 +132,6 @@ export class BeltPath extends BasicSerializableObject { */ tryAcceptItem(item, startProgress = 0) { if (this.spacingToFirstItem >= globalConfig.itemSpacingOnBelts) { - // So, since we already need one tick to accept this item we will add this directly. - const progressGrowth = - this.root.hubGoals.getBeltBaseSpeed() * - this.root.dynamicTickrate.deltaSeconds * - globalConfig.itemSpacingOnBelts; - // First, compute how much progress we can make *at max* const maxProgress = Math.max(0, this.spacingToFirstItem - globalConfig.itemSpacingOnBelts); const initialProgress = Math.min(maxProgress, startProgress); @@ -283,64 +277,6 @@ export class BeltPath extends BasicSerializableObject { }; } - /** - * Computes a method to pass over the item to the entity - * @param {Entity} entity - * @param {number} matchingSlotIndex - * @returns {(item: BaseItem, slotIndex: number) => boolean | void} - */ - computePassOverFunctionWithoutBelts(entity, matchingSlotIndex) { - const systems = this.root.systemMgr.systems; - const hubGoals = this.root.hubGoals; - - // NOTICE: THIS IS COPIED FROM THE ITEM EJECTOR SYSTEM FOR PERFORMANCE REASONS - - const itemProcessorComp = entity.components.ItemProcessor; - if (itemProcessorComp) { - // Its an item processor .. - return function (item) { - // Check for potential filters - if (!systems.itemProcessor.checkRequirements(entity, item, matchingSlotIndex)) { - return; - } - //return itemProcessorComp.tryTakeItem(item, matchingSlotIndex); - }; - } - - const undergroundBeltComp = entity.components.UndergroundBelt; - if (undergroundBeltComp) { - // Its an underground belt. yay. - return function (item) { - return undergroundBeltComp.tryAcceptExternalItem( - item, - hubGoals.getUndergroundBeltBaseSpeed() - ); - }; - } - - const storageComp = entity.components.Storage; - if (storageComp) { - // It's a storage - return function (item) { - if (storageComp.canAcceptItem(item)) { - storageComp.takeItem(item); - return true; - } - }; - } - - const filterComp = entity.components.Filter; - if (filterComp) { - // It's a filter! Unfortunately the filter has to know a lot about it's - // surrounding state and components, so it can't be within the component itself. - return function (item) { - if (systems.filter.tryAcceptItem(entity, matchingSlotIndex, item)) { - return true; - } - }; - } - } - // Following code will be compiled out outside of dev versions /* dev:start */ diff --git a/src/js/game/buildings/balancer.js b/src/js/game/buildings/balancer.js index ce685a9a..3af03e16 100644 --- a/src/js/game/buildings/balancer.js +++ b/src/js/game/buildings/balancer.js @@ -104,8 +104,7 @@ export class MetaBalancerBuilding extends MetaBuilding { speedMultiplier = 1; } - const speed = - (root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.balancer) / 2) * speedMultiplier; + const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.balancer) * speedMultiplier; return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } diff --git a/src/js/game/buildings/cutter.js b/src/js/game/buildings/cutter.js index 21acdaa0..5717b702 100644 --- a/src/js/game/buildings/cutter.js +++ b/src/js/game/buildings/cutter.js @@ -54,7 +54,7 @@ export class MetaCutterBuilding extends MetaBuilding { if (root.gameMode.throughputDoesNotMatter()) { return []; } - const speed = root.hubGoals.getProcessorBaseSpeed( + const speed = root.hubGoals.getProcessingSpeed( variant === enumCutterVariants.quad ? enumItemProcessorTypes.cutterQuad : enumItemProcessorTypes.cutter diff --git a/src/js/game/buildings/hub.js b/src/js/game/buildings/hub.js index f8ba4b82..7ea336f1 100644 --- a/src/js/game/buildings/hub.js +++ b/src/js/game/buildings/hub.js @@ -164,7 +164,6 @@ export class MetaHubBuilding extends MetaBuilding { filter: "shape", }, ], - type: enumItemAcceptorTypes.hub, }) ); } diff --git a/src/js/game/buildings/mixer.js b/src/js/game/buildings/mixer.js index de1665c4..527de3ea 100644 --- a/src/js/game/buildings/mixer.js +++ b/src/js/game/buildings/mixer.js @@ -47,7 +47,7 @@ export class MetaMixerBuilding extends MetaBuilding { if (root.gameMode.throughputDoesNotMatter()) { return []; } - const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.mixer); + const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.mixer); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } diff --git a/src/js/game/buildings/painter.js b/src/js/game/buildings/painter.js index 432973d0..a0839ef4 100644 --- a/src/js/game/buildings/painter.js +++ b/src/js/game/buildings/painter.js @@ -73,15 +73,15 @@ export class MetaPainterBuilding extends MetaBuilding { switch (variant) { case defaultBuildingVariant: case enumPainterVariants.mirrored: { - const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.painter); + const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.painter); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } case enumPainterVariants.double: { - const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.painterDouble); + const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.painterDouble); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed, true)]]; } case enumPainterVariants.quad: { - const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.painterQuad); + const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.painterQuad); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } } diff --git a/src/js/game/buildings/rotater.js b/src/js/game/buildings/rotater.js index e1080767..c8a28748 100644 --- a/src/js/game/buildings/rotater.js +++ b/src/js/game/buildings/rotater.js @@ -70,15 +70,15 @@ export class MetaRotaterBuilding extends MetaBuilding { } switch (variant) { case defaultBuildingVariant: { - const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.rotater); + const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.rotater); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } case enumRotaterVariants.ccw: { - const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.rotaterCCW); + const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.rotaterCCW); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } case enumRotaterVariants.rotate180: { - const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.rotater180); + const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.rotater180); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } } diff --git a/src/js/game/buildings/stacker.js b/src/js/game/buildings/stacker.js index f36ef248..fdd6f5fb 100644 --- a/src/js/game/buildings/stacker.js +++ b/src/js/game/buildings/stacker.js @@ -40,7 +40,7 @@ export class MetaStackerBuilding extends MetaBuilding { if (root.gameMode.throughputDoesNotMatter()) { return []; } - const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.stacker); + const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.stacker); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } diff --git a/src/js/game/buildings/storage.js b/src/js/game/buildings/storage.js index 69e03608..78f398be 100644 --- a/src/js/game/buildings/storage.js +++ b/src/js/game/buildings/storage.js @@ -1,7 +1,7 @@ import { formatBigNumber } from "../../core/utils"; import { enumDirection, Vector } from "../../core/vector"; import { T } from "../../translations"; -import { enumItemAcceptorTypes, ItemAcceptorComponent } from "../components/item_acceptor"; +import { ItemAcceptorComponent } from "../components/item_acceptor"; import { ItemEjectorComponent } from "../components/item_ejector"; import { StorageComponent } from "../components/storage"; import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; @@ -81,7 +81,6 @@ export class MetaStorageBuilding extends MetaBuilding { direction: enumDirection.bottom, }, ], - type: enumItemAcceptorTypes.storage, }) ); diff --git a/src/js/game/buildings/underground_belt.js b/src/js/game/buildings/underground_belt.js index 182ee9a8..4dbce634 100644 --- a/src/js/game/buildings/underground_belt.js +++ b/src/js/game/buildings/underground_belt.js @@ -1,6 +1,6 @@ import { Loader } from "../../core/loader"; import { enumDirection, Vector, enumAngleToDirection, enumDirectionToVector } from "../../core/vector"; -import { enumItemAcceptorTypes, ItemAcceptorComponent } from "../components/item_acceptor"; +import { ItemAcceptorComponent } from "../components/item_acceptor"; import { ItemEjectorComponent } from "../components/item_ejector"; import { enumUndergroundBeltMode, UndergroundBeltComponent } from "../components/underground_belt"; import { Entity } from "../entity"; @@ -184,7 +184,6 @@ export class MetaUndergroundBeltBuilding extends MetaBuilding { * @param {Entity} entity */ setupEntityComponents(entity) { - // Required, since the item processor needs this. entity.addComponent( new ItemEjectorComponent({ slots: [], @@ -195,7 +194,6 @@ export class MetaUndergroundBeltBuilding extends MetaBuilding { entity.addComponent( new ItemAcceptorComponent({ slots: [], - type: enumItemAcceptorTypes.undergroundBelt, }) ); } diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index 9d3f2894..6ad136eb 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -45,8 +45,7 @@ import { GameRoot } from "../root"; */ /** @enum {string} */ -export const enumItemAcceptorTypes = { - itemProcessor: "itemProcessor", +const enumItemAcceptorTypes = { hub: "hub", storage: "storage", trash: "trash", @@ -64,14 +63,13 @@ export class ItemAcceptorComponent extends Component { * @param {Array} param0.slots The slots from which we accept items * @param {enumItemAcceptorTypes=} param0.type Function that gets called when the input of an item is completed */ - constructor({ slots = [], type = enumItemAcceptorTypes.itemProcessor }) { + constructor({ slots = [] }) { super(); /** @type {ItemAcceptorInputs} */ this.inputs = new Map(); /** @type {ItemAcceptorCompletedInputs} */ this.completedInputs = new Map(); // @SENSETODO does this need to be saved? - this.type = type; this.setSlots(slots); } diff --git a/src/js/game/components/item_ejector.js b/src/js/game/components/item_ejector.js index dbf88139..5c1cdb2a 100644 --- a/src/js/game/components/item_ejector.js +++ b/src/js/game/components/item_ejector.js @@ -70,7 +70,7 @@ export class ItemEjectorComponent extends Component { direction: slot.direction, item: null, lastItem: null, - progress: 0, //@SENSETODO needs to be started off with extra time + progress: 0, cachedDestSlot: null, cachedTargetEntity: null, }); @@ -134,7 +134,6 @@ export class ItemEjectorComponent extends Component { if (!this.canEjectOnSlot(slotIndex)) { return false; } - if (startingProgress > 0) console.log("starting with progress: " + startingProgress); this.slots[slotIndex].item = item; this.slots[slotIndex].lastItem = item; this.slots[slotIndex].progress = startingProgress; diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index 854ef2ae..45e56a1b 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -507,55 +507,39 @@ export class HubGoals extends BasicSerializableObject { } /** - * Processor speed + * Processor time to process * @param {enumItemProcessorTypes} processorType - * @returns {number} items / sec + * @returns {number} process time in seconds */ - getProcessorBaseSpeed(processorType) { + getProcessingTime(processorType) { if (this.root.gameMode.throughputDoesNotMatter()) { - return globalConfig.beltSpeedItemsPerSecond * globalConfig.puzzleModeSpeed * 10; + return 0; } switch (processorType) { case enumItemProcessorTypes.trash: case enumItemProcessorTypes.hub: case enumItemProcessorTypes.goal: - return 1e30; case enumItemProcessorTypes.balancer: - return globalConfig.beltSpeedItemsPerSecond * this.upgradeImprovements.belt * 2; case enumItemProcessorTypes.reader: - return globalConfig.beltSpeedItemsPerSecond * this.upgradeImprovements.belt; + case enumItemProcessorTypes.rotater: + case enumItemProcessorTypes.rotaterCCW: + case enumItemProcessorTypes.rotater180: + return 0; case enumItemProcessorTypes.mixer: case enumItemProcessorTypes.painter: case enumItemProcessorTypes.painterDouble: case enumItemProcessorTypes.painterQuad: { - assert( - globalConfig.buildingSpeeds[processorType], - "Processor type has no speed set in globalConfig.buildingSpeeds: " + processorType - ); - return ( - globalConfig.beltSpeedItemsPerSecond * - this.upgradeImprovements.painting * - globalConfig.buildingSpeeds[processorType] - ); + return this.getProcessorTimeWithUpgrades(this.upgradeImprovements.painting, processorType); + // b2 + 4 = 4 + // b2 + 8 = 8 } case enumItemProcessorTypes.cutter: case enumItemProcessorTypes.cutterQuad: - case enumItemProcessorTypes.rotater: - case enumItemProcessorTypes.rotaterCCW: - case enumItemProcessorTypes.rotater180: case enumItemProcessorTypes.stacker: { - assert( - globalConfig.buildingSpeeds[processorType], - "Processor type has no speed set in globalConfig.buildingSpeeds: " + processorType - ); - return ( - globalConfig.beltSpeedItemsPerSecond * - this.upgradeImprovements.processors * - globalConfig.buildingSpeeds[processorType] - ); + return this.getProcessorTimeWithUpgrades(this.upgradeImprovements.processors, processorType); } default: if (MOD_ITEM_PROCESSOR_SPEEDS[processorType]) { @@ -564,6 +548,33 @@ export class HubGoals extends BasicSerializableObject { assertAlways(false, "invalid processor type: " + processorType); } - return 1 / globalConfig.beltSpeedItemsPerSecond; + return 0; + } + + /** + * @param {number} upgrade + * @param {number} upgrade + */ + getProcessorTimeWithUpgrades(upgrade, processorType) { + assert( + globalConfig.buildingAmountsToBelt[processorType], + "Processor type has no speed set in globalConfig.buildingSpeeds: " + processorType + ); + + const processorTime = + globalConfig.buildingAmountsToBelt[processorType] / globalConfig.beltSpeedItemsPerSecond; + return processorTime / upgrade; + } + /** + * Processor speed + * @param {enumItemProcessorTypes} processorType + * @returns {number} process time in seconds + */ + getProcessingSpeed(processorType) { + const time = this.getProcessingTime(processorType); + if (time == 0) { + return time; + } + return 1 / time; } } diff --git a/src/js/game/systems/item_acceptor.js b/src/js/game/systems/item_acceptor.js index a0ba70cf..34b3b12f 100644 --- a/src/js/game/systems/item_acceptor.js +++ b/src/js/game/systems/item_acceptor.js @@ -2,11 +2,7 @@ import { globalConfig } from "../../core/config"; import { DrawParameters } from "../../core/draw_parameters"; import { enumDirectionToVector } from "../../core/vector"; import { ACHIEVEMENTS } from "../../platform/achievement_provider"; -import { - enumItemAcceptorTypes, - ItemAcceptorComponent, - InputCompletedArgs, -} from "../components/item_acceptor"; +import { ItemAcceptorComponent, InputCompletedArgs } from "../components/item_acceptor"; import { GameSystemWithFilter } from "../game_system_with_filter"; import { ShapeItem } from "../items/shape_item"; import { MapChunkView } from "../map_chunk_view"; @@ -14,29 +10,16 @@ import { MapChunkView } from "../map_chunk_view"; export class ItemAcceptorSystem extends GameSystemWithFilter { constructor(root) { super(root, [ItemAcceptorComponent]); - - /** - * @type {Object} - */ - this.handlers = { - [enumItemAcceptorTypes.itemProcessor]: this.input_ITEMPROCESSOR, - [enumItemAcceptorTypes.hub]: this.input_HUB, - [enumItemAcceptorTypes.trash]: this.input_TRASH, - }; - - // Bind all handlers - for (const key in this.handlers) { - this.handlers[key] = this.handlers[key].bind(this); - } } update() { - // * 2 because its only a half tile - (same code as ejector) + // same code for belts, acceptors and ejectors - add helper method??? const progressGrowth = - 2 * this.root.dynamicTickrate.deltaSeconds * this.root.hubGoals.getBeltBaseSpeed() * globalConfig.itemSpacingOnBelts; + // it's only half a belt + const maxProgress = 0.5; for (let i = 0; i < this.allEntities.length; ++i) { const entity = this.allEntities[i]; @@ -46,26 +29,13 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { inputs.forEach((values, index) => { values.animProgress += progressGrowth; - if (values.animProgress < 1) return; + if (values.animProgress < maxProgress) return; inputs.delete(index); acceptorComp.completedInputs.set(index, { item: values.item, - extraProgress: values.animProgress - 1, - }); // will be handled on the SAME frame due to processor being afterwards - - /** @type {function(InputCompletedArgs) : string} */ - const handler = this.handlers[acceptorComp.type]; - assert(handler, "No handler for acceptor type defined: " + acceptorComp.type); - - // Call implementation - handler({ - root: this.root, - entity, - item: values.item, - slotIndex: index, - extraProgress: values.animProgress - 1, - }); + extraProgress: values.animProgress - maxProgress, + }); // will be handled on the SAME frame due to processor system being afterwards }); } } @@ -102,8 +72,8 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { const fadeOutDirection = enumDirectionToVector[staticComp.localDirectionToWorld(direction)]; const finalTile = realSlotPos.subScalars( - fadeOutDirection.x * (animProgress / 2 - 0.5), - fadeOutDirection.y * (animProgress / 2 - 0.5) + fadeOutDirection.x * (animProgress - 0.5), + fadeOutDirection.y * (animProgress - 0.5) ); item.drawItemCenteredClipped( diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index 96c90951..4dfc31b3 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -139,12 +139,13 @@ export class ItemEjectorSystem extends GameSystemWithFilter { update() { this.staleAreaDetector.update(); - // * 2 because its only a half tile - (same code as acceptor) + // same code for belts, acceptors and ejectors - add helper method??? const progressGrowth = - 2 * this.root.dynamicTickrate.deltaSeconds * this.root.hubGoals.getBeltBaseSpeed() * globalConfig.itemSpacingOnBelts; + // it's only half a belt + const maxProgress = 0.5; // Go over all cache entries for (let i = 0; i < this.allEntities.length; ++i) { @@ -160,25 +161,25 @@ export class ItemEjectorSystem extends GameSystemWithFilter { continue; } - if (slot.progress < 1) { + if (slot.progress < maxProgress) { // Advance items on the slot slot.progress += progressGrowth; if (G_IS_DEV && globalConfig.debug.disableEjectorProcessing) { - slot.progress = 1; + slot.progress = maxProgress; } } // Check if we are still in the process of ejecting, can't proceed then - if (slot.progress < 1) continue; + if (slot.progress < maxProgress) continue; - const extraProgress = slot.progress - 1; + const extraProgress = slot.progress - maxProgress; // Check if we are ejecting to a belt path const destPath = slot.cachedBeltPath; if (destPath) { - // Try passing the item over - extraProgress / 2 because the progress there is for double the distance - if (destPath.tryAcceptItem(item, extraProgress / 2)) { + // Try passing the item over + if (destPath.tryAcceptItem(item, extraProgress)) { slot.item = null; } @@ -203,8 +204,6 @@ export class ItemEjectorSystem extends GameSystemWithFilter { slot.item = null; } } - - //@SENSETODO deal with other buildings - acceptor code on them needs to be different! } } } @@ -244,8 +243,13 @@ export class ItemEjectorSystem extends GameSystemWithFilter { continue; } + // don't render items at the start of output + if (slot.progress < 0.05) { + continue; + } + // Limit the progress to the maximum available space on the next belt (also see #1000) - let progress = Math.min(1, slot.progress); + let progress = Math.min(0.5, slot.progress); const nextBeltPath = slot.cachedBeltPath; if (nextBeltPath) { /* @@ -281,7 +285,7 @@ export class ItemEjectorSystem extends GameSystemWithFilter { ^ max progress = 0.3 Because now our range actually only goes to the end of the building, and not towards the center of the building, we need to multiply - all values by 2: + all values by 2: <--------- except max progress is now 0.5 rather than 1, so this isn't needed anymore Building Belt | X | X | @@ -293,7 +297,7 @@ export class ItemEjectorSystem extends GameSystemWithFilter { */ const maxProgress = - (0.5 + nextBeltPath.spacingToFirstItem - globalConfig.itemSpacingOnBelts) * 2; + 0.5 + nextBeltPath.spacingToFirstItem - globalConfig.itemSpacingOnBelts; progress = Math.min(maxProgress, progress); } @@ -306,8 +310,8 @@ export class ItemEjectorSystem extends GameSystemWithFilter { const realDirection = staticComp.localDirectionToWorld(slot.direction); const realDirectionVector = enumDirectionToVector[realDirection]; - const tileX = realPosition.x + 0.5 + realDirectionVector.x * 0.5 * progress; - const tileY = realPosition.y + 0.5 + realDirectionVector.y * 0.5 * progress; + const tileX = realPosition.x + 0.5 + realDirectionVector.x * progress; + const tileY = realPosition.y + 0.5 + realDirectionVector.y * progress; const worldX = tileX * globalConfig.tileSize; const worldY = tileY * globalConfig.tileSize; diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 2119a721..20bfbdab 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -1,4 +1,5 @@ import { globalConfig } from "../../core/config"; +import { ACHIEVEMENTS } from "../../platform/achievement_provider"; import { BaseItem } from "../base_item"; import { enumColorMixingResults, enumColors } from "../colors"; import { @@ -13,10 +14,10 @@ import { ColorItem, COLOR_ITEM_SINGLETONS } from "../items/color_item"; import { ShapeItem } from "../items/shape_item"; /** - * We need to allow queuing charges, otherwise the throughput will stall + * We need to allow queuing charges, otherwise the throughput will stalls */ //@SENSETODO not sure if this is true anymore -const MAX_QUEUED_CHARGES = 2; +const MAX_QUEUED_CHARGES = 1; /** * Whole data for a produced item @@ -266,7 +267,6 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // First, take inputs - but only ones that are completed const inputs = acceptorComp.completedInputs; - console.log("processor added charge"); const outItems = []; @@ -289,8 +289,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } // Queue Charge - const baseSpeed = this.root.hubGoals.getProcessorBaseSpeed(processorComp.type); - const originalTime = 0; + const originalTime = this.root.hubGoals.getProcessingTime(processorComp.type); const bonusTimeToApply = Math.min(originalTime, processorComp.bonusTime); const timeToProcess = originalTime - bonusTimeToApply; @@ -414,6 +413,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const rotatedDefinition = this.root.shapeDefinitionMgr.shapeActionRotateCCW(inputDefinition); payload.outItems.push({ item: this.root.shapeDefinitionMgr.getShapeItemFromDefinition(rotatedDefinition), + extraProgress: input.extraProgress, }); } @@ -429,6 +429,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const rotatedDefinition = this.root.shapeDefinitionMgr.shapeActionRotate180(inputDefinition); payload.outItems.push({ item: this.root.shapeDefinitionMgr.getShapeItemFromDefinition(rotatedDefinition), + extraProgress: input.extraProgress, }); } @@ -437,7 +438,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { */ process_STACKER(payload) { const lowerInput = payload.inputs.get(0); - const upperInput = payload.inputs.get(0); + const upperInput = payload.inputs.get(1); const lowerItem = /** @type {ShapeItem} */ (lowerInput.item); const upperItem = /** @type {ShapeItem} */ (upperInput.item); @@ -450,6 +451,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { ); payload.outItems.push({ item: this.root.shapeDefinitionMgr.getShapeItemFromDefinition(stackedDefinition), + extraProgress: lowerInput.extraProgress, }); } @@ -457,7 +459,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_TRASH(payload) { - // Do nothing .. + payload.entity.root.signals.achievementCheck.dispatch(ACHIEVEMENTS.trash1000, 1); } /** @@ -483,6 +485,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } payload.outItems.push({ item: COLOR_ITEM_SINGLETONS[resultColor], + extraProgress: input1.extraProgress, }); } @@ -502,6 +505,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { payload.outItems.push({ item: this.root.shapeDefinitionMgr.getShapeItemFromDefinition(colorizedDefinition), + extraProgress: input1.extraProgress, }); } @@ -509,8 +513,11 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_PAINTER_DOUBLE(payload) { - const shapeItem1 = /** @type {ShapeItem} */ (payload.inputs.get(0).item); - const shapeItem2 = /** @type {ShapeItem} */ (payload.inputs.get(1).item); + const input1 = payload.inputs.get(0); + const input2 = payload.inputs.get(1); + + const shapeItem1 = /** @type {ShapeItem} */ (input1.item); + const shapeItem2 = /** @type {ShapeItem} */ (input2.item); const colorItem = /** @type {ColorItem} */ (payload.inputs.get(2).item); assert(shapeItem1 instanceof ShapeItem, "Input for painter is not a shape"); @@ -528,10 +535,12 @@ export class ItemProcessorSystem extends GameSystemWithFilter { ); payload.outItems.push({ item: this.root.shapeDefinitionMgr.getShapeItemFromDefinition(colorizedDefinition1), + extraProgress: input1.extraProgress, }); payload.outItems.push({ item: this.root.shapeDefinitionMgr.getShapeItemFromDefinition(colorizedDefinition2), + extraProgress: input2.extraProgress, }); } @@ -559,6 +568,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { payload.outItems.push({ item: this.root.shapeDefinitionMgr.getShapeItemFromDefinition(colorizedDefinition), + extraProgress: input.extraProgress, }); } @@ -567,33 +577,34 @@ export class ItemProcessorSystem extends GameSystemWithFilter { */ process_READER(payload) { // Pass through the item - const item = payload.inputs.get(0).item; + const input = payload.inputs.get(0); payload.outItems.push({ - item, + item: input.item, doNotTrack: true, + extraProgress: input.extraProgress, }); // Track the item const readerComp = payload.entity.components.BeltReader; readerComp.lastItemTimes.push(this.root.time.now()); - readerComp.lastItem = item; + readerComp.lastItem = input.item; } /** * @param {ProcessorImplementationPayload} payload */ process_HUB(payload) { - //const input = payload.inputs.get(i); - //const hubComponent = payload.entity.components.Hub; - //assert(hubComponent, "Hub item processor has no hub component"); - //// Hardcoded - //for (let i = 0; i < payload.inputCount; ++i) { - // const item = /** @type {ShapeItem} */ (payload.inputs.get(i)); - // if (!item) { - // continue; - // } - // this.root.hubGoals.handleDefinitionDelivered(item.definition); - //} + const hubComponent = payload.entity.components.Hub; + assert(hubComponent, "Hub item processor has no hub component"); + // Hardcoded + for (let i = 0; i < payload.inputs.size; ++i) { + const input = payload.inputs.get(i); + if (!input) continue; + const item = /** @type {ShapeItem} */ (input.item); + if (!item) continue; + + this.root.hubGoals.handleDefinitionDelivered(item.definition); + } } /** diff --git a/src/js/game/systems/underground_belt.js b/src/js/game/systems/underground_belt.js index 9b31eec1..84f71abd 100644 --- a/src/js/game/systems/underground_belt.js +++ b/src/js/game/systems/underground_belt.js @@ -294,6 +294,7 @@ export class UndergroundBeltSystem extends GameSystemWithFilter { */ handleSender(entity) { const undergroundComp = entity.components.UndergroundBelt; + const acceptorComp = entity.components.ItemAcceptor; // Find the current receiver let cacheEntry = undergroundComp.cachedLinkedEntity; From d01341bb4f31546c3490337c874e3322ab3a2406 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Wed, 19 Jan 2022 17:56:44 +0000 Subject: [PATCH 076/129] Got all buildings working - storage and tunnel still aren't exact --- src/js/game/belt_path.js | 7 +++-- src/js/game/components/filter.js | 6 ++-- src/js/game/components/underground_belt.js | 25 ++-------------- src/js/game/systems/filter.js | 34 ++++++++++------------ src/js/game/systems/item_ejector.js | 6 ++++ src/js/game/systems/item_processor.js | 4 +-- src/js/game/systems/storage.js | 15 ++++++++++ src/js/game/systems/underground_belt.js | 12 +++----- 8 files changed, 51 insertions(+), 58 deletions(-) diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js index e1326693..bf1252ec 100644 --- a/src/js/game/belt_path.js +++ b/src/js/game/belt_path.js @@ -220,8 +220,6 @@ export class BeltPath extends BasicSerializableObject { return; } - const noSimplifiedBelts = !this.root.app.settings.getAllSettings().simplifiedBelts; - DEBUG && !debug_Silent && logger.log(" Found target entity", targetEntity.uid); const targetStaticComp = targetEntity.components.StaticMapEntity; const targetBeltComp = targetEntity.components.Belt; @@ -270,6 +268,11 @@ export class BeltPath extends BasicSerializableObject { const matchingDirection = enumInvertedDirections[ejectingDirection]; return function (item, startProgress = 0.0) { + // storage has to have its own duplicated logic, as it's the ONLY building which the acceptor can't filter for it + const storageComp = targetEntity.components.Storage; + if (storageComp && !storageComp.canAcceptItem(item)) { + return false; + } if (targetAcceptorComp.tryAcceptItem(matchingSlotIndex, matchingDirection, item, startProgress)) { return true; } diff --git a/src/js/game/components/filter.js b/src/js/game/components/filter.js index 8a22a076..4c16ea6f 100644 --- a/src/js/game/components/filter.js +++ b/src/js/game/components/filter.js @@ -6,7 +6,7 @@ import { typeItemSingleton } from "../item_resolver"; /** * @typedef {{ * item: BaseItem, - * progress: number + * extraProgress: number * }} PendingFilterItem */ @@ -24,14 +24,14 @@ export class FilterComponent extends Component { pendingItemsToLeaveThrough: types.array( types.structured({ item: typeItemSingleton, - progress: types.ufloat, + extraProgress: types.ufloat, }) ), pendingItemsToReject: types.array( types.structured({ item: typeItemSingleton, - progress: types.ufloat, + extraProgress: types.ufloat, //@SENSETODO will need save migration }) ), }; diff --git a/src/js/game/components/underground_belt.js b/src/js/game/components/underground_belt.js index 2b744edd..742f14cd 100644 --- a/src/js/game/components/underground_belt.js +++ b/src/js/game/components/underground_belt.js @@ -56,34 +56,13 @@ export class UndergroundBeltComponent extends Component { this.consumptionAnimations = []; /** - * Used on both receiver and sender. - * Reciever: Used to store the next item to transfer, and to block input while doing this - * Sender: Used to store which items are currently "travelling" + * Used only on reciever + * Reciever: Used to store which items are currently "travelling" * @type {Array<[BaseItem, number]>} Format is [Item, ingame time to eject the item] */ this.pendingItems = []; } - /** - * Tries to accept an item from an external source like a regular belt or building - * @param {BaseItem} item - * @param {number} beltSpeed How fast this item travels - */ - tryAcceptExternalItem(item, beltSpeed) { - if (this.mode !== enumUndergroundBeltMode.sender) { - // Only senders accept external items - return false; - } - - if (this.pendingItems.length > 0) { - // We currently have a pending item - return false; - } - - this.pendingItems.push([item, 0]); - return true; - } - /** * Tries to accept a tunneled item * @param {BaseItem} item diff --git a/src/js/game/systems/filter.js b/src/js/game/systems/filter.js index a6442b41..742754c1 100644 --- a/src/js/game/systems/filter.js +++ b/src/js/game/systems/filter.js @@ -13,32 +13,27 @@ export class FilterSystem extends GameSystemWithFilter { } update() { - const progress = - this.root.dynamicTickrate.deltaSeconds * - this.root.hubGoals.getBeltBaseSpeed() * - globalConfig.itemSpacingOnBelts; - - const requiredProgress = 1 - progress; - for (let i = 0; i < this.allEntities.length; ++i) { const entity = this.allEntities[i]; const filterComp = entity.components.Filter; + const acceptorComp = entity.components.ItemAcceptor; const ejectorComp = entity.components.ItemEjector; - // Process payloads + // Take items from acceptor + const input = acceptorComp.completedInputs.get(0); + if (input && this.tryAcceptItem(entity, input)) { + acceptorComp.completedInputs.delete(0); + } + + // Output to ejector const slotsAndLists = [filterComp.pendingItemsToLeaveThrough, filterComp.pendingItemsToReject]; for (let slotIndex = 0; slotIndex < slotsAndLists.length; ++slotIndex) { const pendingItems = slotsAndLists[slotIndex]; for (let j = 0; j < pendingItems.length; ++j) { const nextItem = pendingItems[j]; - // Advance next item - nextItem.progress = Math.min(requiredProgress, nextItem.progress + progress); - // Check if it's ready to eject - if (nextItem.progress >= requiredProgress - 1e-5) { - if (ejectorComp.tryEject(slotIndex, nextItem.item)) { - pendingItems.shift(); - } + if (ejectorComp.tryEject(slotIndex, nextItem.item)) { + pendingItems.shift(); } } } @@ -48,10 +43,11 @@ export class FilterSystem extends GameSystemWithFilter { /** * * @param {Entity} entity - * @param {number} slot - * @param {BaseItem} item + * @param {Object} param0 + * @param {BaseItem} param0.item + * @param {number} param0.extraProgress */ - tryAcceptItem(entity, slot, item) { + tryAcceptItem(entity, { item, extraProgress }) { const network = entity.components.WiredPins.slots[0].linkedNetwork; if (!network || !network.hasValue()) { // Filter is not connected @@ -78,7 +74,7 @@ export class FilterSystem extends GameSystemWithFilter { // Actually accept item listToCheck.push({ item, - progress: 0.0, + extraProgress, }); return true; } diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index 4dfc31b3..5a145a9f 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -191,6 +191,12 @@ export class ItemEjectorSystem extends GameSystemWithFilter { const destEntity = slot.cachedTargetEntity; const destSlot = slot.cachedDestSlot; if (destEntity && destSlot) { + // storage has to have its own duplicated logic, as it's the ONLY building which the acceptor can't filter for it + const storageComp = destEntity.components.Storage; + if (storageComp && !storageComp.canAcceptItem(item)) { + continue; + } + const targetAcceptorComp = destEntity.components.ItemAcceptor; if ( targetAcceptorComp.tryAcceptItem( diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 20bfbdab..f5beb37a 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -16,7 +16,7 @@ import { ShapeItem } from "../items/shape_item"; /** * We need to allow queuing charges, otherwise the throughput will stalls */ -//@SENSETODO not sure if this is true anymore +//@SENSETODO not sure if this needs to be two anymore const MAX_QUEUED_CHARGES = 1; /** @@ -141,8 +141,6 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } } - //@SENSETODO add code in here that handles queued outputs -rearrange where this is too - // If the charge was entirely emptied to the outputs, start the next charge if (itemsToEject.length === 0) { processorComp.ongoingCharges.shift(); diff --git a/src/js/game/systems/storage.js b/src/js/game/systems/storage.js index 80affac9..767f1b4d 100644 --- a/src/js/game/systems/storage.js +++ b/src/js/game/systems/storage.js @@ -30,6 +30,21 @@ export class StorageSystem extends GameSystemWithFilter { const entity = this.allEntities[i]; const storageComp = entity.components.Storage; const pinsComp = entity.components.WiredPins; + const acceptorComp = entity.components.ItemAcceptor; + + // Take items from acceptor + const input1 = acceptorComp.completedInputs.get(0); + const input2 = acceptorComp.completedInputs.get(1); + if (input1) { + storageComp.storedItem = input1.item; + storageComp.storedCount++; + acceptorComp.completedInputs.delete(0); + } + if (input2) { + storageComp.storedItem = input2.item; + storageComp.storedCount++; + acceptorComp.completedInputs.delete(1); + } // Eject from storage if (storageComp.storedItem && storageComp.storedCount > 0) { diff --git a/src/js/game/systems/underground_belt.js b/src/js/game/systems/underground_belt.js index 84f71abd..e273b5cc 100644 --- a/src/js/game/systems/underground_belt.js +++ b/src/js/game/systems/underground_belt.js @@ -308,22 +308,18 @@ export class UndergroundBeltSystem extends GameSystemWithFilter { return; } - // Check if we have any items to eject - const nextItemAndDuration = undergroundComp.pendingItems[0]; - if (nextItemAndDuration) { - assert(undergroundComp.pendingItems.length === 1, "more than 1 pending"); - + const input = acceptorComp.completedInputs.get(0); + if (input) { // Check if the receiver can accept it if ( cacheEntry.entity.components.UndergroundBelt.tryAcceptTunneledItem( - nextItemAndDuration[0], + input.item, cacheEntry.distance, this.root.hubGoals.getUndergroundBeltBaseSpeed(), this.root.time.now() ) ) { - // Drop this item - fastArrayDelete(undergroundComp.pendingItems, 0); + acceptorComp.completedInputs.delete(0); } } } From 4dbbff94778f619f5dfa6c72799986bec763feb0 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Wed, 19 Jan 2022 18:00:26 +0000 Subject: [PATCH 077/129] some cleanup --- src/js/game/components/item_acceptor.js | 2 -- src/js/game/systems/item_acceptor.js | 33 ------------------------- 2 files changed, 35 deletions(-) diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index 6ad136eb..c5fcdd9f 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -103,8 +103,6 @@ export class ItemAcceptorComponent extends Component { tryAcceptItem(slotIndex, direction, item, startProgress = 0.0) { const slot = this.slots[slotIndex]; - //@SENSETODO see if this works for buildings like hub - if (this.completedInputs.has(slotIndex) || (slot.filter && slot.filter != item.getItemType())) { return false; } diff --git a/src/js/game/systems/item_acceptor.js b/src/js/game/systems/item_acceptor.js index 34b3b12f..c150c4f2 100644 --- a/src/js/game/systems/item_acceptor.js +++ b/src/js/game/systems/item_acceptor.js @@ -85,37 +85,4 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { }); } } - - /** - * @param {InputCompletedArgs} args - */ - input_ITEMPROCESSOR(args) {} - //@SENSETODO this isn't set up like it should be yet - - /** - * @param {InputCompletedArgs} args - */ - input_HUB(args) { - const item = /** @type {ShapeItem} */ (args.item); - assert(item instanceof ShapeItem, "Input for hub is not a shape"); - - this.root.hubGoals.handleDefinitionDelivered(item.definition); - - const acceptorComp = args.entity.components.ItemAcceptor; - acceptorComp.inputs.delete(args.slotIndex); - } - - /** - * @param {InputCompletedArgs} args - */ - input_TRASH(args) { - // just remove the item - const acceptorComp = args.entity.components.ItemAcceptor; - acceptorComp.inputs.delete(args.slotIndex); - args.entity.root.signals.achievementCheck.dispatch(ACHIEVEMENTS.trash1000, 1); - } - - //storage - - //underground belt } From 638cdc2733db8a5739ab9ce138d6a882f8a88f72 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Wed, 19 Jan 2022 20:28:04 +0000 Subject: [PATCH 078/129] refactor tunnel to be exactly the same speed as belt --- src/js/game/components/underground_belt.js | 23 ++++-------- src/js/game/game_system_manager.js | 4 +-- src/js/game/systems/underground_belt.js | 41 +++++++++++++++------- 3 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/js/game/components/underground_belt.js b/src/js/game/components/underground_belt.js index 742f14cd..0164e269 100644 --- a/src/js/game/components/underground_belt.js +++ b/src/js/game/components/underground_belt.js @@ -56,9 +56,8 @@ export class UndergroundBeltComponent extends Component { this.consumptionAnimations = []; /** - * Used only on reciever - * Reciever: Used to store which items are currently "travelling" - * @type {Array<[BaseItem, number]>} Format is [Item, ingame time to eject the item] + * Used only on reciever to store which items are currently "travelling" + * @type {Array<[BaseItem, number]>} Format is [Item, Tile progress] */ this.pendingItems = []; } @@ -66,30 +65,22 @@ export class UndergroundBeltComponent extends Component { /** * Tries to accept a tunneled item * @param {BaseItem} item - * @param {number} travelDistance How many tiles this item has to travel - * @param {number} beltSpeed How fast this item travels - * @param {number} now Current ingame time + * @param {number} travelDistance + * @param {number} startProgress The starting tile progress */ - tryAcceptTunneledItem(item, travelDistance, beltSpeed, now) { + tryAcceptTunneledItem(item, travelDistance, startProgress = 0) { if (this.mode !== enumUndergroundBeltMode.receiver) { // Only receivers can accept tunneled items return false; } - // Notice: We assume that for all items the travel distance is the same - const maxItemsInTunnel = (2 + travelDistance) / globalConfig.itemSpacingOnBelts; + const maxItemsInTunnel = travelDistance / globalConfig.itemSpacingOnBelts; if (this.pendingItems.length >= maxItemsInTunnel) { // Simulate a real belt which gets full at some point return false; } - // NOTICE: - // This corresponds to the item ejector - it needs 0.5 additional tiles to eject the item. - // So instead of adding 1 we add 0.5 only. - // Additionally it takes 1 tile for the acceptor which we just add on top. - const travelDuration = (travelDistance + 1.5) / beltSpeed / globalConfig.itemSpacingOnBelts; - - this.pendingItems.push([item, now + travelDuration]); + this.pendingItems.push([item, startProgress]); return true; } } diff --git a/src/js/game/game_system_manager.js b/src/js/game/game_system_manager.js index 4bf5f64d..9270a75c 100644 --- a/src/js/game/game_system_manager.js +++ b/src/js/game/game_system_manager.js @@ -150,14 +150,14 @@ export class GameSystemManager { add("belt", BeltSystem); - add("undergroundBelt", UndergroundBeltSystem); - add("miner", MinerSystem); add("storage", StorageSystem); add("itemEjector", ItemEjectorSystem); + add("undergroundBelt", UndergroundBeltSystem); + add("itemProcessor", ItemProcessorSystem); add("filter", FilterSystem); diff --git a/src/js/game/systems/underground_belt.js b/src/js/game/systems/underground_belt.js index e273b5cc..451b6e55 100644 --- a/src/js/game/systems/underground_belt.js +++ b/src/js/game/systems/underground_belt.js @@ -225,7 +225,11 @@ export class UndergroundBeltSystem extends GameSystemWithFilter { this.staleAreaWatcher.update(); const sender = enumUndergroundBeltMode.sender; - const now = this.root.time.now(); + + const progressGrowth = + this.root.dynamicTickrate.deltaSeconds * + this.root.hubGoals.getBeltBaseSpeed() * + globalConfig.itemSpacingOnBelts; for (let i = 0; i < this.allEntities.length; ++i) { const entity = this.allEntities[i]; @@ -233,7 +237,7 @@ export class UndergroundBeltSystem extends GameSystemWithFilter { if (undergroundComp.mode === sender) { this.handleSender(entity); } else { - this.handleReceiver(entity, now); + this.handleReceiver(entity, progressGrowth); } } } @@ -253,8 +257,8 @@ export class UndergroundBeltSystem extends GameSystemWithFilter { // Search in the direction of the tunnel for ( - let searchOffset = 0; - searchOffset < globalConfig.undergroundBeltMaxTilesByTier[undergroundComp.tier]; + let searchOffset = 1; + searchOffset < globalConfig.undergroundBeltMaxTilesByTier[undergroundComp.tier] + 1; ++searchOffset ) { currentTile = currentTile.add(searchVector); @@ -281,6 +285,9 @@ export class UndergroundBeltSystem extends GameSystemWithFilter { break; } + console.log("distance: " + searchOffset); + // make sure to link the other way as well + receiverUndergroundComp.cachedLinkedEntity = { entity: null, distance: searchOffset }; return { entity: potentialReceiver, distance: searchOffset }; } @@ -310,13 +317,13 @@ export class UndergroundBeltSystem extends GameSystemWithFilter { const input = acceptorComp.completedInputs.get(0); if (input) { + console.log("found input"); // Check if the receiver can accept it if ( cacheEntry.entity.components.UndergroundBelt.tryAcceptTunneledItem( input.item, cacheEntry.distance, - this.root.hubGoals.getUndergroundBeltBaseSpeed(), - this.root.time.now() + input.extraProgress ) ) { acceptorComp.completedInputs.delete(0); @@ -327,20 +334,28 @@ export class UndergroundBeltSystem extends GameSystemWithFilter { /** * * @param {Entity} entity - * @param {number} now + * @param {number} progressGrowth */ - handleReceiver(entity, now) { + handleReceiver(entity, progressGrowth) { const undergroundComp = entity.components.UndergroundBelt; - // Try to eject items, we only check the first one because it is sorted by remaining time - const nextItemAndDuration = undergroundComp.pendingItems[0]; - if (nextItemAndDuration) { - if (now > nextItemAndDuration[1]) { + if (!undergroundComp.cachedLinkedEntity) return; + const distance = undergroundComp.cachedLinkedEntity.distance; + + // Move items along + for (let i = 0; i < undergroundComp.pendingItems.length; i++) { + const itemAndProgress = undergroundComp.pendingItems[i]; + if (itemAndProgress[1] < distance) { + itemAndProgress[1] += progressGrowth; + } + + if (itemAndProgress[1] >= distance) { const ejectorComp = entity.components.ItemEjector; const nextSlotIndex = ejectorComp.getFirstFreeSlot(); if (nextSlotIndex !== null) { - if (ejectorComp.tryEject(nextSlotIndex, nextItemAndDuration[0])) { + const extraProgress = itemAndProgress[1] - distance; + if (ejectorComp.tryEject(nextSlotIndex, itemAndProgress[0], extraProgress)) { undergroundComp.pendingItems.shift(); } } From b2ec3322b8a060f3a6e99bdfe6b45e8a7e3327df Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Wed, 19 Jan 2022 20:59:29 +0000 Subject: [PATCH 079/129] add acceptor extension option to fix storage --- src/js/game/buildings/storage.js | 1 + src/js/game/components/item_acceptor.js | 15 ++++----------- src/js/game/systems/item_acceptor.js | 3 +-- src/js/game/systems/item_processor.js | 7 ++++++- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/js/game/buildings/storage.js b/src/js/game/buildings/storage.js index 78f398be..df9f95f4 100644 --- a/src/js/game/buildings/storage.js +++ b/src/js/game/buildings/storage.js @@ -81,6 +81,7 @@ export class MetaStorageBuilding extends MetaBuilding { direction: enumDirection.bottom, }, ], + lengthMultiplier: 3, // make progress 1.5 to reach the ejector }) ); diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index c5fcdd9f..5c989521 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -44,14 +44,6 @@ import { GameRoot } from "../root"; * }} InputCompletedArgs */ -/** @enum {string} */ -const enumItemAcceptorTypes = { - hub: "hub", - storage: "storage", - trash: "trash", - undergroundBelt: "undergroundBelt", -}; - export class ItemAcceptorComponent extends Component { static getId() { return "ItemAcceptor"; @@ -61,9 +53,9 @@ export class ItemAcceptorComponent extends Component { * * @param {object} param0 * @param {Array} param0.slots The slots from which we accept items - * @param {enumItemAcceptorTypes=} param0.type Function that gets called when the input of an item is completed + * @param {number=} param0.lengthMultiplier Whether the acceptor is double the usual length */ - constructor({ slots = [] }) { + constructor({ slots = [], lengthMultiplier = 1 }) { super(); /** @type {ItemAcceptorInputs} */ @@ -71,6 +63,7 @@ export class ItemAcceptorComponent extends Component { /** @type {ItemAcceptorCompletedInputs} */ this.completedInputs = new Map(); // @SENSETODO does this need to be saved? this.setSlots(slots); + this.progressLength = 0.5 * lengthMultiplier; } /** @@ -110,7 +103,7 @@ export class ItemAcceptorComponent extends Component { this.inputs.set(slotIndex, { item, direction, - animProgress: Math.min(1, startProgress), + animProgress: Math.min(this.progressLength, startProgress), }); return true; } diff --git a/src/js/game/systems/item_acceptor.js b/src/js/game/systems/item_acceptor.js index c150c4f2..24b8b603 100644 --- a/src/js/game/systems/item_acceptor.js +++ b/src/js/game/systems/item_acceptor.js @@ -18,13 +18,12 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { this.root.dynamicTickrate.deltaSeconds * this.root.hubGoals.getBeltBaseSpeed() * globalConfig.itemSpacingOnBelts; - // it's only half a belt - const maxProgress = 0.5; for (let i = 0; i < this.allEntities.length; ++i) { const entity = this.allEntities[i]; const acceptorComp = entity.components.ItemAcceptor; const inputs = acceptorComp.inputs; + const maxProgress = acceptorComp.progressLength; inputs.forEach((values, index) => { values.animProgress += progressGrowth; diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index f5beb37a..ab7eeba9 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -205,8 +205,13 @@ export class ItemProcessorSystem extends GameSystemWithFilter { case enumItemProcessorRequirements.painterQuad: { const pinsComp = entity.components.WiredPins; + const input = acceptorComp.inputs.get(0); + if (!input) { + return false; + } + // First slot is the shape, so if it's not there we can't do anything - const shapeItem = /** @type {ShapeItem} */ (acceptorComp.inputs.get(0).item); + const shapeItem = /** @type {ShapeItem} */ (input.item); if (!shapeItem) { return false; } From 99ae4c81ee89a573abebc4efc7116470dff873c0 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Wed, 19 Jan 2022 22:05:26 +0000 Subject: [PATCH 080/129] fix double painter bug --- src/js/game/components/item_processor.js | 5 + src/js/game/systems/item_processor.js | 125 +++++++++-------------- 2 files changed, 53 insertions(+), 77 deletions(-) diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index 422450dd..830e2382 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -108,5 +108,10 @@ export class ItemProcessorComponent extends Component { * @type {number} */ this.bonusTime = 0; + + /** + * @type {Array} + */ + this.queuedEjects = []; } } diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index ab7eeba9..6736bc65 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -102,89 +102,58 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } } - // Check if it finished - if (currentCharge.remainingTime <= 0.0) { + // Check if it finished - but don't finish another charge if there are still items queued to eject, or we might keep backing up + if (currentCharge.remainingTime <= 0.0 && processorComp.queuedEjects.length < 1) { const itemsToEject = currentCharge.items; // Go over all items and try to eject them for (let j = 0; j < itemsToEject.length; ++j) { - const { item, requiredSlot, preferredSlot, extraProgress = 0 } = itemsToEject[j]; - - assert(ejectorComp, "To eject items, the building needs to have an ejector"); - - let slot = null; - if (requiredSlot !== null && requiredSlot !== undefined) { - // We have a slot override, check if that is free - if (ejectorComp.canEjectOnSlot(requiredSlot)) { - slot = requiredSlot; - } - } else if (preferredSlot !== null && preferredSlot !== undefined) { - // We have a slot preference, try using it but otherwise use a free slot - if (ejectorComp.canEjectOnSlot(preferredSlot)) { - slot = preferredSlot; - } else { - slot = ejectorComp.getFirstFreeSlot(); - } - } else { - // We can eject on any slot - slot = ejectorComp.getFirstFreeSlot(); - } - - if (slot !== null) { - // Alright, we can actually eject - if (!ejectorComp.tryEject(slot, item, extraProgress)) { - assert(false, "Failed to eject"); - } else { - itemsToEject.splice(j, 1); - j -= 1; - } - } + processorComp.queuedEjects.push(itemsToEject[j]); } - // If the charge was entirely emptied to the outputs, start the next charge - if (itemsToEject.length === 0) { - processorComp.ongoingCharges.shift(); + processorComp.ongoingCharges.shift(); + } + } + + // Go over all items and try to eject them + for (let j = 0; j < processorComp.queuedEjects.length; ++j) { + const { item, requiredSlot, preferredSlot, extraProgress = 0 } = processorComp.queuedEjects[ + j + ]; + + assert(ejectorComp, "To eject items, the building needs to have an ejector"); + + let slot = null; + if (requiredSlot !== null && requiredSlot !== undefined) { + // We have a slot override, check if that is free + if (ejectorComp.canEjectOnSlot(requiredSlot)) { + slot = requiredSlot; + } + } else if (preferredSlot !== null && preferredSlot !== undefined) { + // We have a slot preference, try using it but otherwise use a free slot + if (ejectorComp.canEjectOnSlot(preferredSlot)) { + slot = preferredSlot; + } else { + slot = ejectorComp.getFirstFreeSlot(); + } + } else { + // We can eject on any slot + slot = ejectorComp.getFirstFreeSlot(); + } + + if (slot !== null) { + // Alright, we can actually eject + if (!ejectorComp.tryEject(slot, item, extraProgress)) { + assert(false, "Failed to eject"); + } else { + processorComp.queuedEjects.splice(j, 1); + j -= 1; } } } } } - /** - * Returns true if the entity should accept the given item on the given slot. - * This should only be called with matching items! I.e. if a color item is expected - * on the given slot, then only a color item must be passed. - * @param {Entity} entity - * @param {BaseItem} item The item to accept - * @param {number} slotIndex The slot index - * @returns {boolean} - */ - checkRequirements(entity, item, slotIndex) { - const itemProcessorComp = entity.components.ItemProcessor; - const pinsComp = entity.components.WiredPins; - - switch (itemProcessorComp.processingRequirement) { - case enumItemProcessorRequirements.painterQuad: { - if (slotIndex === 0) { - // Always accept the shape - return true; - } - - // Check the network value at the given slot - const network = pinsComp.slots[slotIndex - 1].linkedNetwork; - const slotIsEnabled = network && network.hasValue() && isTruthyItem(network.currentValue); - if (!slotIsEnabled) { - return false; - } - return true; - } - - // By default, everything is accepted - default: - return true; - } - } - /** * Checks whether it's possible to process something * @param {Entity} entity @@ -205,7 +174,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { case enumItemProcessorRequirements.painterQuad: { const pinsComp = entity.components.WiredPins; - const input = acceptorComp.inputs.get(0); + const input = acceptorComp.completedInputs.get(0); if (!input) { return false; } @@ -213,6 +182,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // First slot is the shape, so if it's not there we can't do anything const shapeItem = /** @type {ShapeItem} */ (input.item); if (!shapeItem) { + console.log("not got shape"); return false; } @@ -240,12 +210,13 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // Check if all colors of the enabled slots are there for (let i = 0; i < slotStatus.length; ++i) { - if (slotStatus[i] && !acceptorComp.inputs.get(1 + i)) { + if (slotStatus[i] && !acceptorComp.completedInputs.get(1 + i)) { // A slot which is enabled wasn't enabled. Make sure if there is anything on the quadrant, // it is not possible to paint, but if there is nothing we can ignore it for (let j = 0; j < 4; ++j) { const layer = shapeItem.definition.layers[j]; if (layer && layer[i]) { + console.log("other error"); return false; } } @@ -291,7 +262,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } } - // Queue Charge + // Queue Charge - but not if we have no outItems const originalTime = this.root.hubGoals.getProcessingTime(processorComp.type); const bonusTimeToApply = Math.min(originalTime, processorComp.bonusTime); @@ -558,9 +529,9 @@ export class ItemProcessorSystem extends GameSystemWithFilter { /** @type {Array} */ const colors = [null, null, null, null]; for (let i = 0; i < 4; ++i) { - const colorItem = /** @type {ColorItem} */ (payload.inputs.get(i + 1).item); - if (colorItem) { - colors[i] = colorItem.color; + const colorInput = payload.inputs.get(i + 1); + if (colorInput) { + colors[i] = /** @type {ColorItem} */ (colorInput.item).color; } } From 2867a8bba2d1e66ce773b44119cfd9cc947ce70c Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Wed, 19 Jan 2022 22:13:44 +0000 Subject: [PATCH 081/129] remove test logs --- src/js/game/systems/item_processor.js | 2 -- src/js/game/systems/underground_belt.js | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 6736bc65..1b18c01d 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -182,7 +182,6 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // First slot is the shape, so if it's not there we can't do anything const shapeItem = /** @type {ShapeItem} */ (input.item); if (!shapeItem) { - console.log("not got shape"); return false; } @@ -216,7 +215,6 @@ export class ItemProcessorSystem extends GameSystemWithFilter { for (let j = 0; j < 4; ++j) { const layer = shapeItem.definition.layers[j]; if (layer && layer[i]) { - console.log("other error"); return false; } } diff --git a/src/js/game/systems/underground_belt.js b/src/js/game/systems/underground_belt.js index 451b6e55..d103c926 100644 --- a/src/js/game/systems/underground_belt.js +++ b/src/js/game/systems/underground_belt.js @@ -285,7 +285,6 @@ export class UndergroundBeltSystem extends GameSystemWithFilter { break; } - console.log("distance: " + searchOffset); // make sure to link the other way as well receiverUndergroundComp.cachedLinkedEntity = { entity: null, distance: searchOffset }; return { entity: potentialReceiver, distance: searchOffset }; @@ -317,7 +316,6 @@ export class UndergroundBeltSystem extends GameSystemWithFilter { const input = acceptorComp.completedInputs.get(0); if (input) { - console.log("found input"); // Check if the receiver can accept it if ( cacheEntry.entity.components.UndergroundBelt.tryAcceptTunneledItem( From 66f085250a5eb69311126f7763ce8fff5f994bde Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 20 Jan 2022 14:59:25 +0100 Subject: [PATCH 082/129] Fix runBeforeMethod and runAfterMethod --- src/js/mods/mod_interface.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 5df35563..949e4301 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -424,8 +424,8 @@ export class ModInterface { const oldHandle = classHandle.prototype[methodName]; classHandle.prototype[methodName] = function () { //@ts-ignore Same as above - executeBefore.apply(this, ...arguments); - return oldHandle.apply(this, ...arguments); + executeBefore.apply(this, arguments); + return oldHandle.apply(this, arguments); }; } @@ -442,9 +442,9 @@ export class ModInterface { runAfterMethod(classHandle, methodName, executeAfter) { const oldHandle = classHandle.prototype[methodName]; classHandle.prototype[methodName] = function () { - const returnValue = oldHandle.apply(this, ...arguments); + const returnValue = oldHandle.apply(this, arguments); //@ts-ignore - executeAfter.apply(this, ...arguments); + executeAfter.apply(this, arguments); return returnValue; }; } From 38cca33985993022faff1951110ec4ee7357a8be Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 20 Jan 2022 16:05:39 +0100 Subject: [PATCH 083/129] Minor game system code cleanup --- src/js/game/game_system_manager.js | 1 + src/js/game/systems/belt.js | 11 +++++++---- src/js/game/systems/belt_underlays.js | 6 +++--- src/js/game/systems/constant_producer.js | 2 -- src/js/game/systems/display.js | 7 +++---- src/js/game/systems/goal_acceptor.js | 2 -- src/js/game/systems/item_ejector.js | 1 - src/js/game/systems/item_producer.js | 5 ----- src/js/game/systems/lever.js | 9 ++++----- src/js/game/systems/storage.js | 8 ++++---- src/js/game/systems/wire.js | 5 +++-- 11 files changed, 25 insertions(+), 32 deletions(-) diff --git a/src/js/game/game_system_manager.js b/src/js/game/game_system_manager.js index 05085b70..f2d44e52 100644 --- a/src/js/game/game_system_manager.js +++ b/src/js/game/game_system_manager.js @@ -187,6 +187,7 @@ export class GameSystemManager { // IMPORTANT: We have 2 phases: In phase 1 we compute the output values of all gates, // processors etc. In phase 2 we propagate it through the wires network add("logicGate", LogicGateSystem); + add("beltReader", BeltReaderSystem); add("display", DisplaySystem); diff --git a/src/js/game/systems/belt.js b/src/js/game/systems/belt.js index 00491eff..c19715a4 100644 --- a/src/js/game/systems/belt.js +++ b/src/js/game/systems/belt.js @@ -11,6 +11,7 @@ import { arrayBeltVariantToRotation, MetaBeltBuilding } from "../buildings/belt" import { getCodeFromBuildingData } from "../building_codes"; import { BeltComponent } from "../components/belt"; import { Entity } from "../entity"; +import { GameSystem } from "../game_system"; import { GameSystemWithFilter } from "../game_system_with_filter"; import { MapChunkView } from "../map_chunk_view"; import { defaultBuildingVariant } from "../meta_building"; @@ -22,9 +23,9 @@ const logger = createLogger("belt"); /** * Manages all belts */ -export class BeltSystem extends GameSystemWithFilter { +export class BeltSystem extends GameSystem { constructor(root) { - super(root, [BeltComponent]); + super(root); /** * @type {Object.>} */ @@ -425,8 +426,10 @@ export class BeltSystem extends GameSystemWithFilter { const result = []; - for (let i = 0; i < this.allEntities.length; ++i) { - const entity = this.allEntities[i]; + const beltEntities = this.root.entityMgr.getAllWithComponent(BeltComponent); + + for (let i = 0; i < beltEntities.length; ++i) { + const entity = beltEntities[i]; if (visitedUids.has(entity.uid)) { continue; } diff --git a/src/js/game/systems/belt_underlays.js b/src/js/game/systems/belt_underlays.js index c5c69d26..02707525 100644 --- a/src/js/game/systems/belt_underlays.js +++ b/src/js/game/systems/belt_underlays.js @@ -16,7 +16,7 @@ import { BeltUnderlaysComponent, enumClippedBeltUnderlayType } from "../componen import { ItemAcceptorComponent } from "../components/item_acceptor"; import { ItemEjectorComponent } from "../components/item_ejector"; import { Entity } from "../entity"; -import { GameSystemWithFilter } from "../game_system_with_filter"; +import { GameSystem } from "../game_system"; import { MapChunkView } from "../map_chunk_view"; import { BELT_ANIM_COUNT } from "./belt"; @@ -31,9 +31,9 @@ const enumUnderlayTypeToClipRect = { [enumClippedBeltUnderlayType.bottomOnly]: new Rectangle(0, 0.5, 1, 0.5), }; -export class BeltUnderlaysSystem extends GameSystemWithFilter { +export class BeltUnderlaysSystem extends GameSystem { constructor(root) { - super(root, [BeltUnderlaysComponent]); + super(root); this.underlayBeltSprites = []; diff --git a/src/js/game/systems/constant_producer.js b/src/js/game/systems/constant_producer.js index 5c10b409..a95efdb0 100644 --- a/src/js/game/systems/constant_producer.js +++ b/src/js/game/systems/constant_producer.js @@ -5,10 +5,8 @@ import { ConstantSignalComponent } from "../components/constant_signal"; import { ItemProducerComponent } from "../components/item_producer"; import { GameSystemWithFilter } from "../game_system_with_filter"; import { MapChunk } from "../map_chunk"; -import { GameRoot } from "../root"; export class ConstantProducerSystem extends GameSystemWithFilter { - /** @param {GameRoot} root */ constructor(root) { super(root, [ConstantSignalComponent, ItemProducerComponent]); } diff --git a/src/js/game/systems/display.js b/src/js/game/systems/display.js index f11091b9..65cb3a5c 100644 --- a/src/js/game/systems/display.js +++ b/src/js/game/systems/display.js @@ -2,15 +2,14 @@ import { globalConfig } from "../../core/config"; import { Loader } from "../../core/loader"; import { BaseItem } from "../base_item"; import { enumColors } from "../colors"; -import { DisplayComponent } from "../components/display"; -import { GameSystemWithFilter } from "../game_system_with_filter"; +import { GameSystem } from "../game_system"; import { isTrueItem } from "../items/boolean_item"; import { ColorItem, COLOR_ITEM_SINGLETONS } from "../items/color_item"; import { MapChunkView } from "../map_chunk_view"; -export class DisplaySystem extends GameSystemWithFilter { +export class DisplaySystem extends GameSystem { constructor(root) { - super(root, [DisplayComponent]); + super(root); /** @type {Object} */ this.displaySprites = {}; diff --git a/src/js/game/systems/goal_acceptor.js b/src/js/game/systems/goal_acceptor.js index 60d4a984..2ffc3b52 100644 --- a/src/js/game/systems/goal_acceptor.js +++ b/src/js/game/systems/goal_acceptor.js @@ -5,10 +5,8 @@ import { Vector } from "../../core/vector"; import { GoalAcceptorComponent } from "../components/goal_acceptor"; import { GameSystemWithFilter } from "../game_system_with_filter"; import { MapChunk } from "../map_chunk"; -import { GameRoot } from "../root"; export class GoalAcceptorSystem extends GameSystemWithFilter { - /** @param {GameRoot} root */ constructor(root) { super(root, [GoalAcceptorComponent]); diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index db37455a..4eef11aa 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -4,7 +4,6 @@ import { createLogger } from "../../core/logging"; import { Rectangle } from "../../core/rectangle"; import { StaleAreaDetector } from "../../core/stale_area_detector"; import { enumDirection, enumDirectionToVector } from "../../core/vector"; -import { ACHIEVEMENTS } from "../../platform/achievement_provider"; import { BaseItem } from "../base_item"; import { BeltComponent } from "../components/belt"; import { ItemAcceptorComponent } from "../components/item_acceptor"; diff --git a/src/js/game/systems/item_producer.js b/src/js/game/systems/item_producer.js index 0a385907..8ca29ae1 100644 --- a/src/js/game/systems/item_producer.js +++ b/src/js/game/systems/item_producer.js @@ -1,12 +1,7 @@ -/* typehints:start */ -import { GameRoot } from "../root"; -/* typehints:end */ - import { ItemProducerComponent } from "../components/item_producer"; import { GameSystemWithFilter } from "../game_system_with_filter"; export class ItemProducerSystem extends GameSystemWithFilter { - /** @param {GameRoot} root */ constructor(root) { super(root, [ItemProducerComponent]); this.item = null; diff --git a/src/js/game/systems/lever.js b/src/js/game/systems/lever.js index 75b6cf28..343894ae 100644 --- a/src/js/game/systems/lever.js +++ b/src/js/game/systems/lever.js @@ -1,9 +1,8 @@ -import { GameSystemWithFilter } from "../game_system_with_filter"; -import { LeverComponent } from "../components/lever"; -import { BOOL_TRUE_SINGLETON, BOOL_FALSE_SINGLETON } from "../items/boolean_item"; -import { MapChunkView } from "../map_chunk_view"; -import { globalConfig } from "../../core/config"; import { Loader } from "../../core/loader"; +import { LeverComponent } from "../components/lever"; +import { GameSystemWithFilter } from "../game_system_with_filter"; +import { BOOL_FALSE_SINGLETON, BOOL_TRUE_SINGLETON } from "../items/boolean_item"; +import { MapChunkView } from "../map_chunk_view"; export class LeverSystem extends GameSystemWithFilter { constructor(root) { diff --git a/src/js/game/systems/storage.js b/src/js/game/systems/storage.js index 80affac9..cd204448 100644 --- a/src/js/game/systems/storage.js +++ b/src/js/game/systems/storage.js @@ -1,9 +1,9 @@ -import { GameSystemWithFilter } from "../game_system_with_filter"; -import { StorageComponent } from "../components/storage"; import { DrawParameters } from "../../core/draw_parameters"; -import { formatBigNumber, lerp } from "../../core/utils"; import { Loader } from "../../core/loader"; -import { BOOL_TRUE_SINGLETON, BOOL_FALSE_SINGLETON } from "../items/boolean_item"; +import { formatBigNumber, lerp } from "../../core/utils"; +import { StorageComponent } from "../components/storage"; +import { GameSystemWithFilter } from "../game_system_with_filter"; +import { BOOL_FALSE_SINGLETON, BOOL_TRUE_SINGLETON } from "../items/boolean_item"; import { MapChunkView } from "../map_chunk_view"; export class StorageSystem extends GameSystemWithFilter { diff --git a/src/js/game/systems/wire.js b/src/js/game/systems/wire.js index 0491def6..4a255866 100644 --- a/src/js/game/systems/wire.js +++ b/src/js/game/systems/wire.js @@ -21,6 +21,7 @@ import { enumWireType, enumWireVariant, WireComponent } from "../components/wire import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; import { WireTunnelComponent } from "../components/wire_tunnel"; import { Entity } from "../entity"; +import { GameSystem } from "../game_system"; import { GameSystemWithFilter } from "../game_system_with_filter"; import { isTruthyItem } from "../items/boolean_item"; import { MapChunkView } from "../map_chunk_view"; @@ -90,9 +91,9 @@ export class WireNetwork { } } -export class WireSystem extends GameSystemWithFilter { +export class WireSystem extends GameSystem { constructor(root) { - super(root, [WireComponent]); + super(root); /** * @type {Object>} From 7a3ab7aaed6dcac0ccfacff5e4218d3f28d72dcd Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:52:41 +0000 Subject: [PATCH 084/129] minor cleanup and fixes --- src/js/game/buildings/hub.js | 2 +- src/js/game/buildings/storage.js | 1 - src/js/game/components/item_acceptor.js | 6 ++---- src/js/game/entity.js | 26 ++++++++++++------------- src/js/game/hub_goals.js | 5 ++--- src/js/game/systems/filter.js | 1 - src/js/game/systems/item_acceptor.js | 6 ++---- src/js/game/systems/item_ejector.js | 2 -- src/js/game/systems/underground_belt.js | 1 - 9 files changed, 19 insertions(+), 31 deletions(-) diff --git a/src/js/game/buildings/hub.js b/src/js/game/buildings/hub.js index 7ea336f1..caac9733 100644 --- a/src/js/game/buildings/hub.js +++ b/src/js/game/buildings/hub.js @@ -1,6 +1,6 @@ import { enumDirection, Vector } from "../../core/vector"; import { HubComponent } from "../components/hub"; -import { enumItemAcceptorTypes, ItemAcceptorComponent } from "../components/item_acceptor"; +import { ItemAcceptorComponent } from "../components/item_acceptor"; import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor"; import { Entity } from "../entity"; import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; diff --git a/src/js/game/buildings/storage.js b/src/js/game/buildings/storage.js index df9f95f4..78f398be 100644 --- a/src/js/game/buildings/storage.js +++ b/src/js/game/buildings/storage.js @@ -81,7 +81,6 @@ export class MetaStorageBuilding extends MetaBuilding { direction: enumDirection.bottom, }, ], - lengthMultiplier: 3, // make progress 1.5 to reach the ejector }) ); diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index 5c989521..0c9189c3 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -53,9 +53,8 @@ export class ItemAcceptorComponent extends Component { * * @param {object} param0 * @param {Array} param0.slots The slots from which we accept items - * @param {number=} param0.lengthMultiplier Whether the acceptor is double the usual length */ - constructor({ slots = [], lengthMultiplier = 1 }) { + constructor({ slots = [] }) { super(); /** @type {ItemAcceptorInputs} */ @@ -63,7 +62,6 @@ export class ItemAcceptorComponent extends Component { /** @type {ItemAcceptorCompletedInputs} */ this.completedInputs = new Map(); // @SENSETODO does this need to be saved? this.setSlots(slots); - this.progressLength = 0.5 * lengthMultiplier; } /** @@ -103,7 +101,7 @@ export class ItemAcceptorComponent extends Component { this.inputs.set(slotIndex, { item, direction, - animProgress: Math.min(this.progressLength, startProgress), + animProgress: Math.min(0.5, startProgress), }); return true; } diff --git a/src/js/game/entity.js b/src/js/game/entity.js index d7dd715e..3010f067 100644 --- a/src/js/game/entity.js +++ b/src/js/game/entity.js @@ -197,20 +197,18 @@ export class Entity extends BasicSerializableObject { for (let i = 0; i < acceptorComp.slots.length; ++i) { const slot = acceptorComp.slots[i]; const slotTile = staticComp.localTileToWorld(slot.pos); - for (let k = 0; k < slot.directions.length; ++k) { - const direction = staticComp.localDirectionToWorld(slot.directions[k]); - const directionVector = enumDirectionToVector[direction]; - const angle = Math.radians(enumDirectionToAngle[direction] + 180); - context.globalAlpha = 0.4; - drawRotatedSprite({ - parameters, - sprite: acceptorSprite, - x: (slotTile.x + 0.5 + directionVector.x * 0.37) * globalConfig.tileSize, - y: (slotTile.y + 0.5 + directionVector.y * 0.37) * globalConfig.tileSize, - angle, - size: globalConfig.tileSize * 0.25, - }); - } + const direction = staticComp.localDirectionToWorld(slot.direction); + const directionVector = enumDirectionToVector[direction]; + const angle = Math.radians(enumDirectionToAngle[direction] + 180); + context.globalAlpha = 0.4; + drawRotatedSprite({ + parameters, + sprite: acceptorSprite, + x: (slotTile.x + 0.5 + directionVector.x * 0.37) * globalConfig.tileSize, + y: (slotTile.y + 0.5 + directionVector.y * 0.37) * globalConfig.tileSize, + angle, + size: globalConfig.tileSize * 0.25, + }); } } diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index 45e56a1b..1064ad55 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -532,8 +532,6 @@ export class HubGoals extends BasicSerializableObject { case enumItemProcessorTypes.painterDouble: case enumItemProcessorTypes.painterQuad: { return this.getProcessorTimeWithUpgrades(this.upgradeImprovements.painting, processorType); - // b2 + 4 = 4 - // b2 + 8 = 8 } case enumItemProcessorTypes.cutter: @@ -561,6 +559,7 @@ export class HubGoals extends BasicSerializableObject { "Processor type has no speed set in globalConfig.buildingSpeeds: " + processorType ); + // super complicated maths here, but it works const processorTime = globalConfig.buildingAmountsToBelt[processorType] / globalConfig.beltSpeedItemsPerSecond; return processorTime / upgrade; @@ -573,7 +572,7 @@ export class HubGoals extends BasicSerializableObject { getProcessingSpeed(processorType) { const time = this.getProcessingTime(processorType); if (time == 0) { - return time; + return this.getBeltBaseSpeed(); } return 1 / time; } diff --git a/src/js/game/systems/filter.js b/src/js/game/systems/filter.js index 742754c1..4e0d5dc4 100644 --- a/src/js/game/systems/filter.js +++ b/src/js/game/systems/filter.js @@ -1,4 +1,3 @@ -import { globalConfig } from "../../core/config"; import { BaseItem } from "../base_item"; import { FilterComponent } from "../components/filter"; import { Entity } from "../entity"; diff --git a/src/js/game/systems/item_acceptor.js b/src/js/game/systems/item_acceptor.js index 24b8b603..075e2040 100644 --- a/src/js/game/systems/item_acceptor.js +++ b/src/js/game/systems/item_acceptor.js @@ -1,10 +1,8 @@ import { globalConfig } from "../../core/config"; import { DrawParameters } from "../../core/draw_parameters"; import { enumDirectionToVector } from "../../core/vector"; -import { ACHIEVEMENTS } from "../../platform/achievement_provider"; -import { ItemAcceptorComponent, InputCompletedArgs } from "../components/item_acceptor"; +import { ItemAcceptorComponent } from "../components/item_acceptor"; import { GameSystemWithFilter } from "../game_system_with_filter"; -import { ShapeItem } from "../items/shape_item"; import { MapChunkView } from "../map_chunk_view"; export class ItemAcceptorSystem extends GameSystemWithFilter { @@ -23,7 +21,7 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { const entity = this.allEntities[i]; const acceptorComp = entity.components.ItemAcceptor; const inputs = acceptorComp.inputs; - const maxProgress = acceptorComp.progressLength; + const maxProgress = 0.5; inputs.forEach((values, index) => { values.animProgress += progressGrowth; diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index 5a145a9f..d599d547 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -4,8 +4,6 @@ import { createLogger } from "../../core/logging"; import { Rectangle } from "../../core/rectangle"; import { StaleAreaDetector } from "../../core/stale_area_detector"; import { enumDirection, enumDirectionToVector } from "../../core/vector"; -import { ACHIEVEMENTS } from "../../platform/achievement_provider"; -import { BaseItem } from "../base_item"; import { BeltComponent } from "../components/belt"; import { ItemAcceptorComponent } from "../components/item_acceptor"; import { ItemEjectorComponent } from "../components/item_ejector"; diff --git a/src/js/game/systems/underground_belt.js b/src/js/game/systems/underground_belt.js index d103c926..b28f4207 100644 --- a/src/js/game/systems/underground_belt.js +++ b/src/js/game/systems/underground_belt.js @@ -3,7 +3,6 @@ import { Loader } from "../../core/loader"; import { createLogger } from "../../core/logging"; import { Rectangle } from "../../core/rectangle"; import { StaleAreaDetector } from "../../core/stale_area_detector"; -import { fastArrayDelete } from "../../core/utils"; import { enumAngleToDirection, enumDirection, From 670c07cba8a0d8a9b58df22bf7fa3c1eeee289be Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 20 Jan 2022 17:07:03 +0100 Subject: [PATCH 085/129] Belt path drawing optimization --- src/js/game/belt_path.js | 162 +++++++++++++++++++++++++++++++++++++-- src/js/game/logic.js | 2 +- 2 files changed, 156 insertions(+), 8 deletions(-) diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js index 8ad4f7e3..badcf3cb 100644 --- a/src/js/game/belt_path.js +++ b/src/js/game/belt_path.js @@ -1,7 +1,9 @@ import { globalConfig } from "../core/config"; +import { smoothenDpi } from "../core/dpi_manager"; import { DrawParameters } from "../core/draw_parameters"; import { createLogger } from "../core/logging"; import { Rectangle } from "../core/rectangle"; +import { ORIGINAL_SPRITE_SCALE } from "../core/sprites"; import { clamp, epsilonCompare, round4Digits } from "../core/utils"; import { enumDirection, enumDirectionToVector, enumInvertedDirections, Vector } from "../core/vector"; import { BasicSerializableObject, types } from "../savegame/serialization"; @@ -1430,6 +1432,12 @@ export class BeltPath extends BasicSerializableObject { let trackPos = 0.0; + /** + * @type {Array<[Vector, BaseItem]>} + */ + let drawStack = []; + let drawStackProp = ""; + // Iterate whole track and check items for (let i = 0; i < this.entityPath.length; ++i) { const entity = this.entityPath[i]; @@ -1449,25 +1457,165 @@ export class BeltPath extends BasicSerializableObject { const worldPos = staticComp.localTileToWorld(localPos).toWorldSpaceCenterOfTile(); const distanceAndItem = this.items[currentItemIndex]; + const item = distanceAndItem[1 /* item */]; + const nextItemDistance = distanceAndItem[0 /* nextDistance */]; - distanceAndItem[1 /* item */].drawItemCenteredClipped( - worldPos.x, - worldPos.y, - parameters, - globalConfig.defaultItemDiameter - ); + if (drawStack.length > 1) { + // Check if we can append to the stack, since its already a stack of two same items + const referenceItem = drawStack[0]; + if (Math.abs(referenceItem[0][drawStackProp] - worldPos[drawStackProp]) < 0.001) { + // Will continue stack + } else { + // Start a new stack, since item doesn't follow in row + this.drawDrawStack(drawStack, parameters, drawStackProp); + drawStack = []; + drawStackProp = ""; + } + } else if (drawStack.length === 1) { + const firstItem = drawStack[0]; + + // Check if we can make it a stack + if (firstItem[1 /* item */].equals(item)) { + // Same item, check if it is either horizontal or vertical + const startPos = firstItem[0 /* pos */]; + + if (Math.abs(startPos.x - worldPos.x) < 0.001) { + drawStackProp = "x"; + } else if (Math.abs(startPos.y - worldPos.y) < 0.001) { + drawStackProp = "y"; + } else { + // Start a new stack + this.drawDrawStack(drawStack, parameters, drawStackProp); + drawStack = []; + drawStackProp = ""; + } + } else { + // Start a new stack, since item doesn't equal + this.drawDrawStack(drawStack, parameters, drawStackProp); + drawStack = []; + drawStackProp = ""; + } + } else { + // First item of stack, do nothing + } + + drawStack.push([worldPos, item]); // Check for the next item - currentItemPos += distanceAndItem[0 /* nextDistance */]; + currentItemPos += nextItemDistance; ++currentItemIndex; + if (nextItemDistance > globalConfig.itemSpacingOnBelts + 0.002 || drawStack.length > 20) { + // If next item is not directly following, abort drawing + this.drawDrawStack(drawStack, parameters, drawStackProp); + drawStack = []; + drawStackProp = ""; + } + if (currentItemIndex >= this.items.length) { // We rendered all items + + this.drawDrawStack(drawStack, parameters, drawStackProp); return; } } trackPos += beltLength; } + + this.drawDrawStack(drawStack, parameters, drawStackProp); + } + + /** + * + * @param {HTMLCanvasElement} canvas + * @param {CanvasRenderingContext2D} context + * @param {number} w + * @param {number} h + * @param {number} dpi + * @param {object} param0 + * @param {string} param0.direction + * @param {Array<[Vector, BaseItem]>} param0.stack + * @param {GameRoot} param0.root + * @param {number} param0.zoomLevel + */ + drawShapesInARow(canvas, context, w, h, dpi, { direction, stack, root, zoomLevel }) { + context.scale(dpi, dpi); + context.fillStyle = "rgba(0, 0, 255, 0.1)"; + context.fillRect(1, 1, w - 2, h - 2); + + const parameters = new DrawParameters({ + context, + desiredAtlasScale: ORIGINAL_SPRITE_SCALE, + root, + visibleRect: new Rectangle(-1000, -1000, 2000, 2000), + zoomLevel, + }); + + const itemSize = globalConfig.itemSpacingOnBelts * globalConfig.tileSize; + const item = stack[0]; + const pos = new Vector(itemSize / 2, itemSize / 2); + + for (let i = 0; i < stack.length; i++) { + item[1].drawItemCenteredClipped(pos.x, pos.y, parameters, globalConfig.defaultItemDiameter); + pos[direction] += globalConfig.itemSpacingOnBelts * globalConfig.tileSize; + } + } + + /** + * @param {Array<[Vector, BaseItem]>} stack + * @param {DrawParameters} parameters + */ + drawDrawStack(stack, parameters, directionProp) { + if (stack.length === 0) { + return; + } + + const firstItem = stack[0]; + const firstItemPos = firstItem[0]; + if (stack.length === 1) { + firstItem[1].drawItemCenteredClipped( + firstItemPos.x, + firstItemPos.y, + parameters, + globalConfig.defaultItemDiameter + ); + return; + } + + const itemSize = globalConfig.itemSpacingOnBelts * globalConfig.tileSize; + const inverseDirection = directionProp === "x" ? "y" : "x"; + + const dimensions = new Vector(itemSize, itemSize); + dimensions[inverseDirection] *= stack.length; + + const directionVector = firstItemPos.copy().sub(stack[1][0]); + + const dpi = smoothenDpi(globalConfig.shapesSharpness * parameters.zoomLevel); + + const sprite = this.root.buffers.getForKey({ + key: "beltpaths", + subKey: "stack-" + directionProp + "-" + dpi + "-" + stack.length + firstItem[1].serialize(), + dpi, + w: dimensions.x, + h: dimensions.y, + redrawMethod: this.drawShapesInARow.bind(this), + additionalParams: { + direction: inverseDirection, + stack, + root: this.root, + zoomLevel: parameters.zoomLevel, + }, + }); + + const anchor = directionVector[inverseDirection] < 0 ? firstItem : stack[stack.length - 1]; + + parameters.context.drawImage( + sprite, + anchor[0].x - itemSize / 2, + anchor[0].y - itemSize / 2, + dimensions.x, + dimensions.y + ); } } diff --git a/src/js/game/logic.js b/src/js/game/logic.js index 49bfb416..c7306dfc 100644 --- a/src/js/game/logic.js +++ b/src/js/game/logic.js @@ -58,7 +58,7 @@ export class GameLogic { * @param {Vector=} param0.offset Optional, move the entity by the given offset first * @returns {boolean} true if the entity could be placed there */ - checkCanPlaceEntity(entity, { allowReplaceBuildings = false, offset = null }) { + checkCanPlaceEntity(entity, { allowReplaceBuildings = true, offset = null }) { // Compute area of the building const rect = entity.components.StaticMapEntity.getTileSpaceBounds(); if (offset) { From 8c21d0e8e4cb9b6625592676ae1088317d39ab26 Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 20 Jan 2022 17:21:35 +0100 Subject: [PATCH 086/129] Fix belt path optimization --- src/js/game/belt_path.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js index badcf3cb..95124cd7 100644 --- a/src/js/game/belt_path.js +++ b/src/js/game/belt_path.js @@ -1505,7 +1505,7 @@ export class BeltPath extends BasicSerializableObject { currentItemPos += nextItemDistance; ++currentItemIndex; - if (nextItemDistance > globalConfig.itemSpacingOnBelts + 0.002 || drawStack.length > 20) { + if (nextItemDistance > globalConfig.itemSpacingOnBelts + 0.001 || drawStack.length > 20) { // If next item is not directly following, abort drawing this.drawDrawStack(drawStack, parameters, drawStackProp); drawStack = []; @@ -1541,8 +1541,8 @@ export class BeltPath extends BasicSerializableObject { */ drawShapesInARow(canvas, context, w, h, dpi, { direction, stack, root, zoomLevel }) { context.scale(dpi, dpi); - context.fillStyle = "rgba(0, 0, 255, 0.1)"; - context.fillRect(1, 1, w - 2, h - 2); + context.fillStyle = "rgba(0, 0, 255, 0.5)"; + context.fillRect(0, 0, w, h); const parameters = new DrawParameters({ context, @@ -1554,6 +1554,7 @@ export class BeltPath extends BasicSerializableObject { const itemSize = globalConfig.itemSpacingOnBelts * globalConfig.tileSize; const item = stack[0]; + console.log(w, h, dpi, direction, item[1].serialize()); const pos = new Vector(itemSize / 2, itemSize / 2); for (let i = 0; i < stack.length; i++) { From d6bb79c470dd7e3f969ebc315b14472226691383 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Thu, 20 Jan 2022 16:35:53 +0000 Subject: [PATCH 087/129] fixed items being too close between buildings --- src/js/game/systems/item_ejector.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index d599d547..1e544814 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -163,6 +163,18 @@ export class ItemEjectorSystem extends GameSystemWithFilter { // Advance items on the slot slot.progress += progressGrowth; + // limit the progress to stop items being too close + if (slot.cachedTargetEntity && slot.cachedDestSlot) { + const acceptorComp = slot.cachedTargetEntity.components.ItemAcceptor; + const acceptorInput = acceptorComp.inputs.get(slot.cachedDestSlot.index); + + if (acceptorInput) { + const maxProgress = + 0.5 + acceptorInput.animProgress - globalConfig.itemSpacingOnBelts; + slot.progress = Math.min(maxProgress, slot.progress); + } + } + if (G_IS_DEV && globalConfig.debug.disableEjectorProcessing) { slot.progress = maxProgress; } From 177450230451422be76129a79105afd711b41755 Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 20 Jan 2022 17:37:23 +0100 Subject: [PATCH 088/129] Belt drawing improvements, again --- src/js/core/config.js | 6 +- src/js/core/config.local.template.js | 3 + src/js/game/belt_path.js | 91 +++++++++++++++++----------- 3 files changed, 62 insertions(+), 38 deletions(-) diff --git a/src/js/core/config.js b/src/js/core/config.js index bc2e2460..d64791c8 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -42,7 +42,7 @@ export const globalConfig = { // Which dpi the assets have assetsDpi: 192 / 32, assetsSharpness: 1.5, - shapesSharpness: 1.4, + shapesSharpness: 1.3, // Achievements achievementSliceDuration: 10, // Seconds @@ -58,9 +58,11 @@ export const globalConfig = { // Map mapChunkSize: 16, chunkAggregateSize: 4, - mapChunkOverviewMinZoom: 0.9, + mapChunkOverviewMinZoom: 0, mapChunkWorldSize: null, // COMPUTED + maxBeltShapeBundleSize: 20, + // Belt speeds // NOTICE: Update webpack.production.config too! beltSpeedItemsPerSecond: 2, diff --git a/src/js/core/config.local.template.js b/src/js/core/config.local.template.js index c2fe786c..9a432b56 100644 --- a/src/js/core/config.local.template.js +++ b/src/js/core/config.local.template.js @@ -119,5 +119,8 @@ export default { // Allows to load a mod from an external source for developing it // externalModUrl: "http://localhost:3005/combined.js", // ----------------------------------------------------------------------------------- + // Visualizes the shape grouping on belts + // showShapeGrouping: true + // ----------------------------------------------------------------------------------- /* dev:end */ }; diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js index 95124cd7..7e2bfaf4 100644 --- a/src/js/game/belt_path.js +++ b/src/js/game/belt_path.js @@ -1460,52 +1460,69 @@ export class BeltPath extends BasicSerializableObject { const item = distanceAndItem[1 /* item */]; const nextItemDistance = distanceAndItem[0 /* nextDistance */]; - if (drawStack.length > 1) { - // Check if we can append to the stack, since its already a stack of two same items - const referenceItem = drawStack[0]; - if (Math.abs(referenceItem[0][drawStackProp] - worldPos[drawStackProp]) < 0.001) { - // Will continue stack - } else { - // Start a new stack, since item doesn't follow in row - this.drawDrawStack(drawStack, parameters, drawStackProp); - drawStack = []; - drawStackProp = ""; - } - } else if (drawStack.length === 1) { - const firstItem = drawStack[0]; - - // Check if we can make it a stack - if (firstItem[1 /* item */].equals(item)) { - // Same item, check if it is either horizontal or vertical - const startPos = firstItem[0 /* pos */]; - - if (Math.abs(startPos.x - worldPos.x) < 0.001) { - drawStackProp = "x"; - } else if (Math.abs(startPos.y - worldPos.y) < 0.001) { - drawStackProp = "y"; + if ( + !parameters.visibleRect.containsCircle( + worldPos.x, + worldPos.y, + globalConfig.defaultItemDiameter + ) + ) { + // this one isn't visible, do not append it + // Start a new stack + this.drawDrawStack(drawStack, parameters, drawStackProp); + drawStack = []; + drawStackProp = ""; + } else { + if (drawStack.length > 1) { + // Check if we can append to the stack, since its already a stack of two same items + const referenceItem = drawStack[0]; + if (Math.abs(referenceItem[0][drawStackProp] - worldPos[drawStackProp]) < 0.001) { + // Will continue stack } else { - // Start a new stack + // Start a new stack, since item doesn't follow in row + this.drawDrawStack(drawStack, parameters, drawStackProp); + drawStack = []; + drawStackProp = ""; + } + } else if (drawStack.length === 1) { + const firstItem = drawStack[0]; + + // Check if we can make it a stack + if (firstItem[1 /* item */].equals(item)) { + // Same item, check if it is either horizontal or vertical + const startPos = firstItem[0 /* pos */]; + + if (Math.abs(startPos.x - worldPos.x) < 0.001) { + drawStackProp = "x"; + } else if (Math.abs(startPos.y - worldPos.y) < 0.001) { + drawStackProp = "y"; + } else { + // Start a new stack + this.drawDrawStack(drawStack, parameters, drawStackProp); + drawStack = []; + drawStackProp = ""; + } + } else { + // Start a new stack, since item doesn't equal this.drawDrawStack(drawStack, parameters, drawStackProp); drawStack = []; drawStackProp = ""; } } else { - // Start a new stack, since item doesn't equal - this.drawDrawStack(drawStack, parameters, drawStackProp); - drawStack = []; - drawStackProp = ""; + // First item of stack, do nothing } - } else { - // First item of stack, do nothing - } - drawStack.push([worldPos, item]); + drawStack.push([worldPos, item]); + } // Check for the next item currentItemPos += nextItemDistance; ++currentItemIndex; - if (nextItemDistance > globalConfig.itemSpacingOnBelts + 0.001 || drawStack.length > 20) { + if ( + nextItemDistance > globalConfig.itemSpacingOnBelts + 0.001 || + drawStack.length > globalConfig.maxBeltShapeBundleSize + ) { // If next item is not directly following, abort drawing this.drawDrawStack(drawStack, parameters, drawStackProp); drawStack = []; @@ -1541,8 +1558,11 @@ export class BeltPath extends BasicSerializableObject { */ drawShapesInARow(canvas, context, w, h, dpi, { direction, stack, root, zoomLevel }) { context.scale(dpi, dpi); - context.fillStyle = "rgba(0, 0, 255, 0.5)"; - context.fillRect(0, 0, w, h); + + if (G_IS_DEV && globalConfig.debug.showShapeGrouping) { + context.fillStyle = "rgba(0, 0, 255, 0.5)"; + context.fillRect(0, 0, w, h); + } const parameters = new DrawParameters({ context, @@ -1554,7 +1574,6 @@ export class BeltPath extends BasicSerializableObject { const itemSize = globalConfig.itemSpacingOnBelts * globalConfig.tileSize; const item = stack[0]; - console.log(w, h, dpi, direction, item[1].serialize()); const pos = new Vector(itemSize / 2, itemSize / 2); for (let i = 0; i < stack.length; i++) { From 6a57448fab7ee6d0058e48a896e043ebe8d51bcb Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 20 Jan 2022 17:52:49 +0100 Subject: [PATCH 089/129] =?UTF-8?q?Do=20not=20render=20belts=20in=20static?= =?UTF-8?q?s=20disabled=C2=A0view?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/game/systems/belt.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/js/game/systems/belt.js b/src/js/game/systems/belt.js index c19715a4..38ac9b0b 100644 --- a/src/js/game/systems/belt.js +++ b/src/js/game/systems/belt.js @@ -497,6 +497,10 @@ export class BeltSystem extends GameSystem { * @param {MapChunkView} chunk */ drawChunk(parameters, chunk) { + if (G_IS_DEV && globalConfig.debug.doNotRenderStatics) { + return; + } + // Limit speed to avoid belts going backwards const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10); From 30beb7df5fb43ea090e19d03d2ab0930093234f5 Mon Sep 17 00:00:00 2001 From: Bagel03 <70449196+Bagel03@users.noreply.github.com> Date: Thu, 20 Jan 2022 11:54:42 -0500 Subject: [PATCH 090/129] Allow external URL to load more than one mod (#1337) * Allow external URL to load more than one mod Instead of loading the text returned from the remote server, load a JSON object with a `mods` field, containing strings of all the mods. This lets us work on more than one mod at a time or without separate repos. This will break tooling such as `create-shapezio-mod` though. * Update modloader.js --- src/js/mods/modloader.js | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index fa90b8a6..dc64eb6c 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -103,21 +103,25 @@ export class ModLoader { mods = await ipcRenderer.invoke("get-mods"); } if (G_IS_DEV && globalConfig.debug.externalModUrl) { - const response = await fetch(globalConfig.debug.externalModUrl, { - method: "GET", - }); - if (response.status !== 200) { - throw new Error( - "Failed to load " + - globalConfig.debug.externalModUrl + - ": " + - response.status + - " " + - response.statusText - ); + let modURLs = Array.isArray(globalConfig.debug.externalModUrl) ? + globalConfig.debug.externalModUrl : [globalConfig.debug.externalModUrl]; + + for(let i = 0; i < modURLs.length; i++) { + const response = await fetch(modURLs[i], { + method: "GET", + }); + if (response.status !== 200) { + throw new Error( + "Failed to load " + + modURLs[i] + + ": " + + response.status + + " " + + response.statusText + ); + } + mods.push(await response.text()); } - - mods.push(await response.text()); } window.$shapez_registerMod = (modClass, meta) => { From 388f7888ee9a97659fea0ff59ff8de330cc911e1 Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 20 Jan 2022 17:55:53 +0100 Subject: [PATCH 091/129] Prettier fixes --- src/js/mods/modloader.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index dc64eb6c..96743038 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -103,21 +103,17 @@ export class ModLoader { mods = await ipcRenderer.invoke("get-mods"); } if (G_IS_DEV && globalConfig.debug.externalModUrl) { - let modURLs = Array.isArray(globalConfig.debug.externalModUrl) ? - globalConfig.debug.externalModUrl : [globalConfig.debug.externalModUrl]; - - for(let i = 0; i < modURLs.length; i++) { + const modURLs = Array.isArray(globalConfig.debug.externalModUrl) + ? globalConfig.debug.externalModUrl + : [globalConfig.debug.externalModUrl]; + + for (let i = 0; i < modURLs.length; i++) { const response = await fetch(modURLs[i], { method: "GET", }); if (response.status !== 200) { throw new Error( - "Failed to load " + - modURLs[i] + - ": " + - response.status + - " " + - response.statusText + "Failed to load " + modURLs[i] + ": " + response.status + " " + response.statusText ); } mods.push(await response.text()); From 7a1dedd2c8474d137baab070d7b42774ca7ed2bd Mon Sep 17 00:00:00 2001 From: "Thomas (DJ1TJOO)" <44841260+DJ1TJOO@users.noreply.github.com> Date: Thu, 20 Jan 2022 17:56:09 +0100 Subject: [PATCH 092/129] Added link to create-shapezio-mod npm page (#1339) Added link to create-shapezio-mod npm page: https://www.npmjs.com/package/create-shapezio-mod --- mod_examples/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod_examples/README.md b/mod_examples/README.md index 1545a46b..c918a9ed 100644 --- a/mod_examples/README.md +++ b/mod_examples/README.md @@ -5,7 +5,7 @@ Currently there are two options to develop mods for shapez.io: 1. Writing single file mods, which doesn't require any additional tools and can be loaded directly in the game -2. Using the `create-shapezio-mod` package. This package is still in development but allows you to pack multiple files and images into a single mod file, so you don't have to base64 encode your images etc. +2. Using the [create-shapezio-mod](https://www.npmjs.com/package/create-shapezio-mod) package. This package is still in development but allows you to pack multiple files and images into a single mod file, so you don't have to base64 encode your images etc. Since the `create-shapezio-mod` package is still in development, the current recommended way is to write single file mods, which I'll explain now. From 839d2037371c0a9927f612d0f42cacc97c53e68d Mon Sep 17 00:00:00 2001 From: Emerald Block <69981203+EmeraldBlock@users.noreply.github.com> Date: Thu, 20 Jan 2022 10:56:26 -0600 Subject: [PATCH 093/129] allow command line switch to load more than one mod (#1342) --- electron/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/electron/index.js b/electron/index.js index 18943589..f1de906f 100644 --- a/electron/index.js +++ b/electron/index.js @@ -361,7 +361,8 @@ ipcMain.handle("get-mods", async () => { if (externalMod) { console.log("Adding external mod source:", externalMod); - modFiles.push(externalMod); + const externalModPaths = externalMod.split(","); + modFiles = modFiles.concat(externalModPaths); } if (modFiles.length > 0 && !isDev) { From 0718f6cf802bb5397bc7c43606740ef2558c8f69 Mon Sep 17 00:00:00 2001 From: "Thomas (DJ1TJOO)" <44841260+DJ1TJOO@users.noreply.github.com> Date: Thu, 20 Jan 2022 17:57:04 +0100 Subject: [PATCH 094/129] Fixed class handle type (#1345) * Fixed class handle type * Fixed import game state --- src/js/mods/mod_interface.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index 949e4301..e3b9e59b 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -369,7 +369,7 @@ export class ModInterface { /** * Registers a new state class, should be a GameState derived class - * @param {typeof GameState} stateClass + * @param {typeof import("../core/game_state").GameState} stateClass */ registerGameState(stateClass) { this.modLoader.app.stateMgr.register(stateClass); @@ -470,7 +470,7 @@ export class ModInterface { /** * - * @param {typeof Object} classHandle + * @param {Class} classHandle * @param {({ $super, $old }) => any} extender */ extendClass(classHandle, extender) { From c86416cf79b2b817dbce185e8226dcb92d862fce Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Thu, 20 Jan 2022 19:48:03 +0000 Subject: [PATCH 095/129] fix minor issues --- src/js/game/game_system_manager.js | 2 +- src/js/game/hub_goals.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/game/game_system_manager.js b/src/js/game/game_system_manager.js index f39089a6..0239abf7 100644 --- a/src/js/game/game_system_manager.js +++ b/src/js/game/game_system_manager.js @@ -145,7 +145,7 @@ export class GameSystemManager { // Order is important! // IMPORTANT: Item acceptor must be before the belt, because it may not tick after the belt - // has put in the item into the acceptor animqation, otherwise its off + // has put in the item into the acceptor animation, otherwise its off add("itemAcceptor", ItemAcceptorSystem); add("belt", BeltSystem); diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index 1064ad55..c1b2a4e4 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -571,7 +571,7 @@ export class HubGoals extends BasicSerializableObject { */ getProcessingSpeed(processorType) { const time = this.getProcessingTime(processorType); - if (time == 0) { + if (!time) { return this.getBeltBaseSpeed(); } return 1 / time; From 2ab4f3ba9adf965e14c502efc99c5aca366af8d3 Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 20 Jan 2022 22:18:25 +0100 Subject: [PATCH 096/129] Minor adjustments --- mod_examples/README.md | 4 ++++ src/js/core/config.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mod_examples/README.md b/mod_examples/README.md index 1545a46b..579eb34d 100644 --- a/mod_examples/README.md +++ b/mod_examples/README.md @@ -50,3 +50,7 @@ To get into shapez.io modding, I highly recommend checking out all of the exampl | [usage_statistics.js](usage_statistics.js) | Displays a percentage on every building showing its utilization | Adding a new component, Adding a new GameSystem, Drawing within a GameSystem, Modifying builtin buildings, Adding custom game logic | | [new_item_type.js](new_item_type.js) | Adds a new type of items to the map (fluids) | Adding a new item type, modifying map generation | | [buildings_have_cost.js](buildings_have_cost.js) | Adds a new currency, and belts cost 1 of that currency | Extending and replacing builtin methods, Adding CSS and custom sprites | + +### Creating new sprites + +If you want to add new buildings and create sprites for them, you can download the original Photoshop PSD files here: https://static.shapez.io/building-psds.zip diff --git a/src/js/core/config.js b/src/js/core/config.js index d64791c8..773295ed 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -58,7 +58,7 @@ export const globalConfig = { // Map mapChunkSize: 16, chunkAggregateSize: 4, - mapChunkOverviewMinZoom: 0, + mapChunkOverviewMinZoom: 0.9, mapChunkWorldSize: null, // COMPUTED maxBeltShapeBundleSize: 20, From 36f125e6d75e56258c7e86b0f35183931ee97af0 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Thu, 20 Jan 2022 21:50:11 +0000 Subject: [PATCH 097/129] most of the requested changes --- src/js/game/components/item_processor.js | 4 ++-- src/js/game/systems/filter.js | 9 ++++----- src/js/game/systems/item_acceptor.js | 4 +++- src/js/game/systems/item_ejector.js | 9 --------- src/js/game/systems/item_processor.js | 16 +++++----------- 5 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index 830e2382..59a9f6d6 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -99,9 +99,9 @@ export class ItemProcessorComponent extends Component { * What we are currently processing, empty if we don't produce anything rn * requiredSlot: Item *must* be ejected on this slot * preferredSlot: Item *can* be ejected on this slot, but others are fine too if the one is not usable - * @type {Array} + * @type {EjectorCharge|null} */ - this.ongoingCharges = []; + this.currentCharge = null; /** * How much processing time we have left from the last tick diff --git a/src/js/game/systems/filter.js b/src/js/game/systems/filter.js index 4e0d5dc4..507bf2f8 100644 --- a/src/js/game/systems/filter.js +++ b/src/js/game/systems/filter.js @@ -20,7 +20,7 @@ export class FilterSystem extends GameSystemWithFilter { // Take items from acceptor const input = acceptorComp.completedInputs.get(0); - if (input && this.tryAcceptItem(entity, input)) { + if (input && this.tryAcceptItem(entity, input.item, input.extraProgress)) { acceptorComp.completedInputs.delete(0); } @@ -42,11 +42,10 @@ export class FilterSystem extends GameSystemWithFilter { /** * * @param {Entity} entity - * @param {Object} param0 - * @param {BaseItem} param0.item - * @param {number} param0.extraProgress + * @param {BaseItem} item + * @param {number} extraProgress */ - tryAcceptItem(entity, { item, extraProgress }) { + tryAcceptItem(entity, item, extraProgress) { const network = entity.components.WiredPins.slots[0].linkedNetwork; if (!network || !network.hasValue()) { // Filter is not connected diff --git a/src/js/game/systems/item_acceptor.js b/src/js/game/systems/item_acceptor.js index 075e2040..23d4605d 100644 --- a/src/js/game/systems/item_acceptor.js +++ b/src/js/game/systems/item_acceptor.js @@ -26,7 +26,9 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { inputs.forEach((values, index) => { values.animProgress += progressGrowth; - if (values.animProgress < maxProgress) return; + if (values.animProgress < maxProgress) { + return; + } inputs.delete(index); acceptorComp.completedInputs.set(index, { diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index 1e544814..858a1fba 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -300,15 +300,6 @@ export class ItemEjectorSystem extends GameSystemWithFilter { ^ ^ item @ 0.9 ^ max progress = 0.3 - Because now our range actually only goes to the end of the building, and not towards the center of the building, we need to multiply - all values by 2: <--------- except max progress is now 0.5 rather than 1, so this isn't needed anymore - - Building Belt - | X | X | - | 0.........1.........2 | - ^ ^ item @ 1.8 - ^ max progress = 0.6 - And that's it! If you summarize the calculations from above into a formula, you get the one below. */ diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 1b18c01d..bde78572 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -13,12 +13,6 @@ import { isTruthyItem } from "../items/boolean_item"; import { ColorItem, COLOR_ITEM_SINGLETONS } from "../items/color_item"; import { ShapeItem } from "../items/shape_item"; -/** - * We need to allow queuing charges, otherwise the throughput will stalls - */ -//@SENSETODO not sure if this needs to be two anymore -const MAX_QUEUED_CHARGES = 1; - /** * Whole data for a produced item * @@ -85,13 +79,13 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const ejectorComp = entity.components.ItemEjector; // Check if we have an empty queue and can start a new charge - do this first so we don't waste a tick - if (processorComp.ongoingCharges.length < MAX_QUEUED_CHARGES) { + if (!processorComp.currentCharge) { if (this.canProcess(entity)) { this.startNewCharge(entity); } } - const currentCharge = processorComp.ongoingCharges[0]; + const currentCharge = processorComp.currentCharge; if (currentCharge) { // Process next charge if (currentCharge.remainingTime > 0.0) { @@ -111,7 +105,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { processorComp.queuedEjects.push(itemsToEject[j]); } - processorComp.ongoingCharges.shift(); + processorComp.currentCharge = null; } } @@ -267,10 +261,10 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const timeToProcess = originalTime - bonusTimeToApply; processorComp.bonusTime -= bonusTimeToApply; - processorComp.ongoingCharges.push({ + processorComp.currentCharge = { items: outItems, remainingTime: timeToProcess, - }); + }; acceptorComp.completedInputs.clear(); } From 10e9d2cf8b37670081248baf22b201f60277684a Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Thu, 20 Jan 2022 21:57:20 +0000 Subject: [PATCH 098/129] add braces --- src/js/game/systems/item_ejector.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index 858a1fba..bfcf2146 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -181,7 +181,9 @@ export class ItemEjectorSystem extends GameSystemWithFilter { } // Check if we are still in the process of ejecting, can't proceed then - if (slot.progress < maxProgress) continue; + if (slot.progress < maxProgress) { + continue; + } const extraProgress = slot.progress - maxProgress; From e3dc236286eaab758ffba5a30cb4e2664ca543f8 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Thu, 20 Jan 2022 22:47:11 +0000 Subject: [PATCH 099/129] remove cap on startProgress to help fix high speeds - item ejector is still limited to 1 item/tick though --- src/js/game/belt_path.js | 11 +++++++---- src/js/game/components/item_acceptor.js | 3 ++- src/js/game/systems/filter.js | 6 +++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js index 23948b9b..4b274092 100644 --- a/src/js/game/belt_path.js +++ b/src/js/game/belt_path.js @@ -134,12 +134,15 @@ export class BeltPath extends BasicSerializableObject { */ tryAcceptItem(item, startProgress = 0) { if (this.spacingToFirstItem >= globalConfig.itemSpacingOnBelts) { - // First, compute how much progress we can make *at max* + // *Never* cap start progress, or if an item moves more than a belt in a tick, it breaks + // instead return false if the start progress is too much const maxProgress = Math.max(0, this.spacingToFirstItem - globalConfig.itemSpacingOnBelts); - const initialProgress = Math.min(maxProgress, startProgress); + if (startProgress > maxProgress) { + return false; + } - this.items.unshift([this.spacingToFirstItem - initialProgress, item]); - this.spacingToFirstItem = initialProgress; + this.items.unshift([this.spacingToFirstItem - startProgress, item]); + this.spacingToFirstItem = startProgress; if (G_IS_DEV && globalConfig.debug.checkBeltPaths) { this.debug_checkIntegrity("accept-item"); diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index 0c9189c3..de0e77c3 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -98,10 +98,11 @@ export class ItemAcceptorComponent extends Component { return false; } + // if the start progress is bigger than 0.5, the remainder should get passed on to the ejector this.inputs.set(slotIndex, { item, direction, - animProgress: Math.min(0.5, startProgress), + animProgress: startProgress, }); return true; } diff --git a/src/js/game/systems/filter.js b/src/js/game/systems/filter.js index 507bf2f8..fcdd8d25 100644 --- a/src/js/game/systems/filter.js +++ b/src/js/game/systems/filter.js @@ -43,9 +43,9 @@ export class FilterSystem extends GameSystemWithFilter { * * @param {Entity} entity * @param {BaseItem} item - * @param {number} extraProgress + * @param {number} startProgress */ - tryAcceptItem(entity, item, extraProgress) { + tryAcceptItem(entity, item, startProgress) { const network = entity.components.WiredPins.slots[0].linkedNetwork; if (!network || !network.hasValue()) { // Filter is not connected @@ -72,7 +72,7 @@ export class FilterSystem extends GameSystemWithFilter { // Actually accept item listToCheck.push({ item, - extraProgress, + extraProgress: startProgress, }); return true; } From 7741d1590ef532460566d80ef390bb8a57d972a2 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 21 Jan 2022 09:43:21 +0100 Subject: [PATCH 100/129] Refactor item acceptor to allow only single direction slots --- mod_examples/add_building_flipper.js | 2 +- src/js/game/buildings/balancer.js | 11 +-- src/js/game/buildings/cutter.js | 2 +- src/js/game/buildings/filter.js | 2 +- src/js/game/buildings/goal_acceptor.js | 2 +- src/js/game/buildings/hub.js | 86 +++-------------- src/js/game/buildings/mixer.js | 4 +- src/js/game/buildings/painter.js | 25 +++-- src/js/game/buildings/reader.js | 2 +- src/js/game/buildings/rotater.js | 2 +- src/js/game/buildings/stacker.js | 4 +- src/js/game/buildings/storage.js | 4 +- src/js/game/buildings/trash.js | 19 ++-- src/js/game/buildings/underground_belt.js | 2 +- src/js/game/components/belt.js | 2 +- src/js/game/components/item_acceptor.js | 27 +++--- src/js/game/entity.js | 26 +++--- src/js/game/hub_goals.js | 2 +- src/js/game/hud/parts/building_placer.js | 108 +++++++++++----------- src/js/game/logic.js | 30 +++--- src/js/game/systems/belt_underlays.js | 10 +- src/js/game/systems/item_ejector.js | 6 +- 22 files changed, 159 insertions(+), 219 deletions(-) diff --git a/mod_examples/add_building_flipper.js b/mod_examples/add_building_flipper.js index b3b746f3..c04354bf 100644 --- a/mod_examples/add_building_flipper.js +++ b/mod_examples/add_building_flipper.js @@ -80,7 +80,7 @@ class MetaModFlipperBuilding extends shapez.ModMetaBuilding { slots: [ { pos: new shapez.Vector(0, 0), - directions: [shapez.enumDirection.bottom], + direction: shapez.enumDirection.bottom, filter: "shape", }, ], diff --git a/src/js/game/buildings/balancer.js b/src/js/game/buildings/balancer.js index 0948338c..ce685a9a 100644 --- a/src/js/game/buildings/balancer.js +++ b/src/js/game/buildings/balancer.js @@ -179,11 +179,11 @@ export class MetaBalancerBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, { pos: new Vector(1, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, ]); @@ -204,15 +204,14 @@ export class MetaBalancerBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, { pos: new Vector(0, 0), - directions: [ + direction: variant === enumBalancerVariants.mergerInverse ? enumDirection.left : enumDirection.right, - ], }, ]); @@ -231,7 +230,7 @@ export class MetaBalancerBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, ]); diff --git a/src/js/game/buildings/cutter.js b/src/js/game/buildings/cutter.js index 4950f786..21acdaa0 100644 --- a/src/js/game/buildings/cutter.js +++ b/src/js/game/buildings/cutter.js @@ -96,7 +96,7 @@ export class MetaCutterBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "shape", }, ], diff --git a/src/js/game/buildings/filter.js b/src/js/game/buildings/filter.js index bf4c5f19..f8c29b1f 100644 --- a/src/js/game/buildings/filter.js +++ b/src/js/game/buildings/filter.js @@ -78,7 +78,7 @@ export class MetaFilterBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, ], }) diff --git a/src/js/game/buildings/goal_acceptor.js b/src/js/game/buildings/goal_acceptor.js index cb51a6d2..463798ad 100644 --- a/src/js/game/buildings/goal_acceptor.js +++ b/src/js/game/buildings/goal_acceptor.js @@ -45,7 +45,7 @@ export class MetaGoalAcceptorBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "shape", }, ], diff --git a/src/js/game/buildings/hub.js b/src/js/game/buildings/hub.js index 3a543cf0..a0a9227e 100644 --- a/src/js/game/buildings/hub.js +++ b/src/js/game/buildings/hub.js @@ -70,80 +70,22 @@ export class MetaHubBuilding extends MetaBuilding { }) ); + /** + * @type {Array} + */ + const slots = []; + for (let i = 0; i < 4; ++i) { + slots.push( + { pos: new Vector(i, 0), direction: enumDirection.top, filter: "shape" }, + { pos: new Vector(i, 3), direction: enumDirection.bottom, filter: "shape" }, + { pos: new Vector(0, i), direction: enumDirection.left, filter: "shape" }, + { pos: new Vector(3, i), direction: enumDirection.right, filter: "shape" } + ); + } + entity.addComponent( new ItemAcceptorComponent({ - slots: [ - { - pos: new Vector(0, 0), - directions: [enumDirection.top, enumDirection.left], - filter: "shape", - }, - { - pos: new Vector(1, 0), - directions: [enumDirection.top], - filter: "shape", - }, - { - pos: new Vector(2, 0), - directions: [enumDirection.top], - filter: "shape", - }, - { - pos: new Vector(3, 0), - directions: [enumDirection.top, enumDirection.right], - filter: "shape", - }, - { - pos: new Vector(0, 3), - directions: [enumDirection.bottom, enumDirection.left], - filter: "shape", - }, - { - pos: new Vector(1, 3), - directions: [enumDirection.bottom], - filter: "shape", - }, - { - pos: new Vector(2, 3), - directions: [enumDirection.bottom], - filter: "shape", - }, - { - pos: new Vector(3, 3), - directions: [enumDirection.bottom, enumDirection.right], - filter: "shape", - }, - { - pos: new Vector(0, 1), - directions: [enumDirection.left], - filter: "shape", - }, - { - pos: new Vector(0, 2), - directions: [enumDirection.left], - filter: "shape", - }, - { - pos: new Vector(0, 3), - directions: [enumDirection.left], - filter: "shape", - }, - { - pos: new Vector(3, 1), - directions: [enumDirection.right], - filter: "shape", - }, - { - pos: new Vector(3, 2), - directions: [enumDirection.right], - filter: "shape", - }, - { - pos: new Vector(3, 3), - directions: [enumDirection.right], - filter: "shape", - }, - ], + slots, }) ); } diff --git a/src/js/game/buildings/mixer.js b/src/js/game/buildings/mixer.js index db8d867a..de1665c4 100644 --- a/src/js/game/buildings/mixer.js +++ b/src/js/game/buildings/mixer.js @@ -73,12 +73,12 @@ export class MetaMixerBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "color", }, { pos: new Vector(1, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "color", }, ], diff --git a/src/js/game/buildings/painter.js b/src/js/game/buildings/painter.js index 79ae86ac..432973d0 100644 --- a/src/js/game/buildings/painter.js +++ b/src/js/game/buildings/painter.js @@ -128,12 +128,12 @@ export class MetaPainterBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.left], + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(1, 0), - directions: [enumDirection.top], + direction: enumDirection.top, filter: "color", }, ], @@ -160,14 +160,13 @@ export class MetaPainterBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.left], + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(1, 0), - directions: [ + direction: variant === defaultBuildingVariant ? enumDirection.top : enumDirection.bottom, - ], filter: "color", }, ]); @@ -193,17 +192,17 @@ export class MetaPainterBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.left], + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(0, 1), - directions: [enumDirection.left], + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(1, 0), - directions: [enumDirection.top], + direction: enumDirection.top, filter: "color", }, ]); @@ -251,27 +250,27 @@ export class MetaPainterBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.left], + direction: enumDirection.left, filter: "shape", }, { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "color", }, { pos: new Vector(1, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "color", }, { pos: new Vector(2, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "color", }, { pos: new Vector(3, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "color", }, ]); diff --git a/src/js/game/buildings/reader.js b/src/js/game/buildings/reader.js index 951c7e8a..5c9307c3 100644 --- a/src/js/game/buildings/reader.js +++ b/src/js/game/buildings/reader.js @@ -84,7 +84,7 @@ export class MetaReaderBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, ], }) diff --git a/src/js/game/buildings/rotater.js b/src/js/game/buildings/rotater.js index 428ab08a..e1080767 100644 --- a/src/js/game/buildings/rotater.js +++ b/src/js/game/buildings/rotater.js @@ -128,7 +128,7 @@ export class MetaRotaterBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "shape", }, ], diff --git a/src/js/game/buildings/stacker.js b/src/js/game/buildings/stacker.js index ad1a7bc7..f36ef248 100644 --- a/src/js/game/buildings/stacker.js +++ b/src/js/game/buildings/stacker.js @@ -73,12 +73,12 @@ export class MetaStackerBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "shape", }, { pos: new Vector(1, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, filter: "shape", }, ], diff --git a/src/js/game/buildings/storage.js b/src/js/game/buildings/storage.js index b63adc01..78f398be 100644 --- a/src/js/game/buildings/storage.js +++ b/src/js/game/buildings/storage.js @@ -74,11 +74,11 @@ export class MetaStorageBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 1), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, { pos: new Vector(1, 1), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, ], }) diff --git a/src/js/game/buildings/trash.js b/src/js/game/buildings/trash.js index 3085bc55..fcf7f11f 100644 --- a/src/js/game/buildings/trash.js +++ b/src/js/game/buildings/trash.js @@ -76,12 +76,19 @@ export class MetaTrashBuilding extends MetaBuilding { slots: [ { pos: new Vector(0, 0), - directions: [ - enumDirection.top, - enumDirection.right, - enumDirection.bottom, - enumDirection.left, - ], + direction: enumDirection.top, + }, + { + pos: new Vector(0, 0), + direction: enumDirection.right, + }, + { + pos: new Vector(0, 0), + direction: enumDirection.bottom, + }, + { + pos: new Vector(0, 0), + direction: enumDirection.left, }, ], }) diff --git a/src/js/game/buildings/underground_belt.js b/src/js/game/buildings/underground_belt.js index 0f02863f..7009ebd7 100644 --- a/src/js/game/buildings/underground_belt.js +++ b/src/js/game/buildings/underground_belt.js @@ -277,7 +277,7 @@ export class MetaUndergroundBeltBuilding extends MetaBuilding { entity.components.ItemAcceptor.setSlots([ { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }, ]); return; diff --git a/src/js/game/components/belt.js b/src/js/game/components/belt.js index 3144ad96..81d2c65c 100644 --- a/src/js/game/components/belt.js +++ b/src/js/game/components/belt.js @@ -8,7 +8,7 @@ export const curvedBeltLength = /* Math.PI / 4 */ 0.78; /** @type {import("./item_acceptor").ItemAcceptorSlot} */ export const FAKE_BELT_ACCEPTOR_SLOT = { pos: new Vector(0, 0), - directions: [enumDirection.bottom], + direction: enumDirection.bottom, }; /** @type {Object} */ diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index 354f9024..d3df3763 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -3,9 +3,10 @@ import { types } from "../../savegame/serialization"; import { BaseItem } from "../base_item"; import { Component } from "../component"; -/** @typedef {{ +/** + * @typedef {{ * pos: Vector, - * directions: enumDirection[], + * direction: enumDirection, * filter?: ItemType * }} ItemAcceptorSlot */ @@ -14,12 +15,12 @@ import { Component } from "../component"; * @typedef {{ * slot: ItemAcceptorSlot, * index: number, - * acceptedDirection: enumDirection * }} ItemAcceptorLocatedSlot */ -/** @typedef {{ +/** + * @typedef {{ * pos: Vector, - * directions: enumDirection[], + * direction: enumDirection, * filter?: ItemType * }} ItemAcceptorSlotConfig */ @@ -64,7 +65,7 @@ export class ItemAcceptorComponent extends Component { const slot = slots[i]; this.slots.push({ pos: slot.pos, - directions: slot.directions, + direction: slot.direction, // Which type of item to accept (shape | color | all) @see ItemType filter: slot.filter, @@ -122,15 +123,11 @@ export class ItemAcceptorComponent extends Component { } // Check if the acceptor slot accepts items from our direction - for (let i = 0; i < slot.directions.length; ++i) { - // const localDirection = targetStaticComp.localDirectionToWorld(slot.directions[l]); - if (desiredDirection === slot.directions[i]) { - return { - slot, - index: slotIndex, - acceptedDirection: desiredDirection, - }; - } + if (desiredDirection === slot.direction) { + return { + slot, + index: slotIndex, + }; } } diff --git a/src/js/game/entity.js b/src/js/game/entity.js index d7dd715e..3010f067 100644 --- a/src/js/game/entity.js +++ b/src/js/game/entity.js @@ -197,20 +197,18 @@ export class Entity extends BasicSerializableObject { for (let i = 0; i < acceptorComp.slots.length; ++i) { const slot = acceptorComp.slots[i]; const slotTile = staticComp.localTileToWorld(slot.pos); - for (let k = 0; k < slot.directions.length; ++k) { - const direction = staticComp.localDirectionToWorld(slot.directions[k]); - const directionVector = enumDirectionToVector[direction]; - const angle = Math.radians(enumDirectionToAngle[direction] + 180); - context.globalAlpha = 0.4; - drawRotatedSprite({ - parameters, - sprite: acceptorSprite, - x: (slotTile.x + 0.5 + directionVector.x * 0.37) * globalConfig.tileSize, - y: (slotTile.y + 0.5 + directionVector.y * 0.37) * globalConfig.tileSize, - angle, - size: globalConfig.tileSize * 0.25, - }); - } + const direction = staticComp.localDirectionToWorld(slot.direction); + const directionVector = enumDirectionToVector[direction]; + const angle = Math.radians(enumDirectionToAngle[direction] + 180); + context.globalAlpha = 0.4; + drawRotatedSprite({ + parameters, + sprite: acceptorSprite, + x: (slotTile.x + 0.5 + directionVector.x * 0.37) * globalConfig.tileSize, + y: (slotTile.y + 0.5 + directionVector.y * 0.37) * globalConfig.tileSize, + angle, + size: globalConfig.tileSize * 0.25, + }); } } diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index 854ef2ae..9f9c63be 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -435,7 +435,7 @@ export class HubGoals extends BasicSerializableObject { } const randomColor = () => rng.choice(colors); - const randomShape = () => rng.choice(Object.values(enumSubShape)); + const randomShape = () => rng.choice(availableShapes); let anyIsMissingTwo = false; diff --git a/src/js/game/hud/parts/building_placer.js b/src/js/game/hud/parts/building_placer.js index e4ecfe7e..ca9c128b 100644 --- a/src/js/game/hud/parts/building_placer.js +++ b/src/js/game/hud/parts/building_placer.js @@ -530,7 +530,13 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { const offsetShift = 10; + /** + * @type {Array} + */ let acceptorSlots = []; + /** + * @type {Array} + */ let ejectorSlots = []; if (ejectorComp) { @@ -548,71 +554,65 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { acceptorSlots.push(fakeAcceptorSlot); } - for (let acceptorSlotIndex = 0; acceptorSlotIndex < acceptorSlots.length; ++acceptorSlotIndex) { - const slot = acceptorSlots[acceptorSlotIndex]; + // Go over all slots + for (let i = 0; i < acceptorSlots.length; ++i) { + const slot = acceptorSlots[i]; const acceptorSlotWsTile = staticComp.localTileToWorld(slot.pos); const acceptorSlotWsPos = acceptorSlotWsTile.toWorldSpaceCenterOfTile(); - // Go over all slots - for ( - let acceptorDirectionIndex = 0; - acceptorDirectionIndex < slot.directions.length; - ++acceptorDirectionIndex - ) { - const direction = slot.directions[acceptorDirectionIndex]; - const worldDirection = staticComp.localDirectionToWorld(direction); + const direction = slot.direction; + const worldDirection = staticComp.localDirectionToWorld(direction); - // Figure out which tile ejects to this slot - const sourceTile = acceptorSlotWsTile.add(enumDirectionToVector[worldDirection]); + // Figure out which tile ejects to this slot + const sourceTile = acceptorSlotWsTile.add(enumDirectionToVector[worldDirection]); - let isBlocked = false; - let isConnected = false; + let isBlocked = false; + let isConnected = false; - // Find all entities which are on that tile - const sourceEntities = this.root.map.getLayersContentsMultipleXY(sourceTile.x, sourceTile.y); + // Find all entities which are on that tile + const sourceEntities = this.root.map.getLayersContentsMultipleXY(sourceTile.x, sourceTile.y); - // Check for every entity: - for (let i = 0; i < sourceEntities.length; ++i) { - const sourceEntity = sourceEntities[i]; - const sourceEjector = sourceEntity.components.ItemEjector; - const sourceBeltComp = sourceEntity.components.Belt; - const sourceStaticComp = sourceEntity.components.StaticMapEntity; - const ejectorAcceptLocalTile = sourceStaticComp.worldToLocalTile(acceptorSlotWsTile); + // Check for every entity: + for (let j = 0; j < sourceEntities.length; ++j) { + const sourceEntity = sourceEntities[j]; + const sourceEjector = sourceEntity.components.ItemEjector; + const sourceBeltComp = sourceEntity.components.Belt; + const sourceStaticComp = sourceEntity.components.StaticMapEntity; + const ejectorAcceptLocalTile = sourceStaticComp.worldToLocalTile(acceptorSlotWsTile); - // If this entity is on the same layer as the slot - if so, it can either be - // connected, or it can not be connected and thus block the input - if (sourceEjector && sourceEjector.anySlotEjectsToLocalTile(ejectorAcceptLocalTile)) { - // This one is connected, all good - isConnected = true; - } else if ( - sourceBeltComp && - sourceStaticComp.localDirectionToWorld(sourceBeltComp.direction) === - enumInvertedDirections[worldDirection] - ) { - // Belt connected - isConnected = true; - } else { - // This one is blocked - isBlocked = true; - } + // If this entity is on the same layer as the slot - if so, it can either be + // connected, or it can not be connected and thus block the input + if (sourceEjector && sourceEjector.anySlotEjectsToLocalTile(ejectorAcceptLocalTile)) { + // This one is connected, all good + isConnected = true; + } else if ( + sourceBeltComp && + sourceStaticComp.localDirectionToWorld(sourceBeltComp.direction) === + enumInvertedDirections[worldDirection] + ) { + // Belt connected + isConnected = true; + } else { + // This one is blocked + isBlocked = true; } - - const alpha = isConnected || isBlocked ? 1.0 : 0.3; - const sprite = isBlocked ? badArrowSprite : goodArrowSprite; - - parameters.context.globalAlpha = alpha; - drawRotatedSprite({ - parameters, - sprite, - x: acceptorSlotWsPos.x, - y: acceptorSlotWsPos.y, - angle: Math.radians(enumDirectionToAngle[enumInvertedDirections[worldDirection]]), - size: 13, - offsetY: offsetShift + 13, - }); - parameters.context.globalAlpha = 1; } + + const alpha = isConnected || isBlocked ? 1.0 : 0.3; + const sprite = isBlocked ? badArrowSprite : goodArrowSprite; + + parameters.context.globalAlpha = alpha; + drawRotatedSprite({ + parameters, + sprite, + x: acceptorSlotWsPos.x, + y: acceptorSlotWsPos.y, + angle: Math.radians(enumDirectionToAngle[enumInvertedDirections[worldDirection]]), + size: 13, + offsetY: offsetShift + 13, + }); + parameters.context.globalAlpha = 1; } // Go over all slots diff --git a/src/js/game/logic.js b/src/js/game/logic.js index c7306dfc..0e915fea 100644 --- a/src/js/game/logic.js +++ b/src/js/game/logic.js @@ -395,7 +395,14 @@ export class GameLogic { const entity = this.root.map.getLayerContentXY(tile.x + dx, tile.y + dy, "regular"); if (entity) { + /** + * @type {Array} + */ let ejectorSlots = []; + + /** + * @type {Array} + */ let acceptorSlots = []; const staticComp = entity.components.StaticMapEntity; @@ -436,19 +443,16 @@ export class GameLogic { for (let acceptorSlot = 0; acceptorSlot < acceptorSlots.length; ++acceptorSlot) { const slot = acceptorSlots[acceptorSlot]; const wsTile = staticComp.localTileToWorld(slot.pos); - for (let k = 0; k < slot.directions.length; ++k) { - const direction = slot.directions[k]; - const wsDirection = staticComp.localDirectionToWorld(direction); - - const sourceTile = wsTile.add(enumDirectionToVector[wsDirection]); - if (sourceTile.equals(tile)) { - acceptors.push({ - entity, - slot, - toTile: wsTile, - fromDirection: wsDirection, - }); - } + const direction = slot.direction; + const wsDirection = staticComp.localDirectionToWorld(direction); + const sourceTile = wsTile.add(enumDirectionToVector[wsDirection]); + if (sourceTile.equals(tile)) { + acceptors.push({ + entity, + slot, + toTile: wsTile, + fromDirection: wsDirection, + }); } } } diff --git a/src/js/game/systems/belt_underlays.js b/src/js/game/systems/belt_underlays.js index 02707525..ddbe051a 100644 --- a/src/js/game/systems/belt_underlays.js +++ b/src/js/game/systems/belt_underlays.js @@ -113,12 +113,10 @@ export class BeltUnderlaysSystem extends GameSystem { continue; } - // Step 2: Check if any of the directions matches - for (let j = 0; j < slot.directions.length; ++j) { - const slotDirection = staticComp.localDirectionToWorld(slot.directions[j]); - if (slotDirection === fromDirection) { - return true; - } + // Step 2: Check if the direction matches + const slotDirection = staticComp.localDirectionToWorld(slot.direction); + if (slotDirection === fromDirection) { + return true; } } } diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index 4eef11aa..8c7468ad 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -203,11 +203,7 @@ export class ItemEjectorSystem extends GameSystemWithFilter { if (this.tryPassOverItem(item, destEntity, destSlot.index)) { // Handover successful, clear slot if (!this.root.app.settings.getAllSettings().simplifiedBelts) { - targetAcceptorComp.onItemAccepted( - destSlot.index, - destSlot.acceptedDirection, - item - ); + targetAcceptorComp.onItemAccepted(destSlot.index, destSlot.slot.direction, item); } sourceSlot.item = null; continue; From 1287bc9bf18c614e937b93ef075920977a7daf0c Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 22 Jan 2022 09:03:42 +0100 Subject: [PATCH 101/129] Allow specifying minimumGameVersion --- mod_examples/add_building_basic.js | 1 + mod_examples/add_building_flipper.js | 1 + mod_examples/base.js | 1 + mod_examples/buildings_have_cost.js | 1 + mod_examples/class_extensions.js | 1 + mod_examples/custom_css.js | 1 + mod_examples/custom_drawing.js | 1 + mod_examples/custom_keybinding.js | 1 + mod_examples/custom_sub_shapes.js | 1 + mod_examples/custom_theme.js | 1 + mod_examples/mod_settings.js | 1 + mod_examples/modify_existing_building.js | 1 + mod_examples/modify_theme.js | 1 + mod_examples/modify_ui.js | 1 + mod_examples/new_item_type.js | 1 + mod_examples/notification_blocks.js | 2 ++ mod_examples/pasting.js | 1 + mod_examples/replace_builtin_sprites.js | 1 + mod_examples/translations.js | 1 + mod_examples/usage_statistics.js | 2 ++ package.json | 1 + src/js/mods/modloader.js | 25 ++++++++++++++++++++++++ yarn.lock | 19 ++++++++++++++++++ 23 files changed, 67 insertions(+) diff --git a/mod_examples/add_building_basic.js b/mod_examples/add_building_basic.js index 97e0a358..4f834bc2 100644 --- a/mod_examples/add_building_basic.js +++ b/mod_examples/add_building_basic.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "add-building-basic", description: "Shows how to add a new basic building", + minimumGameVersion: "^1.5.0", }; class MetaDemoModBuilding extends shapez.ModMetaBuilding { diff --git a/mod_examples/add_building_flipper.js b/mod_examples/add_building_flipper.js index c04354bf..670f012a 100644 --- a/mod_examples/add_building_flipper.js +++ b/mod_examples/add_building_flipper.js @@ -7,6 +7,7 @@ const METADATA = { id: "add-building-extended", description: "Shows how to add a new building with logic, in this case it flips/mirrors shapez from top to down", + minimumGameVersion: "^1.5.0", }; // Declare a new type of item processor diff --git a/mod_examples/base.js b/mod_examples/base.js index 6dc8df8f..9810e823 100644 --- a/mod_examples/base.js +++ b/mod_examples/base.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "base", description: "The most basic mod", + minimumGameVersion: "^1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/buildings_have_cost.js b/mod_examples/buildings_have_cost.js index 79061d35..04d1e14e 100644 --- a/mod_examples/buildings_have_cost.js +++ b/mod_examples/buildings_have_cost.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "patch-methods", description: "Shows how to patch existing methods to change the game by making the belts cost shapes", + minimumGameVersion: "^1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/class_extensions.js b/mod_examples/class_extensions.js index c5b5b95e..904a5a03 100644 --- a/mod_examples/class_extensions.js +++ b/mod_examples/class_extensions.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "class-extensions", description: "Shows how to extend builtin classes", + minimumGameVersion: "^1.5.0", }; const BeltExtension = ({ $super, $old }) => ({ diff --git a/mod_examples/custom_css.js b/mod_examples/custom_css.js index 74d19057..2df83afd 100644 --- a/mod_examples/custom_css.js +++ b/mod_examples/custom_css.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "custom-css", description: "Shows how to add custom css", + minimumGameVersion: "^1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/custom_drawing.js b/mod_examples/custom_drawing.js index 6ba49454..f491b94b 100644 --- a/mod_examples/custom_drawing.js +++ b/mod_examples/custom_drawing.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "base", description: "Displays an indicator on every item processing building when its working", + minimumGameVersion: "^1.5.0", }; class ItemProcessorStatusGameSystem extends shapez.GameSystem { diff --git a/mod_examples/custom_keybinding.js b/mod_examples/custom_keybinding.js index 650065f0..46ef71a6 100644 --- a/mod_examples/custom_keybinding.js +++ b/mod_examples/custom_keybinding.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "base", description: "Shows how to add a new keybinding", + minimumGameVersion: "^1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/custom_sub_shapes.js b/mod_examples/custom_sub_shapes.js index afb901c0..906e3c9b 100644 --- a/mod_examples/custom_sub_shapes.js +++ b/mod_examples/custom_sub_shapes.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "custom-sub-shapes", description: "Shows how to add custom sub shapes", + minimumGameVersion: "^1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/custom_theme.js b/mod_examples/custom_theme.js index a596799c..400e3b7c 100644 --- a/mod_examples/custom_theme.js +++ b/mod_examples/custom_theme.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "custom-theme", description: "Shows how to add a custom game theme", + minimumGameVersion: "^1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/mod_settings.js b/mod_examples/mod_settings.js index bbcfe3fd..8f8e20de 100644 --- a/mod_examples/mod_settings.js +++ b/mod_examples/mod_settings.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "mod-settings", description: "Shows how to add settings to your mod", + minimumGameVersion: "^1.5.0", settings: { timesLaunched: 0, diff --git a/mod_examples/modify_existing_building.js b/mod_examples/modify_existing_building.js index 1264b2c3..c88fad7e 100644 --- a/mod_examples/modify_existing_building.js +++ b/mod_examples/modify_existing_building.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "modify-existing-building", description: "Shows how to modify an existing building", + minimumGameVersion: "^1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/modify_theme.js b/mod_examples/modify_theme.js index dfdfb6e9..8a7f4318 100644 --- a/mod_examples/modify_theme.js +++ b/mod_examples/modify_theme.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "modify-theme", description: "Shows how to modify builtin themes", + minimumGameVersion: "^1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/modify_ui.js b/mod_examples/modify_ui.js index 749e191e..ef8d2455 100644 --- a/mod_examples/modify_ui.js +++ b/mod_examples/modify_ui.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "modify-ui", description: "Shows how to modify a builtin game state, in this case the main menu", + minimumGameVersion: "^1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/new_item_type.js b/mod_examples/new_item_type.js index ee06538d..3c8dad5c 100644 --- a/mod_examples/new_item_type.js +++ b/mod_examples/new_item_type.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "new-item-type", description: "Shows how to add a new item type (fluid)", + minimumGameVersion: "^1.5.0", }; // Define which fluid types there are diff --git a/mod_examples/notification_blocks.js b/mod_examples/notification_blocks.js index a8116849..4d8cf476 100644 --- a/mod_examples/notification_blocks.js +++ b/mod_examples/notification_blocks.js @@ -7,6 +7,8 @@ const METADATA = { id: "notification-blocks", description: "Adds a new building to the wires layer, 'Notification Blocks' which show a custom notification when they get a truthy signal.", + + minimumGameVersion: "^1.5.0", }; //////////////////////////////////////////////////////////////////////// diff --git a/mod_examples/pasting.js b/mod_examples/pasting.js index edd4952c..de253910 100644 --- a/mod_examples/pasting.js +++ b/mod_examples/pasting.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "pasting", description: "Shows how to properly receive paste events ingame", + minimumGameVersion: "^1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/replace_builtin_sprites.js b/mod_examples/replace_builtin_sprites.js index 9865121e..1d93a36c 100644 --- a/mod_examples/replace_builtin_sprites.js +++ b/mod_examples/replace_builtin_sprites.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "replace-builtin-sprites", description: "Shows how to replace builtin sprites", + minimumGameVersion: "^1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/translations.js b/mod_examples/translations.js index 8a3e07da..080be45c 100644 --- a/mod_examples/translations.js +++ b/mod_examples/translations.js @@ -6,6 +6,7 @@ const METADATA = { version: "1", id: "translations", description: "Shows how to add and modify translations", + minimumGameVersion: "^1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/usage_statistics.js b/mod_examples/usage_statistics.js index 36bb81f5..1412e4dd 100644 --- a/mod_examples/usage_statistics.js +++ b/mod_examples/usage_statistics.js @@ -7,6 +7,8 @@ const METADATA = { id: "usage-statistics", description: "Shows how to add a new component to the game, how to save additional data and how to add custom logic and drawings", + + minimumGameVersion: "^1.5.0", }; /** diff --git a/package.json b/package.json index 4ee134b7..ef752aac 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "promise-polyfill": "^8.1.0", "query-string": "^6.8.1", "rusha": "^0.8.13", + "semver": "^7.3.5", "serialize-error": "^3.0.0", "strictdom": "^1.0.1", "string-replace-webpack-plugin": "^0.1.3", diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 96743038..48911abd 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -10,6 +10,9 @@ import { Mod } from "./mod"; import { ModInterface } from "./mod_interface"; import { MOD_SIGNALS } from "./mod_signals"; +import semverValidRange from "semver/ranges/valid"; +import semverSatisifies from "semver/functions/satisfies"; + const LOG = createLogger("mods"); /** @@ -20,6 +23,7 @@ const LOG = createLogger("mods"); * website: string; * description: string; * id: string; + * minimumGameVersion?: string; * settings: [] * }} ModMetadata */ @@ -158,6 +162,27 @@ export class ModLoader { const { modClass, meta } = this.modLoadQueue[i]; const modDataFile = "modsettings_" + meta.id + "__" + meta.version + ".json"; + if (meta.minimumGameVersion) { + console.warn(meta.minimumGameVersion, G_BUILD_VERSION); + const minimumGameVersion = meta.minimumGameVersion; + if (!semverValidRange(minimumGameVersion)) { + alert("Mod " + meta.id + " has invalid minimumGameVersion: " + minimumGameVersion); + continue; + } + if (!semverSatisifies(G_BUILD_VERSION, minimumGameVersion)) { + alert( + "Mod '" + + meta.id + + "' is incompatible with this version of the game: \n\n" + + "Mod requires version " + + minimumGameVersion + + " but this game has version " + + G_BUILD_VERSION + ); + continue; + } + } + let settings = meta.settings; if (meta.settings) { diff --git a/yarn.lock b/yarn.lock index cdcdd19e..27552f93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5245,6 +5245,13 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + lz-string@^1.4.4: version "1.4.4" resolved "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz" @@ -7496,6 +7503,13 @@ semver@^7.2.1, semver@^7.3.2: resolved "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== +semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + send@0.17.1: version "0.17.1" resolved "https://registry.npmjs.org/send/-/send-0.17.1.tgz" @@ -8800,6 +8814,11 @@ yallist@^3.0.2: resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + yaml-js@^0.1.3: version "0.1.5" resolved "https://registry.npmjs.org/yaml-js/-/yaml-js-0.1.5.tgz" From ade7176dba0f37d3478d380fc11cf452b43738e3 Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 22 Jan 2022 09:34:38 +0100 Subject: [PATCH 102/129] Add sandbox example --- mod_examples/README.md | 1 + mod_examples/sandbox.js | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 mod_examples/sandbox.js diff --git a/mod_examples/README.md b/mod_examples/README.md index 25b1d75e..e38d5834 100644 --- a/mod_examples/README.md +++ b/mod_examples/README.md @@ -41,6 +41,7 @@ To get into shapez.io modding, I highly recommend checking out all of the exampl | [modify_existing_building.js](modify_existing_building.js) | Makes the rotator building always unlocked and adds a new statistic to the building panel | Modifying a builtin building, replacing builtin methods | | [modify_ui.js](modify_ui.js) | Shows how to add custom IU elements to builtin game states (the Main Menu in this case) | Extending builtin UI states, Adding CSS | | [pasting.js](pasting.js) | Shows a dialog when pasting text in the game | Listening to paste events | +| [sandbox.js](sandbox.js) | Makes blueprints free and always unlocked | Overriding builtin methods | ### Advanced Examples diff --git a/mod_examples/sandbox.js b/mod_examples/sandbox.js new file mode 100644 index 00000000..d57e1e0e --- /dev/null +++ b/mod_examples/sandbox.js @@ -0,0 +1,21 @@ +// @ts-nocheck +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Sandbox", + version: "1", + id: "sandbox", + description: "Blueprints are always unlocked and cost no money, also all buildings are unlocked", + minimumGameVersion: "^1.5.0", +}; + +class Mod extends shapez.Mod { + init() { + this.modInterface.replaceMethod(shapez.Blueprint, "getCost", function () { + return 0; + }); + this.modInterface.replaceMethod(shapez.HubGoals, "isRewardUnlocked", function () { + return true; + }); + } +} From a3dfe6f5fb2cba520c72a495ddea16abd7fb34be Mon Sep 17 00:00:00 2001 From: saile515 <63782477+saile515@users.noreply.github.com> Date: Sat, 22 Jan 2022 09:50:02 +0100 Subject: [PATCH 103/129] Replaced concatenated strings with template literals (#1347) --- mod_examples/mod_settings.js | 2 +- mod_examples/new_item_type.js | 4 ++-- mod_examples/pasting.js | 2 +- mod_examples/replace_builtin_sprites.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mod_examples/mod_settings.js b/mod_examples/mod_settings.js index 8f8e20de..873468c4 100644 --- a/mod_examples/mod_settings.js +++ b/mod_examples/mod_settings.js @@ -24,7 +24,7 @@ class Mod extends shapez.Mod { if (state instanceof shapez.MainMenuState) { this.dialogs.showInfo( "Welcome back", - "You have launched this mod " + this.settings.timesLaunched + " times" + `You have launched this mod ${this.settings.timesLaunched} times` ); } }); diff --git a/mod_examples/new_item_type.js b/mod_examples/new_item_type.js index 3c8dad5c..a9fa30ca 100644 --- a/mod_examples/new_item_type.js +++ b/mod_examples/new_item_type.js @@ -76,7 +76,7 @@ class FluidItem extends shapez.BaseItem { */ drawFullSizeOnCanvas(context, size) { if (!this.cachedSprite) { - this.cachedSprite = shapez.Loader.getSprite("sprites/fluids/" + this.fluidType + ".png"); + this.cachedSprite = shapez.Loader.getSprite(`sprites/fluids/${this.fluidType}.png`); } this.cachedSprite.drawCentered(context, size / 2, size / 2, size); } @@ -90,7 +90,7 @@ class FluidItem extends shapez.BaseItem { drawItemCenteredClipped(x, y, parameters, diameter = globalConfig.defaultItemDiameter) { const realDiameter = diameter * 0.6; if (!this.cachedSprite) { - this.cachedSprite = shapez.Loader.getSprite("sprites/fluids/" + this.fluidType + ".png"); + this.cachedSprite = shapez.Loader.getSprite(`sprites/fluids/${this.fluidType}.png`); } this.cachedSprite.drawCachedCentered(parameters, x, y, realDiameter); } diff --git a/mod_examples/pasting.js b/mod_examples/pasting.js index de253910..b514f137 100644 --- a/mod_examples/pasting.js +++ b/mod_examples/pasting.js @@ -16,7 +16,7 @@ class Mod extends shapez.Mod { event.preventDefault(); const data = event.clipboardData.getData("text"); - this.dialogs.showInfo("Pasted", "You pasted: '" + data + "'"); + this.dialogs.showInfo("Pasted", `You pasted: '${data}'`); }); }); } diff --git a/mod_examples/replace_builtin_sprites.js b/mod_examples/replace_builtin_sprites.js index 1d93a36c..d0407692 100644 --- a/mod_examples/replace_builtin_sprites.js +++ b/mod_examples/replace_builtin_sprites.js @@ -13,7 +13,7 @@ class Mod extends shapez.Mod { init() { // Replace a builtin sprite ["red", "green", "blue", "yellow", "purple", "cyan", "white"].forEach(color => { - this.modInterface.registerSprite("sprites/colors/" + color + ".png", RESOURCES[color + ".png"]); + this.modInterface.registerSprite(`sprites/colors/${color}.png`, RESOURCES[color + ".png"]); }); } } From 408d1a7dcacc44700c5cb3749e2868fe298cfdfb Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 22 Jan 2022 10:03:42 +0100 Subject: [PATCH 104/129] Mod improvements --- src/css/states/main_menu.scss | 43 +++++++++++++++++++++++------------ src/css/states/mods.scss | 9 ++++++++ src/js/core/config.js | 2 ++ src/js/states/main_menu.js | 10 ++++++-- src/js/states/mods.js | 17 +++++++++++++- translations/base-en.yaml | 1 + 6 files changed, 65 insertions(+), 17 deletions(-) diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss index 2458350e..9027d8a8 100644 --- a/src/css/states/main_menu.scss +++ b/src/css/states/main_menu.scss @@ -199,10 +199,6 @@ transform: translateX(50%) rotate(-7deg) scale(1.1); } } - - @include DarkThemeOverride { - color: $colorBlueBright; - } } } @@ -326,6 +322,7 @@ /* @load-async */ background-image: uiResource("icons/edit_key.png") !important; } + @include DarkThemeInvert; } } @@ -354,13 +351,14 @@ box-sizing: border-box; @include PlainText; @include S(margin-bottom, 5px); - display: grid; - grid-template-columns: 1fr auto auto; - @include S(grid-gap, 5px); + display: flex; + flex-direction: column; .author, .version { @include SuperSmallText; + align-self: end; + opacity: 0.4; } .name { overflow: hidden; @@ -457,19 +455,19 @@ .newGameButton { @include IncreasedClickArea(0px); - @include S(margin-left, 15px); + @include S(margin-left, 10px); } .modsButton { @include IncreasedClickArea(0px); - @include S(margin-left, 15px); + @include S(margin-left, 10px); - @include S(width, 20px); + // @include S(width, 20px); - & { - /* @load-async */ - background-image: uiResource("res/ui/icons/mods_white.png") !important; - } + // & { + // /* @load-async */ + // background-image: uiResource("res/ui/icons/mods_white.png") !important; + // } background-position: center center; background-size: D(15px); background-color: $modsColor !important; @@ -837,6 +835,23 @@ } } + .modsOverview { + background: $darkModeControlsBackground; + + .modsList { + border-color: darken($darkModeControlsBackground, 5); + + .mod { + background: darken($darkModeControlsBackground, 5); + color: white; + } + } + + .dlcHint { + color: $accentColorBright; + } + } + .footer { > a, .sidelinks > a { diff --git a/src/css/states/mods.scss b/src/css/states/mods.scss index 54d8422b..acec41fb 100644 --- a/src/css/states/mods.scss +++ b/src/css/states/mods.scss @@ -62,6 +62,11 @@ @include S(margin-top, 100px); color: lighten($accentColorDark, 15); + button { + @include S(margin-top, 10px); + @include S(padding, 10px, 20px); + } + &::before { @include S(margin-bottom, 15px); content: ""; @@ -94,6 +99,10 @@ display: grid; grid-template-columns: 1fr D(100px) D(80px) D(50px); + @include DarkThemeOverride { + background: darken($darkModeControlsBackground, 5); + } + .checkbox { align-self: center; justify-self: center; diff --git a/src/js/core/config.js b/src/js/core/config.js index 773295ed..b451e848 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -28,6 +28,8 @@ export const THIRDPARTY_URLS = { 25: "https://www.youtube.com/watch?v=7OCV1g40Iew&", 26: "https://www.youtube.com/watch?v=gfm6dS1dCoY", }, + + modBrowser: "https://shapez.mod.io/?preview=f55f6304ca4873d9a25f3b575571b948", }; // export const A_B_TESTING_LINK_TYPE = Math.random() > 0.95 ? "steam_1_pr" : "steam_2_npr"; diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index b23a15f3..4d62f2ce 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -161,7 +161,10 @@ export class MainMenuState extends GameState { ${MODS.mods .map(mod => { return ` -
${mod.metadata.name} @ v${mod.metadata.version}
+
+
${mod.metadata.name}
+
by ${mod.metadata.author}
+
`; }) .join("")} @@ -413,7 +416,10 @@ export class MainMenuState extends GameState { } // Mods - this.trackClicks(makeButton(outerDiv, ["modsButton", "styledButton"], " "), this.onModsClicked); + this.trackClicks( + makeButton(outerDiv, ["modsButton", "styledButton"], T.mods.title), + this.onModsClicked + ); buttonContainer.appendChild(outerDiv); } diff --git a/src/js/states/mods.js b/src/js/states/mods.js index c3cbce52..42add8bd 100644 --- a/src/js/states/mods.js +++ b/src/js/states/mods.js @@ -18,6 +18,11 @@ export class ModsState extends TextualGameState {

${this.getStateHeaderTitle()}

+ ${ + (G_IS_STANDALONE || G_IS_DEV) && MODS.mods.length > 0 + ? `` + : "" + } ${ G_IS_STANDALONE || G_IS_DEV ? `` @@ -53,8 +58,9 @@ export class ModsState extends TextualGameState { return `
- ${T.mods.modsInfo} + +
`; @@ -100,6 +106,10 @@ export class ModsState extends TextualGameState { if (openModsFolder) { this.trackClicks(openModsFolder, this.openModsFolder); } + const browseMods = this.htmlElement.querySelector(".browseMods"); + if (browseMods) { + this.trackClicks(browseMods, this.openBrowseMods); + } const checkboxes = this.htmlElement.querySelectorAll(".checkbox"); Array.from(checkboxes).forEach(checkbox => { @@ -119,6 +129,11 @@ export class ModsState extends TextualGameState { ipcRenderer.invoke("open-mods-folder"); } + openBrowseMods() { + this.app.analytics.trackUiClick("mods_sbrowse_link"); + this.app.platformWrapper.openExternalLink(THIRDPARTY_URLS.modBrowser); + } + onSteamLinkClicked() { this.app.analytics.trackUiClick("mods_steam_link"); this.app.platformWrapper.openExternalLink( diff --git a/translations/base-en.yaml b/translations/base-en.yaml index 2f76c00f..7070c318 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -1098,6 +1098,7 @@ mods: version: Version openFolder: Open Mods Folder folderOnlyStandalone: Opening the mod folder is only possible when running the standalone. + browseMods: Browse Mods modsInfo: >- To install and manage mods, copy them to the mods folder within the game directory. You can also use the 'Open Mods Folder' button on the top right. From 0540a010a618f3149275df28f6c3985d1a30bcfb Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 22 Jan 2022 18:23:05 +0100 Subject: [PATCH 105/129] Make wired pins component optional on the storage --- src/js/game/systems/storage.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/js/game/systems/storage.js b/src/js/game/systems/storage.js index cd204448..20204a89 100644 --- a/src/js/game/systems/storage.js +++ b/src/js/game/systems/storage.js @@ -50,8 +50,13 @@ export class StorageSystem extends GameSystemWithFilter { let targetAlpha = storageComp.storedCount > 0 ? 1 : 0; storageComp.overlayOpacity = lerp(storageComp.overlayOpacity, targetAlpha, 0.05); - pinsComp.slots[0].value = storageComp.storedItem; - pinsComp.slots[1].value = storageComp.getIsFull() ? BOOL_TRUE_SINGLETON : BOOL_FALSE_SINGLETON; + // a wired pins component is not guaranteed, but if its there, set the value + if (pinsComp) { + pinsComp.slots[0].value = storageComp.storedItem; + pinsComp.slots[1].value = storageComp.getIsFull() + ? BOOL_TRUE_SINGLETON + : BOOL_FALSE_SINGLETON; + } } } From 132eff5f587e2700c6811e0c5b7eb9c19b5e05a3 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Sat, 22 Jan 2022 18:40:46 +0000 Subject: [PATCH 106/129] adjust hub goals --- src/js/core/config.js | 19 +++++------- src/js/game/hub_goals.js | 67 +++++++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 40 deletions(-) diff --git a/src/js/core/config.js b/src/js/core/config.js index b451e848..602e0c82 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -87,17 +87,14 @@ export const globalConfig = { puzzleMaxBoundsSize: 20, puzzleValidationDurationSeconds: 30, - buildingSpeeds: { - cutter: 1 / 4, - cutterQuad: 1 / 4, - rotater: 1 / 1, - rotaterCCW: 1 / 1, - rotater180: 1 / 1, - painter: 1 / 6, - painterDouble: 1 / 8, - painterQuad: 1 / 2, - mixer: 1 / 5, - stacker: 1 / 8, + buildingRatios: { + cutter: 4, + cutterQuad: 4, + painter: 6, + painterDouble: 8, + painterQuad: 2, + mixer: 5, + stacker: 8, }, // Zooming diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index 9f9c63be..4fe267d8 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -507,55 +507,37 @@ export class HubGoals extends BasicSerializableObject { } /** - * Processor speed + * Processor time to process * @param {enumItemProcessorTypes} processorType - * @returns {number} items / sec + * @returns {number} progress in tiles */ - getProcessorBaseSpeed(processorType) { + getProcessingProgress(processorType) { if (this.root.gameMode.throughputDoesNotMatter()) { - return globalConfig.beltSpeedItemsPerSecond * globalConfig.puzzleModeSpeed * 10; + return 0; } switch (processorType) { case enumItemProcessorTypes.trash: case enumItemProcessorTypes.hub: case enumItemProcessorTypes.goal: - return 1e30; case enumItemProcessorTypes.balancer: - return globalConfig.beltSpeedItemsPerSecond * this.upgradeImprovements.belt * 2; case enumItemProcessorTypes.reader: - return globalConfig.beltSpeedItemsPerSecond * this.upgradeImprovements.belt; + case enumItemProcessorTypes.rotater: + case enumItemProcessorTypes.rotaterCCW: + case enumItemProcessorTypes.rotater180: + return 0; case enumItemProcessorTypes.mixer: case enumItemProcessorTypes.painter: case enumItemProcessorTypes.painterDouble: case enumItemProcessorTypes.painterQuad: { - assert( - globalConfig.buildingSpeeds[processorType], - "Processor type has no speed set in globalConfig.buildingSpeeds: " + processorType - ); - return ( - globalConfig.beltSpeedItemsPerSecond * - this.upgradeImprovements.painting * - globalConfig.buildingSpeeds[processorType] - ); + return this.getProgressWithUpgrades(this.upgradeImprovements.painting, processorType); } case enumItemProcessorTypes.cutter: case enumItemProcessorTypes.cutterQuad: - case enumItemProcessorTypes.rotater: - case enumItemProcessorTypes.rotaterCCW: - case enumItemProcessorTypes.rotater180: case enumItemProcessorTypes.stacker: { - assert( - globalConfig.buildingSpeeds[processorType], - "Processor type has no speed set in globalConfig.buildingSpeeds: " + processorType - ); - return ( - globalConfig.beltSpeedItemsPerSecond * - this.upgradeImprovements.processors * - globalConfig.buildingSpeeds[processorType] - ); + return this.getProgressWithUpgrades(this.upgradeImprovements.processors, processorType); } default: if (MOD_ITEM_PROCESSOR_SPEEDS[processorType]) { @@ -564,6 +546,33 @@ export class HubGoals extends BasicSerializableObject { assertAlways(false, "invalid processor type: " + processorType); } - return 1 / globalConfig.beltSpeedItemsPerSecond; + return 0; + } + + /** + * @param {number} upgrade + * @param {number} upgrade + */ + getProgressWithUpgrades(upgrade, processorType) { + assert( + globalConfig.buildingRatios[processorType], + "Processor type has no speed set in globalConfig.buildingRatios: " + processorType + ); + + const progress = globalConfig.buildingRatios[processorType] - 1; + return progress / upgrade; + } + + /** + * Processor speed + * @param {enumItemProcessorTypes} processorType + * @returns {number} items/sec + */ + getProcessorBaseSpeed(processorType) { + const progress = this.getProcessingProgress(processorType); + if (!progress) { + return this.getBeltBaseSpeed(); + } + return globalConfig.beltSpeedItemsPerSecond / (progress + 1); } } From 3bd86aa6d09354127239b6eff619279b1795e555 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Sat, 22 Jan 2022 19:18:40 +0000 Subject: [PATCH 107/129] half ejector progress --- src/js/game/systems/item_ejector.js | 43 ++++++++++------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index 8c7468ad..57d577b0 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -138,13 +138,6 @@ export class ItemEjectorSystem extends GameSystemWithFilter { update() { this.staleAreaDetector.update(); - // Precompute effective belt speed - let progressGrowth = 2 * this.root.dynamicTickrate.deltaSeconds; - - if (G_IS_DEV && globalConfig.debug.instantBelts) { - progressGrowth = 1; - } - // Go over all cache entries for (let i = 0; i < this.allEntities.length; ++i) { const sourceEntity = this.allEntities[i]; @@ -154,26 +147,27 @@ export class ItemEjectorSystem extends GameSystemWithFilter { for (let j = 0; j < slots.length; ++j) { const sourceSlot = slots[j]; const item = sourceSlot.item; + const maxProgress = 0.5; + if (!item) { // No item available to be ejected continue; } - // Advance items on the slot - sourceSlot.progress = Math.min( - 1, - sourceSlot.progress + - progressGrowth * - this.root.hubGoals.getBeltBaseSpeed() * - globalConfig.itemSpacingOnBelts - ); + if (sourceSlot.progress < maxProgress) { + // Advance items on the slot + sourceSlot.progress += + this.root.dynamicTickrate.deltaSeconds * + this.root.hubGoals.getBeltBaseSpeed() * + globalConfig.itemSpacingOnBelts; + } if (G_IS_DEV && globalConfig.debug.disableEjectorProcessing) { - sourceSlot.progress = 1.0; + sourceSlot.progress = maxProgress; } // Check if we are still in the process of ejecting, can't proceed then - if (sourceSlot.progress < 1.0) { + if (sourceSlot.progress < maxProgress) { continue; } @@ -368,20 +362,11 @@ export class ItemEjectorSystem extends GameSystemWithFilter { ^ ^ item @ 0.9 ^ max progress = 0.3 - Because now our range actually only goes to the end of the building, and not towards the center of the building, we need to multiply - all values by 2: - - Building Belt - | X | X | - | 0.........1.........2 | - ^ ^ item @ 1.8 - ^ max progress = 0.6 - And that's it! If you summarize the calculations from above into a formula, you get the one below. */ const maxProgress = - (0.5 + nextBeltPath.spacingToFirstItem - globalConfig.itemSpacingOnBelts) * 2; + 0.5 + nextBeltPath.spacingToFirstItem - globalConfig.itemSpacingOnBelts; progress = Math.min(maxProgress, progress); } @@ -399,8 +384,8 @@ export class ItemEjectorSystem extends GameSystemWithFilter { const realDirection = staticComp.localDirectionToWorld(slot.direction); const realDirectionVector = enumDirectionToVector[realDirection]; - const tileX = realPosition.x + 0.5 + realDirectionVector.x * 0.5 * progress; - const tileY = realPosition.y + 0.5 + realDirectionVector.y * 0.5 * progress; + const tileX = realPosition.x + 0.5 + realDirectionVector.x * progress; + const tileY = realPosition.y + 0.5 + realDirectionVector.y * progress; const worldX = tileX * globalConfig.tileSize; const worldY = tileY * globalConfig.tileSize; From 509c01f64280aef587633590102cbe55bcfe2e7e Mon Sep 17 00:00:00 2001 From: tobspr Date: Sat, 22 Jan 2022 22:04:49 +0100 Subject: [PATCH 108/129] Fix mod examples --- mod_examples/add_building_basic.js | 2 +- mod_examples/add_building_flipper.js | 2 +- mod_examples/base.js | 2 +- mod_examples/buildings_have_cost.js | 2 +- mod_examples/class_extensions.js | 2 +- mod_examples/custom_css.js | 2 +- mod_examples/custom_drawing.js | 2 +- mod_examples/custom_keybinding.js | 2 +- mod_examples/custom_sub_shapes.js | 2 +- mod_examples/custom_theme.js | 2 +- mod_examples/mod_settings.js | 2 +- mod_examples/modify_existing_building.js | 2 +- mod_examples/modify_theme.js | 2 +- mod_examples/modify_ui.js | 2 +- mod_examples/new_item_type.js | 2 +- mod_examples/notification_blocks.js | 2 +- mod_examples/pasting.js | 2 +- mod_examples/replace_builtin_sprites.js | 2 +- mod_examples/sandbox.js | 2 +- mod_examples/translations.js | 2 +- mod_examples/usage_statistics.js | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/mod_examples/add_building_basic.js b/mod_examples/add_building_basic.js index 4f834bc2..6b92e769 100644 --- a/mod_examples/add_building_basic.js +++ b/mod_examples/add_building_basic.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "add-building-basic", description: "Shows how to add a new basic building", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class MetaDemoModBuilding extends shapez.ModMetaBuilding { diff --git a/mod_examples/add_building_flipper.js b/mod_examples/add_building_flipper.js index 670f012a..03442499 100644 --- a/mod_examples/add_building_flipper.js +++ b/mod_examples/add_building_flipper.js @@ -7,7 +7,7 @@ const METADATA = { id: "add-building-extended", description: "Shows how to add a new building with logic, in this case it flips/mirrors shapez from top to down", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; // Declare a new type of item processor diff --git a/mod_examples/base.js b/mod_examples/base.js index 9810e823..09e12f61 100644 --- a/mod_examples/base.js +++ b/mod_examples/base.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "base", description: "The most basic mod", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/buildings_have_cost.js b/mod_examples/buildings_have_cost.js index 04d1e14e..3dae84ae 100644 --- a/mod_examples/buildings_have_cost.js +++ b/mod_examples/buildings_have_cost.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "patch-methods", description: "Shows how to patch existing methods to change the game by making the belts cost shapes", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/class_extensions.js b/mod_examples/class_extensions.js index 904a5a03..8647fd45 100644 --- a/mod_examples/class_extensions.js +++ b/mod_examples/class_extensions.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "class-extensions", description: "Shows how to extend builtin classes", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; const BeltExtension = ({ $super, $old }) => ({ diff --git a/mod_examples/custom_css.js b/mod_examples/custom_css.js index 2df83afd..dce316c5 100644 --- a/mod_examples/custom_css.js +++ b/mod_examples/custom_css.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "custom-css", description: "Shows how to add custom css", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/custom_drawing.js b/mod_examples/custom_drawing.js index f491b94b..e1c25b30 100644 --- a/mod_examples/custom_drawing.js +++ b/mod_examples/custom_drawing.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "base", description: "Displays an indicator on every item processing building when its working", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class ItemProcessorStatusGameSystem extends shapez.GameSystem { diff --git a/mod_examples/custom_keybinding.js b/mod_examples/custom_keybinding.js index 46ef71a6..0a6b11fc 100644 --- a/mod_examples/custom_keybinding.js +++ b/mod_examples/custom_keybinding.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "base", description: "Shows how to add a new keybinding", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/custom_sub_shapes.js b/mod_examples/custom_sub_shapes.js index 906e3c9b..3aea03cf 100644 --- a/mod_examples/custom_sub_shapes.js +++ b/mod_examples/custom_sub_shapes.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "custom-sub-shapes", description: "Shows how to add custom sub shapes", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/custom_theme.js b/mod_examples/custom_theme.js index 400e3b7c..cc4c9de8 100644 --- a/mod_examples/custom_theme.js +++ b/mod_examples/custom_theme.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "custom-theme", description: "Shows how to add a custom game theme", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/mod_settings.js b/mod_examples/mod_settings.js index 873468c4..b87c138b 100644 --- a/mod_examples/mod_settings.js +++ b/mod_examples/mod_settings.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "mod-settings", description: "Shows how to add settings to your mod", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", settings: { timesLaunched: 0, diff --git a/mod_examples/modify_existing_building.js b/mod_examples/modify_existing_building.js index c88fad7e..b09f5a20 100644 --- a/mod_examples/modify_existing_building.js +++ b/mod_examples/modify_existing_building.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "modify-existing-building", description: "Shows how to modify an existing building", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/modify_theme.js b/mod_examples/modify_theme.js index 8a7f4318..4bc9be34 100644 --- a/mod_examples/modify_theme.js +++ b/mod_examples/modify_theme.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "modify-theme", description: "Shows how to modify builtin themes", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/modify_ui.js b/mod_examples/modify_ui.js index ef8d2455..0b2d1341 100644 --- a/mod_examples/modify_ui.js +++ b/mod_examples/modify_ui.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "modify-ui", description: "Shows how to modify a builtin game state, in this case the main menu", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/new_item_type.js b/mod_examples/new_item_type.js index a9fa30ca..3cd52cef 100644 --- a/mod_examples/new_item_type.js +++ b/mod_examples/new_item_type.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "new-item-type", description: "Shows how to add a new item type (fluid)", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; // Define which fluid types there are diff --git a/mod_examples/notification_blocks.js b/mod_examples/notification_blocks.js index 4d8cf476..23f95943 100644 --- a/mod_examples/notification_blocks.js +++ b/mod_examples/notification_blocks.js @@ -8,7 +8,7 @@ const METADATA = { description: "Adds a new building to the wires layer, 'Notification Blocks' which show a custom notification when they get a truthy signal.", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; //////////////////////////////////////////////////////////////////////// diff --git a/mod_examples/pasting.js b/mod_examples/pasting.js index b514f137..698edeff 100644 --- a/mod_examples/pasting.js +++ b/mod_examples/pasting.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "pasting", description: "Shows how to properly receive paste events ingame", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/replace_builtin_sprites.js b/mod_examples/replace_builtin_sprites.js index d0407692..885846e7 100644 --- a/mod_examples/replace_builtin_sprites.js +++ b/mod_examples/replace_builtin_sprites.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "replace-builtin-sprites", description: "Shows how to replace builtin sprites", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/sandbox.js b/mod_examples/sandbox.js index d57e1e0e..f405ab59 100644 --- a/mod_examples/sandbox.js +++ b/mod_examples/sandbox.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "sandbox", description: "Blueprints are always unlocked and cost no money, also all buildings are unlocked", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/translations.js b/mod_examples/translations.js index 080be45c..2f3a4015 100644 --- a/mod_examples/translations.js +++ b/mod_examples/translations.js @@ -6,7 +6,7 @@ const METADATA = { version: "1", id: "translations", description: "Shows how to add and modify translations", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; class Mod extends shapez.Mod { diff --git a/mod_examples/usage_statistics.js b/mod_examples/usage_statistics.js index 1412e4dd..64da102b 100644 --- a/mod_examples/usage_statistics.js +++ b/mod_examples/usage_statistics.js @@ -8,7 +8,7 @@ const METADATA = { description: "Shows how to add a new component to the game, how to save additional data and how to add custom logic and drawings", - minimumGameVersion: "^1.5.0", + minimumGameVersion: ">=1.5.0", }; /** From 93daf53b0f5ec031619bf81bdd90a766491a2ebd Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Sat, 22 Jan 2022 21:06:06 +0000 Subject: [PATCH 109/129] test --- src/js/game/components/item_processor.js | 8 +------- src/js/game/hub_goals.js | 2 +- src/js/game/systems/item_ejector.js | 2 +- src/js/game/systems/item_processor.js | 25 ++++++++++-------------- 4 files changed, 13 insertions(+), 24 deletions(-) diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index f7dddec1..fbe03391 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -34,7 +34,7 @@ export const enumItemProcessorRequirements = { * }} EjectorItemToEject */ /** @typedef {{ - * remainingTime: number, + * remainingProgress: number, * items: Array, * }} EjectorCharge */ @@ -103,12 +103,6 @@ export class ItemProcessorComponent extends Component { * @type {Array} */ this.ongoingCharges = []; - - /** - * How much processing time we have left from the last tick - * @type {number} - */ - this.bonusTime = 0; } /** diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index 4fe267d8..b013530d 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -560,7 +560,7 @@ export class HubGoals extends BasicSerializableObject { ); const progress = globalConfig.buildingRatios[processorType] - 1; - return progress / upgrade; + return progress + 0.5 / upgrade; } /** diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index 57d577b0..c735c7bd 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -327,7 +327,7 @@ export class ItemEjectorSystem extends GameSystemWithFilter { } // Limit the progress to the maximum available space on the next belt (also see #1000) - let progress = slot.progress; + let progress = Math.min(0.5, slot.progress); const nextBeltPath = slot.cachedBeltPath; if (nextBeltPath) { /* diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 36c837fb..9b746e44 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -76,6 +76,11 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } update() { + const progressGrowth = + this.root.dynamicTickrate.deltaSeconds * + globalConfig.beltSpeedItemsPerSecond * + globalConfig.itemSpacingOnBelts; + for (let i = 0; i < this.allEntities.length; ++i) { const entity = this.allEntities[i]; @@ -86,16 +91,12 @@ export class ItemProcessorSystem extends GameSystemWithFilter { if (currentCharge) { // Process next charge - if (currentCharge.remainingTime > 0.0) { - currentCharge.remainingTime -= this.root.dynamicTickrate.deltaSeconds; - if (currentCharge.remainingTime < 0.0) { - // Add bonus time, this is the time we spent too much - processorComp.bonusTime += -currentCharge.remainingTime; - } + if (currentCharge.remainingProgress > 0.0) { + currentCharge.remainingProgress -= progressGrowth; } // Check if it finished - if (currentCharge.remainingTime <= 0.0) { + if (currentCharge.remainingProgress <= 0.0) { const itemsToEject = currentCharge.items; // Go over all items and try to eject them @@ -286,16 +287,10 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } // Queue Charge - const baseSpeed = this.root.hubGoals.getProcessorBaseSpeed(processorComp.type); - const originalTime = 1 / baseSpeed; - - const bonusTimeToApply = Math.min(originalTime, processorComp.bonusTime); - const timeToProcess = originalTime - bonusTimeToApply; - - processorComp.bonusTime -= bonusTimeToApply; + const progress = this.root.hubGoals.getProcessingProgress(processorComp.type); processorComp.ongoingCharges.push({ items: outItems, - remainingTime: timeToProcess, + remainingProgress: progress, // + Math.min(extra progress' of inputs) }); processorComp.inputSlots.clear(); From 8dcb5faf5f7562ed646c1bcec8f74e44f9427c9a Mon Sep 17 00:00:00 2001 From: Bagel03 <70449196+Bagel03@users.noreply.github.com> Date: Sun, 23 Jan 2022 11:14:03 -0500 Subject: [PATCH 110/129] Bind `this` for method overriding JSDoc (#1352) --- src/js/mods/mod_interface.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js index e3b9e59b..195c005b 100644 --- a/src/js/mods/mod_interface.js +++ b/src/js/mods/mod_interface.js @@ -31,6 +31,12 @@ import { BaseHUDPart } from "../game/hud/base_hud_part"; * @typedef {{new(...args: any[]): any, prototype: any}} constructable */ +/** + * @template {(...args: any) => any} F The function + * @template {object} T The value of this + * @typedef {(this: T, ...args: Parameters) => ReturnType} bindThis + */ + /** * @template {(...args: any[]) => any} F * @template P @@ -400,7 +406,7 @@ export class ModInterface { * @template {extendsPrams} O the method that will override the old one * @param {C} classHandle * @param {M} methodName - * @param {beforePrams} override + * @param {bindThis, InstanceType>} override */ replaceMethod(classHandle, methodName, override) { const oldMethod = classHandle.prototype[methodName]; @@ -418,7 +424,7 @@ export class ModInterface { * @template {extendsPrams} O the method that will run before the old one * @param {C} classHandle * @param {M} methodName - * @param {O} executeBefore + * @param {bindThis>} executeBefore */ runBeforeMethod(classHandle, methodName, executeBefore) { const oldHandle = classHandle.prototype[methodName]; @@ -437,7 +443,7 @@ export class ModInterface { * @template {extendsPrams} O the method that will run before the old one * @param {C} classHandle * @param {M} methodName - * @param {O} executeAfter + * @param {bindThis>} executeAfter */ runAfterMethod(classHandle, methodName, executeAfter) { const oldHandle = classHandle.prototype[methodName]; From 431453f1a2db1977bd5b50ffc6c9cdb366111d4e Mon Sep 17 00:00:00 2001 From: Emerald Block <69981203+EmeraldBlock@users.noreply.github.com> Date: Sun, 23 Jan 2022 10:14:24 -0600 Subject: [PATCH 111/129] fix entity debugger reaching HTML elements (#1353) --- src/js/game/hud/parts/entity_debugger.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/js/game/hud/parts/entity_debugger.js b/src/js/game/hud/parts/entity_debugger.js index 640ad4d6..debd456d 100644 --- a/src/js/game/hud/parts/entity_debugger.js +++ b/src/js/game/hud/parts/entity_debugger.js @@ -94,11 +94,12 @@ export class HUDEntityDebugger extends BaseHUDPart {
`; for (const property in val) { - const isRoot = val[property] == this.root; - const isRecursive = recursion.includes(val[property]); - - let hiddenValue = isRoot ? "" : null; - if (isRecursive) { + let hiddenValue = null; + if (val[property] == this.root) { + hiddenValue = ""; + } else if (val[property] instanceof Node) { + hiddenValue = `<${val[property].constructor.name}>`; + } else if (recursion.includes(val[property])) { // Avoid recursion by not "expanding" object more than once hiddenValue = ""; } From 5a310629c0670dcc9013167115bd50a20ea01260 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Sun, 23 Jan 2022 17:04:05 +0000 Subject: [PATCH 112/129] Undo unnecesary renaming --- src/js/core/config.js | 2 +- src/js/game/belt_path.js | 16 ++++------------ src/js/game/buildings/balancer.js | 2 +- src/js/game/buildings/cutter.js | 2 +- src/js/game/buildings/mixer.js | 2 +- src/js/game/buildings/painter.js | 6 +++--- src/js/game/buildings/rotater.js | 6 +++--- src/js/game/buildings/stacker.js | 2 +- src/js/game/hub_goals.js | 6 +++--- 9 files changed, 18 insertions(+), 26 deletions(-) diff --git a/src/js/core/config.js b/src/js/core/config.js index 754bd7fc..602e0c82 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -87,7 +87,7 @@ export const globalConfig = { puzzleMaxBoundsSize: 20, puzzleValidationDurationSeconds: 30, - buildingAmountsToBelt: { + buildingRatios: { cutter: 4, cutterQuad: 4, painter: 6, diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js index 4b274092..c8895d3e 100644 --- a/src/js/game/belt_path.js +++ b/src/js/game/belt_path.js @@ -134,15 +134,12 @@ export class BeltPath extends BasicSerializableObject { */ tryAcceptItem(item, startProgress = 0) { if (this.spacingToFirstItem >= globalConfig.itemSpacingOnBelts) { - // *Never* cap start progress, or if an item moves more than a belt in a tick, it breaks - // instead return false if the start progress is too much + // First, compute how much progress we can make *at max* const maxProgress = Math.max(0, this.spacingToFirstItem - globalConfig.itemSpacingOnBelts); - if (startProgress > maxProgress) { - return false; - } + const initialProgress = Math.min(maxProgress, startProgress); - this.items.unshift([this.spacingToFirstItem - startProgress, item]); - this.spacingToFirstItem = startProgress; + this.items.unshift([this.spacingToFirstItem - initialProgress, item]); + this.spacingToFirstItem = initialProgress; if (G_IS_DEV && globalConfig.debug.checkBeltPaths) { this.debug_checkIntegrity("accept-item"); @@ -273,11 +270,6 @@ export class BeltPath extends BasicSerializableObject { const matchingDirection = enumInvertedDirections[ejectingDirection]; return function (item, startProgress = 0.0) { - // storage has to have its own duplicated logic, as it's the ONLY building which the acceptor can't filter for it - const storageComp = targetEntity.components.Storage; - if (storageComp && !storageComp.canAcceptItem(item)) { - return false; - } if (targetAcceptorComp.tryAcceptItem(matchingSlotIndex, matchingDirection, item, startProgress)) { return true; } diff --git a/src/js/game/buildings/balancer.js b/src/js/game/buildings/balancer.js index 3af03e16..d87c0a46 100644 --- a/src/js/game/buildings/balancer.js +++ b/src/js/game/buildings/balancer.js @@ -104,7 +104,7 @@ export class MetaBalancerBuilding extends MetaBuilding { speedMultiplier = 1; } - const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.balancer) * speedMultiplier; + const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.balancer) * speedMultiplier; return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } diff --git a/src/js/game/buildings/cutter.js b/src/js/game/buildings/cutter.js index 5717b702..21acdaa0 100644 --- a/src/js/game/buildings/cutter.js +++ b/src/js/game/buildings/cutter.js @@ -54,7 +54,7 @@ export class MetaCutterBuilding extends MetaBuilding { if (root.gameMode.throughputDoesNotMatter()) { return []; } - const speed = root.hubGoals.getProcessingSpeed( + const speed = root.hubGoals.getProcessorBaseSpeed( variant === enumCutterVariants.quad ? enumItemProcessorTypes.cutterQuad : enumItemProcessorTypes.cutter diff --git a/src/js/game/buildings/mixer.js b/src/js/game/buildings/mixer.js index 527de3ea..de1665c4 100644 --- a/src/js/game/buildings/mixer.js +++ b/src/js/game/buildings/mixer.js @@ -47,7 +47,7 @@ export class MetaMixerBuilding extends MetaBuilding { if (root.gameMode.throughputDoesNotMatter()) { return []; } - const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.mixer); + const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.mixer); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } diff --git a/src/js/game/buildings/painter.js b/src/js/game/buildings/painter.js index a0839ef4..432973d0 100644 --- a/src/js/game/buildings/painter.js +++ b/src/js/game/buildings/painter.js @@ -73,15 +73,15 @@ export class MetaPainterBuilding extends MetaBuilding { switch (variant) { case defaultBuildingVariant: case enumPainterVariants.mirrored: { - const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.painter); + const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.painter); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } case enumPainterVariants.double: { - const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.painterDouble); + const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.painterDouble); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed, true)]]; } case enumPainterVariants.quad: { - const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.painterQuad); + const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.painterQuad); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } } diff --git a/src/js/game/buildings/rotater.js b/src/js/game/buildings/rotater.js index c8a28748..e1080767 100644 --- a/src/js/game/buildings/rotater.js +++ b/src/js/game/buildings/rotater.js @@ -70,15 +70,15 @@ export class MetaRotaterBuilding extends MetaBuilding { } switch (variant) { case defaultBuildingVariant: { - const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.rotater); + const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.rotater); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } case enumRotaterVariants.ccw: { - const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.rotaterCCW); + const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.rotaterCCW); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } case enumRotaterVariants.rotate180: { - const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.rotater180); + const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.rotater180); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } } diff --git a/src/js/game/buildings/stacker.js b/src/js/game/buildings/stacker.js index fdd6f5fb..f36ef248 100644 --- a/src/js/game/buildings/stacker.js +++ b/src/js/game/buildings/stacker.js @@ -40,7 +40,7 @@ export class MetaStackerBuilding extends MetaBuilding { if (root.gameMode.throughputDoesNotMatter()) { return []; } - const speed = root.hubGoals.getProcessingSpeed(enumItemProcessorTypes.stacker); + const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.stacker); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; } diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index e0e4608c..c96e2d79 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -555,13 +555,13 @@ export class HubGoals extends BasicSerializableObject { */ getProcessorTimeWithUpgrades(upgrade, processorType) { assert( - globalConfig.buildingAmountsToBelt[processorType], + globalConfig.buildingRatios[processorType], "Processor type has no speed set in globalConfig.buildingSpeeds: " + processorType ); // super complicated maths here, but it works const processorTime = - globalConfig.buildingAmountsToBelt[processorType] / globalConfig.beltSpeedItemsPerSecond; + globalConfig.buildingRatios[processorType] / globalConfig.beltSpeedItemsPerSecond; return processorTime / upgrade; } /** @@ -569,7 +569,7 @@ export class HubGoals extends BasicSerializableObject { * @param {enumItemProcessorTypes} processorType * @returns {number} process time in seconds */ - getProcessingSpeed(processorType) { + getProcessorBaseSpeed(processorType) { const time = this.getProcessingTime(processorType); if (!time) { return this.getBeltBaseSpeed(); From 6cfdca3e10748b3f696fe30918bed7543fc4b4fc Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Sun, 23 Jan 2022 20:23:51 +0000 Subject: [PATCH 113/129] Fix filter --- src/js/game/systems/filter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/game/systems/filter.js b/src/js/game/systems/filter.js index fcdd8d25..7f4c00d2 100644 --- a/src/js/game/systems/filter.js +++ b/src/js/game/systems/filter.js @@ -19,9 +19,9 @@ export class FilterSystem extends GameSystemWithFilter { const ejectorComp = entity.components.ItemEjector; // Take items from acceptor - const input = acceptorComp.completedInputs.get(0); + const input = acceptorComp.completedInputs[0]; if (input && this.tryAcceptItem(entity, input.item, input.extraProgress)) { - acceptorComp.completedInputs.delete(0); + acceptorComp.completedInputs = []; } // Output to ejector From 21df7583f1c5c3a878b1a919fb252edf679545c4 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Sun, 23 Jan 2022 20:30:41 +0000 Subject: [PATCH 114/129] save acceptor inputs to remove startup time on load --- src/js/game/components/item_acceptor.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index 0098d9d9..fa30d281 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -1,7 +1,9 @@ import { enumDirection, enumInvertedDirections, Vector } from "../../core/vector"; +import { types } from "../../savegame/serialization"; import { BaseItem } from "../base_item"; import { Component } from "../component"; import { Entity } from "../entity"; +import { typeItemSingleton } from "../item_resolver"; import { GameRoot } from "../root"; /** @@ -50,6 +52,25 @@ export class ItemAcceptorComponent extends Component { return "ItemAcceptor"; } + static getSchema() { + return { + inputs: types.array( + types.structured({ + slotIndex: types.uint, + item: typeItemSingleton, + animProgress: types.ufloat, + }) + ), + completedInputs: types.array( + types.structured({ + slotIndex: types.uint, + item: typeItemSingleton, + extraProgress: types.ufloat, + }) + ), + }; + } + /** * * @param {object} param0 From a00c3c6ef31ac52fc495e3b2d6316159f06c2dd2 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Mon, 24 Jan 2022 15:49:24 +0000 Subject: [PATCH 115/129] Fix bugs with ejector and minor changes to processor --- src/js/game/belt_path.js | 12 +++++++++--- src/js/game/components/item_acceptor.js | 5 +++++ src/js/game/components/item_processor.js | 3 ++- src/js/game/systems/item_ejector.js | 7 +++++-- src/js/game/systems/item_processor.js | 18 ++++++++++-------- 5 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js index fa65c11c..25a1b20c 100644 --- a/src/js/game/belt_path.js +++ b/src/js/game/belt_path.js @@ -130,13 +130,19 @@ export class BeltPath extends BasicSerializableObject { /** * Tries to accept the item * @param {BaseItem} item - * @param {number} startProgress */ - tryAcceptItem(item, startProgress = 0) { + tryAcceptItem(item) { if (this.spacingToFirstItem >= globalConfig.itemSpacingOnBelts) { + // So, since we already need one tick to accept this item we will add this directly. + // this means we are moving it forwards twice in one tick, but otherwise belts won't be full :( + const beltProgressPerTick = + this.root.hubGoals.getBeltBaseSpeed() * + this.root.dynamicTickrate.deltaSeconds * + globalConfig.itemSpacingOnBelts; + // First, compute how much progress we can make *at max* const maxProgress = Math.max(0, this.spacingToFirstItem - globalConfig.itemSpacingOnBelts); - const initialProgress = Math.min(maxProgress, startProgress); + const initialProgress = Math.min(maxProgress, beltProgressPerTick); this.items.unshift([this.spacingToFirstItem - initialProgress, item]); this.spacingToFirstItem = initialProgress; diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index fa30d281..0b492843 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -115,6 +115,11 @@ export class ItemAcceptorComponent extends Component { tryAcceptItem(slotIndex, item, startProgress = 0.0) { const slot = this.slots[slotIndex]; + for (let i = 0; i < this.inputs.length; i++) { + if (this.inputs[i].slotIndex == slotIndex) { + return false; + } + } for (let i = 0; i < this.completedInputs.length; i++) { if (this.completedInputs[i].slotIndex == slotIndex) { return false; diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index f5b412cd..35b63452 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -36,7 +36,8 @@ export const enumItemProcessorRequirements = { * }} EjectorItemToEject */ /** @typedef {{ - * remainingProgress: number, + * progress: number, + * targetProgress: number, * items: Array, * }} EjectorCharge * diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index 8968a383..8e0c94d3 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -180,7 +180,9 @@ export class ItemEjectorSystem extends GameSystemWithFilter { const destPath = sourceSlot.cachedBeltPath; if (destPath) { // Try passing the item over - if (destPath.tryAcceptItem(item, extraProgress)) { + // note - no extra progress is relevant here, as we have to push items up to the ones in front to ensure minimum spacing + // it's close enough though, and doesn't break at high speeds + if (destPath.tryAcceptItem(item)) { sourceSlot.item = null; } @@ -200,7 +202,8 @@ export class ItemEjectorSystem extends GameSystemWithFilter { targetAcceptorComp.tryAcceptItem(destSlot.index, item, extraProgress) ) { // unique duplicated code for storage - hacky :( - return true; + sourceSlot.item = null; + return; } if (targetAcceptorComp.tryAcceptItem(destSlot.index, item, extraProgress)) { // Handover successful, clear slot diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index a40403aa..12d7978b 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -91,16 +91,16 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const currentCharge = processorComp.currentCharge; if (currentCharge) { + const targetProgress = currentCharge.targetProgress; // Process next charge - if (currentCharge.remainingProgress > 0.0) { - currentCharge.remainingProgress -= progressGrowth; + if (currentCharge.progress < targetProgress) { + currentCharge.progress += progressGrowth; } // Check if it finished - but don't finish another charge if there are still items queued to eject, or we might keep backing up - if (currentCharge.remainingProgress <= 0.0 && processorComp.queuedEjects.length < 1) { + if (currentCharge.progress >= targetProgress && processorComp.queuedEjects.length < 1) { const itemsToEject = currentCharge.items; - const extraProgress = -currentCharge.remainingProgress; - console.log(extraProgress); + const extraProgress = currentCharge.progress - targetProgress; // Go over all items and try to eject them for (let j = 0; j < itemsToEject.length; ++j) { @@ -270,10 +270,12 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } // Queue Charge - const progress = this.root.hubGoals.getProcessingProgress(processorComp.type); + const targetProgress = this.root.hubGoals.getProcessingProgress(processorComp.type); + //console.log("target progress:" + targetProgress + ", type: " + processorComp.type); processorComp.currentCharge = { items: outItems, - remainingProgress: progress - extraProgress, + targetProgress, + progress: extraProgress, }; acceptorComp.completedInputs = []; @@ -546,7 +548,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { assert(hubComponent, "Hub item processor has no hub component"); // Hardcoded - for (let i = 0; i < payload.items.size; ++i) { + for (let i = 0; i < 16; ++i) { const item = /** @type {ShapeItem} */ (payload.items.get(i)); if (!item) { continue; From b9e09dfb3bb4d6ddf3b387fdfb18ee4b85b5fca3 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Mon, 24 Jan 2022 16:07:02 +0000 Subject: [PATCH 116/129] Fix trash achievement not counting all inputs --- src/js/game/systems/item_processor.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 12d7978b..6e44bb5b 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -423,7 +423,14 @@ export class ItemProcessorSystem extends GameSystemWithFilter { * @param {ProcessorImplementationPayload} payload */ process_TRASH(payload) { - payload.entity.root.signals.achievementCheck.dispatch(ACHIEVEMENTS.trash1000, 1); + // Hardcoded - 4 inputs + for (let i = 0; i < 4; ++i) { + const item = /** @type {ShapeItem} */ (payload.items.get(i)); + if (!item) { + continue; + } + payload.entity.root.signals.achievementCheck.dispatch(ACHIEVEMENTS.trash1000, 1); + } } /** @@ -547,7 +554,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const hubComponent = payload.entity.components.Hub; assert(hubComponent, "Hub item processor has no hub component"); - // Hardcoded + // Hardcoded - 16 inputs for (let i = 0; i < 16; ++i) { const item = /** @type {ShapeItem} */ (payload.items.get(i)); if (!item) { From b39d129152334f10970a8f0779b68b1af4bcfe76 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Tue, 25 Jan 2022 11:41:52 +0000 Subject: [PATCH 117/129] revert processor back to using time, and convert progress both ways --- src/js/game/components/item_acceptor.js | 2 +- src/js/game/components/item_processor.js | 6 ++-- src/js/game/hub_goals.js | 37 ++++++++++++++---------- src/js/game/systems/item_ejector.js | 23 +++++++++++++++ src/js/game/systems/item_processor.js | 32 ++++++++++---------- 5 files changed, 66 insertions(+), 34 deletions(-) diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index 0b492843..3f3a59eb 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -82,7 +82,7 @@ export class ItemAcceptorComponent extends Component { /** @type {ItemAcceptorInputs} */ this.inputs = []; /** @type {ItemAcceptorCompletedInputs} */ - this.completedInputs = []; // @SENSETODO does this need to be saved? + this.completedInputs = []; this.setSlots(slots); } diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index 35b63452..2d85b93f 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -30,17 +30,17 @@ export const enumItemProcessorRequirements = { /** * @typedef {{ * item: BaseItem, - * extraProgress?: number, + * extraProgress?: number * requiredSlot?: number, * preferredSlot?: number * }} EjectorItemToEject */ /** @typedef {{ - * progress: number, - * targetProgress: number, + * remainingTime: number, * items: Array, * }} EjectorCharge * + * * @typedef {{ * item: BaseItem * extraProgress: number diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index d1e0dda8..531a6643 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -509,9 +509,9 @@ export class HubGoals extends BasicSerializableObject { /** * Processor time to process * @param {enumItemProcessorTypes} processorType - * @returns {number} progress in tiles + * @returns {number} process time in seconds */ - getProcessingProgress(processorType) { + getProcessingTime(processorType) { if (this.root.gameMode.throughputDoesNotMatter()) { return 0; } @@ -531,20 +531,12 @@ export class HubGoals extends BasicSerializableObject { case enumItemProcessorTypes.painter: case enumItemProcessorTypes.painterDouble: case enumItemProcessorTypes.painterQuad: { - assert( - globalConfig.buildingRatios[processorType], - "Processor type has no speed set in globalConfig.buildingRatios: " + processorType - ); - return (globalConfig.buildingRatios[processorType] - 1) / this.upgradeImprovements.painting; + return this.getProcessorTimeWithUpgrades(this.upgradeImprovements.painting, processorType); } case enumItemProcessorTypes.cutter: case enumItemProcessorTypes.cutterQuad: case enumItemProcessorTypes.stacker: { - assert( - globalConfig.buildingRatios[processorType], - "Processor type has no speed set in globalConfig.buildingRatios: " + processorType - ); - return (globalConfig.buildingRatios[processorType] - 1) / this.upgradeImprovements.processors; + return this.getProcessorTimeWithUpgrades(this.upgradeImprovements.processors, processorType); } default: if (MOD_ITEM_PROCESSOR_SPEEDS[processorType]) { @@ -556,16 +548,31 @@ export class HubGoals extends BasicSerializableObject { return 0; } + /** + * @param {number} upgrade + * @param {enumItemProcessorTypes} processorType + */ + getProcessorTimeWithUpgrades(upgrade, processorType) { + assert( + globalConfig.buildingRatios[processorType], + "Processor type has no speed set in globalConfig.buildingSpeeds: " + processorType + ); + + const processorTime = + globalConfig.buildingRatios[processorType] / globalConfig.beltSpeedItemsPerSecond; + return processorTime / upgrade; + } + /** * Processor speed * @param {enumItemProcessorTypes} processorType * @returns {number} items/sec */ getProcessorBaseSpeed(processorType) { - const progress = this.getProcessingProgress(processorType); - if (!progress) { + const time = this.getProcessingTime(processorType); + if (!time) { return this.getBeltBaseSpeed(); } - return globalConfig.beltSpeedItemsPerSecond / (progress + 1); + return 1 / time; } } diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index 8e0c94d3..c780f1a7 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -163,6 +163,24 @@ export class ItemEjectorSystem extends GameSystemWithFilter { if (sourceSlot.progress < maxProgress) { // Advance items on the slot sourceSlot.progress += progressGrowth; + + // limit the progress to stop items being too close + if (sourceSlot.cachedTargetEntity && sourceSlot.cachedDestSlot) { + const acceptorComp = sourceSlot.cachedTargetEntity.components.ItemAcceptor; + let acceptorInput = null; + for (let i = 0; i < acceptorComp.inputs.length; i++) { + const input = acceptorComp.inputs[i]; + if (input.slotIndex == sourceSlot.cachedDestSlot.index) { + acceptorInput = input; + } + } + + if (acceptorInput) { + const maxProgress = + 0.5 + acceptorInput.animProgress - globalConfig.itemSpacingOnBelts; + sourceSlot.progress = Math.min(maxProgress, sourceSlot.progress); + } + } } if (G_IS_DEV && globalConfig.debug.disableEjectorProcessing) { @@ -293,6 +311,11 @@ export class ItemEjectorSystem extends GameSystemWithFilter { progress = Math.min(maxProgress, progress); } + // Skip if the item would barely be visible + if (progress < 0.05) { + continue; + } + const realPosition = staticComp.localTileToWorld(slot.pos); if (!chunk.tileSpaceRectangle.containsPoint(realPosition.x, realPosition.y)) { // Not within this chunk diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 6e44bb5b..c4ead3af 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -71,11 +71,6 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } update() { - const progressGrowth = - this.root.dynamicTickrate.deltaSeconds * - globalConfig.beltSpeedItemsPerSecond * - globalConfig.itemSpacingOnBelts; - for (let i = 0; i < this.allEntities.length; ++i) { const entity = this.allEntities[i]; @@ -91,16 +86,19 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const currentCharge = processorComp.currentCharge; if (currentCharge) { - const targetProgress = currentCharge.targetProgress; // Process next charge - if (currentCharge.progress < targetProgress) { - currentCharge.progress += progressGrowth; + if (currentCharge.remainingTime > 0.0) { + currentCharge.remainingTime -= this.root.dynamicTickrate.deltaSeconds; } - // Check if it finished - but don't finish another charge if there are still items queued to eject, or we might keep backing up - if (currentCharge.progress >= targetProgress && processorComp.queuedEjects.length < 1) { + // Check if it finished + if (currentCharge.remainingTime <= 0.0 && processorComp.queuedEjects.length < 1) { const itemsToEject = currentCharge.items; - const extraProgress = currentCharge.progress - targetProgress; + //@SENSETODO not sure this is correct + const extraProgress = + -currentCharge.remainingTime * + globalConfig.beltSpeedItemsPerSecond * + globalConfig.itemSpacingOnBelts; // Go over all items and try to eject them for (let j = 0; j < itemsToEject.length; ++j) { @@ -249,6 +247,10 @@ export class ItemProcessorSystem extends GameSystemWithFilter { extraProgress = Math.max(extraProgress, input.extraProgress); } + //@SENSETODO not sure if this is right + const extraTime = + extraProgress / (globalConfig.beltSpeedItemsPerSecond * globalConfig.itemSpacingOnBelts); + const outItems = []; /** @type {function(ProcessorImplementationPayload) : void} */ @@ -270,12 +272,12 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } // Queue Charge - const targetProgress = this.root.hubGoals.getProcessingProgress(processorComp.type); - //console.log("target progress:" + targetProgress + ", type: " + processorComp.type); + const originalTime = this.root.hubGoals.getProcessingTime(processorComp.type); + const timeToProcess = originalTime - extraTime; + processorComp.currentCharge = { items: outItems, - targetProgress, - progress: extraProgress, + remainingTime: timeToProcess, }; acceptorComp.completedInputs = []; From 9f7c95aec3d7f767964e4babef2757e568318202 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Tue, 25 Jan 2022 13:41:32 +0000 Subject: [PATCH 118/129] Minor changes for processor consistency --- src/js/game/components/item_processor.js | 6 +++++ src/js/game/systems/item_ejector.js | 18 --------------- src/js/game/systems/item_processor.js | 28 +++++++++++++----------- 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index 2d85b93f..be461899 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -104,6 +104,12 @@ export class ItemProcessorComponent extends Component { */ this.currentCharge = null; + /** + * How much processing time we have left from the last tick + * @type {number} + */ + this.bonusTime = 0; + /** * @type {Array} */ diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index c780f1a7..c2c24245 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -163,24 +163,6 @@ export class ItemEjectorSystem extends GameSystemWithFilter { if (sourceSlot.progress < maxProgress) { // Advance items on the slot sourceSlot.progress += progressGrowth; - - // limit the progress to stop items being too close - if (sourceSlot.cachedTargetEntity && sourceSlot.cachedDestSlot) { - const acceptorComp = sourceSlot.cachedTargetEntity.components.ItemAcceptor; - let acceptorInput = null; - for (let i = 0; i < acceptorComp.inputs.length; i++) { - const input = acceptorComp.inputs[i]; - if (input.slotIndex == sourceSlot.cachedDestSlot.index) { - acceptorInput = input; - } - } - - if (acceptorInput) { - const maxProgress = - 0.5 + acceptorInput.animProgress - globalConfig.itemSpacingOnBelts; - sourceSlot.progress = Math.min(maxProgress, sourceSlot.progress); - } - } } if (G_IS_DEV && globalConfig.debug.disableEjectorProcessing) { diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index c4ead3af..1686615e 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -18,6 +18,7 @@ import { ShapeItem } from "../items/shape_item"; * * @typedef {{ * item: BaseItem, + * extraProgress?: number, * preferredSlot?: number, * requiredSlot?: number, * doNotTrack?: boolean @@ -89,22 +90,19 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // Process next charge if (currentCharge.remainingTime > 0.0) { currentCharge.remainingTime -= this.root.dynamicTickrate.deltaSeconds; + if (currentCharge.remainingTime < 0.0) { + // Add bonus time, this is the time we spent too much + processorComp.bonusTime += -currentCharge.remainingTime; + } } // Check if it finished if (currentCharge.remainingTime <= 0.0 && processorComp.queuedEjects.length < 1) { const itemsToEject = currentCharge.items; - //@SENSETODO not sure this is correct - const extraProgress = - -currentCharge.remainingTime * - globalConfig.beltSpeedItemsPerSecond * - globalConfig.itemSpacingOnBelts; // Go over all items and try to eject them for (let j = 0; j < itemsToEject.length; ++j) { - const items = itemsToEject[j]; - items.extraProgress = extraProgress; - processorComp.queuedEjects.push(items); + processorComp.queuedEjects.push(itemsToEject[j]); } processorComp.currentCharge = null; @@ -247,10 +245,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { extraProgress = Math.max(extraProgress, input.extraProgress); } - //@SENSETODO not sure if this is right - const extraTime = - extraProgress / (globalConfig.beltSpeedItemsPerSecond * globalConfig.itemSpacingOnBelts); - + /** @type {Array} */ const outItems = []; /** @type {function(ProcessorImplementationPayload) : void} */ @@ -269,11 +264,18 @@ export class ItemProcessorSystem extends GameSystemWithFilter { if (!outItems[i].doNotTrack) { this.root.signals.itemProduced.dispatch(outItems[i].item); } + + // also set extra progress + outItems[i].extraProgress = extraProgress; } // Queue Charge const originalTime = this.root.hubGoals.getProcessingTime(processorComp.type); - const timeToProcess = originalTime - extraTime; + + const bonusTimeToApply = Math.min(originalTime, processorComp.bonusTime); + const timeToProcess = originalTime - bonusTimeToApply; + + processorComp.bonusTime -= bonusTimeToApply; processorComp.currentCharge = { items: outItems, From cd72da5023a40efd8ef6fa122e70af9283f0cc0d Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Tue, 25 Jan 2022 18:20:01 +0000 Subject: [PATCH 119/129] Fix throughput at high speeds and allow multiple items to be stored in an acceptor slot before it's full --- src/js/game/belt_path.js | 5 +++-- src/js/game/components/item_acceptor.js | 15 ++++++++++++--- src/js/game/systems/item_ejector.js | 4 +--- src/js/game/systems/item_processor.js | 14 ++++++++++++-- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js index 25a1b20c..198b49da 100644 --- a/src/js/game/belt_path.js +++ b/src/js/game/belt_path.js @@ -130,8 +130,9 @@ export class BeltPath extends BasicSerializableObject { /** * Tries to accept the item * @param {BaseItem} item + * @param {number} extraProgress */ - tryAcceptItem(item) { + tryAcceptItem(item, extraProgress = 0) { if (this.spacingToFirstItem >= globalConfig.itemSpacingOnBelts) { // So, since we already need one tick to accept this item we will add this directly. // this means we are moving it forwards twice in one tick, but otherwise belts won't be full :( @@ -142,7 +143,7 @@ export class BeltPath extends BasicSerializableObject { // First, compute how much progress we can make *at max* const maxProgress = Math.max(0, this.spacingToFirstItem - globalConfig.itemSpacingOnBelts); - const initialProgress = Math.min(maxProgress, beltProgressPerTick); + const initialProgress = Math.min(maxProgress, beltProgressPerTick + extraProgress); this.items.unshift([this.spacingToFirstItem - initialProgress, item]); this.spacingToFirstItem = initialProgress; diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index 3f3a59eb..ea25b231 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -75,8 +75,9 @@ export class ItemAcceptorComponent extends Component { * * @param {object} param0 * @param {Array} param0.slots The slots from which we accept items + * @param {number=} param0.maxSlotInputs The maximum amount of items one slot can accept before it is full */ - constructor({ slots = [] }) { + constructor({ slots = [], maxSlotInputs = 2 }) { super(); /** @type {ItemAcceptorInputs} */ @@ -84,6 +85,9 @@ export class ItemAcceptorComponent extends Component { /** @type {ItemAcceptorCompletedInputs} */ this.completedInputs = []; this.setSlots(slots); + + // setting this to 1 will cause throughput issues at very high speeds + this.maxSlotInputs = maxSlotInputs; } /** @@ -115,17 +119,22 @@ export class ItemAcceptorComponent extends Component { tryAcceptItem(slotIndex, item, startProgress = 0.0) { const slot = this.slots[slotIndex]; + let existingInputs = 0; for (let i = 0; i < this.inputs.length; i++) { if (this.inputs[i].slotIndex == slotIndex) { - return false; + existingInputs++; } } for (let i = 0; i < this.completedInputs.length; i++) { if (this.completedInputs[i].slotIndex == slotIndex) { - return false; + existingInputs++; } } + if (existingInputs >= this.maxSlotInputs) { + return false; + } + if (slot.filter && slot.filter != item.getItemType()) { return false; } diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index c2c24245..66903b4b 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -180,9 +180,7 @@ export class ItemEjectorSystem extends GameSystemWithFilter { const destPath = sourceSlot.cachedBeltPath; if (destPath) { // Try passing the item over - // note - no extra progress is relevant here, as we have to push items up to the ones in front to ensure minimum spacing - // it's close enough though, and doesn't break at high speeds - if (destPath.tryAcceptItem(item)) { + if (destPath.tryAcceptItem(item, extraProgress)) { sourceSlot.item = null; } diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 1686615e..cbc3f204 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -232,7 +232,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { const acceptorComp = entity.components.ItemAcceptor; const processorComp = entity.components.ItemProcessor; - // First, take inputs - but only ones that are completed + // First, take inputs - but only one from each const inputs = acceptorComp.completedInputs; // split inputs efficiently @@ -282,7 +282,17 @@ export class ItemProcessorSystem extends GameSystemWithFilter { remainingTime: timeToProcess, }; - acceptorComp.completedInputs = []; + // only remove one item from each slot - we don't want to delete extra items! + let usedSlots = []; + for (let i = 0; i < acceptorComp.completedInputs.length; i++) { + const slot = acceptorComp.completedInputs[i].slotIndex; + + if (!usedSlots.includes(slot)) { + usedSlots.push(slot); + acceptorComp.completedInputs.splice(i); + i--; + } + } } /** From cb4ccdbb79212406129023efc57feddd07464a17 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Tue, 25 Jan 2022 18:30:14 +0000 Subject: [PATCH 120/129] Prevent filter and tunnel from deleting extra acceptor items --- src/js/game/systems/filter.js | 7 +++---- src/js/game/systems/underground_belt.js | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/js/game/systems/filter.js b/src/js/game/systems/filter.js index 7f4c00d2..09a68174 100644 --- a/src/js/game/systems/filter.js +++ b/src/js/game/systems/filter.js @@ -4,8 +4,6 @@ import { Entity } from "../entity"; import { GameSystemWithFilter } from "../game_system_with_filter"; import { BOOL_TRUE_SINGLETON } from "../items/boolean_item"; -const MAX_ITEMS_IN_QUEUE = 2; - export class FilterSystem extends GameSystemWithFilter { constructor(root) { super(root, [FilterComponent]); @@ -21,7 +19,8 @@ export class FilterSystem extends GameSystemWithFilter { // Take items from acceptor const input = acceptorComp.completedInputs[0]; if (input && this.tryAcceptItem(entity, input.item, input.extraProgress)) { - acceptorComp.completedInputs = []; + // only remove one + acceptorComp.completedInputs.splice(0); } // Output to ejector @@ -64,7 +63,7 @@ export class FilterSystem extends GameSystemWithFilter { listToCheck = filterComp.pendingItemsToReject; } - if (listToCheck.length >= MAX_ITEMS_IN_QUEUE) { + if (!listToCheck.length) { // Busy return false; } diff --git a/src/js/game/systems/underground_belt.js b/src/js/game/systems/underground_belt.js index a3b92825..45b39ff5 100644 --- a/src/js/game/systems/underground_belt.js +++ b/src/js/game/systems/underground_belt.js @@ -323,7 +323,7 @@ export class UndergroundBeltSystem extends GameSystemWithFilter { input.extraProgress ) ) { - acceptorComp.completedInputs = []; + acceptorComp.completedInputs.splice(0); } } } From 212c880e75ec498be8b2893b089733ff2c32d5b1 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Tue, 25 Jan 2022 20:20:00 +0000 Subject: [PATCH 121/129] Actually fix filter and tunnel --- src/js/game/systems/filter.js | 3 +-- src/js/game/systems/underground_belt.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/js/game/systems/filter.js b/src/js/game/systems/filter.js index 09a68174..547b3e6c 100644 --- a/src/js/game/systems/filter.js +++ b/src/js/game/systems/filter.js @@ -19,8 +19,7 @@ export class FilterSystem extends GameSystemWithFilter { // Take items from acceptor const input = acceptorComp.completedInputs[0]; if (input && this.tryAcceptItem(entity, input.item, input.extraProgress)) { - // only remove one - acceptorComp.completedInputs.splice(0); + acceptorComp.completedInputs.shift(); } // Output to ejector diff --git a/src/js/game/systems/underground_belt.js b/src/js/game/systems/underground_belt.js index 45b39ff5..aa3df6cc 100644 --- a/src/js/game/systems/underground_belt.js +++ b/src/js/game/systems/underground_belt.js @@ -323,7 +323,7 @@ export class UndergroundBeltSystem extends GameSystemWithFilter { input.extraProgress ) ) { - acceptorComp.completedInputs.splice(0); + acceptorComp.completedInputs.shift(); } } } From b5eb759b690587c054e021fb7f0fc5386074e933 Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Wed, 26 Jan 2022 15:10:05 +0000 Subject: [PATCH 122/129] Fix filter and item acceptor drawing --- src/js/game/systems/filter.js | 4 +++- src/js/game/systems/item_acceptor.js | 2 +- src/js/game/systems/item_processor.js | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/js/game/systems/filter.js b/src/js/game/systems/filter.js index 547b3e6c..e8008bf8 100644 --- a/src/js/game/systems/filter.js +++ b/src/js/game/systems/filter.js @@ -4,6 +4,8 @@ import { Entity } from "../entity"; import { GameSystemWithFilter } from "../game_system_with_filter"; import { BOOL_TRUE_SINGLETON } from "../items/boolean_item"; +const MAX_ITEMS_IN_QUEUE = 2; + export class FilterSystem extends GameSystemWithFilter { constructor(root) { super(root, [FilterComponent]); @@ -62,7 +64,7 @@ export class FilterSystem extends GameSystemWithFilter { listToCheck = filterComp.pendingItemsToReject; } - if (!listToCheck.length) { + if (listToCheck.length >= MAX_ITEMS_IN_QUEUE) { // Busy return false; } diff --git a/src/js/game/systems/item_acceptor.js b/src/js/game/systems/item_acceptor.js index 5b3ed3ca..db9bc7e1 100644 --- a/src/js/game/systems/item_acceptor.js +++ b/src/js/game/systems/item_acceptor.js @@ -70,7 +70,7 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { if (!chunk.tileSpaceRectangle.containsPoint(realSlotPos.x, realSlotPos.y)) { // Not within this chunk - return; + continue; } const fadeOutDirection = diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index cbc3f204..3f700dff 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -285,11 +285,11 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // only remove one item from each slot - we don't want to delete extra items! let usedSlots = []; for (let i = 0; i < acceptorComp.completedInputs.length; i++) { - const slot = acceptorComp.completedInputs[i].slotIndex; + const index = acceptorComp.completedInputs[i].slotIndex; - if (!usedSlots.includes(slot)) { - usedSlots.push(slot); - acceptorComp.completedInputs.splice(i); + if (!usedSlots.includes(index)) { + usedSlots.push(index); + acceptorComp.completedInputs.splice(i, 1); i--; } } From 41841651db62a82fd79127dc73818295d349eae2 Mon Sep 17 00:00:00 2001 From: tobspr Date: Tue, 1 Feb 2022 13:59:59 +0100 Subject: [PATCH 123/129] Store mods in savegame and show warning when it differs --- mod_examples/base.js | 4 ++ mod_examples/custom_css.js | 4 ++ mod_examples/custom_drawing.js | 4 ++ mod_examples/custom_keybinding.js | 4 ++ mod_examples/custom_theme.js | 4 ++ mod_examples/modify_theme.js | 4 ++ mod_examples/modify_ui.js | 4 ++ mod_examples/replace_builtin_sprites.js | 4 ++ mod_examples/translations.js | 4 ++ src/css/ingame_hud/dialogs.scss | 31 +++++++++++ src/js/game/game_system_manager.js | 2 +- src/js/mods/modloader.js | 48 +++++++++++++++- src/js/savegame/savegame.js | 10 +++- .../savegame/savegame_interface_registry.js | 2 + src/js/savegame/savegame_typedefs.js | 9 +++ src/js/savegame/schemas/1010.js | 24 ++++++++ src/js/savegame/schemas/1010.json | 5 ++ src/js/states/main_menu.js | 55 +++++++++++++++++++ src/js/states/mods.js | 2 +- translations/base-en.yaml | 9 +++ 20 files changed, 229 insertions(+), 4 deletions(-) create mode 100644 src/js/savegame/schemas/1010.js create mode 100644 src/js/savegame/schemas/1010.json diff --git a/mod_examples/base.js b/mod_examples/base.js index 09e12f61..f76ded9b 100644 --- a/mod_examples/base.js +++ b/mod_examples/base.js @@ -7,6 +7,10 @@ const METADATA = { id: "base", description: "The most basic mod", minimumGameVersion: ">=1.5.0", + + // You can specify this parameter if savegames will still work + // after your mod has been uninstalled + doesNotAffectSavegame: true, }; class Mod extends shapez.Mod { diff --git a/mod_examples/custom_css.js b/mod_examples/custom_css.js index dce316c5..0d28fda7 100644 --- a/mod_examples/custom_css.js +++ b/mod_examples/custom_css.js @@ -7,6 +7,10 @@ const METADATA = { id: "custom-css", description: "Shows how to add custom css", minimumGameVersion: ">=1.5.0", + + // You can specify this parameter if savegames will still work + // after your mod has been uninstalled + doesNotAffectSavegame: true, }; class Mod extends shapez.Mod { diff --git a/mod_examples/custom_drawing.js b/mod_examples/custom_drawing.js index e1c25b30..2dccab2d 100644 --- a/mod_examples/custom_drawing.js +++ b/mod_examples/custom_drawing.js @@ -7,6 +7,10 @@ const METADATA = { id: "base", description: "Displays an indicator on every item processing building when its working", minimumGameVersion: ">=1.5.0", + + // You can specify this parameter if savegames will still work + // after your mod has been uninstalled + doesNotAffectSavegame: true, }; class ItemProcessorStatusGameSystem extends shapez.GameSystem { diff --git a/mod_examples/custom_keybinding.js b/mod_examples/custom_keybinding.js index 0a6b11fc..0109833c 100644 --- a/mod_examples/custom_keybinding.js +++ b/mod_examples/custom_keybinding.js @@ -7,6 +7,10 @@ const METADATA = { id: "base", description: "Shows how to add a new keybinding", minimumGameVersion: ">=1.5.0", + + // You can specify this parameter if savegames will still work + // after your mod has been uninstalled + doesNotAffectSavegame: true, }; class Mod extends shapez.Mod { diff --git a/mod_examples/custom_theme.js b/mod_examples/custom_theme.js index cc4c9de8..a70d949f 100644 --- a/mod_examples/custom_theme.js +++ b/mod_examples/custom_theme.js @@ -7,6 +7,10 @@ const METADATA = { id: "custom-theme", description: "Shows how to add a custom game theme", minimumGameVersion: ">=1.5.0", + + // You can specify this parameter if savegames will still work + // after your mod has been uninstalled + doesNotAffectSavegame: true, }; class Mod extends shapez.Mod { diff --git a/mod_examples/modify_theme.js b/mod_examples/modify_theme.js index 4bc9be34..de7f0ad2 100644 --- a/mod_examples/modify_theme.js +++ b/mod_examples/modify_theme.js @@ -7,6 +7,10 @@ const METADATA = { id: "modify-theme", description: "Shows how to modify builtin themes", minimumGameVersion: ">=1.5.0", + + // You can specify this parameter if savegames will still work + // after your mod has been uninstalled + doesNotAffectSavegame: true, }; class Mod extends shapez.Mod { diff --git a/mod_examples/modify_ui.js b/mod_examples/modify_ui.js index 0b2d1341..4beb403d 100644 --- a/mod_examples/modify_ui.js +++ b/mod_examples/modify_ui.js @@ -7,6 +7,10 @@ const METADATA = { id: "modify-ui", description: "Shows how to modify a builtin game state, in this case the main menu", minimumGameVersion: ">=1.5.0", + + // You can specify this parameter if savegames will still work + // after your mod has been uninstalled + doesNotAffectSavegame: true, }; class Mod extends shapez.Mod { diff --git a/mod_examples/replace_builtin_sprites.js b/mod_examples/replace_builtin_sprites.js index 885846e7..6e88b7fb 100644 --- a/mod_examples/replace_builtin_sprites.js +++ b/mod_examples/replace_builtin_sprites.js @@ -7,6 +7,10 @@ const METADATA = { id: "replace-builtin-sprites", description: "Shows how to replace builtin sprites", minimumGameVersion: ">=1.5.0", + + // You can specify this parameter if savegames will still work + // after your mod has been uninstalled + doesNotAffectSavegame: true, }; class Mod extends shapez.Mod { diff --git a/mod_examples/translations.js b/mod_examples/translations.js index 2f3a4015..6b9c708e 100644 --- a/mod_examples/translations.js +++ b/mod_examples/translations.js @@ -7,6 +7,10 @@ const METADATA = { id: "translations", description: "Shows how to add and modify translations", minimumGameVersion: ">=1.5.0", + + // You can specify this parameter if savegames will still work + // after your mod has been uninstalled + doesNotAffectSavegame: true, }; class Mod extends shapez.Mod { diff --git a/src/css/ingame_hud/dialogs.scss b/src/css/ingame_hud/dialogs.scss index cc742d42..6a93ceb7 100644 --- a/src/css/ingame_hud/dialogs.scss +++ b/src/css/ingame_hud/dialogs.scss @@ -169,6 +169,10 @@ margin: 1px 0; } + h3 { + @include S(margin-top, 10px); + } + input { background: #eee; color: #333438; @@ -214,6 +218,33 @@ } } } + + .dialogModsMod { + background: rgba(0, 0, 0, 0.05); + @include S(padding, 5px); + @include S(margin, 10px, 0); + @include S(border-radius, $globalBorderRadius); + display: grid; + grid-template-columns: 1fr D(100px); + + @include DarkThemeOverride { + background: rgba(0, 0, 0, 0.2); + } + + button { + grid-column: 2 / 3; + grid-row: 1 / 3; + align-self: start; + } + + .version { + @include SuperSmallText; + opacity: 0.5; + } + + .name { + } + } } > .buttons { diff --git a/src/js/game/game_system_manager.js b/src/js/game/game_system_manager.js index f2d44e52..a799b42a 100644 --- a/src/js/game/game_system_manager.js +++ b/src/js/game/game_system_manager.js @@ -205,7 +205,7 @@ export class GameSystemManager { addBefore("end"); for (const key in MODS_ADDITIONAL_SYSTEMS) { - if (!this.systems[key]) { + if (!this.systems[key] && key !== "end") { logger.error("Mod system not attached due to invalid 'before': ", key); } } diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 48911abd..f91a7b25 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -24,7 +24,8 @@ const LOG = createLogger("mods"); * description: string; * id: string; * minimumGameVersion?: string; - * settings: [] + * settings: []; + * doesNotAffectSavegame?: boolean * }} ModMetadata */ @@ -58,6 +59,51 @@ export class ModLoader { return this.mods.length > 0; } + /** + * + * @returns {import("../savegame/savegame_typedefs").SavegameStoredMods} + */ + getModsListForSavegame() { + return this.mods + .filter(mod => !mod.metadata.doesNotAffectSavegame) + .map(mod => ({ + id: mod.metadata.id, + version: mod.metadata.version, + website: mod.metadata.website, + name: mod.metadata.name, + author: mod.metadata.author, + })); + } + + /** + * + * @param {import("../savegame/savegame_typedefs").SavegameStoredMods} originalMods + */ + computeModDifference(originalMods) { + /** + * @type {import("../savegame/savegame_typedefs").SavegameStoredMods} + */ + let missing = []; + + const current = this.getModsListForSavegame(); + + originalMods.forEach(mod => { + for (let i = 0; i < current.length; ++i) { + const currentMod = current[i]; + if (currentMod.id === mod.id && currentMod.version === mod.version) { + current.splice(i, 1); + return; + } + } + missing.push(mod); + }); + + return { + missing, + extra: current, + }; + } + exposeExports() { if (G_IS_DEV || G_IS_STANDALONE) { let exports = {}; diff --git a/src/js/savegame/savegame.js b/src/js/savegame/savegame.js index 36ed884f..a2f27d0f 100644 --- a/src/js/savegame/savegame.js +++ b/src/js/savegame/savegame.js @@ -14,6 +14,8 @@ import { SavegameInterface_V1006 } from "./schemas/1006"; import { SavegameInterface_V1007 } from "./schemas/1007"; import { SavegameInterface_V1008 } from "./schemas/1008"; import { SavegameInterface_V1009 } from "./schemas/1009"; +import { MODS } from "../mods/modloader"; +import { SavegameInterface_V1010 } from "./schemas/1010"; const logger = createLogger("savegame"); @@ -54,7 +56,7 @@ export class Savegame extends ReadWriteProxy { * @returns {number} */ static getCurrentVersion() { - return 1009; + return 1010; } /** @@ -103,6 +105,7 @@ export class Savegame extends ReadWriteProxy { usedInverseRotater: false, }, lastUpdate: Date.now(), + mods: MODS.getModsListForSavegame(), }; } @@ -159,6 +162,10 @@ export class Savegame extends ReadWriteProxy { SavegameInterface_V1009.migrate1008to1009(data); data.version = 1009; } + if (data.version === 1009) { + SavegameInterface_V1010.migrate1009to1010(data); + data.version = 1010; + } return ExplainedResult.good(); } @@ -269,6 +276,7 @@ export class Savegame extends ReadWriteProxy { shadowData.dump = dump; shadowData.lastUpdate = new Date().getTime(); shadowData.version = this.getCurrentVersion(); + shadowData.mods = MODS.getModsListForSavegame(); const reader = this.getDumpReaderForExternalData(shadowData); diff --git a/src/js/savegame/savegame_interface_registry.js b/src/js/savegame/savegame_interface_registry.js index b4dc4233..089b15fc 100644 --- a/src/js/savegame/savegame_interface_registry.js +++ b/src/js/savegame/savegame_interface_registry.js @@ -10,6 +10,7 @@ import { SavegameInterface_V1006 } from "./schemas/1006"; import { SavegameInterface_V1007 } from "./schemas/1007"; import { SavegameInterface_V1008 } from "./schemas/1008"; import { SavegameInterface_V1009 } from "./schemas/1009"; +import { SavegameInterface_V1010 } from "./schemas/1010"; /** @type {Object.} */ export const savegameInterfaces = { @@ -23,6 +24,7 @@ export const savegameInterfaces = { 1007: SavegameInterface_V1007, 1008: SavegameInterface_V1008, 1009: SavegameInterface_V1009, + 1010: SavegameInterface_V1010, }; const logger = createLogger("savegame_interface_registry"); diff --git a/src/js/savegame/savegame_typedefs.js b/src/js/savegame/savegame_typedefs.js index c5e0e5c5..c72d83e6 100644 --- a/src/js/savegame/savegame_typedefs.js +++ b/src/js/savegame/savegame_typedefs.js @@ -2,6 +2,14 @@ * @typedef {import("../game/entity").Entity} Entity * * @typedef {{ + * id: string; + * version: string; + * website: string; + * name: string; + * author: string; + * }[]} SavegameStoredMods + * + * @typedef {{ * failedMam: boolean, * trashedCount: number, * usedInverseRotater: boolean @@ -25,6 +33,7 @@ * dump: SerializedGame, * stats: SavegameStats, * lastUpdate: number, + * mods: SavegameStoredMods * }} SavegameData * * @typedef {{ diff --git a/src/js/savegame/schemas/1010.js b/src/js/savegame/schemas/1010.js new file mode 100644 index 00000000..5453f3e2 --- /dev/null +++ b/src/js/savegame/schemas/1010.js @@ -0,0 +1,24 @@ +import { createLogger } from "../../core/logging.js"; +import { SavegameInterface_V1009 } from "./1009.js"; + +const schema = require("./1010.json"); +const logger = createLogger("savegame_interface/1010"); + +export class SavegameInterface_V1010 extends SavegameInterface_V1009 { + getVersion() { + return 1010; + } + + getSchemaUncached() { + return schema; + } + + /** + * @param {import("../savegame_typedefs.js").SavegameData} data + */ + static migrate1009to1010(data) { + logger.log("Migrating 1009 to 1010"); + + data.mods = []; + } +} diff --git a/src/js/savegame/schemas/1010.json b/src/js/savegame/schemas/1010.json new file mode 100644 index 00000000..6682f615 --- /dev/null +++ b/src/js/savegame/schemas/1010.json @@ -0,0 +1,5 @@ +{ + "type": "object", + "required": [], + "additionalProperties": true +} diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index 4d62f2ce..10e280b9 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -20,6 +20,7 @@ import { HUDModalDialogs } from "../game/hud/parts/modal_dialogs"; import { MODS } from "../mods/modloader"; import { PlatformWrapperImplBrowser } from "../platform/browser/wrapper"; import { PlatformWrapperImplElectron } from "../platform/electron/wrapper"; +import { Savegame } from "../savegame/savegame"; import { T } from "../translations"; const trim = require("trim"); @@ -615,11 +616,13 @@ export class MainMenuState extends GameState { const savegame = this.app.savegameMgr.getSavegameById(game.internalId); savegame .readAsync() + .then(() => this.checkForModDifferences(savegame)) .then(() => { this.moveToState("InGameState", { savegame, }); }) + .catch(err => { this.dialogs.showWarning( T.dialogs.gameLoadFailure.title, @@ -629,6 +632,57 @@ export class MainMenuState extends GameState { }); } + /** + * @param {Savegame} savegame + */ + checkForModDifferences(savegame) { + const difference = MODS.computeModDifference(savegame.currentData.mods); + + if (difference.missing.length === 0 && difference.extra.length === 0) { + return Promise.resolve(); + } + + let dialogHtml = T.dialogs.modsDifference.desc; + + /** + * + * @param {import("../savegame/savegame_typedefs").SavegameStoredMods[0]} mod + */ + function formatMod(mod) { + return ` +
+
${mod.name}
+
${T.mods.version} ${mod.version}
+ + +
+ `; + } + + if (difference.missing.length > 0) { + dialogHtml += "

" + T.dialogs.modsDifference.missingMods + "

"; + dialogHtml += difference.missing.map(formatMod).join("
"); + } + + if (difference.extra.length > 0) { + dialogHtml += "

" + T.dialogs.modsDifference.newMods + "

"; + dialogHtml += difference.extra.map(formatMod).join("
"); + } + + const signals = this.dialogs.showWarning(T.dialogs.modsDifference.title, dialogHtml, [ + "cancel:good", + "continue:bad", + ]); + + return new Promise(resolve => { + signals.continue.add(resolve); + }); + } + /** * @param {SavegameMetadata} game */ @@ -754,6 +808,7 @@ export class MainMenuState extends GameState { savegame .readAsync() .then(() => this.app.adProvider.showVideoAd()) + .then(() => this.checkForModDifferences(savegame)) .then(() => { this.moveToState("InGameState", { savegame, diff --git a/src/js/states/mods.js b/src/js/states/mods.js index 42add8bd..1e0fe5f1 100644 --- a/src/js/states/mods.js +++ b/src/js/states/mods.js @@ -74,7 +74,7 @@ export class ModsState extends TextualGameState {
${mod.metadata.name} ${mod.metadata.description} - Website + ${T.mods.modWebsite}
${T.mods.version}${mod.metadata.version} ${T.mods.author}${mod.metadata.author} diff --git a/translations/base-en.yaml b/translations/base-en.yaml index 7070c318..0fa240be 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -423,6 +423,14 @@ dialogs: desc: >- Are you sure you want to delete ''? This can not be undone! + modsDifference: + title: Mod Warning + desc: >- + The currently installed mods differ from the mods the savegame was created with. + This might cause the savegame to break or not load at all. Are you sure you want to continue? + missingMods: Missing Mods + newMods: Newly installed Mods + ingame: # This is shown in the top left corner and displays useful keybindings in # every situation @@ -1096,6 +1104,7 @@ mods: author: Author version: Version + modWebsite: Website openFolder: Open Mods Folder folderOnlyStandalone: Opening the mod folder is only possible when running the standalone. browseMods: Browse Mods From 7dbed9fc43453df761842516749d423be941e41a Mon Sep 17 00:00:00 2001 From: tobspr <tobias.springer1@googlemail.com> Date: Tue, 1 Feb 2022 14:02:27 +0100 Subject: [PATCH 124/129] Closes #1357 --- mod_examples/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod_examples/README.md b/mod_examples/README.md index e38d5834..6ea04c38 100644 --- a/mod_examples/README.md +++ b/mod_examples/README.md @@ -11,7 +11,7 @@ Since the `create-shapezio-mod` package is still in development, the current rec ## Mod Developer Discord -A great place to get help with mod development is the official [shapez.io modloader discord]https://discord.gg/xq5v8uyMue). +A great place to get help with mod development is the official [shapez.io modloader discord](https://discord.gg/xq5v8uyMue). ## Setting up your development environment From 321971daddada3e8e586b40b52c9ed516a60e31b Mon Sep 17 00:00:00 2001 From: Bagel03 <70449196+Bagel03@users.noreply.github.com> Date: Tue, 1 Feb 2022 08:05:58 -0500 Subject: [PATCH 125/129] Fix All Shapez Exports Being Const (#1358) * Allowed setting of variables inside webpack modules * remove console log * Fix stringification of things inside of eval Co-authored-by: Edward Badel <you@example.com> --- gulp/mod.js | 3 +++ gulp/webpack.config.js | 3 +++ src/js/mods/modloader.js | 6 ++++-- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 gulp/mod.js diff --git a/gulp/mod.js b/gulp/mod.js new file mode 100644 index 00000000..87912bb3 --- /dev/null +++ b/gulp/mod.js @@ -0,0 +1,3 @@ +module.exports = function (source, map) { + return source + `\nexport let $s=(n,v)=>eval(n+"=v")`; +}; diff --git a/gulp/webpack.config.js b/gulp/webpack.config.js index 7db0bf0b..3c07d7cc 100644 --- a/gulp/webpack.config.js +++ b/gulp/webpack.config.js @@ -93,6 +93,9 @@ module.exports = ({ watch = false, standalone = false, chineseVersion = false, w end: "typehints:end", }, }, + { + loader: path.resolve(__dirname, "mod.js"), + }, ], }, { diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index f91a7b25..a1658abc 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -112,18 +112,20 @@ export class ModLoader { // @ts-ignore const module = modules(key); for (const member in module) { - if (member === "default") { + if (member === "default" || member === "$s") { + // Setter continue; } if (exports[member]) { throw new Error("Duplicate export of " + member); } + Object.defineProperty(exports, member, { get() { return module[member]; }, set(v) { - module[member] = v; + module["$s"](member, v); }, }); } From 20dca5bcc10cf0e0b388c11653b73b4d42ae0e97 Mon Sep 17 00:00:00 2001 From: tobspr <tobias.springer1@googlemail.com> Date: Tue, 1 Feb 2022 14:21:46 +0100 Subject: [PATCH 126/129] Fix building placer intersection warning --- src/js/game/hud/parts/building_placer.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/js/game/hud/parts/building_placer.js b/src/js/game/hud/parts/building_placer.js index ca9c128b..d2904720 100644 --- a/src/js/game/hud/parts/building_placer.js +++ b/src/js/game/hud/parts/building_placer.js @@ -401,9 +401,10 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { * Checks if there are any entities in the way, returns true if there are * @param {Vector} from * @param {Vector} to + * @param {Vector[]=} ignorePositions * @returns */ - checkForObstales(from, to) { + checkForObstales(from, to, ignorePositions = []) { assert(from.x === to.x || from.y === to.y, "Must be a straight line"); const prop = from.x === to.x ? "y" : "x"; @@ -426,6 +427,9 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { for (let i = start; i <= end; i++) { current[prop] = i; + if (ignorePositions.some(p => p.distanceSquare(current) < 0.1)) { + continue; + } if (!this.root.logic.checkCanPlaceEntity(this.fakeEntity, { allowReplaceBuildings: false })) { return true; } @@ -464,8 +468,11 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { const endLine = mouseTile.toWorldSpaceCenterOfTile(); const midLine = this.currentDirectionLockCorner.toWorldSpaceCenterOfTile(); const anyObstacle = - this.checkForObstales(this.lastDragTile, this.currentDirectionLockCorner) || - this.checkForObstales(this.currentDirectionLockCorner, mouseTile); + this.checkForObstales(this.lastDragTile, this.currentDirectionLockCorner, [ + this.lastDragTile, + mouseTile, + ]) || + this.checkForObstales(this.currentDirectionLockCorner, mouseTile, [this.lastDragTile, mouseTile]); if (anyObstacle) { applyStyles("error"); From bf7e1887a80764413c2e5ad89542ba223c30914c Mon Sep 17 00:00:00 2001 From: tobspr <tobias.springer1@googlemail.com> Date: Tue, 1 Feb 2022 14:37:53 +0100 Subject: [PATCH 127/129] Add example for storing data in the savegame --- mod_examples/README.md | 1 + mod_examples/storing_data_in_savegame.js | 78 ++++++++++++++++++++++++ src/js/mods/mod_signals.js | 3 + src/js/savegame/savegame.js | 1 + src/js/savegame/savegame_serializer.js | 12 +++- src/js/savegame/savegame_typedefs.js | 3 +- src/js/savegame/schemas/1010.js | 4 ++ 7 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 mod_examples/storing_data_in_savegame.js diff --git a/mod_examples/README.md b/mod_examples/README.md index 6ea04c38..579751f9 100644 --- a/mod_examples/README.md +++ b/mod_examples/README.md @@ -38,6 +38,7 @@ To get into shapez.io modding, I highly recommend checking out all of the exampl | [modify_theme.js](modify_theme.js) | Modifies the default game themes | Modifying the builtin themes | | [custom_theme.js](custom_theme.js) | Adds a new UI and map theme | Adding a new game theme | | [mod_settings.js](mod_settings.js) | Shows a dialog counting how often the mod has been launched | Reading and storing mod settings | +| [storing_data_in_savegame.js](storing_data_in_savegame.js) | Shows how to store custom (structured) data in the savegame | Storing custom data in savegame | | [modify_existing_building.js](modify_existing_building.js) | Makes the rotator building always unlocked and adds a new statistic to the building panel | Modifying a builtin building, replacing builtin methods | | [modify_ui.js](modify_ui.js) | Shows how to add custom IU elements to builtin game states (the Main Menu in this case) | Extending builtin UI states, Adding CSS | | [pasting.js](pasting.js) | Shows a dialog when pasting text in the game | Listening to paste events | diff --git a/mod_examples/storing_data_in_savegame.js b/mod_examples/storing_data_in_savegame.js new file mode 100644 index 00000000..92f7733b --- /dev/null +++ b/mod_examples/storing_data_in_savegame.js @@ -0,0 +1,78 @@ +// @ts-nocheck +const METADATA = { + website: "https://tobspr.io", + author: "tobspr", + name: "Mod Example: Storing Data in Savegame", + version: "1", + id: "storing-savegame-data", + description: "Shows how to add custom data to a savegame", + minimumGameVersion: ">=1.5.0", +}; + +class Mod extends shapez.Mod { + init() { + //////////////////////////////////////////////////////////////////// + // Option 1: For simple data + this.signals.gameSerialized.add((root, data) => { + data.modExtraData["storing-savegame-data"] = Math.random(); + }); + + this.signals.gameDeserialized.add((root, data) => { + alert("The value stored in the savegame was: " + data.modExtraData["storing-savegame-data"]); + }); + + //////////////////////////////////////////////////////////////////// + // Option 2: If you need a structured way of storing data + + class SomeSerializableObject extends shapez.BasicSerializableObject { + static getId() { + return "SomeSerializableObject"; + } + + static getSchema() { + return { + someInt: shapez.types.int, + someString: shapez.types.string, + someVector: shapez.types.vector, + + // this value is allowed to be null + nullableInt: shapez.types.nullable(shapez.types.int), + + // There is a lot more .. be sure to checkout src/js/savegame/serialization.js + // You can have maps, classes, arrays etc.. + // And if you need something specific you can always ask in the modding discord. + }; + } + + constructor() { + super(); + this.someInt = 42; + this.someString = "Hello World"; + this.someVector = new shapez.Vector(1, 2); + + this.nullableInt = null; + } + } + + // Store our object in the global game root + this.signals.gameInitialized.add(root => { + root.myObject = new SomeSerializableObject(); + }); + + // Save it within the savegame + this.signals.gameSerialized.add((root, data) => { + data.modExtraData["storing-savegame-data-2"] = root.myObject.serialize(); + }); + + // Restore it when the savegame is loaded + this.signals.gameDeserialized.add((root, data) => { + const errorText = root.myObject.deserialize(data.modExtraData["storing-savegame-data-2"]); + if (errorText) { + alert("Mod failed to deserialize from savegame: " + errorText); + } + alert("The other value stored in the savegame (option 2) was " + root.myObject.someInt); + }); + + //////////////////////////////////////////////////////////////////// + } +} diff --git a/src/js/mods/mod_signals.js b/src/js/mods/mod_signals.js index c311af29..a534dd89 100644 --- a/src/js/mods/mod_signals.js +++ b/src/js/mods/mod_signals.js @@ -27,4 +27,7 @@ export const MOD_SIGNALS = { gameStarted: /** @type {TypedSignal<[GameRoot]>} */ (new Signal()), stateEntered: /** @type {TypedSignal<[GameState]>} */ (new Signal()), + + gameSerialized: /** @type {TypedSignal<[GameRoot, import("../savegame/savegame_typedefs").SerializedGame]>} */ (new Signal()), + gameDeserialized: /** @type {TypedSignal<[GameRoot, import("../savegame/savegame_typedefs").SerializedGame]>} */ (new Signal()), }; diff --git a/src/js/savegame/savegame.js b/src/js/savegame/savegame.js index a2f27d0f..b4472b2b 100644 --- a/src/js/savegame/savegame.js +++ b/src/js/savegame/savegame.js @@ -162,6 +162,7 @@ export class Savegame extends ReadWriteProxy { SavegameInterface_V1009.migrate1008to1009(data); data.version = 1009; } + if (data.version === 1009) { SavegameInterface_V1010.migrate1009to1010(data); data.version = 1010; diff --git a/src/js/savegame/savegame_serializer.js b/src/js/savegame/savegame_serializer.js index 3230cdd5..f95c9896 100644 --- a/src/js/savegame/savegame_serializer.js +++ b/src/js/savegame/savegame_serializer.js @@ -1,9 +1,8 @@ import { ExplainedResult } from "../core/explained_result"; -import { createLogger } from "../core/logging"; import { gComponentRegistry } from "../core/global_registries"; +import { createLogger } from "../core/logging"; +import { MOD_SIGNALS } from "../mods/mod_signals"; import { SerializerInternal } from "./serializer_internal"; -import { HUDPinnedShapes } from "../game/hud/parts/pinned_shapes"; -import { HUDWaypoints } from "../game/hud/parts/waypoints"; /** * @typedef {import("../game/component").Component} Component @@ -42,8 +41,12 @@ export class SavegameSerializer { beltPaths: root.systemMgr.systems.belt.serializePaths(), pinnedShapes: root.hud.parts.pinnedShapes ? root.hud.parts.pinnedShapes.serialize() : null, waypoints: root.hud.parts.waypoints ? root.hud.parts.waypoints.serialize() : null, + + modExtraData: {}, }; + MOD_SIGNALS.gameSerialized.dispatch(root, data); + if (G_IS_DEV) { if (sanityChecks) { // Sanity check @@ -151,6 +154,9 @@ export class SavegameSerializer { return ExplainedResult.bad(errorReason); } + // Mods + MOD_SIGNALS.gameDeserialized.dispatch(root, savegame); + return ExplainedResult.good(); } } diff --git a/src/js/savegame/savegame_typedefs.js b/src/js/savegame/savegame_typedefs.js index c72d83e6..b1980115 100644 --- a/src/js/savegame/savegame_typedefs.js +++ b/src/js/savegame/savegame_typedefs.js @@ -25,7 +25,8 @@ * pinnedShapes: any, * waypoints: any, * entities: Array<Entity>, - * beltPaths: Array<any> + * beltPaths: Array<any>, + * modExtraData: Object * }} SerializedGame * * @typedef {{ diff --git a/src/js/savegame/schemas/1010.js b/src/js/savegame/schemas/1010.js index 5453f3e2..8f480800 100644 --- a/src/js/savegame/schemas/1010.js +++ b/src/js/savegame/schemas/1010.js @@ -20,5 +20,9 @@ export class SavegameInterface_V1010 extends SavegameInterface_V1009 { logger.log("Migrating 1009 to 1010"); data.mods = []; + + if (data.dump) { + data.dump.modExtraData = {}; + } } } From d44191092a5d3f97dda7de0f0b71400b9e6edd3a Mon Sep 17 00:00:00 2001 From: Sense101 <67970865+Sense101@users.noreply.github.com> Date: Tue, 1 Feb 2022 13:50:07 +0000 Subject: [PATCH 128/129] Fix double painter bug (#1349) --- src/js/game/components/item_processor.js | 5 ++ src/js/game/systems/item_processor.js | 77 ++++++++++++------------ 2 files changed, 44 insertions(+), 38 deletions(-) diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index f7dddec1..be7d1ce4 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -109,6 +109,11 @@ export class ItemProcessorComponent extends Component { * @type {number} */ this.bonusTime = 0; + + /** + * @type {Array<EjectorItemToEject>} + */ + this.queuedEjects = []; } /** diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 36c837fb..6e1032c9 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -94,49 +94,16 @@ export class ItemProcessorSystem extends GameSystemWithFilter { } } - // Check if it finished - if (currentCharge.remainingTime <= 0.0) { + // Check if it finished and we don't already have queued ejects + if (currentCharge.remainingTime <= 0.0 && !processorComp.queuedEjects.length) { const itemsToEject = currentCharge.items; - // Go over all items and try to eject them + // Go over all items and add them to the queue for (let j = 0; j < itemsToEject.length; ++j) { - const { item, requiredSlot, preferredSlot } = itemsToEject[j]; - - assert(ejectorComp, "To eject items, the building needs to have an ejector"); - - let slot = null; - if (requiredSlot !== null && requiredSlot !== undefined) { - // We have a slot override, check if that is free - if (ejectorComp.canEjectOnSlot(requiredSlot)) { - slot = requiredSlot; - } - } else if (preferredSlot !== null && preferredSlot !== undefined) { - // We have a slot preference, try using it but otherwise use a free slot - if (ejectorComp.canEjectOnSlot(preferredSlot)) { - slot = preferredSlot; - } else { - slot = ejectorComp.getFirstFreeSlot(); - } - } else { - // We can eject on any slot - slot = ejectorComp.getFirstFreeSlot(); - } - - if (slot !== null) { - // Alright, we can actually eject - if (!ejectorComp.tryEject(slot, item)) { - assert(false, "Failed to eject"); - } else { - itemsToEject.splice(j, 1); - j -= 1; - } - } + processorComp.queuedEjects.push(itemsToEject[j]); } - // If the charge was entirely emptied to the outputs, start the next charge - if (itemsToEject.length === 0) { - processorComp.ongoingCharges.shift(); - } + processorComp.ongoingCharges.shift(); } } @@ -146,6 +113,40 @@ export class ItemProcessorSystem extends GameSystemWithFilter { this.startNewCharge(entity); } } + + for (let j = 0; j < processorComp.queuedEjects.length; ++j) { + const { item, requiredSlot, preferredSlot } = processorComp.queuedEjects[j]; + + assert(ejectorComp, "To eject items, the building needs to have an ejector"); + + let slot = null; + if (requiredSlot !== null && requiredSlot !== undefined) { + // We have a slot override, check if that is free + if (ejectorComp.canEjectOnSlot(requiredSlot)) { + slot = requiredSlot; + } + } else if (preferredSlot !== null && preferredSlot !== undefined) { + // We have a slot preference, try using it but otherwise use a free slot + if (ejectorComp.canEjectOnSlot(preferredSlot)) { + slot = preferredSlot; + } else { + slot = ejectorComp.getFirstFreeSlot(); + } + } else { + // We can eject on any slot + slot = ejectorComp.getFirstFreeSlot(); + } + + if (slot !== null) { + // Alright, we can actually eject + if (!ejectorComp.tryEject(slot, item)) { + assert(false, "Failed to eject"); + } else { + processorComp.queuedEjects.splice(j, 1); + j -= 1; + } + } + } } } From ce35a6cf356646d05454eedddd3f9383536f9bf7 Mon Sep 17 00:00:00 2001 From: Sense101 <personal.sense101@gmail.com> Date: Tue, 1 Feb 2022 14:40:55 +0000 Subject: [PATCH 129/129] fix weird merged code in processor --- src/js/game/systems/item_processor.js | 33 --------------------------- 1 file changed, 33 deletions(-) diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index b2e2db74..f0d703c6 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -133,39 +133,6 @@ export class ItemProcessorSystem extends GameSystemWithFilter { slot = ejectorComp.getFirstFreeSlot(); } - if (slot !== null) { - // Alright, we can actually eject - if (!ejectorComp.tryEject(slot, item)) { - assert(false, "Failed to eject"); - } else { - processorComp.queuedEjects.splice(j, 1); - j -= 1; - } - } - } - } - } - - assert(ejectorComp, "To eject items, the building needs to have an ejector"); - - let slot = null; - if (requiredSlot !== null && requiredSlot !== undefined) { - // We have a slot override, check if that is free - if (ejectorComp.canEjectOnSlot(requiredSlot)) { - slot = requiredSlot; - } - } else if (preferredSlot !== null && preferredSlot !== undefined) { - // We have a slot preference, try using it but otherwise use a free slot - if (ejectorComp.canEjectOnSlot(preferredSlot)) { - slot = preferredSlot; - } else { - slot = ejectorComp.getFirstFreeSlot(); - } - } else { - // We can eject on any slot - slot = ejectorComp.getFirstFreeSlot(); - } - if (slot !== null) { // Alright, we can actually eject if (!ejectorComp.tryEject(slot, item, extraProgress)) {