Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00
Code Issues Projects Releases Wiki Activity

Make "get adjacent entry" a common method

Browse Source
This commit is contained in:
isaisstillalive 2020-06-30 01:12:52 +09:00
parent eaa46ec914
commit bfa9e98050
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/js/game/game_system_with_filter.js
View File

@ -8,6 +8,8 @@ import { GameSystem } from "./game_system";
import { arrayDelete, arrayDeleteValue } from "../core/utils";
import { DrawParameters } from "../core/draw_parameters";
import { globalConfig } from "../core/config";
import { enumDirection, enumDirectionToVector } from "../core/vector";
export class GameSystemWithFilter extends GameSystem {
/**
* Constructs a new game system with the given component filter. It will process
@ -211,4 +213,21 @@ export class GameSystemWithFilter extends GameSystem {
arrayDelete(this.allEntities, index);
}
}
/**
*
* @param {Entity} entity
* @param {enumDirection=} direction
* @returns {Entity|null}
*/
getAdjacentEntity(entity, direction = null) {
const ejectComp = entity.components.ItemEjector;
const staticComp = entity.components.StaticMapEntity;
const ejectingSlot = ejectComp.slots[0];
const ejectingPos = staticComp.localTileToWorld(ejectingSlot.pos);
const ejectingDirection = staticComp.localDirectionToWorld(direction || ejectingSlot.direction);
const targetTile = ejectingPos.add(enumDirectionToVector[ejectingDirection]);
return this.root.map.getTileContent(targetTile, enumLayer.regular);
}
}

8
src/js/game/systems/miner.js
View File

@ -66,16 +66,10 @@ export class MinerSystem extends GameSystemWithFilter {
tryPerformMinerEject(entity, item) {
const minerComp = entity.components.Miner;
const ejectComp = entity.components.ItemEjector;
const staticComp = entity.components.StaticMapEntity;
// Check if we are a chained miner
if (minerComp.chainable) {
const ejectingSlot = ejectComp.slots[0];
const ejectingPos = staticComp.localTileToWorld(ejectingSlot.pos);
const ejectingDirection = staticComp.localDirectionToWorld(ejectingSlot.direction);
const targetTile = ejectingPos.add(enumDirectionToVector[ejectingDirection]);
const targetContents = this.root.map.getTileContent(targetTile, enumLayer.regular);
const targetContents = this.getAdjacentEntity(entity);
// Check if we are connected to another miner and thus do not eject directly
if (targetContents) {