Fixed entity definitions

3D/TrenchBroom/EntityDefinitions/base/func_base.tres

@@ -7,9 +7,9 @@
 script = ExtResource("1_grnar")
 classname = "Func"
 base_classes = Array[Resource]([ExtResource("1_ftv6l")])
-class_properties = {
+class_properties = Dictionary[String, Variant]({
 "_phong": false
-}
-class_property_descriptions = {
+})
+class_property_descriptions = Dictionary[String, Variant]({
 "_phong": "Set to 1 to give the brush entity smooth shading."
-}
+})

3D/TrenchBroom/EntityDefinitions/point/actors/Actor_Capacitor_Mini.tres

@@ -8,6 +8,7 @@
 
 [resource]
 script = ExtResource("3_864ca")
+target_map_editor = 1
 rotation_offset = Vector3(0, 180, 0)
 scene_file = ExtResource("2_frb07")
 apply_scale_on_map_build = false
@@ -15,6 +16,6 @@ classname = "actor_capacitor_mini"
 description = "Mini Capacitor"
 base_classes = Array[Resource]([ExtResource("1_frb07"), ExtResource("2_61nv4")])
 meta_properties = Dictionary[String, Variant]({
-"size": AABB(-8, -8, -8, 8, 8, 8),
-"studio": "\"3D/MapModels/actor_capacitor_mini.glb\""
+"model": "{\"path\": \"3D/MapModels/actor_capacitor_mini.glb\", \"scale\": 16.0 }",
+"size": AABB(-8, -8, -8, 8, 8, 8)
 })

3D/TrenchBroom/EntityDefinitions/point/actors/actor_alarmbox.tres

@@ -7,6 +7,7 @@
 
 [resource]
 script = ExtResource("4_n6irp")
+target_map_editor = 1
 rotation_offset = Vector3(0, 180, 0)
 scene_file = ExtResource("2_400u4")
 apply_scale_on_map_build = false
@@ -14,6 +15,6 @@ classname = "actor_alarmbox"
 description = "Alarm Box"
 base_classes = Array[Resource]([ExtResource("1_lfdgw")])
 meta_properties = Dictionary[String, Variant]({
-"size": AABB(-4, -4, -4, 4, 4, 4),
-"studio": "\"3D/MapModels/actor_alarmbox.glb\""
+"model": "{\"path\": \"3D/MapModels/actor_alarmbox.glb\", \"scale\": 16.0 }",
+"size": AABB(-4, -4, -4, 4, 4, 4)
 })

3D/TrenchBroom/EntityDefinitions/solid/Brush/worldspawn_bullet_permeable.tres

@@ -1,6 +1,8 @@
-[gd_resource type="Resource" script_class="FuncGodotFGDSolidClass" load_steps=2 format=3 uid="uid://cs5ourxglor8e"]
+[gd_resource type="Resource" script_class="FuncGodotFGDSolidClass" load_steps=4 format=3 uid="uid://cs5ourxglor8e"]
 
+[ext_resource type="Resource" uid="uid://bcdsueg5pysfq" path="res://addons/func_godot/fgd/cull_interior_faces.tres" id="1_1d7m3"]
 [ext_resource type="Script" uid="uid://5cow84q03m6a" path="res://addons/func_godot/src/fgd/func_godot_fgd_solid_class.gd" id="1_77qe7"]
+[ext_resource type="Resource" uid="uid://doo4ly322b4jc" path="res://addons/func_godot/fgd/vertex_merge_distance_base.tres" id="2_0k1ie"]
 
 [resource]
 script = ExtResource("1_77qe7")
@@ -10,7 +12,8 @@ collision_mask = 0
 classname = "solid_bullet_permeable"
 description = "Default static world geometry. Builds a StaticBody3D with a single MeshInstance3D and a single convex CollisionShape3D shape. Also builds Occluder3D to aid in render culling of other VisualInstance3D nodes.
 Is permeable to bullets"
-meta_properties = {
+base_classes = Array[Resource]([ExtResource("1_1d7m3"), ExtResource("2_0k1ie")])
+meta_properties = Dictionary[String, Variant]({
 "color": Color(0.8, 0.8, 0.8, 1)
-}
+})
 node_class = "StaticBody3D"

3D/TrenchBroom/EntityDefinitions/solid/Brush/worldspawn_custom.tres

@@ -1,6 +1,8 @@
-[gd_resource type="Resource" script_class="FuncGodotFGDSolidClass" load_steps=3 format=3 uid="uid://b2cwp7m1sekps"]
+[gd_resource type="Resource" script_class="FuncGodotFGDSolidClass" load_steps=5 format=3 uid="uid://b2cwp7m1sekps"]
 
 [ext_resource type="Script" uid="uid://5cow84q03m6a" path="res://addons/func_godot/src/fgd/func_godot_fgd_solid_class.gd" id="1_x7jaa"]
+[ext_resource type="Resource" uid="uid://bcdsueg5pysfq" path="res://addons/func_godot/fgd/cull_interior_faces.tres" id="2_klroj"]
+[ext_resource type="Resource" uid="uid://bl4hy04wp3v6a" path="res://3D/TrenchBroom/EntityDefinitions/vertex_merge_distance_base_cirno.tres" id="2_w3vbg"]
 [ext_resource type="Script" uid="uid://oq2ep51w11u5" path="res://3D/TrenchBroom/EntityScripts/Solid/worldspawn.gd" id="2_ypffe"]
 
 [resource]
@@ -12,7 +14,8 @@ collision_mask = 0
 script_class = ExtResource("2_ypffe")
 classname = "worldspawn"
 description = "Default static world geometry. Builds a StaticBody3D with a single MeshInstance3D and a single convex CollisionShape3D shape. Also builds Occluder3D to aid in render culling of other VisualInstance3D nodes."
-meta_properties = {
+base_classes = Array[Resource]([ExtResource("2_klroj"), ExtResource("2_w3vbg")])
+meta_properties = Dictionary[String, Variant]({
 "color": Color(0.8, 0.8, 0.8, 1)
-}
+})
 node_class = "StaticBody3D"

3D/TrenchBroom/EntityDefinitions/solid/Brush/worldspawn_shadow.tres

@@ -1,6 +1,8 @@
-[gd_resource type="Resource" script_class="FuncGodotFGDSolidClass" load_steps=3 format=3 uid="uid://bl3lxmse670pv"]
+[gd_resource type="Resource" script_class="FuncGodotFGDSolidClass" load_steps=5 format=3 uid="uid://bl3lxmse670pv"]
 
 [ext_resource type="Script" uid="uid://5cow84q03m6a" path="res://addons/func_godot/src/fgd/func_godot_fgd_solid_class.gd" id="1_7n2vi"]
+[ext_resource type="Resource" uid="uid://doo4ly322b4jc" path="res://addons/func_godot/fgd/vertex_merge_distance_base.tres" id="1_gdesh"]
+[ext_resource type="Resource" uid="uid://bcdsueg5pysfq" path="res://addons/func_godot/fgd/cull_interior_faces.tres" id="2_h8me0"]
 [ext_resource type="Script" uid="uid://oq2ep51w11u5" path="res://3D/TrenchBroom/EntityScripts/Solid/worldspawn.gd" id="2_s7wnd"]
 
 [resource]
@@ -12,7 +14,8 @@ collision_mask = 0
 script_class = ExtResource("2_s7wnd")
 classname = "solid_shadow"
 description = "Default static world geometry. Builds a StaticBody3D with a single MeshInstance3D and a single convex CollisionShape3D shape. Also builds Occluder3D to aid in render culling of other VisualInstance3D nodes."
-meta_properties = {
+base_classes = Array[Resource]([ExtResource("1_gdesh"), ExtResource("2_h8me0")])
+meta_properties = Dictionary[String, Variant]({
 "color": Color(0.227738, 0.227738, 0.227738, 1)
-}
+})
 node_class = "StaticBody3D"

3D/TrenchBroom/EntityDefinitions/solid/funcs/func_shroud.tres

@@ -18,13 +18,13 @@ script_class = ExtResource("4_ug7xt")
 classname = "func_shroud"
 description = "Geometry that can be made disappear."
 base_classes = Array[Resource]([ExtResource("1_ug7xt"), ExtResource("2_euhoe")])
-class_properties = {
+class_properties = Dictionary[String, Variant]({
 "one_time": true
-}
-class_property_descriptions = {
+})
+class_property_descriptions = Dictionary[String, Variant]({
 "one_time": "Trigger only one time?"
-}
-meta_properties = {
+})
+meta_properties = Dictionary[String, Variant]({
 "color": Color(0.9647059, 0.87211144, 0, 1)
-}
+})
 node_class = "StaticBody3D"

3D/TrenchBroom/EntityDefinitions/vertex_merge_distance_base_cirno.tres

@@ -0,0 +1,15 @@
+[gd_resource type="Resource" script_class="FuncGodotFGDBaseClass" load_steps=2 format=3 uid="uid://bl4hy04wp3v6a"]
+
+[ext_resource type="Script" uid="uid://ck575aqs1sbrb" path="res://addons/func_godot/src/fgd/func_godot_fgd_base_class.gd" id="1_qupqd"]
+
+[resource]
+script = ExtResource("1_qupqd")
+classname = "VertexMergeDistance"
+description = "Adjustable value to snap vertices to on map build. This can reduce instances of seams between polygons."
+class_properties = Dictionary[String, Variant]({
+"_vertex_merge_distance": 0.03125
+})
+class_property_descriptions = Dictionary[String, Variant]({
+"_vertex_merge_distance": "Adjustable value to snap vertices to on map build. This can reduce instances of seams between polygons."
+})
+metadata/_custom_type_script = "uid://ck575aqs1sbrb"