From dac854070521c70b49c289a313ab728557b03192 Mon Sep 17 00:00:00 2001 From: EmoGarbage404 <98561806+EmoGarbage404@users.noreply.github.com> Date: Tue, 17 May 2022 23:44:47 -0400 Subject: [PATCH] Cleaning up lighting prototypes (#8217) Co-authored-by: metalgearsloth --- Resources/Maps/nss_pillar.yml | 2 +- .../base_lighting.yml} | 89 ++++++++++++++----- .../ground_lighting.yml} | 8 +- .../Structures/Wallmounts/emergency_light.yml | 29 ------ 4 files changed, 70 insertions(+), 58 deletions(-) rename Resources/Prototypes/Entities/Structures/{Wallmounts/lighting.yml => Lighting/base_lighting.yml} (76%) rename Resources/Prototypes/Entities/Structures/{lighting_ground.yml => Lighting/ground_lighting.yml} (95%) delete mode 100644 Resources/Prototypes/Entities/Structures/Wallmounts/emergency_light.yml diff --git a/Resources/Maps/nss_pillar.yml b/Resources/Maps/nss_pillar.yml index 1a375dbd2a..4f1699794a 100644 --- a/Resources/Maps/nss_pillar.yml +++ b/Resources/Maps/nss_pillar.yml @@ -38934,7 +38934,7 @@ entities: parent: 131 type: Transform - uid: 2703 - type: WallLight + type: AlwaysPoweredWallLight components: - pos: 39.5,-11.5 parent: 131 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml similarity index 76% rename from Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml rename to Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index 0262610616..ca84e740f6 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -1,8 +1,14 @@ +#==Suffix Guide== +#Always Powered - light doesn't need power to give off life +#Empty - on map init, light spawns without bulb +#Blue/Sodium/etc. - the color of the light + +#Basic lights - type: entity - id: WallLight + id: AlwaysPoweredWallLight name: light - description: "An unpowered light." - suffix: Unpowered + description: "An always powered light." + suffix: Always powered components: - type: MeleeSound soundGroups: @@ -61,8 +67,8 @@ name: light description: "A light fixture. Draws power and produces light when equipped with a light tube." id: PoweredlightEmpty - suffix: Powered, Empty - parent: WallLight + suffix: Empty + parent: AlwaysPoweredWallLight components: - type: Sprite sprite: Structures/Wallmounts/Lighting/light_tube.rsi @@ -89,7 +95,7 @@ - type: entity id: Poweredlight description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Powered + suffix: parent: PoweredlightEmpty components: - type: Sprite @@ -100,10 +106,11 @@ types: Heat: 5 +#LED lights - type: entity id: PoweredlightLED description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Powered, LED + suffix: LED parent: Poweredlight components: - type: PoweredLight @@ -113,9 +120,9 @@ Heat: 5 - type: entity - parent: WallLight - id: UnpoweredLightLED - suffix: Unpowered, LED + parent: AlwaysPoweredWallLight + id: AlwaysPoweredLightLED + suffix: Always Powered, LED components: - type: PointLight radius: 10 @@ -123,10 +130,11 @@ softness: 0.9 color: "#EEEEFF" +#Exterior lights - type: entity id: PoweredlightExterior description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Powered, Exterior Blue + suffix: Blue parent: Poweredlight components: - type: PoweredLight @@ -136,9 +144,9 @@ Heat: 5 - type: entity - parent: WallLight - id: UnpoweredLightExterior - suffix: Unpowered, Exterior Blue + parent: AlwaysPoweredWallLight + id: AlwaysPoweredLightExterior + suffix: Always Powered, Blue components: - type: PointLight radius: 12 @@ -146,11 +154,11 @@ softness: 0.5 color: "#B4FCF0" - +#Sodium lights - type: entity id: PoweredlightSodium description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Powered, Sodium Orange + suffix: Sodium parent: Poweredlight components: - type: PoweredLight @@ -160,9 +168,9 @@ Heat: 5 - type: entity - parent: WallLight - id: UnpoweredLightSodium - suffix: Unpowered, Sodium Orange + parent: AlwaysPoweredWallLight + id: AlwaysPoweredLightSodium + suffix: Always Powered, Sodium components: - type: PointLight radius: 10 @@ -170,12 +178,13 @@ softness: 0.5 color: "#FFAF38" +#Small lights - type: entity name: small light - description: "An unpowered light." + description: "An always powered light." id: SmallLight - suffix: Unpowered - parent: WallLight + suffix: Always Powered + parent: AlwaysPoweredWallLight components: - type: AmbientSound volume: -15 @@ -220,7 +229,7 @@ name: small light description: "A light fixture. Draws power and produces light when equipped with a light bulb." id: PoweredSmallLightEmpty - suffix: Powered, Empty + suffix: Empty parent: SmallLight components: - type: Sprite @@ -246,7 +255,7 @@ - type: entity id: PoweredSmallLight - suffix: Powered + suffix: parent: PoweredSmallLightEmpty components: - type: Sprite @@ -256,3 +265,35 @@ damage: types: Heat: 5 + +#Emergency Lights +- type: entity + id: EmergencyLight + name: emergency light + description: A small red light with an internal battery that turns on as soon as it stops receiving any power. + parent: AlwaysPoweredWallLight + components: + - type: PointLight + enabled: false + radius: 10 + energy: 2.5 + offset: "0, 0.5" + color: "#FF4020" + mask: /Textures/Effects/LightMasks/cone.png + - type: ApcPowerReceiver + - type: ExtensionCableReceiver + - type: Battery + maxCharge: 30000 + startingCharge: 0 + - type: EmergencyLight + - type: Sprite + sprite: Structures/Wallmounts/Lighting/emergency_light.rsi + layers: + - state: emergency_light_off + - type: Appearance + visuals: + - type: EmergencyLightVisualizer + placement: + mode: SnapgridCenter + snap: + - Wallmount diff --git a/Resources/Prototypes/Entities/Structures/lighting_ground.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml similarity index 95% rename from Resources/Prototypes/Entities/Structures/lighting_ground.yml rename to Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index 4929e5c1c1..2a9d35bd5a 100644 --- a/Resources/Prototypes/Entities/Structures/lighting_ground.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml @@ -40,8 +40,8 @@ parent: BaseLightStructure id: LightPostSmall name: post light - description: "An unpowered light." - suffix: Unpowered + description: "An always powered light." + suffix: Always Powered components: - type: Construction graph: LightFixture @@ -63,7 +63,7 @@ id: PoweredLightPostSmallEmpty name: post light description: "A small light post." - suffix: Empty, Powered + suffix: Empty parent: BaseLightStructure components: - type: Sprite @@ -95,7 +95,7 @@ id: PoweredLightPostSmall name: post light description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Powered + suffix: parent: PoweredLightPostSmallEmpty components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/emergency_light.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/emergency_light.yml deleted file mode 100644 index f4c34c660e..0000000000 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/emergency_light.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: entity - id: EmergencyLight - name: emergency light - description: A small red light with an internal battery that turns on as soon as it stops receiving any power. - parent: WallLight - components: - - type: PointLight - enabled: false - radius: 10 - energy: 2.5 - offset: "0, 0.5" - color: "#FF4020" - mask: /Textures/Effects/LightMasks/cone.png - - type: ApcPowerReceiver - - type: ExtensionCableReceiver - - type: Battery - maxCharge: 30000 - startingCharge: 0 - - type: EmergencyLight - - type: Sprite - sprite: Structures/Wallmounts/Lighting/emergency_light.rsi - layers: - - state: emergency_light_off - - type: Appearance - visuals: - - type: EmergencyLightVisualizer - placement: - snap: - - Wallmount