-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это комментарии - они не будут видны в PR. --> ## Описание PR <!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это может повлиять? Постарайтесь описать все внесённые вами изменения! --> **Медиа** <!-- Если приемлемо, добавьте скриншоты для демонстрации вашего PR. Если ваш PR представляет собой визуальное изменение, добавьте скриншоты, иначе он может быть закрыт. --> **Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** <!-- Здесь вы можете написать список изменений, который будет автоматически добавлен в игру, когда ваш PR будет принят. В журнал изменений следует помещать только то, что действительно важно игрокам. В списке изменений тип значка не является часть предложения, поэтому явно указывайте - Добавлен, Удалён, Изменён. плохо: - add: Новый инструмент для инженеров хорошо: - add: Добавлен новый инструмент для инженеров Вы можете указать своё имя после символа 🆑 именно оно будет отображаться в журнале изменений (иначе будет использоваться ваше имя на GitHub) Например: 🆑 Ian --> Собственно добавлен индустриальный СМЭС и иследование его в РНД
- Loading branch information
Showing
24 changed files
with
166 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
.../Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/Circuitboards/Machine/production.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ADTIndustrialSMESMachineCircuitboard = Плата индустриального СМЭСа | ||
.desc = Плата Сверхпроводящей Магнитной Энергонакопительной Станции (СМЭС) повышенной ёмкости емкости. Передовое иследование НТ в передачи и хранении энергии. |
5 changes: 5 additions & 0 deletions
5
Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Power/industrialSMES.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
ent-ADTIndustrialSMES = Индустриальный СМЭС | ||
.desc = Сверхпроводящая Магнитная Энергонакопительная Станция (СМЭС) повышенной ёмкости емкости. Передовое иследование НТ в передачи и хранении энергии | ||
ent-ADTIndustrialSMESEmpty = Индустриальный СМЭС | ||
.desc = Сверхпроводящая Магнитная Энергонакопительная Станция (СМЭС) повышенной ёмкости емкости. Передовое иследование НТ в передачи и хранении энергии | ||
.suffix = Пустой |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
research-avanted-energy = Продвинутая энергетика |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
- type: entity | ||
id: CrateEngineeringIndustrialSMES | ||
parent: CrateEngineeringSecure | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: ADTIndustrialSMESEmpty |
15 changes: 15 additions & 0 deletions
15
Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/production.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
39 changes: 39 additions & 0 deletions
39
Resources/Prototypes/ADT/Entities/Structures/Power/industrialSMES.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} | ||
] | ||
} |
Binary file added
BIN
+114 Bytes
Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-oc0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+145 Bytes
Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-oc1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+145 Bytes
Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-oc2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+101 Bytes
Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+155 Bytes
Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+160 Bytes
Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+194 Bytes
Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+200 Bytes
Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-og5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+106 Bytes
Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-op0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+143 Bytes
Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-op1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+111 Bytes
Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-op2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.32 KB
Resources/Textures/ADT/Structures/Power/industrial_smes.rsi/smes-open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.