Pull in more changes

Author: TeamSpen210

fgd/bases/BasePaintType.fgd

@@ -5,21 +5,23 @@
 	painttype(choices) : "Paint Type" : 0 : "The type of Gel created." =
 		[
 		0: "Repulsion Gel"
-		1: "Reflection Gel / Adhesion Gel"
+		1: "Reflection Gel / Adhesion Gel" [-Strata]
 		2: "Propulsion Gel"
 		3: "Conversion Gel"
 		4: "Cleansing Gel"
+		5: "Adhesion Gel" [+Strata]
 		]
 
 	skin[engine](integer) : "Skin" : 0
 
 	skin(choices) : "[H] Paint Type" : 0 : "The type of gel displayed in Hammer." =
 		[
 		0: "Repulsion Gel"
-		1: "Reflection Gel / Adhesion Gel"
+		1: "Reflection Gel / Adhesion Gel" [-Strata]
 		2: "Propulsion Gel"
 		3: "Conversion Gel"
 		4: "Cleansing Gel"
+		5: "Adhesion Gel" [+Strata]
 		]
 
 	]

fgd/bases/BasePortalCube.fgd

@@ -24,12 +24,12 @@
 
 	input Dissolve(void) : "Fizzles the cube, firing the OnFizzled output."
 	input SilentDissolve(void) : "Kills the cube immediately and fires its OnFizzled output."
-	input ExitDisabledState(void) : "Exits the disabled state of a reflective cube."
 
 	// Outputs
 	output OnOrangePickUp(void) : "P-Body picked up the cube."
 	output OnBluePickUp(void) : "ATLAS picked up the cube."
 	output OnPlayerPickup(void) : "Any player picked up the cube."
 	output OnPhysGunDrop(void) : "Any player dropped the cube."
-	output OnPainted(void) : "Cube got painted, only if the state changed."
+	output OnPainted[-Strata](void) : "Cube got painted, only if the state changed."
+	output OnPainted[Strata](integer) : "Cube got painted, only if the state changed. Has the paint type as parameter."
 ]

fgd/point/ambient/ambient_generic.fgd

@@ -16,9 +16,8 @@
 	message(sound) report: "Sound Name" : : "Name of the GameSound entry for the sound to play. Also supports direct .wav filenames."
 	health(integer) : "Volume" : 10 : "Sound volume, expressed as a range from 0 to 10, where 10 is the loudest."
 
-	radius(float) : "Sound Range" : 1250 : "Maximum distance at which this sound is audible. Overriden by soundscripts."
-	
-	pitch(integer) : "Pitch" : 100 : "Sound pitch, expressed as a range from 1(low) to 255(high), where 100 is the sound's default pitch. Overriden by soundscripts."
+	radius(float) : "Sound Range" : 1250 : "Maximum distance at which this sound is audible. Overridden by soundscripts."
+	pitch(integer) : "Pitch" : 100 : "Sound pitch, expressed as a range from 1(low) to 255(high), where 100 is the sound's default pitch. Overridden by soundscripts."
 
 	sourceentityname(target_destination) : "Source Entity" : : "If an entity is specified, sound will come from this named entity instead of the location of ambient_generic."
 

fgd/point/env/env_cascade_light.fgd

@@ -1,9 +1,11 @@
 @PointClass base(BaseEntityPoint, EnableDisable) 
 	appliesto(since_CSGO, MESA) 
-	iconsprite("editor/shadow_control.vmt") 
+	iconsprite[-Strata]("editor/shadow_control.vmt") 
+	iconsprite[+Strata]("editor/env_cascade_light.vmt")
+	lightprop("models/editor/spot.mdl")
 = env_cascade_light: "An entity to control the sunlight that casts cascaded shadows in the map."
 	[
-	angles(angle) : "Pitch Yaw Roll (Y Z X)" : "50 40 0" : "This is the shadow casting direction. " +
+	angles(angle) : "Pitch Yaw Roll (Y Z X)" : "50 43 0" : "This is the shadow casting direction. " +
 		"Pitch is rotation around the Y axis, " +
 		"yaw is the rotation around the Z axis, and " +
 		"roll is the rotation around the X axis. " +
@@ -34,7 +36,7 @@
 	ViewModelSlopescaledepthbias[MESA](float) : "ViewModelSlopescaledepthbias" : "0.9" : "DepthBias for viewmodel cascade"
 
 	CSMVolumeMode[engine](integer) : "Volume Mode"
-	CSMVolumeMode(choices) : "CSM_Volume_Mode" : 0 : "CSM Volume Modes " +
+	CSMVolumeMode[-Strata](choices) : "CSM_Volume_Mode" : 0 : "CSM Volume Modes " +
 		"- Auto: Static cache will update once every 10 frames (approx) covering max shadow distance or whole map around player. " +
 		"Manual : Static cache area coverage and updates are managed via csm volumes i/o. \n " +
 		"Use Manual mode for better quality and performence. \n " +
@@ -46,6 +48,7 @@
 
 	// Inputs
 	input LightColor(color255) : "Set the light color."
+	input LightColorScale[Strata](integer) : "Set the light color scale"
 	input SetAngles(string) : "Set the sun direction."
 
 	input SetCSMVolume[MESA](void) : "Set CSM Volume via trigger volume"

fgd/point/env/env_cubemap.fgd

@@ -26,6 +26,10 @@
 		"Optionally assigns this cubemap a bounding box for parallax correction " +
 		"(brush entity tied to parallax_obb). " +
 		"This means the cubemap reflection will move as the camera moves, similar to func_reflective_glass. "
+	parallaxobb[Strata](target_destination) : "Cubemap Bounds" : : "" +
+		"Optionally assigns this cubemap a bounding box for parallax correction " +
+		"(brush entity tied to parallax_obb). " +
+		"This means the cubemap reflection will move as the camera moves, similar to func_reflective_glass. "
 
 		@resources []
 	]

fgd/point/env/env_fog_controller.fgd

@@ -48,4 +48,5 @@
 	input StartFogTransition[since_EP1](void) : "Start fog transition."
 	input SetMaxDensityLerpTo[since_P2, GMOD](float) : "Set max density lerp to."
 	input SetZoomFogScale[since_CSGO](void) : "Set the value the fog will scale the default value by when players are zoomed in (scoped)."
+	input ActivateAllPlayers[Strata](void) : "Activates this fog controller for all players"
 	]

fgd/point/env/env_global.fgd

@@ -1,7 +1,7 @@
 @PointClass base(BaseEntityPoint)
 	color(200 0 0)
 	iconsprite("editor/env_global.vmt")
-= env_global: "An entity to control a game-specific global states."
+= env_global: "An entity that controls game-specific global states."
 	[
 
 	globalstate[engine](string) : "Global State to Set"
@@ -108,7 +108,8 @@
 		]
 
 	initialstate[engine](integer) : "Initial State" : 0
-	initialstate(choices) : "Initial State" : 0 =
+	initialstate(choices) : "Initial State" : 0 : "Controls the active state for this global. " +
+		"Setting this to \"Dead\" permanently disables this global, and will not persist during level transitions." =
 		[
 		0: "Off"
 		1: "On"
@@ -129,16 +130,18 @@
 	input Remove(void) : "Set state of global to DEAD."
 	input SetCounter(integer) : "Sets the counter value of this global."
 	input AddToCounter(integer) : "Adds to the counter value of this global. Negative numbers subtract."
-	input GetCounter[!INFRA, !MBASE](void) : "Causes the Counter output to be fired, passing the current counter value for this global. This doesn't work properly."
+	input GetCounter[!INFRA, !MBASE, !Strata](void) : "Causes the Counter output to be fired, passing the current counter value for this global. This doesn't work properly."
 	input GetCounter[INFRA](void) : "Causes the OnGetCounter output to be fired, passing the current counter value for this global."
 	input GetCounter[MBASE](void) : "Causes the OutCounter output to be fired, passing the current counter value for this global."
 
 	// Outputs
 	// This counter output is overwritten by the KV above, making it non-functional.
 	// INFRA and Mapbase rename it to fix that.
-	output Counter[!INFRA, !MBASE](integer) : "Fired in response to the GetCounter input, passing the current value of the counter."
+	// Strata specially handles the KV to support both.
+	output Counter[!INFRA, !MBASE, !Strata](integer) : "This has the same name as the keyvalue, so it does not function."
 	output OutCounter[MBASE](integer) : "Fired in response to the GetCounter input, passing the current value of the counter."
 	output OnGetCounter[INFRA](integer) : "Fired in response to the GetCounter input, passing the current value of the counter."
+	output Counter[Strata](integer) : "Fired in response to the GetCounter input, passing the current value of the counter."
 
 	@resources []
 	]

fgd/point/env/env_portal_laser.fgd

@@ -14,6 +14,15 @@
 
 	startstate(boolean) : "Start Disabled" : 0
 
+	beamcolor[engine](color255) : "Laser Beam Color" : "255 0 0 255"
+	beamcolor[Strata](choices): "Laser Beam Color" : "255 0 0 255" : "The color of the laser. You can also specify a custom RGBA color here." = #snippet "StrataDisBeamColor"
+	DisablePlayerCollision(boolean): "Player Collision" : 0
+	DisablePlayerCollision[Strata](choices): "Player Collision" : 0 : "Override to disable player collision for this laser. If set to 0 (default), sv_player_collide_with_laser will determine whether or not to collide. If 1, laser collision will be disabled." =
+		[
+		0: "Default Behavior"
+		1: "Force Off"
+		]
+
 	lethaldamage[engine](boolean) : "Lethal" : 0
 	lethaldamage(choices) : "Lethal" : 0 : "Instant kill on contact. Buggy when redirected through cubes/portals." =
 		[
@@ -33,6 +42,7 @@
 	input Toggle(void) : "Toggle the laser on and off."
 	input TurnOn(void) : "Turn the laser on."
 	input TurnOff(void) : "Turn the laser off."
+	input SetBeamColor[Strata](color255) : "Changes the laser colour."
 
 	@resources // We know it needs at least these.
 		[

fgd/point/env/env_projectedtexture.fgd

@@ -16,7 +16,7 @@
 		]
 
 	target(target_destination) : "target" : : "target"
-	dontfollowtarget[MBase](boolean) : "Don't Follow Target" : 0 : "Prevents this entity from trying to point at its target, if it has one. Intended for when you want to use 'Light Only Target' without the entity trying to point to it."
+	dontfollowtarget[MBase, -Strata](boolean) : "Don't Follow Target" : 0 : "Prevents this entity from trying to point at its target, if it has one. Intended for when you want to use 'Light Only Target' without the entity trying to point to it."
 	lightfov(float) : "FOV" : 90.0 : "FOV"
 	nearz(float) : "NearZ" : 4.0 : "Specifies the distance at which shadow casting begins. Ideally increase this until just before any objects." 
 	farz(float) : "FarZ" : 750.0 : "Specifies the distance at which shadow casting finishes. Increase this to cover the most distant surfaces."
@@ -29,7 +29,10 @@
 		0: "Low"
 		1: "High"
 		]
-	shadowfilter[MBase](float) : "Shadow Filter Size" : "0.5" : "The amount to filter the shadows. This blurs shadows to make them appear less pixelated, but higher values may have more visible noise."
+	shadowfilter[MBase, -Strata](float) : "Shadow Filter Size" : "0.5" : "The amount to filter the shadows. This blurs shadows to make them appear less pixelated, but higher values may have more visible noise."
+	_dynamicshadowallocation[Strata](boolean): "Use dynamic shadow allocation" : 0 : "Determines whether the map (static) or the engine (dynamic) should dictate the size of the shadows for this light."
+	_initialshadowsize[Strata](integer): "Initial Shadow Size" : 7 : "The initial static shadow resolution exponent. Only relevant for static shadow allocation. Adding 1 to this value doubles both dimensions of the shadowmap."
+	_shadowscale[Strata](float): "Shadow Size Scale" : "1.0" : "Scales the shadowmap resolution exponent. Only relevant for dynamic shadow allocation. For example, a scale of 3.0 will give this light shadowmaps 8 (2^3) times as large as they would usually be."
 
 	lightonlytarget(boolean) : "Light Only Target" : 0 : "Limit flashlight effect to only effect target entity."
 	lightworld(boolean) : "Light World" : 1 : "Control whether flashlight effects static world geometry."
@@ -43,10 +46,10 @@
 
 	colortransitiontime[since_ASW](float) : "Color Transition Speed" : 0.5 : "Controls the speed the transition takes. 1.0 means the color can change by a full 255 over 1 second."
 
-	constant_attn[MBase, TF2](float) : "Constant" : "0" : "The light's constant attenuation, giving the light no falloff. (This value is internally corrected with x*0.5)"
-	linear_attn[MBase, TF2](float) : "Linear" : "1" : "The light's linear attenuation, giving the light linear decline. This is the most common attenuation for projected textures. (This value is internally corrected with x*100)"
-	quadratic_attn[MBase, TF2](float) : "Quadratic" : "0" : "The light's quadratic attenuation, giving the light exponentially decreasing falloff. (This value is internally corrected with x*10000)"
-	shadowatten[MBase, TF2](float) : "Shadow Atten" : "0.0" : "The attenuation of the shadows, " +
+	constant_attn[MBase, TF2, -Strata](float) : "Constant" : "0" : "The light's constant attenuation, giving the light no falloff. (This value is internally corrected with x*0.5)"
+	linear_attn[MBase, TF2, -Strata](float) : "Linear" : "1" : "The light's linear attenuation, giving the light linear decline. This is the most common attenuation for projected textures. (This value is internally corrected with x*100)"
+	quadratic_attn[MBase, TF2, -Strata](float) : "Quadratic" : "0" : "The light's quadratic attenuation, giving the light exponentially decreasing falloff. (This value is internally corrected with x*10000)"
+	shadowatten[MBase, TF2, -Strata](float) : "Shadow Atten" : "0.0" : "The attenuation of the shadows, " +
 		"or how much the shadows should fade into the light of the projected texture, if at all. " +
 		"The player's flashlight uses 0.35 by default, " +
 		"although higher values may be needed for a visible effect."
@@ -55,10 +58,13 @@
 	texturename(texture) : "Texture Name" : "effects/flashlight001" : "VTF Texture to 'project' onto the enviroment. " + 
 		"Please note that env_projectedtexture uses .vtf files directly and does not use .vmt files. " +
 		"The material browser is only available here to assist with finding textures since materials typically have the same name as their textures."
+	moviename[Strata](string): "Movie Name" : : ".webm file used in place of the texture."
 	textureframe(integer) : "Texture Frame" : 0 : "If the VTF is multi-frame, specify the frame to use."
 
-	alwaysdraw[MBase](boolean)	: "Always Draw" : 0 : "Always draws the projected texture, regardless of whether the player can see its frustum. Use this for projected textures that can be seen on monitors or in the skybox."
-	ProjectedTextureVersion[MBase](integer) readonly : "Projected Texture Version" : 1  : "(Don't change). Differentiates between projected textures built before/outside of Mapbase and projected textures using new features."
+	alwaysdraw[MBase, -Strata](boolean)	: "Always Draw" : 0 : "Always draws the projected texture, regardless of whether the player can see its frustum. Use this for projected textures that can be seen on monitors or in the skybox."
+	ProjectedTextureVersion[MBase, -Strata](integer) readonly : "Projected Texture Version" : 1  : "(Don't change). Differentiates between projected textures built before/outside of Mapbase and projected textures using new features."
+	volumetric[Strata](boolean): "Enable Volumetrics" : 0 : "Enables/disables volumetrics from this projected texture."
+	volumetricintensity[Strata](float): "Volumetric Intensity" : "1.0" : "Sets the intensity of the volumetric lighting."
 
 	style[engine](integer) : "Appearance" : 0
 	style[since_P2, GMOD](choices) : "Appearance" : "0" = #snippet LightStyle
@@ -84,32 +90,41 @@
 
 	// Disabled by Valve in the code, emits console message.
 	input SpotlightTexture[!CSGO, !P2](string) : "Set the spotlight texture"
+	input SpotlightTexture[Strata](string) : "Set the spotlight texture"
+	input SetSpotlightTextureFrame[Strata](integer) : "Sets the spotlight texture frame"
 
 	input EnableShadows(boolean) : "Set if the shadows are enabled."
 	input LightColor[since_ASW, MBase, GMOD](color255) : "Change the light color/brightness"
 	input SetLightStyle[since_P2, GMOD](integer) : "Change the lightstyle (see Appearance field for possible values)."
 	input SetPattern[since_P2, GMOD](string) : "Set a custom pattern of light brightness for this light. " +
 		"The Pattern format is a string of characters, where 'a' is total darkness, 'z' fully bright. i.e. " +
 		"'aaggnnttzz' would be a steppy fade in from dark to light."
-	input SetBrightness[MBase](float) : "Sets brightness."
-	input SetColorTransitionTime[MBase](float)	: "Sets the color transition time."
-
-	input SetConstant[MBase](float)    : "Sets the constant attenuation."
-	input SetLinear[MBase](float)      : "Sets the linear attenuation."
-	input SetQuadratic[MBase](float)   : "Sets the quadratic attenuation."
-	input SetFilter[MBase](float)      : "Sets the shadow filter."
-	input SetShadowAtten[MBase](float) : "Sets the shadow attenuation."
-	input SetSpotlightFrame[MBase](string) : "Sets the spotlight texture frame."
-	input AlwaysDrawOn[MBase](void) : "Turns off BBox culling (for skybox or monitor lights)"
-	input AlwaysDrawOff[MBase](void) : "Turns on BBox culling if it was off before"
-	input StopFollowingTarget[MBase](void)	: "Causes this entity to stop following the target, if it has one"
-	input StartFollowingTarget[MBase](void) : "Causes this entity to start following the target if it was set to not follow it before"
+	input SetBrightness[MBase, -Strata](float) : "Sets brightness."
+	input SetColorTransitionTime[MBase, -Strata](float)	: "Sets the color transition time."
+
+	input SetConstant[MBase, -Strata](float)    : "Sets the constant attenuation."
+	input SetLinear[MBase, -Strata](float)      : "Sets the linear attenuation."
+	input SetQuadratic[MBase, -Strata](float)   : "Sets the quadratic attenuation."
+	input SetFilter[MBase, -Strata](float)      : "Sets the shadow filter."
+	input SetShadowAtten[MBase, -Strata](float) : "Sets the shadow attenuation."
+	input SetSpotlightFrame[MBase, -Strata](string) : "Sets the spotlight texture frame."
+	input AlwaysDrawOn[MBase, -Strata](void) : "Turns off BBox culling (for skybox or monitor lights)"
+	input AlwaysDrawOff[MBase, -Strata](void) : "Turns on BBox culling if it was off before"
+	input StopFollowingTarget[MBase, -Strata](void)	: "Causes this entity to stop following the target, if it has one"
+	input StartFollowingTarget[MBase, -Strata](void) : "Causes this entity to start following the target if it was set to not follow it before"
 
 	input SetNearZ[since_P2, GMOD](float) : "Sets the near Z distance."
 	input SetFarZ[since_P2, GMOD](float) : "Sets the far Z distance."
 	input LightOnlyTarget[INFRA](bool) : "Set if the projected texture lights the target only."
 	input LightWorld[INFRA](bool) : "Set if the projected texture lights the world and static geometry."
 	input Ambient[GMod, INFRA](float) : "Set ambient light amount"
 
+	input LightOnlyTarget[Strata](bool) : "Set if the projected texture lights the target only."
+	input LightWorld[Strata](bool) : "Set if the projected texture lights the world and static geometry."
+	input EnableVolumetrics[Strata](bool) : "Set if the volumetrics are enabled."
+	input SetVolumetricIntensity[Strata](float) : "Sets the volumetric lighting's intensity."
+	input SetBrightnessScale[Strata](float) : "Sets the brightness."
+	input SetShadowSize[Strata](integer) : "Set the size exponent of this light's shadowmap."
+
 	@resources []
 	]

fgd/point/linked_portal_door.fgd

@@ -1,11 +1,14 @@
 @PointClass base(BaseEntityPoint, LinkedPortalDoor, ToggleDraw) 
 	appliesto(P2) 
 	studio("models/editor/angle_helper.mdl") 
-	iconsprite("editor/portal_dual.vmt") = linked_portal_door: "A door which is linked by a portal to another 'linked_portal_door' entity. " +
+	iconsprite("editor/portal_dual.vmt") 
+	orientedwidthheighthalf[STRATA](width, height)
+= linked_portal_door: "A door which is linked by a portal to another 'linked_portal_door' entity. " +
 		"Portal shots will pass through, and no effect appears at the edges."
 	[
 	partnername(target_destination) report: "Linked Partner" : : "Another 'linked_portal_door' entity which will link to this one."
 	width(integer) : "Half-Width  (G)" : 64 : "Half the width of the portal, on the Green axis."
 	height(integer) : "Half-Height (B)" : 64 : "Half the height of the portal, on the Blue axis."
+	isstatic[STRATA](boolean): "Static Portal" : 0 : "If set to true, this portal does not ever move or toggle, and allows VRAD to cast light through it."
 	startactive(boolean) : "Start Active" : 0 : "Whether to start the linkage as active from the start."
 	]