Skip to content

Commit

Permalink
New foam sprites (edge sprites) (space-wizards#21308)
Browse files Browse the repository at this point in the history
* New foam sprites (icon smoothing)

* changed to edge sprites for foam

* fix

* edges for metal foams

* fix
  • Loading branch information
brainfood1183 authored Oct 29, 2023
1 parent b5c21bc commit 00523b5
Show file tree
Hide file tree
Showing 22 changed files with 167 additions and 23 deletions.
90 changes: 68 additions & 22 deletions Resources/Prototypes/Entities/Effects/chemistry_effects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,25 @@
components:
- type: Sprite
drawdepth: Effects
color: "#ffffffcc" #Add some transparency
color: "#ffffffcc"
sprite: Effects/foam.rsi
state: foam
layers:
- state: foam
map: ["enum.FoamVisualLayers.Base"]
- map: [ "enum.EdgeLayer.South" ]
state: foam-south
- map: [ "enum.EdgeLayer.East" ]
state: foam-east
- map: [ "enum.EdgeLayer.North" ]
state: foam-north
- map: [ "enum.EdgeLayer.West" ]
state: foam-west
- type: AnimationPlayer
- type: Appearance
- type: SmoothEdge
- type: IconSmooth
key: walls
mode: NoSprite
- type: SmokeVisuals
- type: FoamVisuals
animationTime: 0.6
Expand Down Expand Up @@ -73,42 +84,48 @@
- type: StepTrigger

- type: entity
id: IronMetalFoam
name: iron metal foam
id: MetalFoam
name: metal foam
noSpawn: true
parent: Foam
components:
- type: Sprite
state: mfoam
drawdepth: Effects
color: "#ffffffcc"
sprite: Effects/foam.rsi
layers:
- state: mfoam
map: ["enum.FoamVisualLayers.Base"]
- state: m_foam
map: ["enum.FoamVisualLayers.Base"]
- map: [ "enum.EdgeLayer.South" ]
state: m_foam-south
- map: [ "enum.EdgeLayer.East" ]
state: m_foam-east
- map: [ "enum.EdgeLayer.North" ]
state: m_foam-north
- map: [ "enum.EdgeLayer.West" ]
state: m_foam-west
- type: Appearance
- type: SmokeVisuals
- type: FoamVisuals
animationTime: 0.6
animationState: mfoam-dissolve
animationState: m_foam-dissolve
- type: Smoke

- type: entity
id: IronMetalFoam
name: iron metal foam
noSpawn: true
parent: MetalFoam
components:
- type: SpawnOnDespawn
prototype: FoamedIronMetal

- type: entity
id: AluminiumMetalFoam
name: aluminium metal foam
noSpawn: true
parent: Foam
parent: MetalFoam
components:
- type: Sprite
state: mfoam
layers:
- state: mfoam
map: ["enum.FoamVisualLayers.Base"]
- type: Appearance
- type: SmokeVisuals
- type: FoamVisuals
animationTime: 0.6
animationState: mfoam-dissolve
- type: Smoke
- type: SpawnOnDespawn
prototype: FoamedAluminiumMetal

Expand Down Expand Up @@ -139,6 +156,11 @@
mask:
- WallLayer
- type: Occluder
- type: Appearance
- type: SmoothEdge
- type: IconSmooth
key: walls
mode: NoSprite
- type: Transform
anchored: true
- type: Airtight
Expand All @@ -161,8 +183,20 @@
parent: BaseFoamedMetal
components:
- type: Sprite
drawdepth: Effects
color: "#ffffffcc"
sprite: Effects/foam.rsi
state: ironfoam
layers:
- state: iron_foam
map: ["enum.FoamVisualLayers.Base"]
- map: [ "enum.EdgeLayer.South" ]
state: iron_foam-south
- map: [ "enum.EdgeLayer.East" ]
state: iron_foam-east
- map: [ "enum.EdgeLayer.North" ]
state: iron_foam-north
- map: [ "enum.EdgeLayer.West" ]
state: iron_foam-west

- type: entity
id: FoamedAluminiumMetal
Expand All @@ -171,5 +205,17 @@
parent: BaseFoamedMetal
components:
- type: Sprite
drawdepth: Effects
color: "#ffffffcc"
sprite: Effects/foam.rsi
state: metalfoam
layers:
- state: metal_foam
map: ["enum.FoamVisualLayers.Base"]
- map: [ "enum.EdgeLayer.South" ]
state: metal_foam-south
- map: [ "enum.EdgeLayer.East" ]
state: metal_foam-east
- map: [ "enum.EdgeLayer.North" ]
state: metal_foam-north
- map: [ "enum.EdgeLayer.West" ]
state: metal_foam-west
Binary file added Resources/Textures/Effects/foam.rsi/foam-east.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.
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 Resources/Textures/Effects/foam.rsi/foam-west.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.
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.
100 changes: 99 additions & 1 deletion Resources/Textures/Effects/foam.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1 +1,99 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/81b3a082ccdfb425f36bbed6e5bc1f0faed346ec/icons/effects/effects.dmi", "states": [{"name": "foam", "directions": 1}, {"name": "foam-dissolve", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ironfoam", "directions": 1}, {"name": "metalfoam", "directions": 1}, {"name": "mfoam", "directions": 1}, {"name": "mfoam-dissolve", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}]}
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/81b3a082ccdfb425f36bbed6e5bc1f0faed346ec/icons/effects/effects.dmi, foam_directionals by brainfood1183 (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "foam"
},
{
"name": "foam-west"
},
{
"name": "foam-east"
},
{
"name": "foam-north"
},
{
"name": "foam-south"
},
{
"name": "iron_foam"
},
{
"name": "iron_foam-north"
},
{
"name": "iron_foam-east"
},
{
"name": "iron_foam-south"
},
{
"name": "iron_foam-west"
},
{
"name": "metal_foam"
},
{
"name": "metal_foam-north"
},
{
"name": "metal_foam-east"
},
{
"name": "metal_foam-south"
},
{
"name": "metal_foam-west"
},
{
"name": "m_foam"
},
{
"name": "m_foam-north"
},
{
"name": "m_foam-east"
},
{
"name": "m_foam-south"
},
{
"name": "m_foam-west"
},
{
"name": "m_foam-dissolve",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "foam-dissolve",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}
]
}
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.

0 comments on commit 00523b5

Please sign in to comment.