}
+ */
+ this.allEntities = [];
+
+ this.root.signals.entityAdded.add(this.internalPushEntityIfMatching, this);
+ this.root.signals.entityGotNewComponent.add(this.internalReconsiderEntityToAdd, this);
+ this.root.signals.entityComponentRemoved.add(this.internalCheckEntityAfterComponentRemoval, this);
+ this.root.signals.entityQueuedForDestroy.add(this.internalPopEntityIfMatching, this);
+
+ this.root.signals.postLoadHook.add(this.internalPostLoadHook, this);
+ this.root.signals.bulkOperationFinished.add(this.refreshCaches, this);
+ }
+
+ /**
+ * @param {Entity} entity
+ */
+ internalPushEntityIfMatching(entity) {
+ for (let i = 0; i < this.requiredComponentIds.length; ++i) {
+ if (!entity.components[this.requiredComponentIds[i]]) {
+ return;
+ }
+ }
+
+ // This is slow!
+ if (G_IS_DEV && !globalConfig.debug.disableSlowAsserts) {
+ assert(this.allEntities.indexOf(entity) < 0, "entity already in list: " + entity);
+ }
+
+ this.internalRegisterEntity(entity);
+ }
+
+ /**
+ *
+ * @param {Entity} entity
+ */
+ internalCheckEntityAfterComponentRemoval(entity) {
+ if (this.allEntities.indexOf(entity) < 0) {
+ // Entity wasn't interesting anyways
+ return;
+ }
+
+ for (let i = 0; i < this.requiredComponentIds.length; ++i) {
+ if (!entity.components[this.requiredComponentIds[i]]) {
+ // Entity is not interesting anymore
+ arrayDeleteValue(this.allEntities, entity);
+ }
+ }
+ }
+
+ /**
+ *
+ * @param {Entity} entity
+ */
+ internalReconsiderEntityToAdd(entity) {
+ for (let i = 0; i < this.requiredComponentIds.length; ++i) {
+ if (!entity.components[this.requiredComponentIds[i]]) {
+ return;
+ }
+ }
+ if (this.allEntities.indexOf(entity) >= 0) {
+ return;
+ }
+ this.internalRegisterEntity(entity);
+ }
+
+ refreshCaches() {
+ // Remove all entities which are queued for destroy
+ for (let i = 0; i < this.allEntities.length; ++i) {
+ const entity = this.allEntities[i];
+ if (entity.queuedForDestroy || entity.destroyed) {
+ this.allEntities.splice(i, 1);
+ i -= 1;
+ }
+ }
+
+ this.allEntities.sort((a, b) => a.uid - b.uid);
+ }
+
+ /**
+ * Recomputes all target entities after the game has loaded
+ */
+ internalPostLoadHook() {
+ this.refreshCaches();
+ }
+
+ /**
+ *
+ * @param {Entity} entity
+ */
+ internalRegisterEntity(entity) {
+ this.allEntities.push(entity);
+
+ if (this.root.gameInitialized && !this.root.bulkOperationRunning) {
+ // Sort entities by uid so behaviour is predictable
+ this.allEntities.sort((a, b) => a.uid - b.uid);
+ }
+ }
+
+ /**
+ *
+ * @param {Entity} entity
+ */
+ internalPopEntityIfMatching(entity) {
+ if (this.root.bulkOperationRunning) {
+ // We do this in refreshCaches afterwards
+ return;
+ }
+ const index = this.allEntities.indexOf(entity);
+ if (index >= 0) {
+ arrayDelete(this.allEntities, index);
+ }
+ }
+}
diff --git a/src/js/game/hints.js b/src/js/game/hints.js
new file mode 100644
index 00000000..c2e7e4e5
--- /dev/null
+++ b/src/js/game/hints.js
@@ -0,0 +1,22 @@
+import { randomChoice } from "../core/utils";
+import { T } from "../translations";
+
+const hintsShown = [];
+
+/**
+ * Finds a new hint to show about the game which the user hasn't seen within this session
+ */
+export function getRandomHint() {
+ let maxTries = 100 * T.tips.length;
+
+ while (maxTries-- > 0) {
+ const hint = randomChoice(T.tips);
+ if (!hintsShown.includes(hint)) {
+ hintsShown.push(hint);
+ return hint;
+ }
+ }
+
+ // All tips shown so far
+ return randomChoice(T.tips);
+}
diff --git a/src/js/game/hud/parts/building_placer_logic.js b/src/js/game/hud/parts/building_placer_logic.js
index 4f826eef..4101656b 100644
--- a/src/js/game/hud/parts/building_placer_logic.js
+++ b/src/js/game/hud/parts/building_placer_logic.js
@@ -330,7 +330,7 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
if (tileBelow && this.root.app.settings.getAllSettings().pickMinerOnPatch) {
this.currentMetaBuilding.set(gMetaBuildingRegistry.findByClass(MetaMinerBuilding));
- // Select chained miner if available, since thats always desired once unlocked
+ // Select chained miner if available, since that's always desired once unlocked
if (this.root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_miner_chainable)) {
this.currentVariant.set(ChainableMinerVariant);
}
diff --git a/src/js/game/hud/parts/entity_debugger.js b/src/js/game/hud/parts/entity_debugger.js
index 80f15eea..e290979c 100644
--- a/src/js/game/hud/parts/entity_debugger.js
+++ b/src/js/game/hud/parts/entity_debugger.js
@@ -1,7 +1,13 @@
-import { BaseHUDPart } from "../base_hud_part";
+/* dev:start */
import { makeDiv, removeAllChildren } from "../../../core/utils";
-import { globalConfig } from "../../../core/config";
+import { Vector } from "../../../core/vector";
+import { Entity } from "../../entity";
+import { BaseHUDPart } from "../base_hud_part";
+import { DynamicDomAttach } from "../dynamic_dom_attach";
+/**
+ * Allows to inspect entities by pressing F8 while hovering them
+ */
export class HUDEntityDebugger extends BaseHUDPart {
createElements(parent) {
this.element = makeDiv(
@@ -9,65 +15,143 @@ export class HUDEntityDebugger extends BaseHUDPart {
"ingame_HUD_EntityDebugger",
[],
`
- Tile below cursor:
+ Entity Debugger
+ Use F8 to toggle this overlay
+
+
`
);
-
- /** @type {HTMLElement} */
- this.mousePosElem = this.element.querySelector(".mousePos");
- /** @type {HTMLElement} */
- this.chunkPosElem = this.element.querySelector(".chunkPos");
- this.entityInfoElem = this.element.querySelector(".entityInfo");
+ this.componentsElem = this.element.querySelector(".entityComponents");
}
initialize() {
- this.root.camera.downPreHandler.add(this.onMouseDown, this);
+ this.root.gameState.inputReciever.keydown.add(key => {
+ if (key.keyCode === 119) {
+ // F8
+ this.pickEntity();
+ }
+ });
+
+ /**
+ * The currently selected entity
+ * @type {Entity}
+ */
+ this.selectedEntity = null;
+
+ this.lastUpdate = 0;
+
+ this.domAttach = new DynamicDomAttach(this.root, this.element);
}
- update() {
+ pickEntity() {
const mousePos = this.root.app.mousePosition;
if (!mousePos) {
return;
}
const worldPos = this.root.camera.screenToWorld(mousePos);
const worldTile = worldPos.toTileSpace();
-
- const chunk = worldTile.divideScalar(globalConfig.mapChunkSize).floor();
- this.mousePosElem.innerText = worldTile.x + " / " + worldTile.y;
- this.chunkPosElem.innerText = chunk.x + " / " + chunk.y;
-
const entity = this.root.map.getTileContent(worldTile, this.root.currentLayer);
+
+ this.selectedEntity = entity;
if (entity) {
- removeAllChildren(this.entityInfoElem);
- let html = "Entity";
-
- const flag = (name, val) =>
- `${name} ${val}";
- html += flag("registered", entity.registered);
- html += flag("uid", entity.uid);
- html += flag("destroyed", entity.destroyed);
- html += "
";
-
- html += "";
-
- for (const componentId in entity.components) {
- const data = entity.components[componentId];
- html += "
";
- html += "" + componentId + " ";
- html += "";
-
- html += "
";
- }
-
- html += "
+ ${name} ${typeName}
+ `;
+
+ for (const property in val) {
+ const isRoot = val[property] == this.root;
+ const isRecursive = recursion.includes(val[property]);
+
+ let hiddenValue = isRoot ? "" : null;
+ if (isRecursive) {
+ // Avoid recursion by not "expanding" object more than once
+ hiddenValue = "";
+ }
+
+ html += this.propertyToHTML(
+ property,
+ hiddenValue ? hiddenValue : val[property],
+ indent + 1,
+ [...recursion] // still expand same value in other "branches"
+ );
+ }
+
+ html += "
";
+
+ return html;
+ }
+
+ const displayValue = (val + "")
+ .replaceAll("&", "&")
+ .replaceAll("<", "<")
+ .replaceAll(">", ">");
+ return `${name} ${displayValue} `;
+ }
+
+ /**
+ * Rerenders the whole container
+ * @param {Entity} entity
+ */
+ rerenderFull(entity) {
+ removeAllChildren(this.componentsElem);
+ let html = "";
+
+ const property = (strings, val) => `${strings[0]} ${val} `;
+
+ html += property`registered ${!!entity.registered}`;
+ html += property`uid ${entity.uid}`;
+ html += property`destroyed ${!!entity.destroyed}`;
+
+ for (const componentId in entity.components) {
+ const data = entity.components[componentId];
+ html += "";
+ html += "" + componentId + " ";
+
+ for (const property in data) {
+ // Put entity into recursion list, so it won't get "expanded"
+ html += this.propertyToHTML(property, data[property], 0, [entity]);
+ }
+
+ html += "
";
+ }
+
+ this.componentsElem.innerHTML = html;
+ }
+
+ update() {
+ this.domAttach.update(!!this.selectedEntity);
+ }
}
+
+/* dev:end */
diff --git a/src/js/game/hud/parts/game_menu.js b/src/js/game/hud/parts/game_menu.js
index 59ba0232..6db50066 100644
--- a/src/js/game/hud/parts/game_menu.js
+++ b/src/js/game/hud/parts/game_menu.js
@@ -5,6 +5,7 @@ import { enumNotificationType } from "./notifications";
import { T } from "../../../translations";
import { KEYMAPPINGS } from "../../key_action_mapper";
import { DynamicDomAttach } from "../dynamic_dom_attach";
+import { TrackedState } from "../../../core/tracked_state";
export class HUDGameMenu extends BaseHUDPart {
createElements(parent) {
@@ -97,12 +98,17 @@ export class HUDGameMenu extends BaseHUDPart {
initialize() {
this.root.signals.gameSaved.add(this.onGameSaved, this);
+
+ this.trackedIsSaving = new TrackedState(this.onIsSavingChanged, this);
}
update() {
let playSound = false;
let notifications = new Set();
+ // Check whether we are saving
+ this.trackedIsSaving.set(!!this.root.gameState.currentSavePromise);
+
// Update visibility of buttons
for (let i = 0; i < this.visibilityToUpdate.length; ++i) {
const { condition, domAttach } = this.visibilityToUpdate[i];
@@ -154,6 +160,10 @@ export class HUDGameMenu extends BaseHUDPart {
});
}
+ onIsSavingChanged(isSaving) {
+ this.saveButton.classList.toggle("saving", isSaving);
+ }
+
onGameSaved() {
this.saveButton.classList.toggle("animEven");
this.saveButton.classList.toggle("animOdd");
diff --git a/src/js/game/hud/parts/mass_selector.js b/src/js/game/hud/parts/mass_selector.js
index a8972434..08a11769 100644
--- a/src/js/game/hud/parts/mass_selector.js
+++ b/src/js/game/hud/parts/mass_selector.js
@@ -48,6 +48,9 @@ export class HUDMassSelector extends BaseHUDPart {
* @param {Entity} entity
*/
onEntityDestroyed(entity) {
+ if (this.root.bulkOperationRunning) {
+ return;
+ }
this.selectedUids.delete(entity.uid);
}
@@ -90,14 +93,30 @@ export class HUDMassSelector extends BaseHUDPart {
doDelete() {
const entityUids = Array.from(this.selectedUids);
- for (let i = 0; i < entityUids.length; ++i) {
- const uid = entityUids[i];
- const entity = this.root.entityMgr.findByUid(uid);
- if (!this.root.logic.tryDeleteBuilding(entity)) {
- logger.error("Error in mass delete, could not remove building");
- this.selectedUids.delete(uid);
+
+ // Build mapping from uid to entity
+ /**
+ * @type {Map}
+ */
+ const mapUidToEntity = this.root.entityMgr.getFrozenUidSearchMap();
+
+ this.root.logic.performBulkOperation(() => {
+ for (let i = 0; i < entityUids.length; ++i) {
+ const uid = entityUids[i];
+ const entity = mapUidToEntity.get(uid);
+ if (!entity) {
+ logger.error("Entity not found by uid:", uid);
+ continue;
+ }
+
+ if (!this.root.logic.tryDeleteBuilding(entity)) {
+ logger.error("Error in mass delete, could not remove building");
+ }
}
- }
+ });
+
+ // Clear uids later
+ this.selectedUids = new Set();
}
startCopy() {
diff --git a/src/js/game/hud/parts/notifications.js b/src/js/game/hud/parts/notifications.js
index aef0cc75..bef8dd0f 100644
--- a/src/js/game/hud/parts/notifications.js
+++ b/src/js/game/hud/parts/notifications.js
@@ -1,56 +1,55 @@
-import { BaseHUDPart } from "../base_hud_part";
-import { makeDiv } from "../../../core/utils";
-import { T } from "../../../translations";
-import { IS_DEMO } from "../../../core/config";
-
-/** @enum {string} */
-export const enumNotificationType = {
- saved: "saved",
- upgrade: "upgrade",
- success: "success",
-};
-
-const notificationDuration = 3;
-
-export class HUDNotifications extends BaseHUDPart {
- createElements(parent) {
- this.element = makeDiv(parent, "ingame_HUD_Notifications", [], ``);
- }
-
- initialize() {
- this.root.hud.signals.notification.add(this.onNotification, this);
-
- /** @type {Array<{ element: HTMLElement, expireAt: number}>} */
- this.notificationElements = [];
-
- // Automatic notifications
- this.root.signals.gameSaved.add(() =>
- this.onNotification(T.ingame.notifications.gameSaved, enumNotificationType.saved)
- );
- }
-
- /**
- * @param {string} message
- * @param {enumNotificationType} type
- */
- onNotification(message, type) {
- const element = makeDiv(this.element, null, ["notification", "type-" + type], message);
- element.setAttribute("data-icon", "icons/notification_" + type + ".png");
-
- this.notificationElements.push({
- element,
- expireAt: this.root.time.realtimeNow() + notificationDuration,
- });
- }
-
- update() {
- const now = this.root.time.realtimeNow();
- for (let i = 0; i < this.notificationElements.length; ++i) {
- const handle = this.notificationElements[i];
- if (handle.expireAt <= now) {
- handle.element.remove();
- this.notificationElements.splice(i, 1);
- }
- }
- }
-}
+import { makeDiv } from "../../../core/utils";
+import { T } from "../../../translations";
+import { BaseHUDPart } from "../base_hud_part";
+
+/** @enum {string} */
+export const enumNotificationType = {
+ saved: "saved",
+ upgrade: "upgrade",
+ success: "success",
+};
+
+const notificationDuration = 3;
+
+export class HUDNotifications extends BaseHUDPart {
+ createElements(parent) {
+ this.element = makeDiv(parent, "ingame_HUD_Notifications", [], ``);
+ }
+
+ initialize() {
+ this.root.hud.signals.notification.add(this.onNotification, this);
+
+ /** @type {Array<{ element: HTMLElement, expireAt: number}>} */
+ this.notificationElements = [];
+
+ // Automatic notifications
+ this.root.signals.gameSaved.add(() =>
+ this.onNotification(T.ingame.notifications.gameSaved, enumNotificationType.saved)
+ );
+ }
+
+ /**
+ * @param {string} message
+ * @param {enumNotificationType} type
+ */
+ onNotification(message, type) {
+ const element = makeDiv(this.element, null, ["notification", "type-" + type], message);
+ element.setAttribute("data-icon", "icons/notification_" + type + ".png");
+
+ this.notificationElements.push({
+ element,
+ expireAt: this.root.time.realtimeNow() + notificationDuration,
+ });
+ }
+
+ update() {
+ const now = this.root.time.realtimeNow();
+ for (let i = 0; i < this.notificationElements.length; ++i) {
+ const handle = this.notificationElements[i];
+ if (handle.expireAt <= now) {
+ handle.element.remove();
+ this.notificationElements.splice(i, 1);
+ }
+ }
+ }
+}
diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js
index d5a758a5..7140c927 100644
--- a/src/js/game/key_action_mapper.js
+++ b/src/js/game/key_action_mapper.js
@@ -204,22 +204,20 @@ export function getStringForKeyCode(code) {
case 115:
return "F4";
case 116:
- return "F4";
- case 117:
return "F5";
- case 118:
+ case 117:
return "F6";
- case 119:
+ case 118:
return "F7";
- case 120:
+ case 119:
return "F8";
- case 121:
+ case 120:
return "F9";
- case 122:
+ case 121:
return "F10";
- case 123:
+ case 122:
return "F11";
- case 124:
+ case 123:
return "F12";
case 144:
diff --git a/src/js/game/map.js b/src/js/game/map.js
index 5ff51ce8..a5ec8f21 100644
--- a/src/js/game/map.js
+++ b/src/js/game/map.js
@@ -1,236 +1,236 @@
-import { globalConfig } from "../core/config";
-import { Vector } from "../core/vector";
-import { BasicSerializableObject, types } from "../savegame/serialization";
-import { BaseItem } from "./base_item";
-import { Entity } from "./entity";
-import { MapChunkView } from "./map_chunk_view";
-import { GameRoot } from "./root";
-
-export class BaseMap extends BasicSerializableObject {
- static getId() {
- return "Map";
- }
-
- static getSchema() {
- return {
- seed: types.uint,
- };
- }
-
- /**
- *
- * @param {GameRoot} root
- */
- constructor(root) {
- super();
- this.root = root;
-
- this.seed = 0;
-
- /**
- * Mapping of 'X|Y' to chunk
- * @type {Map} */
- this.chunksById = new Map();
- }
-
- /**
- * Returns the given chunk by index
- * @param {number} chunkX
- * @param {number} chunkY
- */
- getChunk(chunkX, chunkY, createIfNotExistent = false) {
- const chunkIdentifier = chunkX + "|" + chunkY;
- let storedChunk;
-
- if ((storedChunk = this.chunksById.get(chunkIdentifier))) {
- return storedChunk;
- }
-
- if (createIfNotExistent) {
- const instance = new MapChunkView(this.root, chunkX, chunkY);
- this.chunksById.set(chunkIdentifier, instance);
- return instance;
- }
-
- return null;
- }
-
- /**
- * Gets or creates a new chunk if not existent for the given tile
- * @param {number} tileX
- * @param {number} tileY
- * @returns {MapChunkView}
- */
- getOrCreateChunkAtTile(tileX, tileY) {
- const chunkX = Math.floor(tileX / globalConfig.mapChunkSize);
- const chunkY = Math.floor(tileY / globalConfig.mapChunkSize);
- return this.getChunk(chunkX, chunkY, true);
- }
-
- /**
- * Gets a chunk if not existent for the given tile
- * @param {number} tileX
- * @param {number} tileY
- * @returns {MapChunkView?}
- */
- getChunkAtTileOrNull(tileX, tileY) {
- const chunkX = Math.floor(tileX / globalConfig.mapChunkSize);
- const chunkY = Math.floor(tileY / globalConfig.mapChunkSize);
- return this.getChunk(chunkX, chunkY, false);
- }
-
- /**
- * Checks if a given tile is within the map bounds
- * @param {Vector} tile
- * @returns {boolean}
- */
- isValidTile(tile) {
- if (G_IS_DEV) {
- assert(tile instanceof Vector, "tile is not a vector");
- }
- return Number.isInteger(tile.x) && Number.isInteger(tile.y);
- }
-
- /**
- * Returns the tile content of a given tile
- * @param {Vector} tile
- * @param {Layer} layer
- * @returns {Entity} Entity or null
- */
- getTileContent(tile, layer) {
- if (G_IS_DEV) {
- this.internalCheckTile(tile);
- }
- const chunk = this.getChunkAtTileOrNull(tile.x, tile.y);
- return chunk && chunk.getLayerContentFromWorldCoords(tile.x, tile.y, layer);
- }
-
- /**
- * Returns the lower layers content of the given tile
- * @param {number} x
- * @param {number} y
- * @returns {BaseItem=}
- */
- getLowerLayerContentXY(x, y) {
- return this.getOrCreateChunkAtTile(x, y).getLowerLayerFromWorldCoords(x, y);
- }
-
- /**
- * Returns the tile content of a given tile
- * @param {number} x
- * @param {number} y
- * @param {Layer} layer
- * @returns {Entity} Entity or null
- */
- getLayerContentXY(x, y, layer) {
- const chunk = this.getChunkAtTileOrNull(x, y);
- return chunk && chunk.getLayerContentFromWorldCoords(x, y, layer);
- }
-
- /**
- * Returns the tile contents of a given tile
- * @param {number} x
- * @param {number} y
- * @returns {Array} Entity or null
- */
- getLayersContentsMultipleXY(x, y) {
- const chunk = this.getChunkAtTileOrNull(x, y);
- if (!chunk) {
- return [];
- }
- return chunk.getLayersContentsMultipleFromWorldCoords(x, y);
- }
-
- /**
- * Checks if the tile is used
- * @param {Vector} tile
- * @param {Layer} layer
- * @returns {boolean}
- */
- isTileUsed(tile, layer) {
- if (G_IS_DEV) {
- this.internalCheckTile(tile);
- }
- const chunk = this.getChunkAtTileOrNull(tile.x, tile.y);
- return chunk && chunk.getLayerContentFromWorldCoords(tile.x, tile.y, layer) != null;
- }
-
- /**
- * Checks if the tile is used
- * @param {number} x
- * @param {number} y
- * @param {Layer} layer
- * @returns {boolean}
- */
- isTileUsedXY(x, y, layer) {
- const chunk = this.getChunkAtTileOrNull(x, y);
- return chunk && chunk.getLayerContentFromWorldCoords(x, y, layer) != null;
- }
-
- /**
- * Sets the tiles content
- * @param {Vector} tile
- * @param {Entity} entity
- */
- setTileContent(tile, entity) {
- if (G_IS_DEV) {
- this.internalCheckTile(tile);
- }
-
- this.getOrCreateChunkAtTile(tile.x, tile.y).setLayerContentFromWorldCords(
- tile.x,
- tile.y,
- entity,
- entity.layer
- );
-
- const staticComponent = entity.components.StaticMapEntity;
- assert(staticComponent, "Can only place static map entities in tiles");
- }
-
- /**
- * Places an entity with the StaticMapEntity component
- * @param {Entity} entity
- */
- placeStaticEntity(entity) {
- assert(entity.components.StaticMapEntity, "Entity is not static");
- const staticComp = entity.components.StaticMapEntity;
- const rect = staticComp.getTileSpaceBounds();
- for (let dx = 0; dx < rect.w; ++dx) {
- for (let dy = 0; dy < rect.h; ++dy) {
- const x = rect.x + dx;
- const y = rect.y + dy;
- this.getOrCreateChunkAtTile(x, y).setLayerContentFromWorldCords(x, y, entity, entity.layer);
- }
- }
- }
-
- /**
- * Removes an entity with the StaticMapEntity component
- * @param {Entity} entity
- */
- removeStaticEntity(entity) {
- assert(entity.components.StaticMapEntity, "Entity is not static");
- const staticComp = entity.components.StaticMapEntity;
- const rect = staticComp.getTileSpaceBounds();
- for (let dx = 0; dx < rect.w; ++dx) {
- for (let dy = 0; dy < rect.h; ++dy) {
- const x = rect.x + dx;
- const y = rect.y + dy;
- this.getOrCreateChunkAtTile(x, y).setLayerContentFromWorldCords(x, y, null, entity.layer);
- }
- }
- }
-
- // Internal
-
- /**
- * Checks a given tile for validty
- * @param {Vector} tile
- */
- internalCheckTile(tile) {
- assert(tile instanceof Vector, "tile is not a vector: " + tile);
- assert(tile.x % 1 === 0, "Tile X is not a valid integer: " + tile.x);
- assert(tile.y % 1 === 0, "Tile Y is not a valid integer: " + tile.y);
- }
-}
+import { globalConfig } from "../core/config";
+import { Vector } from "../core/vector";
+import { BasicSerializableObject, types } from "../savegame/serialization";
+import { BaseItem } from "./base_item";
+import { Entity } from "./entity";
+import { MapChunkView } from "./map_chunk_view";
+import { GameRoot } from "./root";
+
+export class BaseMap extends BasicSerializableObject {
+ static getId() {
+ return "Map";
+ }
+
+ static getSchema() {
+ return {
+ seed: types.uint,
+ };
+ }
+
+ /**
+ *
+ * @param {GameRoot} root
+ */
+ constructor(root) {
+ super();
+ this.root = root;
+
+ this.seed = 0;
+
+ /**
+ * Mapping of 'X|Y' to chunk
+ * @type {Map} */
+ this.chunksById = new Map();
+ }
+
+ /**
+ * Returns the given chunk by index
+ * @param {number} chunkX
+ * @param {number} chunkY
+ */
+ getChunk(chunkX, chunkY, createIfNotExistent = false) {
+ const chunkIdentifier = chunkX + "|" + chunkY;
+ let storedChunk;
+
+ if ((storedChunk = this.chunksById.get(chunkIdentifier))) {
+ return storedChunk;
+ }
+
+ if (createIfNotExistent) {
+ const instance = new MapChunkView(this.root, chunkX, chunkY);
+ this.chunksById.set(chunkIdentifier, instance);
+ return instance;
+ }
+
+ return null;
+ }
+
+ /**
+ * Gets or creates a new chunk if not existent for the given tile
+ * @param {number} tileX
+ * @param {number} tileY
+ * @returns {MapChunkView}
+ */
+ getOrCreateChunkAtTile(tileX, tileY) {
+ const chunkX = Math.floor(tileX / globalConfig.mapChunkSize);
+ const chunkY = Math.floor(tileY / globalConfig.mapChunkSize);
+ return this.getChunk(chunkX, chunkY, true);
+ }
+
+ /**
+ * Gets a chunk if not existent for the given tile
+ * @param {number} tileX
+ * @param {number} tileY
+ * @returns {MapChunkView?}
+ */
+ getChunkAtTileOrNull(tileX, tileY) {
+ const chunkX = Math.floor(tileX / globalConfig.mapChunkSize);
+ const chunkY = Math.floor(tileY / globalConfig.mapChunkSize);
+ return this.getChunk(chunkX, chunkY, false);
+ }
+
+ /**
+ * Checks if a given tile is within the map bounds
+ * @param {Vector} tile
+ * @returns {boolean}
+ */
+ isValidTile(tile) {
+ if (G_IS_DEV) {
+ assert(tile instanceof Vector, "tile is not a vector");
+ }
+ return Number.isInteger(tile.x) && Number.isInteger(tile.y);
+ }
+
+ /**
+ * Returns the tile content of a given tile
+ * @param {Vector} tile
+ * @param {Layer} layer
+ * @returns {Entity} Entity or null
+ */
+ getTileContent(tile, layer) {
+ if (G_IS_DEV) {
+ this.internalCheckTile(tile);
+ }
+ const chunk = this.getChunkAtTileOrNull(tile.x, tile.y);
+ return chunk && chunk.getLayerContentFromWorldCoords(tile.x, tile.y, layer);
+ }
+
+ /**
+ * Returns the lower layers content of the given tile
+ * @param {number} x
+ * @param {number} y
+ * @returns {BaseItem=}
+ */
+ getLowerLayerContentXY(x, y) {
+ return this.getOrCreateChunkAtTile(x, y).getLowerLayerFromWorldCoords(x, y);
+ }
+
+ /**
+ * Returns the tile content of a given tile
+ * @param {number} x
+ * @param {number} y
+ * @param {Layer} layer
+ * @returns {Entity} Entity or null
+ */
+ getLayerContentXY(x, y, layer) {
+ const chunk = this.getChunkAtTileOrNull(x, y);
+ return chunk && chunk.getLayerContentFromWorldCoords(x, y, layer);
+ }
+
+ /**
+ * Returns the tile contents of a given tile
+ * @param {number} x
+ * @param {number} y
+ * @returns {Array} Entity or null
+ */
+ getLayersContentsMultipleXY(x, y) {
+ const chunk = this.getChunkAtTileOrNull(x, y);
+ if (!chunk) {
+ return [];
+ }
+ return chunk.getLayersContentsMultipleFromWorldCoords(x, y);
+ }
+
+ /**
+ * Checks if the tile is used
+ * @param {Vector} tile
+ * @param {Layer} layer
+ * @returns {boolean}
+ */
+ isTileUsed(tile, layer) {
+ if (G_IS_DEV) {
+ this.internalCheckTile(tile);
+ }
+ const chunk = this.getChunkAtTileOrNull(tile.x, tile.y);
+ return chunk && chunk.getLayerContentFromWorldCoords(tile.x, tile.y, layer) != null;
+ }
+
+ /**
+ * Checks if the tile is used
+ * @param {number} x
+ * @param {number} y
+ * @param {Layer} layer
+ * @returns {boolean}
+ */
+ isTileUsedXY(x, y, layer) {
+ const chunk = this.getChunkAtTileOrNull(x, y);
+ return chunk && chunk.getLayerContentFromWorldCoords(x, y, layer) != null;
+ }
+
+ /**
+ * Sets the tiles content
+ * @param {Vector} tile
+ * @param {Entity} entity
+ */
+ setTileContent(tile, entity) {
+ if (G_IS_DEV) {
+ this.internalCheckTile(tile);
+ }
+
+ this.getOrCreateChunkAtTile(tile.x, tile.y).setLayerContentFromWorldCords(
+ tile.x,
+ tile.y,
+ entity,
+ entity.layer
+ );
+
+ const staticComponent = entity.components.StaticMapEntity;
+ assert(staticComponent, "Can only place static map entities in tiles");
+ }
+
+ /**
+ * Places an entity with the StaticMapEntity component
+ * @param {Entity} entity
+ */
+ placeStaticEntity(entity) {
+ assert(entity.components.StaticMapEntity, "Entity is not static");
+ const staticComp = entity.components.StaticMapEntity;
+ const rect = staticComp.getTileSpaceBounds();
+ for (let dx = 0; dx < rect.w; ++dx) {
+ for (let dy = 0; dy < rect.h; ++dy) {
+ const x = rect.x + dx;
+ const y = rect.y + dy;
+ this.getOrCreateChunkAtTile(x, y).setLayerContentFromWorldCords(x, y, entity, entity.layer);
+ }
+ }
+ }
+
+ /**
+ * Removes an entity with the StaticMapEntity component
+ * @param {Entity} entity
+ */
+ removeStaticEntity(entity) {
+ assert(entity.components.StaticMapEntity, "Entity is not static");
+ const staticComp = entity.components.StaticMapEntity;
+ const rect = staticComp.getTileSpaceBounds();
+ for (let dx = 0; dx < rect.w; ++dx) {
+ for (let dy = 0; dy < rect.h; ++dy) {
+ const x = rect.x + dx;
+ const y = rect.y + dy;
+ this.getOrCreateChunkAtTile(x, y).setLayerContentFromWorldCords(x, y, null, entity.layer);
+ }
+ }
+ }
+
+ // Internal
+
+ /**
+ * Checks a given tile for validty
+ * @param {Vector} tile
+ */
+ internalCheckTile(tile) {
+ assert(tile instanceof Vector, "tile is not a vector: " + tile);
+ assert(tile.x % 1 === 0, "Tile X is not a valid integer: " + tile.x);
+ assert(tile.y % 1 === 0, "Tile Y is not a valid integer: " + tile.y);
+ }
+}
diff --git a/src/js/game/map_chunk_view.js b/src/js/game/map_chunk_view.js
index 3844cd91..6487dc6e 100644
--- a/src/js/game/map_chunk_view.js
+++ b/src/js/game/map_chunk_view.js
@@ -88,16 +88,17 @@ export class MapChunkView extends MapChunk {
});
const dims = globalConfig.mapChunkWorldSize;
+ const extrude = 0.05;
// Draw chunk "pixel" art
parameters.context.imageSmoothingEnabled = false;
drawSpriteClipped({
parameters,
sprite,
- x: this.x * dims,
- y: this.y * dims,
- w: dims,
- h: dims,
+ x: this.x * dims - extrude,
+ y: this.y * dims - extrude,
+ w: dims + 2 * extrude,
+ h: dims + 2 * extrude,
originalW: overlaySize,
originalH: overlaySize,
});
diff --git a/src/js/game/map_view.js b/src/js/game/map_view.js
index 0e0f3d5b..0f2ceb89 100644
--- a/src/js/game/map_view.js
+++ b/src/js/game/map_view.js
@@ -66,32 +66,34 @@ export class MapView extends BaseMap {
* @param {DrawParameters} drawParameters
*/
drawStaticEntityDebugOverlays(drawParameters) {
- const cullRange = drawParameters.visibleRect.toTileCullRectangle();
- const top = cullRange.top();
- const right = cullRange.right();
- const bottom = cullRange.bottom();
- const left = cullRange.left();
+ if (G_IS_DEV && (globalConfig.debug.showAcceptorEjectors || globalConfig.debug.showEntityBounds)) {
+ const cullRange = drawParameters.visibleRect.toTileCullRectangle();
+ const top = cullRange.top();
+ const right = cullRange.right();
+ const bottom = cullRange.bottom();
+ const left = cullRange.left();
- const border = 1;
+ const border = 1;
- const minY = top - border;
- const maxY = bottom + border;
- const minX = left - border;
- const maxX = right + border - 1;
+ const minY = top - border;
+ const maxY = bottom + border;
+ const minX = left - border;
+ const maxX = right + border - 1;
- // Render y from top down for proper blending
- for (let y = minY; y <= maxY; ++y) {
- for (let x = minX; x <= maxX; ++x) {
- // const content = this.tiles[x][y];
- const chunk = this.getChunkAtTileOrNull(x, y);
- if (!chunk) {
- continue;
- }
- const content = chunk.getTileContentFromWorldCoords(x, y);
- if (content) {
- let isBorder = x <= left - 1 || x >= right + 1 || y <= top - 1 || y >= bottom + 1;
- if (!isBorder) {
- content.drawDebugOverlays(drawParameters);
+ // Render y from top down for proper blending
+ for (let y = minY; y <= maxY; ++y) {
+ for (let x = minX; x <= maxX; ++x) {
+ // const content = this.tiles[x][y];
+ const chunk = this.getChunkAtTileOrNull(x, y);
+ if (!chunk) {
+ continue;
+ }
+ const content = chunk.getTileContentFromWorldCoords(x, y);
+ if (content) {
+ let isBorder = x <= left - 1 || x >= right + 1 || y <= top - 1 || y >= bottom + 1;
+ if (!isBorder) {
+ content.drawDebugOverlays(drawParameters);
+ }
}
}
}
diff --git a/src/js/game/meta_building_registry.js b/src/js/game/meta_building_registry.js
index c6add019..df7d5de9 100644
--- a/src/js/game/meta_building_registry.js
+++ b/src/js/game/meta_building_registry.js
@@ -236,4 +236,7 @@ export function initBuildingCodesAfterResourcesLoaded() {
);
variant.silhouetteColor = variant.metaInstance.getSilhouetteColor();
}
+
+ // Update caches
+ buildBuildingCodeCache();
}
diff --git a/src/js/game/systems/belt.js b/src/js/game/systems/belt.js
index ae9cc4c0..f4233d5f 100644
--- a/src/js/game/systems/belt.js
+++ b/src/js/game/systems/belt.js
@@ -1,522 +1,551 @@
-import { globalConfig } from "../../core/config";
-import { DrawParameters } from "../../core/draw_parameters";
-import { gMetaBuildingRegistry } from "../../core/global_registries";
-import { Loader } from "../../core/loader";
-import { createLogger } from "../../core/logging";
-import { AtlasSprite } from "../../core/sprites";
-import { fastArrayDeleteValue } from "../../core/utils";
-import { enumDirection, enumDirectionToVector, enumInvertedDirections, Vector } from "../../core/vector";
-import { BeltPath } from "../belt_path";
-import { BeltComponent } from "../components/belt";
-import { Entity } from "../entity";
-import { GameSystemWithFilter } from "../game_system_with_filter";
-import { MapChunkView } from "../map_chunk_view";
-import { defaultBuildingVariant } from "../meta_building";
-import { getCodeFromBuildingData } from "../building_codes";
-import { arrayBeltVariantToRotation, MetaBeltBuilding } from "../buildings/belt";
-
-export const BELT_ANIM_COUNT = 14;
-
-const logger = createLogger("belt");
-
-/**
- * Manages all belts
- */
-export class BeltSystem extends GameSystemWithFilter {
- constructor(root) {
- super(root, [BeltComponent]);
- /**
- * @type {Object.>}
- */
- this.beltSprites = {
- [enumDirection.top]: Loader.getSprite("sprites/belt/built/forward_0.png"),
- [enumDirection.left]: Loader.getSprite("sprites/belt/built/left_0.png"),
- [enumDirection.right]: Loader.getSprite("sprites/belt/built/right_0.png"),
- };
-
- /**
- * @type {Object.>}
- */
- this.beltAnimations = {
- [enumDirection.top]: [],
- [enumDirection.left]: [],
- [enumDirection.right]: [],
- };
-
- for (let i = 0; i < BELT_ANIM_COUNT; ++i) {
- this.beltAnimations[enumDirection.top].push(
- Loader.getSprite("sprites/belt/built/forward_" + i + ".png")
- );
- this.beltAnimations[enumDirection.left].push(
- Loader.getSprite("sprites/belt/built/left_" + i + ".png")
- );
- this.beltAnimations[enumDirection.right].push(
- Loader.getSprite("sprites/belt/built/right_" + i + ".png")
- );
- }
-
- this.root.signals.entityDestroyed.add(this.onEntityDestroyed, this);
- this.root.signals.entityDestroyed.add(this.updateSurroundingBeltPlacement, this);
-
- // Notice: These must come *after* the entity destroyed signals
- this.root.signals.entityAdded.add(this.onEntityAdded, this);
- this.root.signals.entityAdded.add(this.updateSurroundingBeltPlacement, this);
-
- /** @type {Array} */
- this.beltPaths = [];
- }
-
- /**
- * Serializes all belt paths
- * @returns {Array}
- */
- serializePaths() {
- let data = [];
- for (let i = 0; i < this.beltPaths.length; ++i) {
- data.push(this.beltPaths[i].serialize());
- }
- return data;
- }
-
- /**
- * Deserializes all belt paths
- * @param {Array} data
- */
- deserializePaths(data) {
- if (!Array.isArray(data)) {
- return "Belt paths are not an array: " + typeof data;
- }
-
- for (let i = 0; i < data.length; ++i) {
- const path = BeltPath.fromSerialized(this.root, data[i]);
- // If path is a string, that means its an error
- if (!(path instanceof BeltPath)) {
- return "Failed to create path from belt data: " + path;
- }
- this.beltPaths.push(path);
- }
-
- if (this.beltPaths.length === 0) {
- // Old savegames might not have paths yet
- logger.warn("Recomputing belt paths (most likely the savegame is old or empty)");
- this.recomputeAllBeltPaths();
- } else {
- logger.warn("Restored", this.beltPaths.length, "belt paths");
- }
-
- if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
- this.debug_verifyBeltPaths();
- }
- }
-
- /**
- * Updates the belt placement after an entity has been added / deleted
- * @param {Entity} entity
- */
- updateSurroundingBeltPlacement(entity) {
- if (!this.root.gameInitialized) {
- return;
- }
-
- const staticComp = entity.components.StaticMapEntity;
- if (!staticComp) {
- return;
- }
-
- const metaBelt = gMetaBuildingRegistry.findByClass(MetaBeltBuilding);
- // Compute affected area
- const originalRect = staticComp.getTileSpaceBounds();
- const affectedArea = originalRect.expandedInAllDirections(1);
-
- /** @type {Set} */
- const changedPaths = new Set();
-
- for (let x = affectedArea.x; x < affectedArea.right(); ++x) {
- for (let y = affectedArea.y; y < affectedArea.bottom(); ++y) {
- if (originalRect.containsPoint(x, y)) {
- // Make sure we don't update the original entity
- continue;
- }
-
- const targetEntities = this.root.map.getLayersContentsMultipleXY(x, y);
- for (let i = 0; i < targetEntities.length; ++i) {
- const targetEntity = targetEntities[i];
-
- const targetBeltComp = targetEntity.components.Belt;
- const targetStaticComp = targetEntity.components.StaticMapEntity;
-
- if (!targetBeltComp) {
- // Not a belt
- continue;
- }
-
- const defaultVariant = metaBelt.getDefaultVariant(this.root);
-
- const {
- rotation,
- rotationVariant,
- } = defaultVariant.computeOptimalDirectionAndRotationVariantAtTile({
- root: this.root,
- tile: new Vector(x, y),
- rotation: targetStaticComp.originalRotation,
- layer: targetEntity.layer,
- });
-
- // Compute delta to see if anything changed
- const newDirection = arrayBeltVariantToRotation[rotationVariant];
-
- if (targetStaticComp.rotation !== rotation || newDirection !== targetBeltComp.direction) {
- // Ok, first remove it from its current path
- this.deleteEntityFromPath(targetBeltComp.assignedPath, targetEntity);
-
- // Change stuff
- targetStaticComp.rotation = rotation;
- //metaBelt.updateVariants(targetEntity, rotationVariant, defaultBuildingVariant);
- defaultVariant.updateEntityComponents(targetEntity, rotationVariant, this.root);
-
- // Update code as well
- targetStaticComp.code = getCodeFromBuildingData(
- metaBelt,
- defaultVariant,
- rotationVariant
- );
-
- // Now add it again
- this.addEntityToPaths(targetEntity);
-
- // Sanity
- if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
- this.debug_verifyBeltPaths();
- }
-
- // Make sure the chunks know about the update
- this.root.signals.entityChanged.dispatch(targetEntity);
- }
-
- if (targetBeltComp.assignedPath) {
- changedPaths.add(targetBeltComp.assignedPath);
- }
- }
- }
- }
-
- // notify all paths *afterwards* to avoid multi-updates
- changedPaths.forEach(path => path.onSurroundingsChanged());
-
- if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
- this.debug_verifyBeltPaths();
- }
- }
-
- /**
- * Called when an entity got destroyed
- * @param {Entity} entity
- */
- onEntityDestroyed(entity) {
- if (!this.root.gameInitialized) {
- return;
- }
-
- if (!entity.components.Belt) {
- return;
- }
-
- const assignedPath = entity.components.Belt.assignedPath;
- assert(assignedPath, "Entity has no belt path assigned");
- this.deleteEntityFromPath(assignedPath, entity);
- if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
- this.debug_verifyBeltPaths();
- }
- }
-
- /**
- * Attempts to delete the belt from its current path
- * @param {BeltPath} path
- * @param {Entity} entity
- */
- deleteEntityFromPath(path, entity) {
- if (path.entityPath.length === 1) {
- // This is a single entity path, easy to do, simply erase whole path
- fastArrayDeleteValue(this.beltPaths, path);
- return;
- }
-
- // Notice: Since there might be circular references, it is important to check
- // which role the entity has
- if (path.isStartEntity(entity)) {
- // We tried to delete the start
- path.deleteEntityOnStart(entity);
- } else if (path.isEndEntity(entity)) {
- // We tried to delete the end
- path.deleteEntityOnEnd(entity);
- } else {
- // We tried to delete something inbetween
- const newPath = path.deleteEntityOnPathSplitIntoTwo(entity);
- this.beltPaths.push(newPath);
- }
-
- // Sanity
- entity.components.Belt.assignedPath = null;
- }
-
- /**
- * Adds the given entity to the appropriate paths
- * @param {Entity} entity
- */
- addEntityToPaths(entity) {
- const fromEntity = this.findSupplyingEntity(entity);
- const toEntity = this.findFollowUpEntity(entity);
-
- // Check if we can add the entity to the previous path
- if (fromEntity) {
- const fromPath = fromEntity.components.Belt.assignedPath;
- fromPath.extendOnEnd(entity);
-
- // Check if we now can extend the current path by the next path
- if (toEntity) {
- const toPath = toEntity.components.Belt.assignedPath;
-
- if (fromPath === toPath) {
- // This is a circular dependency -> Ignore
- } else {
- fromPath.extendByPath(toPath);
-
- // Delete now obsolete path
- fastArrayDeleteValue(this.beltPaths, toPath);
- }
- }
- } else {
- if (toEntity) {
- // Prepend it to the other path
- const toPath = toEntity.components.Belt.assignedPath;
- toPath.extendOnBeginning(entity);
- } else {
- // This is an empty belt path
- const path = new BeltPath(this.root, [entity]);
- this.beltPaths.push(path);
- }
- }
- }
-
- /**
- * Called when an entity got added
- * @param {Entity} entity
- */
- onEntityAdded(entity) {
- if (!this.root.gameInitialized) {
- return;
- }
-
- if (!entity.components.Belt) {
- return;
- }
-
- this.addEntityToPaths(entity);
- if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
- this.debug_verifyBeltPaths();
- }
- }
-
- /**
- * Draws all belt paths
- * @param {DrawParameters} parameters
- */
- drawBeltItems(parameters) {
- for (let i = 0; i < this.beltPaths.length; ++i) {
- this.beltPaths[i].draw(parameters);
- }
- }
-
- /**
- * Verifies all belt paths
- */
- debug_verifyBeltPaths() {
- for (let i = 0; i < this.beltPaths.length; ++i) {
- this.beltPaths[i].debug_checkIntegrity("general-verify");
- }
-
- const belts = this.root.entityMgr.getAllWithComponent(BeltComponent);
- for (let i = 0; i < belts.length; ++i) {
- const path = belts[i].components.Belt.assignedPath;
- if (!path) {
- throw new Error("Belt has no path: " + belts[i].uid);
- }
- if (this.beltPaths.indexOf(path) < 0) {
- throw new Error("Path of entity not contained: " + belts[i].uid);
- }
- }
- }
-
- /**
- * Finds the follow up entity for a given belt. Used for building the dependencies
- * @param {Entity} entity
- * @returns {Entity|null}
- */
- findFollowUpEntity(entity) {
- const staticComp = entity.components.StaticMapEntity;
- const beltComp = entity.components.Belt;
-
- const followUpDirection = staticComp.localDirectionToWorld(beltComp.direction);
- const followUpVector = enumDirectionToVector[followUpDirection];
-
- const followUpTile = staticComp.origin.add(followUpVector);
- const followUpEntity = this.root.map.getLayerContentXY(followUpTile.x, followUpTile.y, entity.layer);
-
- // Check if theres a belt at the tile we point to
- if (followUpEntity) {
- const followUpBeltComp = followUpEntity.components.Belt;
- if (followUpBeltComp) {
- const followUpStatic = followUpEntity.components.StaticMapEntity;
-
- const acceptedDirection = followUpStatic.localDirectionToWorld(enumDirection.top);
- if (acceptedDirection === followUpDirection) {
- return followUpEntity;
- }
- }
- }
-
- return null;
- }
-
- /**
- * Finds the supplying belt for a given belt. Used for building the dependencies
- * @param {Entity} entity
- * @returns {Entity|null}
- */
- findSupplyingEntity(entity) {
- const staticComp = entity.components.StaticMapEntity;
-
- const supplyDirection = staticComp.localDirectionToWorld(enumDirection.bottom);
- const supplyVector = enumDirectionToVector[supplyDirection];
-
- const supplyTile = staticComp.origin.add(supplyVector);
- const supplyEntity = this.root.map.getLayerContentXY(supplyTile.x, supplyTile.y, entity.layer);
-
- // Check if theres a belt at the tile we point to
- if (supplyEntity) {
- const supplyBeltComp = supplyEntity.components.Belt;
- if (supplyBeltComp) {
- const supplyStatic = supplyEntity.components.StaticMapEntity;
- const otherDirection = supplyStatic.localDirectionToWorld(
- enumInvertedDirections[supplyBeltComp.direction]
- );
-
- if (otherDirection === supplyDirection) {
- return supplyEntity;
- }
- }
- }
-
- return null;
- }
-
- /**
- * Recomputes the belt path network. Only required for old savegames
- */
- recomputeAllBeltPaths() {
- logger.warn("Recomputing all belt paths");
- const visitedUids = new Set();
-
- const result = [];
-
- for (let i = 0; i < this.allEntities.length; ++i) {
- const entity = this.allEntities[i];
- if (visitedUids.has(entity.uid)) {
- continue;
- }
-
- // Mark entity as visited
- visitedUids.add(entity.uid);
-
- // Compute path, start with entity and find precedors / successors
- const path = [entity];
-
- // Prevent infinite loops
- let maxIter = 99999;
-
- // Find precedors
- let prevEntity = this.findSupplyingEntity(entity);
- while (prevEntity && --maxIter > 0) {
- if (visitedUids.has(prevEntity.uid)) {
- break;
- }
- path.unshift(prevEntity);
- visitedUids.add(prevEntity.uid);
- prevEntity = this.findSupplyingEntity(prevEntity);
- }
-
- // Find succedors
- let nextEntity = this.findFollowUpEntity(entity);
- while (nextEntity && --maxIter > 0) {
- if (visitedUids.has(nextEntity.uid)) {
- break;
- }
-
- path.push(nextEntity);
- visitedUids.add(nextEntity.uid);
- nextEntity = this.findFollowUpEntity(nextEntity);
- }
-
- assert(maxIter > 1, "Ran out of iterations");
- result.push(new BeltPath(this.root, path));
- }
-
- logger.log("Found", this.beltPaths.length, "belt paths");
- this.beltPaths = result;
- }
-
- /**
- * Updates all belts
- */
- update() {
- if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
- this.debug_verifyBeltPaths();
- }
-
- for (let i = 0; i < this.beltPaths.length; ++i) {
- this.beltPaths[i].update();
- }
-
- if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
- this.debug_verifyBeltPaths();
- }
- }
-
- /**
- * Draws a given chunk
- * @param {DrawParameters} parameters
- * @param {MapChunkView} chunk
- */
- drawChunk(parameters, chunk) {
- // Limit speed to avoid belts going backwards
- const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10);
-
- // SYNC with systems/item_acceptor.js:drawEntityUnderlays!
- // 126 / 42 is the exact animation speed of the png animation
- const animationIndex = Math.floor(
- ((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) *
- globalConfig.itemSpacingOnBelts
- );
- const contents = chunk.containedEntitiesByLayer.regular;
- for (let i = 0; i < contents.length; ++i) {
- const entity = contents[i];
- if (entity.components.Belt) {
- const direction = entity.components.Belt.direction;
- const sprite = this.beltAnimations[direction][animationIndex % BELT_ANIM_COUNT];
-
- // Culling happens within the static map entity component
- entity.components.StaticMapEntity.drawSpriteOnBoundsClipped(parameters, sprite, 0);
- }
- }
- }
-
- /**
- * Draws the belt path debug overlays
- * @param {DrawParameters} parameters
- */
- drawBeltPathDebug(parameters) {
- for (let i = 0; i < this.beltPaths.length; ++i) {
- this.beltPaths[i].drawDebug(parameters);
- }
- }
-}
+import { globalConfig } from "../../core/config";
+import { DrawParameters } from "../../core/draw_parameters";
+import { gMetaBuildingRegistry } from "../../core/global_registries";
+import { Loader } from "../../core/loader";
+import { createLogger } from "../../core/logging";
+import { AtlasSprite } from "../../core/sprites";
+import { fastArrayDeleteValue } from "../../core/utils";
+import { enumDirection, enumDirectionToVector, enumInvertedDirections, Vector } from "../../core/vector";
+import { BeltPath } from "../belt_path";
+import { arrayBeltVariantToRotation, MetaBeltBuilding } from "../buildings/belt";
+import { getCodeFromBuildingData } from "../building_codes";
+import { BeltComponent } from "../components/belt";
+import { Entity } from "../entity";
+import { GameSystemWithFilter } from "../game_system_with_filter";
+import { MapChunkView } from "../map_chunk_view";
+import { defaultBuildingVariant } from "../meta_building";
+
+export const BELT_ANIM_COUNT = 14;
+
+const logger = createLogger("belt");
+
+/**
+ * Manages all belts
+ */
+export class BeltSystem extends GameSystemWithFilter {
+ constructor(root) {
+ super(root, [BeltComponent]);
+ /**
+ * @type {Object.>}
+ */
+ this.beltSprites = {
+ [enumDirection.top]: Loader.getSprite("sprites/belt/built/forward_0.png"),
+ [enumDirection.left]: Loader.getSprite("sprites/belt/built/left_0.png"),
+ [enumDirection.right]: Loader.getSprite("sprites/belt/built/right_0.png"),
+ };
+
+ /**
+ * @type {Object.>}
+ */
+ this.beltAnimations = {
+ [enumDirection.top]: [],
+ [enumDirection.left]: [],
+ [enumDirection.right]: [],
+ };
+
+ for (let i = 0; i < BELT_ANIM_COUNT; ++i) {
+ this.beltAnimations[enumDirection.top].push(
+ Loader.getSprite("sprites/belt/built/forward_" + i + ".png")
+ );
+ this.beltAnimations[enumDirection.left].push(
+ Loader.getSprite("sprites/belt/built/left_" + i + ".png")
+ );
+ this.beltAnimations[enumDirection.right].push(
+ Loader.getSprite("sprites/belt/built/right_" + i + ".png")
+ );
+ }
+
+ this.root.signals.entityDestroyed.add(this.onEntityDestroyed, this);
+ this.root.signals.entityDestroyed.add(this.updateSurroundingBeltPlacement, this);
+
+ // Notice: These must come *after* the entity destroyed signals
+ this.root.signals.entityAdded.add(this.onEntityAdded, this);
+ this.root.signals.entityAdded.add(this.updateSurroundingBeltPlacement, this);
+
+ /** @type {Array} */
+ this.beltPaths = [];
+ }
+
+ /**
+ * Serializes all belt paths
+ * @returns {Array}
+ */
+ serializePaths() {
+ let data = [];
+ for (let i = 0; i < this.beltPaths.length; ++i) {
+ data.push(this.beltPaths[i].serialize());
+ }
+ return data;
+ }
+
+ /**
+ * Deserializes all belt paths
+ * @param {Array} data
+ */
+ deserializePaths(data) {
+ if (!Array.isArray(data)) {
+ return "Belt paths are not an array: " + typeof data;
+ }
+
+ for (let i = 0; i < data.length; ++i) {
+ const path = BeltPath.fromSerialized(this.root, data[i]);
+ // If path is a string, that means its an error
+ if (!(path instanceof BeltPath)) {
+ return "Failed to create path from belt data: " + path;
+ }
+ this.beltPaths.push(path);
+ }
+
+ if (this.beltPaths.length === 0) {
+ // Old savegames might not have paths yet
+ logger.warn("Recomputing belt paths (most likely the savegame is old or empty)");
+ this.recomputeAllBeltPaths();
+ } else {
+ logger.warn("Restored", this.beltPaths.length, "belt paths");
+ }
+
+ if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
+ this.debug_verifyBeltPaths();
+ }
+ }
+
+ /**
+ * Updates the belt placement after an entity has been added / deleted
+ * @param {Entity} entity
+ */
+ updateSurroundingBeltPlacement(entity) {
+ if (!this.root.gameInitialized) {
+ return;
+ }
+
+ const staticComp = entity.components.StaticMapEntity;
+ if (!staticComp) {
+ return;
+ }
+
+ const metaBelt = gMetaBuildingRegistry.findByClass(MetaBeltBuilding);
+ // Compute affected area
+ const originalRect = staticComp.getTileSpaceBounds();
+ const affectedArea = originalRect.expandedInAllDirections(1);
+
+ /** @type {Set} */
+ const changedPaths = new Set();
+
+ for (let x = affectedArea.x; x < affectedArea.right(); ++x) {
+ for (let y = affectedArea.y; y < affectedArea.bottom(); ++y) {
+ if (originalRect.containsPoint(x, y)) {
+ // Make sure we don't update the original entity
+ continue;
+ }
+
+ const targetEntities = this.root.map.getLayersContentsMultipleXY(x, y);
+ for (let i = 0; i < targetEntities.length; ++i) {
+ const targetEntity = targetEntities[i];
+
+ const targetBeltComp = targetEntity.components.Belt;
+ const targetStaticComp = targetEntity.components.StaticMapEntity;
+
+ if (!targetBeltComp) {
+ // Not a belt
+ continue;
+ }
+
+ const defaultVariant = metaBelt.getDefaultVariant(this.root);
+
+ const {
+ rotation,
+ rotationVariant,
+ } = defaultVariant.computeOptimalDirectionAndRotationVariantAtTile({
+ root: this.root,
+ tile: new Vector(x, y),
+ rotation: targetStaticComp.originalRotation,
+ layer: targetEntity.layer,
+ });
+
+ // Compute delta to see if anything changed
+ const newDirection = arrayBeltVariantToRotation[rotationVariant];
+
+ if (targetStaticComp.rotation !== rotation || newDirection !== targetBeltComp.direction) {
+ // Ok, first remove it from its current path
+ this.deleteEntityFromPath(targetBeltComp.assignedPath, targetEntity);
+
+ // Change stuff
+ targetStaticComp.rotation = rotation;
+ //metaBelt.updateVariants(targetEntity, rotationVariant, defaultBuildingVariant);
+ defaultVariant.updateEntityComponents(targetEntity, rotationVariant, this.root);
+
+ // Update code as well
+ targetStaticComp.code = getCodeFromBuildingData(
+ metaBelt,
+ defaultVariant,
+ rotationVariant
+ );
+
+ // Now add it again
+ this.addEntityToPaths(targetEntity);
+
+ // Sanity
+ if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
+ this.debug_verifyBeltPaths();
+ }
+
+ // Make sure the chunks know about the update
+ this.root.signals.entityChanged.dispatch(targetEntity);
+ }
+
+ if (targetBeltComp.assignedPath) {
+ changedPaths.add(targetBeltComp.assignedPath);
+ }
+ }
+ }
+ }
+
+ // notify all paths *afterwards* to avoid multi-updates
+ changedPaths.forEach(path => path.onSurroundingsChanged());
+
+ if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
+ this.debug_verifyBeltPaths();
+ }
+ }
+
+ /**
+ * Called when an entity got destroyed
+ * @param {Entity} entity
+ */
+ onEntityDestroyed(entity) {
+ if (!this.root.gameInitialized) {
+ return;
+ }
+
+ if (!entity.components.Belt) {
+ return;
+ }
+
+ const assignedPath = entity.components.Belt.assignedPath;
+ assert(assignedPath, "Entity has no belt path assigned");
+ this.deleteEntityFromPath(assignedPath, entity);
+ if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
+ this.debug_verifyBeltPaths();
+ }
+ }
+
+ /**
+ * Attempts to delete the belt from its current path
+ * @param {BeltPath} path
+ * @param {Entity} entity
+ */
+ deleteEntityFromPath(path, entity) {
+ if (path.entityPath.length === 1) {
+ // This is a single entity path, easy to do, simply erase whole path
+ fastArrayDeleteValue(this.beltPaths, path);
+ return;
+ }
+
+ // Notice: Since there might be circular references, it is important to check
+ // which role the entity has
+ if (path.isStartEntity(entity)) {
+ // We tried to delete the start
+ path.deleteEntityOnStart(entity);
+ } else if (path.isEndEntity(entity)) {
+ // We tried to delete the end
+ path.deleteEntityOnEnd(entity);
+ } else {
+ // We tried to delete something inbetween
+ const newPath = path.deleteEntityOnPathSplitIntoTwo(entity);
+ this.beltPaths.push(newPath);
+ }
+
+ // Sanity
+ entity.components.Belt.assignedPath = null;
+ }
+
+ /**
+ * Adds the given entity to the appropriate paths
+ * @param {Entity} entity
+ */
+ addEntityToPaths(entity) {
+ const fromEntity = this.findSupplyingEntity(entity);
+ const toEntity = this.findFollowUpEntity(entity);
+
+ // Check if we can add the entity to the previous path
+ if (fromEntity) {
+ const fromPath = fromEntity.components.Belt.assignedPath;
+ fromPath.extendOnEnd(entity);
+
+ // Check if we now can extend the current path by the next path
+ if (toEntity) {
+ const toPath = toEntity.components.Belt.assignedPath;
+
+ if (fromPath === toPath) {
+ // This is a circular dependency -> Ignore
+ } else {
+ fromPath.extendByPath(toPath);
+
+ // Delete now obsolete path
+ fastArrayDeleteValue(this.beltPaths, toPath);
+ }
+ }
+ } else {
+ if (toEntity) {
+ // Prepend it to the other path
+ const toPath = toEntity.components.Belt.assignedPath;
+ toPath.extendOnBeginning(entity);
+ } else {
+ // This is an empty belt path
+ const path = new BeltPath(this.root, [entity]);
+ this.beltPaths.push(path);
+ }
+ }
+ }
+
+ /**
+ * Called when an entity got added
+ * @param {Entity} entity
+ */
+ onEntityAdded(entity) {
+ if (!this.root.gameInitialized) {
+ return;
+ }
+
+ if (!entity.components.Belt) {
+ return;
+ }
+
+ this.addEntityToPaths(entity);
+ if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
+ this.debug_verifyBeltPaths();
+ }
+ }
+
+ /**
+ * Draws all belt paths
+ * @param {DrawParameters} parameters
+ */
+ drawBeltItems(parameters) {
+ for (let i = 0; i < this.beltPaths.length; ++i) {
+ this.beltPaths[i].draw(parameters);
+ }
+ }
+
+ /**
+ * Verifies all belt paths
+ */
+ debug_verifyBeltPaths() {
+ for (let i = 0; i < this.beltPaths.length; ++i) {
+ this.beltPaths[i].debug_checkIntegrity("general-verify");
+ }
+
+ const belts = this.root.entityMgr.getAllWithComponent(BeltComponent);
+ for (let i = 0; i < belts.length; ++i) {
+ const path = belts[i].components.Belt.assignedPath;
+ if (!path) {
+ throw new Error("Belt has no path: " + belts[i].uid);
+ }
+ if (this.beltPaths.indexOf(path) < 0) {
+ throw new Error("Path of entity not contained: " + belts[i].uid);
+ }
+ }
+ }
+
+ /**
+ * Finds the follow up entity for a given belt. Used for building the dependencies
+ * @param {Entity} entity
+ * @returns {Entity|null}
+ */
+ findFollowUpEntity(entity) {
+ const staticComp = entity.components.StaticMapEntity;
+ const beltComp = entity.components.Belt;
+
+ const followUpDirection = staticComp.localDirectionToWorld(beltComp.direction);
+ const followUpVector = enumDirectionToVector[followUpDirection];
+
+ const followUpTile = staticComp.origin.add(followUpVector);
+ const followUpEntity = this.root.map.getLayerContentXY(followUpTile.x, followUpTile.y, entity.layer);
+
+ // Check if there's a belt at the tile we point to
+ if (followUpEntity) {
+ const followUpBeltComp = followUpEntity.components.Belt;
+ if (followUpBeltComp) {
+ const followUpStatic = followUpEntity.components.StaticMapEntity;
+
+ const acceptedDirection = followUpStatic.localDirectionToWorld(enumDirection.top);
+ if (acceptedDirection === followUpDirection) {
+ return followUpEntity;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Finds the supplying belt for a given belt. Used for building the dependencies
+ * @param {Entity} entity
+ * @returns {Entity|null}
+ */
+ findSupplyingEntity(entity) {
+ const staticComp = entity.components.StaticMapEntity;
+
+ const supplyDirection = staticComp.localDirectionToWorld(enumDirection.bottom);
+ const supplyVector = enumDirectionToVector[supplyDirection];
+
+ const supplyTile = staticComp.origin.add(supplyVector);
+ const supplyEntity = this.root.map.getLayerContentXY(supplyTile.x, supplyTile.y, entity.layer);
+
+ // Check if there's a belt at the tile we point to
+ if (supplyEntity) {
+ const supplyBeltComp = supplyEntity.components.Belt;
+ if (supplyBeltComp) {
+ const supplyStatic = supplyEntity.components.StaticMapEntity;
+ const otherDirection = supplyStatic.localDirectionToWorld(
+ enumInvertedDirections[supplyBeltComp.direction]
+ );
+
+ if (otherDirection === supplyDirection) {
+ return supplyEntity;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Recomputes the belt path network. Only required for old savegames
+ */
+ recomputeAllBeltPaths() {
+ logger.warn("Recomputing all belt paths");
+ const visitedUids = new Set();
+
+ const result = [];
+
+ for (let i = 0; i < this.allEntities.length; ++i) {
+ const entity = this.allEntities[i];
+ if (visitedUids.has(entity.uid)) {
+ continue;
+ }
+
+ // Mark entity as visited
+ visitedUids.add(entity.uid);
+
+ // Compute path, start with entity and find precedors / successors
+ const path = [entity];
+
+ // Prevent infinite loops
+ let maxIter = 99999;
+
+ // Find precedors
+ let prevEntity = this.findSupplyingEntity(entity);
+ while (prevEntity && --maxIter > 0) {
+ if (visitedUids.has(prevEntity.uid)) {
+ break;
+ }
+ path.unshift(prevEntity);
+ visitedUids.add(prevEntity.uid);
+ prevEntity = this.findSupplyingEntity(prevEntity);
+ }
+
+ // Find succedors
+ let nextEntity = this.findFollowUpEntity(entity);
+ while (nextEntity && --maxIter > 0) {
+ if (visitedUids.has(nextEntity.uid)) {
+ break;
+ }
+
+ path.push(nextEntity);
+ visitedUids.add(nextEntity.uid);
+ nextEntity = this.findFollowUpEntity(nextEntity);
+ }
+
+ assert(maxIter > 1, "Ran out of iterations");
+ result.push(new BeltPath(this.root, path));
+ }
+
+ logger.log("Found", this.beltPaths.length, "belt paths");
+ this.beltPaths = result;
+ }
+
+ /**
+ * Updates all belts
+ */
+ update() {
+ if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
+ this.debug_verifyBeltPaths();
+ }
+
+ for (let i = 0; i < this.beltPaths.length; ++i) {
+ this.beltPaths[i].update();
+ }
+
+ if (G_IS_DEV && globalConfig.debug.checkBeltPaths) {
+ this.debug_verifyBeltPaths();
+ }
+ }
+
+ /**
+ * Draws a given chunk
+ * @param {DrawParameters} parameters
+ * @param {MapChunkView} chunk
+ */
+ drawChunk(parameters, chunk) {
+ // Limit speed to avoid belts going backwards
+ const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10);
+
+ // SYNC with systems/item_acceptor.js:drawEntityUnderlays!
+ // 126 / 42 is the exact animation speed of the png animation
+ const animationIndex = Math.floor(
+ ((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) *
+ globalConfig.itemSpacingOnBelts
+ );
+ const contents = chunk.containedEntitiesByLayer.regular;
+
+ if (this.root.app.settings.getAllSettings().simplifiedBelts) {
+ // POTATO Mode: Only show items when belt is hovered
+ let hoveredBeltPath = null;
+ const mousePos = this.root.app.mousePosition;
+ if (mousePos) {
+ const tile = this.root.camera.screenToWorld(mousePos).toTileSpace();
+ const contents = this.root.map.getLayerContentXY(tile.x, tile.y, "regular");
+ if (contents && contents.components.Belt) {
+ hoveredBeltPath = contents.components.Belt.assignedPath;
+ }
+ }
+
+ for (let i = 0; i < contents.length; ++i) {
+ const entity = contents[i];
+ if (entity.components.Belt) {
+ const direction = entity.components.Belt.direction;
+ let sprite = this.beltAnimations[direction][0];
+
+ if (entity.components.Belt.assignedPath === hoveredBeltPath) {
+ sprite = this.beltAnimations[direction][animationIndex % BELT_ANIM_COUNT];
+ }
+
+ // Culling happens within the static map entity component
+ entity.components.StaticMapEntity.drawSpriteOnBoundsClipped(parameters, sprite, 0);
+ }
+ }
+ } else {
+ for (let i = 0; i < contents.length; ++i) {
+ const entity = contents[i];
+ if (entity.components.Belt) {
+ const direction = entity.components.Belt.direction;
+ const sprite = this.beltAnimations[direction][animationIndex % BELT_ANIM_COUNT];
+
+ // Culling happens within the static map entity component
+ entity.components.StaticMapEntity.drawSpriteOnBoundsClipped(parameters, sprite, 0);
+ }
+ }
+ }
+ }
+
+ /**
+ * Draws the belt path debug overlays
+ * @param {DrawParameters} parameters
+ */
+ drawBeltPathDebug(parameters) {
+ for (let i = 0; i < this.beltPaths.length; ++i) {
+ this.beltPaths[i].drawDebug(parameters);
+ }
+ }
+}
diff --git a/src/js/game/systems/item_acceptor.js b/src/js/game/systems/item_acceptor.js
index 6d6fec77..780b4abd 100644
--- a/src/js/game/systems/item_acceptor.js
+++ b/src/js/game/systems/item_acceptor.js
@@ -9,14 +9,35 @@ 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;
}
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 *
this.root.hubGoals.getBeltBaseSpeed() *
- globalConfig.itemSpacingOnBelts; // * 2 because its only a half tile
+ globalConfig.itemSpacingOnBelts * // * 2 because its only a half tile
+ numTicks;
+
+ // Reset accumulated ticks
+ this.accumulatedTicksWhileInMapOverview = 0;
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
@@ -40,6 +61,11 @@ export class ItemAcceptorSystem extends GameSystemWithFilter {
* @param {MapChunkView} chunk
*/
drawChunk(parameters, chunk) {
+ if (this.root.app.settings.getAllSettings().simplifiedBelts) {
+ // Disabled in potato mode
+ return;
+ }
+
const contents = chunk.containedEntitiesByLayer.regular;
for (let i = 0; i < contents.length; ++i) {
const entity = contents[i];
diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js
index 8fe1cbc5..3bd97cc0 100644
--- a/src/js/game/systems/item_ejector.js
+++ b/src/js/game/systems/item_ejector.js
@@ -2,8 +2,11 @@ import { globalConfig } from "../../core/config";
import { DrawParameters } from "../../core/draw_parameters";
import { createLogger } from "../../core/logging";
import { Rectangle } from "../../core/rectangle";
+import { StaleAreaDetector } from "../../core/stale_area_detector";
import { enumDirection, enumDirectionToVector } from "../../core/vector";
import { BaseItem } from "../base_item";
+import { BeltComponent } from "../components/belt";
+import { ItemAcceptorComponent } from "../components/item_acceptor";
import { ItemEjectorComponent } from "../components/item_ejector";
import { Entity } from "../entity";
import { GameSystemWithFilter } from "../game_system_with_filter";
@@ -15,102 +18,52 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
constructor(root) {
super(root, [ItemEjectorComponent]);
- this.root.signals.entityAdded.add(this.checkForCacheInvalidation, this);
- this.root.signals.entityDestroyed.add(this.checkForCacheInvalidation, this);
- this.root.signals.postLoadHook.add(this.recomputeCache, this);
+ this.staleAreaDetector = new StaleAreaDetector({
+ root: this.root,
+ name: "item-ejector",
+ recomputeMethod: this.recomputeArea.bind(this),
+ });
- /**
- * @type {Rectangle}
- */
- this.areaToRecompute = null;
+ this.staleAreaDetector.recomputeOnComponentsChanged(
+ [ItemEjectorComponent, ItemAcceptorComponent, BeltComponent],
+ 1
+ );
+
+ this.root.signals.postLoadHook.add(this.recomputeCacheFull, this);
}
/**
- *
- * @param {Entity} entity
+ * Recomputes an area after it changed
+ * @param {Rectangle} area
*/
- checkForCacheInvalidation(entity) {
- if (!this.root.gameInitialized) {
- return;
- }
- if (!entity.components.StaticMapEntity) {
- return;
- }
-
- // Optimize for the common case: adding or removing one building at a time. Clicking
- // and dragging can cause up to 4 add/remove signals.
- const staticComp = entity.components.StaticMapEntity;
- const bounds = staticComp.getTileSpaceBounds();
- const expandedBounds = bounds.expandedInAllDirections(2);
-
- if (this.areaToRecompute) {
- this.areaToRecompute = this.areaToRecompute.getUnion(expandedBounds);
- } else {
- this.areaToRecompute = expandedBounds;
- }
- }
-
- /**
- * Precomputes the cache, which makes up for a huge performance improvement
- */
- recomputeCache() {
- if (this.areaToRecompute) {
- logger.log("Recomputing cache using rectangle");
- if (G_IS_DEV && globalConfig.debug.renderChanges) {
- this.root.hud.parts.changesDebugger.renderChange(
- "ejector-area",
- this.areaToRecompute,
- "#fe50a6"
- );
- }
- this.recomputeAreaCache();
- this.areaToRecompute = null;
- } else {
- logger.log("Full cache recompute");
- if (G_IS_DEV && globalConfig.debug.renderChanges) {
- this.root.hud.parts.changesDebugger.renderChange(
- "ejector-full",
- new Rectangle(-1000, -1000, 2000, 2000),
- "#fe50a6"
- );
- }
-
- // Try to find acceptors for every ejector
- for (let i = 0; i < this.allEntities.length; ++i) {
- const entity = this.allEntities[i];
- this.recomputeSingleEntityCache(entity);
- }
- }
- }
-
- /**
- * Recomputes the cache in the given area
- */
- recomputeAreaCache() {
- const area = this.areaToRecompute;
- let entryCount = 0;
-
- logger.log("Recomputing area:", area.x, area.y, "/", area.w, area.h);
-
- // Store the entities we already recomputed, so we don't do work twice
- const recomputedEntities = new Set();
-
- for (let x = area.x; x < area.right(); ++x) {
- for (let y = area.y; y < area.bottom(); ++y) {
- const entities = this.root.map.getLayersContentsMultipleXY(x, y);
- for (let i = 0; i < entities.length; ++i) {
- const entity = entities[i];
-
- // Recompute the entity in case its relevant for this system and it
- // hasn't already been computed
- if (!recomputedEntities.has(entity.uid) && entity.components.ItemEjector) {
- recomputedEntities.add(entity.uid);
- this.recomputeSingleEntityCache(entity);
+ recomputeArea(area) {
+ /** @type {Set} */
+ const seenUids = new Set();
+ for (let x = 0; x < area.w; ++x) {
+ for (let y = 0; y < area.h; ++y) {
+ const tileX = area.x + x;
+ const tileY = area.y + y;
+ // @NOTICE: Item ejector currently only supports regular layer
+ const contents = this.root.map.getLayerContentXY(tileX, tileY, "regular");
+ if (contents && contents.components.ItemEjector) {
+ if (!seenUids.has(contents.uid)) {
+ seenUids.add(contents.uid);
+ this.recomputeSingleEntityCache(contents);
}
}
}
}
- return entryCount;
+ }
+
+ /**
+ * Recomputes the whole cache after the game has loaded
+ */
+ recomputeCacheFull() {
+ logger.log("Full cache recompute in post load hook");
+ for (let i = 0; i < this.allEntities.length; ++i) {
+ const entity = this.allEntities[i];
+ this.recomputeSingleEntityCache(entity);
+ }
}
/**
@@ -183,9 +136,7 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
}
update() {
- if (this.areaToRecompute) {
- this.recomputeCache();
- }
+ this.staleAreaDetector.update();
// Precompute effective belt speed
let progressGrowth = 2 * this.root.dynamicTickrate.deltaSeconds;
@@ -251,7 +202,13 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
// Try to hand over the item
if (this.tryPassOverItem(item, destEntity, destSlot.index)) {
// Handover successful, clear slot
- targetAcceptorComp.onItemAccepted(destSlot.index, destSlot.acceptedDirection, item);
+ if (!this.root.app.settings.getAllSettings().simplifiedBelts) {
+ targetAcceptorComp.onItemAccepted(
+ destSlot.index,
+ destSlot.acceptedDirection,
+ item
+ );
+ }
sourceSlot.item = null;
continue;
}
@@ -333,6 +290,11 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
* @param {MapChunkView} chunk
*/
drawChunk(parameters, chunk) {
+ if (this.root.app.settings.getAllSettings().simplifiedBelts) {
+ // Disabled in potato mode
+ return;
+ }
+
const contents = chunk.containedEntitiesByLayer.regular;
for (let i = 0; i < contents.length; ++i) {
diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js
index d58aa697..3789eecc 100644
--- a/src/js/game/systems/item_processor.js
+++ b/src/js/game/systems/item_processor.js
@@ -553,25 +553,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
const bonusTimeToApply = Math.min(originalTime, processorComp.bonusTime);
const timeToProcess = originalTime - bonusTimeToApply;
- // Substract one tick because we already process it this frame
- // if (processorComp.bonusTime > originalTime) {
- // if (processorComp.type === enumItemProcessorTypes.reader) {
- // console.log(
- // "Bonus time",
- // round4Digits(processorComp.bonusTime),
- // "Original time",
- // round4Digits(originalTime),
- // "Overcomit by",
- // round4Digits(processorComp.bonusTime - originalTime),
- // "->",
- // round4Digits(timeToProcess),
- // "reduced by",
- // round4Digits(bonusTimeToApply)
- // );
- // }
- // }
processorComp.bonusTime -= bonusTimeToApply;
-
processorComp.ongoingCharges.push({
items: outItems,
remainingTime: timeToProcess,
diff --git a/src/js/game/systems/item_processor_overlays.js b/src/js/game/systems/item_processor_overlays.js
index 2ec91b88..26fc14dc 100644
--- a/src/js/game/systems/item_processor_overlays.js
+++ b/src/js/game/systems/item_processor_overlays.js
@@ -1,6 +1,6 @@
import { globalConfig } from "../../core/config";
import { Loader } from "../../core/loader";
-import { smoothPulse, round4Digits } from "../../core/utils";
+import { smoothPulse } from "../../core/utils";
import { enumItemProcessorRequirements, enumItemProcessorTypes } from "../components/item_processor";
import { Entity } from "../entity";
import { GameSystem } from "../game_system";
@@ -17,7 +17,6 @@ export class ItemProcessorOverlaysSystem extends GameSystem {
this.readerOverlaySprite = Loader.getSprite("sprites/misc/reader_overlay.png");
this.drawnUids = new Set();
-
this.root.signals.gameFrameStarted.add(this.clearDrawnUids, this);
}
@@ -40,7 +39,6 @@ export class ItemProcessorOverlaysSystem extends GameSystem {
}
const requirement = processorComp.processingRequirement;
-
if (!requirement && processorComp.type !== enumItemProcessorTypes.reader) {
continue;
}
diff --git a/src/js/game/systems/miner.js b/src/js/game/systems/miner.js
index 94f2791e..feda1594 100644
--- a/src/js/game/systems/miner.js
+++ b/src/js/game/systems/miner.js
@@ -46,7 +46,6 @@ export class MinerSystem extends GameSystemWithFilter {
}
// Check if miner is above an actual tile
-
if (!minerComp.cachedMinedItem) {
const staticComp = entity.components.StaticMapEntity;
const tileBelow = this.root.map.getLowerLayerContentXY(
@@ -171,7 +170,7 @@ export class MinerSystem extends GameSystemWithFilter {
}
// Draw the item background - this is to hide the ejected item animation from
- // the item ejecto
+ // the item ejector
const padding = 3;
const destX = staticComp.origin.x * globalConfig.tileSize + padding;
diff --git a/src/js/game/systems/storage.js b/src/js/game/systems/storage.js
index 5a2b57bb..80affac9 100644
--- a/src/js/game/systems/storage.js
+++ b/src/js/game/systems/storage.js
@@ -1,101 +1,101 @@
-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 { MapChunkView } from "../map_chunk_view";
-
-export class StorageSystem extends GameSystemWithFilter {
- constructor(root) {
- super(root, [StorageComponent]);
-
- this.storageOverlaySprite = Loader.getSprite("sprites/misc/storage_overlay.png");
-
- /**
- * Stores which uids were already drawn to avoid drawing entities twice
- * @type {Set}
- */
- this.drawnUids = new Set();
-
- this.root.signals.gameFrameStarted.add(this.clearDrawnUids, this);
- }
-
- clearDrawnUids() {
- this.drawnUids.clear();
- }
-
- update() {
- for (let i = 0; i < this.allEntities.length; ++i) {
- const entity = this.allEntities[i];
- const storageComp = entity.components.Storage;
- const pinsComp = entity.components.WiredPins;
-
- // Eject from storage
- if (storageComp.storedItem && storageComp.storedCount > 0) {
- const ejectorComp = entity.components.ItemEjector;
-
- const nextSlot = ejectorComp.getFirstFreeSlot();
- if (nextSlot !== null) {
- if (ejectorComp.tryEject(nextSlot, storageComp.storedItem)) {
- storageComp.storedCount--;
-
- if (storageComp.storedCount === 0) {
- storageComp.storedItem = null;
- }
- }
- }
- }
-
- 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;
- }
- }
-
- /**
- * @param {DrawParameters} parameters
- * @param {MapChunkView} chunk
- */
- drawChunk(parameters, chunk) {
- const contents = chunk.containedEntitiesByLayer.regular;
- for (let i = 0; i < contents.length; ++i) {
- const entity = contents[i];
- const storageComp = entity.components.Storage;
- if (!storageComp) {
- continue;
- }
-
- const storedItem = storageComp.storedItem;
- if (!storedItem) {
- continue;
- }
-
- if (this.drawnUids.has(entity.uid)) {
- continue;
- }
-
- this.drawnUids.add(entity.uid);
-
- const staticComp = entity.components.StaticMapEntity;
-
- const context = parameters.context;
- context.globalAlpha = storageComp.overlayOpacity;
- const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace();
- storedItem.drawItemCenteredClipped(center.x, center.y, parameters, 30);
-
- this.storageOverlaySprite.drawCached(parameters, center.x - 15, center.y + 15, 30, 15);
-
- if (parameters.visibleRect.containsCircle(center.x, center.y + 25, 20)) {
- context.font = "bold 10px GameFont";
- context.textAlign = "center";
- context.fillStyle = "#64666e";
- context.fillText(formatBigNumber(storageComp.storedCount), center.x, center.y + 25.5);
- context.textAlign = "left";
- }
- context.globalAlpha = 1;
- }
- }
-}
+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 { MapChunkView } from "../map_chunk_view";
+
+export class StorageSystem extends GameSystemWithFilter {
+ constructor(root) {
+ super(root, [StorageComponent]);
+
+ this.storageOverlaySprite = Loader.getSprite("sprites/misc/storage_overlay.png");
+
+ /**
+ * Stores which uids were already drawn to avoid drawing entities twice
+ * @type {Set}
+ */
+ this.drawnUids = new Set();
+
+ this.root.signals.gameFrameStarted.add(this.clearDrawnUids, this);
+ }
+
+ clearDrawnUids() {
+ this.drawnUids.clear();
+ }
+
+ update() {
+ for (let i = 0; i < this.allEntities.length; ++i) {
+ const entity = this.allEntities[i];
+ const storageComp = entity.components.Storage;
+ const pinsComp = entity.components.WiredPins;
+
+ // Eject from storage
+ if (storageComp.storedItem && storageComp.storedCount > 0) {
+ const ejectorComp = entity.components.ItemEjector;
+
+ const nextSlot = ejectorComp.getFirstFreeSlot();
+ if (nextSlot !== null) {
+ if (ejectorComp.tryEject(nextSlot, storageComp.storedItem)) {
+ storageComp.storedCount--;
+
+ if (storageComp.storedCount === 0) {
+ storageComp.storedItem = null;
+ }
+ }
+ }
+ }
+
+ 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;
+ }
+ }
+
+ /**
+ * @param {DrawParameters} parameters
+ * @param {MapChunkView} chunk
+ */
+ drawChunk(parameters, chunk) {
+ const contents = chunk.containedEntitiesByLayer.regular;
+ for (let i = 0; i < contents.length; ++i) {
+ const entity = contents[i];
+ const storageComp = entity.components.Storage;
+ if (!storageComp) {
+ continue;
+ }
+
+ const storedItem = storageComp.storedItem;
+ if (!storedItem) {
+ continue;
+ }
+
+ if (this.drawnUids.has(entity.uid)) {
+ continue;
+ }
+
+ this.drawnUids.add(entity.uid);
+
+ const staticComp = entity.components.StaticMapEntity;
+
+ const context = parameters.context;
+ context.globalAlpha = storageComp.overlayOpacity;
+ const center = staticComp.getTileSpaceBounds().getCenter().toWorldSpace();
+ storedItem.drawItemCenteredClipped(center.x, center.y, parameters, 30);
+
+ this.storageOverlaySprite.drawCached(parameters, center.x - 15, center.y + 15, 30, 15);
+
+ if (parameters.visibleRect.containsCircle(center.x, center.y + 25, 20)) {
+ context.font = "bold 10px GameFont";
+ context.textAlign = "center";
+ context.fillStyle = "#64666e";
+ context.fillText(formatBigNumber(storageComp.storedCount), center.x, center.y + 25.5);
+ context.textAlign = "left";
+ }
+ context.globalAlpha = 1;
+ }
+ }
+}
diff --git a/src/js/game/systems/underground_belt.js b/src/js/game/systems/underground_belt.js
index 90d29e50..ff437173 100644
--- a/src/js/game/systems/underground_belt.js
+++ b/src/js/game/systems/underground_belt.js
@@ -1,406 +1,369 @@
-import { globalConfig } from "../../core/config";
-import { Loader } from "../../core/loader";
-import { createLogger } from "../../core/logging";
-import { Rectangle } from "../../core/rectangle";
-import {
- enumAngleToDirection,
- enumDirection,
- enumDirectionToAngle,
- enumDirectionToVector,
- enumInvertedDirections,
-} from "../../core/vector";
-import { enumUndergroundBeltMode, UndergroundBeltComponent } from "../components/underground_belt";
-import { Entity } from "../entity";
-import { GameSystemWithFilter } from "../game_system_with_filter";
-import { fastArrayDelete } from "../../core/utils";
-
-const logger = createLogger("tunnels");
-
-export class UndergroundBeltSystem extends GameSystemWithFilter {
- constructor(root) {
- super(root, [UndergroundBeltComponent]);
-
- this.beltSprites = {
- [enumUndergroundBeltMode.sender]: Loader.getSprite(
- "sprites/buildings/underground_belt_entry.png"
- ),
- [enumUndergroundBeltMode.receiver]: Loader.getSprite(
- "sprites/buildings/underground_belt_exit.png"
- ),
- };
-
- this.root.signals.entityManuallyPlaced.add(this.onEntityManuallyPlaced, this);
-
- /**
- * @type {Rectangle}
- */
- this.areaToRecompute = null;
-
- this.root.signals.entityAdded.add(this.onEntityChanged, this);
- this.root.signals.entityDestroyed.add(this.onEntityChanged, this);
- }
-
- /**
- * Called when an entity got added or removed
- * @param {Entity} entity
- */
- onEntityChanged(entity) {
- if (!this.root.gameInitialized) {
- return;
- }
- const undergroundComp = entity.components.UndergroundBelt;
- if (!undergroundComp) {
- return;
- }
-
- const affectedArea = entity.components.StaticMapEntity.getTileSpaceBounds().expandedInAllDirections(
- globalConfig.undergroundBeltMaxTilesByTier[
- globalConfig.undergroundBeltMaxTilesByTier.length - 1
- ] + 1
- );
-
- if (this.areaToRecompute) {
- this.areaToRecompute = this.areaToRecompute.getUnion(affectedArea);
- } else {
- this.areaToRecompute = affectedArea;
- }
- }
-
- /**
- * Callback when an entity got placed, used to remove belts between underground belts
- * @param {Entity} entity
- */
- onEntityManuallyPlaced(entity) {
- if (!this.root.app.settings.getAllSettings().enableTunnelSmartplace) {
- // Smart-place disabled
- return;
- }
-
- const undergroundComp = entity.components.UndergroundBelt;
- if (undergroundComp && undergroundComp.mode === enumUndergroundBeltMode.receiver) {
- const staticComp = entity.components.StaticMapEntity;
- const tile = staticComp.origin;
-
- const direction = enumAngleToDirection[staticComp.rotation];
- const inverseDirection = enumInvertedDirections[direction];
- const offset = enumDirectionToVector[inverseDirection];
-
- let currentPos = tile.copy();
-
- const tier = undergroundComp.tier;
- const range = globalConfig.undergroundBeltMaxTilesByTier[tier];
-
- // FIND ENTRANCE
- // Search for the entrance which is furthes apart (this is why we can't reuse logic here)
- let matchingEntrance = null;
- for (let i = 0; i < range; ++i) {
- currentPos.addInplace(offset);
- const contents = this.root.map.getTileContent(currentPos, entity.layer);
- if (!contents) {
- continue;
- }
-
- const contentsUndergroundComp = contents.components.UndergroundBelt;
- const contentsStaticComp = contents.components.StaticMapEntity;
- if (
- contentsUndergroundComp &&
- contentsUndergroundComp.tier === undergroundComp.tier &&
- contentsUndergroundComp.mode === enumUndergroundBeltMode.sender &&
- enumAngleToDirection[contentsStaticComp.rotation] === direction
- ) {
- matchingEntrance = {
- entity: contents,
- range: i,
- };
- }
- }
-
- if (!matchingEntrance) {
- // Nothing found
- return;
- }
-
- // DETECT OBSOLETE BELTS BETWEEN
- // Remove any belts between entrance and exit which have the same direction,
- // but only if they *all* have the right direction
- currentPos = tile.copy();
- let allBeltsMatch = true;
- for (let i = 0; i < matchingEntrance.range; ++i) {
- currentPos.addInplace(offset);
-
- const contents = this.root.map.getTileContent(currentPos, entity.layer);
- if (!contents) {
- allBeltsMatch = false;
- break;
- }
-
- const contentsStaticComp = contents.components.StaticMapEntity;
- const contentsBeltComp = contents.components.Belt;
- if (!contentsBeltComp) {
- allBeltsMatch = false;
- break;
- }
-
- // It's a belt
- if (
- contentsBeltComp.direction !== enumDirection.top ||
- enumAngleToDirection[contentsStaticComp.rotation] !== direction
- ) {
- allBeltsMatch = false;
- break;
- }
- }
-
- currentPos = tile.copy();
- if (allBeltsMatch) {
- // All belts between this are obsolete, so drop them
- for (let i = 0; i < matchingEntrance.range; ++i) {
- currentPos.addInplace(offset);
- const contents = this.root.map.getTileContent(currentPos, entity.layer);
- assert(contents, "Invalid smart underground belt logic");
- this.root.logic.tryDeleteBuilding(contents);
- }
- }
-
- // REMOVE OBSOLETE TUNNELS
- // Remove any double tunnels, by checking the tile plus the tile above
- currentPos = tile.copy().add(offset);
- for (let i = 0; i < matchingEntrance.range - 1; ++i) {
- const posBefore = currentPos.copy();
- currentPos.addInplace(offset);
-
- const entityBefore = this.root.map.getTileContent(posBefore, entity.layer);
- const entityAfter = this.root.map.getTileContent(currentPos, entity.layer);
-
- if (!entityBefore || !entityAfter) {
- continue;
- }
-
- const undergroundBefore = entityBefore.components.UndergroundBelt;
- const undergroundAfter = entityAfter.components.UndergroundBelt;
-
- if (!undergroundBefore || !undergroundAfter) {
- // Not an underground belt
- continue;
- }
-
- if (
- // Both same tier
- undergroundBefore.tier !== undergroundAfter.tier ||
- // And same tier as our original entity
- undergroundBefore.tier !== undergroundComp.tier
- ) {
- // Mismatching tier
- continue;
- }
-
- if (
- undergroundBefore.mode !== enumUndergroundBeltMode.sender ||
- undergroundAfter.mode !== enumUndergroundBeltMode.receiver
- ) {
- // Not the right mode
- continue;
- }
-
- // Check rotations
- const staticBefore = entityBefore.components.StaticMapEntity;
- const staticAfter = entityAfter.components.StaticMapEntity;
-
- if (
- enumAngleToDirection[staticBefore.rotation] !== direction ||
- enumAngleToDirection[staticAfter.rotation] !== direction
- ) {
- // Wrong rotation
- continue;
- }
-
- // All good, can remove
- this.root.logic.tryDeleteBuilding(entityBefore);
- this.root.logic.tryDeleteBuilding(entityAfter);
- }
- }
- }
-
- /**
- * Recomputes the cache in the given area, invalidating all entries there
- */
- recomputeArea() {
- const area = this.areaToRecompute;
- logger.log("Recomputing area:", area.x, area.y, "/", area.w, area.h);
- if (G_IS_DEV && globalConfig.debug.renderChanges) {
- this.root.hud.parts.changesDebugger.renderChange("tunnels", this.areaToRecompute, "#fc03be");
- }
-
- for (let x = area.x; x < area.right(); ++x) {
- for (let y = area.y; y < area.bottom(); ++y) {
- const entities = this.root.map.getLayersContentsMultipleXY(x, y);
- for (let i = 0; i < entities.length; ++i) {
- const entity = entities[i];
- const undergroundComp = entity.components.UndergroundBelt;
- if (!undergroundComp) {
- continue;
- }
-
- undergroundComp.cachedLinkedEntity = null;
- }
- }
- }
- }
-
- update() {
- if (this.areaToRecompute) {
- this.recomputeArea();
- this.areaToRecompute = null;
- }
-
- const delta = this.root.dynamicTickrate.deltaSeconds;
-
- for (let i = 0; i < this.allEntities.length; ++i) {
- const entity = this.allEntities[i];
- const undergroundComp = entity.components.UndergroundBelt;
- const pendingItems = undergroundComp.pendingItems;
-
- // Decrease remaining time of all items in belt
- for (let k = 0; k < pendingItems.length; ++k) {
- const item = pendingItems[k];
- item[1] = Math.max(0, item[1] - delta);
- if (G_IS_DEV && globalConfig.debug.instantBelts) {
- item[1] = 0;
- }
- }
- if (undergroundComp.mode === enumUndergroundBeltMode.sender) {
- this.handleSender(entity);
- } else {
- this.handleReceiver(entity);
- }
- }
- }
-
- /**
- * Finds the receiver for a given sender
- * @param {Entity} entity
- * @returns {import("../components/underground_belt").LinkedUndergroundBelt}
- */
- findRecieverForSender(entity) {
- const staticComp = entity.components.StaticMapEntity;
- const undergroundComp = entity.components.UndergroundBelt;
- const searchDirection = staticComp.localDirectionToWorld(enumDirection.top);
- const searchVector = enumDirectionToVector[searchDirection];
- const targetRotation = enumDirectionToAngle[searchDirection];
- let currentTile = staticComp.origin;
-
- // Search in the direction of the tunnel
- for (
- let searchOffset = 0;
- searchOffset < globalConfig.undergroundBeltMaxTilesByTier[undergroundComp.tier];
- ++searchOffset
- ) {
- currentTile = currentTile.add(searchVector);
-
- const potentialReceiver = this.root.map.getTileContent(currentTile, "regular");
- if (!potentialReceiver) {
- // Empty tile
- continue;
- }
- const receiverUndergroundComp = potentialReceiver.components.UndergroundBelt;
- if (!receiverUndergroundComp || receiverUndergroundComp.tier !== undergroundComp.tier) {
- // Not a tunnel, or not on the same tier
- continue;
- }
-
- const receiverStaticComp = potentialReceiver.components.StaticMapEntity;
- if (receiverStaticComp.rotation !== targetRotation) {
- // Wrong rotation
- continue;
- }
-
- if (receiverUndergroundComp.mode !== enumUndergroundBeltMode.receiver) {
- // Not a receiver, but a sender -> Abort to make sure we don't deliver double
- break;
- }
-
- return { entity: potentialReceiver, distance: searchOffset };
- }
-
- // None found
- return { entity: null, distance: 0 };
- }
-
- /**
- *
- * @param {Entity} entity
- */
- handleSender(entity) {
- const undergroundComp = entity.components.UndergroundBelt;
-
- // Find the current receiver
- let receiver = undergroundComp.cachedLinkedEntity;
- if (!receiver) {
- // We don't have a receiver, compute it
- receiver = undergroundComp.cachedLinkedEntity = this.findRecieverForSender(entity);
-
- if (G_IS_DEV && globalConfig.debug.renderChanges) {
- this.root.hud.parts.changesDebugger.renderChange(
- "sender",
- entity.components.StaticMapEntity.getTileSpaceBounds(),
- "#fc03be"
- );
- }
- }
-
- if (!receiver.entity) {
- // If there is no connection to a receiver, ignore this one
- return;
- }
-
- // Check if we have any item
- if (undergroundComp.pendingItems.length > 0) {
- assert(undergroundComp.pendingItems.length === 1, "more than 1 pending");
- const nextItemAndDuration = undergroundComp.pendingItems[0];
- const remainingTime = nextItemAndDuration[1];
- const nextItem = nextItemAndDuration[0];
-
- // Check if the item is ready to be emitted
- if (remainingTime === 0) {
- // Check if the receiver can accept it
- if (
- receiver.entity.components.UndergroundBelt.tryAcceptTunneledItem(
- nextItem,
- receiver.distance,
- this.root.hubGoals.getUndergroundBeltBaseSpeed()
- )
- ) {
- // Drop this item
- fastArrayDelete(undergroundComp.pendingItems, 0);
- }
- }
- }
- }
-
- /**
- *
- * @param {Entity} entity
- */
- handleReceiver(entity) {
- const undergroundComp = entity.components.UndergroundBelt;
-
- // Try to eject items, we only check the first one because it is sorted by remaining time
- const items = undergroundComp.pendingItems;
- if (items.length > 0) {
- const nextItemAndDuration = undergroundComp.pendingItems[0];
- const remainingTime = nextItemAndDuration[1];
- const nextItem = nextItemAndDuration[0];
-
- if (remainingTime <= 0) {
- const ejectorComp = entity.components.ItemEjector;
-
- const nextSlotIndex = ejectorComp.getFirstFreeSlot();
- if (nextSlotIndex !== null) {
- if (ejectorComp.tryEject(nextSlotIndex, nextItem)) {
- items.shift();
- }
- }
- }
- }
- }
-}
+import { globalConfig } from "../../core/config";
+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,
+ enumDirectionToAngle,
+ enumDirectionToVector,
+ enumInvertedDirections,
+} from "../../core/vector";
+import { enumUndergroundBeltMode, UndergroundBeltComponent } from "../components/underground_belt";
+import { Entity } from "../entity";
+import { GameSystemWithFilter } from "../game_system_with_filter";
+
+const logger = createLogger("tunnels");
+
+export class UndergroundBeltSystem extends GameSystemWithFilter {
+ constructor(root) {
+ super(root, [UndergroundBeltComponent]);
+
+ this.beltSprites = {
+ [enumUndergroundBeltMode.sender]: Loader.getSprite(
+ "sprites/buildings/underground_belt_entry.png"
+ ),
+ [enumUndergroundBeltMode.receiver]: Loader.getSprite(
+ "sprites/buildings/underground_belt_exit.png"
+ ),
+ };
+
+ this.staleAreaWatcher = new StaleAreaDetector({
+ root: this.root,
+ name: "underground-belt",
+ recomputeMethod: this.recomputeArea.bind(this),
+ });
+
+ this.root.signals.entityManuallyPlaced.add(this.onEntityManuallyPlaced, this);
+
+ // NOTICE: Once we remove a tunnel, we need to update the whole area to
+ // clear outdated handles
+ this.staleAreaWatcher.recomputeOnComponentsChanged(
+ [UndergroundBeltComponent],
+ globalConfig.undergroundBeltMaxTilesByTier[globalConfig.undergroundBeltMaxTilesByTier.length - 1]
+ );
+ }
+
+ /**
+ * Callback when an entity got placed, used to remove belts between underground belts
+ * @param {Entity} entity
+ */
+ onEntityManuallyPlaced(entity) {
+ if (!this.root.app.settings.getAllSettings().enableTunnelSmartplace) {
+ // Smart-place disabled
+ return;
+ }
+
+ const undergroundComp = entity.components.UndergroundBelt;
+ if (undergroundComp && undergroundComp.mode === enumUndergroundBeltMode.receiver) {
+ const staticComp = entity.components.StaticMapEntity;
+ const tile = staticComp.origin;
+
+ const direction = enumAngleToDirection[staticComp.rotation];
+ const inverseDirection = enumInvertedDirections[direction];
+ const offset = enumDirectionToVector[inverseDirection];
+
+ let currentPos = tile.copy();
+
+ const tier = undergroundComp.tier;
+ const range = globalConfig.undergroundBeltMaxTilesByTier[tier];
+
+ // FIND ENTRANCE
+ // Search for the entrance which is farthest apart (this is why we can't reuse logic here)
+ let matchingEntrance = null;
+ for (let i = 0; i < range; ++i) {
+ currentPos.addInplace(offset);
+ const contents = this.root.map.getTileContent(currentPos, entity.layer);
+ if (!contents) {
+ continue;
+ }
+
+ const contentsUndergroundComp = contents.components.UndergroundBelt;
+ const contentsStaticComp = contents.components.StaticMapEntity;
+ if (
+ contentsUndergroundComp &&
+ contentsUndergroundComp.tier === undergroundComp.tier &&
+ contentsUndergroundComp.mode === enumUndergroundBeltMode.sender &&
+ enumAngleToDirection[contentsStaticComp.rotation] === direction
+ ) {
+ matchingEntrance = {
+ entity: contents,
+ range: i,
+ };
+ }
+ }
+
+ if (!matchingEntrance) {
+ // Nothing found
+ return;
+ }
+
+ // DETECT OBSOLETE BELTS BETWEEN
+ // Remove any belts between entrance and exit which have the same direction,
+ // but only if they *all* have the right direction
+ currentPos = tile.copy();
+ let allBeltsMatch = true;
+ for (let i = 0; i < matchingEntrance.range; ++i) {
+ currentPos.addInplace(offset);
+
+ const contents = this.root.map.getTileContent(currentPos, entity.layer);
+ if (!contents) {
+ allBeltsMatch = false;
+ break;
+ }
+
+ const contentsStaticComp = contents.components.StaticMapEntity;
+ const contentsBeltComp = contents.components.Belt;
+ if (!contentsBeltComp) {
+ allBeltsMatch = false;
+ break;
+ }
+
+ // It's a belt
+ if (
+ contentsBeltComp.direction !== enumDirection.top ||
+ enumAngleToDirection[contentsStaticComp.rotation] !== direction
+ ) {
+ allBeltsMatch = false;
+ break;
+ }
+ }
+
+ currentPos = tile.copy();
+ if (allBeltsMatch) {
+ // All belts between this are obsolete, so drop them
+ for (let i = 0; i < matchingEntrance.range; ++i) {
+ currentPos.addInplace(offset);
+ const contents = this.root.map.getTileContent(currentPos, entity.layer);
+ assert(contents, "Invalid smart underground belt logic");
+ this.root.logic.tryDeleteBuilding(contents);
+ }
+ }
+
+ // REMOVE OBSOLETE TUNNELS
+ // Remove any double tunnels, by checking the tile plus the tile above
+ currentPos = tile.copy().add(offset);
+ for (let i = 0; i < matchingEntrance.range - 1; ++i) {
+ const posBefore = currentPos.copy();
+ currentPos.addInplace(offset);
+
+ const entityBefore = this.root.map.getTileContent(posBefore, entity.layer);
+ const entityAfter = this.root.map.getTileContent(currentPos, entity.layer);
+
+ if (!entityBefore || !entityAfter) {
+ continue;
+ }
+
+ const undergroundBefore = entityBefore.components.UndergroundBelt;
+ const undergroundAfter = entityAfter.components.UndergroundBelt;
+
+ if (!undergroundBefore || !undergroundAfter) {
+ // Not an underground belt
+ continue;
+ }
+
+ if (
+ // Both same tier
+ undergroundBefore.tier !== undergroundAfter.tier ||
+ // And same tier as our original entity
+ undergroundBefore.tier !== undergroundComp.tier
+ ) {
+ // Mismatching tier
+ continue;
+ }
+
+ if (
+ undergroundBefore.mode !== enumUndergroundBeltMode.sender ||
+ undergroundAfter.mode !== enumUndergroundBeltMode.receiver
+ ) {
+ // Not the right mode
+ continue;
+ }
+
+ // Check rotations
+ const staticBefore = entityBefore.components.StaticMapEntity;
+ const staticAfter = entityAfter.components.StaticMapEntity;
+
+ if (
+ enumAngleToDirection[staticBefore.rotation] !== direction ||
+ enumAngleToDirection[staticAfter.rotation] !== direction
+ ) {
+ // Wrong rotation
+ continue;
+ }
+
+ // All good, can remove
+ this.root.logic.tryDeleteBuilding(entityBefore);
+ this.root.logic.tryDeleteBuilding(entityAfter);
+ }
+ }
+ }
+
+ /**
+ * Recomputes the cache in the given area, invalidating all entries there
+ * @param {Rectangle} area
+ */
+ recomputeArea(area) {
+ for (let x = area.x; x < area.right(); ++x) {
+ for (let y = area.y; y < area.bottom(); ++y) {
+ const entities = this.root.map.getLayersContentsMultipleXY(x, y);
+ for (let i = 0; i < entities.length; ++i) {
+ const entity = entities[i];
+ const undergroundComp = entity.components.UndergroundBelt;
+ if (!undergroundComp) {
+ continue;
+ }
+ undergroundComp.cachedLinkedEntity = null;
+ }
+ }
+ }
+ }
+
+ update() {
+ this.staleAreaWatcher.update();
+
+ const delta = this.root.dynamicTickrate.deltaSeconds;
+
+ for (let i = 0; i < this.allEntities.length; ++i) {
+ const entity = this.allEntities[i];
+ const undergroundComp = entity.components.UndergroundBelt;
+ const pendingItems = undergroundComp.pendingItems;
+
+ // Decrease remaining time of all items in belt
+ for (let k = 0; k < pendingItems.length; ++k) {
+ const item = pendingItems[k];
+ item[1] = Math.max(0, item[1] - delta);
+ if (G_IS_DEV && globalConfig.debug.instantBelts) {
+ item[1] = 0;
+ }
+ }
+ if (undergroundComp.mode === enumUndergroundBeltMode.sender) {
+ this.handleSender(entity);
+ } else {
+ this.handleReceiver(entity);
+ }
+ }
+ }
+
+ /**
+ * Finds the receiver for a given sender
+ * @param {Entity} entity
+ * @returns {import("../components/underground_belt").LinkedUndergroundBelt}
+ */
+ findRecieverForSender(entity) {
+ const staticComp = entity.components.StaticMapEntity;
+ const undergroundComp = entity.components.UndergroundBelt;
+ const searchDirection = staticComp.localDirectionToWorld(enumDirection.top);
+ const searchVector = enumDirectionToVector[searchDirection];
+ const targetRotation = enumDirectionToAngle[searchDirection];
+ let currentTile = staticComp.origin;
+
+ // Search in the direction of the tunnel
+ for (
+ let searchOffset = 0;
+ searchOffset < globalConfig.undergroundBeltMaxTilesByTier[undergroundComp.tier];
+ ++searchOffset
+ ) {
+ currentTile = currentTile.add(searchVector);
+
+ const potentialReceiver = this.root.map.getTileContent(currentTile, "regular");
+ if (!potentialReceiver) {
+ // Empty tile
+ continue;
+ }
+ const receiverUndergroundComp = potentialReceiver.components.UndergroundBelt;
+ if (!receiverUndergroundComp || receiverUndergroundComp.tier !== undergroundComp.tier) {
+ // Not a tunnel, or not on the same tier
+ continue;
+ }
+
+ const receiverStaticComp = potentialReceiver.components.StaticMapEntity;
+ if (receiverStaticComp.rotation !== targetRotation) {
+ // Wrong rotation
+ continue;
+ }
+
+ if (receiverUndergroundComp.mode !== enumUndergroundBeltMode.receiver) {
+ // Not a receiver, but a sender -> Abort to make sure we don't deliver double
+ break;
+ }
+
+ return { entity: potentialReceiver, distance: searchOffset };
+ }
+
+ // None found
+ return { entity: null, distance: 0 };
+ }
+
+ /**
+ *
+ * @param {Entity} entity
+ */
+ handleSender(entity) {
+ const undergroundComp = entity.components.UndergroundBelt;
+
+ // Find the current receiver
+ let cacheEntry = undergroundComp.cachedLinkedEntity;
+ if (!cacheEntry) {
+ // Need to recompute cache
+ cacheEntry = undergroundComp.cachedLinkedEntity = this.findRecieverForSender(entity);
+ }
+
+ if (!cacheEntry.entity) {
+ // If there is no connection to a receiver, ignore this one
+ return;
+ }
+
+ // Check if we have any item
+ if (undergroundComp.pendingItems.length > 0) {
+ assert(undergroundComp.pendingItems.length === 1, "more than 1 pending");
+ const nextItemAndDuration = undergroundComp.pendingItems[0];
+ const remainingTime = nextItemAndDuration[1];
+ const nextItem = nextItemAndDuration[0];
+
+ // Check if the item is ready to be emitted
+ if (remainingTime === 0) {
+ // Check if the receiver can accept it
+ if (
+ cacheEntry.entity.components.UndergroundBelt.tryAcceptTunneledItem(
+ nextItem,
+ cacheEntry.distance,
+ this.root.hubGoals.getUndergroundBeltBaseSpeed()
+ )
+ ) {
+ // Drop this item
+ fastArrayDelete(undergroundComp.pendingItems, 0);
+ }
+ }
+ }
+ }
+
+ /**
+ *
+ * @param {Entity} entity
+ */
+ handleReceiver(entity) {
+ const undergroundComp = entity.components.UndergroundBelt;
+
+ // Try to eject items, we only check the first one because it is sorted by remaining time
+ const items = undergroundComp.pendingItems;
+ if (items.length > 0) {
+ const nextItemAndDuration = undergroundComp.pendingItems[0];
+ const remainingTime = nextItemAndDuration[1];
+ const nextItem = nextItemAndDuration[0];
+
+ if (remainingTime <= 0) {
+ const ejectorComp = entity.components.ItemEjector;
+
+ const nextSlotIndex = ejectorComp.getFirstFreeSlot();
+ if (nextSlotIndex !== null) {
+ if (ejectorComp.tryEject(nextSlotIndex, nextItem)) {
+ items.shift();
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/src/js/game/systems/wire.js b/src/js/game/systems/wire.js
index 63f0fcc9..290b58bf 100644
--- a/src/js/game/systems/wire.js
+++ b/src/js/game/systems/wire.js
@@ -162,7 +162,7 @@ export class WireSystem extends GameSystemWithFilter {
const tunnelEntities = this.root.entityMgr.getAllWithComponent(WireTunnelComponent);
const pinEntities = this.root.entityMgr.getAllWithComponent(WiredPinsComponent);
- // Clear all network references, but not on the first update since thats the deserializing one
+ // Clear all network references, but not on the first update since that's the deserializing one
if (!this.isFirstRecompute) {
for (let i = 0; i < wireEntities.length; ++i) {
wireEntities[i].components.Wire.linkedNetwork = null;
@@ -432,7 +432,7 @@ export class WireSystem extends GameSystemWithFilter {
continue;
}
- // Check if its a tunnel, if so, go to the forwarded item
+ // Check if it's a tunnel, if so, go to the forwarded item
const tunnelComp = entity.components.WireTunnel;
if (tunnelComp) {
if (visitedTunnels.has(entity.uid)) {
diff --git a/src/js/game/systems/wired_pins.js b/src/js/game/systems/wired_pins.js
index 202691b8..e8bc1882 100644
--- a/src/js/game/systems/wired_pins.js
+++ b/src/js/game/systems/wired_pins.js
@@ -149,8 +149,6 @@ export class WiredPinsSystem extends GameSystemWithFilter {
}
}
- update() {}
-
/**
* Draws a given entity
* @param {DrawParameters} parameters
diff --git a/src/js/profile/application_settings.js b/src/js/profile/application_settings.js
index 084a6fe7..473d6ccc 100644
--- a/src/js/profile/application_settings.js
+++ b/src/js/profile/application_settings.js
@@ -276,6 +276,7 @@ export const allApplicationSettings = [
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) => {}),
];
export function getApplicationSettingById(id) {
@@ -313,6 +314,7 @@ class SettingsStorage {
this.lowQualityMapResources = false;
this.disableTileGrid = false;
this.lowQualityTextures = false;
+ this.simplifiedBelts = false;
/**
* @type {Object.}
@@ -523,7 +525,7 @@ export class ApplicationSettings extends ReadWriteProxy {
}
getCurrentVersion() {
- return 26;
+ return 27;
}
/** @param {{settings: SettingsStorage, version: number}} data */
@@ -646,6 +648,11 @@ export class ApplicationSettings extends ReadWriteProxy {
data.version = 26;
}
+ if (data.version < 27) {
+ data.settings.simplifiedBelts = false;
+ data.version = 27;
+ }
+
return ExplainedResult.good();
}
}
diff --git a/src/js/savegame/savegame_serializer.js b/src/js/savegame/savegame_serializer.js
index 92db738b..552bc35c 100644
--- a/src/js/savegame/savegame_serializer.js
+++ b/src/js/savegame/savegame_serializer.js
@@ -1,146 +1,146 @@
-import { ExplainedResult } from "../core/explained_result";
-import { createLogger } from "../core/logging";
-import { gComponentRegistry } from "../core/global_registries";
-import { SerializerInternal } from "./serializer_internal";
-
-/**
- * @typedef {import("../game/component").Component} Component
- * @typedef {import("../game/component").StaticComponent} StaticComponent
- * @typedef {import("../game/entity").Entity} Entity
- * @typedef {import("../game/root").GameRoot} GameRoot
- * @typedef {import("../savegame/savegame_typedefs").SerializedGame} SerializedGame
- */
-
-const logger = createLogger("savegame_serializer");
-
-/**
- * Serializes a savegame
- */
-export class SavegameSerializer {
- constructor() {
- this.internal = new SerializerInternal();
- }
-
- /**
- * Serializes the game root into a dump
- * @param {GameRoot} root
- * @param {boolean=} sanityChecks Whether to check for validity
- * @returns {object}
- */
- generateDumpFromGameRoot(root, sanityChecks = true) {
- /** @type {SerializedGame} */
- const data = {
- camera: root.camera.serialize(),
- time: root.time.serialize(),
- map: root.map.serialize(),
- entityMgr: root.entityMgr.serialize(),
- hubGoals: root.hubGoals.serialize(),
- pinnedShapes: root.hud.parts.pinnedShapes.serialize(),
- waypoints: root.hud.parts.waypoints.serialize(),
- entities: this.internal.serializeEntityArray(root.entityMgr.entities),
- beltPaths: root.systemMgr.systems.belt.serializePaths(),
- };
-
- if (!G_IS_RELEASE) {
- if (sanityChecks) {
- // Sanity check
- const sanity = this.verifyLogicalErrors(data);
- if (!sanity.result) {
- logger.error("Created invalid savegame:", sanity.reason, "savegame:", data);
- return null;
- }
- }
- }
- return data;
- }
-
- /**
- * Verifies if there are logical errors in the savegame
- * @param {SerializedGame} savegame
- * @returns {ExplainedResult}
- */
- verifyLogicalErrors(savegame) {
- if (!savegame.entities) {
- return ExplainedResult.bad("Savegame has no entities");
- }
-
- const seenUids = [];
-
- // Check for duplicate UIDS
- for (let i = 0; i < savegame.entities.length; ++i) {
- /** @type {Entity} */
- const entity = savegame.entities[i];
-
- const uid = entity.uid;
- if (!Number.isInteger(uid)) {
- return ExplainedResult.bad("Entity has invalid uid: " + uid);
- }
- if (seenUids.indexOf(uid) >= 0) {
- return ExplainedResult.bad("Duplicate uid " + uid);
- }
- seenUids.push(uid);
-
- // Verify components
- if (!entity.components) {
- return ExplainedResult.bad("Entity is missing key 'components': " + JSON.stringify(entity));
- }
-
- const components = entity.components;
- for (const componentId in components) {
- const componentClass = gComponentRegistry.findById(componentId);
-
- // Check component id is known
- if (!componentClass) {
- return ExplainedResult.bad("Unknown component id: " + componentId);
- }
-
- // Verify component data
- const componentData = components[componentId];
- const componentVerifyError = /** @type {StaticComponent} */ (componentClass).verify(
- componentData
- );
-
- // Check component data is ok
- if (componentVerifyError) {
- return ExplainedResult.bad(
- "Component " + componentId + " has invalid data: " + componentVerifyError
- );
- }
- }
- }
-
- return ExplainedResult.good();
- }
-
- /**
- * Tries to load the savegame from a given dump
- * @param {SerializedGame} savegame
- * @param {GameRoot} root
- * @returns {ExplainedResult}
- */
- deserialize(savegame, root) {
- // Sanity
- const verifyResult = this.verifyLogicalErrors(savegame);
- if (!verifyResult.result) {
- return ExplainedResult.bad(verifyResult.reason);
- }
- let errorReason = null;
-
- errorReason = errorReason || root.entityMgr.deserialize(savegame.entityMgr);
- errorReason = errorReason || root.time.deserialize(savegame.time);
- errorReason = errorReason || root.camera.deserialize(savegame.camera);
- errorReason = errorReason || root.map.deserialize(savegame.map);
- errorReason = errorReason || root.hubGoals.deserialize(savegame.hubGoals);
- errorReason = errorReason || root.hud.parts.pinnedShapes.deserialize(savegame.pinnedShapes);
- errorReason = errorReason || root.hud.parts.waypoints.deserialize(savegame.waypoints);
- errorReason = errorReason || this.internal.deserializeEntityArray(root, savegame.entities);
- errorReason = errorReason || root.systemMgr.systems.belt.deserializePaths(savegame.beltPaths);
-
- // Check for errors
- if (errorReason) {
- return ExplainedResult.bad(errorReason);
- }
-
- return ExplainedResult.good();
- }
-}
+import { ExplainedResult } from "../core/explained_result";
+import { createLogger } from "../core/logging";
+import { gComponentRegistry } from "../core/global_registries";
+import { SerializerInternal } from "./serializer_internal";
+
+/**
+ * @typedef {import("../game/component").Component} Component
+ * @typedef {import("../game/component").StaticComponent} StaticComponent
+ * @typedef {import("../game/entity").Entity} Entity
+ * @typedef {import("../game/root").GameRoot} GameRoot
+ * @typedef {import("../savegame/savegame_typedefs").SerializedGame} SerializedGame
+ */
+
+const logger = createLogger("savegame_serializer");
+
+/**
+ * Serializes a savegame
+ */
+export class SavegameSerializer {
+ constructor() {
+ this.internal = new SerializerInternal();
+ }
+
+ /**
+ * Serializes the game root into a dump
+ * @param {GameRoot} root
+ * @param {boolean=} sanityChecks Whether to check for validity
+ * @returns {object}
+ */
+ generateDumpFromGameRoot(root, sanityChecks = true) {
+ /** @type {SerializedGame} */
+ const data = {
+ camera: root.camera.serialize(),
+ time: root.time.serialize(),
+ map: root.map.serialize(),
+ entityMgr: root.entityMgr.serialize(),
+ hubGoals: root.hubGoals.serialize(),
+ pinnedShapes: root.hud.parts.pinnedShapes.serialize(),
+ waypoints: root.hud.parts.waypoints.serialize(),
+ entities: this.internal.serializeEntityArray(root.entityMgr.entities),
+ beltPaths: root.systemMgr.systems.belt.serializePaths(),
+ };
+
+ if (G_IS_DEV) {
+ if (sanityChecks) {
+ // Sanity check
+ const sanity = this.verifyLogicalErrors(data);
+ if (!sanity.result) {
+ logger.error("Created invalid savegame:", sanity.reason, "savegame:", data);
+ return null;
+ }
+ }
+ }
+ return data;
+ }
+
+ /**
+ * Verifies if there are logical errors in the savegame
+ * @param {SerializedGame} savegame
+ * @returns {ExplainedResult}
+ */
+ verifyLogicalErrors(savegame) {
+ if (!savegame.entities) {
+ return ExplainedResult.bad("Savegame has no entities");
+ }
+
+ const seenUids = new Set();
+
+ // Check for duplicate UIDS
+ for (let i = 0; i < savegame.entities.length; ++i) {
+ /** @type {Entity} */
+ const entity = savegame.entities[i];
+
+ const uid = entity.uid;
+ if (!Number.isInteger(uid)) {
+ return ExplainedResult.bad("Entity has invalid uid: " + uid);
+ }
+ if (seenUids.has(uid)) {
+ return ExplainedResult.bad("Duplicate uid " + uid);
+ }
+ seenUids.add(uid);
+
+ // Verify components
+ if (!entity.components) {
+ return ExplainedResult.bad("Entity is missing key 'components': " + JSON.stringify(entity));
+ }
+
+ const components = entity.components;
+ for (const componentId in components) {
+ const componentClass = gComponentRegistry.findById(componentId);
+
+ // Check component id is known
+ if (!componentClass) {
+ return ExplainedResult.bad("Unknown component id: " + componentId);
+ }
+
+ // Verify component data
+ const componentData = components[componentId];
+ const componentVerifyError = /** @type {StaticComponent} */ (componentClass).verify(
+ componentData
+ );
+
+ // Check component data is ok
+ if (componentVerifyError) {
+ return ExplainedResult.bad(
+ "Component " + componentId + " has invalid data: " + componentVerifyError
+ );
+ }
+ }
+ }
+
+ return ExplainedResult.good();
+ }
+
+ /**
+ * Tries to load the savegame from a given dump
+ * @param {SerializedGame} savegame
+ * @param {GameRoot} root
+ * @returns {ExplainedResult}
+ */
+ deserialize(savegame, root) {
+ // Sanity
+ const verifyResult = this.verifyLogicalErrors(savegame);
+ if (!verifyResult.result) {
+ return ExplainedResult.bad(verifyResult.reason);
+ }
+ let errorReason = null;
+
+ errorReason = errorReason || root.entityMgr.deserialize(savegame.entityMgr);
+ errorReason = errorReason || root.time.deserialize(savegame.time);
+ errorReason = errorReason || root.camera.deserialize(savegame.camera);
+ errorReason = errorReason || root.map.deserialize(savegame.map);
+ errorReason = errorReason || root.hubGoals.deserialize(savegame.hubGoals);
+ errorReason = errorReason || root.hud.parts.pinnedShapes.deserialize(savegame.pinnedShapes);
+ errorReason = errorReason || root.hud.parts.waypoints.deserialize(savegame.waypoints);
+ errorReason = errorReason || this.internal.deserializeEntityArray(root, savegame.entities);
+ errorReason = errorReason || root.systemMgr.systems.belt.deserializePaths(savegame.beltPaths);
+
+ // Check for errors
+ if (errorReason) {
+ return ExplainedResult.bad(errorReason);
+ }
+
+ return ExplainedResult.good();
+ }
+}
diff --git a/src/js/states/ingame.js b/src/js/states/ingame.js
index 3eea38b7..2dd2db76 100644
--- a/src/js/states/ingame.js
+++ b/src/js/states/ingame.js
@@ -1,438 +1,458 @@
-import { APPLICATION_ERROR_OCCURED } from "../core/error_handler";
-import { GameState } from "../core/game_state";
-import { logSection, createLogger } from "../core/logging";
-import { waitNextFrame } from "../core/utils";
-import { globalConfig } from "../core/config";
-import { GameLoadingOverlay } from "../game/game_loading_overlay";
-import { KeyActionMapper } from "../game/key_action_mapper";
-import { Savegame } from "../savegame/savegame";
-import { GameCore } from "../game/core";
-import { MUSIC } from "../platform/sound";
-
-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",
-
- s5_firstUpdate: "🌈 5: First game update",
- s6_postLoadHook: "🌈 6: Post load hook",
- s7_warmup: "🌈 7: Warmup",
-
- s10_gameRunning: "🌈 10: Game finally running",
-
- leaving: "🌈 Saving, then leaving the game",
- destroyed: "🌈 DESTROYED: Core is empty and waits for state leave",
- initFailed: "🌈 ERROR: Initialization failed!",
-};
-
-export const gameCreationAction = {
- new: "new-game",
- resume: "resume-game",
-};
-
-// Typehints
-export class GameCreationPayload {
- constructor() {
- /** @type {boolean|undefined} */
- this.fastEnter;
-
- /** @type {Savegame} */
- this.savegame;
- }
-}
-
-export class InGameState extends GameState {
- constructor() {
- super("InGameState");
-
- /** @type {GameCreationPayload} */
- this.creationPayload = null;
-
- // Stores current stage
- this.stage = "";
-
- /** @type {GameCore} */
- this.core = null;
-
- /** @type {KeyActionMapper} */
- this.keyActionMapper = null;
-
- /** @type {GameLoadingOverlay} */
- this.loadingOverlay = null;
-
- /** @type {Savegame} */
- this.savegame;
-
- this.boundInputFilter = this.filterInput.bind(this);
- }
-
- /**
- * Switches the game into another sub-state
- * @param {string} stage
- */
- switchStage(stage) {
- assert(stage, "Got empty stage");
- if (stage !== this.stage) {
- this.stage = stage;
- logger.log(this.stage);
- return true;
- } else {
- // log(this, "Re entering", stage);
- return false;
- }
- }
-
- // GameState implementation
- getInnerHTML() {
- return "";
- }
-
- getThemeMusic() {
- return MUSIC.theme;
- }
-
- onBeforeExit() {
- // logger.log("Saving before quitting");
- // return this.doSave().then(() => {
- // logger.log(this, "Successfully saved");
- // // this.stageDestroyed();
- // });
- }
-
- onAppPause() {
- // if (this.stage === stages.s10_gameRunning) {
- // logger.log("Saving because app got paused");
- // this.doSave();
- // }
- }
-
- getHasFadeIn() {
- return false;
- }
-
- getPauseOnFocusLost() {
- return false;
- }
-
- getHasUnloadConfirmation() {
- return true;
- }
-
- onLeave() {
- if (this.core) {
- this.stageDestroyed();
- }
- this.app.inputMgr.dismountFilter(this.boundInputFilter);
- }
-
- onResized(w, h) {
- super.onResized(w, h);
- if (this.stage === stages.s10_gameRunning) {
- this.core.resize(w, h);
- }
- }
-
- // ---- End of GameState implementation
-
- /**
- * Goes back to the menu state
- */
- goBackToMenu() {
- this.saveThenGoToState("MainMenuState");
- }
-
- /**
- * Goes back to the settings state
- */
- goToSettings() {
- this.saveThenGoToState("SettingsState", {
- backToStateId: this.key,
- backToStatePayload: this.creationPayload,
- });
- }
-
- /**
- * Goes back to the settings state
- */
- goToKeybindings() {
- this.saveThenGoToState("KeybindingsState", {
- backToStateId: this.key,
- backToStatePayload: this.creationPayload,
- });
- }
-
- /**
- * Moves to a state outside of the game
- * @param {string} stateId
- * @param {any=} payload
- */
- saveThenGoToState(stateId, payload) {
- if (this.stage === stages.leaving || this.stage === stages.destroyed) {
- logger.warn(
- "Tried to leave game twice or during destroy:",
- this.stage,
- "(attempted to move to",
- stateId,
- ")"
- );
- return;
- }
- this.stageLeavingGame();
- this.doSave().then(() => {
- this.stageDestroyed();
- this.moveToState(stateId, payload);
- });
- }
-
- onBackButton() {
- // do nothing
- }
-
- /**
- * Called when the game somehow failed to initialize. Resets everything to basic state and
- * then goes to the main menu, showing the error
- * @param {string} err
- */
- onInitializationFailure(err) {
- if (this.switchStage(stages.initFailed)) {
- logger.error("Init failure:", err);
- this.stageDestroyed();
- this.moveToState("MainMenuState", { loadError: err });
- }
- }
-
- // STAGES
-
- /**
- * Creates the game core instance, and thus the root
- */
- stage3CreateCore() {
- if (this.switchStage(stages.s3_createCore)) {
- logger.log("Creating new game core");
- this.core = new GameCore(this.app);
-
- this.core.initializeRoot(this, this.savegame);
-
- if (this.savegame.hasGameDump()) {
- this.stage4bResumeGame();
- } else {
- this.app.gameAnalytics.handleGameStarted();
- this.stage4aInitEmptyGame();
- }
- }
- }
-
- /**
- * Initializes a new empty game
- */
- stage4aInitEmptyGame() {
- if (this.switchStage(stages.s4_A_initEmptyGame)) {
- this.core.initNewGame();
- this.stage5FirstUpdate();
- }
- }
-
- /**
- * Resumes an existing game
- */
- stage4bResumeGame() {
- if (this.switchStage(stages.s4_B_resumeGame)) {
- if (!this.core.initExistingGame()) {
- this.onInitializationFailure("Savegame is corrupt and can not be restored.");
- return;
- }
- this.app.gameAnalytics.handleGameResumed();
- this.stage5FirstUpdate();
- }
- }
-
- /**
- * Performs the first game update on the game which initializes most caches
- */
- stage5FirstUpdate() {
- if (this.switchStage(stages.s5_firstUpdate)) {
- this.core.root.logicInitialized = true;
- this.core.updateLogic();
- this.stage6PostLoadHook();
- }
- }
-
- /**
- * Call the post load hook, this means that we have loaded the game, and all systems
- * can operate and start to work now.
- */
- stage6PostLoadHook() {
- if (this.switchStage(stages.s6_postLoadHook)) {
- logger.log("Post load hook");
- this.core.postLoadHook();
- this.stage7Warmup();
- }
- }
-
- /**
- * This makes the game idle and draw for a while, because we run most code this way
- * the V8 engine can already start to optimize it. Also this makes sure the resources
- * are in the VRAM and we have a smooth experience once we start.
- */
- stage7Warmup() {
- if (this.switchStage(stages.s7_warmup)) {
- if (G_IS_DEV && globalConfig.debug.noArtificialDelays) {
- this.warmupTimeSeconds = 0.05;
- } else {
- if (this.creationPayload.fastEnter) {
- this.warmupTimeSeconds = globalConfig.warmupTimeSecondsFast;
- } else {
- this.warmupTimeSeconds = globalConfig.warmupTimeSecondsRegular;
- }
- }
- }
- }
-
- /**
- * The final stage where this game is running and updating regulary.
- */
- stage10GameRunning() {
- if (this.switchStage(stages.s10_gameRunning)) {
- this.core.root.signals.readyToRender.dispatch();
-
- logSection("GAME STARTED", "#26a69a");
-
- // Initial resize, might have changed during loading (this is possible)
- this.core.resize(this.app.screenWidth, this.app.screenHeight);
- }
- }
-
- /**
- * This stage destroys the whole game, used to cleanup
- */
- stageDestroyed() {
- if (this.switchStage(stages.destroyed)) {
- // Cleanup all api calls
- this.cancelAllAsyncOperations();
-
- if (this.syncer) {
- this.syncer.cancelSync();
- this.syncer = null;
- }
-
- // Cleanup core
- if (this.core) {
- this.core.destruct();
- this.core = null;
- }
- }
- }
-
- /**
- * When leaving the game
- */
- stageLeavingGame() {
- if (this.switchStage(stages.leaving)) {
- // ...
- }
- }
-
- // END STAGES
-
- /**
- * Filters the input (keybindings)
- */
- filterInput() {
- return this.stage === stages.s10_gameRunning;
- }
-
- /**
- * @param {GameCreationPayload} payload
- */
- onEnter(payload) {
- this.app.inputMgr.installFilter(this.boundInputFilter);
-
- this.creationPayload = payload;
- this.savegame = payload.savegame;
-
- this.loadingOverlay = new GameLoadingOverlay(this.app, this.getDivElement());
- this.loadingOverlay.showBasic();
-
- // Remove unneded default element
- document.body.querySelector(".modalDialogParent").remove();
-
- this.asyncChannel.watch(waitNextFrame()).then(() => this.stage3CreateCore());
- }
-
- /**
- * Render callback
- * @param {number} dt
- */
- onRender(dt) {
- if (APPLICATION_ERROR_OCCURED) {
- // Application somehow crashed, do not do anything
- return;
- }
-
- if (this.stage === stages.s7_warmup) {
- this.core.draw();
- this.warmupTimeSeconds -= dt / 1000.0;
- if (this.warmupTimeSeconds < 0) {
- logger.log("Warmup completed");
- this.stage10GameRunning();
- }
- }
-
- if (this.stage === stages.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) {
- // Only draw if page visible
- if (this.app.pageVisible) {
- this.core.draw();
- }
-
- this.loadingOverlay.removeIfAttached();
- } else {
- if (!this.loadingOverlay.isAttached()) {
- this.loadingOverlay.showBasic();
- }
- }
- }
-
- onBackgroundTick(dt) {
- this.onRender(dt);
- }
-
- /**
- * Saves the game
- */
-
- doSave() {
- if (!this.savegame || !this.savegame.isSaveable()) {
- return Promise.resolve();
- }
-
- if (APPLICATION_ERROR_OCCURED) {
- logger.warn("skipping save because application crashed");
- return Promise.resolve();
- }
-
- if (
- this.stage !== stages.s10_gameRunning &&
- this.stage !== stages.s7_warmup &&
- this.stage !== stages.leaving
- ) {
- logger.warn("Skipping save because game is not ready");
- return Promise.resolve();
- }
-
- // First update the game data
- logger.log("Starting to save game ...");
- this.core.root.signals.gameSaved.dispatch();
- this.savegame.updateData(this.core.root);
- return this.savegame.writeSavegameAndMetadata().catch(err => {
- logger.warn("Failed to save:", err);
- });
- }
-}
+import { APPLICATION_ERROR_OCCURED } from "../core/error_handler";
+import { GameState } from "../core/game_state";
+import { logSection, createLogger } from "../core/logging";
+import { waitNextFrame } from "../core/utils";
+import { globalConfig } from "../core/config";
+import { GameLoadingOverlay } from "../game/game_loading_overlay";
+import { KeyActionMapper } from "../game/key_action_mapper";
+import { Savegame } from "../savegame/savegame";
+import { GameCore } from "../game/core";
+import { MUSIC } from "../platform/sound";
+
+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",
+
+ s5_firstUpdate: "🌈 5: First game update",
+ s6_postLoadHook: "🌈 6: Post load hook",
+ s7_warmup: "🌈 7: Warmup",
+
+ s10_gameRunning: "🌈 10: Game finally running",
+
+ leaving: "🌈 Saving, then leaving the game",
+ destroyed: "🌈 DESTROYED: Core is empty and waits for state leave",
+ initFailed: "🌈 ERROR: Initialization failed!",
+};
+
+export const gameCreationAction = {
+ new: "new-game",
+ resume: "resume-game",
+};
+
+// Typehints
+export class GameCreationPayload {
+ constructor() {
+ /** @type {boolean|undefined} */
+ this.fastEnter;
+
+ /** @type {Savegame} */
+ this.savegame;
+ }
+}
+
+export class InGameState extends GameState {
+ constructor() {
+ super("InGameState");
+
+ /** @type {GameCreationPayload} */
+ this.creationPayload = null;
+
+ // Stores current stage
+ this.stage = "";
+
+ /** @type {GameCore} */
+ this.core = null;
+
+ /** @type {KeyActionMapper} */
+ this.keyActionMapper = null;
+
+ /** @type {GameLoadingOverlay} */
+ this.loadingOverlay = null;
+
+ /** @type {Savegame} */
+ this.savegame = null;
+
+ this.boundInputFilter = this.filterInput.bind(this);
+
+ /**
+ * Whether we are currently saving the game
+ * @TODO: This doesn't realy fit here
+ */
+ this.currentSavePromise = null;
+ }
+
+ /**
+ * Switches the game into another sub-state
+ * @param {string} stage
+ */
+ switchStage(stage) {
+ assert(stage, "Got empty stage");
+ if (stage !== this.stage) {
+ this.stage = stage;
+ logger.log(this.stage);
+ return true;
+ } else {
+ // log(this, "Re entering", stage);
+ return false;
+ }
+ }
+
+ // GameState implementation
+ getInnerHTML() {
+ return "";
+ }
+
+ getThemeMusic() {
+ return MUSIC.theme;
+ }
+
+ onBeforeExit() {
+ // logger.log("Saving before quitting");
+ // return this.doSave().then(() => {
+ // logger.log(this, "Successfully saved");
+ // // this.stageDestroyed();
+ // });
+ }
+
+ onAppPause() {
+ // if (this.stage === stages.s10_gameRunning) {
+ // logger.log("Saving because app got paused");
+ // this.doSave();
+ // }
+ }
+
+ getHasFadeIn() {
+ return false;
+ }
+
+ getPauseOnFocusLost() {
+ return false;
+ }
+
+ getHasUnloadConfirmation() {
+ return true;
+ }
+
+ onLeave() {
+ if (this.core) {
+ this.stageDestroyed();
+ }
+ this.app.inputMgr.dismountFilter(this.boundInputFilter);
+ }
+
+ onResized(w, h) {
+ super.onResized(w, h);
+ if (this.stage === stages.s10_gameRunning) {
+ this.core.resize(w, h);
+ }
+ }
+
+ // ---- End of GameState implementation
+
+ /**
+ * Goes back to the menu state
+ */
+ goBackToMenu() {
+ this.saveThenGoToState("MainMenuState");
+ }
+
+ /**
+ * Goes back to the settings state
+ */
+ goToSettings() {
+ this.saveThenGoToState("SettingsState", {
+ backToStateId: this.key,
+ backToStatePayload: this.creationPayload,
+ });
+ }
+
+ /**
+ * Goes back to the settings state
+ */
+ goToKeybindings() {
+ this.saveThenGoToState("KeybindingsState", {
+ backToStateId: this.key,
+ backToStatePayload: this.creationPayload,
+ });
+ }
+
+ /**
+ * Moves to a state outside of the game
+ * @param {string} stateId
+ * @param {any=} payload
+ */
+ saveThenGoToState(stateId, payload) {
+ if (this.stage === stages.leaving || this.stage === stages.destroyed) {
+ logger.warn(
+ "Tried to leave game twice or during destroy:",
+ this.stage,
+ "(attempted to move to",
+ stateId,
+ ")"
+ );
+ return;
+ }
+ this.stageLeavingGame();
+ this.doSave().then(() => {
+ this.stageDestroyed();
+ this.moveToState(stateId, payload);
+ });
+ }
+
+ onBackButton() {
+ // do nothing
+ }
+
+ /**
+ * Called when the game somehow failed to initialize. Resets everything to basic state and
+ * then goes to the main menu, showing the error
+ * @param {string} err
+ */
+ onInitializationFailure(err) {
+ if (this.switchStage(stages.initFailed)) {
+ logger.error("Init failure:", err);
+ this.stageDestroyed();
+ this.moveToState("MainMenuState", { loadError: err });
+ }
+ }
+
+ // STAGES
+
+ /**
+ * Creates the game core instance, and thus the root
+ */
+ stage3CreateCore() {
+ if (this.switchStage(stages.s3_createCore)) {
+ logger.log("Creating new game core");
+ this.core = new GameCore(this.app);
+
+ this.core.initializeRoot(this, this.savegame);
+
+ if (this.savegame.hasGameDump()) {
+ this.stage4bResumeGame();
+ } else {
+ this.app.gameAnalytics.handleGameStarted();
+ this.stage4aInitEmptyGame();
+ }
+ }
+ }
+
+ /**
+ * Initializes a new empty game
+ */
+ stage4aInitEmptyGame() {
+ if (this.switchStage(stages.s4_A_initEmptyGame)) {
+ this.core.initNewGame();
+ this.stage5FirstUpdate();
+ }
+ }
+
+ /**
+ * Resumes an existing game
+ */
+ stage4bResumeGame() {
+ if (this.switchStage(stages.s4_B_resumeGame)) {
+ if (!this.core.initExistingGame()) {
+ this.onInitializationFailure("Savegame is corrupt and can not be restored.");
+ return;
+ }
+ this.app.gameAnalytics.handleGameResumed();
+ this.stage5FirstUpdate();
+ }
+ }
+
+ /**
+ * Performs the first game update on the game which initializes most caches
+ */
+ stage5FirstUpdate() {
+ if (this.switchStage(stages.s5_firstUpdate)) {
+ this.core.root.logicInitialized = true;
+ this.core.updateLogic();
+ this.stage6PostLoadHook();
+ }
+ }
+
+ /**
+ * Call the post load hook, this means that we have loaded the game, and all systems
+ * can operate and start to work now.
+ */
+ stage6PostLoadHook() {
+ if (this.switchStage(stages.s6_postLoadHook)) {
+ logger.log("Post load hook");
+ this.core.postLoadHook();
+ this.stage7Warmup();
+ }
+ }
+
+ /**
+ * This makes the game idle and draw for a while, because we run most code this way
+ * the V8 engine can already start to optimize it. Also this makes sure the resources
+ * are in the VRAM and we have a smooth experience once we start.
+ */
+ stage7Warmup() {
+ if (this.switchStage(stages.s7_warmup)) {
+ if (G_IS_DEV && globalConfig.debug.noArtificialDelays) {
+ this.warmupTimeSeconds = 0.05;
+ } else {
+ if (this.creationPayload.fastEnter) {
+ this.warmupTimeSeconds = globalConfig.warmupTimeSecondsFast;
+ } else {
+ this.warmupTimeSeconds = globalConfig.warmupTimeSecondsRegular;
+ }
+ }
+ }
+ }
+
+ /**
+ * The final stage where this game is running and updating regulary.
+ */
+ stage10GameRunning() {
+ if (this.switchStage(stages.s10_gameRunning)) {
+ this.core.root.signals.readyToRender.dispatch();
+
+ logSection("GAME STARTED", "#26a69a");
+
+ // Initial resize, might have changed during loading (this is possible)
+ this.core.resize(this.app.screenWidth, this.app.screenHeight);
+ }
+ }
+
+ /**
+ * This stage destroys the whole game, used to cleanup
+ */
+ stageDestroyed() {
+ if (this.switchStage(stages.destroyed)) {
+ // Cleanup all api calls
+ this.cancelAllAsyncOperations();
+
+ if (this.syncer) {
+ this.syncer.cancelSync();
+ this.syncer = null;
+ }
+
+ // Cleanup core
+ if (this.core) {
+ this.core.destruct();
+ this.core = null;
+ }
+ }
+ }
+
+ /**
+ * When leaving the game
+ */
+ stageLeavingGame() {
+ if (this.switchStage(stages.leaving)) {
+ // ...
+ }
+ }
+
+ // END STAGES
+
+ /**
+ * Filters the input (keybindings)
+ */
+ filterInput() {
+ return this.stage === stages.s10_gameRunning;
+ }
+
+ /**
+ * @param {GameCreationPayload} payload
+ */
+ onEnter(payload) {
+ this.app.inputMgr.installFilter(this.boundInputFilter);
+
+ this.creationPayload = payload;
+ this.savegame = payload.savegame;
+
+ this.loadingOverlay = new GameLoadingOverlay(this.app, this.getDivElement());
+ this.loadingOverlay.showBasic();
+
+ // Remove unneded default element
+ document.body.querySelector(".modalDialogParent").remove();
+
+ this.asyncChannel.watch(waitNextFrame()).then(() => this.stage3CreateCore());
+ }
+
+ /**
+ * Render callback
+ * @param {number} dt
+ */
+ onRender(dt) {
+ if (APPLICATION_ERROR_OCCURED) {
+ // Application somehow crashed, do not do anything
+ return;
+ }
+
+ if (this.stage === stages.s7_warmup) {
+ this.core.draw();
+ this.warmupTimeSeconds -= dt / 1000.0;
+ if (this.warmupTimeSeconds < 0) {
+ logger.log("Warmup completed");
+ this.stage10GameRunning();
+ }
+ }
+
+ if (this.stage === stages.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) {
+ // Only draw if page visible
+ if (this.app.pageVisible) {
+ this.core.draw();
+ }
+
+ this.loadingOverlay.removeIfAttached();
+ } else {
+ if (!this.loadingOverlay.isAttached()) {
+ this.loadingOverlay.showBasic();
+ }
+ }
+ }
+
+ onBackgroundTick(dt) {
+ this.onRender(dt);
+ }
+
+ /**
+ * Saves the game
+ */
+
+ doSave() {
+ if (!this.savegame || !this.savegame.isSaveable()) {
+ return Promise.resolve();
+ }
+
+ if (APPLICATION_ERROR_OCCURED) {
+ logger.warn("skipping save because application crashed");
+ return Promise.resolve();
+ }
+
+ if (
+ this.stage !== stages.s10_gameRunning &&
+ this.stage !== stages.s7_warmup &&
+ this.stage !== stages.leaving
+ ) {
+ logger.warn("Skipping save because game is not ready");
+ return Promise.resolve();
+ }
+
+ if (this.currentSavePromise) {
+ logger.warn("Skipping double save and returning same promise");
+ return this.currentSavePromise;
+ }
+ logger.log("Starting to save game ...");
+ this.savegame.updateData(this.core.root);
+
+ this.currentSavePromise = this.savegame
+ .writeSavegameAndMetadata()
+ .catch(err => {
+ // Catch errors
+ logger.warn("Failed to save:", err);
+ })
+ .then(() => {
+ // Clear promise
+ logger.log("Saved!");
+ this.core.root.signals.gameSaved.dispatch();
+ this.currentSavePromise = null;
+ });
+
+ return this.currentSavePromise;
+ }
+}
diff --git a/src/js/states/preload.js b/src/js/states/preload.js
index 0f47e8d6..37b0d94e 100644
--- a/src/js/states/preload.js
+++ b/src/js/states/preload.js
@@ -1,293 +1,331 @@
-import { GameState } from "../core/game_state";
-import { createLogger } from "../core/logging";
-import { findNiceValue } from "../core/utils";
-import { cachebust } from "../core/cachebust";
-import { PlatformWrapperImplBrowser } from "../platform/browser/wrapper";
-import { T, autoDetectLanguageId, updateApplicationLanguage } from "../translations";
-import { HUDModalDialogs } from "../game/hud/parts/modal_dialogs";
-import { CHANGELOG } from "../changelog";
-import { globalConfig } from "../core/config";
-
-const logger = createLogger("state/preload");
-
-export class PreloadState extends GameState {
- constructor() {
- super("PreloadState");
- }
-
- getInnerHTML() {
- return `
-
-
- Booting
-
- 0%
-
-
-
- `;
- }
-
- getThemeMusic() {
- return null;
- }
-
- getHasFadeIn() {
- return false;
- }
-
- onEnter() {
- this.htmlElement.classList.add("prefab_LoadingState");
-
- const elementsToRemove = ["#loadingPreload", "#fontPreload"];
- for (let i = 0; i < elementsToRemove.length; ++i) {
- const elem = document.querySelector(elementsToRemove[i]);
- if (elem) {
- elem.remove();
- }
- }
-
- this.dialogs = new HUDModalDialogs(null, this.app);
- const dialogsElement = document.body.querySelector(".modalDialogParent");
- this.dialogs.initializeToElement(dialogsElement);
-
- /** @type {HTMLElement} */
- this.statusText = this.htmlElement.querySelector(".loadingStatus > .desc");
- /** @type {HTMLElement} */
- this.statusBar = this.htmlElement.querySelector(".loadingStatus > .bar > .inner");
- /** @type {HTMLElement} */
- this.statusBarText = this.htmlElement.querySelector(".loadingStatus > .bar > .status");
-
- this.currentStatus = "booting";
- this.currentIndex = 0;
-
- this.startLoading();
- }
-
- onLeave() {
- // this.dialogs.cleanup();
- }
-
- startLoading() {
- this.setStatus("Booting")
-
- .then(() => this.setStatus("Creating platform wrapper"))
- .then(() => this.app.platformWrapper.initialize())
-
- .then(() => this.setStatus("Initializing local storage"))
- .then(() => {
- const wrapper = this.app.platformWrapper;
- if (wrapper instanceof PlatformWrapperImplBrowser) {
- try {
- window.localStorage.setItem("local_storage_test", "1");
- window.localStorage.removeItem("local_storage_test");
- } catch (ex) {
- logger.error("Failed to read/write local storage:", ex);
- return new Promise(() => {
- alert(`Your brower does not support thirdparty cookies or you have disabled it in your security settings.\n\n
- In Chrome this setting is called "Block third-party cookies and site data".\n\n
- Please allow third party cookies and then reload the page.`);
- // Never return
- });
- }
- }
- })
-
- .then(() => this.setStatus("Creating storage"))
- .then(() => {
- return this.app.storage.initialize();
- })
-
- .then(() => this.setStatus("Initializing libraries"))
- .then(() => this.app.analytics.initialize())
- .then(() => this.app.gameAnalytics.initialize())
-
- .then(() => this.setStatus("Initializing settings"))
- .then(() => {
- return this.app.settings.initialize();
- })
-
- .then(() => {
- // Initialize fullscreen
- if (this.app.platformWrapper.getSupportsFullscreen()) {
- this.app.platformWrapper.setFullscreen(this.app.settings.getIsFullScreen());
- }
- })
-
- .then(() => this.setStatus("Initializing language"))
- .then(() => {
- if (this.app.settings.getLanguage() === "auto-detect") {
- const language = autoDetectLanguageId();
- logger.log("Setting language to", language);
- return this.app.settings.updateLanguage(language);
- }
- })
- .then(() => {
- const language = this.app.settings.getLanguage();
- updateApplicationLanguage(language);
- })
-
- .then(() => this.setStatus("Initializing sounds"))
- .then(() => {
- // Notice: We don't await the sounds loading itself
- return this.app.sound.initialize();
- })
-
- .then(() => {
- this.app.backgroundResourceLoader.startLoading();
- })
-
- .then(() => this.setStatus("Initializing savegame"))
- .then(() => {
- return this.app.savegameMgr.initialize().catch(err => {
- logger.error("Failed to initialize savegames:", err);
- alert(
- "Your savegames failed to load, it seems your data files got corrupted. I'm so sorry!\n\n(This can happen if your pc crashed while a game was saved).\n\nYou can try re-importing your savegames."
- );
- return this.app.savegameMgr.writeAsync();
- });
- })
-
- .then(() => this.setStatus("Downloading resources"))
- .then(() => {
- return this.app.backgroundResourceLoader.getPromiseForBareGame();
- })
-
- .then(() => this.setStatus("Checking changelog"))
- .then(() => {
- if (G_IS_DEV && globalConfig.debug.disableUpgradeNotification) {
- return;
- }
-
- return this.app.storage
- .readFileAsync("lastversion.bin")
- .catch(err => {
- logger.warn("Failed to read lastversion:", err);
- return G_BUILD_VERSION;
- })
- .then(version => {
- logger.log("Last version:", version, "App version:", G_BUILD_VERSION);
- this.app.storage.writeFileAsync("lastversion.bin", G_BUILD_VERSION);
- return version;
- })
- .then(version => {
- let changelogEntries = [];
- logger.log("Last seen version:", version);
-
- for (let i = 0; i < CHANGELOG.length; ++i) {
- if (CHANGELOG[i].version === version) {
- break;
- }
- changelogEntries.push(CHANGELOG[i]);
- }
- if (changelogEntries.length === 0) {
- return;
- }
-
- let dialogHtml = T.dialogs.updateSummary.desc;
- for (let i = 0; i < changelogEntries.length; ++i) {
- const entry = changelogEntries[i];
- dialogHtml += `
-
-
${entry.version}
-
${entry.date}
-
- ${entry.entries.map(text => `${text} `).join("")}
-
-
-
-
-
-
- ${this.currentStatus} failed:
-
-
- Please send me an email with steps to reproduce and what you did before this happened:
-
${email}
-
-
-
- Reset App
- Build ${G_BUILD_VERSION} @ ${G_BUILD_COMMIT_HASH}
-
-
+
+ Booting
+
+ 0%
+
+
+
+
+
${entry.version}
+
${entry.date}
+
+ ${entry.entries.map(text => `${text} `).join("")}
+
+
+
+
+
+
+ ${this.currentStatus} failed:
+
+
+ Please send me an email with steps to reproduce and what you did before this happened:
+
${email}
+
+
+
+ Reset App
+ Build ${G_BUILD_VERSION} @ ${G_BUILD_COMMIT_HASH}
+
+
Tastenbelegung-Einstellungen !Tastenbelegung-Einstellungen !STRG + Ziehen: Wähle Areal aus.UMSCH: Halten, um mehrere Gebäude zu platzieren.ALT: Invertiere die Platzierungsrichtung der Förderbänder.alle noch brauchen, um Upgrades freizuschalten !
+ Dieses Level hat dir keine Belohnung gegeben, aber im Nächsten gibt es eine! alle noch brauchen, um Upgrades freizuschalten !
no_reward_freeplay:
title: Nächstes Level
@@ -694,7 +694,7 @@ settings:
movementSpeed:
title: Bewegungsgeschwindigkeit
description: >-
- Ändert die Geschwindigkeit, mit der der Bildschirm durch die Pfeiltasten bewegt wird.
+ Ändert die Geschwindigkeit, mit welcher der Bildschirm durch die Pfeiltasten bewegt wird.
speeds:
super_slow: Sehr langsam
slow: Langsam
@@ -711,7 +711,7 @@ settings:
enableColorBlindHelper:
title: Modus für Farbenblinde
description: >-
- Aktiviert verschiedene Werkzeuge, die dir das Spielen trotz Farbenblindheit ermöglichen.
+ Aktiviert verschiedene Werkzeuge, welche dir das Spielen trotz Farbenblindheit ermöglichen.
fullscreen:
title: Vollbild
@@ -775,7 +775,7 @@ settings:
rotationByBuilding:
title: Rotation pro Gebäudetyp
description: >-
- Jeder Gebäudetyp merkt sich einzeln, in welche Richtung er zeigt.
+ Jeder Gebäudetyp merkt sich eigenständig, in welche Richtung er zeigt.
Das fühlt sich möglicherweise besser an, wenn du häufig zwischen verschiedenen Gebäudetypen wechselst.
compactBuildingInfo:
@@ -786,7 +786,7 @@ settings:
disableCutDeleteWarnings:
title: Deaktiviere Warnungsdialog beim Löschen
description: >-
- Deaktiviert die Warnung, die beim Löschen und Ausschneiden von mehr als 100 Feldern angezeigt wird.
+ Deaktiviert die Warnung, welche beim Löschen und Ausschneiden von mehr als 100 Feldern angezeigt wird.
keybindings:
title: Tastenbelegung
diff --git a/translations/base-en.yaml b/translations/base-en.yaml
index 28fef7e2..dc43f3ce 100644
--- a/translations/base-en.yaml
+++ b/translations/base-en.yaml
@@ -898,6 +898,11 @@ settings:
description: >-
Enabled by default, selects the miner if you use the pipette when hovering a resource patch.
+ simplifiedBelts:
+ title: Simplified Belts (Ugly)
+ description: >-
+ Does not render belt items except when hovering the belt, to save performance.
+
keybindings:
title: Keybindings
hint: >-
@@ -1004,3 +1009,53 @@ demo:
exportingBase: Exporting whole Base as Image
settingNotAvailable: Not available in the demo.
+
+tips:
+ - The hub accepts input of any kind, not just the current shape!
+ - Make sure your factories are stackable - it will pay out!
+ - Don't build too close to the hub, or it will be a huge chaos!
+ - If stacking does not work, try switching the inputs.
+ - You can toggle the belt planner direction by pressing R .
+ - Holding CTRL allows dragging of belts without auto-orientation.
+ - Ratios stay the same, as long as all upgrades are on the same Tier.
+ - Serial execution is more efficient than parallel.
+ - You will unlock more variants of buildings later in the game!
+ - You can use T to switch between different variants.
+ - Symmetry is key!
+ - You can weave different tiers of tunnels.
+ - Try to build compact factories - it will pay out!
+ - The painter has a mirrored variant which you can select with T
+ - Having the right building ratios will maximize efficiency.
+ - At maximum level, 5 extractors will fill a single belt.
+ - Don't forget about tunnels!
+ - You don't need to divide up items evenly for full efficiency.
+ - Holding SHIFT will activate the belt planner, letting you place long lines of belts easily.
+ - Cutters always cut vertically, regardless of their orientation.
+ - To get white mix all three colors.
+ - The storage buffer priorities the first output.
+ - Invest time to build repeatable designs - it's worth it!
+ - Holding CTRL allows to place multiple buildings.
+ - You can hold ALT to invert the direction of placed belts.
+ - Efficiency is key!
+ - Shape patches that are further away from the hub are more complex.
+ - Machines have a limited speed, divide them up for maximum efficiency.
+ - Use balancers to maximize your efficiency.
+ - Organization is important. Try not to cross conveyors too much.
+ - Plan in advance, or it will be a huge chaos!
+ - Don't remove your old factories! You'll need them to unlock upgrades.
+ - Try beating level 18 on your own before seeking for help!
+ - Don't complicate things, try to stay simple and you'll go far.
+ - You may need to re-use factories later in the game. Plan your factories to be re-usable.
+ - Sometimes, you can find a needed shape in the map without creating it with stackers.
+ - Full windmills / pinwheels can never spawn naturally.
+ - Color your shapes before cutting for maximum efficiency.
+ - With modules, space is merely a perception; a concern for mortal men.
+ - Make a separate blueprint factory. They're important for modules.
+ - Have a closer look on the color mixer, and your questions will be answered.
+ - Use CTRL + Click to select an area.
+ - Building too close to the hub can get in the way of later projects.
+ - The pin icon next to each shape in the upgrade list pins it to the screen.
+ - Mix all primary colours together to make white!
+ - You have an infinite map, don't cramp your factory, expand!
+ - Also try Factorio! It's my favourite game.
+ - The quad cutter cuts clockwise starting from the top right!
diff --git a/translations/base-fi.yaml b/translations/base-fi.yaml
index 5acc58cf..17ad35d6 100644
--- a/translations/base-fi.yaml
+++ b/translations/base-fi.yaml
@@ -168,7 +168,7 @@ dialogs:
deleteGame: Tiedän mitä olen tekemässä
viewUpdate: Näytä päivitys
showUpgrades: Näytä Päivitykset
- showKeybindings: Show Keybindings
+ showKeybindings: Näytä pikanäppäimet
importSavegameError:
title: Tuonti Virhe
@@ -258,7 +258,7 @@ dialogs:
createMarker:
title: Uusi Merkki
desc: Anna merkille kuvaava nimi, voit myös sisällyttää muodon lyhyen avaimen siihen. (Lyhyen avaimen voit luoda täällä )
- titleEdit: Edit Marker
+ titleEdit: Muokkaa merkkiä
markerDemoLimit:
desc: Voit tehdä vain kaksi mukautettua merkkiä demoversiossa. Hanki itsenäinen versio saadaksesi loputtoman määrän merkkejä!
@@ -267,8 +267,8 @@ dialogs:
title: Vie kuvakaappaus
desc: Pyysit tukikohtasi viemistä kuvakaappauksena. Huomaa, että tämä voi olla melko hidasta isolla tukikohdalla ja voi jopa kaataa pelisi!
massCutInsufficientConfirm:
- title: Confirm cut
- desc: You can not afford to paste this area! Are you sure you want to cut it?
+ title: Vahvista leikkaus
+ desc: Sinulla ei ole varaa leikata tätä aluetta! Oletko varma että haluat leikata sen?
ingame:
# This is shown in the top left corner and displays useful keybindings in
@@ -303,8 +303,8 @@ ingame:
purple: Violetti
cyan: Syaani
white: Valkoinen
- uncolored: Ei Väriä
- black: Black
+ uncolored: Väritön
+ black: Musta
# Everything related to placing buildings (I.e. as soon as you selected a building
# from the toolbar)
@@ -465,7 +465,7 @@ buildings:
tier2:
name: Tunneli Taso II
- description: Sallii resurssien kuljetuksen rakennuksien ja hihnojen alta.
+ description: Sallii resurssien kuljetuksen rakennuksien ja hihnojen alta pidemmältä kantamalta.
splitter: # Internal name for the Balancer
default:
@@ -498,11 +498,11 @@ buildings:
name: &rotater Kääntäjä
description: Kääntää muotoja 90 astetta myötäpäivään.
ccw:
- name: Rotate (Vastapäivään)
+ name: Kääntäjä (Vastapäivään)
description: Kääntää muotoja 90 astetta vastapäivään.
fl:
- name: Rotate (180)
- description: Rotates shapes by 180 degrees.
+ name: Kääntäkä (180)
+ description: Kääntää muotoja 180 astetta.
stacker:
default:
@@ -550,11 +550,11 @@ buildings:
description: Tuottaa sähköä kuluttamalla muotoja. Jokainen sähkögeneraattori vaatii eri muotoja.
wire_crossings:
default:
- name: Wire Splitter
- description: Splits a energy wire into two.
+ name: Johdon jakaja
+ description: Jakaa energiajohdon kahteen.
merger:
- name: Wire Merger
- description: Merges two energy wires into one.
+ name: Johtojen yhdistäjä
+ description: Yhdistää kaksi energiajohtoa yhteen.
storyRewards:
# Those are the rewards gained from completing the store
@@ -642,9 +642,9 @@ storyRewards:
settings:
title: Asetukset
categories:
- general: General
- userInterface: User Interface
- advanced: Advanced
+ general: Yleinen
+ userInterface: Käyttöliittyma
+ advanced: Kehittynyt
versionBadges:
dev: Kehitys
@@ -736,17 +736,17 @@ settings:
refreshRate:
title: Simulaatiotavoite
description: >-
- Jos sinulla on 144hz näyttö, muuta virkistystaajuus täällä jotta pelin simulaatio toimii oikein isommilla virkistystaajuuksilla. Tämä voi laskea FPS nopeutta jos tietokoneesi on liian hidas.
+ Jos sinulla on 144hz näyttö, muuta virkistystaajuus täällä jotta pelin simulaatio toimii oikein isommilla virkistystaajuuksilla. Tämä voi laskea FPS nopeutta, jos tietokoneesi on liian hidas.
alwaysMultiplace:
title: Monisijoitus
description: >-
- Jos käytössä, kaikki rakennukset pysyvät valittuina sijoittamisen jälkeen kunnes peruutat sen. Tämä vastaa SHIFT:in pitämistö pohjassa ikuisesti.
+ Jos käytössä, kaikki rakennukset pysyvät valittuina sijoittamisen jälkeen kunnes peruutat sen. Tämä vastaa SHIFT:in pitämistä pohjassa ikuisesti.
offerHints:
title: Vihjeet & Oppaat
description: >-
- Tarjotaanko pelaamisen aikana vihjeitä ja oppaita. Myös piilottaa tietyt käyttöliittymäelementit tietyn tason mukaan, jotta alkuunpääseminen olisi helpompaa.
+ Tarjoaa pelaamisen aikana vihjeitä ja oppaita. Myös piilottaa tietyt käyttöliittymäelementit tietyn tason mukaan, jotta alkuunpääseminen olisi helpompaa.
enableTunnelSmartplace:
title: Älykkäät Tunnelit
@@ -771,12 +771,12 @@ settings:
disableCutDeleteWarnings:
title: Poista Leikkaus/Poisto Varoitukset
description: >-
- Poista varoitusikkunat dialogs brought up when cutting/deleting more than 100 entities.
+ Poista varoitusikkunat jotka ilmestyy kun leikkaat/poistat enemmän kuin 100 entiteettiä
keybindings:
title: Pikanäppäimet
hint: >-
- Tip: Muista käyttää CTRL, VAIHTO and ALT! Ne ottavat käyttöön erilaisia sijoitteluvaihtoehtoja.
+ Tip: Muista käyttää CTRL, VAIHTO ja ALT! Ne ottavat käyttöön erilaisia sijoitteluvaihtoehtoja.
resetKeybindings: Nollaa Pikanäppäimet
@@ -843,13 +843,13 @@ keybindings:
placementDisableAutoOrientation: Poista automaattinen suunta käytöstä
placeMultiple: Pysy sijoittamistilassa
- placeInverse: Käännä automaattinen hihnan suunta
- menuClose: Close Menu
+ placeInverse: Käännä automaattinen hihnan suunta päinvastoin
+ menuClose: Sulje valikko
about:
title: Tietoja tästä pelistä
body: >-
- Tämä peli on avoimen lähdekoodin ja kehitettä on Tobias Springer (tämä on minä).Tobias Springer (tämä on minä).shapez.io githubissa . secondes
+ xSecondsAgo: il y a secondes
oneMinuteAgo: il y a une minute
- xMinutesAgo: il y a minutes
+ xMinutesAgo: il y a minutes
oneHourAgo: il y a une heure
- xHoursAgo: il y a heures
+ xHoursAgo: il y a heures
oneDayAgo: il y a un jour
- xDaysAgo: il y a jours
+ xDaysAgo: il y a jours
# Short formats for times, e.g. '5h 23m'
- secondsShort: s
- minutesAndSecondsShort: m s
- hoursAndMinutesShort: h m
+ secondsShort: s
+ minutesAndSecondsShort: m s
+ hoursAndMinutesShort: h m
- xMinutes: minutes
+ xMinutes: minutes
keys:
tab: TAB
@@ -135,21 +136,21 @@ demoBanners:
# This is the "advertisement" shown in the main menu and other various places
title: Version démo
intro: >-
- Achetez la version complète pour débloquer toutes les fonctionnalités !
+ Achetez la version complète pour débloquer toutes les fonctionnalités !
mainMenu:
play: Jouer
changelog: Historique
importSavegame: Importer
- openSourceHint: Ce jeu est open source !
+ openSourceHint: Ce jeu est open source !
discordLink: Serveur Discord officiel
- helpTranslate: Contribuez à la traduction !
+ helpTranslate: Contribuez à la traduction !
# This is shown when using firefox and other browsers which are not supported.
browserWarning: >-
- Désolé, ce jeu est connu pour tourner lentement sur votre navigateur web ! Procurez-vous la version complète ou téléchargez Chrome pour une meilleure expérience.
+ Désolé, ce jeu sera lent sur votre navigateur web ! Procurez-vous la version complète ou téléchargez Chrome pour une meilleure expérience.
- savegameLevel: Niveau
+ savegameLevel: Niveau
savegameLevelUnknown: Niveau inconnu
continue: Continuer
@@ -165,16 +166,16 @@ dialogs:
later: Plus tard
restart: Relancer
reset: Réinitialiser
- getStandalone: Se procurer la version complète
+ getStandalone: Obtenir la version complète
deleteGame: Je sais ce que je fais
viewUpdate: Voir les mises à jour
showUpgrades: Montrer les améliorations
showKeybindings: Montrer les raccourcis
importSavegameError:
- title: Erreur d'importation
+ title: Erreur d’importation
text: >-
- Impossible d'importer votre sauvegarde:
+ Impossible d’importer votre sauvegarde :
importSavegameSuccess:
title: Sauvegarde importée
@@ -184,17 +185,17 @@ dialogs:
gameLoadFailure:
title: La sauvegarde est corrompue
text: >-
- Impossible de charger votre sauvegarde:
+ Impossible de charger votre sauvegarde :
confirmSavegameDelete:
title: Confirmez la suppression
text: >-
- Êtes-vous certains de vouloir supprimer votre partie ?
+ Êtes-vous sûr de vouloir supprimer votre partie ?
savegameDeletionError:
title: Impossible de supprimer
text: >-
- Impossible de supprimer votre sauvegarde:
+ Impossible de supprimer votre sauvegarde :
restartRequired:
title: Redémarrage requis
@@ -211,91 +212,91 @@ dialogs:
keybindingsResetOk:
title: Réinitialisation des contrôles
- desc: Les contrôles ont été réinitialisés dans leur état par défaut respectifs !
+ desc: Les contrôles ont été remis à défaut !
featureRestriction:
title: Version démo
- desc: Vous avez essayé d'accéder à la fonction () qui n'est pas disponible dans la démo. Considérez l'achat de la version complète pour une expérience optimale !
+ desc: Vous avez essayé d’accéder à la fonction () qui n’est pas disponible dans la démo. Pensez à acheter la version complète pour une expérience optimale !
oneSavegameLimit:
title: Sauvegardes limitées
- desc: Vous ne pouvez avoir qu'une seule sauvegarde en même temps dans la version démo. Merci d'effacer celle en cours ou alternativement de vous procurer la version complète !
+ desc: Vous ne pouvez avoir qu’une seule sauvegarde en même temps dans la version démo. Merci d’effacer celle en cours ou bien de vous procurer la version complète !
updateSummary:
- title: Nouvelle mise à jour !
+ title: Nouvelle mise à jour !
desc: >-
- Voici les modifications depuis votre dernière session:
+ Voici les changements depuis votre dernière session :
upgradesIntroduction:
title: Débloquer les améliorations
desc: >-
- Toutes les formes que vous produisez peuvent être utilisées pour débloquer des améliorations - Ne détruisez pas vos anciennes usines !
- L'onglet des améliorations se trouve dans le coin supérieur droit de l'écran.
+ Toutes les formes que vous produisez peuvent être utilisées pour débloquer des améliorations — Ne détruisez pas vos anciennes usines !
+ L’onglet des améliorations se trouve dans le coin supérieur droit de l’écran.
massDeleteConfirm:
title: Confirmation de suppression
desc: >-
- Vous allez supprimer pas mal de bâtiments ( pour être exact) ! Êtes vous certains de vouloir faire ça ?
+ Vous allez supprimer beaucoup de bâtiments ( pour être précis) ! Êtes-vous sûr de vouloir faire ça ?
massCutConfirm:
title: Confirmer la coupure
desc: >-
- Vous vous apprêtez à couper beaucoup de bâtiments ( pour être précis) ! Êtes-vous certains de vouloir faire ça ?
+ Vous allez couper beaucoup de bâtiments ( pour être précis) ! Êtes-vous sûr de vouloir faire ça ?
blueprintsNotUnlocked:
title: Pas encore débloqué
desc: >-
- Les patrons n'ont pas encore étés débloqués ! Terminez encore quelques niveaux pour y avoir accès.
+ Les patrons n’ont pas encore été débloqués ! Terminez le niveau 12 pour y avoir accès.
keybindingsIntroduction:
title: Raccourcis utiles
desc: >-
Le jeu a de nombreux raccourcis facilitant la construction de grandes usines.
- En voici quelques uns, n'hésitez pas à aller découvrir les raccourcis !CTRL + Glisser: Sélectionne une zone à copier / effacer.SHIFT: Laissez appuyé pour placer plusieurs fois le même bâtiment.ALT: Inverse l'orientation des convoyeurs placés.découvrir les raccourcis !CTRL + glisser : Sélectionne une zone à copier / effacer.MAJ : Laissez appuyé pour placer plusieurs fois le même bâtiment.ALT : Inverse l’orientation des convoyeurs placés.le raccourci d'une forme (Que vous pouvez générer ici )
- titleEdit: Éditer cette balise
+ desc: Donnez-lui un nom, vous pouvez aussi inclure le raccourci d’une forme (que vous pouvez générer ici ).
+ titleEdit: Modifier cette balise
markerDemoLimit:
- desc: Vous ne pouvez créer que deux balises dans la démo. Achetez la version complète pour en faire autant que vous voulez !
+ desc: Vous ne pouvez créer que deux balises dans la démo. Achetez la version complète pour en placer autant que vous voulez !
exportScreenshotWarning:
- title: Exporter une capture d'écran
+ title: Exporter une capture d’écran
desc: >-
- Vous avez demandé à exporter votre base sous la forme d'une capture d'écran. Soyez conscient que cela peut s'avérer passablement lent pour une grande base, voire même faire planter votre jeu !
+ Vous avez demandé à exporter une capture d’écran de votre base. Soyez conscient que cela peut s’avérer passablement lent pour une grande base, voire faire planter votre jeu !
massCutInsufficientConfirm:
title: Confirmer la coupe
- desc: Vous n'avez pas les moyens de copier cette zone ! Etes vous certain de vouloir la couper ?
+ desc: Vous n’avez pas les moyens de copier cette zone ! Êtes-vous sûr de vouloir la couper ?
ingame:
# This is shown in the top left corner and displays useful keybindings in
# every situation
keybindingsOverlay:
moveMap: Déplacer
- selectBuildings: Sélection d'une zone
- stopPlacement: Arrêter le placement
+ selectBuildings: Sélection d’une zone
+ stopPlacement: Arrêter de placer
rotateBuilding: Tourner le bâtiment
placeMultiple: Placement multiple
- reverseOrientation: Changer l'orientation
- disableAutoOrientation: Désactiver l'orientation automatique
- toggleHud: Basculer l'affichage tête haute (ATH)
+ reverseOrientation: Changer l’orientation
+ disableAutoOrientation: Désactiver l’orientation automatique
+ toggleHud: Basculer l’affichage tête haute (ATH)
placeBuilding: Placer un bâtiment
createMarker: Créer une balise
delete: Supprimer
pasteLastBlueprint: Copier le dernier patron
- lockBeltDirection: Utiliser le plannificateur de convoyeurs
- plannerSwitchSide: Échanger la direction du plannificateur
+ lockBeltDirection: Utiliser le planificateur de convoyeurs
+ plannerSwitchSide: Inverser la direction du planificateur
cutSelection: Couper
copySelection: Copier
clearSelection: Effacer la sélection
pipette: Pipette
- switchLayers: Échanger les calques
+ switchLayers: Changer de calque
# Everything related to placing buildings (I.e. as soon as you selected a building
# from the toolbar)
@@ -306,29 +307,29 @@ ingame:
# Shows the hotkey in the ui, e.g. "Hotkey: Q"
hotkeyLabel: >-
- Raccourci:
+ Raccourci :
infoTexts:
speed: Vitesse
range: Portée
storage: Espace de stockage
- oneItemPerSecond: 1 forme / s
- itemsPerSecond: formes / s
- itemsPerSecondDouble: (x2)
+ oneItemPerSecond: 1 forme ⁄ s
+ itemsPerSecond: formes ⁄ s
+ itemsPerSecondDouble: (×2)
- tiles: cases
+ tiles: cases
# The notification when completing a level
levelCompleteNotification:
# is replaced by the actual level, so this gets 'Level 03' for example.
- levelTitle: Niveau
+ levelTitle: Niveau
completed: Terminé
- unlockText: débloqué !
+ unlockText: débloqué !
buttonNextLevel: Niveau suivant
# Notifications on the lower right
notifications:
- newUpgrade: Une nouvelle amélioration est disponible !
+ newUpgrade: Une nouvelle amélioration est disponible !
gameSaved: Votre partie a été sauvegardée.
# The "Upgrades" window
@@ -337,11 +338,11 @@ ingame:
buttonUnlock: Améliorer
# Gets replaced to e.g. "Tier IX"
- tier: Niveau
+ tier: Niveau
# The roman number for each tier
tierLabels: [I, II, III, IV, V, VI, VII, VIII, IX, X]
- maximumLevel: NIVEAU MAXIMAL (Vitesse x)
+ maximumLevel: NIVEAU MAXIMAL (Vitesse ×)
# The "Statistics" window
statistics:
@@ -352,14 +353,14 @@ ingame:
description: Affiche le nombre de formes stockées dans votre bâtiment central.
produced:
title: Produit
- description: Affiche tous les formes que votre usine produit, en incluant les formes intermédiaires.
+ description: Affiche toutes les formes que votre usine produit, y compris les formes intermédiaires.
delivered:
- title: Délivré
+ title: Livré
description: Affiche les formes qui ont été livrées dans votre bâtiment central.
- noShapesProduced: Aucune forme n'a été produite jusqu'à présent.
+ noShapesProduced: Aucune forme produite pour le moment.
# Displays the shapes per minute, e.g. '523 / m'
- shapesPerMinute: / m
+ shapesPerMinute: ⁄ m
# Settings menu, when you press "ESC"
settingsMenu:
@@ -375,7 +376,7 @@ ingame:
# Bottom left tutorial hints
tutorialHints:
- title: Besoin d'aide ?
+ title: Besoin d’aide ?
showHint: Indice
hideHint: Fermer
@@ -387,19 +388,19 @@ ingame:
waypoints:
waypoints: Balise
hub: Centre
- description: Cliquez une balise pour vous y rendre, clic-droit pour l'effacer. pour créer une balise sur la vue actuelle, ou clic-droit pour en créer une sur l'endroit pointé.
+ description: Cliquez sur une balise pour vous y rendre, clic-droit pour l’effacer. pour créer une balise sur la vue actuelle, ou clic-droit pour en créer une sur l’endroit pointé.
creationSuccessNotification: La balise a été créée.
# Interactive tutorial
interactiveTutorial:
title: Tutoriel
hints:
- 1_1_extractor: Placez un extracteur sur une forme en cercle pour l'extraire !
+ 1_1_extractor: Placez un extracteur sur une forme en cercle pour l’extraire !
1_2_conveyor: >-
- Connectez l'extracteur avec un convoyeur vers votre centre !Cliquez et faites glisser le convoyeur avec votre souris !
+ Connectez l’extracteur avec un convoyeur vers votre centre !Cliquez et faites glisser le convoyeur avec votre souris !
1_3_expand: >-
- Ceci n'est PAS un jeu incrémental et inactif ! Construisez plus d'extracteurs et de convoyeurs pour atteindre plus vite votre votre but.MAJ enfoncé pour placer plusieurs extracteurs, et utilisez R pour les faire pivoter.
+ Ceci n’est PAS un jeu incrémental et inactif ! Construisez plus d’extracteurs et de convoyeurs pour atteindre plus vite votre but.MAJ enfoncé pour placer plusieurs extracteurs, et utilisez R pour les faire pivoter.
colors:
red: Rouge
@@ -409,92 +410,92 @@ ingame:
purple: Violet
cyan: Cyan
white: Blanc
- uncolored: Non coloré
+ uncolored: Sans couleur
black: Noir
shapeViewer:
title: Calques
empty: Vide
- copyKey: Copier la clé de forme
+ copyKey: Copier le raccourci de la forme
# All shop upgrades
shopUpgrades:
belt:
- name: Convoyeurs, Distributeurs et Tunnels
- description: Vitesse x → x
+ name: Convoyeurs, distributeurs et tunnels
+ description: Vitesse × → ×
miner:
name: Extraction
- description: Vitesse x → x
+ description: Vitesse × → ×
processors:
- name: Découpage, Rotation et Empilage
- description: Vitesse x → x
+ name: Découpage, rotation et empilage
+ description: Vitesse × → ×
painting:
- name: Mélange et Peinture
- description: Vitesse x → x
+ name: Mélange et peinture
+ description: Vitesse × → ×
# Buildings and their name / description
buildings:
belt:
default:
name: &belt Convoyeur
- description: Transporte les objects, maintenez et faites glisser pour en placer plusieurs.
+ description: Transporte les objets, maintenez et faites glisser pour en placer plusieurs.
miner: # Internal name for the Extractor
default:
name: &miner Extracteur
- description: Placez-le au dessus d'une forme ou couleur pour l'extraire.
+ description: Placez-le au-dessus d’une forme ou couleur pour l’extraire.
chainable:
name: Extracteur en série
- description: Placez-le au dessus d'une forme ou couleur pour l'extraire. Peut être mis en série.
+ description: Placez-le au-dessus d’une forme ou couleur pour l’extraire. Peut être mis en série.
underground_belt: # Internal name for the Tunnel
default:
name: &underground_belt Tunnel
- description: Permet de faire passer des ressources en dessous de bâtiment et de convoyeurs.
+ description: Permet de faire passer des ressources sous les bâtiments et les convoyeurs.
tier2:
- name: Tunnel Niveau II
- description: Permet de faire passer des ressources en dessous de bâtiment et de convoyeurs.
+ name: Tunnel niveau II
+ description: Permet de faire passer des ressources sous les bâtiments et les convoyeurs.
splitter: # Internal name for the Balancer
default:
name: &splitter Répartiteur
- description: Multifonctionnel - Distribue de manière équitable toutes les entrées vers toutes les sorties.
+ description: Multifonctions — Distribue équitablement toutes les entrées vers toutes les sorties.
compact:
name: Fusionneur (compact)
- description: Fusionne deux convoyeurs en un.
+ description: Fusionne deux convoyeurs en un seul.
compact-inverse:
name: Fusionneur (compact)
- description: Fusionne deux convoyeurs en un.
+ description: Fusionne deux convoyeurs en un seul.
cutter:
default:
name: &cutter Découpeur
- description: Coupe une forme de haut en bas et sort les deux parties. Si vous n'utilisez qu'une seule partie, assurez-vous de détruite l'autre ou sinon, gare au blocage !
+ description: Coupe une forme de haut en bas et sort les deux parties. Si vous n’utilisez qu’une seule partie, assurez-vous de détruire l’autre ou sinon, gare au blocage !
quad:
- name: Découpeur (Quatre)
- description: Coupe une forme en quatre parties. Si vous n'utilisez pas toutes les parties, assurez-vous de détruite les autres ou sinon, gare au blocage !
+ name: Découpeur (quadruple)
+ description: Coupe une forme en quatre parties. Si vous n’utilisez pas toutes les parties, assurez-vous de détruire les autres ou sinon, gare au blocage !
rotater:
default:
name: &rotater Pivoteur
- description: Fait pivoter une forme de 90 degrés vers la droite.
+ description: Fait pivoter une forme de 90 degrés vers la droite.
ccw:
name: Pivoteur inversé
- description: Fait pivoter une forme de 90 degrés vers la gauche.
+ description: Fait pivoter une forme de 90 degrés vers la gauche.
fl:
name: Retourneur
- description: Tourne la forme de 180 degrés.
+ description: Tourne une forme de 180 degrés.
stacker:
default:
name: &stacker Combineur
- description: Combine deux formes. Si elles ne peuvent pas êtres combinées, la forme de droite est placée sur la forme de gauche.
+ description: Combine deux formes. Si elles ne peuvent pas être combinées, la forme de droite est placée sur la forme de gauche.
mixer:
default:
@@ -506,11 +507,11 @@ buildings:
name: &painter Peintre
description: &painter_desc Colorie entièrement la forme de gauche avec la couleur de droite.
double:
- name: Peintre (Double)
+ name: Peintre (double)
description: Colorie les deux formes de gauche avec la couleur de droite.
quad:
- name: Peintre (Quadruple)
- description: Permet de colorier chaque quadrant d'une forme avec une couleur différente.
+ name: Peintre (quadruple)
+ description: Colorie chaque quadrant d’une forme avec une couleur différente.
mirrored:
name: *painter
description: *painter_desc
@@ -518,125 +519,125 @@ buildings:
trash:
default:
name: &trash Poubelle
- description: Accepte des formes de n'importe quel côté et les détruit... pour toujours.
+ description: Accepte des formes de n’importe quel côté et les détruit… pour toujours.
storage:
name: Stockage
- description: Stocke les formes en trop jusqu'à une certaine capacité. Peut être utilisé comme tampon.
+ description: Stocke les formes en trop jusqu’à une certaine capacité. Peut être utilisé pour absorber un surplus.
hub:
- deliver: Délivrez
+ deliver: Livrez
toUnlock: pour débloquer
levelShortcut: NV
wire:
default:
- name: Ligne énergétique
- description: Permet de transporter de l'énergie.
+ name: Câble
+ description: Permet de transporter de l’énergie.
advanced_processor:
default:
name: Inverseur de couleur
- description: Accepte une couleur ou une forme et l'inverse.
+ description: Accepte une couleur ou une forme, et l’inverse.
energy_generator:
- deliver: Délivrer
+ deliver: Livrer
toGenerateEnergy: Pour
default:
- name: Générateur d'énergie
- description: Genère de l'énergie en consommant des formes.
+ name: Générateur d’énergie
+ description: Génère de l’énergie en consommant des formes.
wire_crossings:
default:
- name: Duplicateur de ligne
- description: Sépare une ligne énergétique en deux.
+ name: Duplicateur de câble
+ description: Sépare un câble en deux.
merger:
- name: Fusionneur de ligne
- description: Fusionne deux lignes énergétiques en une seule.
+ name: Fusionneur de câble
+ description: Fusionne deux câbles en un seul.
storyRewards:
# Those are the rewards gained from completing the store
reward_cutter_and_trash:
- title: Découper des formes
- desc: Vous venez de débloquer le découpeur - il coupe des formes en deux de haut en bas quel que soit son orientation !gare au blocage - À cet effet, je mets à votre disposition la poubelle, qui détruit tout ce que vous y mettez !
+ title: Découpage de formes
+ desc: Vous venez de débloquer le découpeur — il coupe des formes en deux de haut en bas quelle que soit son orientation !gare au blocage — À cet effet, je mets à votre disposition la poubelle, qui détruit tout ce que vous y mettez !
reward_rotater:
title: Rotation
- desc: Le pivoteur a été débloqué ! Il pivote les formes de 90 degrés vers la droite.
+ desc: Le pivoteur a été débloqué ! Il pivote les formes de 90 degrés vers la droite.
reward_painter:
title: Peintre
desc: >-
- Le peintre a été débloqué - Extrayez des pigments de couleur (comme vous le faites avec les formes) et combinez les avec une forme dans un peintre pour les colorier !mode daltonien paramétrable dans les préférences !
+ Le peintre a été débloqué — Extrayez des pigments de couleur (comme vous le faites avec les formes) et combinez-les avec une forme dans un peintre pour les colorier !mode daltonien paramétrable dans les préférences !
reward_mixer:
title: Mélangeur de couleurs
- desc: Le mélangeur a été débloqué - Combinez deux couleurs en utilisant la synthèse additive des couleurs avec ce bâtiment !
+ desc: Le mélangeur a été débloqué — Combinez deux couleurs en utilisant la synthèse additive des couleurs avec ce bâtiment !
reward_stacker:
title: Combineur
- desc: Vous pouvez maintenant combiner deux formes avec le combineur ! Les deux entrées sont combinées et si elles ne peuvent êtres mises l'une à côté de l'autre, elles sont fusionnées . Sinon, la forme de droite est placée au dessus de la forme de gauche après avoir été légèrement réduite.
+ desc: Vous pouvez maintenant combiner deux formes avec le combineur ! Les deux entrées sont combinées et si elles peuvent être mises l’une à côté de l’autre, elles sont fusionnées . Sinon, la forme de droite est placée au-dessus de la forme de gauche.
reward_splitter:
- title: Distributeur/Rassembleur
- desc: Le répartiteur multifonctionnel a été débloqué - Il peut être utilisé pour construire de plus grandes usines en distribuant équitablement et rassemblant les formes entre plusieurs convoyeurs !répartiteur multifonctionnel a été débloqué — Il peut être utilisé pour construire de plus grandes usines en distribuant équitablement et rassemblant les formes entre plusieurs convoyeurs !tunnel a été débloqué - À présent il devient possible de faire passer des formes sous les convoyeurs et les bâtiments !
+ desc: Le tunnel a été débloqué — Vous pouvez maintenant faire passer des formes sous les convoyeurs et les bâtiments !
reward_rotater_ccw:
title: Pivoteur inversé
- desc: Vous avez débloqué une variante du pivoteur - Elle permet de faire pivoter vers la gauche ! Pour le construire, sélectionnez le pivoteur et appuyez sur 'T' pour alterner entre les variantes !
+ desc: Vous avez débloqué une variante du pivoteur — Elle permet de faire pivoter vers la gauche ! Pour le construire, sélectionnez le pivoteur et appuyez sur 'T' pour alterner entre les variantes !
reward_miner_chainable:
title: Extracteur en série
- desc: Vous avez débloqué l'extracteur en série ! Il permet de transférer ses resources à d'autres extracteurs pour augmenter le débit sortant !
+ desc: Vous avez débloqué l’extracteur en série ! Il permet de transférer ses ressources à d’autres extracteurs pour augmenter le débit sortant !
reward_underground_belt_tier_2:
title: Tunnel niveau II
- desc: Vous avez débloqué une nouvelle variante du tunnel - Elle a une portée plus grande , et vous pouvez à présent superposer les deux variantes de tunnels !
+ desc: Vous avez débloqué une nouvelle variante du tunnel — Elle a une portée plus grande , et vous pouvez superposer les deux variantes de tunnels !
reward_splitter_compact:
title: Répartiteur compact
desc: >-
- Vous avez débloqué une variante compacte du répartiteur - Elle accepte deux entrées et les rassemble en une sortie !
+ Vous avez débloqué une variante compacte du répartiteur — Elle accepte deux entrées et les rassemble en une sortie !
reward_cutter_quad:
title: Quadruple découpeur
- desc: Vous avez débloqué une variante du découpeur - Elle permet de découper les formes en quatre parties à la place de simplement deux !
+ desc: Vous avez débloqué une variante du découpeur — Elle permet de découper les formes en quatre parties à la place de simplement deux !
reward_painter_double:
title: Double peintre
- desc: Vous avez débloqué une variante du peintre - Elle fonctionne comme le peintre de base, mais elle permet de traiter deux formes à la fois en ne consommant qu'une couleur au lieu de deux !
+ desc: Vous avez débloqué une variante du peintre — Elle fonctionne comme le peintre de base, mais elle permet de traiter deux formes à la fois en ne consommant qu’une couleur au lieu de deux !
reward_painter_quad:
title: Quadruple peintre
- desc: Vous avez débloqué une variante du peintre - Elle permet de colorier chaque partie d'une forme individuellement !
+ desc: Vous avez débloqué une variante du peintre — Elle permet de colorier chaque partie d’une forme individuellement !
reward_storage:
title: Tampon de stockage
- desc: Vous avez débloqué une variante de la poubelle - Elle permet de stocker des formes jusqu'à une certaine limite !
+ desc: Vous avez débloqué une variante de la poubelle — Elle permet de stocker des formes jusqu’à une certaine limite !
reward_freeplay:
title: Mode libre
- desc: Vous y êtes arrivé ! Vous avez débloqué le mode libre ! Cela veut dire que dorénavant, les formes sont générées aléatoirement ! (Ne vous en faites pas, plus de contenu est prévu pour la version complète !)
+ desc: Vous y êtes arrivé ! Vous avez débloqué le mode libre ! Cela veut dire que dorénavant, les formes sont générées aléatoirement ! (Ne vous en faites pas, encore plus de contenu est prévu pour la version complète !)
reward_blueprints:
title: Patrons
- desc: Vous pouvez maintenant copier et coller des parties de votre usines ! Sélectionnez une zone (Appuyez sur CTRL, et sélectionnez avec votre souris), et appuyez sur 'C' pour la copier.pas gratuit , vous devez produire des formes de patrons pour vous le payer (les mêmes que celles que vous venez de livrer).
+ desc: Vous pouvez maintenant copier et coller des parties de votre usine ! Sélectionnez une zone (Appuyez sur CTRL, et sélectionnez avec votre souris), et appuyez sur 'C' pour la copier.pas gratuit , vous devez produire des formes de patrons pour vous le payer (les mêmes que celles que vous venez de livrer).
# Special reward, which is shown when there is no reward actually
no_reward:
title: Niveau suivant
desc: >-
- Ce niveau n'a pas de récompense mais le prochain, oui ! toutes ces formes plus tard pour débloquer des améliorations
+ Ce niveau n’a pas de récompense mais le prochain, si !toutes ces formes plus tard pour débloquer des améliorations .
no_reward_freeplay:
title: Niveau suivant
desc: >-
- Bravo ! À propos, plus de contenu est prévu pour la version complète !
+ Bravo ! À propos, plus de contenu est prévu pour la version complète !
settings:
title: Options
categories:
general: Général
- userInterface: Interface Utilisateur
+ userInterface: Interface utilisateur
advanced: Avancé
performance: Performance
@@ -648,26 +649,26 @@ settings:
labels:
uiScale:
- title: Taille de l'interface
+ title: Taille de l’interface
description: >-
- Change la taille de l'interface utilisateur. Cette interface se redimensionnera suivant la résolution de votre appareil, mais cette option contrôle le facteur de résolution.
+ Change la taille de l’interface utilisateur. Cette interface se redimensionnera suivant la résolution de votre écran, mais cette option contrôle le facteur de résolution.
scales:
super_small: Très petite
small: Petite
regular: Normale
- large: Large
- huge: Très large
+ large: Grande
+ huge: Très grande
scrollWheelSensitivity:
title: Sensibilité du zoom
description: >-
- Change la sensibilité du zoom (aussi bien de la roulette de la souris que du pavé tactile).
+ Change la sensibilité du zoom (roulette de la souris et pavé tactile).
sensitivity:
- super_slow: Super lent
+ super_slow: Très lent
slow: Lent
regular: Normal
fast: Rapide
- super_fast: Super rapide
+ super_fast: Très rapide
fullscreen:
title: Plein écran
@@ -687,7 +688,7 @@ settings:
theme:
title: Thème
description: >-
- Choisissez votre thème (clair / sombre).
+ Choisissez votre thème (clair / sombre).
themes:
dark: Sombre
@@ -701,7 +702,7 @@ settings:
alwaysMultiplace:
title: Placement multiple
description: >-
- Si activé, tous les bâtiments resterons sélectionnés tant que vous n'aurez pas annulé. Ceci revient à garder la touche SHIFT appuyée en permanence.
+ Si activé, tous les bâtiments resteront sélectionnés tant que vous n’aurez pas annulé. Ceci revient à garder la touche MAJ appuyée en permanence.
offerHints:
title: Indices
@@ -711,13 +712,13 @@ settings:
language:
title: Langue
description: >-
- Change la langue. Toutes les traductions sont des contributions des utilisateurs et pourraient être partiellement incomplètes !
+ Change la langue. Les traductions sont une contribution des utilisateurs et peuvent être incomplètes !
movementSpeed:
title: Vitesse de déplacement
- description: Change la vitesse à laquelle l'écran se déplace lors de l'utilisation du clavier.
+ description: Change la vitesse de déplacement de l’écran avec les touches clavier.
speeds:
- super_slow: Super lent
+ super_slow: Très lent
slow: Lent
regular: Normal
fast: Rapide
@@ -728,75 +729,75 @@ settings:
title: Tunnels intelligents
description: >-
Si cette option est sélectionnée, placer des tunnels effacera automatiquement les convoyeurs inutiles.
- Cela permet aussi d'étirer les tunnels et les tunnels en surnombre seront effacés.
+ Cela permet aussi d’étirer les tunnels, et les tunnels en surnombre seront effacés.
vignette:
title: Effet de vignette
description: >-
- Permet l'affichage de l'effet de vignette qui assombrit les coins de l'écran afin de rendre le texte plus facile à lire.
+ Permet l’affichage de l’effet de vignette qui assombrit les coins de l’écran afin de rendre le texte plus facile à lire.
autosaveInterval:
title: Fréquence des sauvegardes automatiques
description: >-
Contrôle avec quelle fréquence le jeu sera sauvegardé automatiquement. Vous pouvez aussi entièrement désactiver cette fonctionnalité ici.
intervals:
- one_minute: 1 Minute
- two_minutes: 2 Minutes
- five_minutes: 5 Minutes
- ten_minutes: 10 Minutes
- twenty_minutes: 20 Minutes
+ one_minute: 1 minute
+ two_minutes: 2 minutes
+ five_minutes: 5 minutes
+ ten_minutes: 10 minutes
+ twenty_minutes: 20 minutes
disabled: Désactivé
compactBuildingInfo:
title: Informations réduites sur les bâtiments
description: >-
- Raccourcit les panneaux d'information sur les bâtiments en n'affichant que les ratios. Dans le cas contraire, une description et une imagine sont présentés.
+ Raccourcit les panneaux d’information sur les bâtiments en n’affichant que les ratios. Si désactivé, montre une description et une image.
disableCutDeleteWarnings:
- title: Désactive les avertissement pour Couper/Effacer
+ title: Désactive les avertissements pour Couper / Effacer
description: >-
- Désactive la boîte de dialogue qui s'affiche lorsque vous vous apprêtez à couper/effacer plus de 100 entités.
+ Désactive la boîte de dialogue qui s’affiche lorsque vous vous apprêtez à couper / effacer plus de 100 entités.
enableColorBlindHelper:
- title: Mode Daltonien
+ title: Mode daltonien
description: Active divers outils qui permettent de jouer à ce jeu si vous êtes daltonien.
rotationByBuilding:
title: Rotation par catégorie de bâtiment
description: >-
Chaque catégorie de bâtiment enregistre le sens de rotation que vous lui avez assigné la dernière fois, de manière individuelle.
- Cela sera sans doute plus confortable si vous alternez fréquemment entre le placement de différents types de bâtiments.
+ Cela sera sans doute plus agréable si vous alternez fréquemment entre le placement de différents types de bâtiments.
lowQualityMapResources:
title: Ressources de la carte de plus basse qualité
description: >-
- Simplifie le rendu des ressources sur la carte lorsqu'elle est zoomée opur améliorer les performances.
- C'est encore plus clean, n'oubliez pas d'essayer !
+ Simplifie le rendu des ressources sur la carte lorsqu’elle est zoomée pour améliorer les performances.
+ Ça donne un rendu encore plus propre, alors essayez-le !
disableTileGrid:
- title: Desactiver la grille de placement
+ title: Désactiver la grille de placement
description: >-
- Desactiver la grille de placement peut aider les performances. Ça rend aussi le jeu encore plus uni!
+ Désactiver la grille de placement peut améliorer les performances. Ça rend aussi l’apparence plus unie !
clearCursorOnDeleteWhilePlacing:
- title: Effacer le curseur avec clic droit
+ title: Déselectionner avec le clic droit
description: >-
- Activé par défaut, efface le curseur lorsque vous faites un clic droit en ayant un bâtiment selectioné pour la constructio. Si desactivé, vous pouvez detruire les bâtiments en faisant un clic droit tout en placant un bâtiment.
+ Activé par défaut. Désélectionne le bâtiment choisi pour la construction lorsque vous faites un clic droit sur un bâtiment existant. Si désactivé, vous pouvez détruire des bâtiments avec un clic droit puis continuer de placer le bâtiment sélectionné.
lowQualityTextures:
- title: Textures de basse résolution (Moche)
+ title: Textures de basse résolution (moche)
description: >-
- Utilise des textures de basse qualité pour augmenter les performances. Cela va rendre le jeu moche!
+ Utilise des textures de basse qualité pour améliorer les performances. Rend le jeu très moche !
displayChunkBorders:
- title: Monter les bordures de chunks
+ title: Monter les secteurs
description: >-
- Le jeu est divisé en parties de 16x16 cases, si ce réglage est activé, les bordures de chaque partie sont affichées.
+ Le jeu est divisé en secteurs de 16×16 cases. Si ce réglage est activé, les limites de chaque secteur sont affichées.
keybindings:
title: Contrôles
hint: >-
- Astuce: Soyez sûr d'utiliser CTRL, SHIFT et ALT ! Ces touches activent différentes options de placement.
+ Astuce : N’oubliez pas d’utiliser CTRL, MAJ et ALT ! Ces touches activent différentes options de placement.
resetKeybindings: Réinitialiser les contrôles
@@ -805,7 +806,7 @@ keybindings:
ingame: Jeu
navigation: Navigation
placement: Placement
- massSelect: Suppression de zone
+ massSelect: Sélection d’une zone
buildings: Raccourcis bâtiment
placementModifiers: Modificateurs de placement
@@ -825,8 +826,8 @@ keybindings:
menuOpenShop: Améliorations
menuOpenStats: Statistiques
- toggleHud: Basculer l'affichage tête haute (ATH)
- toggleFPSInfo: Basculer l'affichage des IPS (itérations par seconde) et des informations de débogage
+ toggleHud: Basculer l’affichage tête haute (ATH)
+ toggleFPSInfo: Basculer l’affichage des IPS (itérations par seconde) et des informations de débogage
belt: *belt
splitter: *splitter
underground_belt: *underground_belt
@@ -840,49 +841,49 @@ keybindings:
rotateWhilePlacing: Pivoter
rotateInverseModifier: >-
- Variante: Pivote à gauche
+ Variante : Pivote à gauche
cycleBuildingVariants: Alterner entre les variantes
confirmMassDelete: Confirmer la suppression de la sélection
cycleBuildings: Alterner entre les bâtiments
- massSelectStart: Cliquez et maintenez pour commencer
+ massSelectStart: Cliquez et glissez pour commencer
massSelectSelectMultiple: Sélectionner plusieurs zones
massSelectCopy: Copier la sélection
- placementDisableAutoOrientation: Désactiver l'orientation automatique
+ placementDisableAutoOrientation: Désactiver l’orientation automatique
placeMultiple: Rester en mode placement
- placeInverse: Inverser le mode d'orientation automatique
+ placeInverse: Inverser le mode d’orientation automatique
pasteLastBlueprint: Copier le dernier patron
massSelectCut: Couper la sélection
- exportScreenshot: Exporter toute la base en tant qu'image.
+ exportScreenshot: Exporter une image de toute la base
mapMoveFaster: Se déplacer plus vite
- lockBeltDirection: Utiliser le plannificateur de convoyeurs
- switchDirectionLockSide: "Plannificateur: changer de côté"
+ lockBeltDirection: Utiliser le planificateur de convoyeurs
+ switchDirectionLockSide: "Planificateur : changer de côté"
pipette: Pipette
menuClose: Fermer le menu
- switchLayers: Échanger les calques
+ switchLayers: Basculer le calque
advanced_processor: Inverseur de couleur
- energy_generator: Générateur d'énergie
- wire: Ligne énergétique
+ energy_generator: Générateur d’énergie
+ wire: Câble
about:
title: À propos de ce jeu
body: >-
Ce jeu est open source et développé par Tobias Springer (c'est moi).shapez.io sur github .serveur Discord !serveur Discord !Peppsen - Il est impressionnant !Niklas - Sans nos sessions sur factorio, ce jeu n'aurait jamais existé.
+ Pour terminer, un immense merci à mon meilleur ami Niklas — Sans nos sessions sur Factorio, ce jeu n’aurait jamais existé.
changelog:
title: Historique
@@ -893,7 +894,7 @@ demo:
importingGames: Importer des sauvegardes
oneGameLimit: Limité à une sauvegarde
customizeKeybindings: Personnalisation des contrôles
- exportingBase: Exporter toute la base en tant qu'image
+ exportingBase: Exporter une image de toute la base
settingNotAvailable: Indisponible dans la démo.
#
diff --git a/translations/base-ind.yaml b/translations/base-ind.yaml
index 80e1238a..22dc0a08 100644
--- a/translations/base-ind.yaml
+++ b/translations/base-ind.yaml
@@ -22,10 +22,10 @@
---
steamPage:
# This is the short text appearing on the steam page
- shortText: shapez.io adalah permainan membangun pabrik-pabrik dengan tujuan untuk mengautomatiskan pembentukan dan pemrosesan bentuk-bentuk yang bertambah semakin kompleks di dalam area permainan yang meluas secara tak terhingga.
+ shortText: Shapez.io adalah game tentang membangun pabrik untuk mengotomatiskan pembuatan dan pemrosesan bentuk-bentuk yang semakin kompleks di peta yang meluas tanpa batas.
# This is the text shown above the discord link
- discordLink: Tautan Resmi Discord – Obrol dengan saya!
+ discordLink: Tautan Resmi Discord – Mari mengobrol dengan saya!
# This is the long description for the steam page - It is contained here so you can help to translate it, and I will regulary update the store page.
# NOTICE:
# - Do not translate the first line (This is the gif image at the start of the store)
@@ -33,13 +33,13 @@ steamPage:
longText: >-
[img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
- shapez.io adalah permainan membangun pabrik-pabrik dengan tujuan untuk mengautomatiskan pembentukan dan pemrosesan bentuk-bentuk yang bertambah semakin kompleks di dalam area permainan yang meluas secara tak terhingga.
+ shapez.io adalah permainan membangun pabrik dengan tujuan untuk mengautomatiskan pembentukan dan pemrosesan bentuk-bentuk yang bertambah semakin kompleks di peta yang meluas tanpa batas.
Setelah pengiriman bentuk-bentuk yang diminta, Anda akan maju dalam permainan dan membuka tingkatan versi-versi mesin selanjutnya untuk mempercepat pabrik Anda.
- Seiring meningkatnya kesulitan dari bentuk-bentuk yang diminta, Anda harus meningkatkan pabrik Anda untuk mengatasi kesulitan tersebut – Jangan lupa dengan sumber-sumber daya, Anda harus memperluas ke seluruh [b]area yang tidak terbatas[/b]!
+ Seiring meningkatnya kesulitan dari bentuk-bentuk yang diminta, Anda harus meningkatkan pabrik Anda untuk mengatasi kesulitan tersebut – Jangan lupa dengan sumber daya, Anda harus memperluas ke seluruh [b]area yang tidak terbatas[/b]!
- Kemudian Anda harus mencampurkan warna-warna dan mencat bentuk-bentuk dengannya – Campurkan merah, hijau, dan biru untuk memproduksi warna-warna lain dan mencat bentuk-bentuk dengannya untuk memenuhi permintaan.
+ Kemudian Anda harus mencampurkan warna-warna dan mencat bentuk-bentuk tersebut – Campurkan merah, hijau, dan biru untuk memproduksi warna-warna lain dan mencat bentuk-bentuk tersebut untuk memenuhi permintaan.
Permainan ini mempunyai 18 level-level progresif (yang mana akan membuat Anda sibuk berjam-jam!), akan tetapi saya akan terus menambahkan konten-konten baru – Ada banyak yang direncanakan!
@@ -48,16 +48,16 @@ steamPage:
[b]Keuntungan Versi Penuh[/b]
[list]
- [*] Versi Permainan Gelap
+ [*] Mode Malam
[*] Titik Arah Tak Terhingga
[*] Penyimpanan Permainan Tak Terhingga
[*] Pengaturan-pengaturan Tambahan
- [*] Akan datang: Kawat & Energi! Akan dicoba untuk dicapai untuk (kira-kira) akhir Juli 2020.
+ [*] Akan datang: Kawat & Energi! Akan dicoba untuk dicapai sekitar akhir Juli 2020.
[*] Akan datang: Level-level tambahan
- [*] Memperkenankan saya untuk terus mengembangkan shapez.io ❤️
+ [*] Mendukung saya untuk terus mengembangkan shapez.io ❤️
[/list]
- [b]Pembaruan di Masa Depan[/b]
+ [b]Pembaruan di masa yang akan datang[/b]
Saya seringkali membarui permainan ini dan terus mencoba untuk menciptakan pembaruan paling sedikit sekali seminggu!
@@ -87,8 +87,8 @@ steamPage:
[/list]
global:
- loading: Memuat
- error: Terdapat kesalahan
+ loading: Sedang memuat
+ error: Terjadi kesalahan
# How big numbers are rendered, e.g. "10,000"
thousandsDivider: ","
@@ -98,9 +98,9 @@ global:
# The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
suffix:
- thousands: k
- millions: M
- billions: B
+ thousands: K
+ millions: J
+ billions: M
trillions: T
# Shown for infinitely big numbers
@@ -108,13 +108,13 @@ global:
time:
# Used for formatting past time dates
- oneSecondAgo: satu detik yang lalu
+ oneSecondAgo: sedetik yang lalu
xSecondsAgo: detik yang lalu
- oneMinuteAgo: satu menit yang lalu
+ oneMinuteAgo: semenit yang lalu
xMinutesAgo: menit yang lalu
- oneHourAgo: satu jam yang lalu
+ oneHourAgo: sejam yang lalu
xHoursAgo: jam yang lalu
- oneDayAgo: satu hari yang lalu
+ oneDayAgo: sehari yang lalu
xDaysAgo: hari yang lalu
# Short formats for times, e.g. '5h 23m'
@@ -142,7 +142,7 @@ mainMenu:
play: Mulai Permainan
continue: Lanjutkan Permainan
newGame: Permainan Baru
- changelog: Ganti Data Log
+ changelog: Catatan Perubahan
subreddit: Reddit
importSavegame: Impor Data Simpanan
openSourceHint: Permainan ini bekerja secara open source!
@@ -166,7 +166,7 @@ dialogs:
restart: Mulai Ulang
reset: Setel Ulang
getStandalone: Dapatkan Versi Penuh
- deleteGame: Saya tahu apa yang saya kerjakan
+ deleteGame: Saya tahu apa yang saya lakukan
viewUpdate: Tampilkan Pembaruan
showUpgrades: Tunjukkan Tingkatan
showKeybindings: Tunjukan Tombol Pintas
diff --git a/translations/base-nl.yaml b/translations/base-nl.yaml
index 2f061268..01dd79ee 100644
--- a/translations/base-nl.yaml
+++ b/translations/base-nl.yaml
@@ -87,7 +87,7 @@ steamPage:
global:
loading: Laden
- error: Error
+ error: Fout
# How big numbers are rendered, e.g. "10,000"
thousandsDivider: "."
@@ -172,7 +172,7 @@ dialogs:
showKeybindings: Zie Sneltoetsen
importSavegameError:
- title: Importeer error
+ title: Importeerfout
text: >-
Het importeren van je savegame is mislukt:
@@ -322,7 +322,7 @@ ingame:
# is replaced by the actual level, so this gets 'Level 03' for example.
levelTitle: Level
completed: Voltooid
- unlockText: Ontgrendeld !
+ unlockText: ontgrendeld!
buttonNextLevel: Volgende Level
# Notifications on the lower right
@@ -633,9 +633,9 @@ storyRewards:
settings:
title: Opties
categories:
- general: General
- userInterface: User Interface
- advanced: Advanced
+ general: Algemeen
+ userInterface: Opmaak
+ advanced: Geavanceerd
versionBadges:
dev: Ontwikkeling
@@ -795,8 +795,8 @@ keybindings:
menuOpenShop: Upgrades
menuOpenStats: Statistieken
- toggleHud: Toggle HUD
- toggleFPSInfo: Toggle FPS en Debug Info
+ toggleHud: Schakel HUD
+ toggleFPSInfo: Schakel FPS en Debug Info
belt: *belt
splitter: *splitter
underground_belt: *underground_belt
diff --git a/translations/base-pt-BR.yaml b/translations/base-pt-BR.yaml
index bf269558..3a4fef2c 100644
--- a/translations/base-pt-BR.yaml
+++ b/translations/base-pt-BR.yaml
@@ -22,7 +22,7 @@
---
steamPage:
# This is the short text appearing on the steam page
- shortText: shapez.io é um jogo sobre construir fábricas, automatizando a criação e combinação de formas cada vez mais complexas num mapa infinito.
+ shortText: Shapez.io é um jogo sobre construir fábricas, automatizando a criação e combinação de formas cada vez mais complexas num mapa infinito.
# This is the text shown above the Discord link
discordLink: Discord Oficial - Converse comigo!
@@ -34,17 +34,17 @@ steamPage:
longText: >-
[img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
- shapez.io é um jogo sobre construir fábricas, automatizando a criação e combinação de formas cada vez mais complexas num mapa infinito.
+ Shapez.io é um jogo sobre construir fábricas, automatizando a criação e combinação de formas cada vez mais complexas num mapa infinito.
- Após a entrega das formas requisitadas você progredirá no jogo e desbloqueará melhorias para acelerar sua fábrica.
+ Após a entrega das formas requisitadas, você avançará no jogo e desbloqueará melhorias para acelerar sua produção.
- Conforme sua demanda por formas aumenta, você irá que aumentar sua fábrica para alcançar-la - Mas não se esqueça dos recursos, você precisará expandir pelo [b]mapa infinito[/b]!
+ Conforme sua demanda por formas aumenta, você terá que aumentar sua fábrica para alcançá-la - Mas não se esqueça dos recursos, você precisará expandir pelo [b]mapa infinito[/b]!
- Rapidamente você vai ter que misturar cores e pintar suas formas com elas - Combine recursos vermelhos, verdes e azuis para produzir cores diferentes e pintar formas com elas para satisfazer a demanda.
+ Em pouco tempo você terá que misturar cores e pintar suas formas com elas - Combine recursos vermelhos, verdes e azuis para produzir cores diferentes e pintar formas com elas para satisfazer a demanda.
- O jogo contém 18 níveis progressivos (Que já devem manter você ocupado por horas!) mas eu adiciono novo contéudo constantemente - Tem bastante coisa já planejada!
+ O jogo contém 18 níveis progressivos (que já devem manter você ocupado por horas!) mas eu adiciono novo contéudo constantemente - Tem bastante coisa já planejada!
- Comprando o jogo você terá acesso à versão completa, que contém recursos adicionais, e além disso você também terá acesso aos recursos que seram desenvolvidos.
+ Comprando o jogo você terá acesso à versão completa, que contém recursos adicionais, e além disso você também terá acesso aos recursos que serão desenvolvidos.
[b]Vantagens da versão completa[/b]
@@ -60,15 +60,15 @@ steamPage:
[b]Atualizações Futuras[/b]
- Eu lanço atualizações frequentemente e estou tentando lançar pelo menos um por semana!
+ Eu lanço atualizações frequentemente e estou tentando lançar pelo menos uma por semana!
[list]
[*] Mapas diferentes e desafios (por exemplo mapas com obstáculos)
[*] Puzzles (Entregue a forma pedida com uma área restringida ou um certo conjunto de construções)
[*] Um modo história onde as construções têm um custo
- [*] Um geredor de mapa customizável (Configure recursos, forma, tamanho, densidade, semente e mais)
+ [*] Um gerador de mapa customizável (configure recursos, formas, tamanho, densidade, semente e mais)
[*] Mais tipos de formas
- [*] Melhorias de desempenho (O jogo já roda bem!)
+ [*] Melhorias de desempenho (o jogo já roda bem!)
[*] E muito mais!
[/list]
@@ -130,8 +130,8 @@ global:
control: CTRL
alt: ALT
escape: ESC
- shift: SHIFT
- space: ESPAÇO
+ shift: Shift
+ space: Espaço
demoBanners:
# This is the "advertisement" shown in the main menu and other various places
@@ -145,7 +145,7 @@ mainMenu:
newGame: Novo jogo
changelog: Changelog
subreddit: Reddit
- importSavegame: Importar
+ importSavegame: Importar save
openSourceHint: Esse jogo tem código aberto!
discordLink: Discord oficial
helpTranslate: Ajude a traduzir!
@@ -183,7 +183,7 @@ dialogs:
Seu jogo salvo foi importado com sucesso.
gameLoadFailure:
- title: Jogo salvo quebrado
+ title: Jogo salvo corrompido
text: >-
Houve uma falha ao carregar seu jogo salvo:
@@ -198,13 +198,13 @@ dialogs:
Houve uma falha ao deletar seu jogo salvo:
restartRequired:
- title: Ação necessária
+ title: Reinicialização necessária
text: >-
Você precisa reiniciar o jogo para aplicar as mudanças.
editKeybinding:
title: Alterar tecla
- desc: Pressiona a tecla que deseja vincular, ou ESC para cancelar.
+ desc: Pressione a tecla que deseja vincular, ou ESC para cancelar.
resetKeybindingsConfirmation:
title: Resetar controles
@@ -234,17 +234,17 @@ dialogs:
O guia de melhorias pode ser encontrado no canto superior direito da tela.
massDeleteConfirm:
- title: Deletar
+ title: Deletar?
desc: >-
Você está deletando vários objetos ( para ser exato)! Você quer continuar?
massCutConfirm:
- title: Confirmar corte
+ title: Confirmar corte?
desc: >-
Você está cortando vários objetos ( para ser exato)! Você quer continuar?
massCutInsufficientConfirm:
- title: Confirmar Corte
+ title: Confirmar Corte?
desc: >-
You can not afford to paste this area! Are you sure you want to cut it?
@@ -290,8 +290,8 @@ ingame:
createMarker: Criar marcador
delete: Destruir
pasteLastBlueprint: Colar último projeto
- lockBeltDirection: Ativar Planejador de Esteiras
- plannerSwitchSide: Girar Planejador
+ lockBeltDirection: Ativar Planejamento de Esteiras
+ plannerSwitchSide: Girar Planejamento
cutSelection: Cortar
copySelection: Copiar
clearSelection: Limpar Seleção
@@ -363,13 +363,13 @@ ingame:
dataSources:
stored:
title: Estoque
- description: Exibindo a quantidade de formas armazenadas em sua construção central.
+ description: Exibindo a quantidade de formas armazenadas no seu HUB.
produced:
title: Produção
description: Exibindo todas as formas que toda a sua fábrica produz, incluindo produtos intermediários..
delivered:
title: Entregue
- description: Exibindo formas entregues na sua construção central.
+ description: Exibindo formas entregues no seu HUB.
noShapesProduced: Nenhuma forma foi produzida até o momento.
# Displays the shapes per minute, e.g. '523 / m'
@@ -384,14 +384,14 @@ ingame:
buttons:
continue: Continuar
- settings: Definições
+ settings: Configurações
menu: Voltar ao menu
# Bottom left tutorial hints
tutorialHints:
title: Quer ajuda?
showHint: Mostrar dica
- hideHint: Fechar
+ hideHint: Esconder dica
# When placing a blueprint
blueprintPlacer:
@@ -401,7 +401,7 @@ ingame:
waypoints:
waypoints: Marcadores
hub: HUB
- description: Clique com o botão esquerdo do mouse em um marcador para pular, clique com o botão direito do mouse para excluí-lo. para criar um marcador a partir da exibição atual ou clique com o botão direito do mouse para criar um marcador no local selecionado.
+ description: Clique com o botão esquerdo do mouse em um marcador para pular, clique com o botão direito do mouse para excluí-lo. para criar um marcador à partir da exibição atual ou clique com o botão direito do mouse para criar um marcador no local selecionado.
creationSuccessNotification: Marcador criado.
# Shape viewer
@@ -419,7 +419,7 @@ ingame:
Conecte o extrator com uma esteira transportadora até a sua base!clique e arraste a esteira com o mouse!
1_3_expand: >-
- Este NÃO é um jogo inativo! Construa mais extratores e esteiras para concluir o objetivo mais rapidamente.SHIFT para colocar vários extratores e use R para girá-los.
+ Este NÃO é um jogo idle! Construa mais extratores e esteiras para concluir o objetivo mais rapidamente.SHIFT para colocar vários extratores e use R para girá-los.
# All shop upgrades
shopUpgrades:
@@ -433,7 +433,7 @@ shopUpgrades:
name: Corte, Rotação e Montagem
description: Velocidade x → x
painting:
- name: Mistura e Pintura
+ name: Mistura de cores e Pintura
description: Velocidade x → x
# Buildings and their name / description
@@ -469,7 +469,7 @@ buildings:
tier2:
name: Túnel Classe II
- description: Permite transportar recursos por baixo de construções e esteiras.
+ description: Permite transportar recursos por baixo de construções e outras esteiras.
splitter: # Internal name for the Balancer
default:
@@ -541,7 +541,7 @@ buildings:
storage:
name: Estoque
- description: Armazena itens em excesso, até uma determinada capacidade. Pode ser usado como uma porta de transbordamento.
+ description: Armazena itens em excesso, até uma determinada capacidade. Pode ser usado como uma eclusa.
energy_generator:
deliver: Entregar
@@ -575,7 +575,7 @@ storyRewards:
reward_painter:
title: Pintura
desc: >-
- O Pintor foi desbloqueado - Extrai alguns pigmentos coloridos (assim como você fez com as formas) e combina-os com uma forma no pintor para os colorir!modo daltônico nas definições!
+ O Pintor foi desbloqueado - Extraia alguns pigmentos coloridos (assim como você fez com as formas) e combine-os com uma forma no pintor para colorí-las!modo daltônico nas definições!
reward_mixer:
title: Misturando cores
@@ -591,7 +591,7 @@ storyRewards:
reward_tunnel:
title: Túnel
- desc: O túnel foi desbloqueado - Agora você pode canalizar itens sob construções!
+ desc: O túnel foi desbloqueado - Agora você pode transportar itens abaixo do solo!
reward_rotater_ccw:
title: Rotação anti-horária
@@ -646,7 +646,7 @@ storyRewards:
Parabéns! Aliás, mais conteúdo vindo na versão completa!
settings:
- title: opções
+ title: Opções
categories:
general: Geral
userInterface: Interface de Usuário
@@ -671,7 +671,7 @@ settings:
huge: Gigante
autosaveInterval:
- title: Intervalo de gravação automática
+ title: Intervalo de save automático
description: >-
Controla a frequência com que o jogo salva automaticamente. Você também pode desativá-lo totalmente aqui.
@@ -714,7 +714,7 @@ settings:
enableColorBlindHelper:
title: Modo daltônico.
description: >-
- Permite várias ferramentas que permitem jogar se você é daltônico.
+ Habilita várias ferramentas que te permitem jogar se você é daltônico.
fullscreen:
title: Tela Cheia
@@ -745,24 +745,24 @@ settings:
Se você possui um monitor de 144 hz, altere a taxa de atualização aqui para que o jogo seja simulado corretamente com taxas de atualização mais altas. Isso diminuir o FPS consideravelmente se o computador for muito lento.
alwaysMultiplace:
- title: Multiplicidade
+ title: Posicionamento Múltiplo
description: >-
Se ativado, todas as construções permanecerão selecionadas após o posicionamento até que você a cancele. Isso é equivalente a pressionar SHIFT permanentemente.
offerHints:
- title: Dicas e tutoriais
+ title: Dicas e Tutoriais
description: >-
Se ativado, oferece dicas e tutoriais enquanto se joga. Além disso, esconde certos elementos da interface até certo ponto, para facilitar o começo do jogo.
enableTunnelSmartplace:
- title: Túneis inteligentes
+ title: Túneis Inteligentes
description: >-
Quando colocados, irão remover automaticamente esteiras desnecessárias. Isso também permite arrastar túneis e túneis em excesso serão removidos.
vignette:
title: Vinheta
description: >-
- Permite o modo vinheta que escurece os cantos da tela e facilita a leitura do texto.
+ Habilita o modo vinheta que escurece os cantos da tela e facilita a leitura do texto.
rotationByBuilding:
title: Rotação por tipo de construção
@@ -777,7 +777,7 @@ settings:
disableCutDeleteWarnings:
title: Desativar avisos de recorte / exclusão
description: >-
- Desative as caixas de diálogo de aviso exibidas ao cortar / excluir mais de 100 entidades.
+ Desativa as caixas de diálogo de aviso exibidas ao cortar / excluir mais de 100 entidades.
keybindings:
title: Controles
@@ -790,9 +790,9 @@ keybindings:
general: Geral
ingame: Jogo
navigation: Navegação
- placement: Construção
- massSelect: Seleção
- buildings: Atalhos de objetos
+ placement: Posicionamento
+ massSelect: Seleção em Massa
+ buildings: Construções
placementModifiers: Modificadores
mappings:
@@ -807,7 +807,7 @@ keybindings:
mapZoomIn: Aproximar
mapZoomOut: Distanciar
- createMarker: Criar marcação
+ createMarker: Criar marcador
menuOpenShop: Melhorias
menuOpenStats: Estatísticas
@@ -839,7 +839,7 @@ keybindings:
confirmMassDelete: Confirmar exclusão em massa
pasteLastBlueprint: Colar último projeto
cycleBuildings: Trocar de construção
- lockBeltDirection: Ativar planejador de correia
+ lockBeltDirection: Ativar planejamento de esteira
switchDirectionLockSide: >-
Planejador: Mudar de lado
diff --git a/res_built/atlas/atlas0_hq.json b/res_built/atlas/atlas0_hq.json
index 23e86df2..b0cdf7e5 100644
--- a/res_built/atlas/atlas0_hq.json
+++ b/res_built/atlas/atlas0_hq.json
@@ -2,7 +2,7 @@
"sprites/belt/built/forward_0.png":
{
- "frame": {"x":969,"y":1181,"w":116,"h":144},
+ "frame": {"x":305,"y":1895,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -10,7 +10,7 @@
},
"sprites/belt/built/forward_1.png":
{
- "frame": {"x":1490,"y":1317,"w":116,"h":144},
+ "frame": {"x":1885,"y":308,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -18,7 +18,7 @@
},
"sprites/belt/built/forward_2.png":
{
- "frame": {"x":266,"y":1588,"w":116,"h":144},
+ "frame": {"x":954,"y":1724,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -26,7 +26,7 @@
},
"sprites/belt/built/forward_3.png":
{
- "frame": {"x":386,"y":1588,"w":116,"h":144},
+ "frame": {"x":1270,"y":1205,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -34,7 +34,7 @@
},
"sprites/belt/built/forward_4.png":
{
- "frame": {"x":627,"y":1472,"w":116,"h":144},
+ "frame": {"x":1376,"y":1584,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -42,7 +42,7 @@
},
"sprites/belt/built/forward_5.png":
{
- "frame": {"x":932,"y":1329,"w":116,"h":144},
+ "frame": {"x":1376,"y":1736,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -50,7 +50,7 @@
},
"sprites/belt/built/forward_6.png":
{
- "frame": {"x":1052,"y":1329,"w":116,"h":144},
+ "frame": {"x":1500,"y":1584,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -58,7 +58,7 @@
},
"sprites/belt/built/forward_7.png":
{
- "frame": {"x":1172,"y":1329,"w":116,"h":144},
+ "frame": {"x":1500,"y":1736,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -66,7 +66,7 @@
},
"sprites/belt/built/forward_8.png":
{
- "frame": {"x":1292,"y":1329,"w":116,"h":144},
+ "frame": {"x":1506,"y":1888,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -74,7 +74,7 @@
},
"sprites/belt/built/forward_9.png":
{
- "frame": {"x":1555,"y":1465,"w":116,"h":144},
+ "frame": {"x":953,"y":1883,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -82,7 +82,7 @@
},
"sprites/belt/built/forward_10.png":
{
- "frame": {"x":812,"y":1329,"w":116,"h":144},
+ "frame": {"x":573,"y":1581,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -90,7 +90,7 @@
},
"sprites/belt/built/forward_11.png":
{
- "frame": {"x":507,"y":1472,"w":116,"h":144},
+ "frame": {"x":576,"y":1733,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -98,7 +98,7 @@
},
"sprites/belt/built/forward_12.png":
{
- "frame": {"x":146,"y":1588,"w":116,"h":144},
+ "frame": {"x":578,"y":1885,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -106,7 +106,7 @@
},
"sprites/belt/built/forward_13.png":
{
- "frame": {"x":3,"y":1730,"w":116,"h":144},
+ "frame": {"x":830,"y":1731,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -114,7 +114,7 @@
},
"sprites/belt/built/left_0.png":
{
- "frame": {"x":1909,"y":3,"w":130,"h":130},
+ "frame": {"x":718,"y":908,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -122,7 +122,7 @@
},
"sprites/belt/built/left_1.png":
{
- "frame": {"x":405,"y":1767,"w":130,"h":130},
+ "frame": {"x":718,"y":1046,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -130,7 +130,7 @@
},
"sprites/belt/built/left_2.png":
{
- "frame": {"x":1755,"y":1216,"w":130,"h":130},
+ "frame": {"x":1238,"y":1722,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -138,7 +138,7 @@
},
"sprites/belt/built/left_3.png":
{
- "frame": {"x":1675,"y":1478,"w":130,"h":130},
+ "frame": {"x":1390,"y":1357,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -146,7 +146,7 @@
},
"sprites/belt/built/left_4.png":
{
- "frame": {"x":1687,"y":1612,"w":130,"h":130},
+ "frame": {"x":1230,"y":1860,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -154,7 +154,7 @@
},
"sprites/belt/built/left_5.png":
{
- "frame": {"x":1809,"y":1478,"w":130,"h":130},
+ "frame": {"x":1368,"y":1888,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -162,7 +162,7 @@
},
"sprites/belt/built/left_6.png":
{
- "frame": {"x":1438,"y":1738,"w":130,"h":130},
+ "frame": {"x":1342,"y":763,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -170,7 +170,7 @@
},
"sprites/belt/built/left_7.png":
{
- "frame": {"x":1170,"y":1741,"w":130,"h":130},
+ "frame": {"x":1480,"y":763,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -178,7 +178,7 @@
},
"sprites/belt/built/left_8.png":
{
- "frame": {"x":908,"y":1755,"w":130,"h":130},
+ "frame": {"x":1618,"y":763,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -186,7 +186,7 @@
},
"sprites/belt/built/left_9.png":
{
- "frame": {"x":759,"y":1863,"w":130,"h":130},
+ "frame": {"x":1756,"y":763,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -194,7 +194,7 @@
},
"sprites/belt/built/left_10.png":
{
- "frame": {"x":263,"y":1882,"w":130,"h":130},
+ "frame": {"x":1114,"y":1349,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -202,7 +202,7 @@
},
"sprites/belt/built/left_11.png":
{
- "frame": {"x":1170,"y":1607,"w":130,"h":130},
+ "frame": {"x":1099,"y":1487,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -210,7 +210,7 @@
},
"sprites/belt/built/left_12.png":
{
- "frame": {"x":1304,"y":1607,"w":130,"h":130},
+ "frame": {"x":1252,"y":1357,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -218,7 +218,7 @@
},
"sprites/belt/built/left_13.png":
{
- "frame": {"x":1755,"y":1082,"w":130,"h":130},
+ "frame": {"x":1238,"y":1584,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -226,7 +226,7 @@
},
"sprites/belt/built/right_0.png":
{
- "frame": {"x":539,"y":1891,"w":130,"h":130},
+ "frame": {"x":1431,"y":901,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -234,7 +234,7 @@
},
"sprites/belt/built/right_1.png":
{
- "frame": {"x":397,"y":1901,"w":130,"h":130},
+ "frame": {"x":1569,"y":901,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -242,7 +242,7 @@
},
"sprites/belt/built/right_2.png":
{
- "frame": {"x":1821,"y":1612,"w":130,"h":130},
+ "frame": {"x":1721,"y":1039,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -250,7 +250,7 @@
},
"sprites/belt/built/right_3.png":
{
- "frame": {"x":1572,"y":1746,"w":130,"h":130},
+ "frame": {"x":1845,"y":901,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -258,7 +258,7 @@
},
"sprites/belt/built/right_4.png":
{
- "frame": {"x":1438,"y":1872,"w":130,"h":130},
+ "frame": {"x":1859,"y":1039,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -266,7 +266,7 @@
},
"sprites/belt/built/right_5.png":
{
- "frame": {"x":1706,"y":1746,"w":130,"h":130},
+ "frame": {"x":1394,"y":1196,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -274,7 +274,7 @@
},
"sprites/belt/built/right_6.png":
{
- "frame": {"x":1840,"y":1746,"w":130,"h":130},
+ "frame": {"x":1532,"y":1177,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -282,7 +282,7 @@
},
"sprites/belt/built/right_7.png":
{
- "frame": {"x":1042,"y":1875,"w":130,"h":130},
+ "frame": {"x":1670,"y":1177,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -290,7 +290,7 @@
},
"sprites/belt/built/right_8.png":
{
- "frame": {"x":893,"y":1889,"w":130,"h":130},
+ "frame": {"x":1808,"y":1177,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -298,7 +298,7 @@
},
"sprites/belt/built/right_9.png":
{
- "frame": {"x":1176,"y":1875,"w":130,"h":130},
+ "frame": {"x":1532,"y":1315,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -306,7 +306,7 @@
},
"sprites/belt/built/right_10.png":
{
- "frame": {"x":1304,"y":1741,"w":130,"h":130},
+ "frame": {"x":1707,"y":901,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -314,7 +314,7 @@
},
"sprites/belt/built/right_11.png":
{
- "frame": {"x":1889,"y":1082,"w":130,"h":130},
+ "frame": {"x":1307,"y":1058,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -322,7 +322,7 @@
},
"sprites/belt/built/right_12.png":
{
- "frame": {"x":1893,"y":937,"w":130,"h":130},
+ "frame": {"x":1445,"y":1039,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -330,7 +330,7 @@
},
"sprites/belt/built/right_13.png":
{
- "frame": {"x":1889,"y":1216,"w":130,"h":130},
+ "frame": {"x":1583,"y":1039,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -338,7 +338,7 @@
},
"sprites/blueprints/belt_left.png":
{
- "frame": {"x":1572,"y":1880,"w":130,"h":130},
+ "frame": {"x":1670,"y":1315,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -346,7 +346,7 @@
},
"sprites/blueprints/belt_right.png":
{
- "frame": {"x":1706,"y":1880,"w":130,"h":130},
+ "frame": {"x":1808,"y":1315,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -354,7 +354,7 @@
},
"sprites/blueprints/belt_top.png":
{
- "frame": {"x":1816,"y":660,"w":116,"h":144},
+ "frame": {"x":1307,"y":906,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -362,7 +362,7 @@
},
"sprites/blueprints/constant_signal.png":
{
- "frame": {"x":778,"y":1593,"w":105,"h":127},
+ "frame": {"x":1624,"y":1725,"w":105,"h":127},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":0,"w":105,"h":127},
@@ -370,7 +370,7 @@
},
"sprites/blueprints/cutter-quad.png":
{
- "frame": {"x":555,"y":151,"w":548,"h":144},
+ "frame": {"x":5,"y":562,"w":548,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":17,"y":0,"w":548,"h":144},
@@ -378,7 +378,7 @@
},
"sprites/blueprints/cutter.png":
{
- "frame": {"x":547,"y":1028,"w":256,"h":144},
+ "frame": {"x":301,"y":714,"w":256,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":17,"y":0,"w":256,"h":144},
@@ -386,7 +386,7 @@
},
"sprites/blueprints/display.png":
{
- "frame": {"x":646,"y":1620,"w":128,"h":136},
+ "frame": {"x":805,"y":1587,"w":128,"h":136},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":8,"y":8,"w":128,"h":136},
@@ -394,7 +394,7 @@
},
"sprites/blueprints/filter.png":
{
- "frame": {"x":839,"y":738,"w":268,"h":144},
+ "frame": {"x":857,"y":309,"w":268,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":16,"y":0,"w":268,"h":144},
@@ -402,7 +402,7 @@
},
"sprites/blueprints/lever.png":
{
- "frame": {"x":3,"y":1878,"w":111,"h":129},
+ "frame": {"x":1668,"y":1453,"w":111,"h":129},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":17,"y":4,"w":111,"h":129},
@@ -410,7 +410,7 @@
},
"sprites/blueprints/logic_gate-not.png":
{
- "frame": {"x":1237,"y":1181,"w":123,"h":144},
+ "frame": {"x":1884,"y":460,"w":123,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":11,"y":0,"w":123,"h":144},
@@ -418,7 +418,7 @@
},
"sprites/blueprints/logic_gate-or.png":
{
- "frame": {"x":1384,"y":446,"w":144,"h":123},
+ "frame": {"x":566,"y":998,"w":144,"h":123},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":123},
@@ -426,7 +426,7 @@
},
"sprites/blueprints/logic_gate-transistor.png":
{
- "frame": {"x":1936,"y":660,"w":101,"h":144},
+ "frame": {"x":554,"y":1429,"w":101,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":101,"h":144},
@@ -434,7 +434,7 @@
},
"sprites/blueprints/logic_gate-xor.png":
{
- "frame": {"x":1111,"y":741,"w":144,"h":143},
+ "frame": {"x":1841,"y":157,"w":144,"h":143},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":143},
@@ -442,7 +442,7 @@
},
"sprites/blueprints/logic_gate.png":
{
- "frame": {"x":969,"y":594,"w":144,"h":133},
+ "frame": {"x":856,"y":910,"w":144,"h":133},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":133},
@@ -450,7 +450,7 @@
},
"sprites/blueprints/miner-chainable.png":
{
- "frame": {"x":889,"y":1477,"w":136,"h":143},
+ "frame": {"x":1009,"y":613,"w":136,"h":143},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":136,"h":143},
@@ -458,7 +458,7 @@
},
"sprites/blueprints/miner.png":
{
- "frame": {"x":506,"y":1620,"w":136,"h":143},
+ "frame": {"x":1157,"y":764,"w":136,"h":143},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":136,"h":143},
@@ -466,7 +466,7 @@
},
"sprites/blueprints/mixer.png":
{
- "frame": {"x":1411,"y":3,"w":261,"h":144},
+ "frame": {"x":5,"y":1600,"w":261,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":13,"y":0,"w":261,"h":144},
@@ -474,7 +474,7 @@
},
"sprites/blueprints/painter-double.png":
{
- "frame": {"x":255,"y":704,"w":288,"h":287},
+ "frame": {"x":561,"y":309,"w":288,"h":287},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":288,"h":287},
@@ -482,7 +482,7 @@
},
"sprites/blueprints/painter-mirrored.png":
{
- "frame": {"x":3,"y":996,"w":288,"h":144},
+ "frame": {"x":1129,"y":156,"w":288,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":288,"h":144},
@@ -490,7 +490,7 @@
},
"sprites/blueprints/painter-quad.png":
{
- "frame": {"x":3,"y":556,"w":560,"h":144},
+ "frame": {"x":561,"y":5,"w":560,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":560,"h":144},
@@ -498,7 +498,7 @@
},
"sprites/blueprints/painter.png":
{
- "frame": {"x":821,"y":446,"w":288,"h":144},
+ "frame": {"x":1685,"y":5,"w":288,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":288,"h":144},
@@ -506,7 +506,7 @@
},
"sprites/blueprints/reader.png":
{
- "frame": {"x":296,"y":1440,"w":141,"h":144},
+ "frame": {"x":274,"y":1591,"w":141,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":0,"w":141,"h":144},
@@ -514,7 +514,7 @@
},
"sprites/blueprints/rotater-ccw.png":
{
- "frame": {"x":520,"y":1324,"w":143,"h":144},
+ "frame": {"x":274,"y":1743,"w":143,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":143,"h":144},
@@ -522,7 +522,7 @@
},
"sprites/blueprints/rotater-fl.png":
{
- "frame": {"x":150,"y":1440,"w":142,"h":144},
+ "frame": {"x":423,"y":1591,"w":142,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":142,"h":144},
@@ -530,7 +530,7 @@
},
"sprites/blueprints/rotater.png":
{
- "frame": {"x":3,"y":1440,"w":143,"h":144},
+ "frame": {"x":425,"y":1743,"w":143,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":143,"h":144},
@@ -538,7 +538,7 @@
},
"sprites/blueprints/splitter-compact-inverse.png":
{
- "frame": {"x":1458,"y":942,"w":142,"h":138},
+ "frame": {"x":5,"y":1904,"w":142,"h":138},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":2,"w":142,"h":138},
@@ -546,7 +546,7 @@
},
"sprites/blueprints/splitter-compact-merge-inverse.png":
{
- "frame": {"x":1604,"y":942,"w":142,"h":138},
+ "frame": {"x":155,"y":1904,"w":142,"h":138},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":2,"w":142,"h":138},
@@ -554,7 +554,7 @@
},
"sprites/blueprints/splitter-compact-merge.png":
{
- "frame": {"x":3,"y":1588,"w":139,"h":138},
+ "frame": {"x":1160,"y":915,"w":139,"h":138},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":2,"w":139,"h":138},
@@ -562,7 +562,7 @@
},
"sprites/blueprints/splitter-compact.png":
{
- "frame": {"x":1412,"y":1465,"w":139,"h":138},
+ "frame": {"x":976,"y":1197,"w":139,"h":138},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":2,"w":139,"h":138},
@@ -570,7 +570,7 @@
},
"sprites/blueprints/splitter.png":
{
- "frame": {"x":839,"y":886,"w":257,"h":144},
+ "frame": {"x":301,"y":866,"w":257,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":17,"y":0,"w":257,"h":144},
@@ -578,7 +578,7 @@
},
"sprites/blueprints/stacker.png":
{
- "frame": {"x":1399,"y":151,"w":261,"h":144},
+ "frame": {"x":5,"y":1752,"w":261,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":13,"y":0,"w":261,"h":144},
@@ -586,7 +586,7 @@
},
"sprites/blueprints/trash-storage.png":
{
- "frame": {"x":567,"y":446,"w":250,"h":288},
+ "frame": {"x":5,"y":1008,"w":250,"h":288},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":21,"y":0,"w":250,"h":288},
@@ -594,7 +594,7 @@
},
"sprites/blueprints/trash.png":
{
- "frame": {"x":295,"y":995,"w":144,"h":144},
+ "frame": {"x":1425,"y":156,"w":144,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":144},
@@ -602,7 +602,7 @@
},
"sprites/blueprints/underground_belt_entry-tier2.png":
{
- "frame": {"x":1816,"y":808,"w":138,"h":125},
+ "frame": {"x":822,"y":1335,"w":138,"h":125},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":19,"w":138,"h":125},
@@ -610,7 +610,7 @@
},
"sprites/blueprints/underground_belt_entry.png":
{
- "frame": {"x":747,"y":1477,"w":138,"h":112},
+ "frame": {"x":408,"y":1471,"w":138,"h":112},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":32,"w":138,"h":112},
@@ -618,7 +618,7 @@
},
"sprites/blueprints/underground_belt_exit-tier2.png":
{
- "frame": {"x":1623,"y":826,"w":139,"h":112},
+ "frame": {"x":261,"y":1471,"w":139,"h":112},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":139,"h":112},
@@ -626,7 +626,7 @@
},
"sprites/blueprints/underground_belt_exit.png":
{
- "frame": {"x":123,"y":1736,"w":138,"h":112},
+ "frame": {"x":663,"y":1459,"w":138,"h":112},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":138,"h":112},
@@ -634,7 +634,7 @@
},
"sprites/blueprints/virtual_processor-analyzer.png":
{
- "frame": {"x":3,"y":1144,"w":144,"h":144},
+ "frame": {"x":1429,"y":308,"w":144,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":144},
@@ -642,7 +642,7 @@
},
"sprites/blueprints/virtual_processor-rotater.png":
{
- "frame": {"x":1490,"y":1169,"w":118,"h":144},
+ "frame": {"x":702,"y":1883,"w":118,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":118,"h":144},
@@ -650,7 +650,7 @@
},
"sprites/blueprints/virtual_processor-shapecompare.png":
{
- "frame": {"x":1259,"y":741,"w":144,"h":133},
+ "frame": {"x":1008,"y":915,"w":144,"h":133},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":133},
@@ -658,7 +658,7 @@
},
"sprites/blueprints/virtual_processor-stacker.png":
{
- "frame": {"x":685,"y":1176,"w":132,"h":144},
+ "frame": {"x":717,"y":604,"w":132,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":132,"h":144},
@@ -666,7 +666,7 @@
},
"sprites/blueprints/virtual_processor-unstacker.png":
{
- "frame": {"x":151,"y":1144,"w":144,"h":144},
+ "frame": {"x":1428,"y":460,"w":144,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":144},
@@ -674,7 +674,7 @@
},
"sprites/blueprints/virtual_processor.png":
{
- "frame": {"x":1100,"y":888,"w":144,"h":141},
+ "frame": {"x":857,"y":613,"w":144,"h":141},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":3,"w":144,"h":141},
@@ -682,7 +682,7 @@
},
"sprites/blueprints/wire-cross.png":
{
- "frame": {"x":299,"y":1143,"w":144,"h":144},
+ "frame": {"x":1581,"y":308,"w":144,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":144},
@@ -690,7 +690,7 @@
},
"sprites/blueprints/wire-split.png":
{
- "frame": {"x":1384,"y":573,"w":144,"h":82},
+ "frame": {"x":561,"y":604,"w":144,"h":82},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":62,"w":144,"h":82},
@@ -698,7 +698,7 @@
},
"sprites/blueprints/wire-turn.png":
{
- "frame": {"x":1371,"y":1015,"w":82,"h":82},
+ "frame": {"x":1793,"y":1588,"w":82,"h":82},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":62,"y":62,"w":82,"h":82},
@@ -706,7 +706,7 @@
},
"sprites/blueprints/wire.png":
{
- "frame": {"x":447,"y":1143,"w":20,"h":144},
+ "frame": {"x":1904,"y":1453,"w":20,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":62,"y":0,"w":20,"h":144},
@@ -714,7 +714,7 @@
},
"sprites/blueprints/wire_tunnel-coating.png":
{
- "frame": {"x":447,"y":1291,"w":33,"h":134},
+ "frame": {"x":1301,"y":764,"w":33,"h":134},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":56,"y":5,"w":33,"h":134},
@@ -722,7 +722,7 @@
},
"sprites/blueprints/wire_tunnel.png":
{
- "frame": {"x":1612,"y":1224,"w":138,"h":135},
+ "frame": {"x":968,"y":1343,"w":138,"h":135},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":138,"h":135},
@@ -730,7 +730,7 @@
},
"sprites/buildings/belt_left.png":
{
- "frame": {"x":1909,"y":3,"w":130,"h":130},
+ "frame": {"x":718,"y":908,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":14,"w":130,"h":130},
@@ -738,7 +738,7 @@
},
"sprites/buildings/belt_right.png":
{
- "frame": {"x":539,"y":1891,"w":130,"h":130},
+ "frame": {"x":1431,"y":901,"w":130,"h":130},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":14,"w":130,"h":130},
@@ -746,7 +746,7 @@
},
"sprites/buildings/belt_top.png":
{
- "frame": {"x":969,"y":1181,"w":116,"h":144},
+ "frame": {"x":305,"y":1895,"w":116,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":116,"h":144},
@@ -754,7 +754,7 @@
},
"sprites/buildings/constant_signal.png":
{
- "frame": {"x":1438,"y":1607,"w":104,"h":127},
+ "frame": {"x":1630,"y":1860,"w":104,"h":127},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":0,"w":104,"h":127},
@@ -762,7 +762,7 @@
},
"sprites/buildings/cutter-quad.png":
{
- "frame": {"x":555,"y":299,"w":548,"h":143},
+ "frame": {"x":1129,"y":5,"w":548,"h":143},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":17,"y":0,"w":548,"h":143},
@@ -770,7 +770,7 @@
},
"sprites/buildings/cutter.png":
{
- "frame": {"x":829,"y":1034,"w":256,"h":143},
+ "frame": {"x":261,"y":1320,"w":256,"h":143},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":17,"y":0,"w":256,"h":143},
@@ -778,7 +778,7 @@
},
"sprites/buildings/display.png":
{
- "frame": {"x":778,"y":1724,"w":126,"h":135},
+ "frame": {"x":1077,"y":1892,"w":126,"h":135},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":126,"h":135},
@@ -786,7 +786,7 @@
},
"sprites/buildings/filter.png":
{
- "frame": {"x":1113,"y":446,"w":267,"h":144},
+ "frame": {"x":1153,"y":460,"w":267,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":17,"y":0,"w":267,"h":144},
@@ -794,7 +794,7 @@
},
"sprites/buildings/hub.png":
{
- "frame": {"x":3,"y":3,"w":548,"h":549},
+ "frame": {"x":5,"y":5,"w":548,"h":549},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":16,"w":548,"h":549},
@@ -802,7 +802,7 @@
},
"sprites/buildings/lever.png":
{
- "frame": {"x":646,"y":1760,"w":109,"h":127},
+ "frame": {"x":1787,"y":1453,"w":109,"h":127},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":18,"y":5,"w":109,"h":127},
@@ -810,7 +810,7 @@
},
"sprites/buildings/logic_gate-not.png":
{
- "frame": {"x":1364,"y":1181,"w":122,"h":144},
+ "frame": {"x":700,"y":1731,"w":122,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":12,"y":0,"w":122,"h":144},
@@ -818,7 +818,7 @@
},
"sprites/buildings/logic_gate-or.png":
{
- "frame": {"x":1532,"y":531,"w":143,"h":123},
+ "frame": {"x":675,"y":1184,"w":143,"h":123},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":143,"h":123},
@@ -826,7 +826,7 @@
},
"sprites/buildings/logic_gate-transistor.png":
{
- "frame": {"x":443,"y":995,"w":100,"h":144},
+ "frame": {"x":697,"y":1579,"w":100,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":100,"h":144},
@@ -834,7 +834,7 @@
},
"sprites/buildings/logic_gate-xor.png":
{
- "frame": {"x":1485,"y":659,"w":143,"h":143},
+ "frame": {"x":1457,"y":612,"w":143,"h":143},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":143,"h":143},
@@ -842,7 +842,7 @@
},
"sprites/buildings/logic_gate.png":
{
- "frame": {"x":1476,"y":806,"w":143,"h":132},
+ "frame": {"x":856,"y":1051,"w":143,"h":132},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":143,"h":132},
@@ -850,7 +850,7 @@
},
"sprites/buildings/miner-chainable.png":
{
- "frame": {"x":265,"y":1736,"w":136,"h":142},
+ "frame": {"x":531,"y":1129,"w":136,"h":142},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":136,"h":142},
@@ -858,7 +858,7 @@
},
"sprites/buildings/miner.png":
{
- "frame": {"x":123,"y":1852,"w":136,"h":142},
+ "frame": {"x":531,"y":1279,"w":136,"h":142},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":136,"h":142},
@@ -866,7 +866,7 @@
},
"sprites/buildings/mixer.png":
{
- "frame": {"x":1107,"y":299,"w":260,"h":143},
+ "frame": {"x":263,"y":1018,"w":260,"h":143},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":260,"h":143},
@@ -874,7 +874,7 @@
},
"sprites/buildings/painter-double.png":
{
- "frame": {"x":547,"y":738,"w":288,"h":286},
+ "frame": {"x":5,"y":714,"w":288,"h":286},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":288,"h":286},
@@ -882,7 +882,7 @@
},
"sprites/buildings/painter-mirrored.png":
{
- "frame": {"x":1107,"y":151,"w":288,"h":144},
+ "frame": {"x":1133,"y":308,"w":288,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":288,"h":144},
@@ -890,7 +890,7 @@
},
"sprites/buildings/painter-quad.png":
{
- "frame": {"x":555,"y":3,"w":560,"h":144},
+ "frame": {"x":561,"y":157,"w":560,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":560,"h":144},
@@ -898,7 +898,7 @@
},
"sprites/buildings/painter.png":
{
- "frame": {"x":1119,"y":3,"w":288,"h":144},
+ "frame": {"x":857,"y":461,"w":288,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":288,"h":144},
@@ -906,7 +906,7 @@
},
"sprites/buildings/reader.png":
{
- "frame": {"x":667,"y":1324,"w":141,"h":144},
+ "frame": {"x":429,"y":1895,"w":141,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":0,"w":141,"h":144},
@@ -914,7 +914,7 @@
},
"sprites/buildings/rotater-ccw.png":
{
- "frame": {"x":1812,"y":139,"w":141,"h":143},
+ "frame": {"x":1608,"y":612,"w":141,"h":143},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":0,"w":141,"h":143},
@@ -922,7 +922,7 @@
},
"sprites/buildings/rotater-fl.png":
{
- "frame": {"x":1671,"y":679,"w":141,"h":143},
+ "frame": {"x":1757,"y":612,"w":141,"h":143},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":141,"h":143},
@@ -930,7 +930,7 @@
},
"sprites/buildings/rotater.png":
{
- "frame": {"x":1800,"y":513,"w":141,"h":143},
+ "frame": {"x":1008,"y":764,"w":141,"h":143},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":0,"w":141,"h":143},
@@ -938,7 +938,7 @@
},
"sprites/buildings/splitter-compact-inverse.png":
{
- "frame": {"x":1845,"y":371,"w":141,"h":136},
+ "frame": {"x":1158,"y":1061,"w":141,"h":136},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":3,"w":141,"h":136},
@@ -946,7 +946,7 @@
},
"sprites/buildings/splitter-compact-merge-inverse.png":
{
- "frame": {"x":1699,"y":373,"w":142,"h":136},
+ "frame": {"x":826,"y":1191,"w":142,"h":136},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":3,"w":142,"h":136},
@@ -954,7 +954,7 @@
},
"sprites/buildings/splitter-compact-merge.png":
{
- "frame": {"x":1612,"y":1084,"w":139,"h":136},
+ "frame": {"x":1123,"y":1205,"w":139,"h":136},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":3,"w":139,"h":136},
@@ -962,7 +962,7 @@
},
"sprites/buildings/splitter-compact.png":
{
- "frame": {"x":1750,"y":942,"w":139,"h":136},
+ "frame": {"x":675,"y":1315,"w":139,"h":136},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":3,"w":139,"h":136},
@@ -970,7 +970,7 @@
},
"sprites/buildings/splitter.png":
{
- "frame": {"x":1117,"y":594,"w":256,"h":143},
+ "frame": {"x":1577,"y":157,"w":256,"h":143},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":17,"y":0,"w":256,"h":143},
@@ -978,7 +978,7 @@
},
"sprites/buildings/stacker.png":
{
- "frame": {"x":1371,"y":299,"w":260,"h":143},
+ "frame": {"x":263,"y":1169,"w":260,"h":143},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":260,"h":143},
@@ -986,7 +986,7 @@
},
"sprites/buildings/trash-storage.png":
{
- "frame": {"x":3,"y":704,"w":248,"h":288},
+ "frame": {"x":5,"y":1304,"w":248,"h":288},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":22,"y":0,"w":248,"h":288},
@@ -994,7 +994,7 @@
},
"sprites/buildings/trash.png":
{
- "frame": {"x":537,"y":1176,"w":144,"h":144},
+ "frame": {"x":1580,"y":460,"w":144,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":144},
@@ -1002,7 +1002,7 @@
},
"sprites/buildings/underground_belt_entry-tier2.png":
{
- "frame": {"x":1029,"y":1477,"w":137,"h":124},
+ "frame": {"x":1906,"y":754,"w":137,"h":124},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":20,"w":137,"h":124},
@@ -1010,7 +1010,7 @@
},
"sprites/buildings/underground_belt_entry.png":
{
- "frame": {"x":1170,"y":1477,"w":137,"h":111},
+ "frame": {"x":809,"y":1468,"w":137,"h":111},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":33,"w":137,"h":111},
@@ -1018,7 +1018,7 @@
},
"sprites/buildings/underground_belt_exit-tier2.png":
{
- "frame": {"x":1546,"y":1613,"w":137,"h":111},
+ "frame": {"x":954,"y":1486,"w":137,"h":111},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":137,"h":111},
@@ -1026,7 +1026,7 @@
},
"sprites/buildings/underground_belt_exit.png":
{
- "frame": {"x":1675,"y":1363,"w":137,"h":111},
+ "frame": {"x":941,"y":1605,"w":137,"h":111},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":137,"h":111},
@@ -1034,7 +1034,7 @@
},
"sprites/buildings/virtual_processor-analyzer.png":
{
- "frame": {"x":3,"y":1292,"w":144,"h":144},
+ "frame": {"x":1733,"y":308,"w":144,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":144},
@@ -1042,7 +1042,7 @@
},
"sprites/buildings/virtual_processor-rotater.png":
{
- "frame": {"x":1679,"y":531,"w":117,"h":144},
+ "frame": {"x":828,"y":1883,"w":117,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":117,"h":144},
@@ -1050,7 +1050,7 @@
},
"sprites/buildings/virtual_processor-shapecompare.png":
{
- "frame": {"x":1664,"y":236,"w":143,"h":133},
+ "frame": {"x":1007,"y":1056,"w":143,"h":133},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":143,"h":133},
@@ -1058,7 +1058,7 @@
},
"sprites/buildings/virtual_processor-stacker.png":
{
- "frame": {"x":1237,"y":1033,"w":130,"h":144},
+ "frame": {"x":718,"y":756,"w":130,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":130,"h":144},
@@ -1066,7 +1066,7 @@
},
"sprites/buildings/virtual_processor-unstacker.png":
{
- "frame": {"x":1089,"y":1182,"w":144,"h":143},
+ "frame": {"x":1305,"y":612,"w":144,"h":143},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":1,"w":144,"h":143},
@@ -1074,7 +1074,7 @@
},
"sprites/buildings/virtual_processor.png":
{
- "frame": {"x":821,"y":594,"w":144,"h":140},
+ "frame": {"x":856,"y":762,"w":144,"h":140},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":144,"h":140},
@@ -1082,7 +1082,7 @@
},
"sprites/buildings/wire-cross.png":
{
- "frame": {"x":151,"y":1292,"w":144,"h":144},
+ "frame": {"x":1732,"y":460,"w":144,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":144},
@@ -1090,7 +1090,7 @@
},
"sprites/buildings/wire-split.png":
{
- "frame": {"x":1259,"y":878,"w":144,"h":81},
+ "frame": {"x":1086,"y":1625,"w":144,"h":81},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":63,"w":144,"h":81},
@@ -1098,7 +1098,7 @@
},
"sprites/buildings/wire-turn.png":
{
- "frame": {"x":1824,"y":3,"w":81,"h":81},
+ "frame": {"x":1389,"y":1495,"w":81,"h":81},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":63,"y":63,"w":81,"h":81},
@@ -1106,7 +1106,7 @@
},
"sprites/buildings/wire.png":
{
- "frame": {"x":471,"y":1143,"w":18,"h":144},
+ "frame": {"x":1932,"y":1453,"w":18,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":63,"y":0,"w":18,"h":144},
@@ -1114,7 +1114,7 @@
},
"sprites/buildings/wire_tunnel-coating.png":
{
- "frame": {"x":484,"y":1291,"w":32,"h":134},
+ "frame": {"x":1946,"y":1177,"w":32,"h":134},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":56,"y":5,"w":32,"h":134},
@@ -1122,7 +1122,7 @@
},
"sprites/buildings/wire_tunnel.png":
{
- "frame": {"x":1029,"y":1607,"w":137,"h":134},
+ "frame": {"x":1906,"y":612,"w":137,"h":134},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":5,"w":137,"h":134},
@@ -1130,7 +1130,7 @@
},
"sprites/debug/acceptor_slot.png":
{
- "frame": {"x":547,"y":704,"w":12,"h":12},
+ "frame": {"x":1981,"y":119,"w":12,"h":12},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":12,"h":12},
@@ -1138,7 +1138,7 @@
},
"sprites/debug/ejector_slot.png":
{
- "frame": {"x":547,"y":720,"w":12,"h":12},
+ "frame": {"x":1394,"y":1334,"w":12,"h":12},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":12,"h":12},
@@ -1146,7 +1146,7 @@
},
"sprites/misc/hub_direction_indicator.png":
{
- "frame": {"x":1341,"y":963,"w":48,"h":48},
+ "frame": {"x":1630,"y":1995,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -1154,7 +1154,7 @@
},
"sprites/misc/processor_disabled.png":
{
- "frame": {"x":1957,"y":137,"w":78,"h":81},
+ "frame": {"x":1478,"y":1495,"w":78,"h":81},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":10,"y":10,"w":78,"h":81},
@@ -1162,7 +1162,7 @@
},
"sprites/misc/processor_disconnected.png":
{
- "frame": {"x":1407,"y":733,"w":65,"h":84},
+ "frame": {"x":1742,"y":1934,"w":65,"h":84},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":17,"y":8,"w":65,"h":84},
@@ -1170,7 +1170,7 @@
},
"sprites/misc/reader_overlay.png":
{
- "frame": {"x":1377,"y":659,"w":104,"h":70},
+ "frame": {"x":1793,"y":1678,"w":104,"h":70},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":38,"w":104,"h":70},
@@ -1178,7 +1178,7 @@
},
"sprites/misc/slot_bad_arrow.png":
{
- "frame": {"x":1393,"y":976,"w":35,"h":35},
+ "frame": {"x":1815,"y":2007,"w":35,"h":35},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":2,"w":35,"h":35},
@@ -1186,7 +1186,7 @@
},
"sprites/misc/slot_good_arrow.png":
{
- "frame": {"x":1632,"y":658,"w":35,"h":39},
+ "frame": {"x":675,"y":1129,"w":35,"h":39},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":0,"w":35,"h":39},
@@ -1194,7 +1194,7 @@
},
"sprites/misc/storage_overlay.png":
{
- "frame": {"x":1248,"y":963,"w":89,"h":44},
+ "frame": {"x":1831,"y":1845,"w":89,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":1,"w":89,"h":44},
@@ -1202,7 +1202,7 @@
},
"sprites/misc/waypoint.png":
{
- "frame": {"x":1407,"y":873,"w":38,"h":48},
+ "frame": {"x":1886,"y":1897,"w":38,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":38,"h":48},
@@ -1210,7 +1210,7 @@
},
"sprites/wires/boolean_false.png":
{
- "frame": {"x":1422,"y":1101,"w":31,"h":41},
+ "frame": {"x":1946,"y":1319,"w":31,"h":41},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":5,"w":31,"h":41},
@@ -1218,7 +1218,7 @@
},
"sprites/wires/boolean_true.png":
{
- "frame": {"x":1635,"y":299,"w":22,"h":41},
+ "frame": {"x":531,"y":1018,"w":22,"h":41},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":11,"y":5,"w":22,"h":41},
@@ -1226,7 +1226,7 @@
},
"sprites/wires/display/blue.png":
{
- "frame": {"x":1728,"y":88,"w":47,"h":47},
+ "frame": {"x":1983,"y":961,"w":47,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1234,7 +1234,7 @@
},
"sprites/wires/display/cyan.png":
{
- "frame": {"x":1779,"y":88,"w":47,"h":47},
+ "frame": {"x":1831,"y":1897,"w":47,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1242,7 +1242,7 @@
},
"sprites/wires/display/green.png":
{
- "frame": {"x":1407,"y":925,"w":47,"h":47},
+ "frame": {"x":1815,"y":1952,"w":47,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1250,7 +1250,7 @@
},
"sprites/wires/display/purple.png":
{
- "frame": {"x":1371,"y":1101,"w":47,"h":47},
+ "frame": {"x":1870,"y":1953,"w":47,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1258,7 +1258,7 @@
},
"sprites/wires/display/red.png":
{
- "frame": {"x":1830,"y":88,"w":47,"h":47},
+ "frame": {"x":1883,"y":1605,"w":47,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1266,7 +1266,7 @@
},
"sprites/wires/display/white.png":
{
- "frame": {"x":1957,"y":222,"w":47,"h":47},
+ "frame": {"x":1938,"y":1605,"w":47,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1274,7 +1274,7 @@
},
"sprites/wires/display/yellow.png":
{
- "frame": {"x":1981,"y":273,"w":47,"h":47},
+ "frame": {"x":1905,"y":1660,"w":47,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":1,"w":47,"h":47},
@@ -1282,7 +1282,7 @@
},
"sprites/wires/lever_on.png":
{
- "frame": {"x":908,"y":1624,"w":109,"h":127},
+ "frame": {"x":1624,"y":1590,"w":109,"h":127},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":18,"y":5,"w":109,"h":127},
@@ -1290,7 +1290,7 @@
},
"sprites/wires/logical_acceptor.png":
{
- "frame": {"x":441,"y":1439,"w":62,"h":106},
+ "frame": {"x":1981,"y":5,"w":62,"h":106},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":43,"y":0,"w":62,"h":106},
@@ -1298,7 +1298,7 @@
},
"sprites/wires/logical_ejector.png":
{
- "frame": {"x":1635,"y":373,"w":60,"h":67},
+ "frame": {"x":1983,"y":886,"w":60,"h":67},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":44,"y":0,"w":60,"h":67},
@@ -1306,7 +1306,7 @@
},
"sprites/wires/network_conflict.png":
{
- "frame": {"x":1542,"y":1084,"w":47,"h":44},
+ "frame": {"x":1960,"y":1660,"w":47,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":2,"w":47,"h":44},
@@ -1314,7 +1314,7 @@
},
"sprites/wires/network_empty.png":
{
- "frame": {"x":1407,"y":821,"w":41,"h":48},
+ "frame": {"x":1946,"y":1368,"w":41,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":41,"h":48},
@@ -1322,7 +1322,7 @@
},
"sprites/wires/overlay_tile.png":
{
- "frame": {"x":1945,"y":511,"w":96,"h":96},
+ "frame": {"x":1564,"y":1453,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -1330,7 +1330,7 @@
},
"sprites/wires/sets/color_cross.png":
{
- "frame": {"x":299,"y":1291,"w":144,"h":144},
+ "frame": {"x":565,"y":694,"w":144,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":144},
@@ -1338,7 +1338,7 @@
},
"sprites/wires/sets/color_forward.png":
{
- "frame": {"x":493,"y":1143,"w":18,"h":144},
+ "frame": {"x":1741,"y":1590,"w":18,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":63,"y":0,"w":18,"h":144},
@@ -1346,7 +1346,7 @@
},
"sprites/wires/sets/color_split.png":
{
- "frame": {"x":1532,"y":446,"w":144,"h":81},
+ "frame": {"x":1237,"y":1495,"w":144,"h":81},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":63,"w":144,"h":81},
@@ -1354,7 +1354,7 @@
},
"sprites/wires/sets/color_turn.png":
{
- "frame": {"x":1457,"y":1084,"w":81,"h":81},
+ "frame": {"x":1737,"y":1756,"w":81,"h":81},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":63,"y":63,"w":81,"h":81},
@@ -1362,7 +1362,7 @@
},
"sprites/wires/sets/conflict_cross.png":
{
- "frame": {"x":1089,"y":1034,"w":144,"h":144},
+ "frame": {"x":566,"y":846,"w":144,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":144},
@@ -1370,7 +1370,7 @@
},
"sprites/wires/sets/conflict_forward.png":
{
- "frame": {"x":515,"y":1143,"w":18,"h":144},
+ "frame": {"x":1767,"y":1590,"w":18,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":63,"y":0,"w":18,"h":144},
@@ -1378,7 +1378,7 @@
},
"sprites/wires/sets/conflict_split.png":
{
- "frame": {"x":1664,"y":151,"w":144,"h":81},
+ "frame": {"x":1086,"y":1714,"w":144,"h":81},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":63,"w":144,"h":81},
@@ -1386,7 +1386,7 @@
},
"sprites/wires/sets/conflict_turn.png":
{
- "frame": {"x":1811,"y":286,"w":81,"h":81},
+ "frame": {"x":1826,"y":1756,"w":81,"h":81},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":63,"y":63,"w":81,"h":81},
@@ -1394,7 +1394,7 @@
},
"sprites/wires/sets/regular_cross.png":
{
- "frame": {"x":151,"y":1292,"w":144,"h":144},
+ "frame": {"x":1732,"y":460,"w":144,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":144},
@@ -1402,7 +1402,7 @@
},
"sprites/wires/sets/regular_forward.png":
{
- "frame": {"x":471,"y":1143,"w":18,"h":144},
+ "frame": {"x":1932,"y":1453,"w":18,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":63,"y":0,"w":18,"h":144},
@@ -1410,7 +1410,7 @@
},
"sprites/wires/sets/regular_split.png":
{
- "frame": {"x":1259,"y":878,"w":144,"h":81},
+ "frame": {"x":1086,"y":1625,"w":144,"h":81},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":63,"w":144,"h":81},
@@ -1418,7 +1418,7 @@
},
"sprites/wires/sets/regular_turn.png":
{
- "frame": {"x":1824,"y":3,"w":81,"h":81},
+ "frame": {"x":1389,"y":1495,"w":81,"h":81},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":63,"y":63,"w":81,"h":81},
@@ -1426,7 +1426,7 @@
},
"sprites/wires/sets/shape_cross.png":
{
- "frame": {"x":821,"y":1181,"w":144,"h":144},
+ "frame": {"x":1153,"y":612,"w":144,"h":144},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":144,"h":144},
@@ -1434,7 +1434,7 @@
},
"sprites/wires/sets/shape_forward.png":
{
- "frame": {"x":807,"y":1028,"w":18,"h":144},
+ "frame": {"x":1986,"y":1177,"w":18,"h":144},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":63,"y":0,"w":18,"h":144},
@@ -1442,7 +1442,7 @@
},
"sprites/wires/sets/shape_split.png":
{
- "frame": {"x":1676,"y":3,"w":144,"h":81},
+ "frame": {"x":1078,"y":1803,"w":144,"h":81},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":63,"w":144,"h":81},
@@ -1450,7 +1450,7 @@
},
"sprites/wires/sets/shape_turn.png":
{
- "frame": {"x":1896,"y":286,"w":81,"h":81},
+ "frame": {"x":1742,"y":1845,"w":81,"h":81},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":63,"y":63,"w":81,"h":81},
@@ -1458,7 +1458,7 @@
},
"sprites/wires/wires_preview.png":
{
- "frame": {"x":1676,"y":88,"w":48,"h":48},
+ "frame": {"x":1686,"y":1995,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -1471,6 +1471,6 @@
"format": "RGBA8888",
"size": {"w":2048,"h":2048},
"scale": "0.75",
- "smartupdate": "$TexturePacker:SmartUpdate:64d35c8d649d4bb41c7539e7e89c0865:2a9399f9a7c16dc686a4fb0941b02e6b:908b89f5ca8ff73e331a35a3b14d0604$"
+ "smartupdate": "$TexturePacker:SmartUpdate:604557e03fa42226ddc62b672c751ccf:2a9399f9a7c16dc686a4fb0941b02e6b:908b89f5ca8ff73e331a35a3b14d0604$"
}
}
diff --git a/res_built/atlas/atlas0_hq.png b/res_built/atlas/atlas0_hq.png
index da9224c1..001f54b6 100644
Binary files a/res_built/atlas/atlas0_hq.png and b/res_built/atlas/atlas0_hq.png differ
diff --git a/res_built/atlas/atlas0_lq.json b/res_built/atlas/atlas0_lq.json
index 3815e9d9..3cbc79c3 100644
--- a/res_built/atlas/atlas0_lq.json
+++ b/res_built/atlas/atlas0_lq.json
@@ -2,7 +2,7 @@
"sprites/belt/built/forward_0.png":
{
- "frame": {"x":466,"y":519,"w":40,"h":48},
+ "frame": {"x":325,"y":229,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -10,7 +10,7 @@
},
"sprites/belt/built/forward_1.png":
{
- "frame": {"x":51,"y":961,"w":40,"h":48},
+ "frame": {"x":946,"y":567,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -18,7 +18,7 @@
},
"sprites/belt/built/forward_2.png":
{
- "frame": {"x":352,"y":869,"w":40,"h":48},
+ "frame": {"x":810,"y":628,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -26,7 +26,7 @@
},
"sprites/belt/built/forward_3.png":
{
- "frame": {"x":300,"y":891,"w":40,"h":48},
+ "frame": {"x":858,"y":628,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -34,7 +34,7 @@
},
"sprites/belt/built/forward_4.png":
{
- "frame": {"x":249,"y":893,"w":40,"h":48},
+ "frame": {"x":906,"y":679,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -42,7 +42,7 @@
},
"sprites/belt/built/forward_5.png":
{
- "frame": {"x":455,"y":864,"w":40,"h":48},
+ "frame": {"x":954,"y":707,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -50,7 +50,7 @@
},
"sprites/belt/built/forward_6.png":
{
- "frame": {"x":396,"y":912,"w":40,"h":48},
+ "frame": {"x":577,"y":546,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -58,7 +58,7 @@
},
"sprites/belt/built/forward_7.png":
{
- "frame": {"x":344,"y":921,"w":40,"h":48},
+ "frame": {"x":521,"y":550,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -66,7 +66,7 @@
},
"sprites/belt/built/forward_8.png":
{
- "frame": {"x":227,"y":973,"w":40,"h":48},
+ "frame": {"x":625,"y":546,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -74,7 +74,7 @@
},
"sprites/belt/built/forward_9.png":
{
- "frame": {"x":271,"y":973,"w":40,"h":48},
+ "frame": {"x":673,"y":599,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -82,7 +82,7 @@
},
"sprites/belt/built/forward_10.png":
{
- "frame": {"x":95,"y":961,"w":40,"h":48},
+ "frame": {"x":839,"y":572,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -90,7 +90,7 @@
},
"sprites/belt/built/forward_11.png":
{
- "frame": {"x":139,"y":941,"w":40,"h":48},
+ "frame": {"x":887,"y":572,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -98,7 +98,7 @@
},
"sprites/belt/built/forward_12.png":
{
- "frame": {"x":183,"y":917,"w":40,"h":48},
+ "frame": {"x":762,"y":582,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -106,7 +106,7 @@
},
"sprites/belt/built/forward_13.png":
{
- "frame": {"x":183,"y":969,"w":40,"h":48},
+ "frame": {"x":935,"y":623,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -114,7 +114,7 @@
},
"sprites/belt/built/left_0.png":
{
- "frame": {"x":326,"y":499,"w":44,"h":44},
+ "frame": {"x":397,"y":363,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -122,7 +122,7 @@
},
"sprites/belt/built/left_1.png":
{
- "frame": {"x":465,"y":571,"w":44,"h":44},
+ "frame": {"x":638,"y":338,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -130,7 +130,7 @@
},
"sprites/belt/built/left_2.png":
{
- "frame": {"x":323,"y":699,"w":44,"h":44},
+ "frame": {"x":638,"y":390,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -138,7 +138,7 @@
},
"sprites/belt/built/left_3.png":
{
- "frame": {"x":275,"y":707,"w":44,"h":44},
+ "frame": {"x":690,"y":390,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -146,7 +146,7 @@
},
"sprites/belt/built/left_4.png":
{
- "frame": {"x":323,"y":747,"w":44,"h":44},
+ "frame": {"x":742,"y":439,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -154,7 +154,7 @@
},
"sprites/belt/built/left_5.png":
{
- "frame": {"x":208,"y":759,"w":44,"h":44},
+ "frame": {"x":794,"y":474,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -162,7 +162,7 @@
},
"sprites/belt/built/left_6.png":
{
- "frame": {"x":156,"y":773,"w":44,"h":44},
+ "frame": {"x":581,"y":394,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -170,7 +170,7 @@
},
"sprites/belt/built/left_7.png":
{
- "frame": {"x":105,"y":797,"w":44,"h":44},
+ "frame": {"x":505,"y":414,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -178,7 +178,7 @@
},
"sprites/belt/built/left_8.png":
{
- "frame": {"x":54,"y":817,"w":44,"h":44},
+ "frame": {"x":633,"y":442,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -186,7 +186,7 @@
},
"sprites/belt/built/left_9.png":
{
- "frame": {"x":3,"y":843,"w":44,"h":44},
+ "frame": {"x":685,"y":442,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -194,7 +194,7 @@
},
"sprites/belt/built/left_10.png":
{
- "frame": {"x":465,"y":619,"w":44,"h":44},
+ "frame": {"x":690,"y":338,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -202,7 +202,7 @@
},
"sprites/belt/built/left_11.png":
{
- "frame": {"x":324,"y":651,"w":44,"h":44},
+ "frame": {"x":742,"y":387,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -210,7 +210,7 @@
},
"sprites/belt/built/left_12.png":
{
- "frame": {"x":223,"y":611,"w":44,"h":44},
+ "frame": {"x":794,"y":422,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -218,7 +218,7 @@
},
"sprites/belt/built/left_13.png":
{
- "frame": {"x":275,"y":659,"w":44,"h":44},
+ "frame": {"x":882,"y":464,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -226,7 +226,7 @@
},
"sprites/belt/built/right_0.png":
{
- "frame": {"x":311,"y":795,"w":44,"h":44},
+ "frame": {"x":737,"y":491,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -234,7 +234,7 @@
},
"sprites/belt/built/right_1.png":
{
- "frame": {"x":256,"y":797,"w":44,"h":44},
+ "frame": {"x":557,"y":446,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -242,7 +242,7 @@
},
"sprites/belt/built/right_2.png":
{
- "frame": {"x":3,"y":891,"w":44,"h":44},
+ "frame": {"x":317,"y":377,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -250,7 +250,7 @@
},
"sprites/belt/built/right_3.png":
{
- "frame": {"x":359,"y":821,"w":44,"h":44},
+ "frame": {"x":369,"y":415,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -258,7 +258,7 @@
},
"sprites/belt/built/right_4.png":
{
- "frame": {"x":304,"y":843,"w":44,"h":44},
+ "frame": {"x":421,"y":415,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -266,7 +266,7 @@
},
"sprites/belt/built/right_5.png":
{
- "frame": {"x":252,"y":845,"w":44,"h":44},
+ "frame": {"x":473,"y":466,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -274,7 +274,7 @@
},
"sprites/belt/built/right_6.png":
{
- "frame": {"x":201,"y":855,"w":44,"h":44},
+ "frame": {"x":525,"y":498,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -282,7 +282,7 @@
},
"sprites/belt/built/right_7.png":
{
- "frame": {"x":150,"y":869,"w":44,"h":44},
+ "frame": {"x":261,"y":429,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -290,7 +290,7 @@
},
"sprites/belt/built/right_8.png":
{
- "frame": {"x":99,"y":893,"w":44,"h":44},
+ "frame": {"x":313,"y":429,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -298,7 +298,7 @@
},
"sprites/belt/built/right_9.png":
{
- "frame": {"x":51,"y":913,"w":44,"h":44},
+ "frame": {"x":365,"y":467,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -306,7 +306,7 @@
},
"sprites/belt/built/right_10.png":
{
- "frame": {"x":204,"y":807,"w":44,"h":44},
+ "frame": {"x":609,"y":494,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -314,7 +314,7 @@
},
"sprites/belt/built/right_11.png":
{
- "frame": {"x":153,"y":821,"w":44,"h":44},
+ "frame": {"x":661,"y":494,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -322,7 +322,7 @@
},
"sprites/belt/built/right_12.png":
{
- "frame": {"x":102,"y":845,"w":44,"h":44},
+ "frame": {"x":265,"y":377,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -330,7 +330,7 @@
},
"sprites/belt/built/right_13.png":
{
- "frame": {"x":51,"y":865,"w":44,"h":44},
+ "frame": {"x":209,"y":391,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -338,7 +338,7 @@
},
"sprites/blueprints/belt_left.png":
{
- "frame": {"x":3,"y":939,"w":44,"h":44},
+ "frame": {"x":417,"y":467,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -346,7 +346,7 @@
},
"sprites/blueprints/belt_right.png":
{
- "frame": {"x":407,"y":864,"w":44,"h":44},
+ "frame": {"x":469,"y":518,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -354,7 +354,7 @@
},
"sprites/blueprints/belt_top.png":
{
- "frame": {"x":315,"y":973,"w":40,"h":48},
+ "frame": {"x":721,"y":638,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -362,7 +362,7 @@
},
"sprites/blueprints/constant_signal.png":
{
- "frame": {"x":426,"y":411,"w":36,"h":43},
+ "frame": {"x":946,"y":516,"w":36,"h":43},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":6,"y":0,"w":36,"h":43},
@@ -370,7 +370,7 @@
},
"sprites/blueprints/cutter-quad.png":
{
- "frame": {"x":191,"y":55,"w":184,"h":48},
+ "frame": {"x":5,"y":61,"w":184,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":184,"h":48},
@@ -378,7 +378,7 @@
},
"sprites/blueprints/cutter.png":
{
- "frame": {"x":95,"y":296,"w":87,"h":48},
+ "frame": {"x":781,"y":61,"w":87,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":87,"h":48},
@@ -386,7 +386,7 @@
},
"sprites/blueprints/display.png":
{
- "frame": {"x":326,"y":399,"w":44,"h":46},
+ "frame": {"x":509,"y":360,"w":44,"h":46},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":2,"w":44,"h":46},
@@ -394,7 +394,7 @@
},
"sprites/blueprints/filter.png":
{
- "frame": {"x":3,"y":244,"w":91,"h":48},
+ "frame": {"x":589,"y":5,"w":91,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":91,"h":48},
@@ -402,7 +402,7 @@
},
"sprites/blueprints/lever.png":
{
- "frame": {"x":231,"y":467,"w":38,"h":44},
+ "frame": {"x":980,"y":5,"w":38,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":1,"w":38,"h":44},
@@ -410,7 +410,7 @@
},
"sprites/blueprints/logic_gate-not.png":
{
- "frame": {"x":467,"y":311,"w":42,"h":48},
+ "frame": {"x":789,"y":526,"w":42,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":42,"h":48},
@@ -418,7 +418,7 @@
},
"sprites/blueprints/logic_gate-or.png":
{
- "frame": {"x":423,"y":818,"w":48,"h":42},
+ "frame": {"x":509,"y":310,"w":48,"h":42},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":42},
@@ -426,7 +426,7 @@
},
"sprites/blueprints/logic_gate-transistor.png":
{
- "frame": {"x":426,"y":534,"w":35,"h":48},
+ "frame": {"x":615,"y":602,"w":35,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":35,"h":48},
@@ -434,7 +434,7 @@
},
"sprites/blueprints/logic_gate-xor.png":
{
- "frame": {"x":291,"y":159,"w":48,"h":48},
+ "frame": {"x":317,"y":117,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -442,7 +442,7 @@
},
"sprites/blueprints/logic_gate.png":
{
- "frame": {"x":171,"y":622,"w":48,"h":45},
+ "frame": {"x":588,"y":285,"w":48,"h":45},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":45},
@@ -450,7 +450,7 @@
},
"sprites/blueprints/miner-chainable.png":
{
- "frame": {"x":107,"y":648,"w":47,"h":48},
+ "frame": {"x":834,"y":257,"w":47,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":47,"h":48},
@@ -458,7 +458,7 @@
},
"sprites/blueprints/miner.png":
{
- "frame": {"x":55,"y":672,"w":47,"h":48},
+ "frame": {"x":777,"y":276,"w":47,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":47,"h":48},
@@ -466,7 +466,7 @@
},
"sprites/blueprints/mixer.png":
{
- "frame": {"x":98,"y":244,"w":89,"h":48},
+ "frame": {"x":786,"y":5,"w":89,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":89,"h":48},
@@ -474,7 +474,7 @@
},
"sprites/blueprints/painter-double.png":
{
- "frame": {"x":387,"y":3,"w":96,"h":96},
+ "frame": {"x":5,"y":117,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -482,7 +482,7 @@
},
"sprites/blueprints/painter-mirrored.png":
{
- "frame": {"x":191,"y":159,"w":96,"h":48},
+ "frame": {"x":213,"y":117,"w":96,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":48},
@@ -490,7 +490,7 @@
},
"sprites/blueprints/painter-quad.png":
{
- "frame": {"x":3,"y":3,"w":188,"h":48},
+ "frame": {"x":5,"y":5,"w":188,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":188,"h":48},
@@ -498,7 +498,7 @@
},
"sprites/blueprints/painter.png":
{
- "frame": {"x":375,"y":203,"w":96,"h":48},
+ "frame": {"x":213,"y":173,"w":96,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":48},
@@ -506,7 +506,7 @@
},
"sprites/blueprints/reader.png":
{
- "frame": {"x":291,"y":211,"w":48,"h":48},
+ "frame": {"x":317,"y":173,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -514,7 +514,7 @@
},
"sprites/blueprints/rotater-ccw.png":
{
- "frame": {"x":274,"y":399,"w":48,"h":48},
+ "frame": {"x":971,"y":109,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -522,7 +522,7 @@
},
"sprites/blueprints/rotater-fl.png":
{
- "frame": {"x":374,"y":411,"w":48,"h":48},
+ "frame": {"x":965,"y":165,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -530,7 +530,7 @@
},
"sprites/blueprints/rotater.png":
{
- "frame": {"x":274,"y":451,"w":48,"h":48},
+ "frame": {"x":589,"y":173,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -538,7 +538,7 @@
},
"sprites/blueprints/splitter-compact-inverse.png":
{
- "frame": {"x":374,"y":463,"w":48,"h":48},
+ "frame": {"x":645,"y":173,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -546,7 +546,7 @@
},
"sprites/blueprints/splitter-compact-merge-inverse.png":
{
- "frame": {"x":374,"y":515,"w":48,"h":48},
+ "frame": {"x":701,"y":173,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -554,7 +554,7 @@
},
"sprites/blueprints/splitter-compact-merge.png":
{
- "frame": {"x":106,"y":700,"w":47,"h":47},
+ "frame": {"x":832,"y":313,"w":47,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":47,"h":47},
@@ -562,7 +562,7 @@
},
"sprites/blueprints/splitter-compact.png":
{
- "frame": {"x":54,"y":724,"w":47,"h":47},
+ "frame": {"x":772,"y":332,"w":47,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":47,"h":47},
@@ -570,7 +570,7 @@
},
"sprites/blueprints/splitter.png":
{
- "frame": {"x":186,"y":315,"w":87,"h":48},
+ "frame": {"x":876,"y":61,"w":87,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":87,"h":48},
@@ -578,7 +578,7 @@
},
"sprites/blueprints/stacker.png":
{
- "frame": {"x":374,"y":307,"w":89,"h":48},
+ "frame": {"x":883,"y":5,"w":89,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":89,"h":48},
@@ -586,7 +586,7 @@
},
"sprites/blueprints/trash-storage.png":
{
- "frame": {"x":285,"y":299,"w":85,"h":96},
+ "frame": {"x":779,"y":117,"w":85,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":6,"y":0,"w":85,"h":96},
@@ -594,7 +594,7 @@
},
"sprites/blueprints/trash.png":
{
- "frame": {"x":3,"y":400,"w":48,"h":48},
+ "frame": {"x":397,"y":198,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -602,7 +602,7 @@
},
"sprites/blueprints/underground_belt_entry-tier2.png":
{
- "frame": {"x":447,"y":771,"w":48,"h":43},
+ "frame": {"x":453,"y":310,"w":48,"h":43},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":5,"w":48,"h":43},
@@ -610,7 +610,7 @@
},
"sprites/blueprints/underground_belt_entry.png":
{
- "frame": {"x":55,"y":556,"w":48,"h":38},
+ "frame": {"x":61,"y":388,"w":48,"h":38},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":10,"w":48,"h":38},
@@ -618,7 +618,7 @@
},
"sprites/blueprints/underground_belt_exit-tier2.png":
{
- "frame": {"x":55,"y":598,"w":48,"h":38},
+ "frame": {"x":5,"y":389,"w":48,"h":38},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":38},
@@ -626,7 +626,7 @@
},
"sprites/blueprints/underground_belt_exit.png":
{
- "frame": {"x":107,"y":606,"w":48,"h":38},
+ "frame": {"x":117,"y":388,"w":48,"h":38},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":38},
@@ -634,7 +634,7 @@
},
"sprites/blueprints/virtual_processor-analyzer.png":
{
- "frame": {"x":55,"y":400,"w":48,"h":48},
+ "frame": {"x":453,"y":198,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -642,7 +642,7 @@
},
"sprites/blueprints/virtual_processor-rotater.png":
{
- "frame": {"x":466,"y":415,"w":41,"h":48},
+ "frame": {"x":713,"y":543,"w":41,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":41,"h":48},
@@ -650,7 +650,7 @@
},
"sprites/blueprints/virtual_processor-shapecompare.png":
{
- "frame": {"x":223,"y":659,"w":48,"h":45},
+ "frame": {"x":644,"y":285,"w":48,"h":45},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":45},
@@ -658,7 +658,7 @@
},
"sprites/blueprints/virtual_processor-stacker.png":
{
- "frame": {"x":325,"y":547,"w":45,"h":48},
+ "frame": {"x":937,"y":460,"w":45,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":45,"h":48},
@@ -666,7 +666,7 @@
},
"sprites/blueprints/virtual_processor-unstacker.png":
{
- "frame": {"x":107,"y":400,"w":48,"h":48},
+ "frame": {"x":509,"y":198,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -674,7 +674,7 @@
},
"sprites/blueprints/virtual_processor.png":
{
- "frame": {"x":3,"y":452,"w":48,"h":48},
+ "frame": {"x":213,"y":229,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -682,7 +682,7 @@
},
"sprites/blueprints/wire-cross.png":
{
- "frame": {"x":55,"y":452,"w":48,"h":48},
+ "frame": {"x":269,"y":229,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -690,7 +690,7 @@
},
"sprites/blueprints/wire-split.png":
{
- "frame": {"x":285,"y":263,"w":48,"h":28},
+ "frame": {"x":265,"y":341,"w":48,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":20,"w":48,"h":28},
@@ -698,7 +698,7 @@
},
"sprites/blueprints/wire-turn.png":
{
- "frame": {"x":479,"y":162,"w":28,"h":28},
+ "frame": {"x":173,"y":377,"w":28,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":20,"w":28,"h":28},
@@ -706,7 +706,7 @@
},
"sprites/blueprints/wire.png":
{
- "frame": {"x":159,"y":520,"w":8,"h":48},
+ "frame": {"x":381,"y":285,"w":8,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":0,"w":8,"h":48},
@@ -714,7 +714,7 @@
},
"sprites/blueprints/wire_tunnel-coating.png":
{
- "frame": {"x":426,"y":655,"w":12,"h":46},
+ "frame": {"x":757,"y":239,"w":12,"h":46},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":18,"y":1,"w":12,"h":46},
@@ -722,7 +722,7 @@
},
"sprites/blueprints/wire_tunnel.png":
{
- "frame": {"x":107,"y":504,"w":48,"h":47},
+ "frame": {"x":61,"y":333,"w":48,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":47},
@@ -730,7 +730,7 @@
},
"sprites/buildings/belt_left.png":
{
- "frame": {"x":326,"y":499,"w":44,"h":44},
+ "frame": {"x":397,"y":363,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":4,"w":44,"h":44},
@@ -738,7 +738,7 @@
},
"sprites/buildings/belt_right.png":
{
- "frame": {"x":311,"y":795,"w":44,"h":44},
+ "frame": {"x":737,"y":491,"w":44,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":44,"h":44},
@@ -746,7 +746,7 @@
},
"sprites/buildings/belt_top.png":
{
- "frame": {"x":466,"y":519,"w":40,"h":48},
+ "frame": {"x":325,"y":229,"w":40,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":40,"h":48},
@@ -754,7 +754,7 @@
},
"sprites/buildings/constant_signal.png":
{
- "frame": {"x":426,"y":458,"w":36,"h":43},
+ "frame": {"x":983,"y":623,"w":36,"h":43},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":6,"y":0,"w":36,"h":43},
@@ -762,7 +762,7 @@
},
"sprites/buildings/cutter-quad.png":
{
- "frame": {"x":191,"y":107,"w":184,"h":48},
+ "frame": {"x":197,"y":61,"w":184,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":184,"h":48},
@@ -770,7 +770,7 @@
},
"sprites/buildings/cutter.png":
{
- "frame": {"x":3,"y":348,"w":87,"h":48},
+ "frame": {"x":589,"y":117,"w":87,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":87,"h":48},
@@ -778,7 +778,7 @@
},
"sprites/buildings/display.png":
{
- "frame": {"x":326,"y":449,"w":44,"h":46},
+ "frame": {"x":453,"y":361,"w":44,"h":46},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":2,"w":44,"h":46},
@@ -786,7 +786,7 @@
},
"sprites/buildings/filter.png":
{
- "frame": {"x":191,"y":263,"w":90,"h":48},
+ "frame": {"x":688,"y":5,"w":90,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":90,"h":48},
@@ -794,7 +794,7 @@
},
"sprites/buildings/hub.png":
{
- "frame": {"x":3,"y":55,"w":184,"h":185},
+ "frame": {"x":397,"y":5,"w":184,"h":185},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":4,"w":184,"h":185},
@@ -802,7 +802,7 @@
},
"sprites/buildings/lever.png":
{
- "frame": {"x":231,"y":515,"w":38,"h":44},
+ "frame": {"x":980,"y":57,"w":38,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":1,"w":38,"h":44},
@@ -810,7 +810,7 @@
},
"sprites/buildings/logic_gate-not.png":
{
- "frame": {"x":466,"y":363,"w":43,"h":48},
+ "frame": {"x":846,"y":516,"w":43,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":43,"h":48},
@@ -818,7 +818,7 @@
},
"sprites/buildings/logic_gate-or.png":
{
- "frame": {"x":3,"y":556,"w":48,"h":42},
+ "frame": {"x":209,"y":341,"w":48,"h":42},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":42},
@@ -826,7 +826,7 @@
},
"sprites/buildings/logic_gate-transistor.png":
{
- "frame": {"x":426,"y":586,"w":35,"h":48},
+ "frame": {"x":658,"y":655,"w":35,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":35,"h":48},
@@ -834,7 +834,7 @@
},
"sprites/buildings/logic_gate-xor.png":
{
- "frame": {"x":107,"y":452,"w":48,"h":48},
+ "frame": {"x":589,"y":229,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -842,7 +842,7 @@
},
"sprites/buildings/logic_gate.png":
{
- "frame": {"x":371,"y":723,"w":48,"h":45},
+ "frame": {"x":700,"y":285,"w":48,"h":45},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":45},
@@ -850,7 +850,7 @@
},
"sprites/buildings/miner-chainable.png":
{
- "frame": {"x":3,"y":698,"w":47,"h":48},
+ "frame": {"x":889,"y":257,"w":47,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":47,"h":48},
@@ -858,7 +858,7 @@
},
"sprites/buildings/miner.png":
{
- "frame": {"x":158,"y":671,"w":47,"h":48},
+ "frame": {"x":944,"y":257,"w":47,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":47,"h":48},
@@ -866,7 +866,7 @@
},
"sprites/buildings/mixer.png":
{
- "frame": {"x":374,"y":359,"w":88,"h":48},
+ "frame": {"x":589,"y":61,"w":88,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":88,"h":48},
@@ -874,7 +874,7 @@
},
"sprites/buildings/painter-double.png":
{
- "frame": {"x":379,"y":103,"w":96,"h":96},
+ "frame": {"x":109,"y":117,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -882,7 +882,7 @@
},
"sprites/buildings/painter-mirrored.png":
{
- "frame": {"x":191,"y":211,"w":96,"h":48},
+ "frame": {"x":5,"y":221,"w":96,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":48},
@@ -890,7 +890,7 @@
},
"sprites/buildings/painter-quad.png":
{
- "frame": {"x":195,"y":3,"w":188,"h":48},
+ "frame": {"x":201,"y":5,"w":188,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":188,"h":48},
@@ -898,7 +898,7 @@
},
"sprites/buildings/painter.png":
{
- "frame": {"x":375,"y":255,"w":96,"h":48},
+ "frame": {"x":109,"y":221,"w":96,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":48},
@@ -906,7 +906,7 @@
},
"sprites/buildings/reader.png":
{
- "frame": {"x":179,"y":467,"w":48,"h":48},
+ "frame": {"x":645,"y":229,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -914,7 +914,7 @@
},
"sprites/buildings/rotater-ccw.png":
{
- "frame": {"x":273,"y":503,"w":48,"h":48},
+ "frame": {"x":701,"y":229,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -922,7 +922,7 @@
},
"sprites/buildings/rotater-fl.png":
{
- "frame": {"x":374,"y":567,"w":48,"h":48},
+ "frame": {"x":397,"y":254,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -930,7 +930,7 @@
},
"sprites/buildings/rotater.png":
{
- "frame": {"x":273,"y":555,"w":48,"h":48},
+ "frame": {"x":453,"y":254,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -938,7 +938,7 @@
},
"sprites/buildings/splitter-compact-inverse.png":
{
- "frame": {"x":107,"y":555,"w":48,"h":47},
+ "frame": {"x":117,"y":333,"w":48,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":47},
@@ -946,7 +946,7 @@
},
"sprites/buildings/splitter-compact-merge-inverse.png":
{
- "frame": {"x":171,"y":571,"w":48,"h":47},
+ "frame": {"x":778,"y":221,"w":48,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":47},
@@ -954,7 +954,7 @@
},
"sprites/buildings/splitter-compact-merge.png":
{
- "frame": {"x":3,"y":750,"w":47,"h":47},
+ "frame": {"x":887,"y":313,"w":47,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":47,"h":47},
@@ -962,7 +962,7 @@
},
"sprites/buildings/splitter-compact.png":
{
- "frame": {"x":209,"y":708,"w":47,"h":47},
+ "frame": {"x":942,"y":313,"w":47,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":47,"h":47},
@@ -970,7 +970,7 @@
},
"sprites/buildings/splitter.png":
{
- "frame": {"x":94,"y":348,"w":87,"h":48},
+ "frame": {"x":684,"y":117,"w":87,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":87,"h":48},
@@ -978,7 +978,7 @@
},
"sprites/buildings/stacker.png":
{
- "frame": {"x":3,"y":296,"w":88,"h":48},
+ "frame": {"x":685,"y":61,"w":88,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":88,"h":48},
@@ -986,7 +986,7 @@
},
"sprites/buildings/trash-storage.png":
{
- "frame": {"x":185,"y":367,"w":85,"h":96},
+ "frame": {"x":872,"y":117,"w":85,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":6,"y":0,"w":85,"h":96},
@@ -994,7 +994,7 @@
},
"sprites/buildings/trash.png":
{
- "frame": {"x":374,"y":619,"w":48,"h":48},
+ "frame": {"x":509,"y":254,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -1002,7 +1002,7 @@
},
"sprites/buildings/underground_belt_entry-tier2.png":
{
- "frame": {"x":105,"y":751,"w":47,"h":42},
+ "frame": {"x":882,"y":368,"w":47,"h":42},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":6,"w":47,"h":42},
@@ -1010,7 +1010,7 @@
},
"sprites/buildings/underground_belt_entry.png":
{
- "frame": {"x":54,"y":775,"w":47,"h":38},
+ "frame": {"x":937,"y":368,"w":47,"h":38},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":10,"w":47,"h":38},
@@ -1018,7 +1018,7 @@
},
"sprites/buildings/underground_belt_exit-tier2.png":
{
- "frame": {"x":3,"y":801,"w":47,"h":38},
+ "frame": {"x":937,"y":414,"w":47,"h":38},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":47,"h":38},
@@ -1026,7 +1026,7 @@
},
"sprites/buildings/underground_belt_exit.png":
{
- "frame": {"x":260,"y":755,"w":47,"h":38},
+ "frame": {"x":882,"y":418,"w":47,"h":38},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":47,"h":38},
@@ -1034,7 +1034,7 @@
},
"sprites/buildings/virtual_processor-analyzer.png":
{
- "frame": {"x":178,"y":519,"w":48,"h":48},
+ "frame": {"x":5,"y":277,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -1042,7 +1042,7 @@
},
"sprites/buildings/virtual_processor-rotater.png":
{
- "frame": {"x":466,"y":467,"w":41,"h":48},
+ "frame": {"x":897,"y":516,"w":41,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":4,"y":0,"w":41,"h":48},
@@ -1050,7 +1050,7 @@
},
"sprites/buildings/virtual_processor-shapecompare.png":
{
- "frame": {"x":371,"y":772,"w":48,"h":45},
+ "frame": {"x":397,"y":310,"w":48,"h":45},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":45},
@@ -1058,7 +1058,7 @@
},
"sprites/buildings/virtual_processor-stacker.png":
{
- "frame": {"x":325,"y":599,"w":45,"h":48},
+ "frame": {"x":585,"y":338,"w":45,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":45,"h":48},
@@ -1066,7 +1066,7 @@
},
"sprites/buildings/virtual_processor-unstacker.png":
{
- "frame": {"x":272,"y":607,"w":48,"h":48},
+ "frame": {"x":61,"y":277,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -1074,7 +1074,7 @@
},
"sprites/buildings/virtual_processor.png":
{
- "frame": {"x":372,"y":671,"w":48,"h":48},
+ "frame": {"x":117,"y":277,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -1082,7 +1082,7 @@
},
"sprites/buildings/wire-cross.png":
{
- "frame": {"x":458,"y":667,"w":48,"h":48},
+ "frame": {"x":213,"y":285,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -1090,7 +1090,7 @@
},
"sprites/buildings/wire-split.png":
{
- "frame": {"x":3,"y":602,"w":48,"h":28},
+ "frame": {"x":321,"y":341,"w":48,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":20,"w":48,"h":28},
@@ -1098,7 +1098,7 @@
},
"sprites/buildings/wire-turn.png":
{
- "frame": {"x":479,"y":194,"w":28,"h":28},
+ "frame": {"x":990,"y":468,"w":28,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":20,"w":28,"h":28},
@@ -1106,7 +1106,7 @@
},
"sprites/buildings/wire.png":
{
- "frame": {"x":159,"y":572,"w":8,"h":48},
+ "frame": {"x":1002,"y":244,"w":8,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":0,"w":8,"h":48},
@@ -1114,7 +1114,7 @@
},
"sprites/buildings/wire_tunnel-coating.png":
{
- "frame": {"x":442,"y":655,"w":12,"h":46},
+ "frame": {"x":565,"y":294,"w":12,"h":46},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":18,"y":1,"w":12,"h":46},
@@ -1122,7 +1122,7 @@
},
"sprites/buildings/wire_tunnel.png":
{
- "frame": {"x":157,"y":723,"w":47,"h":46},
+ "frame": {"x":827,"y":368,"w":47,"h":46},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":1,"w":47,"h":46},
@@ -1130,7 +1130,7 @@
},
"sprites/debug/acceptor_slot.png":
{
- "frame": {"x":379,"y":55,"w":4,"h":4},
+ "frame": {"x":1015,"y":300,"w":4,"h":4},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":4,"h":4},
@@ -1138,7 +1138,7 @@
},
"sprites/debug/ejector_slot.png":
{
- "frame": {"x":379,"y":63,"w":4,"h":4},
+ "frame": {"x":1015,"y":312,"w":4,"h":4},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":4,"h":4},
@@ -1146,7 +1146,7 @@
},
"sprites/misc/hub_direction_indicator.png":
{
- "frame": {"x":487,"y":30,"w":16,"h":16},
+ "frame": {"x":373,"y":117,"w":16,"h":16},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":16,"h":16},
@@ -1154,7 +1154,7 @@
},
"sprites/misc/processor_disabled.png":
{
- "frame": {"x":479,"y":129,"w":28,"h":29},
+ "frame": {"x":173,"y":340,"w":28,"h":29},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":2,"w":28,"h":29},
@@ -1162,7 +1162,7 @@
},
"sprites/misc/processor_disconnected.png":
{
- "frame": {"x":475,"y":258,"w":23,"h":29},
+ "frame": {"x":992,"y":431,"w":23,"h":29},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":2,"w":23,"h":29},
@@ -1170,7 +1170,7 @@
},
"sprites/misc/reader_overlay.png":
{
- "frame": {"x":426,"y":505,"w":36,"h":25},
+ "frame": {"x":983,"y":674,"w":36,"h":25},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":6,"y":12,"w":36,"h":25},
@@ -1178,7 +1178,7 @@
},
"sprites/misc/slot_bad_arrow.png":
{
- "frame": {"x":426,"y":638,"w":13,"h":13},
+ "frame": {"x":757,"y":197,"w":13,"h":13},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":13,"h":13},
@@ -1186,7 +1186,7 @@
},
"sprites/misc/slot_good_arrow.png":
{
- "frame": {"x":443,"y":638,"w":13,"h":13},
+ "frame": {"x":757,"y":218,"w":13,"h":13},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":13,"h":13},
@@ -1194,7 +1194,7 @@
},
"sprites/misc/storage_overlay.png":
{
- "frame": {"x":479,"y":110,"w":30,"h":15},
+ "frame": {"x":173,"y":317,"w":30,"h":15},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":30,"h":15},
@@ -1202,7 +1202,7 @@
},
"sprites/misc/waypoint.png":
{
- "frame": {"x":495,"y":291,"w":14,"h":16},
+ "frame": {"x":757,"y":173,"w":14,"h":16},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":14,"h":16},
@@ -1210,7 +1210,7 @@
},
"sprites/wires/boolean_false.png":
{
- "frame": {"x":424,"y":705,"w":12,"h":15},
+ "frame": {"x":377,"y":341,"w":12,"h":15},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":1,"w":12,"h":15},
@@ -1218,7 +1218,7 @@
},
"sprites/wires/boolean_true.png":
{
- "frame": {"x":440,"y":705,"w":9,"h":15},
+ "frame": {"x":1002,"y":221,"w":9,"h":15},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":1,"w":9,"h":15},
@@ -1226,7 +1226,7 @@
},
"sprites/wires/display/blue.png":
{
- "frame": {"x":487,"y":50,"w":16,"h":16},
+ "frame": {"x":373,"y":141,"w":16,"h":16},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":16,"h":16},
@@ -1234,7 +1234,7 @@
},
"sprites/wires/display/cyan.png":
{
- "frame": {"x":487,"y":70,"w":16,"h":16},
+ "frame": {"x":373,"y":165,"w":16,"h":16},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":16,"h":16},
@@ -1242,7 +1242,7 @@
},
"sprites/wires/display/green.png":
{
- "frame": {"x":487,"y":90,"w":16,"h":16},
+ "frame": {"x":373,"y":189,"w":16,"h":16},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":16,"h":16},
@@ -1250,7 +1250,7 @@
},
"sprites/wires/display/purple.png":
{
- "frame": {"x":475,"y":291,"w":16,"h":16},
+ "frame": {"x":373,"y":213,"w":16,"h":16},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":16,"h":16},
@@ -1258,7 +1258,7 @@
},
"sprites/wires/display/red.png":
{
- "frame": {"x":159,"y":400,"w":16,"h":16},
+ "frame": {"x":565,"y":198,"w":16,"h":16},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":16,"h":16},
@@ -1266,7 +1266,7 @@
},
"sprites/wires/display/white.png":
{
- "frame": {"x":159,"y":420,"w":16,"h":16},
+ "frame": {"x":565,"y":222,"w":16,"h":16},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":16,"h":16},
@@ -1274,7 +1274,7 @@
},
"sprites/wires/display/yellow.png":
{
- "frame": {"x":159,"y":440,"w":16,"h":16},
+ "frame": {"x":373,"y":237,"w":16,"h":16},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":16,"h":16},
@@ -1282,7 +1282,7 @@
},
"sprites/wires/lever_on.png":
{
- "frame": {"x":230,"y":563,"w":38,"h":44},
+ "frame": {"x":569,"y":602,"w":38,"h":44},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":1,"w":38,"h":44},
@@ -1290,7 +1290,7 @@
},
"sprites/wires/logical_acceptor.png":
{
- "frame": {"x":343,"y":259,"w":23,"h":36},
+ "frame": {"x":992,"y":387,"w":23,"h":36},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":13,"y":0,"w":23,"h":36},
@@ -1298,7 +1298,7 @@
},
"sprites/wires/logical_ejector.png":
{
- "frame": {"x":487,"y":3,"w":22,"h":23},
+ "frame": {"x":997,"y":356,"w":22,"h":23},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":22,"h":23},
@@ -1306,7 +1306,7 @@
},
"sprites/wires/network_conflict.png":
{
- "frame": {"x":159,"y":460,"w":16,"h":16},
+ "frame": {"x":565,"y":246,"w":16,"h":16},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":16,"h":16},
@@ -1314,7 +1314,7 @@
},
"sprites/wires/network_empty.png":
{
- "frame": {"x":159,"y":500,"w":15,"h":16},
+ "frame": {"x":565,"y":270,"w":15,"h":16},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":15,"h":16},
@@ -1322,7 +1322,7 @@
},
"sprites/wires/overlay_tile.png":
{
- "frame": {"x":343,"y":159,"w":32,"h":32},
+ "frame": {"x":173,"y":277,"w":32,"h":32},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":32,"h":32},
@@ -1330,7 +1330,7 @@
},
"sprites/wires/sets/color_cross.png":
{
- "frame": {"x":453,"y":719,"w":48,"h":48},
+ "frame": {"x":269,"y":285,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -1338,7 +1338,7 @@
},
"sprites/wires/sets/color_forward.png":
{
- "frame": {"x":423,"y":724,"w":8,"h":48},
+ "frame": {"x":756,"y":293,"w":8,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":0,"w":8,"h":48},
@@ -1346,7 +1346,7 @@
},
"sprites/wires/sets/color_split.png":
{
- "frame": {"x":3,"y":634,"w":48,"h":28},
+ "frame": {"x":834,"y":221,"w":48,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":20,"w":48,"h":28},
@@ -1354,7 +1354,7 @@
},
"sprites/wires/sets/color_turn.png":
{
- "frame": {"x":343,"y":195,"w":28,"h":28},
+ "frame": {"x":990,"y":504,"w":28,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":20,"w":28,"h":28},
@@ -1362,7 +1362,7 @@
},
"sprites/wires/sets/conflict_cross.png":
{
- "frame": {"x":3,"y":504,"w":48,"h":48},
+ "frame": {"x":325,"y":285,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -1370,7 +1370,7 @@
},
"sprites/wires/sets/conflict_forward.png":
{
- "frame": {"x":435,"y":724,"w":8,"h":48},
+ "frame": {"x":999,"y":300,"w":8,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":0,"w":8,"h":48},
@@ -1378,7 +1378,7 @@
},
"sprites/wires/sets/conflict_split.png":
{
- "frame": {"x":55,"y":640,"w":48,"h":28},
+ "frame": {"x":890,"y":221,"w":48,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":20,"w":48,"h":28},
@@ -1386,7 +1386,7 @@
},
"sprites/wires/sets/conflict_turn.png":
{
- "frame": {"x":475,"y":226,"w":28,"h":28},
+ "frame": {"x":846,"y":422,"w":28,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":20,"w":28,"h":28},
@@ -1394,7 +1394,7 @@
},
"sprites/wires/sets/regular_cross.png":
{
- "frame": {"x":458,"y":667,"w":48,"h":48},
+ "frame": {"x":213,"y":285,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -1402,7 +1402,7 @@
},
"sprites/wires/sets/regular_forward.png":
{
- "frame": {"x":159,"y":572,"w":8,"h":48},
+ "frame": {"x":1002,"y":244,"w":8,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":0,"w":8,"h":48},
@@ -1410,7 +1410,7 @@
},
"sprites/wires/sets/regular_split.png":
{
- "frame": {"x":3,"y":602,"w":48,"h":28},
+ "frame": {"x":321,"y":341,"w":48,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":20,"w":48,"h":28},
@@ -1418,7 +1418,7 @@
},
"sprites/wires/sets/regular_turn.png":
{
- "frame": {"x":479,"y":194,"w":28,"h":28},
+ "frame": {"x":990,"y":468,"w":28,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":20,"w":28,"h":28},
@@ -1426,7 +1426,7 @@
},
"sprites/wires/sets/shape_cross.png":
{
- "frame": {"x":55,"y":504,"w":48,"h":48},
+ "frame": {"x":5,"y":333,"w":48,"h":48},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":48},
@@ -1434,7 +1434,7 @@
},
"sprites/wires/sets/shape_forward.png":
{
- "frame": {"x":499,"y":771,"w":8,"h":48},
+ "frame": {"x":565,"y":348,"w":8,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":0,"w":8,"h":48},
@@ -1442,7 +1442,7 @@
},
"sprites/wires/sets/shape_split.png":
{
- "frame": {"x":3,"y":666,"w":48,"h":28},
+ "frame": {"x":946,"y":221,"w":48,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":20,"w":48,"h":28},
@@ -1450,7 +1450,7 @@
},
"sprites/wires/sets/shape_turn.png":
{
- "frame": {"x":343,"y":227,"w":28,"h":28},
+ "frame": {"x":846,"y":458,"w":28,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":20,"w":28,"h":28},
@@ -1458,7 +1458,7 @@
},
"sprites/wires/wires_preview.png":
{
- "frame": {"x":159,"y":480,"w":16,"h":16},
+ "frame": {"x":373,"y":261,"w":16,"h":16},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":16,"h":16},
@@ -1469,8 +1469,8 @@
"version": "1.0",
"image": "atlas0_lq.png",
"format": "RGBA8888",
- "size": {"w":512,"h":1024},
+ "size": {"w":1024,"h":1024},
"scale": "0.25",
- "smartupdate": "$TexturePacker:SmartUpdate:64d35c8d649d4bb41c7539e7e89c0865:2a9399f9a7c16dc686a4fb0941b02e6b:908b89f5ca8ff73e331a35a3b14d0604$"
+ "smartupdate": "$TexturePacker:SmartUpdate:604557e03fa42226ddc62b672c751ccf:2a9399f9a7c16dc686a4fb0941b02e6b:908b89f5ca8ff73e331a35a3b14d0604$"
}
}
diff --git a/res_built/atlas/atlas0_lq.png b/res_built/atlas/atlas0_lq.png
index 15d6529a..d47b7844 100644
Binary files a/res_built/atlas/atlas0_lq.png and b/res_built/atlas/atlas0_lq.png differ
diff --git a/res_built/atlas/atlas0_mq.json b/res_built/atlas/atlas0_mq.json
index 81d510a9..ff28c7c8 100644
--- a/res_built/atlas/atlas0_mq.json
+++ b/res_built/atlas/atlas0_mq.json
@@ -2,7 +2,7 @@
"sprites/belt/built/forward_0.png":
{
- "frame": {"x":565,"y":1569,"w":78,"h":96},
+ "frame": {"x":941,"y":664,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -10,7 +10,7 @@
},
"sprites/belt/built/forward_1.png":
{
- "frame": {"x":468,"y":1618,"w":78,"h":96},
+ "frame": {"x":273,"y":1925,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -18,7 +18,7 @@
},
"sprites/belt/built/forward_2.png":
{
- "frame": {"x":3,"y":1793,"w":78,"h":96},
+ "frame": {"x":531,"y":1886,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -26,7 +26,7 @@
},
"sprites/belt/built/forward_3.png":
{
- "frame": {"x":3,"y":1893,"w":78,"h":96},
+ "frame": {"x":532,"y":1706,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -34,7 +34,7 @@
},
"sprites/belt/built/forward_4.png":
{
- "frame": {"x":85,"y":1885,"w":78,"h":96},
+ "frame": {"x":694,"y":1691,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -42,7 +42,7 @@
},
"sprites/belt/built/forward_5.png":
{
- "frame": {"x":167,"y":1885,"w":78,"h":96},
+ "frame": {"x":893,"y":1665,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -50,7 +50,7 @@
},
"sprites/belt/built/forward_6.png":
{
- "frame": {"x":844,"y":1565,"w":78,"h":96},
+ "frame": {"x":780,"y":1764,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -58,7 +58,7 @@
},
"sprites/belt/built/forward_7.png":
{
- "frame": {"x":746,"y":1643,"w":78,"h":96},
+ "frame": {"x":694,"y":1795,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -66,7 +66,7 @@
},
"sprites/belt/built/forward_8.png":
{
- "frame": {"x":647,"y":1663,"w":78,"h":96},
+ "frame": {"x":617,"y":1907,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -74,7 +74,7 @@
},
"sprites/belt/built/forward_9.png":
{
- "frame": {"x":550,"y":1669,"w":78,"h":96},
+ "frame": {"x":703,"y":1899,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -82,7 +82,7 @@
},
"sprites/belt/built/forward_10.png":
{
- "frame": {"x":372,"y":1620,"w":78,"h":96},
+ "frame": {"x":359,"y":1925,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -90,7 +90,7 @@
},
"sprites/belt/built/forward_11.png":
{
- "frame": {"x":276,"y":1669,"w":78,"h":96},
+ "frame": {"x":360,"y":1821,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -98,7 +98,7 @@
},
"sprites/belt/built/forward_12.png":
{
- "frame": {"x":184,"y":1727,"w":78,"h":96},
+ "frame": {"x":445,"y":1925,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -106,7 +106,7 @@
},
"sprites/belt/built/forward_13.png":
{
- "frame": {"x":91,"y":1785,"w":78,"h":96},
+ "frame": {"x":446,"y":1782,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -114,7 +114,7 @@
},
"sprites/belt/built/left_0.png":
{
- "frame": {"x":600,"y":1205,"w":87,"h":87},
+ "frame": {"x":469,"y":1039,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -122,7 +122,7 @@
},
"sprites/belt/built/left_1.png":
{
- "frame": {"x":488,"y":1254,"w":87,"h":87},
+ "frame": {"x":105,"y":1573,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -130,7 +130,7 @@
},
"sprites/belt/built/left_2.png":
{
- "frame": {"x":488,"y":1345,"w":87,"h":87},
+ "frame": {"x":620,"y":1414,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -138,7 +138,7 @@
},
"sprites/belt/built/left_3.png":
{
- "frame": {"x":390,"y":1347,"w":87,"h":87},
+ "frame": {"x":514,"y":1421,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -146,7 +146,7 @@
},
"sprites/belt/built/left_4.png":
{
- "frame": {"x":292,"y":1396,"w":87,"h":87},
+ "frame": {"x":409,"y":1497,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -154,7 +154,7 @@
},
"sprites/belt/built/left_5.png":
{
- "frame": {"x":195,"y":1454,"w":87,"h":87},
+ "frame": {"x":305,"y":1536,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -162,7 +162,7 @@
},
"sprites/belt/built/left_6.png":
{
- "frame": {"x":99,"y":1508,"w":87,"h":87},
+ "frame": {"x":200,"y":1582,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -170,7 +170,7 @@
},
"sprites/belt/built/left_7.png":
{
- "frame": {"x":3,"y":1517,"w":87,"h":87},
+ "frame": {"x":100,"y":1668,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -178,7 +178,7 @@
},
"sprites/belt/built/left_8.png":
{
- "frame": {"x":883,"y":1283,"w":87,"h":87},
+ "frame": {"x":5,"y":1689,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -186,7 +186,7 @@
},
"sprites/belt/built/left_9.png":
{
- "frame": {"x":782,"y":1361,"w":87,"h":87},
+ "frame": {"x":819,"y":1475,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -194,7 +194,7 @@
},
"sprites/belt/built/left_10.png":
{
- "frame": {"x":896,"y":1192,"w":87,"h":87},
+ "frame": {"x":5,"y":1594,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -202,7 +202,7 @@
},
"sprites/belt/built/left_11.png":
{
- "frame": {"x":792,"y":1270,"w":87,"h":87},
+ "frame": {"x":829,"y":1380,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -210,7 +210,7 @@
},
"sprites/belt/built/left_12.png":
{
- "frame": {"x":691,"y":1290,"w":87,"h":87},
+ "frame": {"x":924,"y":1380,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -218,7 +218,7 @@
},
"sprites/belt/built/left_13.png":
{
- "frame": {"x":579,"y":1296,"w":87,"h":87},
+ "frame": {"x":724,"y":1406,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -226,7 +226,7 @@
},
"sprites/belt/built/right_0.png":
{
- "frame": {"x":670,"y":1381,"w":87,"h":87},
+ "frame": {"x":715,"y":1501,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -234,7 +234,7 @@
},
"sprites/belt/built/right_1.png":
{
- "frame": {"x":579,"y":1387,"w":87,"h":87},
+ "frame": {"x":609,"y":1509,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -242,7 +242,7 @@
},
"sprites/belt/built/right_2.png":
{
- "frame": {"x":94,"y":1599,"w":87,"h":87},
+ "frame": {"x":100,"y":1763,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -250,7 +250,7 @@
},
"sprites/belt/built/right_3.png":
{
- "frame": {"x":3,"y":1608,"w":87,"h":87},
+ "frame": {"x":5,"y":1784,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -258,7 +258,7 @@
},
"sprites/belt/built/right_4.png":
{
- "frame": {"x":873,"y":1374,"w":87,"h":87},
+ "frame": {"x":914,"y":1475,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -266,7 +266,7 @@
},
"sprites/belt/built/right_5.png":
{
- "frame": {"x":761,"y":1452,"w":87,"h":87},
+ "frame": {"x":810,"y":1570,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -274,7 +274,7 @@
},
"sprites/belt/built/right_6.png":
{
- "frame": {"x":670,"y":1472,"w":87,"h":87},
+ "frame": {"x":704,"y":1596,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -282,7 +282,7 @@
},
"sprites/belt/built/right_7.png":
{
- "frame": {"x":572,"y":1478,"w":87,"h":87},
+ "frame": {"x":599,"y":1604,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -290,7 +290,7 @@
},
"sprites/belt/built/right_8.png":
{
- "frame": {"x":474,"y":1527,"w":87,"h":87},
+ "frame": {"x":495,"y":1611,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -298,7 +298,7 @@
},
"sprites/belt/built/right_9.png":
{
- "frame": {"x":377,"y":1529,"w":87,"h":87},
+ "frame": {"x":390,"y":1687,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -306,7 +306,7 @@
},
"sprites/belt/built/right_10.png":
{
- "frame": {"x":481,"y":1436,"w":87,"h":87},
+ "frame": {"x":504,"y":1516,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -314,7 +314,7 @@
},
"sprites/belt/built/right_11.png":
{
- "frame": {"x":383,"y":1438,"w":87,"h":87},
+ "frame": {"x":400,"y":1592,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -322,7 +322,7 @@
},
"sprites/belt/built/right_12.png":
{
- "frame": {"x":286,"y":1487,"w":87,"h":87},
+ "frame": {"x":295,"y":1631,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -330,7 +330,7 @@
},
"sprites/belt/built/right_13.png":
{
- "frame": {"x":190,"y":1545,"w":87,"h":87},
+ "frame": {"x":195,"y":1677,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -338,7 +338,7 @@
},
"sprites/blueprints/belt_left.png":
{
- "frame": {"x":281,"y":1578,"w":87,"h":87},
+ "frame": {"x":290,"y":1726,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -346,7 +346,7 @@
},
"sprites/blueprints/belt_right.png":
{
- "frame": {"x":185,"y":1636,"w":87,"h":87},
+ "frame": {"x":905,"y":1570,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -354,7 +354,7 @@
},
"sprites/blueprints/belt_top.png":
{
- "frame": {"x":454,"y":1718,"w":78,"h":96},
+ "frame": {"x":866,"y":1769,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -362,7 +362,7 @@
},
"sprites/blueprints/constant_signal.png":
{
- "frame": {"x":949,"y":396,"w":71,"h":85},
+ "frame": {"x":838,"y":1028,"w":71,"h":85},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":13,"y":0,"w":71,"h":85},
@@ -370,7 +370,7 @@
},
"sprites/blueprints/cutter-quad.png":
{
- "frame": {"x":373,"y":103,"w":366,"h":96},
+ "frame": {"x":379,"y":109,"w":366,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":11,"y":0,"w":366,"h":96},
@@ -378,7 +378,7 @@
},
"sprites/blueprints/cutter.png":
{
- "frame": {"x":745,"y":594,"w":172,"h":96},
+ "frame": {"x":187,"y":588,"w":172,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":11,"y":0,"w":172,"h":96},
@@ -386,7 +386,7 @@
},
"sprites/blueprints/display.png":
{
- "frame": {"x":94,"y":1690,"w":86,"h":91},
+ "frame": {"x":799,"y":1665,"w":86,"h":91},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":5,"w":86,"h":91},
@@ -394,7 +394,7 @@
},
"sprites/blueprints/filter.png":
{
- "frame": {"x":569,"y":303,"w":180,"h":96},
+ "frame": {"x":753,"y":612,"w":180,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":10,"y":0,"w":180,"h":96},
@@ -402,7 +402,7 @@
},
"sprites/blueprints/lever.png":
{
- "frame": {"x":944,"y":803,"w":75,"h":86},
+ "frame": {"x":284,"y":692,"w":75,"h":86},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":11,"y":3,"w":75,"h":86},
@@ -410,7 +410,7 @@
},
"sprites/blueprints/logic_gate-not.png":
{
- "frame": {"x":852,"y":1465,"w":83,"h":96},
+ "frame": {"x":5,"y":1879,"w":83,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":7,"y":0,"w":83,"h":96},
@@ -418,7 +418,7 @@
},
"sprites/blueprints/logic_gate-or.png":
{
- "frame": {"x":203,"y":970,"w":96,"h":82},
+ "frame": {"x":421,"y":1134,"w":96,"h":82},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":82},
@@ -426,7 +426,7 @@
},
"sprites/blueprints/logic_gate-transistor.png":
{
- "frame": {"x":451,"y":703,"w":68,"h":96},
+ "frame": {"x":618,"y":1699,"w":68,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":68,"h":96},
@@ -434,7 +434,7 @@
},
"sprites/blueprints/logic_gate-xor.png":
{
- "frame": {"x":3,"y":674,"w":96,"h":96},
+ "frame": {"x":579,"y":517,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -442,7 +442,7 @@
},
"sprites/blueprints/logic_gate.png":
{
- "frame": {"x":103,"y":873,"w":96,"h":89},
+ "frame": {"x":5,"y":1099,"w":96,"h":89},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":89},
@@ -450,7 +450,7 @@
},
"sprites/blueprints/miner-chainable.png":
{
- "frame": {"x":100,"y":1330,"w":92,"h":96},
+ "frame": {"x":106,"y":1469,"w":92,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":92,"h":96},
@@ -458,7 +458,7 @@
},
"sprites/blueprints/miner.png":
{
- "frame": {"x":3,"y":1339,"w":92,"h":96},
+ "frame": {"x":5,"y":1490,"w":92,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":92,"h":96},
@@ -466,7 +466,7 @@
},
"sprites/blueprints/mixer.png":
{
- "frame": {"x":3,"y":474,"w":175,"h":96},
+ "frame": {"x":192,"y":484,"w":175,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":8,"y":0,"w":175,"h":96},
@@ -474,7 +474,7 @@
},
"sprites/blueprints/painter-double.png":
{
- "frame": {"x":759,"y":3,"w":192,"h":192},
+ "frame": {"x":769,"y":5,"w":192,"h":192},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":192,"h":192},
@@ -482,7 +482,7 @@
},
"sprites/blueprints/painter-mirrored.png":
{
- "frame": {"x":373,"y":303,"w":192,"h":96},
+ "frame": {"x":379,"y":317,"w":192,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":192,"h":96},
@@ -490,7 +490,7 @@
},
"sprites/blueprints/painter-quad.png":
{
- "frame": {"x":3,"y":3,"w":374,"h":96},
+ "frame": {"x":5,"y":5,"w":374,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":374,"h":96},
@@ -498,7 +498,7 @@
},
"sprites/blueprints/painter.png":
{
- "frame": {"x":753,"y":394,"w":192,"h":96},
+ "frame": {"x":379,"y":421,"w":192,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":192,"h":96},
@@ -506,7 +506,7 @@
},
"sprites/blueprints/reader.png":
{
- "frame": {"x":403,"y":1052,"w":95,"h":96},
+ "frame": {"x":924,"y":866,"w":95,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":95,"h":96},
@@ -514,7 +514,7 @@
},
"sprites/blueprints/rotater-ccw.png":
{
- "frame": {"x":103,"y":674,"w":96,"h":96},
+ "frame": {"x":578,"y":621,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -522,7 +522,7 @@
},
"sprites/blueprints/rotater-fl.png":
{
- "frame": {"x":303,"y":1107,"w":95,"h":96},
+ "frame": {"x":109,"y":1264,"w":95,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":95,"h":96},
@@ -530,7 +530,7 @@
},
"sprites/blueprints/rotater.png":
{
- "frame": {"x":203,"y":674,"w":96,"h":96},
+ "frame": {"x":578,"y":725,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -538,7 +538,7 @@
},
"sprites/blueprints/splitter-compact-inverse.png":
{
- "frame": {"x":601,"y":1108,"w":95,"h":93},
+ "frame": {"x":669,"y":1132,"w":95,"h":93},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":1,"w":95,"h":93},
@@ -546,7 +546,7 @@
},
"sprites/blueprints/splitter-compact-merge-inverse.png":
{
- "frame": {"x":501,"y":1157,"w":95,"h":93},
+ "frame": {"x":772,"y":1214,"w":95,"h":93},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":1,"w":95,"h":93},
@@ -554,7 +554,7 @@
},
"sprites/blueprints/splitter-compact-merge.png":
{
- "frame": {"x":3,"y":1154,"w":93,"h":93},
+ "frame": {"x":212,"y":1295,"w":93,"h":93},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":1,"w":93,"h":93},
@@ -562,7 +562,7 @@
},
"sprites/blueprints/splitter-compact.png":
{
- "frame": {"x":100,"y":1154,"w":93,"h":93},
+ "frame": {"x":108,"y":1368,"w":93,"h":93},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":1,"w":93,"h":93},
@@ -570,7 +570,7 @@
},
"sprites/blueprints/splitter.png":
{
- "frame": {"x":3,"y":574,"w":172,"h":96},
+ "frame": {"x":367,"y":629,"w":172,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":11,"y":0,"w":172,"h":96},
@@ -578,7 +578,7 @@
},
"sprites/blueprints/stacker.png":
{
- "frame": {"x":182,"y":474,"w":175,"h":96},
+ "frame": {"x":375,"y":525,"w":175,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":8,"y":0,"w":175,"h":96},
@@ -586,7 +586,7 @@
},
"sprites/blueprints/trash-storage.png":
{
- "frame": {"x":529,"y":603,"w":167,"h":192},
+ "frame": {"x":5,"y":692,"w":167,"h":192},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":167,"h":192},
@@ -594,7 +594,7 @@
},
"sprites/blueprints/trash.png":
{
- "frame": {"x":351,"y":703,"w":96,"h":96},
+ "frame": {"x":921,"y":970,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -602,7 +602,7 @@
},
"sprites/blueprints/underground_belt_entry-tier2.png":
{
- "frame": {"x":3,"y":1251,"w":93,"h":84},
+ "frame": {"x":419,"y":1323,"w":93,"h":84},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":12,"w":93,"h":84},
@@ -610,7 +610,7 @@
},
"sprites/blueprints/underground_belt_entry.png":
{
- "frame": {"x":100,"y":1251,"w":93,"h":75},
+ "frame": {"x":313,"y":1350,"w":93,"h":75},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":21,"w":93,"h":75},
@@ -618,7 +618,7 @@
},
"sprites/blueprints/underground_belt_exit-tier2.png":
{
- "frame": {"x":200,"y":1114,"w":94,"h":75},
+ "frame": {"x":317,"y":1267,"w":94,"h":75},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":0,"w":94,"h":75},
@@ -626,7 +626,7 @@
},
"sprites/blueprints/underground_belt_exit.png":
{
- "frame": {"x":197,"y":1288,"w":93,"h":75},
+ "frame": {"x":209,"y":1396,"w":93,"h":75},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":0,"w":93,"h":75},
@@ -634,7 +634,7 @@
},
"sprites/blueprints/virtual_processor-analyzer.png":
{
- "frame": {"x":523,"y":799,"w":96,"h":96},
+ "frame": {"x":567,"y":829,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -642,7 +642,7 @@
},
"sprites/blueprints/virtual_processor-rotater.png":
{
- "frame": {"x":761,"y":1543,"w":79,"h":96},
+ "frame": {"x":186,"y":1858,"w":79,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":79,"h":96},
@@ -650,7 +650,7 @@
},
"sprites/blueprints/virtual_processor-shapecompare.png":
{
- "frame": {"x":3,"y":874,"w":96,"h":89},
+ "frame": {"x":317,"y":1045,"w":96,"h":89},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":89},
@@ -658,7 +658,7 @@
},
"sprites/blueprints/virtual_processor-stacker.png":
{
- "frame": {"x":931,"y":893,"w":88,"h":96},
+ "frame": {"x":471,"y":831,"w":88,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":88,"h":96},
@@ -666,7 +666,7 @@
},
"sprites/blueprints/virtual_processor-unstacker.png":
{
- "frame": {"x":349,"y":803,"w":96,"h":96},
+ "frame": {"x":180,"y":692,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -674,7 +674,7 @@
},
"sprites/blueprints/virtual_processor.png":
{
- "frame": {"x":203,"y":774,"w":96,"h":94},
+ "frame": {"x":213,"y":972,"w":96,"h":94},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":2,"w":96,"h":94},
@@ -682,7 +682,7 @@
},
"sprites/blueprints/wire-cross.png":
{
- "frame": {"x":522,"y":899,"w":96,"h":96},
+ "frame": {"x":367,"y":733,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -690,7 +690,7 @@
},
"sprites/blueprints/wire-split.png":
{
- "frame": {"x":303,"y":990,"w":96,"h":55},
+ "frame": {"x":317,"y":1142,"w":96,"h":55},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":41,"w":96,"h":55},
@@ -698,7 +698,7 @@
},
"sprites/blueprints/wire-turn.png":
{
- "frame": {"x":955,"y":105,"w":55,"h":55},
+ "frame": {"x":953,"y":353,"w":55,"h":55},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":41,"y":41,"w":55,"h":55},
@@ -706,7 +706,7 @@
},
"sprites/blueprints/wire.png":
{
- "frame": {"x":468,"y":894,"w":14,"h":96},
+ "frame": {"x":723,"y":750,"w":14,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":41,"y":0,"w":14,"h":96},
@@ -714,7 +714,7 @@
},
"sprites/blueprints/wire_tunnel-coating.png":
{
- "frame": {"x":921,"y":594,"w":23,"h":90},
+ "frame": {"x":547,"y":629,"w":23,"h":90},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":37,"y":3,"w":23,"h":90},
@@ -722,7 +722,7 @@
},
"sprites/blueprints/wire_tunnel.png":
{
- "frame": {"x":197,"y":1193,"w":93,"h":91},
+ "frame": {"x":5,"y":1391,"w":93,"h":91},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":2,"w":93,"h":91},
@@ -730,7 +730,7 @@
},
"sprites/buildings/belt_left.png":
{
- "frame": {"x":600,"y":1205,"w":87,"h":87},
+ "frame": {"x":469,"y":1039,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":87,"h":87},
@@ -738,7 +738,7 @@
},
"sprites/buildings/belt_right.png":
{
- "frame": {"x":670,"y":1381,"w":87,"h":87},
+ "frame": {"x":715,"y":1501,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":87,"h":87},
@@ -746,7 +746,7 @@
},
"sprites/buildings/belt_top.png":
{
- "frame": {"x":565,"y":1569,"w":78,"h":96},
+ "frame": {"x":941,"y":664,"w":78,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":78,"h":96},
@@ -754,7 +754,7 @@
},
"sprites/buildings/constant_signal.png":
{
- "frame": {"x":949,"y":485,"w":70,"h":85},
+ "frame": {"x":838,"y":1121,"w":70,"h":85},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":13,"y":0,"w":70,"h":85},
@@ -762,7 +762,7 @@
},
"sprites/buildings/cutter-quad.png":
{
- "frame": {"x":373,"y":203,"w":366,"h":96},
+ "frame": {"x":379,"y":213,"w":366,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":11,"y":0,"w":366,"h":96},
@@ -770,7 +770,7 @@
},
"sprites/buildings/cutter.png":
{
- "frame": {"x":179,"y":574,"w":171,"h":96},
+ "frame": {"x":745,"y":820,"w":171,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":11,"y":0,"w":171,"h":96},
@@ -778,7 +778,7 @@
},
"sprites/buildings/display.png":
{
- "frame": {"x":3,"y":1699,"w":84,"h":90},
+ "frame": {"x":935,"y":768,"w":84,"h":90},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":6,"y":6,"w":84,"h":90},
@@ -786,7 +786,7 @@
},
"sprites/buildings/filter.png":
{
- "frame": {"x":569,"y":403,"w":179,"h":96},
+ "frame": {"x":5,"y":484,"w":179,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":11,"y":0,"w":179,"h":96},
@@ -794,7 +794,7 @@
},
"sprites/buildings/hub.png":
{
- "frame": {"x":3,"y":103,"w":366,"h":367},
+ "frame": {"x":5,"y":109,"w":366,"h":367},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":10,"w":366,"h":367},
@@ -802,7 +802,7 @@
},
"sprites/buildings/lever.png":
{
- "frame": {"x":948,"y":574,"w":73,"h":85},
+ "frame": {"x":284,"y":786,"w":73,"h":85},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":12,"y":3,"w":73,"h":85},
@@ -810,7 +810,7 @@
},
"sprites/buildings/logic_gate-not.png":
{
- "frame": {"x":939,"y":1465,"w":82,"h":96},
+ "frame": {"x":96,"y":1879,"w":82,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":8,"y":0,"w":82,"h":96},
@@ -818,7 +818,7 @@
},
"sprites/buildings/logic_gate-or.png":
{
- "frame": {"x":303,"y":903,"w":96,"h":83},
+ "frame": {"x":5,"y":1196,"w":96,"h":83},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":83},
@@ -826,7 +826,7 @@
},
"sprites/buildings/logic_gate-transistor.png":
{
- "frame": {"x":623,"y":799,"w":68,"h":96},
+ "frame": {"x":618,"y":1803,"w":68,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":68,"h":96},
@@ -834,7 +834,7 @@
},
"sprites/buildings/logic_gate-xor.png":
{
- "frame": {"x":103,"y":774,"w":96,"h":95},
+ "frame": {"x":5,"y":996,"w":96,"h":95},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":95},
@@ -842,7 +842,7 @@
},
"sprites/buildings/logic_gate.png":
{
- "frame": {"x":3,"y":967,"w":96,"h":88},
+ "frame": {"x":109,"y":1106,"w":96,"h":88},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":88},
@@ -850,7 +850,7 @@
},
"sprites/buildings/miner-chainable.png":
{
- "frame": {"x":897,"y":1093,"w":91,"h":95},
+ "frame": {"x":310,"y":1433,"w":91,"h":95},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":91,"h":95},
@@ -858,7 +858,7 @@
},
"sprites/buildings/miner.png":
{
- "frame": {"x":801,"y":1171,"w":91,"h":95},
+ "frame": {"x":206,"y":1479,"w":91,"h":95},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":91,"h":95},
@@ -866,7 +866,7 @@
},
"sprites/buildings/mixer.png":
{
- "frame": {"x":361,"y":503,"w":174,"h":96},
+ "frame": {"x":753,"y":716,"w":174,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":174,"h":96},
@@ -874,7 +874,7 @@
},
"sprites/buildings/painter-double.png":
{
- "frame": {"x":759,"y":199,"w":192,"h":191},
+ "frame": {"x":753,"y":205,"w":192,"h":191},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":192,"h":191},
@@ -882,7 +882,7 @@
},
"sprites/buildings/painter-mirrored.png":
{
- "frame": {"x":373,"y":403,"w":192,"h":96},
+ "frame": {"x":753,"y":404,"w":192,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":192,"h":96},
@@ -890,7 +890,7 @@
},
"sprites/buildings/painter-quad.png":
{
- "frame": {"x":381,"y":3,"w":374,"h":96},
+ "frame": {"x":387,"y":5,"w":374,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":374,"h":96},
@@ -898,7 +898,7 @@
},
"sprites/buildings/painter.png":
{
- "frame": {"x":752,"y":494,"w":192,"h":96},
+ "frame": {"x":753,"y":508,"w":192,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":192,"h":96},
@@ -906,7 +906,7 @@
},
"sprites/buildings/reader.png":
{
- "frame": {"x":603,"y":1008,"w":95,"h":96},
+ "frame": {"x":5,"y":1287,"w":95,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":95,"h":96},
@@ -914,7 +914,7 @@
},
"sprites/buildings/rotater-ccw.png":
{
- "frame": {"x":502,"y":1057,"w":95,"h":96},
+ "frame": {"x":735,"y":1028,"w":95,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":95,"h":96},
@@ -922,7 +922,7 @@
},
"sprites/buildings/rotater-fl.png":
{
- "frame": {"x":402,"y":1152,"w":95,"h":96},
+ "frame": {"x":917,"y":1074,"w":95,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":95,"h":96},
@@ -930,7 +930,7 @@
},
"sprites/buildings/rotater.png":
{
- "frame": {"x":702,"y":1090,"w":95,"h":96},
+ "frame": {"x":916,"y":1178,"w":95,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":95,"h":96},
@@ -938,7 +938,7 @@
},
"sprites/buildings/splitter-compact-inverse.png":
{
- "frame": {"x":102,"y":1059,"w":94,"h":91},
+ "frame": {"x":421,"y":1224,"w":94,"h":91},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":2,"w":94,"h":91},
@@ -946,7 +946,7 @@
},
"sprites/buildings/splitter-compact-merge-inverse.png":
{
- "frame": {"x":3,"y":1059,"w":95,"h":91},
+ "frame": {"x":525,"y":1141,"w":95,"h":91},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":2,"w":95,"h":91},
@@ -954,7 +954,7 @@
},
"sprites/buildings/splitter-compact-merge.png":
{
- "frame": {"x":294,"y":1207,"w":93,"h":91},
+ "frame": {"x":628,"y":1233,"w":93,"h":91},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":2,"w":93,"h":91},
@@ -962,7 +962,7 @@
},
"sprites/buildings/splitter-compact.png":
{
- "frame": {"x":391,"y":1252,"w":93,"h":91},
+ "frame": {"x":523,"y":1240,"w":93,"h":91},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":2,"w":93,"h":91},
@@ -970,7 +970,7 @@
},
"sprites/buildings/splitter.png":
{
- "frame": {"x":354,"y":603,"w":171,"h":96},
+ "frame": {"x":742,"y":924,"w":171,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":11,"y":0,"w":171,"h":96},
@@ -978,7 +978,7 @@
},
"sprites/buildings/stacker.png":
{
- "frame": {"x":539,"y":503,"w":174,"h":96},
+ "frame": {"x":5,"y":588,"w":174,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":174,"h":96},
@@ -986,7 +986,7 @@
},
"sprites/buildings/trash-storage.png":
{
- "frame": {"x":737,"y":694,"w":166,"h":192},
+ "frame": {"x":579,"y":317,"w":166,"h":192},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":14,"y":0,"w":166,"h":192},
@@ -994,7 +994,7 @@
},
"sprites/buildings/trash.png":
{
- "frame": {"x":731,"y":890,"w":96,"h":96},
+ "frame": {"x":567,"y":933,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -1002,7 +1002,7 @@
},
"sprites/buildings/underground_belt_entry-tier2.png":
{
- "frame": {"x":196,"y":1367,"w":92,"h":83},
+ "frame": {"x":729,"y":1315,"w":92,"h":83},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":13,"w":92,"h":83},
@@ -1010,7 +1010,7 @@
},
"sprites/buildings/underground_belt_entry.png":
{
- "frame": {"x":99,"y":1430,"w":92,"h":74},
+ "frame": {"x":624,"y":1332,"w":92,"h":74},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":22,"w":92,"h":74},
@@ -1018,7 +1018,7 @@
},
"sprites/buildings/underground_belt_exit-tier2.png":
{
- "frame": {"x":3,"y":1439,"w":92,"h":74},
+ "frame": {"x":520,"y":1339,"w":92,"h":74},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":92,"h":74},
@@ -1026,7 +1026,7 @@
},
"sprites/buildings/underground_belt_exit.png":
{
- "frame": {"x":801,"y":1093,"w":92,"h":74},
+ "frame": {"x":414,"y":1415,"w":92,"h":74},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":92,"h":74},
@@ -1034,7 +1034,7 @@
},
"sprites/buildings/virtual_processor-analyzer.png":
{
- "frame": {"x":622,"y":908,"w":96,"h":96},
+ "frame": {"x":180,"y":796,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -1042,7 +1042,7 @@
},
"sprites/buildings/virtual_processor-rotater.png":
{
- "frame": {"x":663,"y":1563,"w":79,"h":96},
+ "frame": {"x":273,"y":1821,"w":79,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":79,"h":96},
@@ -1050,7 +1050,7 @@
},
"sprites/buildings/virtual_processor-shapecompare.png":
{
- "frame": {"x":103,"y":966,"w":96,"h":89},
+ "frame": {"x":213,"y":1074,"w":96,"h":89},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":89},
@@ -1058,7 +1058,7 @@
},
"sprites/buildings/virtual_processor-stacker.png":
{
- "frame": {"x":700,"y":1190,"w":88,"h":96},
+ "frame": {"x":469,"y":935,"w":88,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":88,"h":96},
@@ -1066,7 +1066,7 @@
},
"sprites/buildings/virtual_processor-unstacker.png":
{
- "frame": {"x":831,"y":893,"w":96,"h":96},
+ "frame": {"x":365,"y":837,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -1074,7 +1074,7 @@
},
"sprites/buildings/virtual_processor.png":
{
- "frame": {"x":203,"y":872,"w":96,"h":94},
+ "frame": {"x":109,"y":1004,"w":96,"h":94},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":2,"w":96,"h":94},
@@ -1082,7 +1082,7 @@
},
"sprites/buildings/wire-cross.png":
{
- "frame": {"x":722,"y":990,"w":96,"h":96},
+ "frame": {"x":365,"y":941,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -1090,7 +1090,7 @@
},
"sprites/buildings/wire-split.png":
{
- "frame": {"x":403,"y":994,"w":96,"h":54},
+ "frame": {"x":213,"y":1171,"w":96,"h":54},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":42,"w":96,"h":54},
@@ -1098,7 +1098,7 @@
},
"sprites/buildings/wire-turn.png":
{
- "frame": {"x":955,"y":164,"w":54,"h":54},
+ "frame": {"x":953,"y":416,"w":54,"h":54},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":42,"y":42,"w":54,"h":54},
@@ -1106,7 +1106,7 @@
},
"sprites/buildings/wire.png":
{
- "frame": {"x":743,"y":103,"w":12,"h":96},
+ "frame": {"x":558,"y":525,"w":12,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":42,"y":0,"w":12,"h":96},
@@ -1114,7 +1114,7 @@
},
"sprites/buildings/wire_tunnel-coating.png":
{
- "frame": {"x":921,"y":688,"w":22,"h":90},
+ "frame": {"x":723,"y":652,"w":22,"h":90},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":37,"y":3,"w":22,"h":90},
@@ -1122,7 +1122,7 @@
},
"sprites/buildings/wire_tunnel.png":
{
- "frame": {"x":294,"y":1302,"w":92,"h":90},
+ "frame": {"x":875,"y":1282,"w":92,"h":90},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":3,"w":92,"h":90},
@@ -1130,7 +1130,7 @@
},
"sprites/debug/acceptor_slot.png":
{
- "frame": {"x":1013,"y":164,"w":8,"h":8},
+ "frame": {"x":1010,"y":202,"w":8,"h":8},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":8,"h":8},
@@ -1138,7 +1138,7 @@
},
"sprites/debug/ejector_slot.png":
{
- "frame": {"x":1013,"y":176,"w":8,"h":8},
+ "frame": {"x":1010,"y":218,"w":8,"h":8},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":8,"h":8},
@@ -1146,7 +1146,7 @@
},
"sprites/misc/hub_direction_indicator.png":
{
- "frame": {"x":695,"y":802,"w":32,"h":32},
+ "frame": {"x":682,"y":826,"w":32,"h":32},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":32,"h":32},
@@ -1154,7 +1154,7 @@
},
"sprites/misc/processor_disabled.png":
{
- "frame": {"x":449,"y":803,"w":53,"h":55},
+ "frame": {"x":683,"y":517,"w":53,"h":55},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":6,"y":6,"w":53,"h":55},
@@ -1162,7 +1162,7 @@
},
"sprites/misc/processor_disconnected.png":
{
- "frame": {"x":303,"y":674,"w":44,"h":57},
+ "frame": {"x":969,"y":5,"w":44,"h":57},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":11,"y":5,"w":44,"h":57},
@@ -1170,7 +1170,7 @@
},
"sprites/misc/reader_overlay.png":
{
- "frame": {"x":947,"y":752,"w":70,"h":47},
+ "frame": {"x":5,"y":1983,"w":70,"h":47},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":13,"y":25,"w":70,"h":47},
@@ -1178,7 +1178,7 @@
},
"sprites/misc/slot_bad_arrow.png":
{
- "frame": {"x":449,"y":862,"w":24,"h":24},
+ "frame": {"x":703,"y":998,"w":24,"h":24},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":1,"w":24,"h":24},
@@ -1186,7 +1186,7 @@
},
"sprites/misc/slot_good_arrow.png":
{
- "frame": {"x":717,"y":575,"w":24,"h":26},
+ "frame": {"x":671,"y":984,"w":24,"h":26},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":1,"y":0,"w":24,"h":26},
@@ -1194,7 +1194,7 @@
},
"sprites/misc/storage_overlay.png":
{
- "frame": {"x":955,"y":71,"w":60,"h":30},
+ "frame": {"x":953,"y":315,"w":60,"h":30},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":60,"h":30},
@@ -1202,7 +1202,7 @@
},
"sprites/misc/waypoint.png":
{
- "frame": {"x":717,"y":539,"w":26,"h":32},
+ "frame": {"x":707,"y":958,"w":26,"h":32},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":26,"h":32},
@@ -1210,7 +1210,7 @@
},
"sprites/wires/boolean_false.png":
{
- "frame": {"x":477,"y":862,"w":21,"h":28},
+ "frame": {"x":724,"y":580,"w":21,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":6,"y":3,"w":21,"h":28},
@@ -1218,7 +1218,7 @@
},
"sprites/wires/boolean_true.png":
{
- "frame": {"x":449,"y":890,"w":15,"h":28},
+ "frame": {"x":724,"y":616,"w":15,"h":28},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":7,"y":3,"w":15,"h":28},
@@ -1226,7 +1226,7 @@
},
"sprites/wires/display/blue.png":
{
- "frame": {"x":700,"y":654,"w":33,"h":33},
+ "frame": {"x":969,"y":202,"w":33,"h":33},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":33,"h":33},
@@ -1234,7 +1234,7 @@
},
"sprites/wires/display/cyan.png":
{
- "frame": {"x":700,"y":691,"w":33,"h":33},
+ "frame": {"x":683,"y":580,"w":33,"h":33},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":33,"h":33},
@@ -1242,7 +1242,7 @@
},
"sprites/wires/display/green.png":
{
- "frame": {"x":700,"y":728,"w":33,"h":33},
+ "frame": {"x":682,"y":621,"w":33,"h":33},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":33,"h":33},
@@ -1250,7 +1250,7 @@
},
"sprites/wires/display/purple.png":
{
- "frame": {"x":700,"y":765,"w":33,"h":33},
+ "frame": {"x":682,"y":662,"w":33,"h":33},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":33,"h":33},
@@ -1258,7 +1258,7 @@
},
"sprites/wires/display/red.png":
{
- "frame": {"x":907,"y":782,"w":33,"h":33},
+ "frame": {"x":682,"y":703,"w":33,"h":33},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":33,"h":33},
@@ -1266,7 +1266,7 @@
},
"sprites/wires/display/white.png":
{
- "frame": {"x":907,"y":819,"w":33,"h":33},
+ "frame": {"x":682,"y":744,"w":33,"h":33},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":33,"h":33},
@@ -1274,7 +1274,7 @@
},
"sprites/wires/display/yellow.png":
{
- "frame": {"x":907,"y":856,"w":33,"h":33},
+ "frame": {"x":682,"y":785,"w":33,"h":33},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":33,"h":33},
@@ -1282,7 +1282,7 @@
},
"sprites/wires/lever_on.png":
{
- "frame": {"x":948,"y":663,"w":73,"h":85},
+ "frame": {"x":284,"y":879,"w":73,"h":85},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":12,"y":3,"w":73,"h":85},
@@ -1290,7 +1290,7 @@
},
"sprites/wires/logical_acceptor.png":
{
- "frame": {"x":303,"y":735,"w":42,"h":71},
+ "frame": {"x":969,"y":70,"w":42,"h":71},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":28,"y":0,"w":42,"h":71},
@@ -1298,7 +1298,7 @@
},
"sprites/wires/logical_ejector.png":
{
- "frame": {"x":700,"y":605,"w":41,"h":45},
+ "frame": {"x":969,"y":149,"w":41,"h":45},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":29,"y":0,"w":41,"h":45},
@@ -1306,7 +1306,7 @@
},
"sprites/wires/network_conflict.png":
{
- "frame": {"x":695,"y":874,"w":32,"h":30},
+ "frame": {"x":671,"y":906,"w":32,"h":30},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":1,"w":32,"h":30},
@@ -1314,7 +1314,7 @@
},
"sprites/wires/network_empty.png":
{
- "frame": {"x":717,"y":503,"w":28,"h":32},
+ "frame": {"x":671,"y":944,"w":28,"h":32},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":3,"y":0,"w":28,"h":32},
@@ -1322,7 +1322,7 @@
},
"sprites/wires/overlay_tile.png":
{
- "frame": {"x":955,"y":3,"w":64,"h":64},
+ "frame": {"x":953,"y":243,"w":64,"h":64},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":64,"h":64},
@@ -1330,7 +1330,7 @@
},
"sprites/wires/sets/color_cross.png":
{
- "frame": {"x":822,"y":993,"w":96,"h":96},
+ "frame": {"x":565,"y":1037,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -1338,7 +1338,7 @@
},
"sprites/wires/sets/color_forward.png":
{
- "frame": {"x":743,"y":203,"w":12,"h":96},
+ "frame": {"x":722,"y":854,"w":12,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":42,"y":0,"w":12,"h":96},
@@ -1346,7 +1346,7 @@
},
"sprites/wires/sets/color_split.png":
{
- "frame": {"x":303,"y":1049,"w":96,"h":54},
+ "frame": {"x":317,"y":1205,"w":96,"h":54},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":42,"w":96,"h":54},
@@ -1354,7 +1354,7 @@
},
"sprites/wires/sets/color_turn.png":
{
- "frame": {"x":955,"y":222,"w":54,"h":54},
+ "frame": {"x":953,"y":478,"w":54,"h":54},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":42,"y":42,"w":54,"h":54},
@@ -1362,7 +1362,7 @@
},
"sprites/wires/sets/conflict_cross.png":
{
- "frame": {"x":922,"y":993,"w":96,"h":96},
+ "frame": {"x":5,"y":892,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -1370,7 +1370,7 @@
},
"sprites/wires/sets/conflict_forward.png":
{
- "frame": {"x":506,"y":803,"w":12,"h":96},
+ "frame": {"x":547,"y":727,"w":12,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":42,"y":0,"w":12,"h":96},
@@ -1378,7 +1378,7 @@
},
"sprites/wires/sets/conflict_split.png":
{
- "frame": {"x":203,"y":1056,"w":96,"h":54},
+ "frame": {"x":109,"y":1202,"w":96,"h":54},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":42,"w":96,"h":54},
@@ -1386,7 +1386,7 @@
},
"sprites/wires/sets/conflict_turn.png":
{
- "frame": {"x":955,"y":280,"w":54,"h":54},
+ "frame": {"x":953,"y":540,"w":54,"h":54},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":42,"y":42,"w":54,"h":54},
@@ -1394,7 +1394,7 @@
},
"sprites/wires/sets/regular_cross.png":
{
- "frame": {"x":722,"y":990,"w":96,"h":96},
+ "frame": {"x":365,"y":941,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -1402,7 +1402,7 @@
},
"sprites/wires/sets/regular_forward.png":
{
- "frame": {"x":743,"y":103,"w":12,"h":96},
+ "frame": {"x":558,"y":525,"w":12,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":42,"y":0,"w":12,"h":96},
@@ -1410,7 +1410,7 @@
},
"sprites/wires/sets/regular_split.png":
{
- "frame": {"x":403,"y":994,"w":96,"h":54},
+ "frame": {"x":213,"y":1171,"w":96,"h":54},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":42,"w":96,"h":54},
@@ -1418,7 +1418,7 @@
},
"sprites/wires/sets/regular_turn.png":
{
- "frame": {"x":955,"y":164,"w":54,"h":54},
+ "frame": {"x":953,"y":416,"w":54,"h":54},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":42,"y":42,"w":54,"h":54},
@@ -1426,7 +1426,7 @@
},
"sprites/wires/sets/shape_cross.png":
{
- "frame": {"x":3,"y":774,"w":96,"h":96},
+ "frame": {"x":109,"y":900,"w":96,"h":96},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":96,"h":96},
@@ -1434,7 +1434,7 @@
},
"sprites/wires/sets/shape_forward.png":
{
- "frame": {"x":486,"y":894,"w":12,"h":96},
+ "frame": {"x":671,"y":1018,"w":12,"h":96},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":42,"y":0,"w":12,"h":96},
@@ -1442,7 +1442,7 @@
},
"sprites/wires/sets/shape_split.png":
{
- "frame": {"x":503,"y":999,"w":96,"h":54},
+ "frame": {"x":213,"y":1233,"w":96,"h":54},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":42,"w":96,"h":54},
@@ -1450,7 +1450,7 @@
},
"sprites/wires/sets/shape_turn.png":
{
- "frame": {"x":955,"y":338,"w":54,"h":54},
+ "frame": {"x":953,"y":602,"w":54,"h":54},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":42,"y":42,"w":54,"h":54},
@@ -1458,7 +1458,7 @@
},
"sprites/wires/wires_preview.png":
{
- "frame": {"x":695,"y":838,"w":32,"h":32},
+ "frame": {"x":671,"y":866,"w":32,"h":32},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":32,"h":32},
@@ -1471,6 +1471,6 @@
"format": "RGBA8888",
"size": {"w":1024,"h":2048},
"scale": "0.5",
- "smartupdate": "$TexturePacker:SmartUpdate:64d35c8d649d4bb41c7539e7e89c0865:2a9399f9a7c16dc686a4fb0941b02e6b:908b89f5ca8ff73e331a35a3b14d0604$"
+ "smartupdate": "$TexturePacker:SmartUpdate:604557e03fa42226ddc62b672c751ccf:2a9399f9a7c16dc686a4fb0941b02e6b:908b89f5ca8ff73e331a35a3b14d0604$"
}
}
diff --git a/res_built/atlas/atlas0_mq.png b/res_built/atlas/atlas0_mq.png
index 6fb0ba3d..2c232edc 100644
Binary files a/res_built/atlas/atlas0_mq.png and b/res_built/atlas/atlas0_mq.png differ
diff --git a/res_raw/atlas.tps b/res_raw/atlas.tps
index 947bdb04..50c27d8b 100644
--- a/res_raw/atlas.tps
+++ b/res_raw/atlas.tps
@@ -283,6 +283,7 @@