Fully merge Strata entities

TeamSpen210 · TeamSpen210 · commit 710a7e0879f0 · 2025-12-06T14:26:53.000+10:00
diff --git a/fgd/base_entity.fgd b/fgd/base_entity.fgd
@@ -44,6 +44,7 @@
 	responseContext(string) : "Response Context" : ""
 	addon(string) : "AI Addon" : : "Broken ASW feature."
 	teamnumber(integer): "Team Number"
+	pendingteamnumber(integer) : "Pending Team Number" : : "Team numer this entity will be on at the beginning of the next round."
 	
 	health(integer) : "Health"
 	max_health(integer) : "Max Health"
@@ -67,6 +68,14 @@
 	disableshadowdepth(boolean) : "Disable Shadow Depth"
 	shadowdepthnocache(integer) : "Cache in Shadow Depth"
 
+	viewhideflags(integer) : "View ID nodraw" : 0 : "This keyvalue can control whether an entity should only draw on things like monitors or mirrors, " +
+		"or the opposite. The code for this is { m_iViewHideFlags & (1 << CurrentViewID()) } and supports any combination of view IDs."
+	fadescale(float) : "Fade Scale" : 1 : "If you specify a fade in the worldspawn, then the engine will forcibly fade out props even if fademindist/fademaxdist isn't specified." +
+		"This scale factor gives you some control over the fade. " +
+		"Using 0 here turns off the forcible fades. " +
+		"Numbers smaller than 1 cause the prop to fade out at further distances, " +
+		"and greater than 1 cause it to fade out at closer distances."
+
 	movetype(integer) : "Movement Type" : 0
 	collisiongroup(integer) : "Collision Group" : 0
 	speed(float) : "Speed" : 0
diff --git a/fgd/brush/func/func_lookdoor.fgd b/fgd/brush/func/func_lookdoor.fgd
@@ -1,5 +1,5 @@
 @SolidClass base(func_movelinear) 
-	appliesto(until_L4D, -TF2)
+	appliesto(until_L4D, -TF2, Strata)
 = func_lookdoor: "A door that moves either when looked by a targeted object or " +
 	"when a target object comes near the door.  " +
 	"Behavior can be either based on viewing direction or proximity alone, or on a combination of both.  "+
diff --git a/fgd/brush/func/func_nav_blocker.fgd b/fgd/brush/func/func_nav_blocker.fgd
@@ -1,5 +1,5 @@
 @SolidClass base(BaseEntityBrush, NavBlocker) 
-	appliesto(TF2, L4D, L4D2, CSGO)
+	appliesto(TF2, L4D, L4D2, since_CSGO)
 = func_nav_blocker: "A brush entity that can block nav areas touching its AABB."
 	[
 	StartDisabled(boolean) : "Start Disabled" : 0
diff --git a/fgd/brush/func/func_tank_combine_cannon.fgd b/fgd/brush/func/func_tank_combine_cannon.fgd
@@ -1,5 +1,5 @@
 @SolidClass base(BaseTank) 
-	appliesto(EP1, EP2, HL2, P1, P2, INFRA, -Strata) = func_tank_combine_cannon: "Combine sentry cannon"
+	appliesto(EP1, EP2, HL2, P1, P2, INFRA) = func_tank_combine_cannon: "Combine sentry cannon"
 	[
 	shootsound[MBase](sound) : "Shoot Sound" : "" : "Plays a specific sound each time this tank fires."
 
diff --git a/fgd/brush/func/func_touch.fgd b/fgd/brush/func/func_touch.fgd
@@ -0,0 +1,6 @@
+@SolidClass base(BaseEntityVisBrush, trigger_multiple)
+	appliesto(Strata)
+= func_touch: "A brush entity that triggers touch events."
+	[
+	
+	]
diff --git a/fgd/brush/func/func_wall_toggle.fgd b/fgd/brush/func/func_wall_toggle.fgd
@@ -1,5 +1,6 @@
 @SolidClass base(func_wall)
-= func_wall_toggle: "Legacy Support for Half-Life. Use func_brush instead. A general brush entity which can be toggled on/off When off, the brush will be non-solid and invisible. Does not cast lightmap shadows."
+= func_wall_toggle: "Legacy Support for Half-Life. Use func_brush instead. " +
+	"A general brush entity which can be toggled on/off. When off, the brush will be non-solid and invisible. Does not cast lightmap shadows."
 	[
 	spawnflags(flags)  =
 		[
diff --git a/fgd/brush/trigger/trigger_gravity.fgd b/fgd/brush/trigger/trigger_gravity.fgd
@@ -2,6 +2,7 @@
 = trigger_gravity: "A trigger volume that changes the gravity on any entity that touches it."
 	[
 	gravity(float) : "Gravity (0-1)" : 1
-	
+
+	persist[Strata](boolean): "Persist" : 0 : "Whether the gravity change persists. A setting of 0 will reset gravity to default on exiting. 1 will persist and thus act like how it did in older games like TF2."
 	@resources []
 	]
diff --git a/fgd/point/ai/ai_goal_fightfromcover.fgd b/fgd/point/ai/ai_goal_fightfromcover.fgd
@@ -1,5 +1,5 @@
 @PointClass base(BaseEntityPoint) 
-	appliesto(since_ASW, -Strata)
+	appliesto(since_ASW)
 	iconsprite("editor/ficool2/ai_goal_fightfromcover.vmt") 
 = ai_goal_fightfromcover: "AI Fight from Cover"
 	[
diff --git a/fgd/point/ai/ai_goal_standoff.fgd b/fgd/point/ai/ai_goal_standoff.fgd
@@ -29,8 +29,8 @@
 		2: "Medium"
 		3: "High"
 		4: "Very High"
-		// Custom agression disabled
-		5 : "Custom" [MBase]
+		// Custom agression disabled?
+		5 : "Custom"
 		]
 
 	playerbattleline(boolean) : "Player battleline" : 1 : "Player defines a battle line, applies to allies only"
@@ -48,7 +48,7 @@
 	// Inputs
 	input Activate(void) : "Begin contesting position."
 	input Deactivate(void) : "Cease contesting position."
-	input UpdateActors[MBase](void) : "Forces an update on this goal's actors."
+	input UpdateActors[MBase, Strata](void) : "Forces an update on this goal's actors."
 	input SetAggressiveness(integer) : "Set aggressiveness."
 
 	@resources []
diff --git a/fgd/point/ent_hover_turret_tether.fgd b/fgd/point/ent_hover_turret_tether.fgd
@@ -1,5 +1,5 @@
 @PointClass base(BaseEntityAnimating)
-	appliesto(P2, +engine)
+	appliesto(P2CE)
 = ent_hover_turret_tether: "The ceiling tether for Hover Turrets. Generated automatically when the hover turret has an attachTarget set."
 [
-]
+]
diff --git a/fgd/point/game/game_player_equip.fgd b/fgd/point/game/game_player_equip.fgd
@@ -17,6 +17,6 @@
 		]
 
 	// Inputs
-	input TriggerForAllPlayers[since_CSGO, GMOD](void) : "This will force all connected players to take the weapon(s) specified."
-	input TriggerForActivatedPlayer[since_CSGO, GMOD](string) : "This will force the player who activated to equip the specified weapon."
+	input TriggerForAllPlayers[CSGO, GMOD](void) : "This will force all connected players to take the weapon(s) specified."
+	input TriggerForActivatedPlayer[CSGO, GMOD](string) : "This will force the player who activated to equip the specified weapon."
 	]
diff --git a/fgd/point/info/info_portal_gamerules.fgd b/fgd/point/info/info_portal_gamerules.fgd
@@ -15,7 +15,9 @@
 		4: "Dual Portal Device (PotatOS attached)"
 		]
 	equippaintgun[engine](integer) : "Equip Paint Gun" : 0
-	equippaintgun(choices) : "Equip Paint Gun" : 0 : "Automatically grants the player a paint gun if enabled.\n\nThe \"basic paint gun\" option will give the player a paint gun with no powers assigned by default - paint powers must be obtained by touching an item_paint_power_pickup entity. Selecting the \"Fully-upgraded paint gun\" option will give the player all applicable paint powers for the paint gun." =
+	equippaintgun(choices) : "Equip Paint Gun" : 0 : "Automatically grants the player a paint gun if enabled.\n\n" +
+		"The \"basic paint gun\" option will give the player a paint gun with no powers assigned by default - paint powers must be obtained by touching an item_paint_power_pickup entity. " +
+		"Selecting the \"Fully-upgraded paint gun\" option will give the player all applicable paint powers for the paint gun." =
 		[
 		0: "None"
 		1: "Basic paint gun"
diff --git a/fgd/point/move/move_track.fgd b/fgd/point/move/move_track.fgd
@@ -0,0 +1,11 @@
+@MoveClass base(BaseEntityPoint, Mover, KeyFrame)
+	size(-8 -8 -8, 8 8 8) 
+	color(255 0 0) 
+	animator() 
+	appliesto(Strata)
+= move_track: "Track Move Behavior"
+	[
+	wheelbaselength(integer) : "Distance between the wheels" : 50
+	damage(integer) : "Damage done to blocking entities" : 0
+	norotate(boolean) : "Turn to face down path" : 0
+	]
diff --git a/fgd/point/npc/npc_hunter.fgd b/fgd/point/npc/npc_hunter.fgd
@@ -4,7 +4,8 @@
 	studio[+MBase]()
 = npc_hunter: "A smaller and faster Strider that can stalk people, impale others, and force the player into buildings. Hunters can protect a fellow Strider and walk in packs."
 	[
-	followtarget(target_destination) report: "Strider to Follow" : : "The name of the strider that this hunter should follow."
+	followtarget(target_destination) report: "Strider to Follow" : : "The name of the strider that this hunter should protect. " +
+		 "If this is specified, Hunters will also attempt to shoot down any Magnusson Devices (weapon_striderbuster) that are being held by the player's gravity gun or are attached to Striders."
 	
 	NoIdlePatrol[engine](boolean) : "Don't patrol while idle" : 0
 	NoIdlePatrol[MBase](choices) : "Patrol while idle" : 0 =
@@ -16,8 +17,8 @@
 	CompanionHunter[EZ2](boolean) : "Companion Hunter" : 0 : "Allows this hunter to regenerate health and do other long-term companion-related things." 
 	NoIdlePatrol[EZ2](boolean) : "Patrol while idle" : 0
 	// Inputs
-	input SetMinigunTime(float) : "Time to shoot at any set minigun target."
-	input SetMinigunTarget(string) : "Hunter will shoot minigun at the named target."
+	// input SetMinigunTime(float) : "Time to shoot at any set minigun target."
+	// input SetMinigunTarget(string) : "Hunter will shoot minigun at the named target."
 	input Dodge(void) : "Force this Hunter to start dodging."
 	input FlankEnemy(void) : "Force this Hunter to flank the enemy it's currently targeting."
  	input DisableShooting(void) : "Forces the hunter to be melee-only."
@@ -28,11 +29,14 @@
 	input DisableSquadShootDelay(void) : "Disables the delay between range attacks for squads of hunters, allowing them to shoot as frequently as they wish."
 	input EnableUnplantedShooting(void) : "Used mainly for scripted attacks against bullseyes. Enables the hunter to shoot without having to plant first."
 	input DisableUnplantedShooting(void) : "Returns the hunter to normal after a call to EnableUnplantedShooting."
-	input DoPhysicsBlast(void) : "Hunter will instantly do the defensive physics blast."
-	input Crouch(void) : "Crouch down."
-	input Stand(void) : "Stand up from crouch."
-	input DisableCrouchWalk(void) : "UNUSED: Prevents the hunter from crouch walking."
-	input EnableCrouchWalk(void) : "UNUSED: Allows the hunter to crouch walk."
+	// Doesn't exist?
+	// input DoPhysicsBlast(void) : "Hunter will instantly do the defensive physics blast."
+	// input Crouch(void) : "Crouch down."
+	// input Stand(void) : "Stand up from crouch."
+	// input DisableCrouchWalk(void) : "UNUSED: Prevents the hunter from crouch walking."
+	// input EnableCrouchWalk(void) : "UNUSED: Allows the hunter to crouch walk."
+
+	output OnPlayerUse[EZ2](void) : "Fired when the player 'pets' the hunter by +USEing them."
 	
 	@resources
 		[
diff --git a/fgd/point/phys/phys_constraint.fgd b/fgd/point/phys/phys_constraint.fgd
@@ -1,10 +1,11 @@
 @PointClass base(TwoObjectPhysics)
 	autovis(Entities, Constraints, Fixed Constraint)
-	studio("models/editor/axis_helper.mdl")
+	studio[-Strata]("models/editor/axis_helper.mdl")
 	line(255 255 255, targetname, attach1)
 	line(255 255 255, targetname, attach2)
 	line(128 128 128, targetname, attach1, targetname, attach2)
 	color(128 128 128)
+	iconsprite[Strata]("editor/phys_constraint")
 = phys_constraint: "A constraint that keeps the relative position and orientation of two objects fixed."
 	[
 	@resources []
diff --git a/fgd/point/phys/phys_slideconstraint.fgd b/fgd/point/phys/phys_slideconstraint.fgd
@@ -1,10 +1,11 @@
 @PointClass base(TwoObjectPhysics)
 	halfgridsnap
-	studio("models/editor/axis_helper.mdl") 
+	studio[-Strata]("models/editor/axis_helper.mdl") 
 	line(255 255 255, targetname, attach1) 
 	line(255 255 255, targetname, attach2) 
 	line(128 128 128, targetname, attach1, targetname, attach2) 
 	color(128 128 128)
+	iconsprite[Strata]("editor/phys_slideconstraint")
 = phys_slideconstraint: "A constraint that constrains an entity along a line segment."
 	[
 	spawnflags(flags) : "spawnflags" =
diff --git a/fgd/point/point/point_combine_ball_launcher.fgd b/fgd/point/point/point_combine_ball_launcher.fgd
@@ -1,6 +1,7 @@
 @PointClass base(CombineBallSpawners) 
 	appliesto(EP1, EP2, HL2, P1, P2) 
-	iconsprite("editor/vizzys/point_combine_ball_launcher.vmt")
+	iconsprite[-Strata]("editor/vizzys/point_combine_ball_launcher.vmt")
+	iconsprite[+Strata]("editor/energy_ball.vmt")
 	studio("models/editor/cone_helper.mdl") 
 = point_combine_ball_launcher: "Launches Combine balls."
 	[
diff --git a/fgd/point/point/point_proximity_sensor.fgd b/fgd/point/point/point_proximity_sensor.fgd
@@ -13,7 +13,7 @@
 
 	// Inputs
 	input Toggle(void) : "Toggle the sensor between enabled and disabled."
-	input SetTargetEntity[MBase](target_destination) : "Sets the entity whose angles will be sensed."
+	input SetTargetEntity[MBase, Strata](target_destination) : "Sets the entity whose angles will be sensed."
 
 	// Outputs
 	output Distance(float) : "Distance of the target entity away from this entity."
diff --git a/fgd/point/point/point_spotlight.fgd b/fgd/point/point/point_spotlight.fgd
@@ -17,10 +17,11 @@
 	rendercolor(color255) : "Color (R G B)" : "255 255 255"
 	renderamt(integer) : "Alpha" : "255" : "Amount of alpha to use for the spotlight."
 	hdrcolorscale(float) : "HDR color scale." : "0.7" : "float value to multiply sprite color by when running in HDR mode."
-	haloscale[since_L4D2, MBase](float) : "Halo size scale." : 60 : "float value to determine the size of the halo."
-
-	ignoresolid[TF2,MBase](boolean) : "Ignore Solid" : 0 : "If set, this spotlight won't trace for solids."
+	haloscale[since_L4D2, MBase, -Strata](float) : "Halo size scale." : 60 : "float value to determine the size of the halo."
 
+	ignoresolid[TF2,MBase,Strata](boolean) : "Ignore Solid" : 0 : "If set, this spotlight won't trace for solids."
+	brightness[Strata](integer): "Brightness" : 64 : "Integer value representing spotlight brightness (0-255)"
+ 
 	HaloMaterial[MBase](sprite) : "Halo material" : "sprites/light_glow03.vmt" : "Material to use for the halo."
 	SpotlightMaterial[MBase](sprite) : "Spotlight beam material" : "sprites/glow_test02.vmt" : "Material to use for the spotlight's beam."
 
@@ -31,6 +32,7 @@
 	input LightToggle[MBase](void) : "Toggles the spotlight on or off"
 	input SetColor[since_ASW, GMod](color255) : "Change the color of the spotlight."
 	input ForceUpdate[since_ASW, GMod](void) : "Force an update of the spotlight position and orientation."
+	input SetBrightness(integer) : "Set the brightness of the spotlight."
 
 	// Outputs
 	output OnLightOn(void) : "Fires when light turns on."
diff --git a/fgd/point/point/point_worldtext.fgd b/fgd/point/point/point_worldtext.fgd
@@ -17,6 +17,7 @@
 		]
 
 	message(string) : "Entity Message" : "" : "Text Message. English characters and numbers only! Newline characters are accepted."
+	message[TF2, Strata, GMod](string) : "Entity Message" : "" : "Text Message. The character selection is limited by the font. Newline characters are accepted."
 	textsize(float) : "Text Size" : 10 : "Text Size."
 	color[since_CSGO](color255) : "Color" : "255 255 255" : "Color of the text"
 	color[until_CSGO](color255) : "Color" : "255 255 255 255" : "Color and opacity of the text"
@@ -38,6 +39,7 @@
 		11 : "Roboto Mono (green glow, soft edges)"
 		12 : "TF2 Build (soft edges)"
 	]
+	font[Strata](material) : "Font Material" : "editor/worldtext" : "The font material atlas to use for the text"
 
 	orientation[engine](integer) : "Orientation" : 0
 	orientation[until_CSGO](choices) : "Orientation" : 0 : "Text orientation mode. Fixed orientation left aligns the text, the others center align it." =
@@ -55,6 +57,7 @@
 	input SetEnabled[GMOD](boolean) : "Sets the visibility based on in the input parameter"
 	input Enable[!TF2](void) : "Start displaying the message text."
 	input Disable[!TF2](void) : "Stop displaying the message text."
+	input Toggle[Strata](void) : "Toggles the display status"
 	input SetMessage[since_CSGO](string) : "Set the message text."
 
 	// SDK 25 Inputs
diff --git a/fgd/point/prop/prop_exploding_futbol.fgd b/fgd/point/prop/prop_exploding_futbol.fgd
@@ -14,6 +14,9 @@
 	input Explode(void) : "Explodes the bomb."
 	input Dissolve(void) : "Fizzles the bomb. Doesn't fire the OnFizzled output."
 
+	// Outputs
+	output OnExplode(void) : "Called when the bomb explodes."
+
 	@resources // Assumed
 		[
 		model "models/npcs/personality_sphere_angry.mdl"
diff --git a/fgd/point/prop/prop_paint_bomb.fgd b/fgd/point/prop/prop_paint_bomb.fgd
@@ -10,21 +10,22 @@
 		]
 
 	allowfunnel(boolean) : "Allow Portal Funneling" : 1 : "Whether or not this object should auto-funnel into a portal."
-	allowsilentdissolve(boolean) : "Allow SilentDissolve input" : 0 : "Allow the SilentDissolve input to dissolve this bomb."
+	// Fizzle I/O is in BaseEntityAnimating.
+	allowsilentdissolve[-Strata](boolean) : "Allow SilentDissolve input" : 0 : "Allow the SilentDissolve input to dissolve this bomb."
 	playspawnsound(boolean) : "Play Spawn Sound" : 1 : "Whether or not this bomb should play a sound on spawn (PaintBlob.Inception)."
 	
 
 	model[engine](string) : "" // Not actually a model it really loads.
-	model(studio) readonly : "Model" : "models/error.mdl" : "Paint bombs need a model set to suppress a warning message. This model gets loaded already."
+	model(studio) readonly : "Model" : "models/error.mdl" : "Paint bombs need a model set to suppress a warning message. This model would be loaded already."
 
 	// Inputs
-	input Dissolve(void) : "Dissolves the paint bomb."
-	input SilentDissolve(void) : "Kills the paint bomb and fires its OnFizzled output."
+	input Dissolve[-Strata](void) : "Dissolves the paint bomb."
+	input SilentDissolve[-Strata](void) : "Kills the paint bomb and fires its OnFizzled output."
 	input EnablePortalFunnel(void) : "Enable portal funneling behavior."
 	input DisablePortalFunnel(void) : "Disable portal funneling behavior."
 
 	// Outputs
-	output OnFizzled(void) : "Fired when a paint bomb is fizzled (by trigger_paint_cleanser?)."
+	output OnFizzled[-Strata](void) : "Fired when a paint bomb is fizzled (by trigger_paint_cleanser?)."
 	output OnExploded(void) : "Fired when a paint bomb explodes."
 
 	@resources [
diff --git a/fgd/point/prop_physics_ragdoll.fgd b/fgd/point/prop_physics_ragdoll.fgd
@@ -0,0 +1,4 @@
+@PointClass aliasof(prop_ragdoll) appliesto(+engine)
+= prop_physics_ragdoll: "Alternate name for prop_ragdoll."
+	[
+	]
diff --git a/fgd/point/sky/sky_camera.fgd b/fgd/point/sky/sky_camera.fgd
@@ -17,11 +17,11 @@
 
 	spawnflags(flags) =
 		[
-		1: "Master (takes priority if multiple sky_cameras exist)" : 0 [MBase]
-		2: "Continuously update position (for moving sky_cameras)" : 0 [MBase]
+		1: "Master (takes priority if multiple sky_cameras exist)" : 0 [MBase, Strata]
+		2: "Continuously update position (for moving sky_cameras)" : 0 [MBase, Strata]
 		]
 
-	skycolor[MBase](color255) : "Sky Color" : "255 255 255 0" : "Causes the skybox to use a solid color instead of the sky texture specified in worldspawn. " +
+	skycolor[MBase, Strata](color255) : "Sky Color" : "255 255 255 0" : "Causes the skybox to use a solid color instead of the sky texture specified in worldspawn. " +
 		"Blended alpha is unfortunately not supported, " +
 		"but an alpha of '0' disables the effect and any alpha greater than that (e.g. 255) enables the effect."
 
@@ -61,7 +61,7 @@
 	input SetFogColor[MBase, Strata](color255) : "Sets the primary fog color."
 	input SetFogColorSecondary[MBase, Strata](color255) : "Sets the secondary fog color."
 	input SetFarZ[MBase, Strata](integer): "Sets the far clip plane distance."
-	
+	input SetFogMaxDensity[MBase, Strata](float) : "0 to 1, set the fog's max density"
 	input SetSkyColor[MBase, Strata](color255) : "Sets the sky color."
 	
 	input CopyFogController[MBase](target_destination) : "Copies the target fog controller's exact fog parameters."
diff --git a/fgd/point/weapon/weapon_portalgun.fgd b/fgd/point/weapon/weapon_portalgun.fgd
@@ -4,15 +4,19 @@
 	autovis(Weapons)
 	studioprop[-P2CE]("models/weapons/w_portalgun.mdl") 
 	studioprop[+P2CE]()
-= weapon_portalgun: "Aperture Science Handheld Portal Device"
+= weapon_portalgun: "The Aperture Science Handheld Portal Device. It shoots linked gates. This is the sole weapon entity used throughout the Portal series."
 	[
+	spawnflags[Strata](flags) =
+		[
+		8: "Disable pickup sounds" : 0
+		]
 	canfireportal1(boolean) : "Can Fire Blue Portals" : 1 : "Determines whether this portal gun can shoot blue portals."
 	canfireportal2(boolean) : "Can Fire Orange Portals" : 1 : "Determines whether this portal gun can shoot orange portals."
 	
 	showingpotatos[P2](boolean) : "Show PoTaToS" : 0 : "Attach PotatOS to the portal gun by enabling its respective bodygroup. PotatOS will animate if the @glados entity is given a VCD to play."
 
 	startingteamnum[engine](integer) : "Player" : 0 : "Which player this gun belongs to.  Will decide which portals it fires before being picked up, as well as the skin."
-	startingteamnum[P2](choices) : "Player" : 0 : "Which player this gun belongs to.  Will decide which portals it fires before being picked up, as well as the skin." =
+	startingteamnum[P2](choices) : "Player" : 0 : "Which player/\"team\" this gun belongs to.  Will decide which portals it fires before being picked up, as well as the skin." =
 		[
 		0: "Singleplayer/Unassigned"
 		2: "P-Body"
diff --git a/fgd/worldspawn.fgd b/fgd/worldspawn.fgd
@@ -14,6 +14,7 @@
 	skyname[CSGO](string)          : "SkyBox Texture Name" : "sky_dust"            : "Texture used for the 2D skybox."
 	skyname[L4D](string)           : "SkyBox Texture Name" : "sky_l4d_urban01_hdr" : "Texture used for the 2D skybox."
 	skyname[L4D2](string)          : "SkyBox Texture Name" : "sky_l4d_rural02_hdr" : "Texture used for the 2D skybox."
+	skyname[P2CE](string)          : "SkyBox Texture Name" : "sky_black_nofog"     : "Texture used for the 2D skybox."
 	
 	chaptertitle[-MBase](string) : "Chapter Title" : : "Chapter Title that appears onscreen when this level starts."
 	chaptertitle[+MBase](string) : "Chapter/Savegame Title" : "" : "A ''chapter'' title that this map should identify with. " +
diff --git a/src/strata_merge.py b/src/strata_merge.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`@SolidClass base(BaseEntityBrush, NavBlocker)`
`2`		`- appliesto(TF2, L4D, L4D2, CSGO)`
	`2`	`+ appliesto(TF2, L4D, L4D2, since_CSGO)`
`3`	`3`	`= func_nav_blocker: "A brush entity that can block nav areas touching its AABB."`
`4`	`4`	`[`
`5`	`5`	`StartDisabled(boolean) : "Start Disabled" : 0`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`@SolidClass base(BaseTank)`
`2`		`- appliesto(EP1, EP2, HL2, P1, P2, INFRA, -Strata) = func_tank_combine_cannon: "Combine sentry cannon"`
	`2`	`+ appliesto(EP1, EP2, HL2, P1, P2, INFRA) = func_tank_combine_cannon: "Combine sentry cannon"`
`3`	`3`	`[`
`4`	`4`	`shootsound[MBase](sound) : "Shoot Sound" : "" : "Plays a specific sound each time this tank fires."`
`5`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`@SolidClass base(func_wall)`
`2`		`-= func_wall_toggle: "Legacy Support for Half-Life. Use func_brush instead. A general brush entity which can be toggled on/off When off, the brush will be non-solid and invisible. Does not cast lightmap shadows."`
	`2`	`+= func_wall_toggle: "Legacy Support for Half-Life. Use func_brush instead. " +`
	`3`	`+ "A general brush entity which can be toggled on/off. When off, the brush will be non-solid and invisible. Does not cast lightmap shadows."`
`3`	`4`	`[`
`4`	`5`	`spawnflags(flags) =`
`5`	`6`	`[`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`= trigger_gravity: "A trigger volume that changes the gravity on any entity that touches it."`
`3`	`3`	`[`
`4`	`4`	`gravity(float) : "Gravity (0-1)" : 1`
`5`		`-`
	`5`	`+`
	`6`	`+ persist[Strata](boolean): "Persist" : 0 : "Whether the gravity change persists. A setting of 0 will reset gravity to default on exiting. 1 will persist and thus act like how it did in older games like TF2."`
`6`	`7`	`@resources []`
`7`	`8`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`@PointClass base(BaseEntityPoint)`
`2`		`- appliesto(since_ASW, -Strata)`
	`2`	`+ appliesto(since_ASW)`
`3`	`3`	`iconsprite("editor/ficool2/ai_goal_fightfromcover.vmt")`
`4`	`4`	`= ai_goal_fightfromcover: "AI Fight from Cover"`
`5`	`5`	`[`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`@PointClass base(BaseEntityAnimating)`
`2`		`- appliesto(P2, +engine)`
	`2`	`+ appliesto(P2CE)`
`3`	`3`	`= ent_hover_turret_tether: "The ceiling tether for Hover Turrets. Generated automatically when the hover turret has an attachTarget set."`
`4`	`4`	`[`
`5`		`-]`
	`5`	`+]`