Skip to content

Commit b1872b2

Browse files
physcannon grab weirdness
1 parent 33eefb3 commit b1872b2

8 files changed

Lines changed: 39 additions & 49 deletions

File tree

fgd/bases/BasePropPhysics.fgd

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
2: "Don't take physics damage" : 0
88
4: "Debris - Don't collide with the player or other debris" : 0
99
8: "Motion Disabled" : 0
10-
64: "Enable motion on Physcannon grab" : 0 [+HL2_ENTITIES]
10+
64: "Enable motion on grab" : 0 [+HL2_ENTITIES]
1111
128: "Not affected by rotor wash" : 0
1212
256: "Generate output on +USE " : 1
1313
512: "Prevent pickup" : 0
1414
1024: "Prevent motion enable on player bump" : 0
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: "Physgun can ALWAYS pick up. No matter what." : 0 [+HL2_ENTITIES]
18+
1048576: "Always allow the gravity gun/portal gun to pick this entity up" : 0 [+HL2_ENTITIES]
1919
2097152: "No collisions" : 0
2020
]
2121

@@ -55,10 +55,10 @@
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 the physcannon or +USE."
59-
output OnPhysGunPunt(void) : "Fired when a player punts this object with the physgun."
60-
output OnPhysGunOnlyPickup(void) : "Fired when a player picks this object up WITH THE PHYSGUN. +USE pickups do not fire this output."
61-
output OnPhysGunDrop(void) : "Fired when the player drops the prop with the physcannon or USE."
58+
output OnPhysGunPickup(void) : "Fired when the player picks up the prop with +USE or with the gravity/portal gun."
59+
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."
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."
6363
output OnPlayerPickup(void) : "Fired whenever the player picks up this prop (with the physcannon or with +USE)."
6464
output OnOutOfWorld(void) : "Fired whenever the prop is out of the allowed world bounds."

fgd/bases/Breakable.fgd

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
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 physcannon."
32-
input DisablePhyscannonPickup(void) : "Makes the breakable not able to picked up by the physcannon."
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."
3333
input SetMass(float) : "Set mass of this object."
3434

3535
// Outputs
3636
output OnBreak(void) : "Fired when this breakable breaks."
3737
output OnTakeDamage(void) : "Fired each time this breakable takes any damage."
3838
output OnHealthChanged(float) : "Fired when the health of this breakable changes, passing the new value of health as a percentage of max health, from [0..1]."
39-
output OnPhysCannonDetach(void) : "Fired when the physcannon has ripped this breakable off of the wall. Only fired if ACT_PHYSCANNON_DETACH is defined in the model this breakable is using."
40-
output OnPhysCannonAnimatePreStarted(void) : "Fired when this prop starts playing the Pre physcannon-pull activity, caused by the player trying to grab this prop with the physcannon. Only fired if the ACT_PHYSCANNON_ANIMATE_PRE activity is defined in the model this breakable is using."
41-
output OnPhysCannonAnimatePullStarted(void) : "Fired when this prop starts playing the physcannon-pull activity, caused by the player trying to grab this prop with the physcannon. Only fired if the ACT_PHYSCANNON_ANIMATE activity is defined in the model this breakable is using. If the prop has Pre pull anim, this will be fired after the Pre anim has finished playing."
42-
output OnPhysCannonPullAnimFinished(void) : "Fired when this prop has finished playing the physcannon-pull activity, caused by the player trying to grab this prop with the physcannon. Only fired if the ACT_PHYSCANNON_ANIMATE activity is defined in the model this breakable is using. If the prop has Pre & Post pull anims, this will be fired after the Post anim has finished playing."
43-
output OnPhysCannonAnimatePostStarted(void) : "Fired when this prop starts playing the Post physcannon-pull activity. Only fired if the ACT_PHYSCANNON_ANIMATE_POST activity is defined in the model this breakable is using."
39+
output OnPhysCannonDetach(void) : "Fired when the gravity gun rips this breakable off of the wall. Only fired if ACT_PHYSCANNON_DETACH is defined in the model this breakable is using."
40+
output OnPhysCannonAnimatePreStarted(void) : "Fired when this prop starts playing the pre-\"physcannon pull\" activity, caused by the player trying to grab this prop with the gravity gun. Only fired if the ACT_PHYSCANNON_ANIMATE_PRE activity is defined in the model this breakable is using."
41+
output OnPhysCannonAnimatePullStarted(void) : "Fired when this prop starts playing the \"physcannon pull\" activity, caused by the player trying to grab this prop with the gravity gun. Only fired if the ACT_PHYSCANNON_ANIMATE activity is defined in the model this breakable is using. If the prop has Pre pull anim, this will be fired after the Pre anim has finished playing."
42+
output OnPhysCannonPullAnimFinished(void) : "Fired when this prop has finished playing the \"physcannon pull\" activity, caused by the player trying to grab this prop with the gravity gun. Only fired if the ACT_PHYSCANNON_ANIMATE activity is defined in the model this breakable is using. If the prop has Pre & Post pull anims, this will be fired after the Post anim has finished playing."
43+
output OnPhysCannonAnimatePostStarted(void) : "Fired when this prop starts playing the post-\"physcannon-pull\" activity. Only fired if the ACT_PHYSCANNON_ANIMATE_POST activity is defined in the model this breakable is using."
4444
]

fgd/bases/CombineBallSpawners.fgd

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
spawnflags(flags) : "spawnflags" =
55
[
66
4096: "Start inactive" : 1
7-
8192: "Combine power supply" : 0
7+
8192: "Combine Power Supply" : 0
88
]
99

1010
ballcount(integer) : "Ball count" : 3 : "This is how many balls will be bouncing around inside the spawner"
@@ -27,10 +27,10 @@
2727
input Disable(void) : "Disable spawning of combine balls"
2828

2929
// Outputs
30-
output OnBallGrabbed(void) : "Fired when a combine ball is grabbed from the field by a mega physcannon"
31-
output OnBallReinserted(void) : "Fired when a combine ball is reinserted into the field (only gets triggered when Combine Power supply is checked)"
32-
output OnBallHitTopSide(void) : "Fired when a combine ball in hits the top side of the field (only gets triggered when Combine Power supply is checked)"
33-
output OnBallHitBottomSide(void) : "Fired when a combine ball in hits the bottom side of the field (only gets triggered when Combine Power supply is checked)"
34-
output OnLastBallGrabbed(void) : "Fired when the last combine ball is grabbed from the field by a mega physcannon"
35-
output OnFirstBallReinserted(void) : "Fired when the first combine ball is reinserted into the field (only gets triggered when Combine Power supply is checked)"
30+
output OnBallGrabbed(void) : "Fired when a Combine energy ball is grabbed from the field by a supercharged gravity gun."
31+
output OnLastBallGrabbed(void) : "Fired when the last combine ball is grabbed from the field by a supercharged gravity gun."
32+
output OnBallReinserted(void) : "Fired when a Combine energy ball is reinserted into the field. (Only gets triggered when the Combine Power Supply spawnflag is enabled.)"
33+
output OnBallHitTopSide(void) : "Fired when a Combine energy ball in hits the top side of the field. (Only gets triggered when the Combine Power Supply spawnflag is enabled.)"
34+
output OnBallHitBottomSide(void) : "Fired when a Combine energy ball in hits the bottom side of the field. (Only gets triggered when the Combine Power Supply spawnflag is enabled.)"
35+
output OnFirstBallReinserted(void) : "Fired when the first Combine energy ball is reinserted into the field. (Only gets triggered when the Combine Power Supply spawnflag is enabled.)"
3636
]

fgd/bases/Weapon.fgd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
output OnPlayerPickup(void) : "Fires when the player picks up this weapon."
1515
output OnNPCPickup[+USE_AI](void) : "Fires when an NPC picks up this weapon."
1616
output OnCacheInteraction[+HL2_ENTITIES](void) : "Fires when the player 'proves' they've found this weapon. " +
17-
"Fires on: Player Touch, +USE pickup, Physcannon pickup, Physcannon punt."
17+
"Fires on player touch, +USE pickup, gravity gun/portal gun pickup, gravity gun punt."
1818
output OnCacheInteraction[-HL2_ENTITIES](void) : "Fires when the player 'proves' they've found this weapon. " +
19-
"Fires on: Player Touch and +USE pickup."
19+
"Fires on player touch and +USE pickup."
2020
]

fgd/brush/func/func_combine_ball_spawner.fgd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
[
55

66
// Outputs
7-
output OnBallReinserted(void) : "Fired when a combine ball is reinserted into the field (only gets triggered when Combine Power supply is checked)"
8-
output OnLastBallGrabbed(void) : "Fired when the last combine ball is grabbed from the field by a mega physcannon"
7+
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"
99
]

fgd/brush/func/func_physbox.fgd

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
[
44
spawnflags(flags) : "spawnflags" =
55
[
6-
4096: "Start Asleep" : 0
7-
8192: "Ignore +USE for Pickup" : 0
6+
4096: "Start asleep" : 0
7+
8192: "Ignore +USE for pickup" : 0
88
16384: "Debris - Don't collide with the player or other debris" : 0
99
32768: "Motion Disabled" : 0
1010
65536: "Use Preferred Carry Angles" : 0
11-
131072: "Enable motion on Physcannon grab" : 0
11+
131072: "Enable motion on grab" : 0
1212
262144: "Not affected by rotor wash" : 0
13-
524288: "Generate output on +USE " : 1
14-
1048576: "Physgun can ALWAYS pick up. No matter what." : 0
15-
2097152: "Physgun is NOT allowed to pick this up." : 0
16-
4194304: "Physgun is NOT allowed to punt this object." : 0
13+
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
16+
4194304: "Disallow punting from gravity gun" : 0
1717
8388608: "Prevent motion enable on player bump" : 0
1818
]
1919

@@ -38,20 +38,10 @@
3838
1: "Passes through World"
3939
]
4040

41-
exploitablebyplayer[engine](boolean) : "Exploitable by Player"
42-
exploitablebyplayer(choices) : "Exploitable by Player" : 0 =
43-
[
44-
0: "Default"
45-
1: "Explosive"
46-
]
47-
48-
4941
// Inputs
5042
input Wake(void) : "Wake up this physics object, if it is sleeping."
51-
input Sleep(void) : "Put this physics object to sleep. It will wake if given the Wake input, " +
52-
"or if force is applied to it. " +
53-
"Note that physics objects go to sleep automatically after coming to rest for a while, " +
54-
"so you don't really need to use this."
43+
input Sleep(void) : "Put this physics object to sleep. It will wake if given the Wake input, or if force is applied to it.\n\n" +
44+
"Note that physics objects go to sleep automatically after coming to rest for a while, so you don't really need to use this."
5545
input EnableMotion(void) : "Enable physics motion/collision response."
5646
input DisableMotion(void) : "Disable physics motion/collision response."
5747
input ForceDrop(void) : "If this object is being carried by a player, with the physgun or +USE, force it to be dropped."
@@ -64,10 +54,10 @@
6454
output OnAwakened(void) : "Fired when this entity becomes awake (collision/force is applied)."
6555
output OnMotionEnabled(void) : "Fired when motion is enabled due to damage/physcannon/force."
6656
output OnPhysGunPickup(void) : "Fired when a player picks this object up, either with the physgun or +USE."
67-
output OnPhysGunPunt(void) : "Fired when a player punts this object with the physgun."
68-
output OnPhysGunOnlyPickup(void) : "Fired when a player picks this object up WITH THE PHYSGUN. " +
57+
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. " +
6959
"+USE pickups do not fire this output."
7060
output OnPhysGunDrop(void) : "Fired when a player drops this object."
71-
output OnPlayerUse(void) : "Fired when the player tries to +USE the physbox. " +
72-
"This output will fire only if the Generate output on +USE spawnflag is set."
61+
output OnPlayerUse(void) : "Fired when the player tries to +USE this physbox." +
62+
"This output will fire only if the \"Generate output on +USE\" spawnflag is set."
7363
]

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: Picked up by +USE, Picked up by Physcannon, Punted by Physcannon, Broken."
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."
3434
]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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 Gravity Gun."
4+
= weapon_physcannon: "The Zero-Point Energy Field Manipulator, aka the \"Gravity Gun\"."
55
[
66
]

0 commit comments

Comments
 (0)