Post light update (#25814)

* penis

* done

diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
index 470733ea1880882cb3cda727239d454b9ffa6daa..34a6f08294e7feeabad7597c0aacd7590d7abf19 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
@@ -1,9 +1,22 @@
 - type: entity
-  abstract: true
+  id: LightPostSmall
+  name: post light
+  description: "An always powered light."
+  suffix: Always Powered
   parent: BaseStructure
-  id: BaseLightStructure
   components:
-  - type: InteractionOutline
+  - type: Sprite
+    sprite: Structures/Lighting/LightPosts/small_light_post.rsi
+    snapCardinals: true
+    drawdepth: Objects
+    noRot: true
+    layers:
+    - map: ["enum.PoweredLightLayers.Base"]
+      state: base
+    - map: ["enum.PoweredLightLayers.Glow"]
+      state: glow
+      shader: unshaded
+    state: base
   - type: Fixtures
     fixtures:
       fix1:
@@ -16,6 +29,13 @@
         layer:
         - MidImpassable
         - LowImpassable
+  - type: PointLight
+    radius: 10
+    energy: 2.5
+    softness: 0.9
+    color: "#EEEEFF"
+  - type: Anchorable
+  - type: InteractionOutline
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
@@ -43,41 +63,16 @@
         sound:
           collection: MetalGlassBreak
 
-- type: entity
-  parent: BaseLightStructure
-  id: LightPostSmall
-  name: post light
-  description: "An always powered light."
-  suffix: Always Powered
-  components:
-  - type: Construction
-    graph: LightFixture
-    node: groundLight
-  - type: Sprite
-    sprite: Structures/Lighting/LightPosts/small_light_post.rsi
-    snapCardinals: true
-    layers:
-    - state: on
-      map: ["enum.PoweredLightLayers.Base"]
-    state: on
-  - type: PointLight
-    radius: 10
-    energy: 0.8
-    softness: 1
-    offset: "0, -0.5"
-
 - type: entity
   id: PoweredLightPostSmallEmpty
   name: post light
   description: "A small light post."
   suffix: Empty
-  parent: BaseLightStructure
+  parent: LightPostSmall
   components:
   - type: Sprite
     sprite: Structures/Lighting/LightPosts/small_light_post.rsi
-    layers:
-    - state: off
-      map: ["enum.PoweredLightLayers.Base"]
+    state: empty
   - type: PointLight
     enabled: false
   - type: PoweredLight
@@ -107,6 +102,12 @@
   - type: PoweredLightVisuals
     blinkingSound:
       path: "/Audio/Machines/light_tube_on.ogg"
+    spriteStateMap:
+      empty: empty
+      off: base
+      on: base
+      broken: broken
+      burned: burned
 
 - type: entity
   id: PoweredLightPostSmall
@@ -116,16 +117,43 @@
   parent: PoweredLightPostSmallEmpty
   components:
   - type: Sprite
-    layers:
-    - state: off
-      map: [ "enum.PoweredLightLayers.Base" ]
+    state: base
+  - type: PointLight
+    enabled: true
   - type: PoweredLight
     hasLampOnSpawn: LightTube
     damage:
       types:
         Heat: 20
+  - type: StaticPrice
+    price: 25
+  - type: AmbientOnPowered
+  - type: AmbientSound
+    volume: -15
+    range: 3
+    sound:
+      path: /Audio/Ambience/Objects/light_hum.ogg
+
+- type: entity
+  id: PoweredLEDLightPostSmall
+  name: post light
+  description: "A light fixture. Draws power and produces light when equipped with a light tube."
+  suffix: LED
+  parent: PoweredLightPostSmallEmpty
+  components:
+  - type: Sprite
+    state: base
   - type: PointLight
     enabled: true
+    radius: 15
+    energy: 1
+    softness: 0.9
+    color: "#EEEEFF"
+  - type: PoweredLight
+    hasLampOnSpawn: LedLightTube
+    damage:
+      types:
+        Heat: 20
   - type: StaticPrice
     price: 25
   - type: AmbientOnPowered

diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index 4aaebaba9f50d9638b2237c34f4bd038e6aa6f4e..f5b4f085d3d297c32b415394b67c627b42e4e329 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -1274,7 +1274,7 @@
   description: A ground light fixture. Use light bulbs.
   icon:
     sprite: Structures/Lighting/LightPosts/small_light_post.rsi
-    state: off
+    state: base
   objectType: Structure
   placementMode: SnapgridCenter
   canRotate: false

diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/base.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/base.png
new file mode 100644 (file)
index 0000000..61c5935
Binary files /dev/null and b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/base.png differ

diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/broken.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/broken.png
index 8acd1a859cb7982ee8451196fab7617af66dc177..0819f73d9a29da3d15678cf4edc79dfd97f78385 100644 (file)
Binary files a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/broken.png and b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/broken.png differ

diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/burned.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/burned.png
new file mode 100644 (file)
index 0000000..a981c6a
Binary files /dev/null and b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/burned.png differ

diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/burnt.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/burnt.png
deleted file mode 100644 (file)
index ef59d22..0000000
Binary files a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/burnt.png and /dev/null differ

diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/empty.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/empty.png
index e28c20cc0bc2bc71e90007e23182cbce7b23aa0b..2be4bba511a1ac8900688f0fe291643c007f3e1c 100644 (file)
Binary files a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/empty.png and b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/empty.png differ

diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/glow.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/glow.png
new file mode 100644 (file)
index 0000000..5e30247
Binary files /dev/null and b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/glow.png differ

diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/meta.json b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/meta.json
index 25064edf455d9d10b84c87dcf4eaa308f293e68b..dfb451a88d2066bcc77959b8b300d6fcf7b341ce 100644 (file)
--- a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/meta.json
+++ b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/meta.json
@@ -5,22 +5,22 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "By Peptide90 for SS14. empy, broken and burnt versions by Nekomancer.",
+  "copyright": "by ko4erga (discord)",
   "states": [
     {
-      "name": "off"
+      "name": "broken"
     },
     {
-      "name": "on"
+      "name": "burned"
     },
     {
-      "name": "empty"
+      "name": "base"
     },
-       {
-         "name": "broken"
-       },
+         {
+           "name": "empty"
+         },
     {
-       "name": "burnt"
+       "name": "glow"
     }
   ]
 }

diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/off.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/off.png
deleted file mode 100644 (file)
index a1f276f..0000000
Binary files a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/off.png and /dev/null differ

diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/on.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/on.png
deleted file mode 100644 (file)
index f0d6dec..0000000
Binary files a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/on.png and /dev/null differ