Start to work on advanced shape processing

artwork/wires/pins.psd

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0e6ae46466addd1bcb55a8005bbfb58fdf9e66c7fbae5620b723bdb21943b1c
-size 89487
+oid sha256:78c36fb8c8190825b20bffc08a141242d8ab65933ff3f6278e87fa5e469b1022
+size 118543

res_built/atlas/atlas0_10.json

@@ -1122,7 +1122,7 @@
 },
 "sprites/buildings/wire_top.png":
 {
-	"frame": {"x":614,"y":84,"w":9,"h":13},
+	"frame": {"x":618,"y":52,"w":9,"h":13},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":2,"y":0,"w":9,"h":13},
@@ -1170,7 +1170,7 @@
 },
 "sprites/misc/deletion_marker.png":
 {
-	"frame": {"x":602,"y":101,"w":10,"h":10},
+	"frame": {"x":602,"y":114,"w":10,"h":10},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":10,"h":10},
@@ -1194,7 +1194,7 @@
 },
 "sprites/misc/slot_bad_arrow.png":
 {
-	"frame": {"x":602,"y":101,"w":10,"h":10},
+	"frame": {"x":602,"y":114,"w":10,"h":10},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":10,"h":10},
@@ -1202,7 +1202,7 @@
 },
 "sprites/misc/slot_good_arrow.png":
 {
-	"frame": {"x":602,"y":115,"w":10,"h":10},
+	"frame": {"x":616,"y":114,"w":10,"h":10},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":10,"h":10},
@@ -1232,7 +1232,7 @@
 	"spriteSourceSize": {"x":0,"y":0,"w":13,"h":13},
 	"sourceSize": {"w":13,"h":13}
 },
-"sprites/wires/pin-negative-energy.png":
+"sprites/wires/pin_negative_accept.png":
 {
 	"frame": {"x":599,"y":86,"w":11,"h":11},
 	"rotated": false,
@@ -1240,21 +1240,37 @@
 	"spriteSourceSize": {"x":1,"y":0,"w":11,"h":11},
 	"sourceSize": {"w":13,"h":13}
 },
-"sprites/wires/pin-positive-energy.png":
+"sprites/wires/pin_negative_eject.png":
 {
 	"frame": {"x":611,"y":69,"w":11,"h":11},
 	"rotated": false,
 	"trimmed": true,
 	"spriteSourceSize": {"x":1,"y":0,"w":11,"h":11},
 	"sourceSize": {"w":13,"h":13}
+},
+"sprites/wires/pin_positive_accept.png":
+{
+	"frame": {"x":614,"y":84,"w":11,"h":11},
+	"rotated": false,
+	"trimmed": true,
+	"spriteSourceSize": {"x":1,"y":0,"w":11,"h":11},
+	"sourceSize": {"w":13,"h":13}
+},
+"sprites/wires/pin_positive_eject.png":
+{
+	"frame": {"x":614,"y":99,"w":11,"h":11},
+	"rotated": false,
+	"trimmed": true,
+	"spriteSourceSize": {"x":1,"y":0,"w":11,"h":11},
+	"sourceSize": {"w":13,"h":13}
 }},
 "meta": {
 	"app": "https://www.codeandweb.com/texturepacker",
 	"version": "1.0",
 	"image": "atlas0_10.png",
 	"format": "RGBA8888",
-	"size": {"w":629,"h":128},
+	"size": {"w":630,"h":128},
 	"scale": "0.1",
-	"smartupdate": "$TexturePacker:SmartUpdate:9ea1a09cb2003bf62ce57f52404292e0:0fc8d0e33f315e93d6d057148d691370:f159918d23e5952766c6d23ab52278c6$"
+	"smartupdate": "$TexturePacker:SmartUpdate:f2991e3fe6c79348d0808b1f60a06ef7:740a2ce184f6485487669e0f615a8a7e:f159918d23e5952766c6d23ab52278c6$"
 }
 }

src/css/icons.scss

@@ -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"] {

src/js/core/config.js

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

src/js/game/buildings/advanced_processor.js

@@ -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,
+                    },
+                ],
+            })
+        );
+    }
+}

src/js/game/components/item_processor.js

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

src/js/game/components/wired_pins.js

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

src/js/game/hub_goals.js

@@ -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);
         }

src/js/game/hud/parts/buildings_toolbar.js

@@ -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 {

src/js/game/items/negative_energy_item.js

@@ -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();

src/js/game/items/positive_energy_item.js

@@ -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();
     }
 }
 

src/js/game/key_action_mapper.js

@@ -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") },

src/js/game/meta_building_registry.js

@@ -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);
 }

src/js/game/systems/item_processor.js

@@ -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);
         }

src/js/game/systems/wired_pins.js

@@ -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"
             ),
         };
     }

translations/base-en.yaml

@@ -485,6 +485,11 @@ buildings:
             name: Cutter (Quad)
             description: Cuts shapes into four parts. <strong>If you use only one part, be sure to destroy the other parts or it will stall!</strong>
 
+    advanced_processor:
+        default:
+            name: &advanced_processor Advanced Processor
+            description: Advanced shape processing
+
     rotater:
         default:
             name: &rotater Rotate
@@ -800,6 +805,7 @@ keybindings:
         underground_belt: *underground_belt
         miner: *miner
         cutter: *cutter
+        advanced_processor: *advanced_processor
         rotater: *rotater
         stacker: *stacker
         mixer: *mixer