From 95d18842fda3657968260e7ed358f4c55007f2de Mon Sep 17 00:00:00 2001 From: Panzer Date: Fri, 9 Aug 2024 15:53:18 -0600 Subject: [PATCH] Revert "fix: clarify/consolidate solidbsp fields" This reverts commit c73df37692d992d1a900dbfd7e3c38ed37ece523. # Conflicts: # fgd/brush/func/func_brush.fgd # fgd/brush/func/func_door_rotating.fgd --- fgd/bases/Door.fgd | 7 ------- fgd/brush/func/func_brush.fgd | 8 -------- fgd/brush/func/func_movelinear.fgd | 8 -------- fgd/brush/func/func_rotating.fgd | 8 -------- fgd/brush/momentary_rot_button.fgd | 8 -------- 5 files changed, 39 deletions(-) diff --git a/fgd/bases/Door.fgd b/fgd/bases/Door.fgd index 2cba13dda..014ca9cc7 100644 --- a/fgd/bases/Door.fgd +++ b/fgd/bases/Door.fgd @@ -21,13 +21,6 @@ "if the player tries to block them with objects." ignoredebris(boolean) : "Ignore Debris" : 0 : "If set this will change the door's collision group to one that ignore collisions with debris objects " + "(note that this is not compatible with the non-solid-to-player spawnflag)." - - solidbsp[engine](boolean) : "Solid Type" : 1 - solidbsp(choices) : "Solid Type" : 1 : "How to calculate collisions. BSP is more rudimentarty but allows more stable collision with players." = - [ - 0 : "VPhysics" - 1 : "BSP" - ] health(integer) : "Door Health" : : "The health of the door (allows someone to shoot it open). 0 means invincible." diff --git a/fgd/brush/func/func_brush.fgd b/fgd/brush/func/func_brush.fgd index 83412a53e..648416dc7 100644 --- a/fgd/brush/func/func_brush.fgd +++ b/fgd/brush/func/func_brush.fgd @@ -18,14 +18,6 @@ invert_exclusion[+USE_AI](boolean) : "Invert NPC class exclusion" : "0" : "If set, then the excluded NPC class will consider this brush solid, and all other NPC classes will consider it non-solid." - solidbsp[engine](boolean) : "Solid Type" : 1 - solidbsp(choices) : "Solid Type" : 1 : "How to calculate collisions. BSP is more rudimentary but allows more stable collision with players." = - [ - 0: "VPhysics" - 1: "BSP" - ] - - // Inputs input SetExcluded[+USE_AI](string) : "Change the NPC class excluded from collisions." input SetInvert[+USE_AI](boolean) : "Set the state of inversion for NPC class exclusion (0 or 1)." diff --git a/fgd/brush/func/func_movelinear.fgd b/fgd/brush/func/func_movelinear.fgd index cdeffc32c..b9d991a45 100644 --- a/fgd/brush/func/func_movelinear.fgd +++ b/fgd/brush/func/func_movelinear.fgd @@ -16,14 +16,6 @@ startsound(sound) : "Start Sound" : :"Sound played when the brush starts moving." stopsound(sound) : "Stop Sound" : : "Sound played when the brush stops moving." - solidbsp[engine](boolean) : "Solid Type" : 1 - solidbsp(choices) : "Solid Type" : 1 : "How to calculate collisions. BSP is more rudimentarty but allows more stable collision with players." = - [ - 0: "VPhysics" - 1: "BSP" - ] - - // Inputs input Open(void) : "Move the brush to the end position (starting position + (move direction * move distance))." input Close(void) : "Move the brush to the starting position." diff --git a/fgd/brush/func/func_rotating.fgd b/fgd/brush/func/func_rotating.fgd index aa99ed829..4e21054f3 100644 --- a/fgd/brush/func/func_rotating.fgd +++ b/fgd/brush/func/func_rotating.fgd @@ -23,14 +23,6 @@ dmg(integer) : "Blocking Damage" : 0 : "Damage done to any entity that blocks the rotation, per frame." - solidbsp[engine](boolean) : "Solid Type" : 1 - solidbsp(choices) : "Solid Type" : 1 : "How to calculate collisions. BSP is more rudimentarty but allows more stable collision with players." = - [ - 0: "VPhysics" - 1: "BSP" - ] - - // Inputs input SetSpeed(integer) : "Set the speed as a ratio of the specified Max Rotation Speed, where 0 is stopped and 1 is the Max Rotation Speed.." input Start(void) : "Start the rotator rotating." diff --git a/fgd/brush/momentary_rot_button.fgd b/fgd/brush/momentary_rot_button.fgd index 88ac98726..56c8fbaf9 100644 --- a/fgd/brush/momentary_rot_button.fgd +++ b/fgd/brush/momentary_rot_button.fgd @@ -79,14 +79,6 @@ 1: "Backward" ] - solidbsp[engine](boolean) : "Solid Type" : 1 - solidbsp(choices) : "Solid Type" : 1 : "How to calculate collisions. BSP is more rudimentarty but allows more stable collision with players." = - [ - 0: "VPhysics" - 1: "BSP" - ] - - // Inputs input Lock(void) : "Lock the button, preventing it from functioning." input Unlock(void) : "Unlock the button, allowing it to function."