diff --git a/3D/MapModels/actor_alarmbox.glb b/3D/MapModels/actor_alarmbox.glb index 3e7854c9..e4b5142d 100644 Binary files a/3D/MapModels/actor_alarmbox.glb and b/3D/MapModels/actor_alarmbox.glb differ diff --git a/3D/MapModels/actor_furniture_can.glb b/3D/MapModels/actor_furniture_can.glb index 041e0d0d..b5cddba7 100644 Binary files a/3D/MapModels/actor_furniture_can.glb and b/3D/MapModels/actor_furniture_can.glb differ diff --git a/3D/MapModels/actor_furniture_shelf.glb b/3D/MapModels/actor_furniture_shelf.glb index f0517699..bfbc6736 100644 Binary files a/3D/MapModels/actor_furniture_shelf.glb and b/3D/MapModels/actor_furniture_shelf.glb differ diff --git a/3D/MapScenes/TestLevel.tscn b/3D/MapScenes/TestLevel.tscn index 80e0ec99..6f733f09 100644 --- a/3D/MapScenes/TestLevel.tscn +++ b/3D/MapScenes/TestLevel.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=379 format=4 uid="uid://c8gtrjf2xeue7"] +[gd_scene load_steps=381 format=4 uid="uid://c8gtrjf2xeue7"] [ext_resource type="Script" uid="uid://kno58homctew" path="res://addons/func_godot/src/map/func_godot_map.gd" id="1_n6h0p"] [ext_resource type="Script" uid="uid://crpgy1o73rtlx" path="res://Scripts/Utils/MapProxy3D.cs" id="1_pvlbf"] @@ -35,7 +35,7 @@ [ext_resource type="Material" uid="uid://br4foqdn2f8ge" path="res://textures/Manual/Wall_Corner.tres" id="27_c4mw0"] [ext_resource type="Material" uid="uid://bijkqqi8bqi3c" path="res://textures/Floors/Floor26.tres" id="28_btjo4"] [ext_resource type="Material" uid="uid://fc0n5jo05seu" path="res://textures/Manual/Wall_Light_Test.tres" id="30_pvlbf"] -[ext_resource type="Material" path="res://textures/Manual/Chevron.tres" id="30_um16p"] +[ext_resource type="Material" uid="uid://dfs1tc2ry78pb" path="res://textures/Manual/Chevron.tres" id="30_um16p"] [ext_resource type="Material" uid="uid://0x6sr7ehv4t1" path="res://textures/Floors/Floor167.tres" id="31_bbydx"] [ext_resource type="Script" uid="uid://crjplbs250g75" path="res://3D/TrenchBroom/EntityScripts/Lights/light_spot.gd" id="31_c2mph"] [ext_resource type="Material" uid="uid://l3g1l0y47c7r" path="res://textures/Manual/Electric_Panel_Wall.tres" id="32_k4tgc"] @@ -83,7 +83,9 @@ [ext_resource type="PackedScene" uid="uid://dyi4ji0t3ryi4" path="res://3D/Scenes/Props/chest_3d.tscn" id="70_005j7"] [ext_resource type="Resource" uid="uid://dy53gia1tmkah" path="res://Resources/Items/Points_Pickup.tres" id="72_51d8c"] [ext_resource type="Script" uid="uid://cpwn25m6b4lqf" path="res://Scripts/Activables/ScriptableArea3D.cs" id="73_51d8c"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="73_kob5s"] [ext_resource type="Script" uid="uid://ddv26x2qilprb" path="res://Scripts/Resources/Events/DialogueStartEvent.cs" id="75_hd6lw"] +[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="77_awrmj"] [ext_resource type="Resource" uid="uid://bdpbekqhuuq4l" path="res://Resources/Items/Shield_Extend_Pickup.tres" id="77_mf5at"] [ext_resource type="PackedScene" uid="uid://dioiq4nb7kiet" path="res://3D/Scenes/Props/ForceField_3D.tscn" id="83_51d8c"] @@ -3073,11 +3075,11 @@ transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -4.480 [node name="Chest" parent="Props" instance=ExtResource("70_005j7")] transform = Transform3D(1.31134e-07, 0, -1, 0, 1, 0, 1, 0, 1.31134e-07, 23.5714, 1.53711, 11.4827) -LootTable = [ExtResource("72_51d8c")] +LootTable = Array[ExtResource("73_kob5s")]([ExtResource("72_51d8c")]) [node name="Chest2" parent="Props" instance=ExtResource("70_005j7")] transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 26.9381, 1.53711, 8.33437) -LootTable = [ExtResource("72_51d8c")] +LootTable = Array[ExtResource("73_kob5s")]([ExtResource("72_51d8c")]) [node name="Forcefield" parent="Props" instance=ExtResource("83_51d8c")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 44.9953, 2.00411, 21.5165) @@ -3087,7 +3089,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25.0085, 1.70611, -2.51795) collision_layer = 32 collision_mask = 0 script = ExtResource("73_51d8c") -Events = [SubResource("Resource_umvl4")] +Events = Array[ExtResource("77_awrmj")]([SubResource("Resource_umvl4")]) metadata/_edit_group_ = true [node name="CollisionShape3D" type="CollisionShape3D" parent="Props/Node3D"] diff --git a/3D/Maps/Factory2.map b/3D/Maps/Factory2.map index d3662633..dce74005 100644 --- a/3D/Maps/Factory2.map +++ b/3D/Maps/Factory2.map @@ -360,6 +360,19 @@ } // entity 45 { +"classname" "acid_area" +// brush 0 +{ +( -488 -64 -40 ) ( -488 -256 -40 ) ( -488 -64 -48 ) Manual/Acid [ 0 -1 0 0 ] [ 0 0 1 -8 ] 270 1 -1 +( -456 -264 -40 ) ( -320 -264 -40 ) ( -456 -264 -48 ) Manual/Acid [ -1 0 0 8 ] [ 0 0 1 -8 ] 90 1 -1 +( -456 -256 -48 ) ( -320 -256 -48 ) ( -456 -64 -48 ) Manual/Acid [ -1 0 0 0 ] [ 0 1 0 0 ] 180 1 1 +( -456 -64 -40 ) ( -320 -64 -40 ) ( -456 -256 -40 ) Manual/Acid [ -1 0 0 0 ] [ 0 1 0 0 ] 180 1 1 +( -456 -64 -48 ) ( -320 -64 -48 ) ( -456 -64 -40 ) Manual/Acid [ -1 0 0 8 ] [ 0 0 1 -8 ] 180 1 -1 +( -432 -256 -40 ) ( -432 -64 -40 ) ( -432 -256 -48 ) Manual/Acid [ 0 -1 0 0 ] [ 0 0 1 -8 ] 0 1 -1 +} +} +// entity 46 +{ "classname" "func_group" "_tb_type" "_tb_layer" "_tb_name" "Solid" @@ -1655,324 +1668,351 @@ // brush 143 { ( -432 136 -24 ) ( -432 -56 -24 ) ( -432 136 -32 ) __TB_empty [ 0 -1 0 -8 ] [ 0 0 1 -8 ] 0 1 -1 -( -480 -176 -24 ) ( -344 -176 -24 ) ( -480 -176 -32 ) __TB_empty [ -1 0 0 0 ] [ 0 0 1 -8 ] 180 1 -1 +( -480 -296 -24 ) ( -344 -296 -24 ) ( -480 -296 -32 ) __TB_empty [ -1 0 0 0 ] [ 0 0 1 -8 ] 90 1 -1 ( -480 -56 -56 ) ( -344 -56 -56 ) ( -480 136 -56 ) __TB_empty [ -1 0 0 -8 ] [ 0 1 0 8 ] 180 1 1 ( -480 136 -24 ) ( -344 136 -24 ) ( -480 -56 -24 ) Floors/Floor18 [ -1 0 0 8 ] [ 0 1 0 -8 ] 270 1 1 -( -480 176 -32 ) ( -344 176 -32 ) ( -480 176 -24 ) Floors/Floor187 [ -1 0 0 0 ] [ 0 0 1 -8 ] 270 1 -1 +( -480 200 -32 ) ( -344 200 -32 ) ( -480 200 -24 ) Floors/Floor187 [ -1 0 0 0 ] [ 0 0 1 -8 ] 0 1 -1 ( -344 -56 -24 ) ( -344 136 -24 ) ( -344 -56 -32 ) Walls/Wall0 [ 0 -1 0 8 ] [ 0 0 1 -8 ] 270 1 -1 } // brush 144 { ( -576 136 -24 ) ( -576 -56 -24 ) ( -576 136 -32 ) __TB_empty [ 0 -1 0 -8 ] [ 0 0 1 -8 ] 180 1 -1 -( -624 -176 -24 ) ( -488 -176 -24 ) ( -624 -176 -32 ) __TB_empty [ -1 0 0 -16 ] [ 0 0 1 -8 ] 0 1 -1 +( -624 -296 -24 ) ( -488 -296 -24 ) ( -624 -296 -32 ) __TB_empty [ -1 0 0 -16 ] [ 0 0 1 -8 ] 270 1 -1 ( -624 -56 -56 ) ( -488 -56 -56 ) ( -624 136 -56 ) __TB_empty [ -1 0 0 -24 ] [ 0 1 0 8 ] 0 1 1 ( -624 136 -24 ) ( -488 136 -24 ) ( -624 -56 -24 ) Floors/Floor18 [ -1 0 0 -8 ] [ 0 1 0 8 ] 90 1 1 -( -624 176 -32 ) ( -488 176 -32 ) ( -624 176 -24 ) Floors/Floor187 [ -1 0 0 0 ] [ 0 0 1 -8 ] 90 1 -1 +( -624 200 -32 ) ( -488 200 -32 ) ( -624 200 -24 ) Floors/Floor187 [ -1 0 0 0 ] [ 0 0 1 -8 ] 180 1 -1 ( -488 -56 -24 ) ( -488 136 -24 ) ( -488 -56 -32 ) Walls/Wall0 [ 0 -1 0 -8 ] [ 0 0 1 -8 ] 90 1 -1 } +// brush 145 +{ +( -488 -72 -24 ) ( -488 -264 -24 ) ( -488 -72 -32 ) __TB_empty [ 0 -1 0 8 ] [ 0 0 1 -8 ] 180 1 -1 +( -568 -64 -24 ) ( -432 -64 -24 ) ( -568 -64 -32 ) __TB_empty [ -1 0 0 8 ] [ 0 0 1 -8 ] 0 1 -1 +( -568 -264 -56 ) ( -432 -264 -56 ) ( -568 -72 -56 ) __TB_empty [ -1 0 0 0 ] [ 0 1 0 -8 ] 270 1 1 +( -568 -72 -24 ) ( -432 -72 -24 ) ( -568 -264 -24 ) Floors/Floor18 [ -1 0 0 0 ] [ 0 1 0 -8 ] 180 1 1 +( -568 -32 -32 ) ( -432 -32 -32 ) ( -568 -32 -24 ) Floors/Floor187 [ -1 0 0 8 ] [ 0 0 1 -8 ] 0 1 -1 +( -432 -264 -24 ) ( -432 -72 -24 ) ( -432 -264 -32 ) Walls/Wall0 [ 0 -1 0 8 ] [ 0 0 1 -8 ] 180 1 -1 } -// entity 46 +// brush 146 +{ +( -488 160 -24 ) ( -488 -32 -24 ) ( -488 160 -32 ) __TB_empty [ 0 -1 0 16 ] [ 0 0 1 -8 ] 180 1 -1 +( -568 168 -24 ) ( -432 168 -24 ) ( -568 168 -32 ) __TB_empty [ -1 0 0 8 ] [ 0 0 1 -8 ] 0 1 -1 +( -568 -32 -56 ) ( -432 -32 -56 ) ( -568 160 -56 ) __TB_empty [ -1 0 0 0 ] [ 0 1 0 -16 ] 270 1 1 +( -568 160 -24 ) ( -432 160 -24 ) ( -568 -32 -24 ) Floors/Floor18 [ -1 0 0 0 ] [ 0 1 0 0 ] 180 1 1 +( -568 200 -32 ) ( -432 200 -32 ) ( -568 200 -24 ) Floors/Floor187 [ -1 0 0 -8 ] [ 0 0 1 -8 ] 0 1 -1 +( -432 -32 -24 ) ( -432 160 -24 ) ( -432 -32 -32 ) Walls/Wall0 [ 0 -1 0 0 ] [ 0 0 1 -8 ] 180 1 -1 +} +// brush 147 +{ +( -488 -304 -24 ) ( -488 -496 -24 ) ( -488 -304 -32 ) __TB_empty [ 0 -1 0 0 ] [ 0 0 1 -8 ] 270 1 -1 +( -568 -296 -24 ) ( -432 -296 -24 ) ( -568 -296 -32 ) __TB_empty [ -1 0 0 8 ] [ 0 0 1 -8 ] 270 1 -1 +( -568 -496 -56 ) ( -432 -496 -56 ) ( -568 -304 -56 ) __TB_empty [ -1 0 0 0 ] [ 0 1 0 0 ] 0 1 1 +( -568 -304 -24 ) ( -432 -304 -24 ) ( -568 -496 -24 ) Floors/Floor18 [ -1 0 0 0 ] [ 0 1 0 0 ] 90 1 1 +( -568 -264 -32 ) ( -432 -264 -32 ) ( -568 -264 -24 ) Floors/Floor187 [ -1 0 0 -8 ] [ 0 0 1 -8 ] 90 1 -1 +( -432 -496 -24 ) ( -432 -304 -24 ) ( -432 -496 -32 ) Walls/Wall0 [ 0 -1 0 0 ] [ 0 0 1 -8 ] 90 1 -1 +} +} +// entity 47 { "classname" "light_omni" "origin" "200 -248 24" "_tb_layer" "3" } -// entity 47 +// entity 48 { "classname" "actor_box_wood" "origin" "172 -96 20" "_tb_layer" "3" } -// entity 48 +// entity 49 { "classname" "actor_box_blue" "origin" "-80 -88 28" "_tb_layer" "3" } -// entity 49 +// entity 50 { "classname" "actor_box_red" "origin" "-80 -88 20" "_tb_layer" "3" } -// entity 50 +// entity 51 { "classname" "actor_terminal" "origin" "-60 -148 28" "angle" "90" "_tb_layer" "3" } -// entity 51 +// entity 52 { "classname" "actor_ac_unit" "origin" "-28 -156 24" "angle" "270" "_tb_layer" "3" } -// entity 52 +// entity 53 { "classname" "actor_table" "origin" "-56 -148 20" "angle" "90" "_tb_layer" "3" } -// entity 53 +// entity 54 { "classname" "actor_box_wood" "origin" "-68 -104 20" "_tb_layer" "3" } -// entity 54 +// entity 55 { "classname" "actor_table" "origin" "-8 -92 20" "_tb_layer" "3" } -// entity 55 +// entity 56 { "classname" "actor_box_wood" "origin" "-84 -152 20" "_tb_layer" "3" } -// entity 56 +// entity 57 { "classname" "actor_box_wood" "origin" "-76 -152 20" "_tb_layer" "3" } -// entity 57 +// entity 58 { "classname" "actor_box_wood" "origin" "-80 -104 20" "_tb_layer" "3" } -// entity 58 +// entity 59 { "classname" "actor_tank" "origin" "168 -544 64" "_tb_layer" "3" } -// entity 59 +// entity 60 { "classname" "actor_tank" "origin" "168 -576 64" "_tb_layer" "3" } -// entity 60 +// entity 61 { "classname" "actor_box_wood" "origin" "160 -600 60" "_tb_layer" "3" } -// entity 61 +// entity 62 { "classname" "actor_box_wood" "origin" "160 -616 60" "_tb_layer" "3" } -// entity 62 +// entity 63 { "classname" "actor_box_red" "origin" "164 -632 60" "_tb_layer" "3" } -// entity 63 +// entity 64 { "classname" "actor_box_blue" "origin" "164 -632 68" "_tb_layer" "3" } -// entity 64 +// entity 65 { "classname" "actor_box_wood" "origin" "276 -192 20" "_tb_layer" "3" } -// entity 65 +// entity 66 { "classname" "actor_elevator_1" "origin" "216 -376 14" "_tb_layer" "3" } -// entity 66 +// entity 67 { "classname" "actor_tube_straight" "origin" "-112 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 67 +// entity 68 { "classname" "actor_tube_straight" "origin" "-96 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 68 +// entity 69 { "classname" "actor_tube_straight" "origin" "-80 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 69 +// entity 70 { "classname" "actor_tube_straight" "origin" "-64 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 70 +// entity 71 { "classname" "actor_tube_straight" "origin" "-48 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 71 +// entity 72 { "classname" "actor_tube_straight" "origin" "-32 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 72 +// entity 73 { "classname" "actor_tube_straight" "origin" "-16 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 73 +// entity 74 { "classname" "actor_tube_straight" "origin" "0 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 74 +// entity 75 { "classname" "actor_tube_straight" "origin" "16 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 75 +// entity 76 { "classname" "actor_tube_straight" "origin" "32 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 76 +// entity 77 { "classname" "actor_tube_straight" "origin" "48 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 77 +// entity 78 { "classname" "actor_tube_straight" "origin" "64 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 78 +// entity 79 { "classname" "actor_tube_straight" "origin" "80 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 79 +// entity 80 { "classname" "actor_tube_straight" "origin" "96 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 80 +// entity 81 { "classname" "actor_tube_straight" "origin" "112 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 81 +// entity 82 { "classname" "actor_tube_straight" "origin" "128 -48 -16" "angle" "270" "_tb_layer" "3" } -// entity 82 +// entity 83 { "classname" "actor_tube_corner" "origin" "144 -48 -16" "angle" "90" "_tb_layer" "3" } -// entity 83 +// entity 84 { "classname" "actor_tank" "origin" "-232 -32 -16" "angle" "90" "_tb_layer" "3" } -// entity 84 +// entity 85 { "classname" "actor_tube_straight" "origin" "-208 -32 -16" "angle" "90" "_tb_layer" "3" } -// entity 85 +// entity 86 { "classname" "actor_tube_straight" "origin" "-192 -32 -16" "angle" "90" "_tb_layer" "3" } -// entity 86 +// entity 87 { "classname" "actor_tube_straight" "origin" "-176 -32 -16" "angle" "90" "_tb_layer" "3" } -// entity 87 +// entity 88 { "classname" "actor_tube_straight" "origin" "-160 -32 -16" "angle" "90" "_tb_layer" "3" } -// entity 88 +// entity 89 { "classname" "actor_barrel_1" "origin" "-240 -8 -16" "_tb_layer" "3" } -// entity 89 +// entity 90 { "classname" "actor_box_red" "origin" "-264 -24 -20" "_tb_layer" "3" } -// entity 90 +// entity 91 { "classname" "actor_box_red" "origin" "-264 -24 -12" "_tb_layer" "3" } -// entity 91 +// entity 92 { "classname" "actor_box_green" "origin" "-264 -8 -20" "_tb_layer" "3" } -// entity 92 +// entity 93 { "classname" "func_group" "_tb_type" "_tb_group" @@ -1991,7 +2031,7 @@ ( -248 -64 0 ) ( -248 -64 1 ) ( -248 -63 0 ) special/clip [ -8.269460797427576e-16 1 0 0 ] [ 0 0 -1 -8 ] 270 1 1 } } -// entity 93 +// entity 94 { "classname" "func_group" "_tb_type" "_tb_group" @@ -2009,129 +2049,129 @@ ( -104 -208 48 ) ( -104 -208 49 ) ( -104 -207 48 ) Manual/Blue_Panel_Wall_Thin [ 0 1 0 8 ] [ 0 0 -1 -16 ] 0 1 1 } } -// entity 94 +// entity 95 { "classname" "actor_capacitor_mini" "origin" "-248 104 -16" "_tb_layer" "3" } -// entity 95 +// entity 96 { "classname" "actor_tank_large" "origin" "-304 -24 -8" "_tb_layer" "3" } -// entity 96 +// entity 97 { "classname" "actor_chest_1" "origin" "-264 56 -16" "_tb_layer" "3" } -// entity 97 +// entity 98 { "classname" "actor_chest_1" "origin" "40 -200 24" "_tb_layer" "3" } -// entity 98 +// entity 99 { "classname" "actor_elevator_1" "origin" "-168 112 -24" "_tb_layer" "3" } -// entity 99 +// entity 100 { "classname" "actor_terminal_big" "origin" "92 -248 28" "angle" "90" "_tb_layer" "3" } -// entity 100 +// entity 101 { "classname" "actor_barrel_1" "origin" "176 -144 24" "_tb_layer" "3" } -// entity 101 +// entity 102 { "classname" "actor_barrel_1" "origin" "176 -300 24" "_tb_layer" "3" } -// entity 102 +// entity 103 { "classname" "actor_barrel_1" "origin" "192 -144 24" "_tb_layer" "3" } -// entity 103 +// entity 104 { "classname" "actor_tube_junction" "origin" "-128 -48 -16" "angle" "90" "_tb_layer" "3" } -// entity 104 +// entity 105 { "classname" "actor_tube_straight" "origin" "-128 -32 -16" "_tb_layer" "3" } -// entity 105 +// entity 106 { "classname" "actor_tube_straight" "origin" "-128 -16 -16" "_tb_layer" "3" } -// entity 106 +// entity 107 { "classname" "actor_tube_straight" "origin" "-128 0 -16" "_tb_layer" "3" } -// entity 107 +// entity 108 { "classname" "actor_tube_straight" "origin" "-128 16 -16" "_tb_layer" "3" } -// entity 108 +// entity 109 { "classname" "actor_tube_straight" "origin" "-128 32 -16" "_tb_layer" "3" } -// entity 109 +// entity 110 { "classname" "actor_tube_straight" "origin" "-128 48 -16" "_tb_layer" "3" } -// entity 110 +// entity 111 { "classname" "actor_tube_straight" "origin" "-128 64 -16" "_tb_layer" "3" } -// entity 111 +// entity 112 { "classname" "actor_tube_straight" "origin" "-128 80 -16" "_tb_layer" "3" } -// entity 112 +// entity 113 { "classname" "actor_tube_straight" "origin" "-128 96 -16" "_tb_layer" "3" } -// entity 113 +// entity 114 { "classname" "actor_tube_straight" "origin" "-128 112 -16" "_tb_layer" "3" } -// entity 114 +// entity 115 { "classname" "actor_tube_straight" "origin" "-128 128 -16"