diff --git a/fgd/bases/BaseEntityAnimating.fgd b/fgd/bases/BaseEntityAnimating.fgd index ead2d686..6ecb285e 100644 --- a/fgd/bases/BaseEntityAnimating.fgd +++ b/fgd/bases/BaseEntityAnimating.fgd @@ -44,6 +44,8 @@ modelscale(float) : "Model Scale" : : "A multiplier for the size of the model." + AllowSilentDissolve[+P2](boolean) : "Allow SilentDissolve input" : 1 : "Allow the SilentDissolve input to dissolve this object." + 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." @@ -94,7 +96,11 @@ input AlternativeSorting(boolean) : "Used to attempt to fix sorting problems when rendering. True activates, false deactivates" input SetModelScale(vector) : "Sets the scale of the model. Secondary parameter (space delimited) sets the duration of time to scale the model." + + input Dissolve[+P2](void) : "Fizzles the object, firing the OnFizzled output." + input SilentDissolve[+P2](void) : "Kills the object immediately, firing the OnFizzled output." // Outputs output OnIgnite(void) : "Fired when this object catches fire." + output OnFizzled[+P2](void) : "Fired when this object is fizzled." ] diff --git a/fgd/point/prop/prop_monster_box.fgd b/fgd/point/prop/prop_monster_box.fgd index 86e0bb0c..be56872c 100644 --- a/fgd/point/prop/prop_monster_box.fgd +++ b/fgd/point/prop/prop_monster_box.fgd @@ -5,7 +5,6 @@ [ startasbox(boolean) : "Start As Box" : 0 : "Start the FrankenTurret in cube form." boxswitchspeed(float) : "Box Switch Speed" : 400 : "Speed to force switch to a box." - allowsilentdissolve(boolean) : "Allow SilentDissolve input" : 1 : "Allow the SilentDissolve input to dissolve this FrankenCube." model[engine](studio) : "Model" : "models/npcs/monsters/monster_a.mdl" model(choices) : "[H] Pose" : "models/npcs/monsters/monster_a.mdl" : "What pose to show in Hammer." = @@ -20,11 +19,8 @@ input BecomeMonster(void) : "Return the FrankenCube to extended form." input BecomeShortcircuit(void) : "Short circuit this FrankenCube and permanently switch to cube form. " + "Creates arc particles randomly across the cube, and the turret's eyes flicker randomly." - input Dissolve(void) : "Fizzles the FrankenCube." - input SilentDissolve(void) : "Kills the FrankenCube and fires its OnFizzled output, if the relevant setting is on." // Outputs - output OnFizzled(void) : "Fired when a cube is fizzled." output OnPlayerUse(void) : "Any player +USEd the cube." output OnPlayerPickup(void) : "Any player picked up the cube." output OnPhysGunDrop(void) : "Any player dropped the cube." diff --git a/fgd/point/prop/prop_paint_bomb.fgd b/fgd/point/prop/prop_paint_bomb.fgd index 311bca26..b5c71723 100644 --- a/fgd/point/prop/prop_paint_bomb.fgd +++ b/fgd/point/prop/prop_paint_bomb.fgd @@ -11,18 +11,14 @@ ] allowfunnel(boolean) : "Allow Portal Funneling" : 1 : "Whether or not this object should auto-funnel into a portal." - allowsilentdissolve(boolean) : "Allow SilentDissolve input" : 0 : "Allow the SilentDissolve input to dissolve this bomb." playspawnsound(boolean) : "Play Spawn Sound" : 1 : "Whether or not this bomb should play a sound on spawn (PaintBlob.Inception)." model(studio) readonly : "Model" : "models/error.mdl" : "Paint bombs need a model set to suppress a warning message. This model would be loaded already." // Inputs - input Dissolve(void) : "Dissolves the paint bomb." - input SilentDissolve(void) : "Kills the paint bomb and fires its OnFizzled output." input EnablePortalFunnel(void) : "Enable portal funneling behavior." input DisablePortalFunnel(void) : "Disable portal funneling behavior." // Outputs - output OnFizzled(void) : "Fired when a paint bomb is fizzled (by trigger_paint_cleanser?)." output OnExploded(void) : "Fired when a paint bomb explodes." ] diff --git a/fgd/point/prop/prop_weighted_cube.fgd b/fgd/point/prop/prop_weighted_cube.fgd index 568d4ff0..440b4c4f 100644 --- a/fgd/point/prop/prop_weighted_cube.fgd +++ b/fgd/point/prop/prop_weighted_cube.fgd @@ -78,18 +78,14 @@ input DisablePortalFunnel(void) : "Disable portal funneling behavior." input EnableMotion(void) : "Allow physics simulation." input DisableMotion(void) : "Prevent Physics simulation, freezing the cube in place." - input SetPaint(integer) : "Force the cube to be painted with 0 (Repulsion), 2 (Propulsion), or 4 (No) gel." - - input Dissolve(void) : "Fizzles the cube, firing the OnFizzled output." - input SilentDissolve(void) : "Kills the cube immediately and fires its OnFizzled output." input ExitDisabledState(void) : "Exits the disabled state of a reflective cube." + input SetPaint(integer) : "Force the cube to be painted with 0 (Repulsion), 2 (Propulsion), or 4 (No) gel." input SetReflectModifyColor(color255) : "Changes the laser modifier colour of the cube." input SetReflectFilterColor(color255) : "Changes the laser filter colour of the cube." input EmitLaser(boolean) : "Makes this cube emit or stop emitting its own laser." // Outputs - output OnFizzled(void) : "Fired when a cube is fizzled." output OnOrangePickUp(void) : "P-Body picked up the cube." output OnBluePickUp(void) : "ATLAS picked up the cube." output OnPlayerPickup(void) : "Any player picked up the cube."