Skip to content

Commit 218005a

Browse files
authored
Merge pull request CommunalHelper#261 from aonkeeper4/glow-controller-depth-fix
Fix Glow Controllers not affecting entities whose Awake method is called after the controller's
2 parents 113465d + 6e0b9c6 commit 218005a

File tree

3 files changed

+190
-109
lines changed

3 files changed

+190
-109
lines changed

Loenn/entities/misc/glow_controller.lua

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ glowController.depth = -1000000
55
glowController.texture = "objects/CommunalHelper/glowController/icon"
66

77
glowController.fieldInformation = {
8+
lightWhitelist = {
9+
fieldType = "list",
10+
},
11+
lightBlacklist = {
12+
fieldType = "list",
13+
},
814
lightColor = {
915
fieldType = "color",
1016
},
@@ -23,6 +29,12 @@ glowController.fieldInformation = {
2329
lightOffsetY = {
2430
fieldType = "integer",
2531
},
32+
bloomWhitelist = {
33+
fieldType = "list",
34+
},
35+
bloomBlacklist = {
36+
fieldType = "list",
37+
},
2638
bloomAlpha = {
2739
fieldType = "number",
2840
},
@@ -35,6 +47,15 @@ glowController.fieldInformation = {
3547
bloomOffsetY = {
3648
fieldType = "integer",
3749
},
50+
deathAnimationIds = {
51+
fieldType = "list",
52+
},
53+
respawnAnimationIds = {
54+
fieldType = "list",
55+
},
56+
flagFadeTime = {
57+
minimumValue = 0.0,
58+
},
3859
}
3960

4061
glowController.placements = {
@@ -57,6 +78,8 @@ glowController.placements = {
5778
bloomOffsetY = 0,
5879
deathAnimationIds = "death",
5980
respawnAnimationIds = "respawn",
81+
flag = "",
82+
flagFadeTime = 1.0,
6083
},
6184
},
6285
}

Loenn/lang/en_gb.lang

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -858,6 +858,8 @@ entities.CommunalHelper/GlowController.attributes.description.bloomOffsetX=The X
858858
entities.CommunalHelper/GlowController.attributes.description.bloomOffsetY=The Y offset from the entity's position at which to place the BloomPoint. Defaults to 0.
859859
entities.CommunalHelper/GlowController.attributes.description.deathAnimationIds=A list of animation IDs to treat as "death" animations, that is, when the targeted entities' Sprites start playing one of these animations, their light/bloom will fade out.
860860
entities.CommunalHelper/GlowController.attributes.description.respawnAnimationIds=A list of animation IDs to treat as "respawn" animations, that is, when the targeted entities' Sprites start playing one of these animations, their light/bloom will fade back in.
861+
entities.CommunalHelper/GlowController.attributes.description.flag=A flag that should control the opacity of the light and bloom added to these entities.
862+
entities.CommunalHelper/GlowController.attributes.description.flagFadeTime=The time in seconds it takes for the light and bloom to fade in/out on these entities when the flag in "Flag" is set/unset.\nDoes nothing if "Flag" is not specified.
861863

862864
# Poison Gas
863865
entities.CommunalHelper/PoisonGas.placements.name.main=Poison Gas

0 commit comments

Comments
 (0)