repo: merge beta into main addon

.gitignore

@@ -3,3 +3,5 @@ maps/sc_highschool.bsp
 maps/sc_hospital.bsp
 /.idea/
 maps/sc_redforest.bsp
+*.bak
+_workshop/**

gamemodes/slashco/entities/effects/rocks_lightning.lua

@@ -0,0 +1,75 @@
+local mat = Material("cable/blue_elec")
+function EFFECT:Init(data)
+	self.StartPos = data:GetStart()
+	self.HitPos = data:GetOrigin()
+	self.fDelta = 3
+	self.Entity:SetRenderBoundsWS(self.StartPos, self.HitPos)
+	self.BeamSize = 16
+	self.DieTime = CurTime() + math.Rand(0.5,1.0)
+end
+
+function EFFECT:Think()
+	return not (CurTime() > self.DieTime)
+end
+
+local rng_vec = Vector()
+local color = Color(143, 167, 240, 255)
+function EFFECT:Render()
+	self.fDelta = math.Max(self.fDelta - 0.5, 0)
+	self.BeamSize = math.Max(self.BeamSize - 0.05, 0)
+	render.SetMaterial(mat)
+
+	local start_pos = self.StartPos
+	local end_pos = self.HitPos
+	local dir = (end_pos - start_pos)
+	local increment = dir:Length() / 12
+	dir:Normalize()
+
+	// set material
+	render.SetMaterial(mat)
+
+	// start the beam with 14 points
+	render.StartBeam(14)
+
+	local curTime = CurTime()
+
+	// add start
+	render.AddBeam(
+		start_pos,				// Start position
+		self.BeamSize,					// Width
+		curTime,				// Texture coordinate
+		color		// Color
+	)
+
+	for i = 1, 12 do
+		// get point
+		local point = start_pos + dir
+		point:Mul(i * increment)
+
+		rng_vec:Random(-1, 1)
+		point:Add(rng_vec)
+		point:Mul(math.random(1, 8))
+
+		// texture coords
+		local tcoord = curTime + (1 / 12) * i
+
+		// add point
+		render.AddBeam(
+			point,
+			self.BeamSize,
+			tcoord,
+			color
+		)
+	end
+
+	// add the last point
+	render.AddBeam(
+		end_pos,
+		self.BeamSize,
+		curTime + 1,
+		color
+	)
+
+	// finish up the beam
+	render.EndBeam()
+end

gamemodes/slashco/entities/effects/sid_muzzle.lua

@@ -2,7 +2,7 @@ function EFFECT:Init(data)
 	local vOffset = data:GetOrigin()
 	--local Dir = data:GetStart()
 
-	local Dir = Entity(1):EyeAngles():Forward()
+	local Dir = data:GetEntity():EyeAngles():Forward()
 
 	local NumParticles = 32
 
@@ -66,19 +66,19 @@ function EFFECT:Init(data)
 
 			particleflash:SetAngleVelocity(Angle(math.Rand(-25, 25), math.Rand(-25, 25), math.Rand(-25, 25)))
 		end
-
-		if i == 1 then
-			local dlight = DynamicLight(24984)
-			if dlight then
-				dlight.pos = vOffset
-				dlight.r = 255
-				dlight.g = 100
-				dlight.b = 100
-				dlight.brightness = 3
-				dlight.Decay = 1000
-				dlight.Size = 150
-				dlight.DieTime = CurTime() + 0.12
-			end
+	end
+
+	if GameData.CURRENT_SID then
+		local dlight = DynamicLight(MAX_EDICT + GameData.CURRENT_SID:EntIndex())
+		if dlight then
+			dlight.pos = vOffset
+			dlight.r = 255
+			dlight.g = 100
+			dlight.b = 100
+			dlight.brightness = 3
+			dlight.Decay = 1000
+			dlight.Size = 150
+			dlight.DieTime = CurTime() + 0.12
 		end
 	end
 

gamemodes/slashco/entities/entities/func_sc_limitedzone.lua

@@ -98,6 +98,44 @@ function ENT:Leave(ent)
 	end
 end
 
+hook.Add("SlashCo:Precache", "PrecacheZone", function()
+	for k=1, 5 do
+		SlashCo.PrecacheSound("physics/flesh/flesh_impact_bullet" .. k .. ".wav")
+	end
+
+	SlashCo.PrecacheSound("physics/flesh/flesh_bloody_break.wav")
+
+	for k=1, 3 do
+		SlashCo.PrecacheSound("physics/flesh/flesh_strider_impact_bullet" .. k .. ".wav")
+	end
+
+	for k=1, 4 do
+		SlashCo.PrecacheSound("physics/glass/glass_pottery_break" .. k .. ".wav")
+	end
+
+	for k=1, 4 do
+		SlashCo.PrecacheSound("physics/glass/glass_strain" .. k .. ".wav")
+	end
+
+	for k=1, 4 do
+		SlashCo.PrecacheSound("physics/flesh/flesh_squishy_impact_hard" .. k .. ".wav")
+	end
+
+	SlashCo.PrecacheSound("physics/flesh/flesh_bloody_break.wav")
+
+	for k=1, 4 do
+		SlashCo.PrecacheSound("physics/flesh/flesh_squishy_impact_hard" .. k .. ".wav")
+	end
+
+	for k=1, 4 do
+		SlashCo.PrecacheSound("physics/glass/glass_pottery_break" .. k .. ".wav")
+	end
+
+	for k=1, 4 do
+		SlashCo.PrecacheSound("physics/glass/glass_strain" .. k .. ".wav")
+	end
+end)
+
 local damageSounds = {
 	[1] = function(ent, damage)
 		--default

gamemodes/slashco/entities/entities/func_sc_lobby_elevator_ready_zone.lua

@@ -0,0 +1,23 @@
+ENT.Type = "brush"
+
+function ENT:Initialize()
+	self:SetTrigger(true)
+
+	GameData.PlayersInElevatorZone = GameData.PlayersInElevatorZone or {}
+end
+
+function ENT:StartTouch(ent)
+	if not ent:IsPlayer() then return end
+
+	-- RaphaelIT7: We reference count to avoid the case that a mapper screwed up if they put zones INTO each other.
+	GameData.PlayersInElevatorZone[ent] = (GameData.PlayersInElevatorZone[ent] or 0) + 1
+end
+
+function ENT:EndTouch(ent)
+	if not ent:IsPlayer() then return end
+
+	GameData.PlayersInElevatorZone[ent] = GameData.PlayersInElevatorZone[ent] - 1
+	if GameData.PlayersInElevatorZone[ent] == 0 then
+		GameData.PlayersInElevatorZone[ent] = nil
+	end
+end

gamemodes/slashco/entities/entities/info_sc_battery/init.lua

@@ -64,6 +64,7 @@ function ENT:OnSpawn()
 	Ent:SetPos(pos)
 	Ent:SetAngles(ang)
 	Ent:Spawn()
+	Ent:AddEFlags(EFL_KEEP_ON_RECREATE_ENTITIES)
 
 	return Ent
 end

gamemodes/slashco/entities/entities/info_sc_blackout_trollge_path.lua

@@ -0,0 +1,84 @@
+--[[
+	Map entity meant to only be used in the Lobby.
+]]
+
+ENT.Type = "point"
+
+if CLIENT then return end
+
+GameData.TrollgePaths = GameData.TrollgePaths or {}
+function ENT:Initialize()
+	GameData.TrollgePaths[self.PathName] = self
+end
+
+function ENT:OnRemove()
+	GameData.TrollgePaths[self.PathName] = nil
+end
+
+local PATH_TYPE_START = 0
+local PATH_TYPE_MOVE = 1
+local PATH_TYPE_DOOR = 2
+local PATH_TYPE_FINISH = 3
+
+local PATH_AREA_INSIDE = 0
+local PATH_AREA_OUTSIDE = 1
+
+function SlashCo.FindNextBlackoutPath(inside, currentPath, backwards)
+	if not currentPath then
+		for _, path in pairs(GameData.TrollgePaths) do
+			if path.PathType == PATH_TYPE_START then
+				if inside and path.PathArea == PATH_AREA_INSIDE then
+					return path.PathName, path:GetPos()
+				end
+
+				if not inside and path.PathArea == PATH_AREA_OUTSIDE then
+					return path.PathName, path:GetPos()
+				end
+			end
+		end
+
+		return nil, nil
+	end
+
+	local path = GameData.TrollgePaths[currentPath]
+	if not IsValid(path) then return nil, nil end
+	if backwards then
+		for _, prev in pairs(GameData.TrollgePaths) do
+			if prev.NextPath == currentPath then
+				return prev.PathName, prev:GetPos(), prev.PathType == PATH_TYPE_DOOR
+			end
+		end
+
+		return nil, nil
+	end
+
+	if not path.NextPath then return nil, nil end
+
+	local nextPath = GameData.TrollgePaths[path.NextPath]
+	if not IsValid(nextPath) then return nil, nil end
+
+	return nextPath.PathName, nextPath:GetPos(), nextPath.PathType == PATH_TYPE_DOOR
+end
+
+function ENT:KeyValue(key, value)
+	key = string.lower(key)
+	if key == "path_type" then
+		self.PathType = tonumber(value)
+		return
+	end
+
+	if key == "path_area" then
+		self.PathArea = tonumber(value)
+		return
+	end
+
+	if key == "path_name" then
+		self.PathName = value
+		return
+	end
+
+	if key == "path_next" then
+		self.NextPath = value
+		return
+	end
+end

gamemodes/slashco/entities/entities/info_sc_document/init.lua

@@ -0,0 +1,6 @@
+ENT.Type = "point"
+ENT.Base = "sc_forciblespawnbase"
+
+function ENT:OnSpawn()
+	return SlashCo.CreateDocument(self:GetPos(), self:GetAngles())
+end

gamemodes/slashco/entities/entities/info_sc_generator/init.lua

@@ -14,6 +14,7 @@ function ENT:OnSpawn()
 	Ent:SetPos(pos)
 	Ent:SetAngles(ang)
 	Ent:Spawn()
+	Ent:AddEFlags(EFL_KEEP_ON_RECREATE_ENTITIES)
 
 	return Ent
 end

gamemodes/slashco/entities/entities/info_sc_lobby_briefingscreen.lua

@@ -0,0 +1,32 @@
+ENT.Type = "point"
+
+function ENT:Initialize()
+	SetGlobal2Vector("SlashCo:BriefingUIPos", self:GetPos())
+	SetGlobal2Angle("SlashCo:BriefingUIAng", self:GetAngles())
+end
+
+ENT.OnMapToolRedo = ENT.Initialize
+ENT.OnMapToolUndo = ENT.Initialize
+
+-- Call this once you changed the Global2 values above to your new values
+concommand.Add("slashco_maptool_applybriefingscreen", function(ply)
+	if not ply or (IsValid(ply) and not ply:IsListenServerHost()) then return end
+
+	local ent = ents.FindByClass("info_sc_lobby_briefingscreen")[1]
+	if not IsValid(ent) then return end
+
+	SlashCo.MapTools.SetEntityPositionAndAngle(ent, GetGlobal2Vector("SlashCo:BriefingUIPos"), GetGlobal2Angle("SlashCo:BriefingUIAng"))
+end)
+
+local angRotation = Angle(0, 90, 90)
+concommand.Add("slashco_maptool_setbriefingscreen", function(ply)
+	if not ply or (IsValid(ply) and not ply:IsListenServerHost()) then return end
+
+	SlashCo.MapTools.IsEnabled()
+	local eyeTrace = ply:GetEyeTrace()
+	SetGlobal2Vector("SlashCo:BriefingUIPos", eyeTrace.HitPos)
+
+	local traceAngle = eyeTrace.HitNormal:Angle()
+	traceAngle:Add(angRotation)
+	SetGlobal2Angle("SlashCo:BriefingUIAng", traceAngle)
+end)

gamemodes/slashco/entities/entities/info_sc_lobby_documentscreen.lua

@@ -0,0 +1,32 @@
+ENT.Type = "point"
+
+function ENT:Initialize()
+	SetGlobal2Vector("SlashCo:DocumentUIPos", self:GetPos())
+	SetGlobal2Angle("SlashCo:DocumentUIAng", self:GetAngles())
+end
+
+ENT.OnMapToolRedo = ENT.Initialize
+ENT.OnMapToolUndo = ENT.Initialize
+
+-- Call this once you changed the Global2 values above to your new values
+concommand.Add("slashco_maptool_applydocumentscreen", function(ply)
+	if not ply or (IsValid(ply) and not ply:IsListenServerHost()) then return end
+
+	local ent = ents.FindByClass("info_sc_lobby_documentscreen")[1]
+	if not IsValid(ent) then return end
+
+	SlashCo.MapTools.SetEntityPositionAndAngle(ent, GetGlobal2Vector("SlashCo:DocumentUIPos"), GetGlobal2Angle("SlashCo:DocumentUIAng"))
+end)
+
+local angRotation = Angle(0, 90, 90)
+concommand.Add("slashco_maptool_setdocumentscreen", function(ply)
+	if not ply or (IsValid(ply) and not ply:IsListenServerHost()) then return end
+
+	SlashCo.MapTools.IsEnabled()
+	local eyeTrace = ply:GetEyeTrace()
+	SetGlobal2Vector("SlashCo:DocumentUIPos", eyeTrace.HitPos)
+
+	local traceAngle = eyeTrace.HitNormal:Angle()
+	traceAngle:Add(angRotation)
+	SetGlobal2Angle("SlashCo:DocumentUIAng", traceAngle)
+end)

gamemodes/slashco/entities/entities/info_sc_player_employee/init.lua

@@ -1,13 +1,3 @@
 ENT.Type = "point"
 ENT.Base = "sc_spawnbase"
-ENT.Team = TEAM_SURVIVOR
-
-function ENT:Initialize()
-	self.TimerIndex = math.random(1000000000)
-end
-
-function ENT:OnSpawn()
-	timer.Create("SlashCoSpawn_" .. self.TimerIndex, 5, 1, function()
-		self.SpawnedEntity = nil
-	end)
-end
+ENT.Team = TEAM_SURVIVOR