Updated to Godot 4.5 and func_godot 2025.9. Added grid_white and grid_taupe textures. Unfucked func_godot and navmesh settings. Began blocking out motel layout in map.

2025-10-14 02:15:54 -04:00
parent 986d2f5666
commit b402a162e1
154 changed files with 10450 additions and 10097 deletions
--- a/addons/func_godot/game_config/netradiant_custom/func_godot_netradiant_custom_gamepack_config.tres
+++ b/addons/func_godot/game_config/netradiant_custom/func_godot_netradiant_custom_gamepack_config.tres
@@ -1,21 +1,24 @@
-[gd_resource type="Resource" script_class="NetRadiantCustomGamePackConfig" load_steps=5 format=3 uid="uid://cv1k2e85fo2ax"]
+[gd_resource type="Resource" script_class="NetRadiantCustomGamePackConfig" load_steps=6 format=3 uid="uid://cv1k2e85fo2ax"]

 [ext_resource type="Resource" uid="uid://crgpdahjaj" path="res://addons/func_godot/fgd/func_godot_fgd.tres" id="1_gct4v"]
-[ext_resource type="Script" uid="uid://ckvnkpgsci7hg" path="res://addons/func_godot/src/netradiant_custom/netradiant_custom_gamepack_config.gd" id="2_en8ro"]
+[ext_resource type="Script" uid="uid://dfhj3me2g5j0l" path="res://addons/func_godot/src/netradiant_custom/netradiant_custom_gamepack_config.gd" id="2_en8ro"]
 [ext_resource type="Resource" uid="uid://f5erfnvbg6b7" path="res://addons/func_godot/game_config/netradiant_custom/netradiant_custom_shader_clip.tres" id="2_w7psh"]
 [ext_resource type="Resource" uid="uid://cfhg30jclb4lw" path="res://addons/func_godot/game_config/netradiant_custom/netradiant_custom_shader_skip.tres" id="3_6gpk8"]
+[ext_resource type="Resource" uid="uid://bpnj14oaufdpt" path="res://addons/func_godot/game_config/netradiant_custom/netradiant_custom_shader_origin.tres" id="4_8rl60"]

 [resource]
 script = ExtResource("2_en8ro")
-export_file = false
 gamepack_name = "func_godot"
 game_name = "FuncGodot"
 base_game_path = ""
 fgd_file = ExtResource("1_gct4v")
-netradiant_custom_shaders = Array[Resource]([ExtResource("2_w7psh"), ExtResource("3_6gpk8")])
+netradiant_custom_shaders = Array[Resource]([ExtResource("2_w7psh"), ExtResource("3_6gpk8"), ExtResource("4_8rl60")])
 texture_types = PackedStringArray("png", "jpg", "jpeg", "bmp", "tga")
 model_types = PackedStringArray("glb", "gltf", "obj")
 sound_types = PackedStringArray("wav", "ogg")
 default_scale = "1.0"
 clip_texture = "textures/special/clip"
 skip_texture = "textures/special/skip"
+map_type = 1
+default_build_menu_variables = {}
+default_build_menu_commands = {}
--- a/addons/func_godot/game_config/netradiant_custom/netradiant_custom_shader_clip.tres
+++ b/addons/func_godot/game_config/netradiant_custom/netradiant_custom_shader_clip.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="NetRadiantCustomShader" load_steps=2 format=3 uid="uid://f5erfnvbg6b7"]

-[ext_resource type="Script" uid="uid://dtmnasjcec1cl" path="res://addons/func_godot/src/netradiant_custom/netradiant_custom_shader.gd" id="1_cuylw"]
+[ext_resource type="Script" uid="uid://dn86acprv4e86" path="res://addons/func_godot/src/netradiant_custom/netradiant_custom_shader.gd" id="1_cuylw"]

 [resource]
 script = ExtResource("1_cuylw")
--- a/addons/func_godot/game_config/netradiant_custom/netradiant_custom_shader_origin.tres
+++ b/addons/func_godot/game_config/netradiant_custom/netradiant_custom_shader_origin.tres
@@ -0,0 +1,8 @@
+[gd_resource type="Resource" script_class="NetRadiantCustomShader" load_steps=2 format=3 uid="uid://bpnj14oaufdpt"]
+
+[ext_resource type="Script" uid="uid://dn86acprv4e86" path="res://addons/func_godot/src/netradiant_custom/netradiant_custom_shader.gd" id="1_ah2cp"]
+
+[resource]
+script = ExtResource("1_ah2cp")
+texture_path = "textures/special/origin"
+shader_attributes = Array[String](["qer_trans 0.4"])
--- a/addons/func_godot/game_config/netradiant_custom/netradiant_custom_shader_skip.tres
+++ b/addons/func_godot/game_config/netradiant_custom/netradiant_custom_shader_skip.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="NetRadiantCustomShader" load_steps=2 format=3 uid="uid://cfhg30jclb4lw"]

-[ext_resource type="Script" uid="uid://dtmnasjcec1cl" path="res://addons/func_godot/src/netradiant_custom/netradiant_custom_shader.gd" id="1_4ja6h"]
+[ext_resource type="Script" uid="uid://dn86acprv4e86" path="res://addons/func_godot/src/netradiant_custom/netradiant_custom_shader.gd" id="1_4ja6h"]

 [resource]
 script = ExtResource("1_4ja6h")
--- a/addons/func_godot/game_config/trenchbroom/func_godot_tb_game_config.tres
+++ b/addons/func_godot/game_config/trenchbroom/func_godot_tb_game_config.tres
@@ -1,17 +1,15 @@
-[gd_resource type="Resource" script_class="TrenchBroomGameConfig" load_steps=8 format=3 uid="uid://b44ah5b2000wa"]
+[gd_resource type="Resource" script_class="TrenchBroomGameConfig" load_steps=7 format=3 uid="uid://b44ah5b2000wa"]

 [ext_resource type="Resource" uid="uid://crgpdahjaj" path="res://addons/func_godot/fgd/func_godot_fgd.tres" id="1_8u1vq"]
 [ext_resource type="Resource" uid="uid://b4xhdj0e16lop" path="res://addons/func_godot/game_config/trenchbroom/tb_face_tag_clip.tres" id="1_rsp20"]
 [ext_resource type="Resource" uid="uid://ca7377sfgj074" path="res://addons/func_godot/game_config/trenchbroom/tb_face_tag_skip.tres" id="2_166i2"]
-[ext_resource type="Script" uid="uid://c51cy33iaei4s" path="res://addons/func_godot/src/trenchbroom/trenchbroom_game_config.gd" id="2_ns6ah"]
-[ext_resource type="Resource" uid="uid://37iduqf7tpxq" path="res://addons/func_godot/game_config/trenchbroom/tb_brush_tag_func.tres" id="3_mbuv7"]
-[ext_resource type="Resource" uid="uid://co2sb1ng7cw4i" path="res://addons/func_godot/game_config/trenchbroom/tb_brush_tag_trigger.tres" id="4_y0tjm"]
+[ext_resource type="Script" uid="uid://cx44c4vnq8bt5" path="res://addons/func_godot/src/trenchbroom/trenchbroom_game_config.gd" id="2_ns6ah"]
+[ext_resource type="Resource" uid="uid://bkjxc54mmdhbo" path="res://addons/func_godot/game_config/trenchbroom/tb_face_tag_origin.tres" id="3_stisi"]
 [ext_resource type="Texture2D" uid="uid://decwujsyhj0qy" path="res://addons/func_godot/icon32.png" id="6_tex5j"]

 [resource]
 script = ExtResource("2_ns6ah")
-export_file = false
-game_name = "maskmaker"
+game_name = "FuncGodot"
 icon = ExtResource("6_tex5j")
 map_formats = Array[Dictionary]([{
 "format": "Valve",
@@ -25,9 +23,12 @@ map_formats = Array[Dictionary]([{
 }, {
 "format": "Quake3"
 }])
+textures_root_folder = "textures"
 texture_exclusion_patterns = Array[String](["*_albedo", "*_ao", "*_emission", "*_height", "*_metallic", "*_normal", "*_orm", "*_roughness", "*_sss"])
+palette_path = "textures/palette.lmp"
 fgd_file = ExtResource("1_8u1vq")
 entity_scale = "32"
+brush_tags = Array[Resource]([])
+brushface_tags = Array[Resource]([ExtResource("1_rsp20"), ExtResource("2_166i2"), ExtResource("3_stisi")])
 default_uv_scale = Vector2(1, 1)
-brush_tags = Array[Resource]([ExtResource("3_mbuv7"), ExtResource("4_y0tjm")])
-brushface_tags = Array[Resource]([ExtResource("1_rsp20"), ExtResource("2_166i2")])
+game_config_version = 0
--- a/addons/func_godot/game_config/trenchbroom/tb_brush_tag_func.tres
+++ b/addons/func_godot/game_config/trenchbroom/tb_brush_tag_func.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="TrenchBroomTag" load_steps=2 format=3 uid="uid://37iduqf7tpxq"]

-[ext_resource type="Script" uid="uid://5eacgso7tkh6" path="res://addons/func_godot/src/trenchbroom/trenchbroom_tag.gd" id="1_rn13a"]
+[ext_resource type="Script" uid="uid://b66qdknwqpfup" path="res://addons/func_godot/src/trenchbroom/trenchbroom_tag.gd" id="1_rn13a"]

 [resource]
 script = ExtResource("1_rn13a")
--- a/addons/func_godot/game_config/trenchbroom/tb_brush_tag_trigger.tres
+++ b/addons/func_godot/game_config/trenchbroom/tb_brush_tag_trigger.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="TrenchBroomTag" load_steps=2 format=3 uid="uid://co2sb1ng7cw4i"]

-[ext_resource type="Script" uid="uid://5eacgso7tkh6" path="res://addons/func_godot/src/trenchbroom/trenchbroom_tag.gd" id="1_msqpk"]
+[ext_resource type="Script" uid="uid://b66qdknwqpfup" path="res://addons/func_godot/src/trenchbroom/trenchbroom_tag.gd" id="1_msqpk"]

 [resource]
 script = ExtResource("1_msqpk")
--- a/addons/func_godot/game_config/trenchbroom/tb_face_tag_clip.tres
+++ b/addons/func_godot/game_config/trenchbroom/tb_face_tag_clip.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="TrenchBroomTag" load_steps=2 format=3 uid="uid://b4xhdj0e16lop"]

-[ext_resource type="Script" uid="uid://5eacgso7tkh6" path="res://addons/func_godot/src/trenchbroom/trenchbroom_tag.gd" id="1_7td58"]
+[ext_resource type="Script" uid="uid://b66qdknwqpfup" path="res://addons/func_godot/src/trenchbroom/trenchbroom_tag.gd" id="1_7td58"]

 [resource]
 script = ExtResource("1_7td58")
--- a/addons/func_godot/game_config/trenchbroom/tb_face_tag_origin.tres
+++ b/addons/func_godot/game_config/trenchbroom/tb_face_tag_origin.tres
@@ -0,0 +1,11 @@
+[gd_resource type="Resource" script_class="TrenchBroomTag" load_steps=2 format=3 uid="uid://bkjxc54mmdhbo"]
+
+[ext_resource type="Script" uid="uid://b66qdknwqpfup" path="res://addons/func_godot/src/trenchbroom/trenchbroom_tag.gd" id="1_enkfc"]
+
+[resource]
+script = ExtResource("1_enkfc")
+tag_name = "Origin"
+tag_attributes = Array[String](["transparent"])
+tag_match_type = 0
+tag_pattern = "origin"
+texture_name = ""
--- a/addons/func_godot/game_config/trenchbroom/tb_face_tag_skip.tres
+++ b/addons/func_godot/game_config/trenchbroom/tb_face_tag_skip.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="TrenchBroomTag" load_steps=2 format=3 uid="uid://ca7377sfgj074"]

-[ext_resource type="Script" uid="uid://5eacgso7tkh6" path="res://addons/func_godot/src/trenchbroom/trenchbroom_tag.gd" id="1_2teqe"]
+[ext_resource type="Script" uid="uid://b66qdknwqpfup" path="res://addons/func_godot/src/trenchbroom/trenchbroom_tag.gd" id="1_2teqe"]

 [resource]
 script = ExtResource("1_2teqe")