mirror of
https://github.com/tobspr/shapez.io.git
synced 2025-06-13 13:04:03 +00:00
Pass through items by slot map (currently working)
This commit is contained in:
Kiet
parent
1046e7d4bd
commit
bfbce653c6
11
package.json
11
package.json
@ -37,7 +37,7 @@
|
||||
"colors": "^1.3.3",
|
||||
"core-js": "3",
|
||||
"crc": "^3.8.0",
|
||||
"cssnano-preset-advanced": "^4.0.7",
|
||||
"cssnano-preset-advanced": "^5.1.2",
|
||||
"debounce-promise": "^3.1.2",
|
||||
"email-validator": "^2.0.4",
|
||||
"eslint": "7.1.0",
|
||||
@ -46,12 +46,13 @@
|
||||
"howler": "^2.1.2",
|
||||
"html-loader": "^0.5.5",
|
||||
"ignore-loader": "^0.1.2",
|
||||
"immutable": "^4.0.0-rc.12",
|
||||
"logrocket": "^1.0.7",
|
||||
"lz-string": "^1.4.4",
|
||||
"markdown-loader": "^4.0.0",
|
||||
"match-all": "^1.2.5",
|
||||
"phonegap-plugin-mobile-accessibility": "^1.0.5",
|
||||
"postcss": ">=5.0.0",
|
||||
"postcss": "^8.3.0",
|
||||
"promise-polyfill": "^8.1.0",
|
||||
"query-string": "^6.8.1",
|
||||
"rusha": "^0.8.13",
|
||||
@ -77,19 +78,19 @@
|
||||
"@octokit/rest": "^18.0.6",
|
||||
"@typescript-eslint/eslint-plugin": "3.0.1",
|
||||
"@typescript-eslint/parser": "3.0.1",
|
||||
"autoprefixer": "^9.4.3",
|
||||
"autoprefixer": "^10.2.6",
|
||||
"babel-plugin-closure-elimination": "^1.3.0",
|
||||
"babel-plugin-console-source": "^2.0.2",
|
||||
"babel-plugin-danger-remove-unused-import": "^1.1.2",
|
||||
"css-mqpacker": "^7.0.0",
|
||||
"cssnano": "^4.1.10",
|
||||
"cssnano": "^5.0.5",
|
||||
"eslint-config-prettier": "6.11.0",
|
||||
"eslint-plugin-prettier": "3.1.3",
|
||||
"faster.js": "^1.1.0",
|
||||
"glob": "^7.1.3",
|
||||
"imagemin-mozjpeg": "^8.0.0",
|
||||
"imagemin-pngquant": "^8.0.0",
|
||||
"jimp": "^0.6.1",
|
||||
"jimp": "^0.16.1",
|
||||
"js-yaml": "^3.13.1",
|
||||
"postcss-assets": "^5.0.0",
|
||||
"postcss-preset-env": "^6.5.0",
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
import { types } from "../../savegame/serialization";
|
||||
import { BaseItem } from "../base_item";
|
||||
import { Component } from "../component";
|
||||
const { Set } = require("immutable");
|
||||
|
||||
/** @enum {string} */
|
||||
export const enumItemProcessorTypes = {
|
||||
@ -27,6 +28,12 @@ export const enumItemProcessorRequirements = {
|
||||
painterQuad: "painterQuad",
|
||||
};
|
||||
|
||||
const specialCaseProcessorTypes = Set.of(
|
||||
enumItemProcessorTypes.hub,
|
||||
enumItemProcessorTypes.trash,
|
||||
enumItemProcessorTypes.goal
|
||||
);
|
||||
|
||||
/** @typedef {{
|
||||
* item: BaseItem,
|
||||
* requiredSlot?: number,
|
||||
@ -73,6 +80,12 @@ export class ItemProcessorComponent extends Component {
|
||||
// Type of processing requirement
|
||||
this.processingRequirement = processingRequirement;
|
||||
|
||||
/**
|
||||
* Our current inputs
|
||||
* @type {Map<number, BaseItem>}
|
||||
*/
|
||||
this.inputSlotsMap = new Map();
|
||||
|
||||
this.clear();
|
||||
}
|
||||
|
||||
@ -88,6 +101,8 @@ export class ItemProcessorComponent extends Component {
|
||||
*/
|
||||
this.inputSlots = [];
|
||||
|
||||
this.inputSlotsMap.clear();
|
||||
|
||||
/**
|
||||
* What we are currently processing, empty if we don't produce anything rn
|
||||
* requiredSlot: Item *must* be ejected on this slot
|
||||
@ -109,13 +124,10 @@ export class ItemProcessorComponent extends Component {
|
||||
* @param {number} sourceSlot
|
||||
*/
|
||||
tryTakeItem(item, sourceSlot) {
|
||||
if (
|
||||
this.type === enumItemProcessorTypes.hub ||
|
||||
this.type === enumItemProcessorTypes.trash ||
|
||||
this.type === enumItemProcessorTypes.goal
|
||||
) {
|
||||
if (specialCaseProcessorTypes.contains(this.type)) {
|
||||
// Hub has special logic .. not really nice but efficient.
|
||||
this.inputSlots.push({ item, sourceSlot });
|
||||
this.inputSlotsMap.set(sourceSlot, item);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -128,6 +140,7 @@ export class ItemProcessorComponent extends Component {
|
||||
}
|
||||
|
||||
this.inputSlots.push({ item, sourceSlot });
|
||||
this.inputSlotsMap.set(sourceSlot, item);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -32,7 +32,7 @@ const MAX_QUEUED_CHARGES = 2;
|
||||
* @typedef {{
|
||||
* entity: Entity,
|
||||
* items: Array<{ item: BaseItem, sourceSlot: number }>,
|
||||
* itemsBySlot: Object<number, BaseItem>,
|
||||
* itemsBySlotMap: Map<number, BaseItem>,
|
||||
* outItems: Array<ProducedItem>
|
||||
* }} ProcessorImplementationPayload
|
||||
*/
|
||||
@ -196,18 +196,12 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
|
||||
case enumItemProcessorRequirements.painterQuad: {
|
||||
const pinsComp = entity.components.WiredPins;
|
||||
|
||||
/** @type {Object.<number, { item: BaseItem, sourceSlot: number }>} */
|
||||
const itemsBySlot = {};
|
||||
for (let i = 0; i < processorComp.inputSlots.length; ++i) {
|
||||
itemsBySlot[processorComp.inputSlots[i].sourceSlot] = processorComp.inputSlots[i];
|
||||
}
|
||||
|
||||
// First slot is the shape, so if it's not there we can't do anything
|
||||
if (!itemsBySlot[0]) {
|
||||
if (!processorComp.inputSlotsMap.has(0)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const shapeItem = /** @type {ShapeItem} */ (itemsBySlot[0].item);
|
||||
const shapeItem = /** @type {ShapeItem} */ (processorComp.inputSlotsMap.get(0));
|
||||
const slotStatus = [];
|
||||
|
||||
// Check which slots are enabled
|
||||
@ -232,7 +226,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
|
||||
|
||||
// Check if all colors of the enabled slots are there
|
||||
for (let i = 0; i < slotStatus.length; ++i) {
|
||||
if (slotStatus[i] && !itemsBySlot[1 + i]) {
|
||||
if (slotStatus[i] && !processorComp.inputSlotsMap.has(1 + 1)) {
|
||||
// A slot which is enabled wasn't enabled. Make sure if there is anything on the quadrant,
|
||||
// it is not possible to paint, but if there is nothing we can ignore it
|
||||
for (let j = 0; j < 4; ++j) {
|
||||
@ -269,6 +263,13 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
|
||||
itemsBySlot[items[i].sourceSlot] = items[i].item;
|
||||
}
|
||||
|
||||
/** @type {Map<number, BaseItem>} */
|
||||
const itemsBySlotMap = new Map();
|
||||
for (let [key, value] of processorComp.inputSlotsMap.entries()) {
|
||||
itemsBySlotMap.set(key, value);
|
||||
}
|
||||
processorComp.inputSlotsMap.clear();
|
||||
|
||||
/** @type {Array<ProducedItem>} */
|
||||
const outItems = [];
|
||||
|
||||
@ -280,7 +281,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
|
||||
handler({
|
||||
entity,
|
||||
items,
|
||||
itemsBySlot,
|
||||
itemsBySlotMap,
|
||||
outItems,
|
||||
});
|
||||
|
||||
@ -416,8 +417,8 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
|
||||
* @param {ProcessorImplementationPayload} payload
|
||||
*/
|
||||
process_STACKER(payload) {
|
||||
const lowerItem = /** @type {ShapeItem} */ (payload.itemsBySlot[0]);
|
||||
const upperItem = /** @type {ShapeItem} */ (payload.itemsBySlot[1]);
|
||||
const lowerItem = /** @type {ShapeItem} */ (payload.itemsBySlotMap.get(0));
|
||||
const upperItem = /** @type {ShapeItem} */ (payload.itemsBySlotMap.get(1));
|
||||
|
||||
assert(lowerItem instanceof ShapeItem, "Input for lower stack is not a shape");
|
||||
assert(upperItem instanceof ShapeItem, "Input for upper stack is not a shape");
|
||||
@ -466,8 +467,8 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
|
||||
* @param {ProcessorImplementationPayload} payload
|
||||
*/
|
||||
process_PAINTER(payload) {
|
||||
const shapeItem = /** @type {ShapeItem} */ (payload.itemsBySlot[0]);
|
||||
const colorItem = /** @type {ColorItem} */ (payload.itemsBySlot[1]);
|
||||
const shapeItem = /** @type {ShapeItem} */ (payload.itemsBySlotMap.get(0));
|
||||
const colorItem = /** @type {ColorItem} */ (payload.itemsBySlotMap.get(1));
|
||||
|
||||
const colorizedDefinition = this.root.shapeDefinitionMgr.shapeActionPaintWith(
|
||||
shapeItem.definition,
|
||||
@ -483,9 +484,9 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
|
||||
* @param {ProcessorImplementationPayload} payload
|
||||
*/
|
||||
process_PAINTER_DOUBLE(payload) {
|
||||
const shapeItem1 = /** @type {ShapeItem} */ (payload.itemsBySlot[0]);
|
||||
const shapeItem2 = /** @type {ShapeItem} */ (payload.itemsBySlot[1]);
|
||||
const colorItem = /** @type {ColorItem} */ (payload.itemsBySlot[2]);
|
||||
const shapeItem1 = /** @type {ShapeItem} */ (payload.itemsBySlotMap.get(0));
|
||||
const shapeItem2 = /** @type {ShapeItem} */ (payload.itemsBySlotMap.get(1));
|
||||
const colorItem = /** @type {ColorItem} */ (payload.itemsBySlotMap.get(2));
|
||||
|
||||
assert(shapeItem1 instanceof ShapeItem, "Input for painter is not a shape");
|
||||
assert(shapeItem2 instanceof ShapeItem, "Input for painter is not a shape");
|
||||
@ -513,14 +514,14 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
|
||||
* @param {ProcessorImplementationPayload} payload
|
||||
*/
|
||||
process_PAINTER_QUAD(payload) {
|
||||
const shapeItem = /** @type {ShapeItem} */ (payload.itemsBySlot[0]);
|
||||
const shapeItem = /** @type {ShapeItem} */ (payload.itemsBySlotMap.get(0));
|
||||
assert(shapeItem instanceof ShapeItem, "Input for painter is not a shape");
|
||||
|
||||
/** @type {Array<enumColors>} */
|
||||
const colors = [null, null, null, null];
|
||||
for (let i = 0; i < 4; ++i) {
|
||||
if (payload.itemsBySlot[i + 1]) {
|
||||
colors[i] = /** @type {ColorItem} */ (payload.itemsBySlot[i + 1]).color;
|
||||
if (payload.itemsBySlotMap.get(i + 1)) {
|
||||
colors[i] = /** @type {ColorItem} */ (payload.itemsBySlotMap.get(i + 1)).color;
|
||||
}
|
||||
}
|
||||
|
||||
@ -539,7 +540,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
|
||||
*/
|
||||
process_READER(payload) {
|
||||
// Pass through the item
|
||||
const item = payload.itemsBySlot[0];
|
||||
const item = payload.itemsBySlotMap.get(0);
|
||||
payload.outItems.push({
|
||||
item,
|
||||
doNotTrack: true,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user