Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Смена параллакса #49

Merged
merged 4 commits into from
Apr 22, 2024
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
14 changes: 14 additions & 0 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4129,3 +4129,17 @@ Entries:
message: Blood cultists no longer use numerals instead of punctuation
id: 4926
time: '2024-04-22T10:12:32.0000000+00:00'
- author: Kesiath
changes:
- type: Tweak
message: >-
Frontier Station's orbit around Frontier Prime has entered a dense
asteroid belt.
id: 4927
time: '2024-04-22T22:37:20.0000000+00:00'
- author: erhardsteinhauer
changes:
- type: Tweak
message: SCAF suit is now void capable, can be researched and printed.
id: 4928
time: '2024-04-22T22:53:40.0000000+00:00'
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@
- ClothingOuterHardsuitRd # Frontier
- ClothingOuterHardsuitLuxury # Frontier
- ClothingOuterHardsuitMercenary # Frontier
- ClothingOuterHardsuitScaf # Frontier
- ClothingOuterHardsuitPilot # Frontier
- ClothingOuterHardsuitMaximPrototype # Frontier
- ClothingHeadHelmetAncient # Frontier
Expand Down
39 changes: 28 additions & 11 deletions Resources/Prototypes/Parallaxes/frontier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,51 @@
layers:
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/Parallaxes/FrontierParallaxBG.png"
slowness: 0.969046875
path: "/Textures/Parallaxes/layer1.png"
slowness: 0.998046875
scale: "1, 1"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/_NF/Parallaxes/FrontierParallaxBG.png"
slowness: 0.998046875
scale: "1, 1"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/_NF/Parallaxes/FrontierParallaxNeb.png"
slowness: 0.998046875
scale: "1, 1"
- texture:
!type:GeneratedParallaxTextureSource
id: "hq_wizard_stars"
configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml"
slowness: 0.961625
slowness: 0.996625
- texture:
!type:GeneratedParallaxTextureSource
id: "hq_wizard_stars_dim"
configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml"
slowness: 0.952375
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/Parallaxes/FrontierParallaxNeb.png"
slowness: 0.943046875
scale: "1, 1"
slowness: 0.989375
- texture:
!type:GeneratedParallaxTextureSource
id: "hq_wizard_stars_faster"
configPath: "/Prototypes/Parallaxes/parallax_config_stars-2.toml"
slowness: 0.934265625
slowness: 0.987265625
- texture:
!type:GeneratedParallaxTextureSource
id: "hq_wizard_stars_dim_faster"
configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim-2.toml"
slowness: 0.920352
slowness: 0.984352
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/_NF/Parallaxes/Asteroids.png"
slowness: 0.97
scale: 1.5,1.5
scrolling: "0.018, 0.01"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/_NF/Parallaxes/Asteroids.png"
slowness: 0.80
scale: 0.95,0.95
scrolling: "-0.0075, -0.009"
layersLQ:
- texture:
!type:GeneratedParallaxTextureSource
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,3 +212,30 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9

#SCAF Helmet
- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitScaf
name: scaf hardsuit helmet
description: A robust, strong helmet. On the inside smells of pent up anger.
noSpawn: true
components:
- type: BreathMask
- type: Sprite
sprite: _NF/Clothing/Head/Hardsuits/scaf.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hardsuits/scaf.rsi
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.8
- type: PointLight
radius: 7
energy: 2
#color: "#d6adff"
Original file line number Diff line number Diff line change
Expand Up @@ -296,3 +296,34 @@
- type: ClothingSpeedModifier
walkModifier: 0.85
sprintModifier: 0.75

# SCAF hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitScaf
name: scaf hardsuit
description: A green and brown combat hardsuit. Old yet sturdy nonetheless.
components:
- type: Sprite
sprite: _NF/Clothing/OuterClothing/Hardsuits/scaf.rsi
- type: Clothing
sprite: _NF/Clothing/OuterClothing/Hardsuits/scaf.rsi
- type: Armor # Kept original scaf stats
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.7
Piercing: 0.4
Heat: 0.9
Caustic: 0.9
- type: ExplosionResistance
damageCoefficient: 0.8
- type: PressureProtection
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitScaf
11 changes: 11 additions & 0 deletions Resources/Prototypes/_NF/Recipes/Lathes/eva.yml
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,17 @@
Durathread: 2000
Gold: 2000

- type: latheRecipe
id: ClothingOuterHardsuitScaf
result: ClothingOuterHardsuitScaf
category: EVASuits
completetime: 4
materials:
Glass: 500
Plasteel: 2000
Durathread: 2000
Gold: 2000

- type: latheRecipe
id: ClothingOuterHardsuitEngineeringWhite
result: ClothingOuterHardsuitEngineeringWhite
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_NF/Research/arsenal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
- ClothingOuterHardsuitSecurity
- ClothingOuterHardsuitWarden
- ClothingOuterHardsuitBrigmedic
- ClothingOuterHardsuitScaf
technologyPrerequisites:
- HardsuitsArmored
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.
41 changes: 41 additions & 0 deletions Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1 | erhardsteinhauer added variations with light sfx",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
},
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "off-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
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
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
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
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7 | erhardsteinhauer added boots (exactly 4 pixels at the bottom in icon and equipped-OUTERCLOTHING, no overlap with original suit sprites)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Binary file added Resources/Textures/_NF/Parallaxes/Asteroids.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading