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

Start to work on advanced shape processing

Browse Source
This commit is contained in:
tobspr
2020-06-28 20:28:46 +02:00
parent 0967d5114c
commit b499760d74
32 changed files with 829 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/css/icons.scss
View File

@@ -1,5 +1,5 @@
$buildings: belt, cutter, miner, mixer, painter, rotater, splitter, stacker, trash, underground_belt,
energy_generator, wire;
energy_generator, wire, advanced_processor;
@each $building in $buildings {
[data-icon="building_icons/#{$building}.png"] {

1
src/js/core/config.js
View File

@@ -66,6 +66,7 @@ export const globalConfig = {
painterQuad: 1 / 8,
mixer: 1 / 5,
stacker: 1 / 6,
advancedProcessor: 1 / 15,
},
// Zooming

99
src/js/game/buildings/advanced_processor.js Normal file
View File

@@ -0,0 +1,99 @@
import { formatItemsPerSecond } from "../../core/utils";
import { enumDirection, Vector } from "../../core/vector";
import { T } from "../../translations";
import { enumItemType } from "../base_item";
import { ItemAcceptorComponent } from "../components/item_acceptor";
import { ItemEjectorComponent } from "../components/item_ejector";
import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor";
import { Entity } from "../entity";
import { MetaBuilding } from "../meta_building";
import { GameRoot, enumLayer } from "../root";
import { WiredPinsComponent, enumPinSlotType } from "../components/wired_pins";
export class MetaAdvancedProcessorBuilding extends MetaBuilding {
constructor() {
super("advanced_processor");
}
getSilhouetteColor() {
return "#25d7b8";
}
getDimensions(variant) {
return new Vector(2, 2);
}
/**
* @param {GameRoot} root
* @param {string} variant
* @returns {Array<[string, string]>}
*/
getAdditionalStatistics(root, variant) {
const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.advancedProcessor);
return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]];
}
/**
* @param {GameRoot} root
*/
getIsUnlocked(root) {
// TODO
return true;
// return root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_cutter_and_trash);
}
/**
* Creates the entity at the given location
* @param {Entity} entity
*/
setupEntityComponents(entity) {
entity.addComponent(
new ItemProcessorComponent({
inputsPerCharge: 1,
processorType: enumItemProcessorTypes.advancedProcessor,
})
);
entity.addComponent(
new ItemEjectorComponent({
slots: [
{ pos: new Vector(1, 0), direction: enumDirection.right },
{ pos: new Vector(1, 0), direction: enumDirection.top, layer: enumLayer.wires },
],
})
);
entity.addComponent(
new WiredPinsComponent({
slots: [
{
pos: new Vector(0, 0),
direction: enumDirection.top,
type: enumPinSlotType.positiveEnergyAcceptor,
},
{
pos: new Vector(1, 0),
direction: enumDirection.top,
type: enumPinSlotType.negativeEnergyEjector,
},
],
})
);
entity.addComponent(
new ItemAcceptorComponent({
slots: [
{
pos: new Vector(0, 0),
directions: [enumDirection.left],
filter: enumItemType.shape,
},
{
pos: new Vector(0, 0),
directions: [enumDirection.top],
filter: enumItemType.positiveEnergy,
layer: enumLayer.wires,
},
],
})
);
}
}

1
src/js/game/components/item_processor.js
View File

@@ -16,6 +16,7 @@ export const enumItemProcessorTypes = {
painter: "painter",
painterDouble: "painterDouble",
painterQuad: "painterQuad",
advancedProcessor: "advancedProcessor",
hub: "hub",
};

2
src/js/game/components/wired_pins.js
View File

@@ -7,7 +7,7 @@ export const enumPinSlotType = {
positiveEnergyEjector: "positiveEnergyEjector",
negativeEnergyEjector: "negativeEnergyEjector",
positiveEnergyAcceptor: "positiveEnergyAcceptor",
negativeEnergyAcceptor: "positiveEnergyAcceptor",
negativeEnergyAcceptor: "negativeEnergyAcceptor",
};
/** @typedef {{

3
src/js/game/hub_goals.js
View File

@@ -435,6 +435,9 @@ export class HubGoals extends BasicSerializableObject {
globalConfig.buildingSpeeds[processorType]
);
}
case enumItemProcessorTypes.advancedProcessor: {
return globalConfig.beltSpeedItemsPerSecond * globalConfig.buildingSpeeds[processorType];
}
default:
assertAlways(false, "invalid processor type: " + processorType);
}

2
src/js/game/hud/parts/buildings_toolbar.js
View File

@@ -11,6 +11,7 @@ import { MetaTrashBuilding } from "../../buildings/trash";
import { MetaUndergroundBeltBuilding } from "../../buildings/underground_belt";
import { enumLayer } from "../../root";
import { HUDBaseToolbar } from "./base_toolbar";
import { MetaAdvancedProcessorBuilding } from "../../buildings/advanced_processor";
const supportedBuildings = [
MetaBeltBaseBuilding,
@@ -25,6 +26,7 @@ const supportedBuildings = [
MetaTrashBuilding,
MetaEnergyGenerator,
MetaAdvancedProcessorBuilding,
];
export class HUDBuildingsToolbar extends HUDBaseToolbar {

10
src/js/game/items/negative_energy_item.js
View File

@@ -41,7 +41,7 @@ export class NegativeEnergyItem extends BaseItem {
const dpi = smoothenDpi(globalConfig.shapesSharpness * parameters.zoomLevel);
const key = size + "/" + dpi;
const key = "pos:" + size + "/" + dpi;
const canvas = parameters.root.buffers.getForKey(key, "", size, size, dpi, this.bufferGenerator);
parameters.context.drawImage(canvas, x - size / 2, y - size / 2, size, size);
}
@@ -56,13 +56,11 @@ export class NegativeEnergyItem extends BaseItem {
context.translate((w * dpi) / 2, (h * dpi) / 2);
context.scale((dpi * w) / 12, (dpi * h) / 12);
context.fillStyle = "#1d2725";
context.strokeStyle = "#eee";
context.lineWidth = 1;
context.beginCircle(0, 0, 5);
context.fill();
context.lineWidth = 2;
context.beginCircle(0, 0, 4);
context.stroke();
}
}
export const POSITIVE_ENERGY_ITEM_SINGLETON = new NegativeEnergyItem();
export const NEGATIVE_ENERGY_ITEM_SINGLETON = new NegativeEnergyItem();

8
src/js/game/items/positive_energy_item.js
View File

@@ -41,7 +41,7 @@ export class PositiveEnergyItem extends BaseItem {
const dpi = smoothenDpi(globalConfig.shapesSharpness * parameters.zoomLevel);
const key = size + "/" + dpi;
const key = "neg:" + size + "/" + dpi;
const canvas = parameters.root.buffers.getForKey(key, "", size, size, dpi, this.bufferGenerator);
parameters.context.drawImage(canvas, x - size / 2, y - size / 2, size, size);
}
@@ -56,12 +56,10 @@ export class PositiveEnergyItem extends BaseItem {
context.translate((w * dpi) / 2, (h * dpi) / 2);
context.scale((dpi * w) / 12, (dpi * h) / 12);
context.fillStyle = "#e84a4a";
context.strokeStyle = "#eee";
context.fillStyle = "#eee";
context.lineWidth = 1;
context.beginCircle(0, 0, 5);
context.beginCircle(0, 0, 4);
context.fill();
context.stroke();
}
}

1
src/js/game/key_action_mapper.js
View File

@@ -54,6 +54,7 @@ export const KEYMAPPINGS = {
painter: { keyCode: key("9") },
trash: { keyCode: key("0") },
energy_generator: { keyCode: key("O") },
advanced_processor: { keyCode: key("P") },
// Wires layer
wire: { keyCode: key("1") },

2
src/js/game/meta_building_registry.js
View File

@@ -12,6 +12,7 @@ import { MetaUndergroundBeltBuilding } from "./buildings/underground_belt";
import { MetaHubBuilding } from "./buildings/hub";
import { MetaEnergyGenerator } from "./buildings/energy_generator";
import { MetaWireBaseBuilding } from "./buildings/wire_base";
import { MetaAdvancedProcessorBuilding } from "./buildings/advanced_processor";
export function initMetaBuildingRegistry() {
gMetaBuildingRegistry.register(MetaSplitterBuilding);
@@ -27,4 +28,5 @@ export function initMetaBuildingRegistry() {
gMetaBuildingRegistry.register(MetaHubBuilding);
gMetaBuildingRegistry.register(MetaEnergyGenerator);
gMetaBuildingRegistry.register(MetaWireBaseBuilding);
gMetaBuildingRegistry.register(MetaAdvancedProcessorBuilding);
}

11
src/js/game/systems/item_processor.js
View File

@@ -7,6 +7,7 @@ import { GameSystemWithFilter } from "../game_system_with_filter";
import { ColorItem } from "../items/color_item";
import { ShapeItem } from "../items/shape_item";
import { enumLayer } from "../root";
import { NEGATIVE_ENERGY_ITEM_SINGLETON } from "../items/negative_energy_item";
export class ItemProcessorSystem extends GameSystemWithFilter {
constructor(root) {
@@ -335,6 +336,16 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
break;
}
// ADVANCED PROCESSING
case enumItemProcessorTypes.advancedProcessor: {
// TODO
entity.components.ItemEjector.tryEject(1, NEGATIVE_ENERGY_ITEM_SINGLETON);
break;
}
default:
assertAlways(false, "Unkown item processor type: " + processorComp.type);
}

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

@@ -11,11 +11,13 @@ export class WiredPinsSystem extends GameSystemWithFilter {
super(root, [WiredPinsComponent]);
this.pinSprites = {
[enumPinSlotType.positiveEnergyEjector]: Loader.getSprite(
"sprites/wires/pin-positive-energy.png"
[enumPinSlotType.positiveEnergyEjector]: Loader.getSprite("sprites/wires/pin_positive_eject.png"),
[enumPinSlotType.positiveEnergyAcceptor]: Loader.getSprite(
"sprites/wires/pin_positive_accept.png"
),
[enumPinSlotType.negativeEnergyEjector]: Loader.getSprite("sprites/wires/pin_negative_eject.png"),
[enumPinSlotType.negativeEnergyAcceptor]: Loader.getSprite(
"sprites/wires/pin-negative-energy.png"
"sprites/wires/pin_negative_accept.png"
),
};
}