From bab8dde96c183e306acb2c162f6617c713a8b1fa Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Thu, 23 Jul 2026 22:28:49 +0300 Subject: [PATCH] Add info_goal entity for maps --- .gitignore | 1 + godot/maps/entities/goal.tres | 26 ++++ .../{spawn.tres => info_spawn_point.tres} | 10 +- .../entities/{spawn.gd => spawn_entity.gd} | 0 .../{spawn.gd.uid => spawn_entity.gd.uid} | 0 godot/maps/meta/map_entity_defs.tres | 5 +- godot/maps/two_towers/two_towers.map | 12 ++ godot/maps/two_towers/two_towers.tscn | 120 ++++++++++-------- godot/project.godot | 4 + 9 files changed, 115 insertions(+), 63 deletions(-) create mode 100644 godot/maps/entities/goal.tres rename godot/maps/entities/{spawn.tres => info_spawn_point.tres} (86%) rename godot/maps/entities/{spawn.gd => spawn_entity.gd} (100%) rename godot/maps/entities/{spawn.gd.uid => spawn_entity.gd.uid} (100%) diff --git a/.gitignore b/.gitignore index 950e4f1..ebf7e55 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ godot/android/ # Mapping ignores godot/maps/**/autosave/* !godot/maps/**/autosave/.gdignore +godot/maps/entity_models # Rust ignores rust/target diff --git a/godot/maps/entities/goal.tres b/godot/maps/entities/goal.tres new file mode 100644 index 0000000..5298b8a --- /dev/null +++ b/godot/maps/entities/goal.tres @@ -0,0 +1,26 @@ +[gd_resource type="Resource" script_class="FuncGodotFGDModelPointClass" format=3 uid="uid://bm5nw7wckpjqp"] + +[ext_resource type="Script" uid="uid://d1nwwgcrner8b" path="res://addons/func_godot/src/fgd/func_godot_fgd_point_class_display_descriptor.gd" id="1_2ikly"] +[ext_resource type="Script" uid="uid://ldfqjtq0br35" path="res://addons/func_godot/src/fgd/func_godot_fgd_model_point_class.gd" id="2_12rmh"] +[ext_resource type="PackedScene" uid="uid://c1r8nk58cci3a" path="res://scenes/misc/goal.tscn" id="2_ryfjt"] + +[resource] +script = ExtResource("2_12rmh") +target_map_editor = 1 +generate_size_property = true +scene_file = ExtResource("2_ryfjt") +classname = "info_goal" +class_properties = Dictionary[String, Variant]({ +"team": -1 +}) +class_property_descriptions = Dictionary[String, Variant]({ +"team": "The index of the team in the MapResource teams array, whose goal this is." +}) +auto_apply_to_matching_node_properties = true +meta_properties = Dictionary[String, Variant]({ +"color": Color(0.8, 0.8, 0.8, 1), +"model": "{\"path\": \"godot/maps/entity_models/info_goal.glb\", \"scale\": 32.0 }", +"size": AABB(-64, -64, 0, 64, 64, 64) +}) +node_class = "Node3D" +metadata/_custom_type_script = "uid://ldfqjtq0br35" diff --git a/godot/maps/entities/spawn.tres b/godot/maps/entities/info_spawn_point.tres similarity index 86% rename from godot/maps/entities/spawn.tres rename to godot/maps/entities/info_spawn_point.tres index 4dba6e4..225c5d9 100644 --- a/godot/maps/entities/spawn.tres +++ b/godot/maps/entities/info_spawn_point.tres @@ -1,12 +1,12 @@ [gd_resource type="Resource" script_class="FuncGodotFGDPointClass" format=3 uid="uid://bqm65x2jpfxho"] -[ext_resource type="Script" uid="uid://d1nwwgcrner8b" path="res://addons/func_godot/src/fgd/func_godot_fgd_point_class_display_descriptor.gd" id="1_0io4j"] -[ext_resource type="Script" uid="uid://cxsqwtsqd8w33" path="res://addons/func_godot/src/fgd/func_godot_fgd_point_class.gd" id="2_nqhon"] -[ext_resource type="Script" uid="uid://chhq2pb2quwg6" path="res://maps/entities/spawn.gd" id="3_nqhon"] +[ext_resource type="Script" uid="uid://d1nwwgcrner8b" path="res://addons/func_godot/src/fgd/func_godot_fgd_point_class_display_descriptor.gd" id="1_hnobx"] +[ext_resource type="Script" uid="uid://cxsqwtsqd8w33" path="res://addons/func_godot/src/fgd/func_godot_fgd_point_class.gd" id="2_qg1kx"] +[ext_resource type="Script" uid="uid://chhq2pb2quwg6" path="res://maps/entities/spawn_entity.gd" id="3_n2n2j"] [resource] -script = ExtResource("2_nqhon") -script_class = ExtResource("3_nqhon") +script = ExtResource("2_qg1kx") +script_class = ExtResource("3_n2n2j") classname = "info_spawn_point" class_properties = Dictionary[String, Variant]({ "is_ball_spawn": false, diff --git a/godot/maps/entities/spawn.gd b/godot/maps/entities/spawn_entity.gd similarity index 100% rename from godot/maps/entities/spawn.gd rename to godot/maps/entities/spawn_entity.gd diff --git a/godot/maps/entities/spawn.gd.uid b/godot/maps/entities/spawn_entity.gd.uid similarity index 100% rename from godot/maps/entities/spawn.gd.uid rename to godot/maps/entities/spawn_entity.gd.uid diff --git a/godot/maps/meta/map_entity_defs.tres b/godot/maps/meta/map_entity_defs.tres index 0a11d47..daa2d41 100644 --- a/godot/maps/meta/map_entity_defs.tres +++ b/godot/maps/meta/map_entity_defs.tres @@ -3,11 +3,12 @@ [ext_resource type="Resource" uid="uid://cb5fm54x4t23d" path="res://maps/entities/worldspawn.tres" id="1_fkacr"] [ext_resource type="Resource" uid="uid://crgpdahjaj" path="res://addons/func_godot/fgd/func_godot_fgd.tres" id="1_j17uj"] [ext_resource type="Script" uid="uid://drlmgulwbjwqu" path="res://addons/func_godot/src/fgd/func_godot_fgd_file.gd" id="2_2w5ia"] -[ext_resource type="Resource" uid="uid://bqm65x2jpfxho" path="res://maps/entities/spawn.tres" id="3_qwe78"] +[ext_resource type="Resource" uid="uid://bqm65x2jpfxho" path="res://maps/entities/info_spawn_point.tres" id="3_qwe78"] +[ext_resource type="Resource" uid="uid://bm5nw7wckpjqp" path="res://maps/entities/goal.tres" id="4_x6tyy"] [resource] script = ExtResource("2_2w5ia") fgd_name = "QuakeBall" base_fgd_files = Array[Resource]([ExtResource("1_j17uj")]) -entity_definitions = Array[Resource]([ExtResource("1_fkacr"), ExtResource("3_qwe78")]) +entity_definitions = Array[Resource]([ExtResource("1_fkacr"), ExtResource("3_qwe78"), ExtResource("4_x6tyy")]) metadata/_custom_type_script = "uid://drlmgulwbjwqu" diff --git a/godot/maps/two_towers/two_towers.map b/godot/maps/two_towers/two_towers.map index 9c045a4..b43d361 100644 --- a/godot/maps/two_towers/two_towers.map +++ b/godot/maps/two_towers/two_towers.map @@ -240,3 +240,15 @@ "origin" "-440 424 168" "is_ball_spawn" "1" } +// entity 4 +{ +"classname" "info_goal" +"origin" "-192 192 0" +"team" "0" +} +// entity 5 +{ +"classname" "info_goal" +"origin" "192 -192 0" +"team" "1" +} diff --git a/godot/maps/two_towers/two_towers.tscn b/godot/maps/two_towers/two_towers.tscn index 7c1081b..ddb7000 100644 --- a/godot/maps/two_towers/two_towers.tscn +++ b/godot/maps/two_towers/two_towers.tscn @@ -10,9 +10,10 @@ [ext_resource type="Material" uid="uid://cflfpp58y77fm" path="res://maps/materials/str_stonebrk1.tres" id="8_2spb1"] [ext_resource type="Material" uid="uid://c1qgpdya0unj7" path="res://maps/materials/str_stonewall4.tres" id="9_mw7l8"] [ext_resource type="Material" uid="uid://vc7bel8b68an" path="res://maps/materials/str_stoneflr5.tres" id="10_ldmbn"] -[ext_resource type="Script" uid="uid://chhq2pb2quwg6" path="res://maps/entities/spawn.gd" id="11_26faa"] +[ext_resource type="Script" uid="uid://chhq2pb2quwg6" path="res://maps/entities/spawn_entity.gd" id="11_26faa"] +[ext_resource type="PackedScene" uid="uid://c1r8nk58cci3a" path="res://scenes/misc/goal.tscn" id="12_2spb1"] -[sub_resource type="ArrayMesh" id="ArrayMesh_ykri2"] +[sub_resource type="ArrayMesh" id="ArrayMesh_2spb1"] _surfaces = [{ "aabb": AABB(-56, -2, -56, 112, 8, 112), "attribute_data": PackedByteArray("AADgwAAAgL0AAOBAAACAvQAA4EAAAEA+AADgwAAAQD4AAOBAAABAPgAA4MAAAEA+AADgwAAAgL0AAOBAAACAvQAA4MAAAOBAAADgwAAA4MAAAOBAAADgwAAA4EAAAOBAAADgQAAA4EAAAODAAADgQAAA4MAAAODAAADgQAAA4MAAAODAAACAvQAA4EAAAIC9AADgQAAAQD4AAODAAABAPgAA4EAAAEA+AADgwAAAQD4AAODAAACAvQAA4EAAAIC9AADgvwAAoD8AAOC/AACAPwAAwL8AAIA/AADAvwAAoD8AAOC/AADgPwAA4L8AAMA/AADAvwAAwD8AAMC/AADgPwAA4D8AAAC/AADAPwAAAL8AAMA/AABAvwAA4D8AAEC/AADgPwAAwD8AAOA/AACgPwAAwD8AAKA/AADAPwAAwD8AAOC/AABAvwAAwL8AAEC/AADAvwAAAL8AAOC/AAAAvw=="), @@ -63,73 +64,73 @@ _surfaces = [{ "vertex_data": PackedByteArray("AACAwAAAgD8AAAAAAACAwAAAAAAAAAAAAAAAvwAAAAAAAAA/AAAAvwAAgD8AAAA/AAAAAAAAgD8AAIBAAAAAvwAAgD8AAAA/AAAAvwAAAAAAAAA/AAAAAAAAAAAAAIBAAACAwAAAAAAAAIBAAACAwAAAAAAAAAAAAACAwAAAgD8AAAAAAACAwAAAgD8AAIBAAACAwAAAAAAAAIBAAAAAAAAAAAAAAIBAAAAAvwAAAAAAAAA/AACAwAAAAAAAAAAAAACAwAAAgD8AAIBAAACAwAAAgD8AAAAAAAAAvwAAgD8AAAA/AAAAAAAAgD8AAIBAAACAwAAAAAAAAIBAAACAwAAAgD8AAIBAAAAAAAAAgD8AAIBAAAAAAAAAAAAAAIBAAAAAAAAAAAAAAIDAAACAQAAAAAAAAIDAAACAQAAAgD8AAIDAAAAAAAAAgD8AAIDAAAAAPwAAAAAAAAC/AACAQAAAAAAAAAAAAACAQAAAAAAAAIDAAAAAAAAAAAAAAIDAAAAAPwAAgD8AAAC/AAAAAAAAgD8AAIDAAACAQAAAgD8AAIDAAACAQAAAgD8AAAAAAACAQAAAgD8AAAAAAACAQAAAgD8AAIDAAACAQAAAAAAAAIDAAACAQAAAAAAAAAAAAAAAPwAAAAAAAAC/AAAAAAAAAAAAAIDAAAAAAAAAgD8AAIDAAAAAPwAAgD8AAAC/AACAQAAAAAAAAAAAAAAAPwAAAAAAAAC/AAAAPwAAgD8AAAC/AACAQAAAgD8AAAAA////7wAA/7/////vAAD/v////+8AAP+/////7wAA/7////+P/////////4//////////j/////////+P/////wAA/3//f/+/AAD/f/9//78AAP9//3//vwAA/3//f/+//38AAP//////fwAA//////9/AAD//////38AAP//////f////3//v/9/////f/+//3////9//7//f////3//v/9//3////+//3//f////7//f/9/////v/9//3////+//////wAA/7//////AAD/v/////8AAP+//////wAA/7//fwAA//////9/AAD//////38AAP//////fwAA//////9/////f/+//3////9//7//f////3//v/9/////f/+/////f/////////9//////////3//////////f///////D/9//3//v/8P/3//f/+//w//f/9//7//D/9//3//v/9v/3////+//2//f////7//b/9/////v/9v/3////+/") }] -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_2spb1"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_mw7l8"] points = PackedVector3Array(56, 0, 56, 56, -2, 56, -56, 0, 56, -56, -2, 56, 56, 0, -56, 56, -2, -56, -56, 0, -56, -56, -2, -56) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_mw7l8"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_ldmbn"] points = PackedVector3Array(14, 22, 18, 14, 0, 18, 6, 22, 18, 6, 0, 18, 14, 22, 10, 14, 0, 10, 6, 22, 10, 6, 0, 10) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_ldmbn"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_26faa"] points = PackedVector3Array(-6, 22, -10, -6, 0, -10, -14, 22, -10, -14, 0, -10, -6, 22, -18, -6, 0, -18, -14, 22, -18, -14, 0, -18) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_26faa"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_law7c"] points = PackedVector3Array(22, 10, 16, 22, 0, 16, 18, 10, 16, 18, 0, 16, 22, 10, -14, 22, 0, -14, 18, 10, -14, 18, 0, -14) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_law7c"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_mjjvs"] points = PackedVector3Array(18, 14, 16, 18, 0, 16, 14, 14, 16, 14, 0, 16, 18, 14, 12, 18, 0, 12, 14, 14, 12, 14, 0, 12) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_mjjvs"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_13612"] points = PackedVector3Array(-18, 10, 14, -18, 0, 14, -22, 10, 14, -22, 0, 14, -18, 10, -16, -18, 0, -16, -22, 10, -16, -22, 0, -16) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_13612"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_iqy6x"] points = PackedVector3Array(-14, 14, -12, -14, 0, -12, -18, 14, -12, -18, 0, -12, -14, 14, -16, -14, 0, -16, -18, 14, -16, -18, 0, -16) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_iqy6x"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_xq706"] points = PackedVector3Array(-4, 6, 22, -4, 0, 22, -14, 6, 22, -14, 0, 22, -4, 6, 18, -4, 0, 18, -14, 6, 18, -14, 0, 18) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_xq706"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_55tqc"] points = PackedVector3Array(6, 10, 16, 6, 0, 16, -8, 10, 16, -8, 0, 16, 6, 10, 12, 6, 0, 12, -8, 10, 12, -8, 0, 12) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_55tqc"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_inyex"] points = PackedVector3Array(14, 6, -18, 14, 0, -18, 2, 6, -18, 2, 0, -18, 14, 6, -22, 14, 0, -22, 2, 6, -22, 2, 0, -22) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_inyex"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_jbkif"] points = PackedVector3Array(6, 10, -12, 6, 0, -12, -6, 10, -12, -6, 0, -12, 6, 10, -16, 6, 0, -16, -6, 10, -16, -6, 0, -16) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_jbkif"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_00tui"] points = PackedVector3Array(22, 12, -14.000001, 22, 0, -14.000001, 16, 12, -14.000001, 16, 0, -14.000001, 24, 12, -16, 24, 0, -16, 14.000001, 12, -16, 14.000001, 0, -16, 24, 12, -21.999996, 24, 0, -21.999996, 14.000001, 12, -22, 21.999996, 12, -24, 16, 12, -24, 14.000001, 0, -22, 21.999996, 0, -24, 16, 0, -24) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_00tui"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_lsew2"] points = PackedVector3Array(-16, 12, 24, -16, 0, 24, -21.999996, 12, 24, -21.999996, 0, 24, -14.000001, 12, 22, -14.000001, 0, 22, -24, 12, 21.999996, -24, 0, 21.999996, -14.000001, 12, 16, -14.000001, 0, 16, -24, 12, 16, -16, 12, 14.000001, -22, 12, 14.000001, -24, 0, 16, -16, 0, 14.000001, -22, 0, 14.000001) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_lsew2"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_gsm6b"] points = PackedVector3Array(-8, 2, 0, -8, 0, 0, -12, 2, 0, -12, 0, 0, -8, 2, -4, -8, 0, -4, -12, 2, -4, -12, 0, -4) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_gsm6b"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_pdnd8"] points = PackedVector3Array(13.999999, 1.0000001, -6, 12, 1.0000001, -6, 14, -1.0000001, -5.9999995, 13.999999, -0.99999994, -6, 11.999999, 0, -5.9999995, 13.999999, -0.9999999, -6, 13.999999, 2, -13.999999, 12, 2, -13.999999, 14, -1.0000006, -5.9999948, 13.999999, 0, -13.999999, 12, -5.37269e-07, -13.999994, 11.999999, 0, -14, 11.999998, 1.3431725e-07, -14, 12, 0, -13.999999) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_pdnd8"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_gsv88"] points = PackedVector3Array(-4, 1, 4, 0, 1, 4, -4, 0, 4, 0, 0, 4, -4, 1, -6.0209786e-08, -0.50000006, 1, 0.49999994, -4, 0, -6.0209786e-08, -0.50000006, 0, 0.49999994) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_gsv88"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_bj81e"] points = PackedVector3Array(0.50000006, 1, -0.49999994, 0.50000006, 0, -0.49999994, 4, 1, 6.0209786e-08, 4, 0, 6.0209786e-08, 0, 1, -4, 0, 0, -4, 4, 1, -4, 4, 0, -4) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_bj81e"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_wnq4i"] points = PackedVector3Array(-4, 6, 18, -4, 0, 18, -8, 6, 18, -8, 0, 18, -4, 6, 16, -4, 0, 16, -8, 6, 16, -8, 0, 16) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_wnq4i"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_mycsq"] points = PackedVector3Array(6, 6, -16, 6, 0, -16, 2, 6, -16, 2, 0, -16, 6, 6, -18, 6, 0, -18, 2, 6, -18, 2, 0, -18) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_mycsq"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_ux7cq"] points = PackedVector3Array(-8, 6, 14, -8, 0, 14, -10, 6, 14, -10, 0, 14, -8, 6, 12, -8, 0, 12, -10, 6, 12, -10, 0, 12) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_ux7cq"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_ertlo"] points = PackedVector3Array(-12, 6, 14, -12, 0, 14, -14, 6, 14, -14, 0, 14, -12, 6, 12, -12, 0, 12, -14, 6, 12, -14, 0, 12) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_ertlo"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_jr4rq"] points = PackedVector3Array(-10, 6, 14, -10, 4, 14, -12, 6, 14, -12, 4, 14, -10, 6, 12, -10, 4, 12, -12, 6, 12, -12, 4, 12) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_jr4rq"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_v2xet"] points = PackedVector3Array(-10, 4, 14, -10, 0, 14, -12, 4, 14, -12, 0, 14, -10, 4, 13, -10, 0, 13, -12, 4, 13, -12, 0, 13) [node name="two_towers" type="Map" unique_id=590524284 node_paths=PackedStringArray("spawners", "ball_spawner")] @@ -149,97 +150,104 @@ map_settings = ExtResource("2_s5s5s") hyperplane_size = 2048.0 metadata/_custom_type_script = "uid://cwu5cf7a0awcd" -[node name="entity_0_worldspawn" type="StaticBody3D" parent="func_godot_map" unique_id=1270458016] +[node name="entity_0_worldspawn" type="StaticBody3D" parent="func_godot_map" unique_id=92327706] collision_layer = 7 collision_mask = 7 -[node name="entity_0_mesh_instance" type="MeshInstance3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1495344957] -mesh = SubResource("ArrayMesh_ykri2") +[node name="entity_0_mesh_instance" type="MeshInstance3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1362689390] +mesh = SubResource("ArrayMesh_2spb1") -[node name="entity_0_brush_0_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=683944652] -shape = SubResource("ConvexPolygonShape3D_2spb1") - -[node name="entity_0_brush_1_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=804402486] +[node name="entity_0_brush_0_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1962461945] shape = SubResource("ConvexPolygonShape3D_mw7l8") -[node name="entity_0_brush_2_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1174539107] +[node name="entity_0_brush_1_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=50585597] shape = SubResource("ConvexPolygonShape3D_ldmbn") -[node name="entity_0_brush_3_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=966642678] +[node name="entity_0_brush_2_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1684372617] shape = SubResource("ConvexPolygonShape3D_26faa") -[node name="entity_0_brush_4_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1748433871] +[node name="entity_0_brush_3_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=712397961] shape = SubResource("ConvexPolygonShape3D_law7c") -[node name="entity_0_brush_5_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=2132179366] +[node name="entity_0_brush_4_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=346445158] shape = SubResource("ConvexPolygonShape3D_mjjvs") -[node name="entity_0_brush_6_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=2020383590] +[node name="entity_0_brush_5_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=544312233] shape = SubResource("ConvexPolygonShape3D_13612") -[node name="entity_0_brush_7_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1838159027] +[node name="entity_0_brush_6_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1169697841] shape = SubResource("ConvexPolygonShape3D_iqy6x") -[node name="entity_0_brush_8_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=327004295] +[node name="entity_0_brush_7_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1982135682] shape = SubResource("ConvexPolygonShape3D_xq706") -[node name="entity_0_brush_9_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1224741081] +[node name="entity_0_brush_8_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=95892976] shape = SubResource("ConvexPolygonShape3D_55tqc") -[node name="entity_0_brush_10_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=551132754] +[node name="entity_0_brush_9_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1846299267] shape = SubResource("ConvexPolygonShape3D_inyex") -[node name="entity_0_brush_11_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=936113621] +[node name="entity_0_brush_10_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=840810627] shape = SubResource("ConvexPolygonShape3D_jbkif") -[node name="entity_0_brush_12_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1165571418] +[node name="entity_0_brush_11_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1062307022] shape = SubResource("ConvexPolygonShape3D_00tui") -[node name="entity_0_brush_13_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1570665743] +[node name="entity_0_brush_12_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=2045894037] shape = SubResource("ConvexPolygonShape3D_lsew2") -[node name="entity_0_brush_14_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1656910330] +[node name="entity_0_brush_13_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1983129264] shape = SubResource("ConvexPolygonShape3D_gsm6b") -[node name="entity_0_brush_15_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1268171384] +[node name="entity_0_brush_14_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=897050556] shape = SubResource("ConvexPolygonShape3D_pdnd8") -[node name="entity_0_brush_16_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=301281672] +[node name="entity_0_brush_15_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1309302928] shape = SubResource("ConvexPolygonShape3D_gsv88") -[node name="entity_0_brush_17_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=630070020] +[node name="entity_0_brush_16_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1694417334] shape = SubResource("ConvexPolygonShape3D_bj81e") -[node name="entity_0_brush_18_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=21986463] +[node name="entity_0_brush_17_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1249141012] shape = SubResource("ConvexPolygonShape3D_wnq4i") -[node name="entity_0_brush_19_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=929657953] +[node name="entity_0_brush_18_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1553953865] shape = SubResource("ConvexPolygonShape3D_mycsq") -[node name="entity_0_brush_20_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1843598375] +[node name="entity_0_brush_19_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=627692502] shape = SubResource("ConvexPolygonShape3D_ux7cq") -[node name="entity_0_brush_21_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=2008400564] +[node name="entity_0_brush_20_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=560779878] shape = SubResource("ConvexPolygonShape3D_ertlo") -[node name="entity_0_brush_22_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=176211363] +[node name="entity_0_brush_21_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=1744048799] shape = SubResource("ConvexPolygonShape3D_jr4rq") -[node name="entity_1_info_spawn_point" type="Node3D" parent="func_godot_map" unique_id=687285906] +[node name="entity_0_brush_22_collision_shape" type="CollisionShape3D" parent="func_godot_map/entity_0_worldspawn" unique_id=430532212] +shape = SubResource("ConvexPolygonShape3D_v2xet") + +[node name="entity_1_info_spawn_point" type="Node3D" parent="func_godot_map" unique_id=195030041] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -2.25, 1.25, 2.25) script = ExtResource("11_26faa") team_index = 1 -[node name="entity_2_info_spawn_point" type="Node3D" parent="func_godot_map" unique_id=448410114] +[node name="entity_2_info_spawn_point" type="Node3D" parent="func_godot_map" unique_id=1646489376] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1.75, 1.25, -2.25) script = ExtResource("11_26faa") team_index = 0 -[node name="entity_3_info_spawn_point" type="Node3D" parent="func_godot_map" unique_id=2002477426] +[node name="entity_3_info_spawn_point" type="Node3D" parent="func_godot_map" unique_id=377795637] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 13.25, 5.25, -13.75) script = ExtResource("11_26faa") is_ball_spawn = true +[node name="entity_4_info_goal" parent="func_godot_map" unique_id=177528504 instance=ExtResource("12_2spb1")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 6, 0, -6) + +[node name="entity_5_info_goal" parent="func_godot_map" unique_id=1461014728 instance=ExtResource("12_2spb1")] +team = 1 +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -6, 0, 6) + [node name="directional_light_3d" type="DirectionalLight3D" parent="." unique_id=1461274044] transform = Transform3D(0.99328005, -0.09338135, 0.068372406, 0.019120537, 0.7150448, 0.6988171, -0.11414584, -0.6928138, 0.7120252, 0, 8, 0) shadow_enabled = true diff --git a/godot/project.godot b/godot/project.godot index ac04df6..3d8b409 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -45,6 +45,10 @@ enabled=PackedStringArray("res://addons/func_godot/plugin.cfg") import/blender/enabled=false +[func_godot] + +model_point_class_save_path="godot/maps/entity_models" + [input] toggle_cli={