diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 7afbe73b63..263de0b68a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1859,7 +1859,7 @@ - type: PointLight color: LightGreen radius: 5 - energy: 5 + energy: 2 netsync: false - type: RadiationSource intensity: 0.3 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml index b67e3b520e..c56ebe42d1 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml @@ -246,7 +246,7 @@ color: "#75b1f0" - type: PointLight radius: 2.0 - energy: 3.5 + energy: 2.5 color: "#75b1f0" # Edited through the LiquidAnomalySystem - type: MobState allowedStates: diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index bffa8ca134..1ff0426fdc 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml @@ -211,7 +211,7 @@ - type: PointLight enabled: false radius: 8 - energy: 5 + energy: 1.8 - type: ItemSlots slots: cell_slot: diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml index ce507ae68f..b7a7f79e8b 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml @@ -107,202 +107,3 @@ glowColorLit: "#0000FF" - type: PointLight color: "#0000FF" - -# ---------------------------------------------------------------------------- -# THE FOLLOWING ARE ALL DUMMY ENTITIES USED TO TEST THE LIGHT BEHAVIOUR SYSTEM -# ---------------------------------------------------------------------------- -- type: entity - name: light pulse test - parent: BaseItem - id: LightBehaviourTest1 - categories: [ HideSpawnMenu ] - components: - - type: Sprite - sprite: Objects/Misc/glowstick.rsi - layers: - - state: glowstick_base - - state: glowstick_unlit - shader: unshaded - color: "#FF0000" - - type: Item - sprite: Objects/Misc/glowstick.rsi - heldPrefix: unlit - - type: PointLight - enabled: true - color: "#FF0000" - radius: 5 - - type: LightBehaviour - behaviours: - - !type:PulseBehaviour - interpolate: Cubic - maxDuration: 10.0 - minValue: 1.0 - maxValue: 7.0 - isLooped: true - property: Energy - enabled: true - -- type: entity - name: color cycle test - parent: BaseItem - id: LightBehaviourTest2 - categories: [ HideSpawnMenu ] - components: - - type: Sprite - sprite: Objects/Misc/glowstick.rsi - layers: - - state: glowstick_base - - state: glowstick_unlit - shader: unshaded - color: "#FF0000" - - type: Item - sprite: Objects/Misc/glowstick.rsi - heldPrefix: unlit - - type: PointLight - enabled: true - color: "#FF0000" - radius: 5 - - type: LightBehaviour - behaviours: - - !type:ColorCycleBehaviour - interpolate: Nearest - maxDuration: 0.8 - isLooped: true - enabled: true - colors: - - red - - blue - - green - -- type: entity - name: multi-behaviour light test - parent: BaseItem - id: LightBehaviourTest3 - categories: [ HideSpawnMenu ] - components: - - type: Sprite - sprite: Objects/Misc/glowstick.rsi - layers: - - state: glowstick_base - - state: glowstick_unlit - shader: unshaded - color: "#FF0000" - - type: Item - sprite: Objects/Misc/glowstick.rsi - heldPrefix: unlit - - type: PointLight - enabled: false - color: "#FF0000" - radius: 5 - - type: LightBehaviour - behaviours: - - !type:PulseBehaviour - interpolate: Nearest - minDuration: 0.2 - maxDuration: 1.0 - maxValue: 0.2 - property: AnimatedEnable - isLooped: true - enabled: true - - !type:ColorCycleBehaviour - interpolate: Cubic - maxDuration: 0.8 - isLooped: true - enabled: true - colors: - - red - - blue - - green - -- type: entity - name: light fade in test - parent: BaseItem - id: LightBehaviourTest4 - categories: [ HideSpawnMenu ] - components: - - type: Sprite - sprite: Objects/Misc/glowstick.rsi - layers: - - state: glowstick_base - - state: glowstick_unlit - shader: unshaded - color: "#FF0000" - - type: Item - sprite: Objects/Misc/glowstick.rsi - heldPrefix: unlit - - type: PointLight - enabled: false - color: "#FF0000" - radius: 5 - - type: LightBehaviour - behaviours: - - !type:FadeBehaviour - interpolate: Cubic - maxDuration: 5.0 - minValue: 0.0 - maxValue: 10.0 - isLooped: true - property: Energy - enabled: true - -- type: entity - name: light pulse radius test - parent: BaseItem - id: LightBehaviourTest5 - categories: [ HideSpawnMenu ] - components: - - type: Sprite - sprite: Objects/Misc/glowstick.rsi - layers: - - state: glowstick_base - - state: glowstick_unlit - shader: unshaded - color: "#FF0000" - - type: Item - sprite: Objects/Misc/glowstick.rsi - heldPrefix: unlit - - type: PointLight - enabled: false - color: "#FF0000" - radius: 5 - - type: LightBehaviour - behaviours: - - !type:PulseBehaviour - interpolate: Cubic - minDuration: 1.0 - maxDuration: 5.0 - minValue: 2.0 - maxValue: 10.0 - isLooped: true - enabled: true - -- type: entity - name: light randomize radius test - parent: BaseItem - id: LightBehaviourTest6 - categories: [ HideSpawnMenu ] - components: - - type: Sprite - sprite: Objects/Misc/glowstick.rsi - layers: - - state: glowstick_base - - state: glowstick_unlit - shader: unshaded - color: "#FF0000" - - type: Item - sprite: Objects/Misc/glowstick.rsi - heldPrefix: unlit - - type: PointLight - enabled: false - color: "#FF0000" - radius: 5 - energy: 10 - - type: LightBehaviour - behaviours: - - !type:RandomizeBehaviour - interpolate: Nearest - maxDuration: 0.5 - minValue: 10.0 - maxValue: 25.0 - isLooped: true - enabled: true diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index cc6a1096d1..82961e59e3 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -33,7 +33,7 @@ state: base - type: PointLight color: "#FFE4CE" # 5000K color temp - energy: 0.8 + energy: 1.2 radius: 10 softness: 1 offset: "0, -0.5" diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml index 558504d579..c2ba959f3f 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml @@ -62,7 +62,7 @@ - GlassLayer - type: PointLight radius: 10 - energy: 16 + energy: 4 - type: EventHorizon radius: 0.5 canBreachContainment: false