Skip to content

Better method of specifying a target source property type for FGD entities #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
redxdev wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −2
Open

Better method of specifying a target source property type for FGD entities #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions addons/func_godot/src/core/parser.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,12 @@ func parse_map_data(map_file: String, map_settings: FuncGodotMapSettings) -> _Pa
properties[property] = prop_default[prop_default.keys().front()]
else:
properties[property] = 0
# Materials, Shaders, and Sounds
# Materials, Shaders, Sounds, and special property types
elif prop_default is Resource:
properties[property] = prop_default.resource_path
if prop_default is FuncGodotTargetSourceProperty:
properties[property] = ""
else:
properties[property] = prop_default.resource_path
# Target Destination and Target Source
elif prop_default is NodePath or prop_default is Object or prop_default == null:
properties[property] = ""
Expand Down
3 changes: 3 additions & 0 deletions addons/func_godot/src/fgd/func_godot_fgd_entity_class.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,9 @@ func build_def_text(target_editor: FuncGodotFGDFile.FuncGodotTargetMapEditors =
prop_type = "decal"
elif value is AudioStream:
prop_type = "sound"
elif value is FuncGodotTargetSourceProperty:
prop_type = "target_source"
prop_val = "\"\""
else:
prop_type = "target_source"
prop_val = "\"\""
Expand Down
3 changes: 3 additions & 0 deletions addons/func_godot/src/fgd/func_godot_target_source_property.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class_name FuncGodotTargetSourceProperty
extends Resource
## Special resource used to indicate that an FGD entity property is of type "target_source"
1 change: 1 addition & 0 deletions addons/func_godot/src/fgd/func_godot_target_source_property.gd.uid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://dkhtfq0fu81pm