Skip to content

Commit

Permalink
Version 2.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
TeamSpen210 committed Dec 30, 2019
2 parents d3bb1a1 + 4b6e228 commit f549a1e
Show file tree
Hide file tree
Showing 27 changed files with 128 additions and 75 deletions.
7 changes: 7 additions & 0 deletions fgd/bases/BModelParticleSpawner.fgd
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
sphere(distmax)
= BModelParticleSpawner
[
// These two values break dustmotes.
solid(choices) readonly: "Solid" : 0 : "This needs to be zero to allow this to not collide." =
[
0: "Non-solid"
]
origin(origin) readonly: "Origin": "" : "If offset, this breaks."

startdisabled(boolean) : "Start Disabled" : 0
color(color255) : "Particle Color (R G B)" : "255 255 255"
spawnrate(integer) : "Particle Per Second" : 40 : "Number of particles to spawn, per second."
Expand Down
28 changes: 23 additions & 5 deletions fgd/bases/RopeKeyFrame.fgd
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
1: "Auto Resize" : 0
]

nextkey(target_destination) : "Next Rope" : : "Name of the next rope along this path."

slack(integer) : "Slack" : 25 : "How much extra length the rope has (by default it has the length between its two endpoints in the editor)."
type(choices) : "Type" : "0" =
[
Expand All @@ -17,11 +19,22 @@

subdiv(integer) : "Subdivision" : 2 : "Number of subdivisions between each rope segment. Maximum value is 8. Higher values make smoother ropes, but are slower to render."
barbed(boolean) : "Barbed" : 0 : "Test effect that makes the rope look sharper and more barbed."
width(string) : "Width (1-64)" : "2" : "Width of the rope."
texturescale(string) : "Texture Scale" : "1" : "This changes the texture resolution. The default resolution is 4 pixels per inch. Larger values stretch the texture and smaller values scrunch it up."
width(float) : "Width (1-64)" : 2 : "Width of the rope."
texturescale(float) : "Texture Scale" : 1 : "This changes the texture resolution. The default resolution is 4 pixels per inch. Larger values stretch the texture and smaller values scrunch it up."
collide(boolean) : "Collide with world" : 0
dangling(boolean) : "Start Dangling" : 0 : "When set to Yes, the rope starts out detached from its target endpoint."
breakable(boolean) : "Breakable" : 0 : "When set to yes, the rope can be detached from either endpoint when shot."

dangling(boolean) : "Start Dangling" : 0
dangling(choices) : "Start Dangling" : 0 : "When set to Yes, the rope starts out detached from its target endpoint." = [
0 : "Start Attached"
1 : "Start Dangling"
]

breakable(boolean) : "Breakable" : 0
breakable(choices) : "Breakable" : 0 : "When set to yes, the rope can be detached from either endpoint when shot." = [
0 : "Indestructible"
1 : "Breakable"
]

ropematerial(material) : "Rope Material" : "cable/cable.vmt" : "The material to use when rendering the rope."

usewind(choices) : "Wind" : "0" : "Is the rope affected by wind?" =
Expand All @@ -31,10 +44,15 @@
]
usewind[engine](boolean): "Use Wind": 0

// Useless remmnants of unused keyframe logic.
// We have to have these for Hammer to render ropes.
movespeed(integer) readonly: "Speed (unused)" : 64
positioninterpolator(integer) readonly: "Position Interpolator" : 2 : "Curve Type. Currently only Rope is fully supported."


// Inputs
input SetScrollSpeed(float) : "Set the speed at which the texture scrolls."
input SetForce(string) : "Apply a force instantaneously to the rope. The parameter should be a vector containing the force to be applied (X Y Z)."
input SetForce(vector) : "Apply a force instantaneously to the rope. The parameter should be a vector containing the force to be applied (X Y Z)."
input Break(void) : "Break the rope, if it's marked to do so."

// Outputs
Expand Down
2 changes: 1 addition & 1 deletion fgd/brush/func/func_null.fgd
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
// However, it kills itself immediately so most are useless
// TODO: might be useful to strip ones that can't function.
@SolidClass base(BaseEntity) appliesto(Mbase)
= func_lod: "A brush entity that's immediately removed upon spawning. Useful for invisible brush lights."
= func_null: "A brush entity that's immediately removed upon spawning. Useful for invisible brush lights."
[
]
2 changes: 1 addition & 1 deletion fgd/brush/func/func_tanklogic.fgd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@SolidClass base(BaseTank)
appliesto(MBase)
= func_tank: "A special kind of turret designed to fire outputs instead of bullets, functioning solely through the I/O system."
= func_tanklogic: "A special kind of turret designed to fire outputs instead of bullets, functioning solely through the I/O system."
[
shootsound[MBase](sound) : "Shoot Sound" : "" : "Plays a specific sound each time this tank fires."

Expand Down
2 changes: 1 addition & 1 deletion fgd/point/ai/ai_relationship_classify.fgd
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
appliesto(MBase)
autovis(AI, AI Relationship)
iconsprite("editor/ai_relationship.vmt")
sphere() = ai_relationship: "AI Relationship - Sets relationships between entire classify classes in the AI."
sphere() = ai_relationship_classify: "AI Relationship - Sets relationships between entire classify classes in the AI."
[
subject[engine](integer) : "Subject(s)" : 0
subject(choices) : "Subject(s)" : 0 : "This is the NPC class whose disposition will change." =
Expand Down
2 changes: 2 additions & 0 deletions fgd/point/comp/comp_kv_setter.fgd
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
kv_value_global(string) : "Value - String" : : "The value to apply."
kv_value_local(target_destination) : "Value - Ent Name" : : "If set, use this fixed-up entity name."

invert(boolean) : "Invert Value" : 0 : "If enabled, invert the value so 0 and 1 are swapped."

// We need to provide "some" outputs to allow you to add some.
// These exist on everything, at least.
output OnUser1(void) : "Fired in response to FireUser1 input."
Expand Down
2 changes: 1 addition & 1 deletion fgd/point/env/env_lightglow.fgd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@PointClass base(BaseEntityPoint)
@PointClass base(BaseEntityPoint, RenderFields)
color(255 128 0)
studio("models/editor/axis_helper_thick.mdl")
iconsprite("editor/ficool2/env_lightglow.vmt")
Expand Down
2 changes: 1 addition & 1 deletion fgd/point/env/env_sprite.fgd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@PointClass base(BaseEntityPoint, SystemLevelChoice)
@PointClass base(BaseEntityPoint, RenderFields, SystemLevelChoice)
studio("models/editor/axis_helper.mdl")
sprite()
color(20 140 20)
Expand Down
2 changes: 1 addition & 1 deletion fgd/point/env/env_spritetrail.fgd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@PointClass base(BaseEntityPoint)
@PointClass base(BaseEntityPoint, RenderFields)
iconsprite("editor/env_spritetrail.vmt")
sphere(startwidth)
sphere(endwidth)
Expand Down
2 changes: 1 addition & 1 deletion fgd/point/env/env_steam.fgd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@PointClass base(BaseEntityPoint)
@PointClass base(BaseEntityPoint, RenderFields)
color(255 255 255)
color(200 200 0)
studio("models/editor/spot_cone.mdl")
Expand Down
2 changes: 1 addition & 1 deletion fgd/point/env/env_sun.fgd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@PointClass base(BaseEntityPoint, SystemLevelChoice)
@PointClass base(BaseEntityPoint, RenderFields, SystemLevelChoice)
color(255 0 0)
color(200 0 0)
iconsprite("editor/env_sun.vmt")
Expand Down
19 changes: 0 additions & 19 deletions fgd/point/env/env_terrainmorph.fgd

This file was deleted.

2 changes: 1 addition & 1 deletion fgd/point/info/info_node_link_logic.fgd
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@PointClass base(info_node_link) appliesto(MBase)
color(220 180 0)
iconsprite("editor/info_node_link.vmt")
= info_node_link_filtered :
= info_node_link_logic:
"A variant of info_node_link that fires outputs when a NPC tries to use it. " +
"Otherwise functions identically to a regular info_node_link."
[
Expand Down
2 changes: 1 addition & 1 deletion fgd/point/info/info_node_link_oneway.fgd
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@PointClass base(info_node_link) appliesto(MBase)
color(220 180 0)
iconsprite("editor/info_node_link.vmt")
= info_node_link_filtered :
= info_node_link_oneway:
"A variant of info_node_link that fires outputs when a NPC tries to use it. " +
"Otherwise functions identically to a regular info_node_link."
[
Expand Down
1 change: 1 addition & 0 deletions fgd/point/infra/infra_loading_screen_control.fgd
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@PointClass base(BaseEntityPoint)
appliesto(INFRA)
iconsprite("editor/infra_loading_screen_control.vmt")
autovis(Point Entities, Globals, Loading Screen)
= infra_loading_screen_control: "Loading screen"
Expand Down
15 changes: 12 additions & 3 deletions fgd/point/keyframe/keyframe_rope.fgd
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
@KeyframeClass base(BaseEntityPoint, KeyFrame, RopeKeyFrame)
// Valve originally had move_rope and keyframe_rope, intended in that order.
// Engine-wise they're exactly identical.
// So we want to combine the logic, but Hammer still thinks they're the same.
// It only detects @MoveClass, so we're alright not using @KeyFrameClass.
//@MoveClass and animator() is required to allow them to be the first in a chain.
// keyframe() automatically renames when copied.

@MoveClass base(BaseEntityPoint, RopeKeyFrame)
studio("models/editor/axis_helper_thick.mdl")
keyframe()
= keyframe_rope: "A node entity that marks a point in a rope. The first node in the rope should be a move_rope, followed by 1 or more keyframe_ropes."
animator() keyframe()
= keyframe_rope: "A node entity that marks a point in a rope. " +
"Traditionally, one move_rope is used to start the chain and then is followed by one or more keyframe_rope entities. " +
"However they are freely interchangeable."
[
]
2 changes: 1 addition & 1 deletion fgd/point/light/light_environment.fgd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@PointClass base(Angles)
autovis(Lights, Environment Light)
iconsprite("editor/ficool2/light_env.vmt")
iconsprite("editor/ficool2/light_environment.vmt")
color(255 255 0)
lightprop("models/editor/spot.mdl")
autovis(Point Entities, Globals, Light Environment)
Expand Down
2 changes: 1 addition & 1 deletion fgd/point/logic/logic_scene_list_manager.fgd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@PointClass base(BaseEntityPoint)
color(0 0 255)
iconsprite("editor/choreo_manager.vmt")
iconsprite("editor/ficool2/logic_scene_list_manager.vmt")
color(240 180 250)
line(240 180 250, targetname, scene0)
line(240 180 250, targetname, scene1)
Expand Down
22 changes: 12 additions & 10 deletions fgd/point/move/move_rope.fgd
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
@MoveClass base(BaseEntityPoint, KeyFrame, RopeKeyFrame)
// Valve originally had move_rope and keyframe_rope, intended in that order.
// Engine-wise they're exactly identical.
// So we want to combine the logic, but Hammer still thinks they're the same.
// It only detects @MoveClass, so we're alright not using @KeyFrameClass.
//@MoveClass and animator() is required to allow them to be the first in a chain.
// keyframe() automatically renames when copied.

@MoveClass base(BaseEntityPoint, RopeKeyFrame)
studio("models/editor/axis_helper.mdl")
animator()
= move_rope: "The first node in set of nodes that are used to place ropes in the world. It should connect to 1 or more keyframe_rope entities."
animator() keyframe()
= move_rope: "A node entity that marks a point in a rope. " +
"Traditionally, one move_rope is used to start the chain and then is followed by one or more keyframe_rope entities. " +
"However they are freely interchangeable."
[
positioninterpolator[engine](integer) : "Position Interpolator" : 2
positioninterpolator(choices) : "Position Interpolator" : 2 : "Curve Type. Currently only type 2 (Rope) is fully supported." =
[
0: "Linear"
1: "Catmull-Rom Spline"
2: "Rope"
]
]
1 change: 1 addition & 0 deletions fgd/point/npc/npc_clawscanner.fgd
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@NpcClass base(npc_cscanner)
appliesto(EP1, EP2, HL2, P1, ASW)
autovis(NPCs, Combine, Combine Claw Scannner)
studio("models/shield_scanner.mdl")
= npc_clawscanner: "Claw Scanner"
Expand Down
8 changes: 3 additions & 5 deletions fgd/point/portal_race_checkpoint.fgd
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
@PointClass base(BaseEntityPoint)
@PointClass base(BaseEntityAnimating)
appliesto(P2)
autovis(Point Entities, Globals, Challenge Mode End)
studioprop("models/props/stopwatch_finish_line.mdl") = portal_race_checkpoint: "Checkpoint for race maps."
studioprop("models/effects/cappoint_hologram.mdl") = portal_race_checkpoint: "Checkpoint for race maps. Wen touched, lights up briefly."
[
resettime(float) : "Reset Time" : 5.0 : "The time it takes for the checkpoint to reset after activation"
skin(integer) readonly: "<Skin>" : 3 : "Ignore, needed to make the skin lit."
resettime(float) : "Reset Time" : 5.0 : "The time it takes for the checkpoint to reset after activation."

// Inputs
input Activate(void) : "Activates the checkpoint."
Expand Down
1 change: 1 addition & 0 deletions fgd/point/prop/prop_weighted_cube.fgd
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
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."
Expand Down
9 changes: 0 additions & 9 deletions fgd/point/vehicle/vehicle_viewcontroller.fgd

This file was deleted.

9 changes: 4 additions & 5 deletions fgd/point/vehicle_viewcontroller.fgd
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

@PointClass base(BaseDriveableVehicle)
appliesto(ASW, EP1, EP2, HL2, P1, P2)
studioprop() = vehicle_viewcontroller: "Vehicle hack to control player view"
studioprop()
= vehicle_viewcontroller: "Vehicle hack to control player view"
[

// Inputs
input ForcePlayerIn(string) : "Force the player into the vehicle. The animation to use can be specified in the parameter. Without a parameter, the player just teleports."
input ForcePlayerIn(string) : "Force the player into the vehicle. The animation to use can be specified in the parameter. " +
"Without a parameter, the player just teleports."
input ForcePlayerOut(void) : "Force the player out of the vehicle."
]
1 change: 0 additions & 1 deletion fgd/point/vgui/vgui_movie_display.fgd
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@PointClass base(BaseEntityPoint)
appliesto(since_ASW)
studioprop("models/editor/axis_helper_thick.mdl")
color(200 200 0)
studioprop("models/editor/vgui_arrows.mdl")
sphere(width)
Expand Down
4 changes: 2 additions & 2 deletions hammer/materials/editor/ts2do/logic_collision_pair.vmt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
$spriteorientation "vp_parallel"
$spriteorigin "[ 0.50 0.50 ]"
$basetexture "editor/ts2do/logic_collision_pair"
$no_fullbright" 1
}
$no_fullbright 1
}
Loading

0 comments on commit f549a1e

Please sign in to comment.