diff --git a/3D/MapModels/actor_terminal_big.glb b/3D/MapModels/actor_terminal_big.glb new file mode 100644 index 00000000..c1512e1a Binary files /dev/null and b/3D/MapModels/actor_terminal_big.glb differ diff --git a/3D/MapScenes/TestLevel.tscn b/3D/MapScenes/TestLevel.tscn index 91d6c89e..a4cc5159 100644 --- a/3D/MapScenes/TestLevel.tscn +++ b/3D/MapScenes/TestLevel.tscn @@ -2034,6 +2034,9 @@ TargetName = &"actor_elevator_test" transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 22.25, 1.75, 26.25) TargetGroup = "actor_elevator_test" +[node name="entity_116_actor_terminal_big" parent="FuncGodotMap" instance=ExtResource("53_anja4")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 33.25, 1.75, 10.5) + [node name="Props" type="Node3D" parent="."] [node name="Mainframe3d" parent="Props" instance=ExtResource("16_u5cc4")] @@ -2062,9 +2065,6 @@ Target = NodePath("../../Door") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.31017, 4.50433, -1.4148) Target = NodePath("../Elevator") -[node name="TerminalBig" parent="Props/TestElevator" instance=ExtResource("53_anja4")] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 29.7672, 1.5, -12.8515) - [node name="Teleporter" parent="Props/TestElevator" instance=ExtResource("47_l0046")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19.7148, 1, -14.9477) diff --git a/3D/Maps/Level1.map b/3D/Maps/Level1.map index 7e5f533b..15f69a7e 100644 --- a/3D/Maps/Level1.map +++ b/3D/Maps/Level1.map @@ -2666,3 +2666,8 @@ "targetname" "" "target" "actor_elevator_test" } +// entity 140 +{ +"classname" "actor_terminal_big" +"origin" "168 532 28" +} diff --git a/3D/TrenchBroom/EntityDefinitions/point/actors/actor_terminal_big.tres b/3D/TrenchBroom/EntityDefinitions/point/actors/actor_terminal_big.tres new file mode 100644 index 00000000..731e0d01 --- /dev/null +++ b/3D/TrenchBroom/EntityDefinitions/point/actors/actor_terminal_big.tres @@ -0,0 +1,30 @@ +[gd_resource type="Resource" script_class="FuncGodotFGDModelPointClass" load_steps=4 format=3 uid="uid://bw6nmtgqwmw5x"] + +[ext_resource type="Resource" uid="uid://5bc1qysixhmh" path="res://3D/TrenchBroom/EntityDefinitions/base/actor_base.tres" id="1_tvwfa"] +[ext_resource type="PackedScene" uid="uid://cf3kjg36q3wvd" path="res://3D/Scenes/Props/Terminal_Big_3D.tscn" id="2_tvwfa"] +[ext_resource type="Script" uid="uid://dkmyelig23ub5" path="res://addons/func_godot/src/fgd/func_godot_fgd_model_point_class.gd" id="3_e32b8"] + +[resource] +script = ExtResource("3_e32b8") +target_map_editor = 0 +models_sub_folder = "" +scale_expression = "" +generate_size_property = false +generate_gd_ignore_file = false +scene_file = ExtResource("2_tvwfa") +apply_rotation_on_map_build = true +apply_scale_on_map_build = false +classname = "actor_terminal_big" +description = "Terminal Big" +func_godot_internal = false +base_classes = Array[Resource]([ExtResource("1_tvwfa")]) +class_properties = {} +class_property_descriptions = {} +auto_apply_to_matching_node_properties = false +meta_properties = { +"size": AABB(-8, -12, -12, 8, 12, 12), +"studio": "\"3D/MapModels/Terminal_Big.glb\"" +} +node_class = "" +name_property = "" +metadata/_custom_type_script = "uid://c83r7t467hm4m" diff --git a/3D/TrenchBroom/fgd_point.tres b/3D/TrenchBroom/fgd_point.tres index d8c03b8e..8cfaa7b6 100644 --- a/3D/TrenchBroom/fgd_point.tres +++ b/3D/TrenchBroom/fgd_point.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="FuncGodotFGDFile" load_steps=21 format=3 uid="uid://b700sa4be6dfa"] +[gd_resource type="Resource" script_class="FuncGodotFGDFile" load_steps=22 format=3 uid="uid://b700sa4be6dfa"] [ext_resource type="Resource" uid="uid://ia1t5p4mhom3" path="res://3D/TrenchBroom/EntityDefinitions/point/lights/light_omni.tres" id="1_7vcj1"] [ext_resource type="Script" uid="uid://cknmd0lgmorx2" path="res://addons/func_godot/src/fgd/func_godot_fgd_file.gd" id="1_lykim"] @@ -20,6 +20,7 @@ [ext_resource type="Resource" uid="uid://dj72os2jpdl4l" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/actor_box_yellow.tres" id="17_m3sbm"] [ext_resource type="Resource" uid="uid://bmfarpfcbbfa5" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/Actor_VendingMachine.tres" id="18_m3sbm"] [ext_resource type="Resource" uid="uid://ceio7tm5eopbb" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/actor_controlpad.tres" id="19_hvhb8"] +[ext_resource type="Resource" uid="uid://bw6nmtgqwmw5x" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/actor_terminal_big.tres" id="20_3v5us"] [resource] script = ExtResource("1_lykim") @@ -27,5 +28,5 @@ export_file = false target_map_editor = 1 fgd_name = "FuncGodot" base_fgd_files = Array[Resource]([]) -entity_definitions = Array[Resource]([ExtResource("1_7vcj1"), ExtResource("2_u7uvb"), ExtResource("3_u7uvb"), ExtResource("4_1nmxk"), ExtResource("5_ljb2x"), ExtResource("6_seuvu"), ExtResource("7_fmwex"), ExtResource("8_c8m8m"), ExtResource("9_14sjf"), ExtResource("10_xik3w"), ExtResource("11_dgiqm"), ExtResource("12_1teik"), ExtResource("13_f0hti"), ExtResource("14_6ld6e"), ExtResource("15_g8j5j"), ExtResource("16_7h4of"), ExtResource("17_m3sbm"), ExtResource("18_m3sbm"), ExtResource("19_hvhb8")]) +entity_definitions = Array[Resource]([ExtResource("1_7vcj1"), ExtResource("2_u7uvb"), ExtResource("3_u7uvb"), ExtResource("4_1nmxk"), ExtResource("5_ljb2x"), ExtResource("6_seuvu"), ExtResource("7_fmwex"), ExtResource("8_c8m8m"), ExtResource("9_14sjf"), ExtResource("10_xik3w"), ExtResource("11_dgiqm"), ExtResource("12_1teik"), ExtResource("13_f0hti"), ExtResource("14_6ld6e"), ExtResource("15_g8j5j"), ExtResource("16_7h4of"), ExtResource("17_m3sbm"), ExtResource("18_m3sbm"), ExtResource("19_hvhb8"), ExtResource("20_3v5us")]) metadata/_custom_type_script = "uid://cknmd0lgmorx2"