From d9f03cb4c86d589a2db43311753c7c4a3304ccd7 Mon Sep 17 00:00:00 2001 From: Merrokitsune Date: Sun, 10 Nov 2024 02:27:25 +0700 Subject: [PATCH 1/3] Add TEG flatpacks and put them on the market. --- .../Structures/Power/Generation/teg.yml | 8 +++-- .../Catalog/Cargo/cargo_engines.yml | 9 +++++ .../Catalog/Fills/Crates/engines.yml | 11 ++++++ .../Objects/Devices/Circuitboards/engines.yml | 28 +++++++++++++++ .../Entities/Objects/Devices/flatpack.yml | 36 ++++++++++++++++++- 5 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/Ronstation/Catalog/Cargo/cargo_engines.yml create mode 100644 Resources/Prototypes/Ronstation/Catalog/Fills/Crates/engines.yml create mode 100644 Resources/Prototypes/Ronstation/Entities/Objects/Devices/Circuitboards/engines.yml diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml index b7f43614dbd3a2..f5fe4285429cd5 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml @@ -2,7 +2,7 @@ id: TegCenter name: thermo-electric generator description: A high efficiency generator that uses energy transfer between hot and cold gases to produce electricity. - parent: BaseMachinePowered + parent: [ BaseMachinePowered, ConstructibleMachine ] placement: mode: SnapgridCenter components: @@ -100,12 +100,14 @@ guides: [ TEG, Power ] - type: StealTarget stealGroup: Teg + - type: Machine + board: TegCenterCircuitboard - type: entity id: TegCirculator name: circulator description: Passes gas through the thermo-electric generator to exchange heat. Has an inlet and outlet port. - parent: BaseMachine + parent: [ BaseMachine, ConstructibleMachine ] placement: mode: SnapgridCenter components: @@ -180,6 +182,8 @@ - type: TegCirculator - type: StealTarget stealGroup: Teg + - type: Machine + board: TegCirculatorCircuitboard - # Spawned by the client-side circulator examine code to indicate the inlet/outlet direction. type: entity diff --git a/Resources/Prototypes/Ronstation/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Ronstation/Catalog/Cargo/cargo_engines.yml new file mode 100644 index 00000000000000..a122044687d522 --- /dev/null +++ b/Resources/Prototypes/Ronstation/Catalog/Cargo/cargo_engines.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: EngineTegFlatpack + icon: + sprite: Structures/Power/Generation/teg.rsi + state: static + product: CrateEngineeringTeg + cost: 15000 + category: cargoproduct-category-name-engineering + group: market diff --git a/Resources/Prototypes/Ronstation/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Ronstation/Catalog/Fills/Crates/engines.yml new file mode 100644 index 00000000000000..c94960ace96f66 --- /dev/null +++ b/Resources/Prototypes/Ronstation/Catalog/Fills/Crates/engines.yml @@ -0,0 +1,11 @@ +- type: entity + id: CrateEngineeringTeg + parent: CrateEngineeringSecure + name: thermo-electric generator flatpack set crate + description: Contains a set of 3 flatpacks to build your own thermo-electric generator. Requires Engineering access to open. + components: + - type: StorageFill + contents: + - id: TegCenterFlatpack + - id: TegCirculatorFlatpack + amount: 2 diff --git a/Resources/Prototypes/Ronstation/Entities/Objects/Devices/Circuitboards/engines.yml b/Resources/Prototypes/Ronstation/Entities/Objects/Devices/Circuitboards/engines.yml new file mode 100644 index 00000000000000..93da5dadeb0b95 --- /dev/null +++ b/Resources/Prototypes/Ronstation/Entities/Objects/Devices/Circuitboards/engines.yml @@ -0,0 +1,28 @@ +- type: entity + parent: BaseMachineCircuitboard + id: TegCenterCircuitboard + name: thermo-electric generator machine board + components: + - type: Sprite + state: engineering + - type: MachineBoard + prototype: TegCenter + requirements: + Capacitor: 4 + MatterBin: 1 + Steel: 6 + Cable: 4 + +- type: entity + parent: BaseMachineCircuitboard + id: TegCirculatorCircuitboard + name: circulator machine board + components: + - type: Sprite + state: engineering + - type: MachineBoard + prototype: TegCirculator + requirements: + Capacitor: 2 + Steel: 3 + GasPipeStraight: 1 diff --git a/Resources/Prototypes/Ronstation/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Ronstation/Entities/Objects/Devices/flatpack.yml index c13820006fcda4..dcf945b367d171 100644 --- a/Resources/Prototypes/Ronstation/Entities/Objects/Devices/flatpack.yml +++ b/Resources/Prototypes/Ronstation/Entities/Objects/Devices/flatpack.yml @@ -42,4 +42,38 @@ - state: base - state: overlay color: "#D381C9" - - state: icon-default \ No newline at end of file + - state: icon-default + +- type: entity + parent: BaseFlatpack + id: TegCenterFlatpack + name: thermo-electric generator flatpack + description: A flatpack used for constructing a thermo-electric generator. + components: + - type: Flatpack + entity: TegCenter + - type: Sprite + layers: + - state: base + - state: overlay + color: "#EFB341" + - state: icon-default + - type: GuideHelp + guides: [ TEG, Power ] + +- type: entity + parent: BaseFlatpack + id: TegCirculatorFlatpack + name: circulator flatpack + description: A flatpack used for constructing a circulator. + components: + - type: Flatpack + entity: TegCirculator + - type: Sprite + layers: + - state: base + - state: overlay + color: "#EFB341" + - state: icon-default + - type: GuideHelp + guides: [ TEG, Power ] From c0ca9c81e77a4d39b7db0c5e02f0f0cac30dabc3 Mon Sep 17 00:00:00 2001 From: Merrokitsune Date: Sun, 10 Nov 2024 21:12:13 +0700 Subject: [PATCH 2/3] Replace '' with ''. --- .../Entities/Objects/Devices/Circuitboards/engines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Ronstation/Entities/Objects/Devices/Circuitboards/engines.yml b/Resources/Prototypes/Ronstation/Entities/Objects/Devices/Circuitboards/engines.yml index 93da5dadeb0b95..fd8e64caf8dcde 100644 --- a/Resources/Prototypes/Ronstation/Entities/Objects/Devices/Circuitboards/engines.yml +++ b/Resources/Prototypes/Ronstation/Entities/Objects/Devices/Circuitboards/engines.yml @@ -7,7 +7,7 @@ state: engineering - type: MachineBoard prototype: TegCenter - requirements: + stackRequirements: Capacitor: 4 MatterBin: 1 Steel: 6 @@ -22,7 +22,7 @@ state: engineering - type: MachineBoard prototype: TegCirculator - requirements: + stackRequirements: Capacitor: 2 Steel: 3 GasPipeStraight: 1 From b1a4f519648f97f88c53bd85c21746d26a8f4763 Mon Sep 17 00:00:00 2001 From: Merrokitsune Date: Sun, 10 Nov 2024 21:35:11 +0700 Subject: [PATCH 3/3] Fix circulator machine board requirements. --- .../Entities/Objects/Devices/Circuitboards/engines.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Ronstation/Entities/Objects/Devices/Circuitboards/engines.yml b/Resources/Prototypes/Ronstation/Entities/Objects/Devices/Circuitboards/engines.yml index fd8e64caf8dcde..e384e0bb224950 100644 --- a/Resources/Prototypes/Ronstation/Entities/Objects/Devices/Circuitboards/engines.yml +++ b/Resources/Prototypes/Ronstation/Entities/Objects/Devices/Circuitboards/engines.yml @@ -25,4 +25,7 @@ stackRequirements: Capacitor: 2 Steel: 3 - GasPipeStraight: 1 + tagRequirements: + Pipe: + amount: 1 + defaultPrototype: GasPipeStraight