Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2026-03-02 03:39:21 +00:00
Code Issues Projects Releases Wiki Activity

Remove enumLayer and enumItemType

Browse Source
This commit is contained in:
Bjorn Stromberg
2020-08-16 01:39:08 +09:00
committed by tobspr
parent 75e729dac2
commit 6a447e3583
51 changed files with 166 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/game/components/item_acceptor.js
View File

@@ -1,12 +1,12 @@
import { enumDirection, enumInvertedDirections, Vector } from "../../core/vector";
import { types } from "../../savegame/serialization";
import { BaseItem, enumItemType } from "../base_item";
import { BaseItem } from "../base_item";
import { Component } from "../component";
/** @typedef {{
* pos: Vector,
* directions: enumDirection[],
* filter?: enumItemType
* filter?: ItemType
* }} ItemAcceptorSlot */
/**
@@ -20,7 +20,7 @@ import { Component } from "../component";
/** @typedef {{
* pos: Vector,
* directions: enumDirection[],
* filter?: enumItemType
* filter?: ItemType
* }} ItemAcceptorSlotConfig */
export class ItemAcceptorComponent extends Component {
@@ -74,7 +74,7 @@ export class ItemAcceptorComponent extends Component {
pos: slot.pos,
directions: slot.directions,
// Which type of item to accept (shape | color | all) @see enumItemType
// Which type of item to accept (shape | color | all) @see ItemType
filter: slot.filter,
});
}

6
src/js/game/components/storage.js
View File

@@ -1,5 +1,5 @@
import { types } from "../../savegame/serialization";
import { BaseItem, enumItemType } from "../base_item";
import { BaseItem } from "../base_item";
import { Component } from "../component";
import { typeItemSingleton } from "../item_resolver";
import { ColorItem } from "../items/color_item";
@@ -65,11 +65,11 @@ export class StorageComponent extends Component {
return false;
}
if (itemType === enumItemType.color) {
if (itemType === "color") {
return /** @type {ColorItem} */ (this.storedItem).color === /** @type {ColorItem} */ (item).color;
}
if (itemType === enumItemType.shape) {
if (itemType === "shape") {
return (
/** @type {ShapeItem} */ (this.storedItem).definition.getHash() ===
/** @type {ShapeItem} */ (item).definition.getHash()