Skip to content

Commit 7ab48fe

Browse files
Remove almost every single slavery reference from FGD (#323)
Removes virtually almost _all_ references to derogatory "master"/"slave" terminology from the Strata FGDs, except for internal keyvalues parameters directly bound to by engine code. The `MasterEnt` FGD (which was used by the HL1 `multisource` entity) has also been removed as it no longer exists in Strata engine code. Any entity that used to rely on this has had their FGDs modified to no longer reference it.
1 parent eadb167 commit 7ab48fe

21 files changed

Lines changed: 59 additions & 58 deletions

fgd/bases/BaseTank.fgd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
]
2020

2121
control_volume(target_destination) : "Control Volume" : : "Name of a trigger the specifies the volume in which a player must be to control this tank."
22-
23-
master(string) : "(Team) Master"
2422

2523
yawrate(string) : "Yaw rate" : "30" : "How fast tank can look left or right."
2624
yawrange(string) : "Yaw range" : "180" : "How far tank can turn left or right."

fgd/bases/Door.fgd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@BaseClass base(BaseEntityVisBrush, MasterEnt)
1+
@BaseClass base(BaseEntityVisBrush)
22
line(255 255 255, targetname, chainstodoor)
33
= Door
44
[

fgd/bases/MasterEnt.fgd

Lines changed: 0 additions & 6 deletions
This file was deleted.

fgd/brush/func/func_rot_button.fgd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@SolidClass base(BaseEntityVisBrush, MasterEnt, Button)
1+
@SolidClass base(BaseEntityVisBrush, Button)
22
= func_rot_button: "A brush entity that's designed to be used for a rotating player-useable button. When used by the player, it rotates to a pressed position."
33
[
44
speed(integer) : "Speed" : 50 : "The speed that the button rotates, in degrees per second."

fgd/brush/momentary_rot_button.fgd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@SolidClass base(BaseEntityVisBrush, Angles, MasterEnt)
1+
@SolidClass base(BaseEntityVisBrush, Angles)
22
= momentary_rot_button: "A brush entity that's designed to be used for rotating wheels, " +
33
"where the player can rotate them to arbitrary positions before stopping."
44
[

fgd/brush/trigger/trigger_hurt.fgd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@SolidClass base(Trigger, MasterEnt, DamageType)
1+
@SolidClass base(Trigger, DamageType)
22
= trigger_hurt: "A trigger volume that damages entities that touch it."
33
[
44
damage(integer) : "Damage" : 20 : "The amount of damage done to entities that touch this trigger. " +

fgd/point/env/env_fog_controller.fgd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
farz(string) : "Far Z Clip Plane" : "-1" : "The distance at which the world will not be rendered."
2020
spawnflags(flags) : "spawnflags" =
2121
[
22-
1: "Master (Has priority if multiple env_fog_controllers exist)" : 0
22+
1: "Primary Fog Controller (takes priority over existing controllers)" : 0
2323
]
2424

2525
hdrcolorscale(float) : "HDR Color Scale" : "1" : "Float value to multiply fog color by when running in HDR mode."

fgd/point/env/env_tonemap_controller.fgd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[
66
spawnflags(flags) : "spawnflags" =
77
[
8-
1: "Master (Has priority if multiple env_tonemap_controllers exist)" : 0
8+
1: "Primary Tonemapper (takes priority over existing controllers)" : 0
99
]
1010

1111
// Inputs

fgd/point/game/game_end.fgd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@PointClass base(BaseEntityPoint, MasterEnt)
1+
@PointClass base(BaseEntityPoint)
22
appliesto(+USE_MULTIPLAYER)
33
iconsprite("editor/game_end.vmt")
44
= game_end: "An entity that ends a multiplayer game."

fgd/point/game/game_player_equip.fgd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@PointClass appliesto(-MOMENTUM)
2-
base(BaseEntityPoint, MasterEnt)
2+
base(BaseEntityPoint)
33
iconsprite("editor/ficool2/game_player_equip")
44
= game_player_equip:
55
"An entity that gives equipment to the player who activates it. " +

0 commit comments

Comments
 (0)