diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/engineering.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/engineering.ftl index e51e3608c00..b97144b3c20 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/engineering.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/engineering.ftl @@ -2,3 +2,5 @@ ent-ADTCrateRPDAmmo = ящик консервированной материи .desc = Содержит 3 консервированных картриджа для работы РРТ. ent-ADTCrateRPD = ящик РРТ .desc = Ящик, содержащий один ручной раздатчик труб. +ent-CrateEngineeringIndustrialSMES = Ящик с индустриальным СМЭСом + .desc = Ящик, содержащий инустриальный СМЭС. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/Circuitboards/Machine/production.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/Circuitboards/Machine/production.ftl new file mode 100644 index 00000000000..36053d64cbc --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/Circuitboards/Machine/production.ftl @@ -0,0 +1,2 @@ +ent-ADTIndustrialSMESMachineCircuitboard = Плата индустриального СМЭСа + .desc = Плата Сверхпроводящей Магнитной Энергонакопительной Станции (СМЭС) повышенной ёмкости емкости. Передовое иследование НТ в передачи и хранении энергии. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Power/industrialSMES.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Power/industrialSMES.ftl new file mode 100644 index 00000000000..a6c022af9d5 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Power/industrialSMES.ftl @@ -0,0 +1,5 @@ +ent-ADTIndustrialSMES = Индустриальный СМЭС + .desc = Сверхпроводящая Магнитная Энергонакопительная Станция (СМЭС) повышенной ёмкости емкости. Передовое иследование НТ в передачи и хранении энергии +ent-ADTIndustrialSMESEmpty = Индустриальный СМЭС + .desc = Сверхпроводящая Магнитная Энергонакопительная Станция (СМЭС) повышенной ёмкости емкости. Передовое иследование НТ в передачи и хранении энергии + .suffix = Пустой diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Research/industrial.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Research/industrial.ftl new file mode 100644 index 00000000000..fbdb78a099f --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Research/industrial.ftl @@ -0,0 +1 @@ +research-avanted-energy = Продвинутая энергетика diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/engines.yml new file mode 100644 index 00000000000..ba7a8b7bbd7 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Crates/engines.yml @@ -0,0 +1,7 @@ +- type: entity + id: CrateEngineeringIndustrialSMES + parent: CrateEngineeringSecure + components: + - type: StorageFill + contents: + - id: ADTIndustrialSMESEmpty diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/production.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/production.yml new file mode 100644 index 00000000000..1d8d929077d --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/production.yml @@ -0,0 +1,15 @@ +- type: entity + id: ADTIndustrialSMESMachineCircuitboard + parent: BaseMachineCircuitboard + name: Industrial SMES machine board + description: A machine printed circuit board for a SMES. + components: + - type: MachineBoard + prototype: ADTIndustrialSMESEmpty + stackRequirements: + Capacitor: 4 + CableHV: 30 + componentRequirements: + PowerCell: + amount: 16 + defaultPrototype: PowerCellSmall diff --git a/Resources/Prototypes/ADT/Entities/Structures/Power/industrialSMES.yml b/Resources/Prototypes/ADT/Entities/Structures/Power/industrialSMES.yml new file mode 100644 index 00000000000..ca065132433 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Power/industrialSMES.yml @@ -0,0 +1,39 @@ +- type: entity + parent: BaseSMES + id: ADTIndustrialSMES + suffix: Basic, 80MW + components: + - type: Sprite + sprite: ADT/Structures/Power/industrial_smes.rsi + snapCardinals: true + layers: + - state: smes + - map: ["enum.SmesVisualLayers.Charge"] + state: "smes-og1" + shader: unshaded + visible: false + - map: ["enum.SmesVisualLayers.Input"] + state: "smes-oc0" + shader: unshaded + - map: ["enum.SmesVisualLayers.Output"] + state: "smes-op1" + shader: unshaded + - type: Smes + - type: Battery + maxCharge: 80000000 + startingCharge: 80000000 + - type: PowerNetworkBattery + maxSupply: 15000000 + maxChargeRate: 500000 + supplyRampTolerance: 500000 + supplyRampRate: 100000 + - type: Machine + board: ADTIndustrialSMESMachineCircuitboard + +- type: entity + parent: ADTIndustrialSMES + id: ADTIndustrialSMESEmpty + suffix: Empty + components: + - type: Battery + startingCharge: 0 diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/electronics.yml b/Resources/Prototypes/ADT/Recipes/Lathes/electronics.yml index 24c34e966ff..0adfc02de19 100644 --- a/Resources/Prototypes/ADT/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/ADT/Recipes/Lathes/electronics.yml @@ -6,3 +6,12 @@ Steel: 900 Plastic: 100 Gold: 100 + +- type: latheRecipe + id: ADTIndustrialSMESMachineCircuitboard + result: ADTIndustrialSMESMachineCircuitboard + completetime: 4 + materials: + Steel: 100 + Glass: 900 + Gold: 100 diff --git a/Resources/Prototypes/ADT/Research/industrial.yml b/Resources/Prototypes/ADT/Research/industrial.yml new file mode 100644 index 00000000000..2ad05129d9b --- /dev/null +++ b/Resources/Prototypes/ADT/Research/industrial.yml @@ -0,0 +1,11 @@ +- type: technology + id: Advanted Energy + name: research-avanted-energy + icon: + sprite: ADT/Structures/Power/industrial_smes.rsi + state: smes + discipline: Industrial + tier: 3 + cost: 15000 + recipeUnlocks: + - ADTIndustrialSMESMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 1027c510e27..b1f33a361be 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -546,6 +546,7 @@ - MassMediaCircuitboard - ReagentGrinderIndustrialMachineCircuitboard - JukeboxCircuitBoard + - ADTIndustrialSMESMachineCircuitboard #ADT - type: EmagLatheRecipes emagDynamicRecipes: - ShuttleGunDusterCircuitboard diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/meta.json b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/meta.json new file mode 100644 index 00000000000..827aef3b56a --- /dev/null +++ b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/meta.json @@ -0,0 +1,74 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprites of smes was created by Unlumination. Discord:unlumy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "smes" + }, + { + "name": "smes-open" + }, + { + "name": "smes-oc0" + }, + { + "name": "smes-oc1", + "delays": [ + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "smes-oc2", + "delays": [ + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "smes-og1", + "delays": [ + [ + 1, + 1 + ] + ] + }, + { + "name": "smes-og2" + }, + { + "name": "smes-og3" + }, + { + "name": "smes-og4" + }, + { + "name": "smes-og5" + }, + { + "name": "smes-op0" + }, + { + "name": "smes-op1", + "delays": [ + [ + 1, + 1 + ] + ] + }, + { + "name": "smes-op2" + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-oc0.png b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-oc0.png new file mode 100644 index 00000000000..5579432d3fe Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-oc0.png differ diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-oc1.png b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-oc1.png new file mode 100644 index 00000000000..d624672613b Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-oc1.png differ diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-oc2.png b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-oc2.png new file mode 100644 index 00000000000..d624672613b Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-oc2.png differ diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og1.png b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og1.png new file mode 100644 index 00000000000..c65f011a070 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og1.png differ diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og2.png b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og2.png new file mode 100644 index 00000000000..00237504051 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og2.png differ diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og3.png b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og3.png new file mode 100644 index 00000000000..51df688e4a8 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og3.png differ diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og4.png b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og4.png new file mode 100644 index 00000000000..ceb3db1bc31 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og4.png differ diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og5.png b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og5.png new file mode 100644 index 00000000000..e6c0c8a2eac Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og5.png differ diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-op0.png b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-op0.png new file mode 100644 index 00000000000..573b5c404ff Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-op0.png differ diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-op1.png b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-op1.png new file mode 100644 index 00000000000..f5c8e104894 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-op1.png differ diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-op2.png b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-op2.png new file mode 100644 index 00000000000..af560237f17 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-op2.png differ diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-open.png b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-open.png new file mode 100644 index 00000000000..885e2b75291 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-open.png differ diff --git a/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes.png b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes.png new file mode 100644 index 00000000000..bb23bd2ceca Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes.png differ