Merge remote-tracking branch 'origin/master' into better-building-variants
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 1.3 MiB |
@ -1471,6 +1471,6 @@
|
|||||||
"format": "RGBA8888",
|
"format": "RGBA8888",
|
||||||
"size": {"w":512,"h":1024},
|
"size": {"w":512,"h":1024},
|
||||||
"scale": "0.25",
|
"scale": "0.25",
|
||||||
"smartupdate": "$TexturePacker:SmartUpdate:d21082eda6f288e04b0739186004794d:0912211652d1c400e2846013f9de057b:908b89f5ca8ff73e331a35a3b14d0604$"
|
"smartupdate": "$TexturePacker:SmartUpdate:64d35c8d649d4bb41c7539e7e89c0865:2a9399f9a7c16dc686a4fb0941b02e6b:908b89f5ca8ff73e331a35a3b14d0604$"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Before Width: | Height: | Size: 280 KiB After Width: | Height: | Size: 281 KiB |
Before Width: | Height: | Size: 677 KiB After Width: | Height: | Size: 661 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 16 KiB |
@ -2,9 +2,8 @@ import { DrawParameters } from "./draw_parameters";
|
|||||||
import { Rectangle } from "./rectangle";
|
import { Rectangle } from "./rectangle";
|
||||||
import { round3Digits } from "./utils";
|
import { round3Digits } from "./utils";
|
||||||
|
|
||||||
const floorSpriteCoordinates = false;
|
|
||||||
|
|
||||||
export const ORIGINAL_SPRITE_SCALE = "0.75";
|
export const ORIGINAL_SPRITE_SCALE = "0.75";
|
||||||
|
export const FULL_CLIP_RECT = new Rectangle(0, 0, 1, 1);
|
||||||
|
|
||||||
export class BaseSprite {
|
export class BaseSprite {
|
||||||
/**
|
/**
|
||||||
@ -200,27 +199,6 @@ export class AtlasSprite extends BaseSprite {
|
|||||||
destH = intersection.h;
|
destH = intersection.h;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (floorSpriteCoordinates) {
|
|
||||||
parameters.context.drawImage(
|
|
||||||
link.atlas,
|
|
||||||
|
|
||||||
// atlas src pos
|
|
||||||
Math.floor(srcX),
|
|
||||||
Math.floor(srcY),
|
|
||||||
|
|
||||||
// atlas src size
|
|
||||||
Math.floor(srcW),
|
|
||||||
Math.floor(srcH),
|
|
||||||
|
|
||||||
// dest pos
|
|
||||||
Math.floor(destX),
|
|
||||||
Math.floor(destY),
|
|
||||||
|
|
||||||
// dest size
|
|
||||||
Math.floor(destW),
|
|
||||||
Math.floor(destH)
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
parameters.context.drawImage(
|
parameters.context.drawImage(
|
||||||
link.atlas,
|
link.atlas,
|
||||||
|
|
||||||
@ -239,6 +217,61 @@ export class AtlasSprite extends BaseSprite {
|
|||||||
destH
|
destH
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Draws a subset of the sprite. Does NO culling
|
||||||
|
* @param {DrawParameters} parameters
|
||||||
|
* @param {number} x
|
||||||
|
* @param {number} y
|
||||||
|
* @param {number} w
|
||||||
|
* @param {number} h
|
||||||
|
* @param {Rectangle=} clipRect The rectangle in local space (0 ... 1) to draw of the image
|
||||||
|
*/
|
||||||
|
drawCachedWithClipRect(parameters, x, y, w = null, h = null, clipRect = FULL_CLIP_RECT) {
|
||||||
|
if (G_IS_DEV) {
|
||||||
|
assert(parameters instanceof DrawParameters, "Not a valid context");
|
||||||
|
assert(!!w && w > 0, "Not a valid width:" + w);
|
||||||
|
assert(!!h && h > 0, "Not a valid height:" + h);
|
||||||
|
assert(clipRect, "No clip rect given!");
|
||||||
|
}
|
||||||
|
|
||||||
|
const scale = parameters.desiredAtlasScale;
|
||||||
|
const link = this.linksByResolution[scale];
|
||||||
|
|
||||||
|
if (!link) {
|
||||||
|
assert(false, `Link not known: ${scale} (having ${Object.keys(this.linksByResolution)})`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const scaleW = w / link.w;
|
||||||
|
const scaleH = h / link.h;
|
||||||
|
|
||||||
|
let destX = x + link.packOffsetX * scaleW + clipRect.x * w;
|
||||||
|
let destY = y + link.packOffsetY * scaleH + clipRect.y * h;
|
||||||
|
let destW = link.packedW * scaleW * clipRect.w;
|
||||||
|
let destH = link.packedH * scaleH * clipRect.h;
|
||||||
|
|
||||||
|
let srcX = link.packedX + clipRect.x * link.packedW;
|
||||||
|
let srcY = link.packedY + clipRect.y * link.packedH;
|
||||||
|
let srcW = link.packedW * clipRect.w;
|
||||||
|
let srcH = link.packedH * clipRect.h;
|
||||||
|
|
||||||
|
parameters.context.drawImage(
|
||||||
|
link.atlas,
|
||||||
|
|
||||||
|
// atlas src pos
|
||||||
|
srcX,
|
||||||
|
srcY,
|
||||||
|
|
||||||
|
// atlas src siize
|
||||||
|
srcW,
|
||||||
|
srcH,
|
||||||
|
|
||||||
|
// dest pos and size
|
||||||
|
destX,
|
||||||
|
destY,
|
||||||
|
destW,
|
||||||
|
destH
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
|
import { Component } from "../game/component";
|
||||||
|
import { Entity } from "../game/entity";
|
||||||
|
import { globalConfig } from "./config";
|
||||||
import { createLogger } from "./logging";
|
import { createLogger } from "./logging";
|
||||||
import { Rectangle } from "./rectangle";
|
import { Rectangle } from "./rectangle";
|
||||||
import { globalConfig } from "./config";
|
|
||||||
|
|
||||||
const logger = createLogger("stale_areas");
|
const logger = createLogger("stale_areas");
|
||||||
|
|
||||||
@ -34,6 +36,40 @@ export class StaleAreaDetector {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Makes this detector recompute the area of an entity whenever
|
||||||
|
* it changes in any way
|
||||||
|
* @param {Array<typeof Component>} components
|
||||||
|
* @param {number} tilesAround
|
||||||
|
*/
|
||||||
|
recomputeOnComponentsChanged(components, tilesAround = 1) {
|
||||||
|
const componentIds = components.map(component => component.getId());
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Internal checker method
|
||||||
|
* @param {Entity} entity
|
||||||
|
*/
|
||||||
|
const checker = entity => {
|
||||||
|
// Check for all components
|
||||||
|
for (let i = 0; i < componentIds.length; ++i) {
|
||||||
|
if (entity.components[componentIds[i]]) {
|
||||||
|
// Entity is relevant, compute affected area
|
||||||
|
const area = entity.components.StaticMapEntity.getTileSpaceBounds().expandedInAllDirections(
|
||||||
|
tilesAround
|
||||||
|
);
|
||||||
|
this.invalidate(area);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
this.root.signals.entityAdded.add(checker);
|
||||||
|
this.root.signals.entityChanged.add(checker);
|
||||||
|
this.root.signals.entityComponentRemoved.add(checker);
|
||||||
|
this.root.signals.entityGotNewComponent.add(checker);
|
||||||
|
this.root.signals.entityDestroyed.add(checker);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Updates the stale area
|
* Updates the stale area
|
||||||
*/
|
*/
|
||||||
|
@ -1,9 +1,24 @@
|
|||||||
import { Loader } from "../../core/loader";
|
import { Loader } from "../../core/loader";
|
||||||
import { enumDirection } from "../../core/vector";
|
import { formatItemsPerSecond, generateMatrixRotations } from "../../core/utils";
|
||||||
|
import { enumAngleToDirection, enumDirection, Vector } from "../../core/vector";
|
||||||
import { SOUNDS } from "../../platform/sound";
|
import { SOUNDS } from "../../platform/sound";
|
||||||
import { arrayBeltVariantToRotation, DefaultBeltBaseVariant, MetaBeltBaseBuilding } from "./belt_base";
|
import { T } from "../../translations";
|
||||||
|
import { BeltComponent } from "../components/belt";
|
||||||
|
import { Entity } from "../entity";
|
||||||
|
import { MetaBuilding, MetaBuildingVariant, defaultBuildingVariant } from "../meta_building";
|
||||||
|
import { GameRoot } from "../root";
|
||||||
|
|
||||||
export class MetaBeltBuilding extends MetaBeltBaseBuilding {
|
export const arrayBeltVariantToRotation = [enumDirection.top, enumDirection.left, enumDirection.right];
|
||||||
|
|
||||||
|
export const beltOverlayMatrices = {
|
||||||
|
[enumDirection.top]: generateMatrixRotations([0, 1, 0, 0, 1, 0, 0, 1, 0]),
|
||||||
|
[enumDirection.left]: generateMatrixRotations([0, 0, 0, 1, 1, 0, 0, 1, 0]),
|
||||||
|
[enumDirection.right]: generateMatrixRotations([0, 0, 0, 0, 1, 1, 0, 1, 0]),
|
||||||
|
};
|
||||||
|
|
||||||
|
export class MetaBeltBaseBuilding extends MetaBuilding {}
|
||||||
|
|
||||||
|
export class MetaBeltBuilding extends MetaBuilding {
|
||||||
constructor() {
|
constructor() {
|
||||||
super("belt");
|
super("belt");
|
||||||
}
|
}
|
||||||
@ -16,12 +31,53 @@ export class MetaBeltBuilding extends MetaBeltBaseBuilding {
|
|||||||
return SOUNDS.placeBelt;
|
return SOUNDS.placeBelt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getHasDirectionLockAvailable() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
getStayInPlacementMode() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
getIsReplaceable() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
getAvailableVariants() {
|
getAvailableVariants() {
|
||||||
return [DefaultBeltVariant];
|
return [DefaultBeltVariant];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates the entity at the given location
|
||||||
|
* @param {Entity} entity
|
||||||
|
*/
|
||||||
|
setupEntityComponents(entity) {
|
||||||
|
entity.addComponent(
|
||||||
|
new BeltComponent({
|
||||||
|
direction: enumDirection.top, // updated later
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class DefaultBeltVariant extends DefaultBeltBaseVariant {
|
export class DefaultBeltVariant extends MetaBuildingVariant {
|
||||||
|
static getId() {
|
||||||
|
return defaultBuildingVariant;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {GameRoot} root
|
||||||
|
* @returns {Array<[string, string]>}
|
||||||
|
*/
|
||||||
|
static getAdditionalStatistics(root) {
|
||||||
|
const beltSpeed = root.hubGoals.getBeltBaseSpeed();
|
||||||
|
return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(beltSpeed)]];
|
||||||
|
}
|
||||||
|
|
||||||
|
static getRotateAutomaticallyWhilePlacing() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
static getPreviewSprite(rotationVariant) {
|
static getPreviewSprite(rotationVariant) {
|
||||||
switch (arrayBeltVariantToRotation[rotationVariant]) {
|
switch (arrayBeltVariantToRotation[rotationVariant]) {
|
||||||
case enumDirection.top: {
|
case enumDirection.top: {
|
||||||
@ -39,6 +95,10 @@ export class DefaultBeltVariant extends DefaultBeltBaseVariant {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static getSprite() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
static getBlueprintSprite(rotationVariant) {
|
static getBlueprintSprite(rotationVariant) {
|
||||||
switch (arrayBeltVariantToRotation[rotationVariant]) {
|
switch (arrayBeltVariantToRotation[rotationVariant]) {
|
||||||
case enumDirection.top: {
|
case enumDirection.top: {
|
||||||
@ -55,4 +115,124 @@ export class DefaultBeltVariant extends DefaultBeltBaseVariant {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param {number} rotation
|
||||||
|
* @param {number} rotationVariant
|
||||||
|
* @param {Entity} entity
|
||||||
|
*/
|
||||||
|
static getSpecialOverlayRenderMatrix(rotation, rotationVariant, entity) {
|
||||||
|
return beltOverlayMatrices[entity.components.Belt.direction][rotation];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param {Entity} entity
|
||||||
|
* @param {number} rotationVariant
|
||||||
|
*/
|
||||||
|
static updateEntityComponents(entity, rotationVariant) {
|
||||||
|
entity.components.Belt.direction = arrayBeltVariantToRotation[rotationVariant];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Should compute the optimal rotation variant on the given tile
|
||||||
|
* @param {object} param0
|
||||||
|
* @param {GameRoot} param0.root
|
||||||
|
* @param {Vector} param0.tile
|
||||||
|
* @param {number} param0.rotation
|
||||||
|
* @param {Layer} param0.layer
|
||||||
|
* @return {{ rotation: number, rotationVariant: number, connectedEntities?: Array<Entity> }}
|
||||||
|
*/
|
||||||
|
static computeOptimalDirectionAndRotationVariantAtTile({ root, tile, rotation, layer }) {
|
||||||
|
const topDirection = enumAngleToDirection[rotation];
|
||||||
|
const rightDirection = enumAngleToDirection[(rotation + 90) % 360];
|
||||||
|
const bottomDirection = enumAngleToDirection[(rotation + 180) % 360];
|
||||||
|
const leftDirection = enumAngleToDirection[(rotation + 270) % 360];
|
||||||
|
|
||||||
|
const { ejectors, acceptors } = root.logic.getEjectorsAndAcceptorsAtTile(tile);
|
||||||
|
|
||||||
|
let hasBottomEjector = false;
|
||||||
|
let hasRightEjector = false;
|
||||||
|
let hasLeftEjector = false;
|
||||||
|
|
||||||
|
let hasTopAcceptor = false;
|
||||||
|
let hasLeftAcceptor = false;
|
||||||
|
let hasRightAcceptor = false;
|
||||||
|
|
||||||
|
// Check all ejectors
|
||||||
|
for (let i = 0; i < ejectors.length; ++i) {
|
||||||
|
const ejector = ejectors[i];
|
||||||
|
|
||||||
|
if (ejector.toDirection === topDirection) {
|
||||||
|
hasBottomEjector = true;
|
||||||
|
} else if (ejector.toDirection === leftDirection) {
|
||||||
|
hasRightEjector = true;
|
||||||
|
} else if (ejector.toDirection === rightDirection) {
|
||||||
|
hasLeftEjector = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check all acceptors
|
||||||
|
for (let i = 0; i < acceptors.length; ++i) {
|
||||||
|
const acceptor = acceptors[i];
|
||||||
|
if (acceptor.fromDirection === bottomDirection) {
|
||||||
|
hasTopAcceptor = true;
|
||||||
|
} else if (acceptor.fromDirection === rightDirection) {
|
||||||
|
hasLeftAcceptor = true;
|
||||||
|
} else if (acceptor.fromDirection === leftDirection) {
|
||||||
|
hasRightAcceptor = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Soo .. if there is any ejector below us we always prioritize
|
||||||
|
// this ejector
|
||||||
|
if (!hasBottomEjector) {
|
||||||
|
// When something ejects to us from the left and nothing from the right,
|
||||||
|
// do a curve from the left to the top
|
||||||
|
|
||||||
|
if (hasRightEjector && !hasLeftEjector) {
|
||||||
|
return {
|
||||||
|
rotation: (rotation + 270) % 360,
|
||||||
|
rotationVariant: 2,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// When something ejects to us from the right and nothing from the left,
|
||||||
|
// do a curve from the right to the top
|
||||||
|
if (hasLeftEjector && !hasRightEjector) {
|
||||||
|
return {
|
||||||
|
rotation: (rotation + 90) % 360,
|
||||||
|
rotationVariant: 1,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// When there is a top acceptor, ignore sides
|
||||||
|
// NOTICE: This makes the belt prefer side turns *way* too much!
|
||||||
|
if (!hasTopAcceptor) {
|
||||||
|
// When there is an acceptor to the right but no acceptor to the left,
|
||||||
|
// do a turn to the right
|
||||||
|
if (hasRightAcceptor && !hasLeftAcceptor) {
|
||||||
|
return {
|
||||||
|
rotation,
|
||||||
|
rotationVariant: 2,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// When there is an acceptor to the left but no acceptor to the right,
|
||||||
|
// do a turn to the left
|
||||||
|
if (hasLeftAcceptor && !hasRightAcceptor) {
|
||||||
|
return {
|
||||||
|
rotation,
|
||||||
|
rotationVariant: 1,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
rotation,
|
||||||
|
rotationVariant: 0,
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,189 +0,0 @@
|
|||||||
import { formatItemsPerSecond, generateMatrixRotations } from "../../core/utils";
|
|
||||||
import { enumAngleToDirection, enumDirection, Vector } from "../../core/vector";
|
|
||||||
import { SOUNDS } from "../../platform/sound";
|
|
||||||
import { T } from "../../translations";
|
|
||||||
import { BeltComponent } from "../components/belt";
|
|
||||||
import { Entity } from "../entity";
|
|
||||||
import { defaultBuildingVariant, MetaBuilding, MetaBuildingVariant } from "../meta_building";
|
|
||||||
import { GameRoot } from "../root";
|
|
||||||
|
|
||||||
export const arrayBeltVariantToRotation = [enumDirection.top, enumDirection.left, enumDirection.right];
|
|
||||||
|
|
||||||
export const beltOverlayMatrices = {
|
|
||||||
[enumDirection.top]: generateMatrixRotations([0, 1, 0, 0, 1, 0, 0, 1, 0]),
|
|
||||||
[enumDirection.left]: generateMatrixRotations([0, 0, 0, 1, 1, 0, 0, 1, 0]),
|
|
||||||
[enumDirection.right]: generateMatrixRotations([0, 0, 0, 0, 1, 1, 0, 1, 0]),
|
|
||||||
};
|
|
||||||
|
|
||||||
export class MetaBeltBaseBuilding extends MetaBuilding {
|
|
||||||
getHasDirectionLockAvailable() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
getStayInPlacementMode() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
getPlacementSound() {
|
|
||||||
return SOUNDS.placeBelt;
|
|
||||||
}
|
|
||||||
|
|
||||||
getIsReplaceable() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates the entity at the given location
|
|
||||||
* @param {Entity} entity
|
|
||||||
*/
|
|
||||||
setupEntityComponents(entity) {
|
|
||||||
entity.addComponent(
|
|
||||||
new BeltComponent({
|
|
||||||
direction: enumDirection.top, // updated later
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class DefaultBeltBaseVariant extends MetaBuildingVariant {
|
|
||||||
static getId() {
|
|
||||||
return defaultBuildingVariant;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {GameRoot} root
|
|
||||||
* @returns {Array<[string, string]>}
|
|
||||||
*/
|
|
||||||
static getAdditionalStatistics(root) {
|
|
||||||
const beltSpeed = root.hubGoals.getBeltBaseSpeed();
|
|
||||||
return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(beltSpeed)]];
|
|
||||||
}
|
|
||||||
|
|
||||||
static getRotateAutomaticallyWhilePlacing() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static getSprite() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param {number} rotation
|
|
||||||
* @param {number} rotationVariant
|
|
||||||
* @param {Entity} entity
|
|
||||||
*/
|
|
||||||
static getSpecialOverlayRenderMatrix(rotation, rotationVariant, entity) {
|
|
||||||
return beltOverlayMatrices[entity.components.Belt.direction][rotation];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param {Entity} entity
|
|
||||||
* @param {number} rotationVariant
|
|
||||||
*/
|
|
||||||
static updateEntityComponents(entity, rotationVariant) {
|
|
||||||
entity.components.Belt.direction = arrayBeltVariantToRotation[rotationVariant];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Should compute the optimal rotation variant on the given tile
|
|
||||||
* @param {object} param0
|
|
||||||
* @param {GameRoot} param0.root
|
|
||||||
* @param {Vector} param0.tile
|
|
||||||
* @param {number} param0.rotation
|
|
||||||
* @param {Layer} param0.layer
|
|
||||||
* @return {{ rotation: number, rotationVariant: number, connectedEntities?: Array<Entity> }}
|
|
||||||
*/
|
|
||||||
static computeOptimalDirectionAndRotationVariantAtTile({ root, tile, rotation, layer }) {
|
|
||||||
const topDirection = enumAngleToDirection[rotation];
|
|
||||||
const rightDirection = enumAngleToDirection[(rotation + 90) % 360];
|
|
||||||
const bottomDirection = enumAngleToDirection[(rotation + 180) % 360];
|
|
||||||
const leftDirection = enumAngleToDirection[(rotation + 270) % 360];
|
|
||||||
|
|
||||||
const { ejectors, acceptors } = root.logic.getEjectorsAndAcceptorsAtTile(tile);
|
|
||||||
|
|
||||||
let hasBottomEjector = false;
|
|
||||||
let hasRightEjector = false;
|
|
||||||
let hasLeftEjector = false;
|
|
||||||
|
|
||||||
let hasTopAcceptor = false;
|
|
||||||
let hasLeftAcceptor = false;
|
|
||||||
let hasRightAcceptor = false;
|
|
||||||
|
|
||||||
// Check all ejectors
|
|
||||||
for (let i = 0; i < ejectors.length; ++i) {
|
|
||||||
const ejector = ejectors[i];
|
|
||||||
|
|
||||||
if (ejector.toDirection === topDirection) {
|
|
||||||
hasBottomEjector = true;
|
|
||||||
} else if (ejector.toDirection === leftDirection) {
|
|
||||||
hasRightEjector = true;
|
|
||||||
} else if (ejector.toDirection === rightDirection) {
|
|
||||||
hasLeftEjector = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check all acceptors
|
|
||||||
for (let i = 0; i < acceptors.length; ++i) {
|
|
||||||
const acceptor = acceptors[i];
|
|
||||||
if (acceptor.fromDirection === bottomDirection) {
|
|
||||||
hasTopAcceptor = true;
|
|
||||||
} else if (acceptor.fromDirection === rightDirection) {
|
|
||||||
hasLeftAcceptor = true;
|
|
||||||
} else if (acceptor.fromDirection === leftDirection) {
|
|
||||||
hasRightAcceptor = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Soo .. if there is any ejector below us we always prioritize
|
|
||||||
// this ejector
|
|
||||||
if (!hasBottomEjector) {
|
|
||||||
// When something ejects to us from the left and nothing from the right,
|
|
||||||
// do a curve from the left to the top
|
|
||||||
|
|
||||||
if (hasRightEjector && !hasLeftEjector) {
|
|
||||||
return {
|
|
||||||
rotation: (rotation + 270) % 360,
|
|
||||||
rotationVariant: 2,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// When something ejects to us from the right and nothing from the left,
|
|
||||||
// do a curve from the right to the top
|
|
||||||
if (hasLeftEjector && !hasRightEjector) {
|
|
||||||
return {
|
|
||||||
rotation: (rotation + 90) % 360,
|
|
||||||
rotationVariant: 1,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// When there is a top acceptor, ignore sides
|
|
||||||
// NOTICE: This makes the belt prefer side turns *way* too much!
|
|
||||||
if (!hasTopAcceptor) {
|
|
||||||
// When there is an acceptor to the right but no acceptor to the left,
|
|
||||||
// do a turn to the right
|
|
||||||
if (hasRightAcceptor && !hasLeftAcceptor) {
|
|
||||||
return {
|
|
||||||
rotation,
|
|
||||||
rotationVariant: 2,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// When there is an acceptor to the left but no acceptor to the right,
|
|
||||||
// do a turn to the left
|
|
||||||
if (hasLeftAcceptor && !hasRightAcceptor) {
|
|
||||||
return {
|
|
||||||
rotation,
|
|
||||||
rotationVariant: 1,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
rotation,
|
|
||||||
rotationVariant: 0,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
@ -72,6 +72,7 @@ export class MetaSplitterBuilding extends MetaBuilding {
|
|||||||
entity.addComponent(
|
entity.addComponent(
|
||||||
new ItemEjectorComponent({
|
new ItemEjectorComponent({
|
||||||
slots: [], // set later
|
slots: [], // set later
|
||||||
|
renderFloatingItems: false,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -1,6 +1,29 @@
|
|||||||
import { Component } from "../component";
|
|
||||||
import { types } from "../../savegame/serialization";
|
|
||||||
import { enumDirection, Vector } from "../../core/vector";
|
import { enumDirection, Vector } from "../../core/vector";
|
||||||
|
import { Component } from "../component";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Store which type an underlay is, this is cached so we can easily
|
||||||
|
* render it.
|
||||||
|
*
|
||||||
|
* Full: Render underlay at top and bottom of tile
|
||||||
|
* Bottom Only: Only render underlay at the bottom half
|
||||||
|
* Top Only:
|
||||||
|
* @enum {string}
|
||||||
|
*/
|
||||||
|
export const enumClippedBeltUnderlayType = {
|
||||||
|
full: "full",
|
||||||
|
bottomOnly: "bottomOnly",
|
||||||
|
topOnly: "topOnly",
|
||||||
|
none: "none",
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @typedef {{
|
||||||
|
* pos: Vector,
|
||||||
|
* direction: enumDirection,
|
||||||
|
* cachedType?: enumClippedBeltUnderlayType
|
||||||
|
* }} BeltUnderlayTile
|
||||||
|
*/
|
||||||
|
|
||||||
export class BeltUnderlaysComponent extends Component {
|
export class BeltUnderlaysComponent extends Component {
|
||||||
static getId() {
|
static getId() {
|
||||||
@ -24,9 +47,9 @@ export class BeltUnderlaysComponent extends Component {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {object} param0
|
* @param {object} param0
|
||||||
* @param {Array<{pos: Vector, direction: enumDirection}>=} param0.underlays Where to render belt underlays
|
* @param {Array<BeltUnderlayTile>=} param0.underlays Where to render belt underlays
|
||||||
*/
|
*/
|
||||||
constructor({ underlays }) {
|
constructor({ underlays = [] }) {
|
||||||
super();
|
super();
|
||||||
this.underlays = underlays;
|
this.underlays = underlays;
|
||||||
}
|
}
|
||||||
|
@ -47,6 +47,7 @@ export class ItemEjectorComponent extends Component {
|
|||||||
|
|
||||||
return new ItemEjectorComponent({
|
return new ItemEjectorComponent({
|
||||||
slots: slotsCopy,
|
slots: slotsCopy,
|
||||||
|
renderFloatingItems: this.renderFloatingItems,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -54,16 +55,13 @@ export class ItemEjectorComponent extends Component {
|
|||||||
*
|
*
|
||||||
* @param {object} param0
|
* @param {object} param0
|
||||||
* @param {Array<{pos: Vector, direction: enumDirection }>=} param0.slots The slots to eject on
|
* @param {Array<{pos: Vector, direction: enumDirection }>=} param0.slots The slots to eject on
|
||||||
|
* @param {boolean=} param0.renderFloatingItems Whether to render items even if they are not connected
|
||||||
*/
|
*/
|
||||||
constructor({ slots = [] }) {
|
constructor({ slots = [], renderFloatingItems = true }) {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
this.setSlots(slots);
|
this.setSlots(slots);
|
||||||
|
this.renderFloatingItems = renderFloatingItems;
|
||||||
/**
|
|
||||||
* Whether this ejector slot is enabled
|
|
||||||
*/
|
|
||||||
this.enabled = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,21 +1,21 @@
|
|||||||
import { MetaBeltBaseBuilding } from "../../buildings/belt_base";
|
import { MetaBeltBuilding } from "../../buildings/belt";
|
||||||
import { MetaCutterBuilding } from "../../buildings/cutter";
|
import { MetaCutterBuilding } from "../../buildings/cutter";
|
||||||
|
import { MetaDisplayBuilding } from "../../buildings/display";
|
||||||
|
import { MetaFilterBuilding } from "../../buildings/filter";
|
||||||
|
import { MetaLeverBuilding } from "../../buildings/lever";
|
||||||
import { MetaMinerBuilding } from "../../buildings/miner";
|
import { MetaMinerBuilding } from "../../buildings/miner";
|
||||||
import { MetaMixerBuilding } from "../../buildings/mixer";
|
import { MetaMixerBuilding } from "../../buildings/mixer";
|
||||||
import { MetaPainterBuilding } from "../../buildings/painter";
|
import { MetaPainterBuilding } from "../../buildings/painter";
|
||||||
|
import { MetaReaderBuilding } from "../../buildings/reader";
|
||||||
import { MetaRotaterBuilding } from "../../buildings/rotater";
|
import { MetaRotaterBuilding } from "../../buildings/rotater";
|
||||||
import { MetaSplitterBuilding } from "../../buildings/splitter";
|
import { MetaSplitterBuilding } from "../../buildings/splitter";
|
||||||
import { MetaStackerBuilding } from "../../buildings/stacker";
|
import { MetaStackerBuilding } from "../../buildings/stacker";
|
||||||
import { MetaTrashBuilding } from "../../buildings/trash";
|
import { MetaTrashBuilding } from "../../buildings/trash";
|
||||||
import { MetaUndergroundBeltBuilding } from "../../buildings/underground_belt";
|
import { MetaUndergroundBeltBuilding } from "../../buildings/underground_belt";
|
||||||
import { HUDBaseToolbar } from "./base_toolbar";
|
import { HUDBaseToolbar } from "./base_toolbar";
|
||||||
import { MetaLeverBuilding } from "../../buildings/lever";
|
|
||||||
import { MetaFilterBuilding } from "../../buildings/filter";
|
|
||||||
import { MetaDisplayBuilding } from "../../buildings/display";
|
|
||||||
import { MetaReaderBuilding } from "../../buildings/reader";
|
|
||||||
|
|
||||||
const supportedBuildings = [
|
const supportedBuildings = [
|
||||||
MetaBeltBaseBuilding,
|
MetaBeltBuilding,
|
||||||
MetaSplitterBuilding,
|
MetaSplitterBuilding,
|
||||||
MetaUndergroundBeltBuilding,
|
MetaUndergroundBeltBuilding,
|
||||||
MetaMinerBuilding,
|
MetaMinerBuilding,
|
||||||
|
@ -67,7 +67,7 @@ export class HUDMinerHighlight extends BaseHUDPart {
|
|||||||
|
|
||||||
const maxThroughput = this.root.hubGoals.getBeltBaseSpeed();
|
const maxThroughput = this.root.hubGoals.getBeltBaseSpeed();
|
||||||
|
|
||||||
const screenPos = this.root.camera.screenToWorld(mousePos);
|
const tooltipLocation = this.root.camera.screenToWorld(mousePos);
|
||||||
|
|
||||||
const scale = (1 / this.root.camera.zoomLevel) * this.root.app.getEffectiveUiScale();
|
const scale = (1 / this.root.camera.zoomLevel) * this.root.app.getEffectiveUiScale();
|
||||||
|
|
||||||
@ -76,8 +76,8 @@ export class HUDMinerHighlight extends BaseHUDPart {
|
|||||||
// Background
|
// Background
|
||||||
parameters.context.fillStyle = THEME.map.connectedMiners.background;
|
parameters.context.fillStyle = THEME.map.connectedMiners.background;
|
||||||
parameters.context.beginRoundedRect(
|
parameters.context.beginRoundedRect(
|
||||||
screenPos.x + 5 * scale,
|
tooltipLocation.x + 5 * scale,
|
||||||
screenPos.y - 3 * scale,
|
tooltipLocation.y - 3 * scale,
|
||||||
(isCapped ? 100 : 65) * scale,
|
(isCapped ? 100 : 65) * scale,
|
||||||
(isCapped ? 45 : 30) * scale,
|
(isCapped ? 45 : 30) * scale,
|
||||||
2
|
2
|
||||||
@ -89,8 +89,8 @@ export class HUDMinerHighlight extends BaseHUDPart {
|
|||||||
parameters.context.font = "bold " + scale * 10 + "px GameFont";
|
parameters.context.font = "bold " + scale * 10 + "px GameFont";
|
||||||
parameters.context.fillText(
|
parameters.context.fillText(
|
||||||
formatItemsPerSecond(throughput),
|
formatItemsPerSecond(throughput),
|
||||||
screenPos.x + 10 * scale,
|
tooltipLocation.x + 10 * scale,
|
||||||
screenPos.y + 10 * scale
|
tooltipLocation.y + 10 * scale
|
||||||
);
|
);
|
||||||
|
|
||||||
// Amount of miners
|
// Amount of miners
|
||||||
@ -100,8 +100,8 @@ export class HUDMinerHighlight extends BaseHUDPart {
|
|||||||
connectedEntities.length === 1
|
connectedEntities.length === 1
|
||||||
? T.ingame.connectedMiners.one_miner
|
? T.ingame.connectedMiners.one_miner
|
||||||
: T.ingame.connectedMiners.n_miners.replace("<amount>", String(connectedEntities.length)),
|
: T.ingame.connectedMiners.n_miners.replace("<amount>", String(connectedEntities.length)),
|
||||||
screenPos.x + 10 * scale,
|
tooltipLocation.x + 10 * scale,
|
||||||
screenPos.y + 22 * scale
|
tooltipLocation.y + 22 * scale
|
||||||
);
|
);
|
||||||
|
|
||||||
parameters.context.globalAlpha = 1;
|
parameters.context.globalAlpha = 1;
|
||||||
@ -113,8 +113,8 @@ export class HUDMinerHighlight extends BaseHUDPart {
|
|||||||
"<max_throughput>",
|
"<max_throughput>",
|
||||||
formatItemsPerSecond(maxThroughput)
|
formatItemsPerSecond(maxThroughput)
|
||||||
),
|
),
|
||||||
screenPos.x + 10 * scale,
|
tooltipLocation.x + 10 * scale,
|
||||||
screenPos.y + 34 * scale
|
tooltipLocation.y + 34 * scale
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,9 +5,6 @@ import { lerp } from "../../core/utils";
|
|||||||
|
|
||||||
/* dev:start */
|
/* dev:start */
|
||||||
import trailerPoints from "./trailer_points";
|
import trailerPoints from "./trailer_points";
|
||||||
import { gMetaBuildingRegistry } from "../../core/global_registries";
|
|
||||||
import { MetaBeltBaseBuilding } from "../buildings/belt_base";
|
|
||||||
import { MinerComponent } from "../components/miner";
|
|
||||||
|
|
||||||
const tickrate = 1 / 165;
|
const tickrate = 1 / 165;
|
||||||
|
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
import { gMetaBuildingRegistry } from "../core/global_registries";
|
import { gMetaBuildingRegistry } from "../core/global_registries";
|
||||||
import { createLogger } from "../core/logging";
|
import { createLogger } from "../core/logging";
|
||||||
import { DefaultBeltVariant, MetaBeltBuilding } from "./buildings/belt";
|
import { DefaultBeltVariant, MetaBeltBuilding } from "./buildings/belt";
|
||||||
import { DefaultBeltBaseVariant, MetaBeltBaseBuilding } from "./buildings/belt_base";
|
|
||||||
import {
|
import {
|
||||||
DefaultCutterVariant,
|
DefaultCutterVariant,
|
||||||
enumCutterVariants,
|
enumCutterVariants,
|
||||||
@ -111,9 +110,9 @@ export function initMetaBuildingRegistry() {
|
|||||||
gMetaBuildingRegistry.register(MetaReaderBuilding);
|
gMetaBuildingRegistry.register(MetaReaderBuilding);
|
||||||
|
|
||||||
// Belt
|
// Belt
|
||||||
registerBuildingVariant(1, MetaBeltBaseBuilding, DefaultBeltVariant, 0);
|
registerBuildingVariant(1, MetaBeltBuilding, DefaultBeltVariant, 0);
|
||||||
registerBuildingVariant(2, MetaBeltBaseBuilding, DefaultBeltVariant, 1);
|
registerBuildingVariant(2, MetaBeltBuilding, DefaultBeltVariant, 1);
|
||||||
registerBuildingVariant(3, MetaBeltBaseBuilding, DefaultBeltVariant, 2);
|
registerBuildingVariant(3, MetaBeltBuilding, DefaultBeltVariant, 2);
|
||||||
|
|
||||||
// Splitter
|
// Splitter
|
||||||
registerBuildingVariant(4, MetaSplitterBuilding, DefaultSplitterVariant);
|
registerBuildingVariant(4, MetaSplitterBuilding, DefaultSplitterVariant);
|
||||||
|
@ -7,13 +7,13 @@ import { AtlasSprite } from "../../core/sprites";
|
|||||||
import { fastArrayDeleteValue } from "../../core/utils";
|
import { fastArrayDeleteValue } from "../../core/utils";
|
||||||
import { enumDirection, enumDirectionToVector, enumInvertedDirections, Vector } from "../../core/vector";
|
import { enumDirection, enumDirectionToVector, enumInvertedDirections, Vector } from "../../core/vector";
|
||||||
import { BeltPath } from "../belt_path";
|
import { BeltPath } from "../belt_path";
|
||||||
import { arrayBeltVariantToRotation, MetaBeltBaseBuilding } from "../buildings/belt_base";
|
|
||||||
import { BeltComponent } from "../components/belt";
|
import { BeltComponent } from "../components/belt";
|
||||||
import { Entity } from "../entity";
|
import { Entity } from "../entity";
|
||||||
import { GameSystemWithFilter } from "../game_system_with_filter";
|
import { GameSystemWithFilter } from "../game_system_with_filter";
|
||||||
import { MapChunkView } from "../map_chunk_view";
|
import { MapChunkView } from "../map_chunk_view";
|
||||||
import { defaultBuildingVariant } from "../meta_building";
|
import { defaultBuildingVariant } from "../meta_building";
|
||||||
import { getCodeFromBuildingData } from "../building_codes";
|
import { getCodeFromBuildingData } from "../building_codes";
|
||||||
|
import { arrayBeltVariantToRotation, MetaBeltBuilding } from "../buildings/belt";
|
||||||
|
|
||||||
export const BELT_ANIM_COUNT = 14;
|
export const BELT_ANIM_COUNT = 14;
|
||||||
|
|
||||||
@ -123,7 +123,7 @@ export class BeltSystem extends GameSystemWithFilter {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const metaBelt = gMetaBuildingRegistry.findByClass(MetaBeltBaseBuilding);
|
const metaBelt = gMetaBuildingRegistry.findByClass(MetaBeltBuilding);
|
||||||
// Compute affected area
|
// Compute affected area
|
||||||
const originalRect = staticComp.getTileSpaceBounds();
|
const originalRect = staticComp.getTileSpaceBounds();
|
||||||
const affectedArea = originalRect.expandedInAllDirections(1);
|
const affectedArea = originalRect.expandedInAllDirections(1);
|
||||||
|
@ -1,12 +1,35 @@
|
|||||||
import { globalConfig } from "../../core/config";
|
import { globalConfig } from "../../core/config";
|
||||||
import { drawRotatedSprite } from "../../core/draw_utils";
|
|
||||||
import { Loader } from "../../core/loader";
|
|
||||||
import { enumDirectionToAngle } from "../../core/vector";
|
|
||||||
import { BeltUnderlaysComponent } from "../components/belt_underlays";
|
|
||||||
import { GameSystemWithFilter } from "../game_system_with_filter";
|
|
||||||
import { BELT_ANIM_COUNT } from "./belt";
|
|
||||||
import { MapChunkView } from "../map_chunk_view";
|
|
||||||
import { DrawParameters } from "../../core/draw_parameters";
|
import { DrawParameters } from "../../core/draw_parameters";
|
||||||
|
import { Loader } from "../../core/loader";
|
||||||
|
import { Rectangle } from "../../core/rectangle";
|
||||||
|
import { FULL_CLIP_RECT } from "../../core/sprites";
|
||||||
|
import { StaleAreaDetector } from "../../core/stale_area_detector";
|
||||||
|
import {
|
||||||
|
enumDirection,
|
||||||
|
enumDirectionToAngle,
|
||||||
|
enumDirectionToVector,
|
||||||
|
enumInvertedDirections,
|
||||||
|
Vector,
|
||||||
|
} from "../../core/vector";
|
||||||
|
import { BeltComponent } from "../components/belt";
|
||||||
|
import { BeltUnderlaysComponent, enumClippedBeltUnderlayType } from "../components/belt_underlays";
|
||||||
|
import { ItemAcceptorComponent } from "../components/item_acceptor";
|
||||||
|
import { ItemEjectorComponent } from "../components/item_ejector";
|
||||||
|
import { Entity } from "../entity";
|
||||||
|
import { GameSystemWithFilter } from "../game_system_with_filter";
|
||||||
|
import { MapChunkView } from "../map_chunk_view";
|
||||||
|
import { BELT_ANIM_COUNT } from "./belt";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mapping from underlay type to clip rect
|
||||||
|
* @type {Object<enumClippedBeltUnderlayType, Rectangle>}
|
||||||
|
*/
|
||||||
|
const enumUnderlayTypeToClipRect = {
|
||||||
|
[enumClippedBeltUnderlayType.none]: null,
|
||||||
|
[enumClippedBeltUnderlayType.full]: FULL_CLIP_RECT,
|
||||||
|
[enumClippedBeltUnderlayType.topOnly]: new Rectangle(0, 0, 1, 0.5),
|
||||||
|
[enumClippedBeltUnderlayType.bottomOnly]: new Rectangle(0, 0.5, 1, 0.5),
|
||||||
|
};
|
||||||
|
|
||||||
export class BeltUnderlaysSystem extends GameSystemWithFilter {
|
export class BeltUnderlaysSystem extends GameSystemWithFilter {
|
||||||
constructor(root) {
|
constructor(root) {
|
||||||
@ -17,6 +40,180 @@ export class BeltUnderlaysSystem extends GameSystemWithFilter {
|
|||||||
for (let i = 0; i < BELT_ANIM_COUNT; ++i) {
|
for (let i = 0; i < BELT_ANIM_COUNT; ++i) {
|
||||||
this.underlayBeltSprites.push(Loader.getSprite("sprites/belt/built/forward_" + i + ".png"));
|
this.underlayBeltSprites.push(Loader.getSprite("sprites/belt/built/forward_" + i + ".png"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Automatically recompute areas
|
||||||
|
this.staleArea = new StaleAreaDetector({
|
||||||
|
root,
|
||||||
|
name: "belt-underlay",
|
||||||
|
recomputeMethod: this.recomputeStaleArea.bind(this),
|
||||||
|
});
|
||||||
|
|
||||||
|
this.staleArea.recomputeOnComponentsChanged(
|
||||||
|
[BeltUnderlaysComponent, BeltComponent, ItemAcceptorComponent, ItemEjectorComponent],
|
||||||
|
1
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
update() {
|
||||||
|
this.staleArea.update();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when an area changed - Resets all caches in the given area
|
||||||
|
* @param {Rectangle} area
|
||||||
|
*/
|
||||||
|
recomputeStaleArea(area) {
|
||||||
|
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;
|
||||||
|
const entity = this.root.map.getLayerContentXY(tileX, tileY, "regular");
|
||||||
|
if (entity) {
|
||||||
|
const underlayComp = entity.components.BeltUnderlays;
|
||||||
|
if (underlayComp) {
|
||||||
|
for (let i = 0; i < underlayComp.underlays.length; ++i) {
|
||||||
|
underlayComp.underlays[i].cachedType = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if a given tile is connected and has an acceptor
|
||||||
|
* @param {Vector} tile
|
||||||
|
* @param {enumDirection} fromDirection
|
||||||
|
* @returns {boolean}
|
||||||
|
*/
|
||||||
|
checkIsAcceptorConnected(tile, fromDirection) {
|
||||||
|
const contents = this.root.map.getLayerContentXY(tile.x, tile.y, "regular");
|
||||||
|
if (!contents) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const staticComp = contents.components.StaticMapEntity;
|
||||||
|
|
||||||
|
// Check if its a belt, since then its simple
|
||||||
|
const beltComp = contents.components.Belt;
|
||||||
|
if (beltComp) {
|
||||||
|
return staticComp.localDirectionToWorld(enumDirection.bottom) === fromDirection;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if there's an item acceptor
|
||||||
|
const acceptorComp = contents.components.ItemAcceptor;
|
||||||
|
if (acceptorComp) {
|
||||||
|
// Check each slot to see if its connected
|
||||||
|
for (let i = 0; i < acceptorComp.slots.length; ++i) {
|
||||||
|
const slot = acceptorComp.slots[i];
|
||||||
|
const slotTile = staticComp.localTileToWorld(slot.pos);
|
||||||
|
|
||||||
|
// Step 1: Check if the tile matches
|
||||||
|
if (!slotTile.equals(tile)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Step 2: Check if any of the directions matches
|
||||||
|
for (let j = 0; j < slot.directions.length; ++j) {
|
||||||
|
const slotDirection = staticComp.localDirectionToWorld(slot.directions[j]);
|
||||||
|
if (slotDirection === fromDirection) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if a given tile is connected and has an ejector
|
||||||
|
* @param {Vector} tile
|
||||||
|
* @param {enumDirection} toDirection
|
||||||
|
* @returns {boolean}
|
||||||
|
*/
|
||||||
|
checkIsEjectorConnected(tile, toDirection) {
|
||||||
|
const contents = this.root.map.getLayerContentXY(tile.x, tile.y, "regular");
|
||||||
|
if (!contents) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const staticComp = contents.components.StaticMapEntity;
|
||||||
|
|
||||||
|
// Check if its a belt, since then its simple
|
||||||
|
const beltComp = contents.components.Belt;
|
||||||
|
if (beltComp) {
|
||||||
|
return staticComp.localDirectionToWorld(beltComp.direction) === toDirection;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for an ejector
|
||||||
|
const ejectorComp = contents.components.ItemEjector;
|
||||||
|
if (ejectorComp) {
|
||||||
|
// Check each slot to see if its connected
|
||||||
|
for (let i = 0; i < ejectorComp.slots.length; ++i) {
|
||||||
|
const slot = ejectorComp.slots[i];
|
||||||
|
const slotTile = staticComp.localTileToWorld(slot.pos);
|
||||||
|
|
||||||
|
// Step 1: Check if the tile matches
|
||||||
|
if (!slotTile.equals(tile)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Step 2: Check if the direction matches
|
||||||
|
const slotDirection = staticComp.localDirectionToWorld(slot.direction);
|
||||||
|
if (slotDirection === toDirection) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Computes the flag for a given tile
|
||||||
|
* @param {Entity} entity
|
||||||
|
* @param {import("../components/belt_underlays").BeltUnderlayTile} underlayTile
|
||||||
|
* @returns {enumClippedBeltUnderlayType} The type of the underlay
|
||||||
|
*/
|
||||||
|
computeBeltUnderlayType(entity, underlayTile) {
|
||||||
|
if (underlayTile.cachedType) {
|
||||||
|
return underlayTile.cachedType;
|
||||||
|
}
|
||||||
|
|
||||||
|
const staticComp = entity.components.StaticMapEntity;
|
||||||
|
|
||||||
|
const transformedPos = staticComp.localTileToWorld(underlayTile.pos);
|
||||||
|
const destX = transformedPos.x * globalConfig.tileSize;
|
||||||
|
const destY = transformedPos.y * globalConfig.tileSize;
|
||||||
|
|
||||||
|
// Extract direction and angle
|
||||||
|
const worldDirection = staticComp.localDirectionToWorld(underlayTile.direction);
|
||||||
|
const worldDirectionVector = enumDirectionToVector[worldDirection];
|
||||||
|
|
||||||
|
// Figure out if there is anything connected at the top
|
||||||
|
const connectedTop = this.checkIsAcceptorConnected(
|
||||||
|
transformedPos.add(worldDirectionVector),
|
||||||
|
enumInvertedDirections[worldDirection]
|
||||||
|
);
|
||||||
|
|
||||||
|
// Figure out if there is anything connected at the bottom
|
||||||
|
const connectedBottom = this.checkIsEjectorConnected(
|
||||||
|
transformedPos.sub(worldDirectionVector),
|
||||||
|
worldDirection
|
||||||
|
);
|
||||||
|
|
||||||
|
let flag = enumClippedBeltUnderlayType.none;
|
||||||
|
|
||||||
|
if (connectedTop && connectedBottom) {
|
||||||
|
flag = enumClippedBeltUnderlayType.full;
|
||||||
|
} else if (connectedTop) {
|
||||||
|
flag = enumClippedBeltUnderlayType.topOnly;
|
||||||
|
} else if (connectedBottom) {
|
||||||
|
flag = enumClippedBeltUnderlayType.bottomOnly;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (underlayTile.cachedType = flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -39,18 +236,18 @@ export class BeltUnderlaysSystem extends GameSystemWithFilter {
|
|||||||
const staticComp = entity.components.StaticMapEntity;
|
const staticComp = entity.components.StaticMapEntity;
|
||||||
const underlays = underlayComp.underlays;
|
const underlays = underlayComp.underlays;
|
||||||
for (let i = 0; i < underlays.length; ++i) {
|
for (let i = 0; i < underlays.length; ++i) {
|
||||||
|
// Extract underlay parameters
|
||||||
const { pos, direction } = underlays[i];
|
const { pos, direction } = underlays[i];
|
||||||
const transformedPos = staticComp.localTileToWorld(pos);
|
const transformedPos = staticComp.localTileToWorld(pos);
|
||||||
|
const destX = transformedPos.x * globalConfig.tileSize;
|
||||||
|
const destY = transformedPos.y * globalConfig.tileSize;
|
||||||
|
|
||||||
// Culling
|
// Culling, Part 1: Check if the chunk contains the tile
|
||||||
if (!chunk.tileSpaceRectangle.containsPoint(transformedPos.x, transformedPos.y)) {
|
if (!chunk.tileSpaceRectangle.containsPoint(transformedPos.x, transformedPos.y)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
const destX = transformedPos.x * globalConfig.tileSize;
|
// Culling, Part 2: Check if the overlay is visible
|
||||||
const destY = transformedPos.y * globalConfig.tileSize;
|
|
||||||
|
|
||||||
// Culling, #2
|
|
||||||
if (
|
if (
|
||||||
!parameters.visibleRect.containsRect4Params(
|
!parameters.visibleRect.containsRect4Params(
|
||||||
destX,
|
destX,
|
||||||
@ -62,22 +259,41 @@ export class BeltUnderlaysSystem extends GameSystemWithFilter {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
const angle = enumDirectionToAngle[staticComp.localDirectionToWorld(direction)];
|
// Extract direction and angle
|
||||||
|
const worldDirection = staticComp.localDirectionToWorld(direction);
|
||||||
|
const angle = enumDirectionToAngle[worldDirection];
|
||||||
|
|
||||||
|
const underlayType = this.computeBeltUnderlayType(entity, underlays[i]);
|
||||||
|
const clipRect = enumUnderlayTypeToClipRect[underlayType];
|
||||||
|
if (!clipRect) {
|
||||||
|
// Empty
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Actually draw the sprite
|
||||||
|
const x = destX + globalConfig.halfTileSize;
|
||||||
|
const y = destY + globalConfig.halfTileSize;
|
||||||
|
const angleRadians = Math.radians(angle);
|
||||||
|
|
||||||
// SYNC with systems/belt.js:drawSingleEntity!
|
// SYNC with systems/belt.js:drawSingleEntity!
|
||||||
const animationIndex = Math.floor(
|
const animationIndex = Math.floor(
|
||||||
((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) *
|
((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) *
|
||||||
globalConfig.itemSpacingOnBelts
|
globalConfig.itemSpacingOnBelts
|
||||||
);
|
);
|
||||||
|
parameters.context.translate(x, y);
|
||||||
drawRotatedSprite({
|
parameters.context.rotate(angleRadians);
|
||||||
|
this.underlayBeltSprites[
|
||||||
|
animationIndex % this.underlayBeltSprites.length
|
||||||
|
].drawCachedWithClipRect(
|
||||||
parameters,
|
parameters,
|
||||||
sprite: this.underlayBeltSprites[animationIndex % this.underlayBeltSprites.length],
|
-globalConfig.halfTileSize,
|
||||||
x: destX + globalConfig.halfTileSize,
|
-globalConfig.halfTileSize,
|
||||||
y: destY + globalConfig.halfTileSize,
|
globalConfig.tileSize,
|
||||||
angle: Math.radians(angle),
|
globalConfig.tileSize,
|
||||||
size: globalConfig.tileSize,
|
clipRect
|
||||||
});
|
);
|
||||||
|
parameters.context.rotate(-angleRadians);
|
||||||
|
parameters.context.translate(-x, -y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -198,9 +198,6 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
|
|||||||
for (let i = 0; i < this.allEntities.length; ++i) {
|
for (let i = 0; i < this.allEntities.length; ++i) {
|
||||||
const sourceEntity = this.allEntities[i];
|
const sourceEntity = this.allEntities[i];
|
||||||
const sourceEjectorComp = sourceEntity.components.ItemEjector;
|
const sourceEjectorComp = sourceEntity.components.ItemEjector;
|
||||||
if (!sourceEjectorComp.enabled) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const slots = sourceEjectorComp.slots;
|
const slots = sourceEjectorComp.slots;
|
||||||
for (let j = 0; j < slots.length; ++j) {
|
for (let j = 0; j < slots.length; ++j) {
|
||||||
@ -211,8 +208,6 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
const targetEntity = sourceSlot.cachedTargetEntity;
|
|
||||||
|
|
||||||
// Advance items on the slot
|
// Advance items on the slot
|
||||||
sourceSlot.progress = Math.min(
|
sourceSlot.progress = Math.min(
|
||||||
1,
|
1,
|
||||||
@ -245,15 +240,16 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check if the target acceptor can actually accept this item
|
// Check if the target acceptor can actually accept this item
|
||||||
|
const destEntity = sourceSlot.cachedTargetEntity;
|
||||||
const destSlot = sourceSlot.cachedDestSlot;
|
const destSlot = sourceSlot.cachedDestSlot;
|
||||||
if (destSlot) {
|
if (destSlot) {
|
||||||
const targetAcceptorComp = targetEntity.components.ItemAcceptor;
|
const targetAcceptorComp = destEntity.components.ItemAcceptor;
|
||||||
if (!targetAcceptorComp.canAcceptItem(destSlot.index, item)) {
|
if (!targetAcceptorComp.canAcceptItem(destSlot.index, item)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try to hand over the item
|
// Try to hand over the item
|
||||||
if (this.tryPassOverItem(item, targetEntity, destSlot.index)) {
|
if (this.tryPassOverItem(item, destEntity, destSlot.index)) {
|
||||||
// Handover successful, clear slot
|
// Handover successful, clear slot
|
||||||
targetAcceptorComp.onItemAccepted(destSlot.index, destSlot.acceptedDirection, item);
|
targetAcceptorComp.onItemAccepted(destSlot.index, destSlot.acceptedDirection, item);
|
||||||
sourceSlot.item = null;
|
sourceSlot.item = null;
|
||||||
@ -357,6 +353,11 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!ejectorComp.renderFloatingItems && !slot.cachedTargetEntity) {
|
||||||
|
// Not connected to any building
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
const realPosition = staticComp.localTileToWorld(slot.pos);
|
const realPosition = staticComp.localTileToWorld(slot.pos);
|
||||||
if (!chunk.tileSpaceRectangle.containsPoint(realPosition.x, realPosition.y)) {
|
if (!chunk.tileSpaceRectangle.containsPoint(realPosition.x, realPosition.y)) {
|
||||||
// Not within this chunk
|
// Not within this chunk
|
||||||
|
@ -133,7 +133,7 @@ export class MainMenuState extends GameState {
|
|||||||
!this.app.platformWrapper.getHasUnlimitedSavegames()
|
!this.app.platformWrapper.getHasUnlimitedSavegames()
|
||||||
) {
|
) {
|
||||||
this.app.analytics.trackUiClick("importgame_slot_limit_show");
|
this.app.analytics.trackUiClick("importgame_slot_limit_show");
|
||||||
this.dialogs.showWarning(T.dialogs.oneSavegameLimit.title, T.dialogs.oneSavegameLimit.desc);
|
this.showSavegameSlotLimit();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -522,6 +522,21 @@ export class MainMenuState extends GameState {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shows a hint that the slot limit has been reached
|
||||||
|
*/
|
||||||
|
showSavegameSlotLimit() {
|
||||||
|
const { getStandalone } = this.dialogs.showWarning(
|
||||||
|
T.dialogs.oneSavegameLimit.title,
|
||||||
|
T.dialogs.oneSavegameLimit.desc,
|
||||||
|
["cancel:bad", "getStandalone:good"]
|
||||||
|
);
|
||||||
|
getStandalone.add(() => {
|
||||||
|
this.app.analytics.trackUiClick("visit_steampage_from_slot_limit");
|
||||||
|
this.app.platformWrapper.openExternalLink(THIRDPARTY_URLS.standaloneStorePage);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
onSettingsButtonClicked() {
|
onSettingsButtonClicked() {
|
||||||
this.moveToState("SettingsState");
|
this.moveToState("SettingsState");
|
||||||
}
|
}
|
||||||
@ -540,7 +555,7 @@ export class MainMenuState extends GameState {
|
|||||||
!this.app.platformWrapper.getHasUnlimitedSavegames()
|
!this.app.platformWrapper.getHasUnlimitedSavegames()
|
||||||
) {
|
) {
|
||||||
this.app.analytics.trackUiClick("startgame_slot_limit_show");
|
this.app.analytics.trackUiClick("startgame_slot_limit_show");
|
||||||
this.dialogs.showWarning(T.dialogs.oneSavegameLimit.title, T.dialogs.oneSavegameLimit.desc);
|
this.showSavegameSlotLimit();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|