From: brainfood1183 <113240905+brainfood1183@users.noreply.github.com> Date: Sun, 29 Oct 2023 14:13:41 +0000 (+0000) Subject: New foam sprites (edge sprites) (#21308) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=00523b52608a5903fd000ac8625be9f8abb13af4;p=space-station-14.git New foam sprites (edge sprites) (#21308) * New foam sprites (icon smoothing) * changed to edge sprites for foam * fix * edges for metal foams * fix --- diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml index 415ecd4a98..dfa2fb113a 100644 --- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml +++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml @@ -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 @@ -73,22 +84,39 @@ - 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 @@ -96,19 +124,8 @@ 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 @@ -139,6 +156,11 @@ mask: - WallLayer - type: Occluder + - type: Appearance + - type: SmoothEdge + - type: IconSmooth + key: walls + mode: NoSprite - type: Transform anchored: true - type: Airtight @@ -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 @@ -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 diff --git a/Resources/Textures/Effects/foam.rsi/foam-east.png b/Resources/Textures/Effects/foam.rsi/foam-east.png new file mode 100644 index 0000000000..4b4523012c Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/foam-east.png differ diff --git a/Resources/Textures/Effects/foam.rsi/foam-north.png b/Resources/Textures/Effects/foam.rsi/foam-north.png new file mode 100644 index 0000000000..b0eb1e7bc7 Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/foam-north.png differ diff --git a/Resources/Textures/Effects/foam.rsi/foam-south.png b/Resources/Textures/Effects/foam.rsi/foam-south.png new file mode 100644 index 0000000000..761927c3f2 Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/foam-south.png differ diff --git a/Resources/Textures/Effects/foam.rsi/foam-west.png b/Resources/Textures/Effects/foam.rsi/foam-west.png new file mode 100644 index 0000000000..1513b5c39f Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/foam-west.png differ diff --git a/Resources/Textures/Effects/foam.rsi/iron_foam-east.png b/Resources/Textures/Effects/foam.rsi/iron_foam-east.png new file mode 100644 index 0000000000..be075b71f0 Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/iron_foam-east.png differ diff --git a/Resources/Textures/Effects/foam.rsi/iron_foam-north.png b/Resources/Textures/Effects/foam.rsi/iron_foam-north.png new file mode 100644 index 0000000000..30ff28c875 Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/iron_foam-north.png differ diff --git a/Resources/Textures/Effects/foam.rsi/iron_foam-south.png b/Resources/Textures/Effects/foam.rsi/iron_foam-south.png new file mode 100644 index 0000000000..99213b98e6 Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/iron_foam-south.png differ diff --git a/Resources/Textures/Effects/foam.rsi/iron_foam-west.png b/Resources/Textures/Effects/foam.rsi/iron_foam-west.png new file mode 100644 index 0000000000..0608fdf32a Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/iron_foam-west.png differ diff --git a/Resources/Textures/Effects/foam.rsi/ironfoam.png b/Resources/Textures/Effects/foam.rsi/iron_foam.png similarity index 100% rename from Resources/Textures/Effects/foam.rsi/ironfoam.png rename to Resources/Textures/Effects/foam.rsi/iron_foam.png diff --git a/Resources/Textures/Effects/foam.rsi/mfoam-dissolve.png b/Resources/Textures/Effects/foam.rsi/m_foam-dissolve.png similarity index 100% rename from Resources/Textures/Effects/foam.rsi/mfoam-dissolve.png rename to Resources/Textures/Effects/foam.rsi/m_foam-dissolve.png diff --git a/Resources/Textures/Effects/foam.rsi/m_foam-east.png b/Resources/Textures/Effects/foam.rsi/m_foam-east.png new file mode 100644 index 0000000000..754604aa64 Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/m_foam-east.png differ diff --git a/Resources/Textures/Effects/foam.rsi/m_foam-north.png b/Resources/Textures/Effects/foam.rsi/m_foam-north.png new file mode 100644 index 0000000000..e170444a63 Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/m_foam-north.png differ diff --git a/Resources/Textures/Effects/foam.rsi/m_foam-south.png b/Resources/Textures/Effects/foam.rsi/m_foam-south.png new file mode 100644 index 0000000000..7b374e6039 Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/m_foam-south.png differ diff --git a/Resources/Textures/Effects/foam.rsi/m_foam-west.png b/Resources/Textures/Effects/foam.rsi/m_foam-west.png new file mode 100644 index 0000000000..07439be545 Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/m_foam-west.png differ diff --git a/Resources/Textures/Effects/foam.rsi/mfoam.png b/Resources/Textures/Effects/foam.rsi/m_foam.png similarity index 100% rename from Resources/Textures/Effects/foam.rsi/mfoam.png rename to Resources/Textures/Effects/foam.rsi/m_foam.png diff --git a/Resources/Textures/Effects/foam.rsi/meta.json b/Resources/Textures/Effects/foam.rsi/meta.json index 33d13b267b..f4cbd1d7f8 100644 --- a/Resources/Textures/Effects/foam.rsi/meta.json +++ b/Resources/Textures/Effects/foam.rsi/meta.json @@ -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]]}]} \ No newline at end of file +{ + "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 + ] + ] + } + ] +} diff --git a/Resources/Textures/Effects/foam.rsi/metal_foam-east.png b/Resources/Textures/Effects/foam.rsi/metal_foam-east.png new file mode 100644 index 0000000000..77b1d68910 Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/metal_foam-east.png differ diff --git a/Resources/Textures/Effects/foam.rsi/metal_foam-north.png b/Resources/Textures/Effects/foam.rsi/metal_foam-north.png new file mode 100644 index 0000000000..141433ed76 Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/metal_foam-north.png differ diff --git a/Resources/Textures/Effects/foam.rsi/metal_foam-south.png b/Resources/Textures/Effects/foam.rsi/metal_foam-south.png new file mode 100644 index 0000000000..95f8932c6c Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/metal_foam-south.png differ diff --git a/Resources/Textures/Effects/foam.rsi/metal_foam-west.png b/Resources/Textures/Effects/foam.rsi/metal_foam-west.png new file mode 100644 index 0000000000..c2e2848333 Binary files /dev/null and b/Resources/Textures/Effects/foam.rsi/metal_foam-west.png differ diff --git a/Resources/Textures/Effects/foam.rsi/metalfoam.png b/Resources/Textures/Effects/foam.rsi/metal_foam.png similarity index 100% rename from Resources/Textures/Effects/foam.rsi/metalfoam.png rename to Resources/Textures/Effects/foam.rsi/metal_foam.png