Skip to content

Commit 26620ec

Browse files
Remove references to portal gun, clarify weapon_physcannon behaviors
1 parent b1872b2 commit 26620ec

6 files changed

Lines changed: 18 additions & 17 deletions

File tree

fgd/bases/BasePropPhysics.fgd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
4096: "Debris with trigger interaction" : 0
1616
8192: "Force server-side (Multiplayer only)" : 0 [+USE_MULTIPLAYER]
1717
16384: "Radius pickup (easier to pickup)" : 0
18-
1048576: "Always allow the gravity gun/portal gun to pick this entity up" : 0 [+HL2_ENTITIES]
18+
1048576: "Always allow the gravity gun to pick this entity up" : 0 [+HL2_ENTITIES]
1919
2097152: "No collisions" : 0
2020
]
2121

@@ -55,11 +55,11 @@
5555
// Outputs
5656
output OnMotionEnabled(void) : "Fired when motion is enabled on this prop, either via 'Health Level to Override Motion' or from the EnableMotion input."
5757
output OnAwakened(void) : "Fired when this entity becomes awake (collision/force is applied to it while it's asleep)."
58-
output OnPhysGunPickup(void) : "Fired when the player picks up the prop with +USE or with the gravity/portal gun."
58+
output OnPhysGunPickup(void) : "Fired when the player picks up the prop with +USE or with the gravity gun."
5959
output OnPhysGunPunt(void) : "Fired when a player punts this object with the gravity gun."
60-
output OnPhysGunOnlyPickup(void) : "Fired when a player picks this object up with the gravity/portal gun ONLY. +USE pickups do not fire this output."
61-
output OnPhysGunDrop(void) : "Fired when the player drops the prop with +USE or with the gravity/portal gun."
60+
output OnPhysGunOnlyPickup(void) : "Fired when a player picks this object up with the gravity gun ONLY. +USE pickups do not fire this output."
61+
output OnPhysGunDrop(void) : "Fired when the player drops the prop with +USE or with the gravity gun."
6262
output OnPlayerUse(void) : "Fired when the player tries to +USE the prop. This output will fire only if the Generate output on +USE spawnflag is set."
63-
output OnPlayerPickup(void) : "Fired whenever the player picks up this prop (with the physcannon or with +USE)."
63+
output OnPlayerPickup(void) : "Fired whenever the player picks up this prop (with the gravity gun or with +USE)."
6464
output OnOutOfWorld(void) : "Fired whenever the prop is out of the allowed world bounds."
6565
]

fgd/bases/Breakable.fgd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
input SetHealth(integer) : "Sets a new value for the breakable's health. If the breakable's health reaches zero it will break."
2929
input AddHealth(integer) : "Adds health to the breakable. If the breakable's health reaches zero it will break."
3030
input RemoveHealth(integer) : "Removes health from the breakable. If the breakable's health reaches zero it will break."
31-
input EnablePhyscannonPickup(void) : "Makes the breakable able to picked up by the gravity/portal gun."
32-
input DisablePhyscannonPickup(void) : "Makes the breakable not able to picked up by the gravity/portal gun."
31+
input EnablePhyscannonPickup(void) : "Makes the breakable able to picked up by the gravity gun."
32+
input DisablePhyscannonPickup(void) : "Makes the breakable not able to picked up by the gravity gun."
3333
input SetMass(float) : "Set mass of this object."
3434

3535
// Outputs

fgd/brush/func/func_combine_ball_spawner.fgd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55

66
// Outputs
77
output OnBallReinserted(void) : "Fired when a Combine energy ball is reinserted into the field. (Only gets triggered when Combine Power Supply spawnflag is enabled.)"
8-
output OnLastBallGrabbed(void) : "Fired when the last Combine energy ball is grabbed from the field by a mega physcannon"
8+
output OnLastBallGrabbed(void) : "Fired when the last Combine energy ball is grabbed from the field by a supercharged gravity gun."
99
]

fgd/brush/func/func_physbox.fgd

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
131072: "Enable motion on grab" : 0
1212
262144: "Not affected by rotor wash" : 0
1313
524288: "Generate output on +USE" : 1
14-
1048576: "Always allow the gravity gun/portal gun to pick this entity up" : 0
15-
2097152: "Disallow pickup from gravity gun/portal gun" : 0
14+
1048576: "Always allow the gravity gun to pick this entity up" : 0
15+
2097152: "Disallow pickup from gravity gun" : 0
1616
4194304: "Disallow punting from gravity gun" : 0
1717
8388608: "Prevent motion enable on player bump" : 0
1818
]
@@ -29,7 +29,7 @@
2929
damagetoenablemotion(integer) : "Health Level to Override Motion" : 0 : "If specified, this object will start motion disabled. Once its health has dropped below this specified amount, it will enable motion."
3030
forcetoenablemotion(float) : "Physics Impact Force to Override Motion" : 0 : "If specified, this object will start motion disabled. Any impact that imparts a force greater than this value on the physbox will enable motion."
3131
health(integer) : "Strength" : 0 : "Number of points of damage to take before breaking. 0 means don't break."
32-
preferredcarryangles(vector) : "Preferred Player-carry Angles" : "0 0 0" : "If the 'Use Preferred Carry Angles' spawnflag is set, this angle is the angle which the object should orient to when the player picks it up, with the physgun or +USE."
32+
preferredcarryangles(vector) : "Preferred Player-carry Angles" : "0 0 0" : "If the 'Use Preferred Carry Angles' spawnflag is set, this is the angle which the object should orient to when the player picks it up with the gravity gun or +USE."
3333

3434
notsolid[engine](boolean): "Not solid to world?"
3535
notsolid(choices) : "Not solid to world" : 0 =
@@ -44,18 +44,18 @@
4444
"Note that physics objects go to sleep automatically after coming to rest for a while, so you don't really need to use this."
4545
input EnableMotion(void) : "Enable physics motion/collision response."
4646
input DisableMotion(void) : "Disable physics motion/collision response."
47-
input ForceDrop(void) : "If this object is being carried by a player, with the physgun or +USE, force it to be dropped."
47+
input ForceDrop(void) : "If this object is being carried by a player, with the gravity gun or +USE, force it to be dropped."
4848
input Enable(void) : "Show this object and allow it to collide, doesn't override notsolid."
4949
input Disable(void) : "Hide this object and stop collisions."
5050
input BecomeDebris(void) : "Change the collision to act like debris"
5151

5252
// Outputs
5353
output OnDamaged(void) : "Fired when this entity is damaged."
5454
output OnAwakened(void) : "Fired when this entity becomes awake (collision/force is applied)."
55-
output OnMotionEnabled(void) : "Fired when motion is enabled due to damage/physcannon/force."
56-
output OnPhysGunPickup(void) : "Fired when a player picks this object up, either with the physgun or +USE."
55+
output OnMotionEnabled(void) : "Fires when motion is enabled due to this entity either receiving damage, being impacted by physics forces or if it is the subject of a gravity gun interaction."
56+
output OnPhysGunPickup(void) : "Fired when a player picks this object up, either with the gravity gun or +USE."
5757
output OnPhysGunPunt(void) : "Fired when a player punts this object with the gravity gun."
58-
output OnPhysGunOnlyPickup(void) : "Fired when a player picks this object up with the gravity gun or portal gun ONLY. " +
58+
output OnPhysGunOnlyPickup(void) : "Fired when a player picks this object up with the gravity gun ONLY. " +
5959
"+USE pickups do not fire this output."
6060
output OnPhysGunDrop(void) : "Fired when a player drops this object."
6161
output OnPlayerUse(void) : "Fired when the player tries to +USE this physbox." +

fgd/point/item/item_item_crate.fgd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030
// Outputs
3131
output OnBreak(void) : "Fires when broken."
3232
output OnHealthChanged(float) : "Fires when the health of this breakable changes, passing the new value of health as a percentage of max health, from [0..1]."
33-
output OnCacheInteraction(void) : "This output fires when the player proves they have 'found' this crate. Fires on player touch, +USE pickup, gravity gun/portal gun pickup, gravity gun punt."
33+
output OnCacheInteraction(void) : "This output fires when the player proves they have 'found' this crate. Fires on player touch, +USE pickup, and with gravity gun pull/punt."
3434
]
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@PointClass base(Weapon)
22
appliesto(+HL2_ENTITIES)
33
studioprop("models/weapons/w_physics.mdl")
4-
= weapon_physcannon: "The Zero-Point Energy Field Manipulator, aka the \"Gravity Gun\"."
4+
= weapon_physcannon: "The Zero-Point Energy Field Manipulator, aka the \"Gravity Gun\". Can pull, hold and throw small and large objects at the player's will.\n\n" +
5+
"This weapon can additionally be given the ability to instantly electrocute enemies using pull/punt by enabling the \"Supercharged gravity gun enabled\" global state."
56
[
67
]

0 commit comments

Comments
 (0)