[WIP] Day of Defeat: Source entities and other TF2 Branch fixes

CREDITS.md

@@ -3,3 +3,4 @@
 - [ZPS: Supplemental Hammer Icons](http://www.necrotalesgames.com/tools/index.php) (some icons)
 - [ts2do's HL2 FGDs](http://halflife2.filefront.com/file/HalfLife_2_Upgraded_Base_FGDs;48139) (some more icons)
 - [Ficool2's FGD pack](https://tf2maps.net/downloads/ficool2s-overhauled-fgd-all-entities-documentated-icons.7209/) (several icons)
+- [Twemoji](https://github.com/twitter/twemoji) (basis for `dod_location` icon)

build.bat

@@ -1,7 +1,7 @@
 @echo off
 setlocal EnableDelayedExpansion
 
-SET games=p2 p1 hl2 ep1 ep2 gmod csgo tf2 asw l4d l4d2 infra mesa
+SET games=p2 p1 hl2 ep1 ep2 gmod csgo tf2 asw l4d l4d2 infra mesa dods
 
 :: If set, override the FGD filename generated.
 SET filename.p2=portal2
@@ -14,19 +14,23 @@ SET filename.asw=swarm
 SET filename.l4d=left4dead
 SET filename.l4d2=left4dead2
 SET filename.mesa=blackmesa
+SET filename.dods=dod
 
 :: Other games supported by tags, but not currently included in builds
-SET filename.dods=dod
+SET filename.asrd=reactivedrop
 SET filename.css=cstrike
 SET filename.ez1=EntropyZero
 SET filename.ez2=EntropyZero2
+SET filename.hl2dm=hl2mp
 SET filename.kz=kreedzclimbing
 :: No official name for this, but don't want it to just be "psa.fgd"
 SET filename.psa=portal_stillalive
-SET filename.asrd=reactivedrop
+:: No official name for these either
 SET filename.p2sixense=portal2_sixense
-:: No official name for this either
 SET filename.p2edu=portal2_edu
+:: No official Half-Life: Source FGD exists; using game dir name
+SET filename.hls=hl1
+SET filename.hldms=hl1mp
 
 SET game=%1
 

build.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-games="p2 p1 hl2 ep1 ep2 gmod csgo tf2 asw l4d l4d2 infra mesa"
+games="p2 p1 hl2 ep1 ep2 gmod csgo tf2 asw l4d l4d2 infra mesa dods"
 game=$1
 if [ $# -eq 0 ]; then
   echo Games: "${games[*]}" & echo Enter game to build. Use ALL to build every game. & read -p "" game

comp_team_wall.py

@@ -0,0 +1,13 @@
+"""Alias for func_team_wall."""
+from hammeraddons.bsp_transform import trans, Context
+
+
+@trans('comp_team_wall')
+def trigger_brush_input_filters(ctx: Context) -> None:
+    """Alias for func_team_wall. 
+
+    This allows func_team_wall to be used as either a point entity or a brush entity, as it is
+    designed to be usable as either, but FGD syntax prohibits this if they share a name.
+    """
+    for ent in ctx.vmf.by_class['comp_team_wall']:
+        ent['classname'] = "func_team_wall"

fgd/bases/BaseEntityAnimating.fgd

@@ -36,7 +36,7 @@
 		]
 
 	body(integer) : "Bodygroup" : 0 : "Body Groups allow turning on and off parts of a model, so sections can be shown or hidden dynamically."
-	setbodygroup[complete](integer) : "(Set) Body Group" : 0 :  "Identical to Body Group (body), ask Valve why this is duplicated. Body Groups allow turning on and off parts of a model, so sections can be shown or hidden dynamically."
+	setbodygroup[complete](integer) : "(Set) Body Group" : 0 :  "Identical to Body Group (body), which takes priority. Body Groups allow turning on and off parts of a model, so sections can be shown or hidden dynamically."
 
 	texframeindex[complete](integer) : "ToggleTexture Frame" : 0 : "The initial texture frame used by the ToggleTexture proxy and controlled by env_texturetoggle."
 	hitboxset[complete](string) : "Hitbox Set" : : "Sets the $hboxset to use for collision testing."
@@ -55,8 +55,9 @@
 
 	linedivider_animbase[!engine](string) readonly : "----------------------------------------------------------------------------------------------------------" : ""
 
-	LightingOrigin(target_destination) : "Lighting Origin" :  : "Select any entity (not info_lighting!) from which to sample lighting instead of the entity's origin."
-	LightingOriginHack(target_destination) : "Lighting Origin Offset" :  : "The info_lighting_relative from which to sample lighting instead of the entity's origin."
+	// $illumposition defaults to center of model's bounding box, *not* the origin
+	LightingOrigin(target_destination) : "Lighting Origin" :  : "Select any entity (not info_lighting!) from which to sample lighting instead of the entity's $illumposition."
+	LightingOriginHack(target_destination) : "Lighting Origin Offset" :  : "The info_lighting_relative from which to sample lighting instead of the entity's $illumposition."
 
 	fademindist(float) : "Start Fade Distance/Pixels" : : "Distance at which the entity starts fading. If <0, the entity will disappear instantly when end fade is hit. The value will scale appropriately if the entity is in a 3D Skybox."
 	fademaxdist(float) : "End Fade Distance/Pixels" : : "Distance at which the entity ends fading. If <0, the entity won't disappear at all. The value will scale appropriately if the entity is in a 3D Skybox."
@@ -90,9 +91,9 @@
 
 	input AlternativeSorting[SINCE_EP1](boolean) : "Used to attempt to fix sorting problems when rendering. True activates, false deactivates"
 
-	input SetModel[TF2](string) : "Changes the model to the specified path.\nForm of 'models/ammo/ammo_us.mdl'.\nIMPORTANT:\nAbsolutely NO quotes!\nMake sure you use this slash '/'.\nMerasmus says to heed this advice thou shalt corrupt the VMF."
-	input SetCycle[TF2](float) : "Skip to a specific point in the current animation."
-	input SetPlaybackRate[TF2](float) : "Change the animation speed multiplier."
+	input SetModel[2025MP](string) : "Changes the model to the specified path.\nForm of 'models/ammo/ammo_us.mdl'.\nIMPORTANT:\nAbsolutely NO quotes!\nMake sure you use this slash '/'.\nMerasmus says to heed this advice thou shalt corrupt the VMF."
+	input SetCycle[2025MP](float) : "Skip to a specific point in the current animation."
+	input SetPlaybackRate[2025MP](float) : "Change the animation speed multiplier."
 
 	input SetModel[MBase](string) : "Sets this entity's model. Must include 'models/' as well as the extension."
 	input CreateSeparateRagdoll[MBase](void) : "Creates a separate serverside ragdoll at this entity's origin."

fgd/bases/TeamNum.fgd

@@ -26,11 +26,17 @@
 		2: "P-Body"
 		3: "ATLAS"
 		]
+	teamnum[DODS](choices) : "Team" : 0 =
+	[
+		0 : "Neutral"
+		2 : "Allies"
+		3 : "Axis"
+	]
 
 	teamnum(integer) : "Team"
 	teamnum[engine](integer): "Team": 0
 
 
 	// Inputs
 	input SetTeam(integer) : "Changes the entity's team."
-	]
+]

fgd/bases/Trigger.fgd

@@ -3,7 +3,7 @@
 	[
 	// Inputs
     input EndTouch(void) : "Fires the OnEndTouch output. If called by an entity inside the trigger, the OnEndTouch will be fired for them as the activator. Note that this input is passed even if the player is being treated as 'not' touching the trigger while outside it."
-	input DisableAndEndTouch[TF2](void) : "Disables this trigger and calls EndTouch on all currently-touching entities."
+	input DisableAndEndTouch[2025MP](void) : "Disables this trigger and calls EndTouch on all currently-touching entities."
 
 	// Outputs
 	output OnStartTouchAll(void) : "Fired when an entity starts touching this trigger, and no other entities are touching it. " +

fgd/bases/TriggerOnce.fgd

@@ -6,8 +6,8 @@
 	[
 	spawnflags(flags)  =
 		[
-		1: "Clients (Players/Bots)" : 1 [TF2, CSGO, CSS, MESA]
-		1: "Clients (Players)" : 1 [!TF2, !CSGO, !CSS, !MESA]
+		1: "Clients (Players/Bots)" : 1 [2025MP, CSGO, MESA]
+		1: "Clients (Players)" : 1 [!2025MP, !CSGO, !MESA]
 		2: "NPCs" : 0 [!ASW]
 		2: "Marines and Aliens" : 0 [ASW]
 		4: "func_pushable" : 0
@@ -20,7 +20,7 @@
 		512: "Only clients *not* in vehicles" : 0 [!ASW]
 		1024: "Physics debris" : 0
 		2048: "Only NPCs in vehicles (respects player ally flag)" : 0
-		4096: "Disallow Bots" : 0 [CSGO, TF2, MESA]
+		4096: "Disallow Bots" : 0 [CSGO, 2025MP, MESA]
 		]
 
 	StartDisabled(boolean) : "Start Disabled?" : 0
@@ -54,7 +54,7 @@
     // This I/O does actually exist, but it couldn't ever be used usefully. 
     // Entities that can use them should inherit Trigger instead.
     input EndTouch[engine](void)
-	input DisableAndEndTouch[TF2, engine](void)
+	input DisableAndEndTouch[2025MP, engine](void)
 	output OnStartTouchAll[engine](void) // Always fires along with OnStartTouch, so useless.
 	output OnEndTouch[engine](void)
 	output OnEndTouchAll[engine](void)

fgd/bases/Weapon.fgd

@@ -6,9 +6,10 @@
 	[
 	spawnflags(flags)  =
 		[
-		1: "Start constrained" : 0
+		1: "Start constrained (don't fall to ground)" : 0
 		2: "Deny player pickup (reserve for NPC)" : 0
-		4: "Not puntable by Gravity Gun" : 0
+		// Technically in every game, but most don't have gravity gun
+		4: "Not puntable by Gravity Gun" : 0 [HL2, P1, GMOD, complete]
 		8 : "Deny NPC pickup (reserve for player)" : 0 [MBase]
 		16 : "Preserve ammo values when picked up" : 0 [MBase]
 		32 : "Preserve name on player pickup" : 0 [MBase]
@@ -17,6 +18,8 @@
 		1073741824 : "Never respawn in multiplayer" : 0 [HL2DM, TF2, complete]
 		]
 
+
+	ammo[CSS](integer) : "Reserve ammo" : : "Ammo to include with the weapon. Default 0."
 	SetAmmo1[MBase](integer) : "Ammo 1 Override" : 0 : "Overrides the amount of primary ammo this weapon has. Be sure to set 'Preserve ammo values when picked up' for this to be maintained upon pickup."
 	SetAmmo2[MBase](integer) : "Ammo 2 Override" : 0 : "Overrides the amount of secondary ammo this weapon has. Be sure to set 'Preserve ammo values when picked up' for this to be maintained upon pickup."
 

fgd/brush/dod/dod_bomb_dispenser.fgd

@@ -0,0 +1,16 @@
+@SolidClass base(Trigger) appliesto(DODS) = dod_bomb_dispenser : "Bomb Dispenser Area."
+[
+	dispense_team[engine](integer) : "Team to give bombs to" : 0
+	dispense_team(choices) : "Team to give bombs to" : 0 = 
+	[
+		0 : "Both Teams"
+		2 : "Allies Only"
+		3 : "Axis Only"
+	]
+
+	@resources
+	[
+		entity weapon_basebomb
+		entity dod_bomb_dispenser_icon
+	]
+]

fgd/brush/dod/dod_capture_area.fgd

@@ -0,0 +1,52 @@
+@SolidClass base(Trigger) appliesto(DODS) line(0 128 0, targetname, area_cap_point) = dod_capture_area : "Capture Area for a dod_control_point."
+[
+	area_allies_cancap[engine](boolean) : "Can Allies Cap?" : 1
+	area_allies_cancap(choices) : "Can Allies Cap?" : 1 = 
+	[
+		0 : "No"
+		1 : "Yes"
+	]
+
+	area_axis_cancap[engine](boolean) : "Can Axis Cap?" : 1
+	area_axis_cancap(choices) : "Can Axis Cap?" : 1 = 
+	[
+		0 : "No"
+		1 : "Yes"
+	]
+
+	area_allies_numcap[engine](integer) : "Number of Allies to cap" : 1
+	area_allies_numcap(choices) : "Number of Allies to cap" : 1 : "Client crash if set above 5. The limit is supposed to be 9." =
+	[
+		1 : "1"
+		2 : "2"
+		3 : "3"
+		4 : "4"
+		5 : "5"
+	]
+	area_axis_numcap[engine](integer) : "Number of Axis to cap" : 1
+	area_axis_numcap(choices) : "Number of Axis to cap" : 1 : "Client crash if set above 5. The limit is supposed to be 9." =
+	[
+		1 : "1"
+		2 : "2"
+		3 : "3"
+		4 : "4"
+		5 : "5"
+	]
+
+	area_time_to_cap(float) : "Time to cap (sec)" : 5 
+	area_cap_point(target_destination) report : "Linked control point" : "" : "Name of the control point this area is linked to"
+
+	output OnAlliesStartCap(void) : "Sent when Allies start capture"
+	output OnAlliesBreakCap(void) : "Sent when Allies break capture"
+	output OnAlliesEndCap(void) : "Sent when Allies end capture"
+
+	output OnAxisStartCap(void) : "Sent when Axis start capture"
+	output OnAxisBreakCap(void) : "Sent when Axis break capture"
+	output OnAxisEndCap(void) : "Sent when Axis end capture"
+
+	output OnStartCap(void) : "Sent when either team starts capture"
+	output OnBreakCap(void) : "Sent when either team break capture"
+	output OnEndCap(void) : "Sent when either team end capture"
+
+	input RoundInit(void) : "Re-parse the ''area_allies_numcap'', ''area_allies_numcap'', and ''area_time_to_cap'' KVs."
+]

fgd/brush/func/func_team_wall.fgd

@@ -0,0 +1,21 @@
+// Dino D-Day has a identically-named entity which works differently
+@SolidClass base(BaseEntityBrush) appliesto(DODS) = func_team_wall : "Team Blocker Wall.\n\nUnlike func_teamblocker, it is able to be loaded via an ENT file, cannot have its team value changed without AddOutput, and is preserved between rounds."
+[
+	blockteam[engine](integer) : "Team to block" : 0
+	blockteam(choices) : "Team to block" : 0 =
+	[
+		0 : "Neither"
+		2 : "Allies Only"
+		3 : "Axis Only"
+	]
+	warn[engine](boolean) : "Show warning" : "" : "Show warning when touching this entity as the enemy team."
+	warn(choices) : "Show warning" : "" : "Show warning when touching this entity as the enemy team." = 
+	[
+		"" : "No"
+		"1" : "Yes"
+	]
+
+	mins(vector) : "mins" : : "The uppermost and northernmost point of the bounding box; used instead of bmodel if present."
+	maxs(vector) : "maxs" : : "The bottommost and southernmost point of the bounding box; used instead of bmodel if present."
+	angles(angle) : "Pitch Yaw Roll (Y Z X)" : "0 0 0" : "If mins and maxs keyvalues are used, this will rotate the resultant collision."
+]

fgd/brush/func/func_teamblocker.fgd

@@ -0,0 +1,9 @@
+// note: also in Insurgency and Day of Infamy
+@SolidClass base(BaseEntityBrush, TeamNum) appliesto(DODS) = func_teamblocker : 
+	"Walls that players of a certain team are unable to pass through.\n\nUnlike func_team_wall, it cannot be loaded via an ENT file, can have its team value changed with an input, and is reset between rounds." 
+[	
+	spawnflags(flags) =
+	[
+		2: "Don't show hint when touched" : 0
+	]
+]

fgd/brush/trigger/trigger_teleport_relative.fgd

@@ -1,5 +1,5 @@
 @SolidClass base(Trigger) 
-	appliesto(MBase, TF2) = trigger_teleport_relative: "A trigger volume that teleports entities that touch it. " +
+	appliesto(MBase, 2025MP) = trigger_teleport_relative: "A trigger volume that teleports entities that touch it. " +
 		"Entities are teleported by Offset from their current position. " +
 		"Useful to get objects out of situations where levels or entities suddenly appear intersecting with them."
 	[

fgd/engine/base_rocket.fgd

@@ -0,0 +1,10 @@
+@PointClass base(BaseEntityAnimating)
+	appliesto(+engine,DODS)
+= base_rocket : "Base class for bazooka and panzerschreck projectiles."
+[
+	@resources
+	[
+		snd "Weapon_Bazooka.Shoot"
+		particle "rockettrail"
+	]
+]

fgd/engine/dod/dod_ammo_box.fgd

@@ -0,0 +1,10 @@
+@PointClass base(Item)
+    appliesto(+engine,DODS)
+    studioprop("models/ammo/ammo_us.mdl") = dod_ammo_box : "An ammo box. It can only be picked up by members of the same teams as the player who dropped it, and the variable which controls this isn't exposed to keyvalues or even VScript, so there's little reason to place it directly."
+[
+    @resources
+    [
+        mdl "models/ammo/ammo_us.mdl"
+        mdl "models/ammo/ammo_axis.mdl"
+    ]
+]

fgd/engine/dod/dod_bomb_dispenser_icon.fgd

@@ -0,0 +1 @@
+@PointClass base(BaseEntityPoint) appliesto(+engine,DODS) = dod_bomb_dispenser_icon : "Spawned automatically at the center of each dod_bomb_dispenser's bbox to indicate where it is on the minimap. Does not work when spawned directly." []

fgd/engine/dod/dod_gamerules.fgd

@@ -0,0 +1,29 @@
+@PointClass base(BaseEntity)
+    appliesto(+engine,DODS) = dod_gamerules : "Proxy entity for networking game rules. No mapper-setable values."
+[
+    @resources
+    [
+		// round win music
+        snd "Game.USWin"
+		snd "Game.GermanWin"
+
+        // these ents have nothing of note for the postcompiler to care about
+        //entity dod_team_manager
+        //entity dod_team_allies
+        //entity dod_team_axis
+
+		// techncially precached outside of any class
+		mat "sprites/white.vmt"
+		mat "sprites/physbeam.vmt"
+
+		// technically precached on client
+		mat "effects/stun"
+		mat "effects/blood_gore"
+		mat "effects/blood_drop"
+		mat "effects/blood_puff"
+		mat "sprites/effects/muzzleflash1"
+		mat "sprites/effects/muzzleflash2"
+		mat "effects/fainttracer"
+		mat "effects/spark"
+    ]
+]

fgd/engine/dod/dod_round_timer.fgd

@@ -0,0 +1,2 @@
+@PointClass base(BaseEntity)
+    appliesto(+engine,DODS) = dod_round_timer : "Round timer. All mapper-side functionality has been folded into dod_control_point_master." []

fgd/engine/grenade.fgd → fgd/engine/grenade/grenade.fgd

@@ -14,6 +14,11 @@
 	@resources [
 		sound "BaseGrenade.Explode"
 
+        particle "grenadetrail" [+dods]
+        particle "riflegrenadetrail" [+dods]
+        particle "explosioncore_midair" [+dods]
+        particle "explosioncore_floor" [+dods]
+
 		particle "ExplosionCore" [+entropyzero2]
 		particle "ExplosionEmbers" [+entropyzero2]
 		particle "ExplosionFlash" [+entropyzero2]

fgd/engine/grenade/grenade_frag_ger.fgd

@@ -0,0 +1,11 @@
+@PointClass base(grenade, BaseEntityAnimating) // Mismatch??
+	appliesto(+engine, DODS)
+	studioprop("models/Weapons/w_stick.mdl")
+= grenade_frag_ger : "Axis stick grenade, as spawned from weapon_frag_ger."
+[
+	@resources
+	[
+		mdl "models/Weapons/w_stick.mdl"
+		snd "HEGrenade.Bounce"
+	]
+]

fgd/engine/grenade/grenade_frag_us.fgd

@@ -0,0 +1,11 @@
+@PointClass base(grenade, BaseEntityAnimating) // Mismatch??
+	appliesto(+engine, DODS)
+	studioprop("models/Weapons/w_frag.mdl")
+= grenade_frag_us : "Allies hand grenade, as spawned from weapon_frag_us."
+[
+	@resources
+	[
+		mdl "models/Weapons/w_frag.mdl"
+		snd "HEGrenade.Bounce"
+	]
+]