diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/materials/materials.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/materials/materials.ftl index 9d49a92d6c..9f2f54dcc4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/materials/materials.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/materials/materials.ftl @@ -4,5 +4,8 @@ ent-MaterialBluespace = блюспейс кристалл ent-MaterialBluespace1 = блюспейс кристалл .suffix = 1 .desc = { ent-MaterialBluespace.desc } +ent-MaterialBluespace10 = блюспейс кристалл + .suffix = 10 + .desc = { ent-MaterialBluespace.desc } ent-HideMothroach = шкура таракана-мотылька .desc = Тонкий слой шкурки таракана-мотылька. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/specific/research/crystals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/specific/research/crystals.ftl index 7b6b4fa0ac..5d59781b2b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/specific/research/crystals.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/specific/research/crystals.ftl @@ -1,4 +1,9 @@ ent-CrystalNormality = кристалл нормальности - .desc = Это выглядит... нормально. Спрайт-заполнитель. + .suffix = Полный + .desc = Это выглядит... нормально. +ent-CrystalNormality1 = кристалл нормальности + .desc = Это выглядит... нормально. +ent-CrystalNormality10 = кристалл нормальности + .desc = Это выглядит... нормально. ent-CrystalSoul = кристалл души .desc = Содержит душу. Спрайт-заполнитель. diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml index b8c0ec4983..5a6dce4d09 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml @@ -8,13 +8,22 @@ components: - type: Sprite sprite: Objects/Specific/Syndicate/telecrystal.rsi - state: telecrystal - - type: Item - sprite: Objects/Specific/Syndicate/telecrystal.rsi - size: Tiny +# Backmen-Stak-Start + layers: + - state: telecrystal_3 + map: ["base"] + - type: Item + size: Tiny + - type: Appearance - type: Stack - count: 20 stackType: Telecrystal + baseLayer: base + layerStates: + - telecrystal + - telecrystal_2 + - telecrystal_3 + count: 20 +# Backmen-Stak-End - type: StaticPrice price: 0 - type: StackPrice @@ -40,22 +49,24 @@ - Scientist - Borg # Corvax-HiddenDesc-End - + - type: entity parent: Telecrystal id: Telecrystal1 suffix: 1 TC components: - type: Stack + stackType: Telecrystal # Backmen count: 1 - + - type: entity parent: Telecrystal id: Telecrystal5 suffix: 5 TC components: - type: Stack - count: 5 + stackType: Telecrystal # Backmen + count: 5 - type: entity parent: Telecrystal @@ -63,6 +74,7 @@ suffix: 10 TC components: - type: Stack + stackType: Telecrystal # Backmen count: 10 # Uplinks diff --git a/Resources/Prototypes/Stacks/Materials/crystals.yml b/Resources/Prototypes/Stacks/Materials/crystals.yml index 28f4ed70ca..03bcb5ac34 100644 --- a/Resources/Prototypes/Stacks/Materials/crystals.yml +++ b/Resources/Prototypes/Stacks/Materials/crystals.yml @@ -1,5 +1,6 @@ - type: stack id: Telecrystal name: telecrystal - icon: Objects/Specific/Syndicate/telecrystal.rsi + icon: { sprite: Objects/Specific/Syndicate/telecrystal.rsi, state: telecrystal } # Backmen spawn: Telecrystal1 + maxCount: 30 # Backmen \ No newline at end of file diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Materials/materials.yml index d7d460b667..52cc4bec98 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Materials/materials.yml @@ -25,7 +25,7 @@ - bluespace - bluespace_2 - bluespace_3 - count: 5 + count: 30 - type: Item size: Normal @@ -42,6 +42,20 @@ tags: - BluespaceCrystal - RawMaterial + +- type: entity + parent: MaterialBluespace + id: MaterialBluespace10 + name: bluespace crystal + suffix: 10 + components: + - type: Stack + stackType: Bluespace + count: 10 + - type: Tag + tags: + - BluespaceCrystal + - RawMaterial - type: entity parent: BaseItem diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Specific/Research/crystals.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Specific/Research/crystals.yml index b37291bd5d..63f4395fb4 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Specific/Research/crystals.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Specific/Research/crystals.yml @@ -1,17 +1,59 @@ - type: entity - parent: BaseItem + parent: MaterialBase id: CrystalNormality name: normality crystal - description: It looks... normal. Placeholder sprite. + description: It looks... normal. components: - type: Sprite sprite: Backmen/Objects/Materials/materials.rsi - state: bluespace - color: gray + layers: + - state: normalitycrystal_3 + map: ["base"] + - type: Appearance + - type: Material + - type: PhysicalComposition + materialComposition: + NormalityCrystal: 100 + - type: Stack + stackType: NormalityCrystal + baseLayer: base + layerStates: + - normalitycrystal + - normalitycrystal_2 + - normalitycrystal_3 + count: 30 - type: Tag tags: - NormalityCrystal - + - type: Item + size: Normal +- type: entity + parent: CrystalNormality + id: CrystalNormality1 + name: normality crystal + suffix: 1 + components: + - type: Stack + stackType: NormalityCrystal + count: 1 + - type: Tag + tags: + - NormalityCrystal + - RawMaterial + +- type: entity + parent: CrystalNormality + id: CrystalNormality10 + name: normality crystal + suffix: 10 + components: + - type: Stack + stackType: NormalityCrystal + count: 10 + - type: Tag + tags: + - NormalityCrystal + - type: entity parent: BaseItem id: CrystalSoul diff --git a/Resources/Prototypes/_Backmen/Reactions/psionic.yml b/Resources/Prototypes/_Backmen/Reactions/psionic.yml index 77fd3dae0f..a916d7370a 100644 --- a/Resources/Prototypes/_Backmen/Reactions/psionic.yml +++ b/Resources/Prototypes/_Backmen/Reactions/psionic.yml @@ -30,6 +30,6 @@ catalyst: true effects: - !type:CreateEntityReactionEffect - entity: CrystalNormality + entity: CrystalNormality1 - !type:ChangeGlimmerReactionEffect count: -10 diff --git a/Resources/Prototypes/_Backmen/Reagents/Materials/materials.yml b/Resources/Prototypes/_Backmen/Reagents/Materials/materials.yml index cf57392310..d60cdd1a8d 100644 --- a/Resources/Prototypes/_Backmen/Reagents/Materials/materials.yml +++ b/Resources/Prototypes/_Backmen/Reagents/Materials/materials.yml @@ -5,3 +5,11 @@ color: "#53a9ff" stackEntity: MaterialBluespace price: 15 + +- type: material + id: NormalityCrystal + name: normality сrystal + icon: { sprite: Backmen/Objects/Materials/materials.rsi, state: normalitycrystal } + color: "#77e5f6" + stackEntity: NormalityCrystal + price: 20 \ No newline at end of file diff --git a/Resources/Prototypes/_Backmen/Recipes/Construction/Graphs/structures/glimmerdevices.yml b/Resources/Prototypes/_Backmen/Recipes/Construction/Graphs/structures/glimmerdevices.yml index 5791c86a7f..5f306444f2 100644 --- a/Resources/Prototypes/_Backmen/Recipes/Construction/Graphs/structures/glimmerdevices.yml +++ b/Resources/Prototypes/_Backmen/Recipes/Construction/Graphs/structures/glimmerdevices.yml @@ -31,36 +31,9 @@ conditions: - !type:EntityAnchored {} steps: - - tag: NormalityCrystal - icon: - sprite: Backmen/Objects/Materials/materials.rsi - state: bluespace - name: a normality crystal - doAfter: 1 - - tag: NormalityCrystal - icon: - sprite: Backmen/Objects/Materials/materials.rsi - state: bluespace - name: a normality crystal - doAfter: 1 - - tag: NormalityCrystal - icon: - sprite: Backmen/Objects/Materials/materials.rsi - state: bluespace - name: a normality crystal - doAfter: 1 - - tag: NormalityCrystal - icon: - sprite: Backmen/Objects/Materials/materials.rsi - state: bluespace - name: a normality crystal - doAfter: 1 - - tag: NormalityCrystal - icon: - sprite: Backmen/Objects/Materials/materials.rsi - state: bluespace - name: a normality crystal - doAfter: 1 + - material: NormalityCrystal + amount: 5 + doAfter: 5 - tool: Welding doAfter: 5 diff --git a/Resources/Prototypes/_Backmen/Stacks/materials.yml b/Resources/Prototypes/_Backmen/Stacks/materials.yml index 9492245ecb..697e7116ba 100644 --- a/Resources/Prototypes/_Backmen/Stacks/materials.yml +++ b/Resources/Prototypes/_Backmen/Stacks/materials.yml @@ -3,3 +3,11 @@ name: bluespace icon: { sprite: Backmen/Objects/Materials/materials.rsi, state: bluespace } spawn: MaterialBluespace + maxCount: 30 + +- type: stack + id: NormalityCrystal + name: normalitycrystal + icon: { sprite: Backmen/Objects/Materials/materials.rsi, state: normalitycrystal } + spawn: CrystalNormality + maxCount: 30 \ No newline at end of file diff --git a/Resources/Textures/Backmen/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Backmen/Objects/Materials/materials.rsi/meta.json index 603002bcc0..31cdae7921 100644 --- a/Resources/Textures/Backmen/Objects/Materials/materials.rsi/meta.json +++ b/Resources/Textures/Backmen/Objects/Materials/materials.rsi/meta.json @@ -6,15 +6,24 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "bluespace" - }, - { - "name": "bluespace_2" - }, - { - "name": "bluespace_3" - } - ] + "states": [ + { + "name": "bluespace" + }, + { + "name": "bluespace_2" + }, + { + "name": "bluespace_3" + }, + { + "name": "normalitycrystal" + }, + { + "name": "normalitycrystal_2" + }, + { + "name": "normalitycrystal_3" + } + ] } diff --git a/Resources/Textures/Backmen/Objects/Materials/materials.rsi/normalitycrystal.png b/Resources/Textures/Backmen/Objects/Materials/materials.rsi/normalitycrystal.png new file mode 100644 index 0000000000..fb69f48a72 Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Materials/materials.rsi/normalitycrystal.png differ diff --git a/Resources/Textures/Backmen/Objects/Materials/materials.rsi/normalitycrystal_2.png b/Resources/Textures/Backmen/Objects/Materials/materials.rsi/normalitycrystal_2.png new file mode 100644 index 0000000000..bcff38e7af Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Materials/materials.rsi/normalitycrystal_2.png differ diff --git a/Resources/Textures/Backmen/Objects/Materials/materials.rsi/normalitycrystal_3.png b/Resources/Textures/Backmen/Objects/Materials/materials.rsi/normalitycrystal_3.png new file mode 100644 index 0000000000..16c220ce0e Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Materials/materials.rsi/normalitycrystal_3.png differ diff --git a/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/meta.json b/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/meta.json index 0ec31e402a..2f41bd8518 100644 --- a/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/meta.json @@ -10,13 +10,19 @@ { "name": "telecrystal" }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "telecrystal_2" + }, + { + "name": "telecrystal_3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/telecrystal.png b/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/telecrystal.png index cf7be5b549..f77efbcc97 100644 Binary files a/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/telecrystal.png and b/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/telecrystal.png differ diff --git a/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/telecrystal_2.png b/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/telecrystal_2.png new file mode 100644 index 0000000000..3695feda34 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/telecrystal_2.png differ diff --git a/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/telecrystal_3.png b/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/telecrystal_3.png new file mode 100644 index 0000000000..65c2b9f647 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/telecrystal_3.png differ