mirror of
https://github.com/thepaperpilot/Advent-Incremental.git
synced 2024-11-28 02:51:46 +00:00
Arbitrary infinite factory size
This commit is contained in:
ducdat0507
parent
6b9a53685b
commit
4f496765a9
2 changed files with 243 additions and 242 deletions
|
|
@ -10,7 +10,7 @@ import cursor from "./factory-components/cursor.jpg";
|
|||
import square from "./factory-components/square.jpg";
|
||||
import { computed, ComputedRef, reactive, Ref, ref, watchEffect } from "vue";
|
||||
import { Direction } from "util/common";
|
||||
import { persistent } from "game/persistence";
|
||||
import { Persistent, persistent, State } from "game/persistence";
|
||||
import player from "game/player";
|
||||
import "./styles/factory.css";
|
||||
import { globalBus } from "game/events";
|
||||
|
|
@ -25,8 +25,8 @@ const day = 20;
|
|||
// TODO: unhardcode stuff
|
||||
|
||||
enum FactoryDirections {
|
||||
Any,
|
||||
None
|
||||
Any = "ANY",
|
||||
None = "NONE"
|
||||
}
|
||||
type FactoryDirection = FactoryDirections | Direction;
|
||||
|
||||
|
|
@ -76,8 +76,8 @@ function getDirection(dir: Direction) {
|
|||
}
|
||||
|
||||
const factorySize = {
|
||||
width: 50,
|
||||
height: 50
|
||||
width: 6,
|
||||
height: 6
|
||||
};
|
||||
const blockSize = 50;
|
||||
|
||||
|
|
@ -128,7 +128,7 @@ const factory = createLayer(id, () => {
|
|||
|
||||
type FactoryCompNames = keyof typeof FACTORY_COMPONENTS;
|
||||
type BuildableCompName = Exclude<FactoryCompNames, "cursor">;
|
||||
interface FactoryComponentProducers {
|
||||
interface FactoryComponentProducers extends Record<string, State> {
|
||||
type: Exclude<BuildableCompName, "conveyor">;
|
||||
consumptionStock: Record<string, number>;
|
||||
|
||||
|
|
@ -136,7 +136,7 @@ const factory = createLayer(id, () => {
|
|||
productionStock: Record<string, number>;
|
||||
ticksDone: number;
|
||||
}
|
||||
interface FactoryComponentConveyor {
|
||||
interface FactoryComponentConveyor extends Record<string, State> {
|
||||
type: "conveyor";
|
||||
directionOut: Direction;
|
||||
}
|
||||
|
|
@ -147,18 +147,18 @@ const factory = createLayer(id, () => {
|
|||
name: string;
|
||||
description: string;
|
||||
|
||||
// amount it consumes
|
||||
/** amount it consumes */
|
||||
consumption: Record<string, number>;
|
||||
// maximum stock of consumption
|
||||
/** maximum stock of consumption */
|
||||
consumptionStock: Record<string, number>;
|
||||
// amount it produces
|
||||
/** amount it produces */
|
||||
production: Record<string, number>;
|
||||
// maximum stock of production
|
||||
/** maximum stock of production */
|
||||
productionStock: Record<string, number>;
|
||||
|
||||
// on produce, do something
|
||||
/** on produce, do something */
|
||||
onProduce?: (times: number) => void;
|
||||
// can it produce? (in addtion to the stock check)
|
||||
/** can it produce? (in addtion to the stock check) */
|
||||
canProduce?: ComputedRef<boolean>;
|
||||
}
|
||||
|
||||
|
|
@ -202,14 +202,8 @@ const factory = createLayer(id, () => {
|
|||
const isMouseHoverShown = ref(false);
|
||||
const whatIsHovered = ref<FactoryCompNames | "">("");
|
||||
const compSelected = ref<FactoryCompNames>("cursor");
|
||||
const components: Ref<(FactoryComponent | null)[][]> = persistent(
|
||||
Array(factorySize.width)
|
||||
.fill(undefined)
|
||||
.map(() => Array(factorySize.height).fill(null))
|
||||
);
|
||||
const compInternalData: (FactoryInternal | null)[][] = Array(factorySize.width)
|
||||
.fill(undefined)
|
||||
.map(() => Array(factorySize.height).fill(null));
|
||||
const components: Persistent<{ [key: string]: FactoryComponent }> = persistent({});
|
||||
const compInternalData: Record<string, FactoryInternal> = {};
|
||||
|
||||
// pixi
|
||||
const app = new Application({
|
||||
|
|
@ -219,31 +213,54 @@ const factory = createLayer(id, () => {
|
|||
let spriteContainer = new Container();
|
||||
const movingBlocks = new Container();
|
||||
|
||||
graphicContainer.zIndex = 1;
|
||||
movingBlocks.zIndex = 2;
|
||||
spriteContainer.zIndex = 0;
|
||||
movingBlocks.zIndex = 1;
|
||||
graphicContainer.zIndex = 2;
|
||||
app.stage.addChild(graphicContainer, spriteContainer, movingBlocks);
|
||||
app.stage.sortableChildren = true;
|
||||
let loaded = false;
|
||||
|
||||
globalBus.on("onLoad", async () => {
|
||||
loaded = false;
|
||||
|
||||
spriteContainer.destroy({
|
||||
children: true
|
||||
});
|
||||
spriteContainer = new Container();
|
||||
app.stage.addChild(spriteContainer);
|
||||
for (const y of components.value.keys()) {
|
||||
for (const x of components.value[y].keys()) {
|
||||
const data = components.value[y][x];
|
||||
if (data === null) continue;
|
||||
await addFactoryComp(x, y, data.type);
|
||||
|
||||
const floorGraphics = new Graphics();
|
||||
floorGraphics.beginFill(0x70645d);
|
||||
floorGraphics.drawRect(
|
||||
-factorySize.width * blockSize,
|
||||
-factorySize.height * blockSize,
|
||||
factorySize.width * 2 * blockSize,
|
||||
factorySize.height * 2 * blockSize
|
||||
);
|
||||
floorGraphics.endFill();
|
||||
spriteContainer.addChild(floorGraphics);
|
||||
|
||||
// load every sprite here so pixi doesn't complain about loading multiple times
|
||||
await Assets.load(Object.values(FACTORY_COMPONENTS).map(x => x.imageSrc));
|
||||
|
||||
if (Array.isArray(components.value)) components.value = {};
|
||||
else
|
||||
for (const id in components.value) {
|
||||
const data = components.value[id];
|
||||
console.log(id, data);
|
||||
if (data?.type === undefined) {
|
||||
delete components.value[id];
|
||||
continue;
|
||||
}
|
||||
const [x, y] = id.split("x").map(p => +p);
|
||||
addFactoryComp(x, y, data.type);
|
||||
}
|
||||
|
||||
loaded = true;
|
||||
});
|
||||
window.internal = compInternalData;
|
||||
window.comp = components;
|
||||
window.blocks = movingBlocks;
|
||||
(window as any).internal = compInternalData;
|
||||
(window as any).comp = components;
|
||||
(window as any).blocks = movingBlocks;
|
||||
let taskIsRunning = false;
|
||||
|
||||
globalBus.on("update", async diff => {
|
||||
|
|
@ -253,12 +270,12 @@ const factory = createLayer(id, () => {
|
|||
// will change soon:tm:
|
||||
const tick = diff;
|
||||
// make them produce
|
||||
for (const y of components.value.keys()) {
|
||||
for (const x of components.value[y].keys()) {
|
||||
const data = components.value[y][x];
|
||||
const compData = compInternalData[y][x];
|
||||
for (const id in components.value) {
|
||||
const [x, y] = id.split("x").map(p => +p);
|
||||
const data = components.value[id];
|
||||
const compData = compInternalData[id];
|
||||
//console.log(compData, data)
|
||||
if (data === null || compData === null) continue;
|
||||
if (data === undefined || compData === undefined) continue;
|
||||
const factoryData = FACTORY_COMPONENTS[data.type];
|
||||
//debugger;
|
||||
if (data.type === "conveyor") {
|
||||
|
|
@ -273,18 +290,15 @@ const factory = createLayer(id, () => {
|
|||
const dirAmt = directionToNum(data.directionOut);
|
||||
if (dirType === "h") {
|
||||
if (block.x <= block.lastX + dirAmt) {
|
||||
// hit border
|
||||
if (
|
||||
(dirAmt === -1 && x === 0) ||
|
||||
(dirAmt === 1 && x === components.value[y].length - 1)
|
||||
)
|
||||
continue;
|
||||
const compBehind = compInternalData[y][x + dirAmt];
|
||||
const storedComp = components.value[y][x + dirAmt];
|
||||
const compBehind = compInternalData[x + dirAmt + "x" + y];
|
||||
const storedComp = components.value[x + dirAmt + "x" + y];
|
||||
|
||||
// empty spot
|
||||
if (compBehind === null) continue;
|
||||
if (compBehind.type === "conveyor") {
|
||||
if (compBehind === undefined) {
|
||||
// just delete it
|
||||
movingBlocks.removeChild(block.sprite);
|
||||
compData.packages.splice(key, 1);
|
||||
} else if (compBehind.type === "conveyor") {
|
||||
// push it to the next conveyor, kill it from the
|
||||
// curent conveyor
|
||||
block.lastX += dirAmt;
|
||||
|
|
@ -307,18 +321,15 @@ const factory = createLayer(id, () => {
|
|||
}
|
||||
} else {
|
||||
if (block.y <= block.lastY + dirAmt) {
|
||||
// hit border
|
||||
if (
|
||||
(dirAmt === -1 && y === 0) ||
|
||||
(dirAmt === 1 && y === components.value.length - 1)
|
||||
)
|
||||
continue;
|
||||
const compBehind = compInternalData[y + dirAmt][x];
|
||||
const storedComp = components.value[y + dirAmt][x];
|
||||
const compBehind = compInternalData[x + "x" + (y + dirAmt)];
|
||||
const storedComp = components.value[x + "x" + (y + dirAmt)];
|
||||
|
||||
// empty spot
|
||||
if (compBehind === null) continue;
|
||||
if (compBehind.type === "conveyor") {
|
||||
if (compBehind === undefined) {
|
||||
// just delete it
|
||||
movingBlocks.removeChild(block.sprite);
|
||||
compData.packages.splice(key, 1);
|
||||
} else if (compBehind.type === "conveyor") {
|
||||
// push it to the next conveyor, kill it from the
|
||||
// curent conveyor
|
||||
block.lastY += dirAmt;
|
||||
|
|
@ -333,8 +344,7 @@ const factory = createLayer(id, () => {
|
|||
compData.packages.splice(key, 1);
|
||||
}
|
||||
} else {
|
||||
const change =
|
||||
dirAmt * Math.min(Math.abs(block.y - block.lastY), tick);
|
||||
const change = dirAmt * Math.min(Math.abs(block.y - block.lastY), tick);
|
||||
block.y += change;
|
||||
block.sprite.y += change * blockSize;
|
||||
}
|
||||
|
|
@ -364,30 +374,26 @@ const factory = createLayer(id, () => {
|
|||
let xInc = 0;
|
||||
//debugger;
|
||||
if (
|
||||
y < components.value.length - 1 &&
|
||||
components.value[y + 1][x]?.type === "conveyor" &&
|
||||
(compInternalData[y + 1][x] as FactoryInternalProducer).startingFrom ===
|
||||
"up"
|
||||
components.value[x + "x" + (y + 1)]?.type === "conveyor" &&
|
||||
(compInternalData[x + "x" + (y + 1)] as FactoryInternalProducer)
|
||||
.startingFrom === "up"
|
||||
) {
|
||||
yInc = 1;
|
||||
} else if (
|
||||
y > 0 &&
|
||||
components.value[y - 1][x]?.type === "conveyor" &&
|
||||
(compInternalData[y - 1][x] as FactoryInternalProducer).startingFrom ===
|
||||
"down"
|
||||
components.value[x + "x" + (y - 1)]?.type === "conveyor" &&
|
||||
(compInternalData[x + "x" + (y - 1)] as FactoryInternalProducer)
|
||||
.startingFrom === "down"
|
||||
) {
|
||||
yInc = -1;
|
||||
} else if (
|
||||
x < components.value[y].length - 1 &&
|
||||
components.value[y][x + 1]?.type === "conveyor" &&
|
||||
(compInternalData[y][x + 1] as FactoryInternalProducer).startingFrom ===
|
||||
components.value[x + 1 + "x" + y]?.type === "conveyor" &&
|
||||
(compInternalData[x + 1 + "x" + y] as FactoryInternalProducer).startingFrom ===
|
||||
"right"
|
||||
) {
|
||||
xInc = 1;
|
||||
} else if (
|
||||
x > 0 &&
|
||||
components.value[y][x - 1]?.type === "conveyor" &&
|
||||
(compInternalData[y][x - 1] as FactoryInternalProducer).startingFrom ===
|
||||
components.value[x - 1 + "x" + y]?.type === "conveyor" &&
|
||||
(compInternalData[x - 1 + "x" + y] as FactoryInternalProducer).startingFrom ===
|
||||
"left"
|
||||
) {
|
||||
xInc = -1;
|
||||
|
|
@ -406,7 +412,7 @@ const factory = createLayer(id, () => {
|
|||
}
|
||||
// there is nothing to move
|
||||
if (itemToMove === undefined) continue;
|
||||
const texture = await Assets.load(RESOURCES[itemToMove[0]]);
|
||||
const texture = Assets.get(RESOURCES[itemToMove[0]]);
|
||||
const sprite = new Sprite(texture);
|
||||
|
||||
/*
|
||||
|
|
@ -440,25 +446,27 @@ const factory = createLayer(id, () => {
|
|||
};
|
||||
|
||||
(
|
||||
compInternalData[y + yInc][x + xInc] as FactoryInternalConveyor
|
||||
compInternalData[x + xInc + "x" + (y + yInc)] as FactoryInternalConveyor
|
||||
).nextPackages.push(block);
|
||||
movingBlocks.addChild(sprite);
|
||||
}
|
||||
}
|
||||
}
|
||||
taskIsRunning = false;
|
||||
});
|
||||
|
||||
async function addFactoryComp(x: number, y: number, type: BuildableCompName) {
|
||||
function addFactoryComp(x: number, y: number, type: BuildableCompName) {
|
||||
if (x < -factorySize.width || x >= factorySize.width) return;
|
||||
if (y < -factorySize.height || y >= factorySize.height) return;
|
||||
|
||||
const factoryBaseData = FACTORY_COMPONENTS[type];
|
||||
const sheet = await Assets.load(factoryBaseData.imageSrc);
|
||||
const sheet = Assets.get(factoryBaseData.imageSrc);
|
||||
const sprite = new Sprite(sheet);
|
||||
|
||||
sprite.x = x * blockSize;
|
||||
sprite.y = y * blockSize;
|
||||
sprite.width = blockSize;
|
||||
sprite.height = blockSize;
|
||||
components.value[y][x] = {
|
||||
components.value[x + "x" + y] = {
|
||||
type,
|
||||
ticksDone: 0,
|
||||
directionIn: type === "conveyor" ? Direction.Right : undefined,
|
||||
|
|
@ -477,7 +485,7 @@ const factory = createLayer(id, () => {
|
|||
)
|
||||
} as FactoryComponent;
|
||||
const isConveyor = type === "conveyor";
|
||||
compInternalData[y][x] = {
|
||||
compInternalData[x + "x" + y] = {
|
||||
type,
|
||||
packages: isConveyor ? [] : undefined,
|
||||
nextPackages: isConveyor ? [] : undefined,
|
||||
|
|
@ -486,7 +494,7 @@ const factory = createLayer(id, () => {
|
|||
if (type === "conveyor") return true;
|
||||
if (!(factoryBaseData.canProduce?.value ?? true)) return false;
|
||||
// this should NEVER be null
|
||||
const compData = components.value[y][x] as FactoryComponentProducers;
|
||||
const compData = components.value[x + "x" + y] as FactoryComponentProducers;
|
||||
for (const [key, res] of Object.entries(compData.productionStock)) {
|
||||
// if the current stock + production is more than you can handle
|
||||
if (
|
||||
|
|
@ -510,14 +518,12 @@ const factory = createLayer(id, () => {
|
|||
function updateGraphics() {
|
||||
app.resize();
|
||||
graphicContainer.clear();
|
||||
// I honestly have no clue how this works
|
||||
const calculatedX = mapOffset.x * blockSize;
|
||||
const calculatedY = mapOffset.y * blockSize;
|
||||
// make (0, 0) the center of the screen
|
||||
const calculatedX = mapOffset.x * blockSize + app.view.width / 2;
|
||||
const calculatedY = mapOffset.y * blockSize + app.view.height / 2;
|
||||
|
||||
movingBlocks.x = calculatedX;
|
||||
movingBlocks.y = calculatedY;
|
||||
spriteContainer.x = calculatedX;
|
||||
spriteContainer.y = calculatedY;
|
||||
spriteContainer.x = movingBlocks.x = calculatedX;
|
||||
spriteContainer.y = movingBlocks.y = calculatedY;
|
||||
|
||||
if (isMouseHoverShown.value && compSelected.value !== "cursor") {
|
||||
const { tx, ty } = spriteContainer.localTransform;
|
||||
|
|
@ -534,7 +540,7 @@ const factory = createLayer(id, () => {
|
|||
|
||||
const pointerDown = ref(false),
|
||||
pointerDrag = ref(false),
|
||||
compHovered = ref<FactoryComponent | null>(null);
|
||||
compHovered = ref<FactoryComponent | undefined>(undefined);
|
||||
|
||||
function onFactoryPointerMove(e: PointerEvent) {
|
||||
const { x, y } = getRelativeCoords(e);
|
||||
|
|
@ -551,28 +557,24 @@ const factory = createLayer(id, () => {
|
|||
mapOffset.y += e.movementY / blockSize;
|
||||
// the maximum you can see currently
|
||||
// total size of blocks - current size = amount you should move
|
||||
mapOffset.x = Math.min(
|
||||
Math.max(mapOffset.x, 0),
|
||||
blockSize * factorySize.width - app.screen.width
|
||||
);
|
||||
mapOffset.y = Math.min(
|
||||
Math.max(mapOffset.y, 0),
|
||||
blockSize * factorySize.height - app.screen.height
|
||||
);
|
||||
mapOffset.x = Math.min(Math.max(mapOffset.x, -factorySize.width), factorySize.width);
|
||||
mapOffset.y = Math.min(Math.max(mapOffset.y, -factorySize.height), factorySize.height);
|
||||
}
|
||||
if (!pointerDown.value && !pointerDrag.value && compSelected.value === "cursor") {
|
||||
const { tx, ty } = spriteContainer.localTransform;
|
||||
compHovered.value =
|
||||
components.value[roundDownTo(y - ty, blockSize) / blockSize][
|
||||
roundDownTo(x - tx, blockSize) / blockSize
|
||||
components.value[
|
||||
Math.round(roundDownTo(x - tx, blockSize) / blockSize) +
|
||||
"x" +
|
||||
Math.round(roundDownTo(y - ty, blockSize) / blockSize)
|
||||
];
|
||||
}
|
||||
}
|
||||
async function onFactoryPointerDown() {
|
||||
function onFactoryPointerDown() {
|
||||
window.addEventListener("pointerup", onFactoryPointerUp);
|
||||
pointerDown.value = true;
|
||||
}
|
||||
async function onFactoryPointerUp(e: PointerEvent) {
|
||||
function onFactoryPointerUp(e: PointerEvent) {
|
||||
// make sure they're not dragging and that
|
||||
// they aren't trying to put down a cursor
|
||||
if (!pointerDrag.value) {
|
||||
|
|
@ -582,13 +584,13 @@ const factory = createLayer(id, () => {
|
|||
y = roundDownTo(y - ty, blockSize) / blockSize;
|
||||
if (e.button === 0) {
|
||||
if (compSelected.value !== "cursor") {
|
||||
await addFactoryComp(x, y, compSelected.value);
|
||||
if (!components.value[x + "x" + y]) addFactoryComp(x, y, compSelected.value);
|
||||
}
|
||||
} else if (e.button === 2) {
|
||||
const data = compInternalData[y][x];
|
||||
if (data === null) return;
|
||||
components.value[y][x] = null;
|
||||
compInternalData[y][x] = null;
|
||||
const data = compInternalData[x + "x" + y];
|
||||
if (data === undefined) return;
|
||||
delete components.value[x + "x" + y];
|
||||
delete compInternalData[x + "x" + y];
|
||||
spriteContainer.removeChild(data.sprite);
|
||||
}
|
||||
}
|
||||
|
|
@ -607,7 +609,6 @@ const factory = createLayer(id, () => {
|
|||
player.tabs.splice(0, Infinity, "main");
|
||||
}
|
||||
function onComponentHover(name: FactoryCompNames | "") {
|
||||
if (compSelected.value !== "cursor") return;
|
||||
whatIsHovered.value = name;
|
||||
}
|
||||
function onCompClick(name: FactoryCompNames) {
|
||||
|
|
@ -635,7 +636,7 @@ const factory = createLayer(id, () => {
|
|||
onContextmenu={(e: MouseEvent) => e.preventDefault()}
|
||||
/>
|
||||
<div class="info-container">
|
||||
{compHovered.value !== null ? (
|
||||
{compHovered.value !== undefined ? (
|
||||
<>
|
||||
<b>{FACTORY_COMPONENTS[compHovered.value.type].name}</b>
|
||||
<br />
|
||||
|
|
@ -649,9 +650,9 @@ const factory = createLayer(id, () => {
|
|||
...compHovered.value.consumptionStock
|
||||
}).map(i => {
|
||||
return `${i[0]}: ${i[1]}/${
|
||||
FACTORY_COMPONENTS[compHovered.value.type]
|
||||
FACTORY_COMPONENTS[compHovered.value?.type ?? "cursor"]
|
||||
.consumptionStock[i[0]] ??
|
||||
FACTORY_COMPONENTS[compHovered.value.type]
|
||||
FACTORY_COMPONENTS[compHovered.value?.type ?? "cursor"]
|
||||
.productionStock[i[0]]
|
||||
}`;
|
||||
})}
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ export function isFunction<T, S extends ReadonlyArray<unknown>, R>(
|
|||
}
|
||||
|
||||
export enum Direction {
|
||||
Up = "Up",
|
||||
Down = "Down",
|
||||
Left = "Left",
|
||||
Right = "Right",
|
||||
Default = "Up"
|
||||
Up = "UP",
|
||||
Down = "DOWN",
|
||||
Left = "LEFT",
|
||||
Right = "RIGHT",
|
||||
Default = "UP"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue