From 1a672c9c6d726f3cdde77e90d677dd4514c269fb Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:55:21 +0200 Subject: [PATCH] add more logic gates prototypes for mapping (#30385) * Add more logic gates types for mapping * i forgor * me stupid * nuh --- .../Prototypes/Entities/Structures/gates.yml | 68 ++++++++++++++++++- .../Construction/Graphs/tools/logic_gate.yml | 2 +- Resources/migration.yml | 3 + 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/gates.yml b/Resources/Prototypes/Entities/Structures/gates.yml index 22ab745a1e..6b02840ba0 100644 --- a/Resources/Prototypes/Entities/Structures/gates.yml +++ b/Resources/Prototypes/Entities/Structures/gates.yml @@ -15,9 +15,10 @@ - type: entity parent: BaseLogicItem - id: LogicGate + id: LogicGateOr name: logic gate description: A logic gate with two inputs and one output. Technicians can change its mode of operation using a screwdriver. + suffix: Or components: - type: Sprite layers: @@ -51,6 +52,71 @@ Nand: { state: nand } Xnor: { state: xnor } +- type: entity + parent: LogicGateOr + id: LogicGateAnd + suffix: And + components: + - type: Sprite + layers: + - state: base + - state: and + map: [ "enum.LogicGateLayers.Gate" ] + - type: LogicGate + gate: And + +- type: entity + parent: LogicGateOr + id: LogicGateXor + suffix: Xor + components: + - type: Sprite + layers: + - state: base + - state: xor + map: [ "enum.LogicGateLayers.Gate" ] + - type: LogicGate + gate: Xor + +- type: entity + parent: LogicGateOr + id: LogicGateNor + suffix: Nor + components: + - type: Sprite + layers: + - state: base + - state: nor + map: [ "enum.LogicGateLayers.Gate" ] + - type: LogicGate + gate: Nor + +- type: entity + parent: LogicGateOr + id: LogicGateNand + suffix: Nand + components: + - type: Sprite + layers: + - state: base + - state: nand + map: [ "enum.LogicGateLayers.Gate" ] + - type: LogicGate + gate: Nand + +- type: entity + parent: LogicGateOr + id: LogicGateXnor + suffix: Xnor + components: + - type: Sprite + layers: + - state: base + - state: xnor + map: [ "enum.LogicGateLayers.Gate" ] + - type: LogicGate + gate: Xnor + - type: entity parent: BaseLogicItem id: EdgeDetector diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml index 6e64f061eb..d366a2ea59 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml @@ -34,7 +34,7 @@ state: icon name: a multitool - node: logic_gate - entity: LogicGate + entity: LogicGateOr - node: edge_detector entity: EdgeDetector - node: power_sensor diff --git a/Resources/migration.yml b/Resources/migration.yml index a4276c7f10..92b2ca6d3b 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -377,3 +377,6 @@ SignDrones: SignMaterials SignShield: null # what was this even for? SignHydro2: SignHydro1 SignHydro3: SignHydro1 + +# 2024-07-27 +LogicGate: LogicGateOr -- 2.52.0