From 223e0e2615e68f2c7cfc712c162e67ff12e0188b Mon Sep 17 00:00:00 2001 From: isaisstillalive Date: Fri, 3 Jul 2020 01:44:31 +0900 Subject: [PATCH] Implement tryTakeItem in UndergroundBelt --- src/js/game/buildings/underground_belt.js | 1 + src/js/game/components/underground_belt.js | 15 +++++++++++++++ src/js/game/systems/item_ejector.js | 16 ---------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/js/game/buildings/underground_belt.js b/src/js/game/buildings/underground_belt.js index 99004b99..5b8d4708 100644 --- a/src/js/game/buildings/underground_belt.js +++ b/src/js/game/buildings/underground_belt.js @@ -214,6 +214,7 @@ export class MetaUndergroundBeltBuilding extends MetaBuilding { { pos: new Vector(0, 0), directions: [enumDirection.bottom], + processor: "UndergroundBelt", }, ]); return; diff --git a/src/js/game/components/underground_belt.js b/src/js/game/components/underground_belt.js index e94b7cb1..fe04ebfa 100644 --- a/src/js/game/components/underground_belt.js +++ b/src/js/game/components/underground_belt.js @@ -70,6 +70,21 @@ export class UndergroundBeltComponent extends Component { this.cachedLinkedEntity = null; } + /** + * + * @param {BaseItem} item + * @param {number} slot + */ + tryTakeItem(item, slot) { + // Its an underground belt. yay. + if (this.tryAcceptExternalItem(item, 0)) { + return true; + } + + // Underground belt can have nothing else + return false; + } + /** * Tries to accept an item from an external source like a regular belt or building * @param {BaseItem} item diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index f9972434..a08bda35 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -295,22 +295,6 @@ export class ItemEjectorSystem extends GameSystemWithFilter { // Energy consumer can have more components } - const undergroundBeltComp = receiver.components.UndergroundBelt; - if (undergroundBeltComp) { - // Its an underground belt. yay. - if ( - undergroundBeltComp.tryAcceptExternalItem( - item, - this.root.hubGoals.getUndergroundBeltBaseSpeed() - ) - ) { - return true; - } - - // Underground belt can have nothing else - return false; - } - return false; }