From 19f4bf0222b5dbf6be4f029c233b1d6b603baf36 Mon Sep 17 00:00:00 2001 From: Daniel Queiroz Porto Date: Mon, 25 Mar 2024 21:22:38 -0300 Subject: [PATCH] Remove large_object_item_spawn scene from sarcophagus and lids --- scenes/objects/large_objects/sarcophagi/sarcophagus.tscn | 7 +------ .../large_objects/sarcophagi/sarcophagus_lid_knight.tscn | 6 +----- .../large_objects/sarcophagi/sarcophagus_lid_plain.tscn | 6 +----- .../large_objects/sarcophagi/sarcophagus_lid_saint.tscn | 6 +----- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/scenes/objects/large_objects/sarcophagi/sarcophagus.tscn b/scenes/objects/large_objects/sarcophagi/sarcophagus.tscn index c8f0db19..0e612440 100644 --- a/scenes/objects/large_objects/sarcophagi/sarcophagus.tscn +++ b/scenes/objects/large_objects/sarcophagi/sarcophagus.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=3 uid="uid://b7efglls5kuu1"] +[gd_scene load_steps=16 format=3 uid="uid://b7efglls5kuu1"] [ext_resource type="PackedScene" uid="uid://dacmg3fcjxckm" path="res://scenes/objects/large_objects/sarcophagi/sarcophagus_base.tscn" id="1"] [ext_resource type="PackedScene" uid="uid://dgrv7l1saak5h" path="res://scenes/objects/large_objects/sarcophagi/sarcophagus_lid_saint.tscn" id="2"] @@ -6,7 +6,6 @@ [ext_resource type="PackedScene" uid="uid://bs375p3exel4b" path="res://scenes/objects/large_objects/sarcophagi/sarcophagus_lid_knight.tscn" id="4"] [ext_resource type="Script" path="res://scenes/objects/large_objects/sarcophagi/sarcophagus.gd" id="5"] [ext_resource type="Script" path="res://utils/auto_free.gd" id="6"] -[ext_resource type="PackedScene" uid="uid://cykkk7776h00v" path="res://scenes/objects/large_objects/large_object_item_spawn.tscn" id="7"] [sub_resource type="Animation" id="3"] resource_name = "RESET" @@ -306,8 +305,4 @@ mesh = SubResource("1") surface_material_override/0 = SubResource("2") script = ExtResource("6") -[node name="ItemGeneratorOnPlacementAnchor" parent="." instance=ExtResource("7")] -anchors_parent = NodePath("../SarcophagusBase") -max_items_to_spawn = 1 - [connection signal="tree_exiting" from="2Tiles" to="." method="_on_2Tiles_tree_exiting"] diff --git a/scenes/objects/large_objects/sarcophagi/sarcophagus_lid_knight.tscn b/scenes/objects/large_objects/sarcophagi/sarcophagus_lid_knight.tscn index 55e8e939..03300617 100644 --- a/scenes/objects/large_objects/sarcophagi/sarcophagus_lid_knight.tscn +++ b/scenes/objects/large_objects/sarcophagi/sarcophagus_lid_knight.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=14 format=3 uid="uid://bs375p3exel4b"] +[gd_scene load_steps=13 format=3 uid="uid://bs375p3exel4b"] [ext_resource type="PackedScene" uid="uid://dvd18jjk81qum" path="res://resources/models/large_objects/sarcophagi/Sarcophagus_knight.glb" id="1"] [ext_resource type="Script" path="res://scenes/objects/large_objects/sarcophagi/sarcophagus_lid.gd" id="2"] [ext_resource type="AudioStream" uid="uid://bhv1a0txg52j4" path="res://resources/sounds/sarcophagus_lid_scrape.wav" id="3"] [ext_resource type="AudioStream" uid="uid://fsmbmceuvwh5" path="res://resources/sounds/impacts/heavy_stone/491119__jedimichael__lowbigboom.wav" id="4"] [ext_resource type="Script" path="res://scenes/objects/large_objects/placement_anchor.gd" id="5"] -[ext_resource type="PackedScene" uid="uid://cykkk7776h00v" path="res://scenes/objects/large_objects/large_object_item_spawn.tscn" id="6"] [sub_resource type="BoxShape3D" id="BoxShape3D_ny35n"] size = Vector3(2.199, 0.166, 1.004) @@ -150,7 +149,4 @@ script = ExtResource("5") transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.994057, 0.170658, 0.379488) script = ExtResource("5") -[node name="ItemSpawnerOnPlacementAnchor" parent="." instance=ExtResource("6")] -anchors_parent = NodePath("..") - [editable path="Sarcophagus_knight"] diff --git a/scenes/objects/large_objects/sarcophagi/sarcophagus_lid_plain.tscn b/scenes/objects/large_objects/sarcophagi/sarcophagus_lid_plain.tscn index 382550aa..d1b9c1ed 100644 --- a/scenes/objects/large_objects/sarcophagi/sarcophagus_lid_plain.tscn +++ b/scenes/objects/large_objects/sarcophagi/sarcophagus_lid_plain.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=10 format=3 uid="uid://coi5edcyci001"] +[gd_scene load_steps=9 format=3 uid="uid://coi5edcyci001"] [ext_resource type="Material" path="res://resources/models/large_objects/sarcophagi/M_SarcoLidClean.material" id="1"] [ext_resource type="Script" path="res://scenes/objects/large_objects/sarcophagi/sarcophagus_lid.gd" id="2"] [ext_resource type="AudioStream" uid="uid://bhv1a0txg52j4" path="res://resources/sounds/sarcophagus_lid_scrape.wav" id="3"] [ext_resource type="AudioStream" uid="uid://fsmbmceuvwh5" path="res://resources/sounds/impacts/heavy_stone/491119__jedimichael__lowbigboom.wav" id="4"] [ext_resource type="Script" path="res://scenes/objects/large_objects/placement_anchor.gd" id="5"] -[ext_resource type="PackedScene" uid="uid://cykkk7776h00v" path="res://scenes/objects/large_objects/large_object_item_spawn.tscn" id="6"] [sub_resource type="ArrayMesh" id="1"] resource_name = "Sarcophagus_Clean_Plane016" @@ -127,6 +126,3 @@ script = ExtResource("5") [node name="PlacementAnchor11" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.994057, 0.130774, 0.379488) script = ExtResource("5") - -[node name="ItemSpawnerOnPlacementAnchor" parent="." instance=ExtResource("6")] -anchors_parent = NodePath("..") diff --git a/scenes/objects/large_objects/sarcophagi/sarcophagus_lid_saint.tscn b/scenes/objects/large_objects/sarcophagi/sarcophagus_lid_saint.tscn index d1befdbd..89a18bb9 100644 --- a/scenes/objects/large_objects/sarcophagi/sarcophagus_lid_saint.tscn +++ b/scenes/objects/large_objects/sarcophagi/sarcophagus_lid_saint.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=15 format=3 uid="uid://dgrv7l1saak5h"] +[gd_scene load_steps=14 format=3 uid="uid://dgrv7l1saak5h"] [ext_resource type="PackedScene" uid="uid://bh5gd5dh1ukn2" path="res://resources/models/large_objects/sarcophagi/Sarcophagus_Statue.glb" id="1"] [ext_resource type="Script" path="res://scenes/objects/large_objects/sarcophagi/sarcophagus_lid.gd" id="2"] [ext_resource type="AudioStream" uid="uid://bhv1a0txg52j4" path="res://resources/sounds/sarcophagus_lid_scrape.wav" id="3"] [ext_resource type="AudioStream" uid="uid://fsmbmceuvwh5" path="res://resources/sounds/impacts/heavy_stone/491119__jedimichael__lowbigboom.wav" id="4"] [ext_resource type="Script" path="res://scenes/objects/large_objects/placement_anchor.gd" id="5"] -[ext_resource type="PackedScene" uid="uid://cykkk7776h00v" path="res://scenes/objects/large_objects/large_object_item_spawn.tscn" id="6"] [sub_resource type="BoxShape3D" id="BoxShape3D_es52y"] size = Vector3(2.199, 0.166, 1.004) @@ -171,7 +170,4 @@ script = ExtResource("5") transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.994057, 0.130774, 0.379488) script = ExtResource("5") -[node name="ItemSpawnerOnPlacementAnchor" parent="." instance=ExtResource("6")] -anchors_parent = NodePath("..") - [editable path="Sarcophagus_Statue"]