Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Изменение текстур стаков телекристаллов, БС и нормальности, а так же … #1078

Merged
merged 2 commits into from
Feb 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Тонкий слой шкурки таракана-мотылька.
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
ent-CrystalNormality = кристалл нормальности
.desc = Это выглядит... нормально. Спрайт-заполнитель.
.suffix = Полный
.desc = Это выглядит... нормально.
ent-CrystalNormality1 = кристалл нормальности
.desc = Это выглядит... нормально.
ent-CrystalNormality10 = кристалл нормальности
.desc = Это выглядит... нормально.
ent-CrystalSoul = кристалл души
.desc = Содержит душу. Спрайт-заполнитель.
28 changes: 20 additions & 8 deletions Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -40,29 +49,32 @@
- 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
id: Telecrystal10
suffix: 10 TC
components:
- type: Stack
stackType: Telecrystal # Backmen
count: 10

# Uplinks
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Stacks/Materials/crystals.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
- bluespace
- bluespace_2
- bluespace_3
count: 5
count: 30
- type: Item
size: Normal

Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Backmen/Reactions/psionic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
catalyst: true
effects:
- !type:CreateEntityReactionEffect
entity: CrystalNormality
entity: CrystalNormality1
- !type:ChangeGlimmerReactionEffect
count: -10
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,11 @@
color: "#53a9ff"
stackEntity: MaterialBluespace
price: 15

- type: material
id: NormalityCrystal
name: normality crystal
icon: { sprite: Backmen/Objects/Materials/materials.rsi, state: normalitycrystal }
color: "#77e5f6"
stackEntity: CrystalNormality
price: 20
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/_Backmen/Stacks/materials.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
]
}
}
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading