Fixed addon conflicts for LBL, UTV and PB addons.

Author: Rip-Rip-Rip

light_bridge_lights/addon.kv3

@@ -1,7 +1,7 @@
 <!-- kv3 encoding:text:version{e21c7f3c-8a33-41c5-9977-a76d3a32aa0d} format:generic:version{7412167c-06e9-4698-aff2-e63eb59037e7} -->
 {
 	mod = "Dynamic Light Bridge Lights (★)"
-	description = "Adds dynamic lighting to light bridges, similar in style to our Clustered Renderer showcase video.\n\nWARNING: This addon can be very performance-heavy on lower-end hardware due to the number of lights it creates.\n\nThis addon is a stand-in solution until Area Lights have been implemented.\n\nVersion 1.0.0"
+	description = "Adds dynamic lighting to light bridges, similar in style to our Clustered Renderer showcase video.\n\nWARNING: This addon can be very performance-heavy on lower-end hardware due to the number of lights it creates.\n\nThis addon is a stand-in solution until Area Lights have been implemented.\n\nVersion 1.0.2"
 	type = ""
 	id = 0
 	thumbnail = ".assets/thumb.jpg"

light_bridge_lights/scripts/vscripts/light_bridge_lights/helper.nut

@@ -1,6 +1,6 @@
 // table containing useful dev functions
-if(!("Dev" in getroottable())) {
-    ::Dev <- {
+if(!("LBL_Dev" in getroottable())) {
+    ::LBL_Dev <- {
         function msg(msg) {
             printl("[LIGHT BRIDGE LIGHTS] " + msg)
         }

light_bridge_lights/scripts/vscripts/sv_init.nut

@@ -1,181 +1,215 @@
-IncludeScript("light_bridge_lights/helper.nut")
-
-// sv_init.nut runs before entities have spawned + on every game load. wait until entities are ready before running
-function scriptStart() {
-    local initTimer = CreateEntityByName("logic_timer", {   // check every tick if entities have actually spawned in yet
-        targetname = "lightbridgelights_canstarttimer"
-        RefireTime = 0.01
-    })
+if(!("Entities" in this)) return
 
-    initTimer.ConnectOutput("OnTimer", "scriptInit")
-    EntFire("lightbridgelights_canstarttimer", "Enable")
-}
-function scriptInit() {   // if player exists, other entities exist
-    local player = GetPlayer()
-    if(player != null) {
-        EntFire("lightbridgelights_canstarttimer", "Kill")    // prevent further inits
+IncludeScript("light_bridge_lights/helper.nut")
 
-        Setup()
-        if(GetDeveloperLevel() > 0) Dev.msgDeveloper("Script initialised.")
+function LBL_scriptInit() {
+    if(GetPlayer() != null) {
+        LBL_Setup()
+        if(GetDeveloperLevel() > 0) LBL_Dev.msgDeveloper("Script initialised.")
+    } else {
+        printl("[LIGHT BRIDGE LIGHTS - ERROR] Player entity not found!")
     }
 }
 
-::LIGHT_COLOUR <- Vector(63, 196, 252)  // RGB colour values - light blue
-const LIGHT_BRIGHTNESS = 40
-const LIGHT_D50 = 50
-const LIGHT_D0 = 300
-const LIGHT_SHADOWSIZE = -1 // DONT CHANGE THIS FROM -1, it just instantly overwhelms the shadow atlas (-1 = no shadows)
+LBL_LIGHT_COLOUR <- Vector(63, 196, 252)  // RGB colour values - light blue
+const LBL_LIGHT_BRIGHTNESS = 40
+const LBL_LIGHT_D50 = 50
+const LBL_LIGHT_D0 = 300
+const LBL_LIGHT_SHADOWSIZE = -1 // DONT CHANGE THIS FROM -1, it just instantly overwhelms the shadow atlas (-1 = no shadows)
+
+const LBL_LIGHT_SPACING = 20  // distance between lights in units, less spacing means more lights but a higher performance cost
+const LBL_LIGHT_MAXCOUNT = 128  // maximum number of lights per bridge to prevent performance issues
 
-const LIGHT_SPACING = 20  // distance between lights in units, less spacing means more lights but a higher performance cost
+const LBL_LIGHT_SPECIFIC_HEALTH = 27852 // used to identify lights created by this script
 
-bridgesCached <- [] // stores bridge handles and their entindexes
-bridgeLightCountPrevious <- {}
-bridgesCacheMarkedForReset <- false
-const CACHE_REFRESH_TIME = 0.01
+LBL_bridgesCached <- [] // stores bridge handles and their entindexes
+LBL_bridgeLightCountPrevious <- {}
+LBL_bridgesCacheMarkedForReset <- false
+const LBL_CACHE_REFRESH_TIME = 0.01
 
 // traces used for calculating bridge length
-const TRACE_DISTANCE = 8192
-TRACE_MASK <- MASK_SOLID | MASK_WATER | MASK_BLOCKLOS
-TRACE_COLLISION_GROUP <- COLLISION_GROUP_NONE
-TRACE_BOUNDS_MIN <- Vector(-12, -12, -12)
-TRACE_BOUNDS_MAX <- Vector(12, 12, 12)
-
-function Setup() {
-    Dev.msgDeveloper("Creating cache refresh timer...")
+const LBL_TRACE_DISTANCE = 8192
+LBL_TRACE_MASK <- MASK_SOLID | MASK_WATER | MASK_BLOCKLOS
+LBL_TRACE_COLLISION_GROUP <- COLLISION_GROUP_NONE
+LBL_TRACE_BOUNDS_MIN <- Vector(-12, -12, -12)
+LBL_TRACE_BOUNDS_MAX <- Vector(12, 12, 12)
+
+function LBL_Setup() {
+    if(Entities.FindByName(null, "lightbridgelights_setupdone") != null) {
+        LBL_Dev.msgDeveloper("Setup has already been completed, skipping...")
+        return
+    }
+
+    LBL_Dev.msgDeveloper("Creating cache refresh timer...")
     local loopTimer = CreateEntityByName("logic_timer", {  // cache refresh timer
-        RefireTime = CACHE_REFRESH_TIME
+        RefireTime = LBL_CACHE_REFRESH_TIME
+    })
+    loopTimer.ConnectOutput("OnTimer", "LBL_bridgeCacheRefresh")
+    LBL_bridgeCacheRefresh()  // initial cache
+
+    local loadAuto = CreateEntityByName("logic_auto", {}) // handle loading of saves
+    loadAuto.ConnectOutput("OnLoadGame", "LBL_OnLoadGame")
+
+    local hasBeenSetupEntity = CreateEntityByName("info_target", { // dummy entity to check against to prevent multiple setups
+        targetname = "lightbridgelights_setupdone"
     })
-    loopTimer.ConnectOutput("OnTimer", "bridgeCacheRefresh")
-    bridgeCacheRefresh()  // initial cache
 }
 
-function bridgeCacheRefresh() {
-    if(bridgesCacheMarkedForReset) {
-        foreach(idx, data in bridgesCached) {
-            local bridgeIndex = data.index
-            lightRemoveAtBridge(bridgeIndex)    // prevent duplicate lights
+function LBL_OnLoadGame() {
+    LBL_Dev.msgDeveloper("Load game detected, resetting lights...")
 
-            bridgesCached.remove(idx)   // dont attempt to remove lights at this bridge again
-        }
-        bridgeCacheReset()
-        bridgesCacheMarkedForReset = false
+    // entindexs get messed up on load, meaning all lights need to be reset
+    LBL_bridgesCacheMarkedForReset = true
+    LBL_lightRemoveAll()
+}
+
+function LBL_bridgeCacheRefresh() {
+    if(LBL_bridgesCacheMarkedForReset) {
+        LBL_bridgeCacheReset()
+        LBL_bridgesCacheMarkedForReset = false
     }
 
-    foreach(data in bridgesCached) {
+    foreach(data in LBL_bridgesCached) {
         local bridge = data.bridge
         local bridgeIndex = data.index
 
         // reset the cache if any cached bridges are invalid
         // one small problem with this is it causes all lights to respawn (hence a small flicker), but it's better than crashing
 
         if(!bridge.IsValid()) { 
-            lightRemoveAtBridge(bridgeIndex)
-            bridgesCacheMarkedForReset = true   // wait until next tick to prevent crashes
+            LBL_lightRemoveAtBridge(bridgeIndex)
+            LBL_bridgesCacheMarkedForReset = true   // wait until next tick to prevent crashes
             break
         }
 
-        local lightCountNew = bridgeGetLightCount(bridge)
+        local lightCountNew = LBL_bridgeGetLightCount(bridge)
 
         // get old light count, or use new light count if not found
-        local lightCountOld = (bridgeIndex in bridgeLightCountPrevious) ? bridgeLightCountPrevious[bridgeIndex] : lightCountNew 
+        local lightCountOld = (bridgeIndex in LBL_bridgeLightCountPrevious) ? LBL_bridgeLightCountPrevious[bridgeIndex] : lightCountNew 
 
         // check if light count has changed
         if(lightCountNew != lightCountOld) {
-            if(lightCountNew < lightCountOld) lightRemoveAtBridge(bridgeIndex, lightCountNew)    // remove lights if bridge has shrunk
-            if(lightCountNew > lightCountOld) lightSpawnAtBridge(bridge, lightCountOld) // spawn additional lights
-            bridgeLightCountPrevious[bridgeIndex] <- lightCountNew
+            if(lightCountNew < lightCountOld) LBL_lightRemoveAtBridge(bridgeIndex, lightCountNew)    // remove lights if bridge has shrunk
+            if(lightCountNew > lightCountOld) LBL_lightSpawnAtBridge(bridge, lightCountOld) // spawn additional lights
+            LBL_bridgeLightCountPrevious[bridgeIndex] <- lightCountNew
         }
     }
 
     for(local bridge = null; bridge = Entities.FindByClassname(bridge, "projected_wall_entity");) {
-        if(bridgeIsCached(bridge) || !bridge.IsValid()) continue   // skip cached bridges or invalid bridges
+        if(LBL_bridgeIsCached(bridge) || !bridge.IsValid()) continue   // skip cached bridges or invalid bridges
 
         // update cache with new bridge
 
         local bridgeIndex = bridge.entindex()
 
-        bridgesCached.append({
+        LBL_bridgesCached.append({
             bridge = bridge,
             index = bridgeIndex
         })
 
-        local bridgeLightCount = bridgeGetLightCount(bridge)
-        bridgeLightCountPrevious[bridgeIndex] <- bridgeLightCount   // store initial lightcount in a table based on entindex() for comparison later
+        local bridgeLightCount = LBL_bridgeGetLightCount(bridge)
+        LBL_bridgeLightCountPrevious[bridgeIndex] <- bridgeLightCount   // store initial lightcount in a table based on entindex() for comparison later
 
-        lightSpawnAtBridge(bridge)
+        LBL_lightSpawnAtBridge(bridge)
     }
 }
 
-function bridgeIsCached(bridge) {
-    foreach(data in bridgesCached) {
+function LBL_bridgeIsCached(bridge) {
+    foreach(data in LBL_bridgesCached) {
         if(data.bridge == bridge) return true
     }
     return false
 }
 
-function bridgeCacheReset() {
-    Dev.msgDeveloper("Resetting bridge cache...")
-    bridgesCached <- []
-    bridgeLightCountPrevious <- {}
+function LBL_bridgeCacheReset() {
+    LBL_Dev.msgDeveloper("Resetting bridge cache...")
+
+    foreach(idx, data in LBL_bridgesCached) {
+        local bridgeIndex = data.index
+        LBL_lightRemoveAtBridge(bridgeIndex)    // prevent duplicate lights
+
+        LBL_bridgesCached.remove(idx)   // dont attempt to remove lights at this bridge again
+    }
+
+    LBL_bridgesCached <- []
+    LBL_bridgeLightCountPrevious <- {}
 }
 
-function bridgeCalculateLength(bridge) {
+function LBL_bridgeCalculateLength(bridge) {
     local pos = bridge.GetOrigin()
     local forward = bridge.GetForwardVector()
-    local ray = TraceHull(pos, pos + (forward * TRACE_DISTANCE), TRACE_BOUNDS_MIN, TRACE_BOUNDS_MAX, TRACE_MASK, bridge, TRACE_COLLISION_GROUP)
+    local ray = TraceHull(pos, pos + (forward * LBL_TRACE_DISTANCE), LBL_TRACE_BOUNDS_MIN, LBL_TRACE_BOUNDS_MAX, LBL_TRACE_MASK, bridge, LBL_TRACE_COLLISION_GROUP)
 
-    return Dev.distance(pos, ray.GetEndPos())
+    return LBL_Dev.distance(pos, ray.GetEndPos())
 }
 
-function bridgeGetLightCount(bridge) {
-    local bridgeLength = bridgeCalculateLength(bridge)
+function LBL_bridgeGetLightCount(bridge) {
+    local bridgeLength = LBL_bridgeCalculateLength(bridge)
 
-    return floor(bridgeLength / LIGHT_SPACING) + 1
+    return floor(bridgeLength / LBL_LIGHT_SPACING) + 1
 }
 
-function lightSpawnAtBridge(bridge, currentLightCount = 0) {
-    local bridgeLength = bridgeCalculateLength(bridge)
-    local lightCount = bridgeGetLightCount(bridge)
+function LBL_lightSpawnAtBridge(bridge, currentLightCount = 0) {
+    local bridgeLength = LBL_bridgeCalculateLength(bridge)
+
+    local lightCount = LBL_bridgeGetLightCount(bridge)
+    if(lightCount > LBL_LIGHT_MAXCOUNT) lightCount = LBL_LIGHT_MAXCOUNT  // cap light count to prevent performance issues
+
     local bridgeIndex = bridge.entindex()
 
-    Dev.msgDeveloper("Spawning " + (lightCount - currentLightCount) + " lights.")
+    LBL_Dev.msgDeveloper("Spawning " + (lightCount - currentLightCount) + " lights.")
 
     for(local i = currentLightCount; i < lightCount; i++) { // spawn lights from currentLightCount onwards
-        local distance = (i * LIGHT_SPACING < bridgeLength) ? i * LIGHT_SPACING : bridgeLength  // prevent overshoot on last light
-        local light = lightCreate(bridge.GetOrigin() + (bridge.GetForwardVector() * distance))
+        local distance = (i * LBL_LIGHT_SPACING < bridgeLength) ? i * LBL_LIGHT_SPACING : bridgeLength  // prevent overshoot on last light
+        local light = LBL_lightCreate(bridge.GetOrigin() + (bridge.GetForwardVector() * distance))
 
         light.SetParent(bridge)
         light.__KeyValueFromString("targetname", bridgeIndex + "_light" + i)
     }
 }
 
-function lightCreate(pos) {    // returns light handle
+function LBL_lightCreate(pos) {    // returns light handle
     local light = null
 
     light = CreateEntityByName("light_rt", {
         _lightmode = 3,
         spawnflags = 2
     })
-    light.SetLightColor(LIGHT_COLOUR, LIGHT_BRIGHTNESS)
-    light.SetLightFalloffD50D0(LIGHT_D50, LIGHT_D0)
-    light.SetShadowSize(LIGHT_SHADOWSIZE)
+    light.SetLightColor(LBL_LIGHT_COLOUR, LBL_LIGHT_BRIGHTNESS)
+    light.SetLightFalloffD50D0(LBL_LIGHT_D50, LBL_LIGHT_D0)
+    light.SetShadowSize(LBL_LIGHT_SHADOWSIZE)
 
     light.Spawn()
     light.SetOrigin(pos)
 
+    light.__KeyValueFromInt("max_health", LBL_LIGHT_SPECIFIC_HEALTH) // needed to detect light entities later
+
     return light
 }
 
-function lightRemoveAtBridge(bridgeIndex, numLightsToKeep = 0) { 
-    Dev.msgDeveloper("Removing lights from bridgeIndex " + bridgeIndex + " starting at light index " + numLightsToKeep + ".")
+function LBL_lightRemoveAtBridge(bridgeIndex, numLightsToKeep = 0) { 
+    LBL_Dev.msgDeveloper("Removing lights from bridgeIndex " + bridgeIndex + " starting at light index " + numLightsToKeep + ".")
 
     // how many lights could ever exist on this bridge given the current settings
-    local numLightsPotential = (TRACE_DISTANCE / LIGHT_SPACING) 
+    local numLightsPotential = (LBL_TRACE_DISTANCE / LBL_LIGHT_SPACING) 
 
     for(local i = numLightsToKeep; i < numLightsToKeep + numLightsPotential; i++) { // remove all lights from index numLightsToKeep onwards
         local light = Entities.FindByName(null, bridgeIndex + "_light" + i)
-        if(light != null) Dev.EntFireByHandleCompressed(light, "Kill")
+        if(light != null) LBL_Dev.EntFireByHandleCompressed(light, "Kill")
     }
 }
 
-scriptStart()
+function LBL_lightRemoveAll() {
+    LBL_Dev.msgDeveloper("Removing all bridge lights...")
+
+    for(local light = null; light = Entities.FindByClassname(light, "light_rt");) {
+        if(light.GetMaxHealth() == LBL_LIGHT_SPECIFIC_HEALTH) { // only remove lights created by this script
+            LBL_Dev.EntFireByHandleCompressed(light, "Kill")
+        }
+    }
+
+    LBL_bridgeCacheReset()
+}
+
+LBL_auto <- CreateEntityByName("logic_auto", {spawnflags = 1})
+LBL_auto.ConnectOutput("OnNewGame", "LBL_scriptInit")

player_blood/addon.kv3

@@ -1,7 +1,7 @@
 <!-- kv3 encoding:text:version{e21c7f3c-8a33-41c5-9977-a76d3a32aa0d} format:generic:version{7412167c-06e9-4698-aff2-e63eb59037e7} -->
 {
 	mod = "Player Blood (★)"
-	description = "Re-enables player blood, as seen in Portal 1.\n\nVersion 1.0.0"
+	description = "Re-enables player blood, as seen in Portal 1.\n\nVersion 1.0.1"
 	type = ""
 	id = 0
 	thumbnail = ".assets/thumb.jpg"

player_blood/scripts/vscripts/sv_init.nut

@@ -1,22 +1,15 @@
-// sv_init.nut runs before entities have spawned + on every game load. wait until entities are ready before running
-function initStart() {
-    local initStartTimer = CreateEntityByName("logic_timer", {   // check every tick if entities have actually spawned in yet
-        targetname = "playerblood_canstarttimer"
-        RefireTime = 0.01
-    })
+if(!("Entities" in this)) return
 
-    initStartTimer.ConnectOutput("OnTimer", "Init")
-    EntFire("playerblood_canstarttimer", "Enable")
-}
-function Init() {   // if player exists, other entities exist
+function PB_Init() {   // if player exists, other entities exist
     local player = GetPlayer()
     if(player != null) {
-        EntFire("playerblood_canstarttimer", "Kill")    // prevent further inits
-
         player.__KeyValueFromString("bloodcolor", "0")  // enable blood
         if(GetDeveloperLevel() > 0) printl("[PLAYER BLOOD - DEV] Enabled player blood.")
+    } else {
+        printl("[PLAYER BLOOD - ERROR] Player entity not found!")
     }
 }
 
-// run the script
-initStart()
+// run the script on spawn
+PB_auto <- CreateEntityByName("logic_auto", {spawnflags = 1})
+PB_auto.ConnectOutput("OnNewGame", "PB_Init")

unused_turret_vo/addon.kv3

@@ -1,7 +1,7 @@
 <!-- kv3 encoding:text:version{e21c7f3c-8a33-41c5-9977-a76d3a32aa0d} format:generic:version{7412167c-06e9-4698-aff2-e63eb59037e7} -->
 {
 	mod = "Unused Turret VO (★)"
-	description = "Reimplements the unused Turret VO found within Portal's files.\n\nAlso adds logic to restore lines designed to play if Turrets are blocked by a Hard Light Bridge.\n\nOverall, a total of 28 additional voicelines have the ability to play.\n\nVersion 1.2.0"
+	description = "Reimplements the unused Turret VO found within Portal's files.\n\nAlso adds logic to restore lines designed to play if Turrets are blocked by a Hard Light Bridge.\n\nOverall, a total of 28 additional voicelines have the ability to play.\n\nVersion 1.2.1"
 	type = "Asset Pack"
 	id = 0
 	thumbnail = ".assets/thumb.jpg"